WinGui:

- Makes the new preview window user accessible from the main window.
- Attempt at a fix for a QT lockup.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2060 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 37 insertions, 17 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 7893e7198..37dcd055a 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -38,7 +38,7 @@ namespace Handbrake
             System.Windows.Forms.Label Label38;

             System.Windows.Forms.ContextMenuStrip notifyIconMenu;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();

             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

@@ -244,11 +244,13 @@ namespace Handbrake
             this.btn_add2Queue = new System.Windows.Forms.ToolStripButton();

             this.btn_showQueue = new System.Windows.Forms.ToolStripButton();

             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();

-            this.btn_vidPreview = new System.Windows.Forms.ToolStripButton();

             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();

             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);

             this.StatusStrip = new System.Windows.Forms.StatusStrip();

             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();

+            this.tb_preview = new System.Windows.Forms.ToolStripDropDownButton();

+            this.mnu_qtpreview = new System.Windows.Forms.ToolStripMenuItem();

+            this.mnu_vlcpreview = new System.Windows.Forms.ToolStripMenuItem();

             Label38 = new System.Windows.Forms.Label();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

@@ -642,9 +644,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle3.Format = "N0";

+            dataGridViewCellStyle3.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle3;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

@@ -2743,7 +2745,7 @@ namespace Handbrake
             this.btn_add2Queue,

             this.btn_showQueue,

             this.toolStripSeparator4,

-            this.btn_vidPreview,

+            this.tb_preview,

             this.btn_ActivityWindow});

             this.toolStrip1.Location = new System.Drawing.Point(0, 24);

             this.toolStrip1.Name = "toolStrip1";

@@ -2842,16 +2844,6 @@ namespace Handbrake
             this.toolStripSeparator4.Name = "toolStripSeparator4";

             this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);

             // 

-            // btn_vidPreview

-            // 

-            this.btn_vidPreview.Image = global::Handbrake.Properties.Resources.picture;

-            this.btn_vidPreview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

-            this.btn_vidPreview.ImageTransparentColor = System.Drawing.Color.Magenta;

-            this.btn_vidPreview.Name = "btn_vidPreview";

-            this.btn_vidPreview.Size = new System.Drawing.Size(81, 36);

-            this.btn_vidPreview.Text = "Preview";

-            this.btn_vidPreview.Click += new System.EventHandler(this.btn_vidPreview_Click);

-            // 

             // btn_ActivityWindow

             // 

             this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;

@@ -2891,6 +2883,32 @@ namespace Handbrake
             this.lbl_encode.Size = new System.Drawing.Size(31, 17);

             this.lbl_encode.Text = "{0}";

             // 

+            // tb_preview

+            // 

+            this.tb_preview.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.mnu_qtpreview,

+            this.mnu_vlcpreview});

+            this.tb_preview.Image = global::Handbrake.Properties.Resources.picture;

+            this.tb_preview.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.tb_preview.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.tb_preview.Name = "tb_preview";

+            this.tb_preview.Size = new System.Drawing.Size(90, 36);

+            this.tb_preview.Text = "Preview";

+            // 

+            // mnu_qtpreview

+            // 

+            this.mnu_qtpreview.Name = "mnu_qtpreview";

+            this.mnu_qtpreview.Size = new System.Drawing.Size(185, 22);

+            this.mnu_qtpreview.Text = "Preview in QuickTime";

+            this.mnu_qtpreview.Click += new System.EventHandler(this.mnu_qtpreview_Click);

+            // 

+            // mnu_vlcpreview

+            // 

+            this.mnu_vlcpreview.Name = "mnu_vlcpreview";

+            this.mnu_vlcpreview.Size = new System.Drawing.Size(185, 22);

+            this.mnu_vlcpreview.Text = "Preview in VLC";

+            this.mnu_vlcpreview.Click += new System.EventHandler(this.mnu_vlcpreview_Click);

+            // 

             // frmMain

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

@@ -3151,7 +3169,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator sep1;

         private System.Windows.Forms.ToolStripMenuItem pmnu_delete;

         private System.Windows.Forms.SplitContainer splitContainer1;

-        private System.Windows.Forms.ToolStripButton btn_vidPreview;

         private System.Windows.Forms.Button btn_RemoveAudioTrack;

         private System.Windows.Forms.Button btn_addAudioTrack;

         private System.Windows.Forms.ColumnHeader col_Source;

@@ -3167,6 +3184,9 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;

         private System.Windows.Forms.ToolStripMenuItem audioList_remove;

         private System.Windows.Forms.ImageList AudioMenuRowHeightHack;

+        private System.Windows.Forms.ToolStripDropDownButton tb_preview;

+        private System.Windows.Forms.ToolStripMenuItem mnu_qtpreview;

+        private System.Windows.Forms.ToolStripMenuItem mnu_vlcpreview;

 

     }

 }
\ No newline at end of file