diff options
| author | sr55 <[email protected]> | 2008-08-01 18:15:19 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-08-01 18:15:19 +0000 |
| commit | 754e130f3401e2ff630d2746b5f99ea66330f119 (patch) | |
| tree | 64dc4230cae7a2c1e71512fc39742fa21ee5a358 /win/C# | |
| parent | 7dde8068656d19ee95b0b9231e53d1c669806efe (diff) | |
WinGui:
- Changed the layout of the Options window.
- Added a "Stop" button to stop encodes.
- Moved Encode status label onto a status bar at the bottom of the window. Now includes scanning status.
- Added and Removed some png images
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1600 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#')
| -rw-r--r-- | win/C#/HandBrakeCS.csproj | 5 | ||||
| -rw-r--r-- | win/C#/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | win/C#/Properties/Resources.Designer.cs | 42 | ||||
| -rw-r--r-- | win/C#/Properties/Resources.resx | 42 | ||||
| -rw-r--r-- | win/C#/Resources/Help16.png | bin | 0 -> 3499 bytes | |||
| -rw-r--r-- | win/C#/Resources/hb16.png | bin | 0 -> 3746 bytes | |||
| -rw-r--r-- | win/C#/Resources/hb32.png | bin | 0 -> 5935 bytes | |||
| -rw-r--r-- | win/C#/Resources/info16.png | bin | 0 -> 3495 bytes | |||
| -rw-r--r-- | win/C#/Resources/stop.png | bin | 0 -> 1341 bytes | |||
| -rw-r--r-- | win/C#/frmMain.Designer.cs | 255 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 25 | ||||
| -rw-r--r-- | win/C#/frmMain.resx | 94 | ||||
| -rw-r--r-- | win/C#/frmOptions.Designer.cs | 443 | ||||
| -rw-r--r-- | win/C#/frmOptions.cs | 33 | ||||
| -rw-r--r-- | win/C#/frmOptions.resx | 3 |
15 files changed, 471 insertions, 473 deletions
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index cb4fa7295..43bc6c014 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -236,6 +236,10 @@ <None Include="Resources\AddToQueue.png" />
<Content Include="Resources\ActivityWindow_small.png" />
<Content Include="Resources\disc_small.png" />
+ <None Include="Resources\hb32.png" />
+ <None Include="Resources\hb16.png" />
+ <None Include="Resources\Help16.png" />
+ <None Include="Resources\info16.png" />
<Content Include="Resources\JobPassLarge.png" />
<Content Include="Resources\Output_Small.png" />
<None Include="Resources\Pause.png" />
@@ -243,6 +247,7 @@ <Content Include="Resources\Pref_Small.png" />
<Content Include="Resources\Queue.png" />
<Content Include="Resources\Queue_Small.png" />
+ <None Include="Resources\stop.png" />
<None Include="Resources\SplashScreen.jpg" />
<None Include="Resources\Remove.png" />
<None Include="Resources\Movies.png" />
diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs index f7ea463b2..834ae795a 100644 --- a/win/C#/Properties/AssemblyInfo.cs +++ b/win/C#/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ using System.Resources; [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("HandBrake")]
[assembly: AssemblyProduct("HandBrake")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyCopyright("Copyright © 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index 60a12a5c2..f03af9328 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -81,20 +81,6 @@ namespace Handbrake.Properties { }
}
- internal static System.Drawing.Bitmap Delete {
- get {
- object obj = ResourceManager.GetObject("Delete", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap Disc {
- get {
- object obj = ResourceManager.GetObject("Disc", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap disc_small {
get {
object obj = ResourceManager.GetObject("disc_small", resourceCulture);
@@ -102,37 +88,37 @@ namespace Handbrake.Properties { }
}
- internal static System.Drawing.Bitmap Emoticon {
+ internal static System.Drawing.Bitmap General_Preferences {
get {
- object obj = ResourceManager.GetObject("Emoticon", resourceCulture);
+ object obj = ResourceManager.GetObject("General_Preferences", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap General_Preferences {
+ internal static System.Drawing.Bitmap hb16 {
get {
- object obj = ResourceManager.GetObject("General_Preferences", resourceCulture);
+ object obj = ResourceManager.GetObject("hb16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap Help {
+ internal static System.Drawing.Bitmap hb32 {
get {
- object obj = ResourceManager.GetObject("Help", resourceCulture);
+ object obj = ResourceManager.GetObject("hb32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap History {
+ internal static System.Drawing.Bitmap Help16 {
get {
- object obj = ResourceManager.GetObject("History", resourceCulture);
+ object obj = ResourceManager.GetObject("Help16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap info {
+ internal static System.Drawing.Bitmap info16 {
get {
- object obj = ResourceManager.GetObject("info", resourceCulture);
+ object obj = ResourceManager.GetObject("info16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -207,16 +193,16 @@ namespace Handbrake.Properties { }
}
- internal static System.Drawing.Bitmap Remove {
+ internal static System.Drawing.Bitmap SplashScreen {
get {
- object obj = ResourceManager.GetObject("Remove", resourceCulture);
+ object obj = ResourceManager.GetObject("SplashScreen", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
- internal static System.Drawing.Bitmap SplashScreen {
+ internal static System.Drawing.Bitmap stop {
get {
- object obj = ResourceManager.GetObject("SplashScreen", resourceCulture);
+ object obj = ResourceManager.GetObject("stop", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index 7f07815fc..4fe140efd 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -124,30 +124,15 @@ <data name="Queue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Disc" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Disc.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Pref_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Pref_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="History" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\History.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="logo128" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo128.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ActivityWindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ActivityWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -160,21 +145,12 @@ <data name="Output_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Output_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Queue_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Queue_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Remove" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Movies" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Movies.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Emoticon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Emoticon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Movies_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Movies_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -187,4 +163,22 @@ <data name="ActivityWindow_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\activitywindow_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="hb16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\hb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="hb32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\hb32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="Help16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Help16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="info16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\info16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file diff --git a/win/C#/Resources/Help16.png b/win/C#/Resources/Help16.png Binary files differnew file mode 100644 index 000000000..bb5ef99ce --- /dev/null +++ b/win/C#/Resources/Help16.png diff --git a/win/C#/Resources/hb16.png b/win/C#/Resources/hb16.png Binary files differnew file mode 100644 index 000000000..a9f720775 --- /dev/null +++ b/win/C#/Resources/hb16.png diff --git a/win/C#/Resources/hb32.png b/win/C#/Resources/hb32.png Binary files differnew file mode 100644 index 000000000..5054264d3 --- /dev/null +++ b/win/C#/Resources/hb32.png diff --git a/win/C#/Resources/info16.png b/win/C#/Resources/info16.png Binary files differnew file mode 100644 index 000000000..6b6b9f01f --- /dev/null +++ b/win/C#/Resources/info16.png diff --git a/win/C#/Resources/stop.png b/win/C#/Resources/stop.png Binary files differnew file mode 100644 index 000000000..c544b5ee4 --- /dev/null +++ b/win/C#/Resources/stop.png diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index b2ca12981..ecc8f47ae 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();
@@ -91,16 +91,11 @@ namespace Handbrake this.File_Open = new System.Windows.Forms.OpenFileDialog();
this.ISO_Open = new System.Windows.Forms.OpenFileDialog();
this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_exit = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_open3 = new System.Windows.Forms.ToolStripMenuItem();
this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
- this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();
this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_delete_preset = new System.Windows.Forms.ToolStripMenuItem();
@@ -108,13 +103,10 @@ namespace Handbrake this.btn_new_preset = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem();
this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();
- this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();
this.mnu_handbrake_forums = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_UpdateCheck = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
- this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();
this.frmMainMenu = new System.Windows.Forms.MenuStrip();
this.GroupBox1 = new System.Windows.Forms.GroupBox();
this.Label13 = new System.Windows.Forms.Label();
@@ -251,22 +243,30 @@ namespace Handbrake this.groupBox2 = new System.Windows.Forms.GroupBox();
this.treeView_presets = new System.Windows.Forms.TreeView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ 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.btn_source = new System.Windows.Forms.ToolStripDropDownButton();
this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();
this.btn_dvd_source = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_dvd_drive = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.btn_start = new System.Windows.Forms.ToolStripButton();
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_ActivityWindow = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.btn_minimize = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
- this.lbl_encode = new System.Windows.Forms.ToolStripLabel();
- this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
+ this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_user_guide = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_handbrake_home = new System.Windows.Forms.ToolStripMenuItem();
+ this.mnu_about = new System.Windows.Forms.ToolStripMenuItem();
Label38 = new System.Windows.Forms.Label();
notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
notifyIconMenu.SuspendLayout();
@@ -293,6 +293,7 @@ namespace Handbrake this.groupBox_dest.SuspendLayout();
this.groupBox2.SuspendLayout();
this.toolStrip1.SuspendLayout();
+ this.StatusStrip.SuspendLayout();
this.SuspendLayout();
//
// Label38
@@ -651,9 +652,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";
@@ -1042,16 +1043,6 @@ namespace Handbrake this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20);
this.FileToolStripMenuItem.Text = "&File";
//
- // mnu_open
- //
- this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));
- this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.mnu_open.Name = "mnu_open";
- this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
- this.mnu_open.Size = new System.Drawing.Size(210, 22);
- this.mnu_open.Text = "&Import Preset";
- this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);
- //
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -1081,44 +1072,11 @@ namespace Handbrake this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(49, 20);
this.ToolsToolStripMenuItem.Text = "&Tools";
//
- // mnu_encode
- //
- this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;
- this.mnu_encode.Name = "mnu_encode";
- this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
- this.mnu_encode.Size = new System.Drawing.Size(251, 22);
- this.mnu_encode.Text = "Show Queue";
- this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);
- //
- // mnu_encodeLog
- //
- this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;
- this.mnu_encodeLog.Name = "mnu_encodeLog";
- this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22);
- this.mnu_encodeLog.Text = "Activity Window (Encode log)";
- this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);
- //
- // mnu_viewDVDdata
- //
- this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;
- this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";
- this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);
- this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";
- this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);
- //
// ToolStripSeparator5
//
this.ToolStripSeparator5.Name = "ToolStripSeparator5";
this.ToolStripSeparator5.Size = new System.Drawing.Size(248, 6);
//
- // mnu_options
- //
- this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;
- this.mnu_options.Name = "mnu_options";
- this.mnu_options.Size = new System.Drawing.Size(251, 22);
- this.mnu_options.Text = "Options";
- this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
- //
// PresetsToolStripMenuItem
//
this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1180,20 +1138,6 @@ namespace Handbrake this.HelpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.HelpToolStripMenuItem.Text = "&Help";
//
- // mnu_user_guide
- //
- this.mnu_user_guide.Name = "mnu_user_guide";
- this.mnu_user_guide.Size = new System.Drawing.Size(215, 22);
- this.mnu_user_guide.Text = "HandBrake User Guide";
- this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click_1);
- //
- // mnu_handbrake_home
- //
- this.mnu_handbrake_home.Name = "mnu_handbrake_home";
- this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);
- this.mnu_handbrake_home.Text = "HandBrake Homepage";
- this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);
- //
// mnu_handbrake_forums
//
this.mnu_handbrake_forums.Name = "mnu_handbrake_forums";
@@ -1218,13 +1162,6 @@ namespace Handbrake this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(212, 6);
//
- // mnu_about
- //
- this.mnu_about.Name = "mnu_about";
- this.mnu_about.Size = new System.Drawing.Size(215, 22);
- this.mnu_about.Text = "About...";
- this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
- //
// frmMainMenu
//
this.frmMainMenu.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -1236,7 +1173,7 @@ namespace Handbrake this.HelpToolStripMenuItem});
this.frmMainMenu.Location = new System.Drawing.Point(0, 0);
this.frmMainMenu.Name = "frmMainMenu";
- this.frmMainMenu.Size = new System.Drawing.Size(931, 24);
+ this.frmMainMenu.Size = new System.Drawing.Size(936, 24);
this.frmMainMenu.TabIndex = 0;
this.frmMainMenu.Text = "MenuStrip1";
//
@@ -1708,7 +1645,6 @@ namespace Handbrake this.drp_track1Audio.Name = "drp_track1Audio";
this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);
this.drp_track1Audio.TabIndex = 3;
-
//
// Label32
//
@@ -2922,16 +2858,56 @@ namespace Handbrake this.toolStripSeparator4,
this.btn_ActivityWindow,
this.toolStripSeparator8,
- this.btn_minimize,
- this.toolStripSeparator9,
- this.lbl_encode});
+ this.btn_minimize});
this.toolStrip1.Location = new System.Drawing.Point(0, 24);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
- this.toolStrip1.Size = new System.Drawing.Size(931, 39);
+ this.toolStrip1.Size = new System.Drawing.Size(936, 39);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
//
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);
+ //
+ // notifyIcon
+ //
+ this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
+ this.notifyIcon.BalloonTipText = "HandBrake Status Here";
+ this.notifyIcon.BalloonTipTitle = "HandBrake";
+ this.notifyIcon.ContextMenuStrip = notifyIconMenu;
+ this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
+ this.notifyIcon.Text = "HandBrake";
+ this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
+ //
+ // StatusStrip
+ //
+ this.StatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.lbl_encode});
+ this.StatusStrip.Location = new System.Drawing.Point(0, 619);
+ this.StatusStrip.Name = "StatusStrip";
+ this.StatusStrip.Size = new System.Drawing.Size(936, 22);
+ this.StatusStrip.TabIndex = 12;
+ this.StatusStrip.Text = "statusStrip1";
+ //
+ // lbl_encode
+ //
+ this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbl_encode.Name = "lbl_encode";
+ this.lbl_encode.Size = new System.Drawing.Size(148, 17);
+ this.lbl_encode.Text = "Encoding: Not Started";
+ //
// btn_source
//
this.btn_source.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -2978,11 +2954,6 @@ namespace Handbrake this.mnu_dvd_drive.Visible = false;
this.mnu_dvd_drive.Click += new System.EventHandler(this.mnu_dvd_drive_Click);
//
- // toolStripSeparator10
- //
- this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 39);
- //
// btn_start
//
this.btn_start.Image = global::Handbrake.Properties.Resources.Play;
@@ -3016,11 +2987,6 @@ namespace Handbrake this.btn_showQueue.Text = "Show Queue";
this.btn_showQueue.Click += new System.EventHandler(this.btn_showQueue_Click);
//
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 39);
- //
// btn_ActivityWindow
//
this.btn_ActivityWindow.Image = global::Handbrake.Properties.Resources.ActivityWindow;
@@ -3033,47 +2999,87 @@ namespace Handbrake "ently running encode.";
this.btn_ActivityWindow.Click += new System.EventHandler(this.btn_ActivityWindow_Click);
//
- // toolStripSeparator8
- //
- this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 39);
- //
// btn_minimize
//
- this.btn_minimize.Image = ((System.Drawing.Image)(resources.GetObject("btn_minimize.Image")));
+ this.btn_minimize.Image = global::Handbrake.Properties.Resources.hb32;
this.btn_minimize.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btn_minimize.Name = "btn_minimize";
this.btn_minimize.Size = new System.Drawing.Size(122, 36);
this.btn_minimize.Text = "Minimize To Taskbar";
this.btn_minimize.Click += new System.EventHandler(this.btn_minimize_Click);
//
- // toolStripSeparator9
+ // mnu_open
//
- this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 39);
+ this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));
+ this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.mnu_open.Name = "mnu_open";
+ this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+ this.mnu_open.Size = new System.Drawing.Size(210, 22);
+ this.mnu_open.Text = "&Import Preset";
+ this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);
//
- // lbl_encode
+ // mnu_encode
//
- this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_encode.Name = "lbl_encode";
- this.lbl_encode.Size = new System.Drawing.Size(148, 36);
- this.lbl_encode.Text = "Encoding: Not Started";
+ this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;
+ this.mnu_encode.Name = "mnu_encode";
+ this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));
+ this.mnu_encode.Size = new System.Drawing.Size(251, 22);
+ this.mnu_encode.Text = "Show Queue";
+ this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);
//
- // notifyIcon
+ // mnu_encodeLog
//
- this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
- this.notifyIcon.BalloonTipText = "HandBrake Status Here";
- this.notifyIcon.BalloonTipTitle = "HandBrake";
- this.notifyIcon.ContextMenuStrip = notifyIconMenu;
- this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
- this.notifyIcon.Text = "HandBrake";
- this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
+ this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;
+ this.mnu_encodeLog.Name = "mnu_encodeLog";
+ this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22);
+ this.mnu_encodeLog.Text = "Activity Window (Encode log)";
+ this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);
+ //
+ // mnu_viewDVDdata
+ //
+ this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;
+ this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";
+ this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);
+ this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";
+ this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);
+ //
+ // mnu_options
+ //
+ this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;
+ this.mnu_options.Name = "mnu_options";
+ this.mnu_options.Size = new System.Drawing.Size(251, 22);
+ this.mnu_options.Text = "Options";
+ this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);
+ //
+ // mnu_user_guide
+ //
+ this.mnu_user_guide.Image = global::Handbrake.Properties.Resources.Help16;
+ this.mnu_user_guide.Name = "mnu_user_guide";
+ this.mnu_user_guide.Size = new System.Drawing.Size(215, 22);
+ this.mnu_user_guide.Text = "HandBrake User Guide";
+ this.mnu_user_guide.Click += new System.EventHandler(this.mnu_user_guide_Click_1);
+ //
+ // mnu_handbrake_home
+ //
+ this.mnu_handbrake_home.Image = global::Handbrake.Properties.Resources.info16;
+ this.mnu_handbrake_home.Name = "mnu_handbrake_home";
+ this.mnu_handbrake_home.Size = new System.Drawing.Size(215, 22);
+ this.mnu_handbrake_home.Text = "HandBrake Homepage";
+ this.mnu_handbrake_home.Click += new System.EventHandler(this.mnu_handbrake_home_Click);
+ //
+ // mnu_about
+ //
+ this.mnu_about.Image = global::Handbrake.Properties.Resources.hb16;
+ this.mnu_about.Name = "mnu_about";
+ this.mnu_about.Size = new System.Drawing.Size(215, 22);
+ this.mnu_about.Text = "About...";
+ this.mnu_about.Click += new System.EventHandler(this.mnu_about_Click);
//
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(931, 617);
+ this.ClientSize = new System.Drawing.Size(936, 641);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox_dest);
@@ -3081,6 +3087,7 @@ namespace Handbrake this.Controls.Add(this.groupBox_output);
this.Controls.Add(this.GroupBox1);
this.Controls.Add(this.frmMainMenu);
+ this.Controls.Add(this.StatusStrip);
this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(680, 580);
@@ -3122,6 +3129,8 @@ namespace Handbrake this.groupBox2.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
+ this.StatusStrip.ResumeLayout(false);
+ this.StatusStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -3337,7 +3346,6 @@ namespace Handbrake internal System.Windows.Forms.RichTextBox rtf_query;
private System.Windows.Forms.NotifyIcon notifyIcon;
private System.Windows.Forms.ToolStripButton btn_minimize;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripMenuItem btn_restore;
internal System.Windows.Forms.Label lbl_src_res;
internal System.Windows.Forms.Label label7;
@@ -3345,7 +3353,6 @@ namespace Handbrake internal System.Windows.Forms.Label label_duration;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
private System.Windows.Forms.ToolStripMenuItem btn_file_source;
- private System.Windows.Forms.ToolStripLabel lbl_encode;
private System.Windows.Forms.ToolStripMenuItem mnu_delete_preset;
private System.Windows.Forms.ToolStripMenuItem btn_new_preset;
private System.Windows.Forms.ToolStripMenuItem mnu_handbrake_forums;
@@ -3357,6 +3364,8 @@ namespace Handbrake internal System.Windows.Forms.ComboBox drop_format;
internal System.Windows.Forms.Label label5;
internal System.Windows.Forms.ToolStripMenuItem mnu_encodeLog;
+ private System.Windows.Forms.StatusStrip StatusStrip;
+ private System.Windows.Forms.ToolStripStatusLabel lbl_encode;
}
}
\ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index c352c5de2..c300dc3b8 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -356,7 +356,7 @@ namespace Handbrake }
private void mnu_options_Click(object sender, EventArgs e)
{
- Form Options = new frmOptions();
+ Form Options = new frmOptions(this);
Options.ShowDialog();
}
@@ -459,8 +459,13 @@ namespace Handbrake ThreadPool.QueueUserWorkItem(procMonitor, query);
lbl_encode.Visible = true;
- lbl_encode.Text = "Encoding in Progress";
+ lbl_encode.Text = "Encoding: in Progress";
+
+ btn_start.Text = "Stop";
+ btn_start.Image = Properties.Resources.stop;
}
+
+
}
private void btn_add2Queue_Click(object sender, EventArgs e)
{
@@ -507,6 +512,7 @@ namespace Handbrake {
Form frmRD = new frmReadDVD(filename, this);
text_source.Text = filename;
+ lbl_encode.Text = "Scanning ...";
frmRD.ShowDialog();
}
else
@@ -516,6 +522,7 @@ namespace Handbrake if (drp_dvdtitle.Items.Count == 0)
MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ lbl_encode.Text = "Encoding: Not Started";
}
}
private void btn_file_source_Click(object sender, EventArgs e)
@@ -534,6 +541,7 @@ namespace Handbrake {
Form frmRD = new frmReadDVD(filename, this);
text_source.Text = filename;
+ lbl_encode.Text = "Scanning ...";
frmRD.ShowDialog();
}
else
@@ -543,6 +551,7 @@ namespace Handbrake if (drp_dvdtitle.Items.Count == 0)
MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ lbl_encode.Text = "Encoding: Not Started";
}
}
private void mnu_dvd_drive_Click(object sender, EventArgs e)
@@ -552,6 +561,7 @@ namespace Handbrake {
string[] path = mnu_dvd_drive.Text.Split(' ');
filename = path[0];
+ lbl_encode.Text = "Scanning ...";
Form frmRD = new frmReadDVD(filename, this);
text_source.Text = filename;
frmRD.ShowDialog();
@@ -561,6 +571,7 @@ namespace Handbrake if (drp_dvdtitle.Items.Count == 0)
MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+ lbl_encode.Text = "Encoding: Not Started";
}
private void drp_dvdtitle_Click(object sender, EventArgs e)
@@ -729,7 +740,7 @@ namespace Handbrake // Output Settings
private void drop_format_SelectedIndexChanged(object sender, EventArgs e)
{
-
+
if (drop_format.SelectedIndex == 0)
setExtension(".mp4");
else if (drop_format.SelectedIndex == 1)
@@ -1968,7 +1979,9 @@ namespace Handbrake {
// Make sure we are not already encoding and if we are then display an error.
if (hbProc != null)
- MessageBox.Show("Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ {
+ hbProc.CloseMainWindow();
+ }
else
{
hbProc = cliObj.runCli(this, (string)state);
@@ -1996,7 +2009,9 @@ namespace Handbrake this.BeginInvoke(new UpdateUIHandler(setEncodeLabelFinished));
return;
}
- lbl_encode.Text = "Encoding Finished";
+ lbl_encode.Text = "Encoding: Finished";
+ btn_start.Text = "Start";
+ btn_start.Image = Properties.Resources.Play;
}
public Boolean isEncoding()
{
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 1da887cdb..dd4fda4be 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -155,6 +155,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise the list will not be populated with the correct amount of chapters.
Note: Do not change any of the chapter numbers!</value>
</data>
+ <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>223, 15</value>
</metadata>
@@ -164,65 +170,16 @@ Note: Do not change any of the chapter numbers!</value> <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>329, 15</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
- k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
- TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
- AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
- BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
- UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
- CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
- F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
- rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
- NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
- 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
- AAAAAElFTkSuQmCC
-</value>
- </data>
<metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>106, 15</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 18</value>
</metadata>
- <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
- k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
- TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
- AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
- BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
- UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
- CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
- F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
- rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
- NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
- 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
- AAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="btn_minimize.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL
- U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI
- VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ
- QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4
- /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9
- cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j
- 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR
- dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb
- NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE
- s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC
-</value>
- </data>
<metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>830, 18</value>
</metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
@@ -602,6 +559,43 @@ Note: Do not change any of the chapter numbers!</value> AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==
</value>
</data>
+ <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>1060, 18</value>
+ </metadata>
+ <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
+ k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
+ TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
+ AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
+ BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
+ UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
+ CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
+ F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
+ rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
+ NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
+ 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
+ AAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I
+ k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC
+ TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p
+ AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0
+ BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr
+ UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG
+ CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5
+ F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS
+ rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt
+ NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp
+ 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W
+ AAAAAElFTkSuQmCC
+</value>
+ </data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>56</value>
</metadata>
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 6bcf91a2c..b2f2152dc 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -34,41 +34,40 @@ namespace Handbrake /// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions));
this.btn_close = new System.Windows.Forms.Button();
this.drp_completeOption = new System.Windows.Forms.ComboBox();
- this.label5 = new System.Windows.Forms.Label();
this.tab_options = new System.Windows.Forms.TabControl();
this.tab_general = new System.Windows.Forms.TabPage();
- this.check_tooltip = new System.Windows.Forms.CheckBox();
- this.check_updateCheck = new System.Windows.Forms.CheckBox();
- this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();
- this.label1 = new System.Windows.Forms.Label();
- this.tabPage1 = new System.Windows.Forms.TabPage();
- this.btn_drive_detect = new System.Windows.Forms.CheckBox();
- this.label6 = new System.Windows.Forms.Label();
this.btn_browse = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label();
this.text_an_path = new System.Windows.Forms.TextBox();
this.check_autoNaming = new System.Windows.Forms.CheckBox();
- this.label9 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.check_tooltip = new System.Windows.Forms.CheckBox();
+ this.check_updateCheck = new System.Windows.Forms.CheckBox();
+ this.check_userDefaultSettings = new System.Windows.Forms.CheckBox();
+ this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
- this.tab_debug = new System.Windows.Forms.TabPage();
- this.label3 = new System.Windows.Forms.Label();
+ this.tab_cli = new System.Windows.Forms.TabPage();
+ this.check_cli_minimized = new System.Windows.Forms.CheckBox();
+ this.label12 = new System.Windows.Forms.Label();
this.drp_Priority = new System.Windows.Forms.ComboBox();
this.Label11 = new System.Windows.Forms.Label();
this.drp_processors = new System.Windows.Forms.ComboBox();
this.Label4 = new System.Windows.Forms.Label();
+ this.tab_advanced = new System.Windows.Forms.TabPage();
+ this.btn_drive_detect = new System.Windows.Forms.CheckBox();
+ this.label6 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
- this.label7 = new System.Windows.Forms.Label();
this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();
- this.check_cli_minimized = new System.Windows.Forms.CheckBox();
- this.label12 = new System.Windows.Forms.Label();
+ this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
this.tab_options.SuspendLayout();
this.tab_general.SuspendLayout();
- this.tabPage1.SuspendLayout();
- this.tab_debug.SuspendLayout();
+ this.tab_cli.SuspendLayout();
+ this.tab_advanced.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout();
//
@@ -78,7 +77,7 @@ namespace Handbrake this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_close.Location = new System.Drawing.Point(320, 383);
+ this.btn_close.Location = new System.Drawing.Point(395, 344);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(107, 22);
this.btn_close.TabIndex = 53;
@@ -99,57 +98,110 @@ namespace Handbrake "Lock System",
"Log Off",
"Quit HandBrake"});
- this.drp_completeOption.Location = new System.Drawing.Point(193, 39);
+ this.drp_completeOption.Location = new System.Drawing.Point(114, 103);
this.drp_completeOption.Name = "drp_completeOption";
- this.drp_completeOption.Size = new System.Drawing.Size(111, 21);
+ this.drp_completeOption.Size = new System.Drawing.Size(166, 21);
this.drp_completeOption.TabIndex = 43;
+ this.ToolTip.SetToolTip(this.drp_completeOption, "Performs an action when an encode or queue has completed.");
this.drp_completeOption.SelectedIndexChanged += new System.EventHandler(this.drp_completeOption_SelectedIndexChanged);
//
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(14, 42);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(173, 13);
- this.label5.TabIndex = 42;
- this.label5.Text = "When the encode completes:";
- //
// tab_options
//
this.tab_options.Controls.Add(this.tab_general);
- this.tab_options.Controls.Add(this.tabPage1);
- this.tab_options.Controls.Add(this.tab_debug);
- this.tab_options.Location = new System.Drawing.Point(12, 63);
+ this.tab_options.Controls.Add(this.tab_cli);
+ this.tab_options.Controls.Add(this.tab_advanced);
+ this.tab_options.Location = new System.Drawing.Point(12, 55);
this.tab_options.Name = "tab_options";
this.tab_options.SelectedIndex = 0;
- this.tab_options.Size = new System.Drawing.Size(419, 314);
+ this.tab_options.Size = new System.Drawing.Size(490, 278);
this.tab_options.TabIndex = 58;
//
// tab_general
//
+ this.tab_general.Controls.Add(this.btn_browse);
+ this.tab_general.Controls.Add(this.label10);
+ this.tab_general.Controls.Add(this.text_an_path);
+ this.tab_general.Controls.Add(this.check_autoNaming);
+ this.tab_general.Controls.Add(this.label13);
this.tab_general.Controls.Add(this.check_tooltip);
this.tab_general.Controls.Add(this.check_updateCheck);
this.tab_general.Controls.Add(this.check_userDefaultSettings);
this.tab_general.Controls.Add(this.label1);
+ this.tab_general.Controls.Add(this.label2);
+ this.tab_general.Controls.Add(this.drp_completeOption);
this.tab_general.Location = new System.Drawing.Point(4, 22);
this.tab_general.Name = "tab_general";
- this.tab_general.Padding = new System.Windows.Forms.Padding(3);
- this.tab_general.Size = new System.Drawing.Size(411, 232);
- this.tab_general.TabIndex = 0;
- this.tab_general.Text = "Startup";
+ this.tab_general.Size = new System.Drawing.Size(482, 252);
+ this.tab_general.TabIndex = 3;
+ this.tab_general.Text = "General";
this.tab_general.UseVisualStyleBackColor = true;
//
+ // btn_browse
+ //
+ this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;
+ this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
+ this.btn_browse.Location = new System.Drawing.Point(386, 174);
+ this.btn_browse.Name = "btn_browse";
+ this.btn_browse.Size = new System.Drawing.Size(68, 22);
+ this.btn_browse.TabIndex = 78;
+ this.btn_browse.Text = "Browse";
+ this.btn_browse.UseVisualStyleBackColor = true;
+ this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label10.Location = new System.Drawing.Point(111, 177);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(82, 13);
+ this.label10.TabIndex = 77;
+ this.label10.Text = "Default Path:";
+ //
+ // text_an_path
+ //
+ this.text_an_path.Location = new System.Drawing.Point(199, 174);
+ this.text_an_path.Name = "text_an_path";
+ this.text_an_path.Size = new System.Drawing.Size(181, 21);
+ this.text_an_path.TabIndex = 76;
+ this.ToolTip.SetToolTip(this.text_an_path, "Default location where Auto named files are stored.");
+ this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);
+ //
+ // check_autoNaming
+ //
+ this.check_autoNaming.AutoSize = true;
+ this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_autoNaming.Location = new System.Drawing.Point(114, 151);
+ this.check_autoNaming.Name = "check_autoNaming";
+ this.check_autoNaming.Size = new System.Drawing.Size(340, 17);
+ this.check_autoNaming.TabIndex = 72;
+ this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)";
+ this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");
+ this.check_autoNaming.UseVisualStyleBackColor = true;
+ this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label13.Location = new System.Drawing.Point(10, 152);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(86, 13);
+ this.label13.TabIndex = 71;
+ this.label13.Text = "Output files:";
+ //
// check_tooltip
//
this.check_tooltip.AutoSize = true;
this.check_tooltip.BackColor = System.Drawing.Color.Transparent;
this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_tooltip.Location = new System.Drawing.Point(16, 56);
+ this.check_tooltip.Location = new System.Drawing.Point(114, 41);
this.check_tooltip.Name = "check_tooltip";
this.check_tooltip.Size = new System.Drawing.Size(135, 17);
- this.check_tooltip.TabIndex = 57;
+ this.check_tooltip.TabIndex = 70;
this.check_tooltip.Text = "Enable GUI tooltips";
+ this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls.");
this.check_tooltip.UseVisualStyleBackColor = false;
this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged);
//
@@ -158,11 +210,13 @@ namespace Handbrake this.check_updateCheck.AutoSize = true;
this.check_updateCheck.BackColor = System.Drawing.Color.Transparent;
this.check_updateCheck.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_updateCheck.Location = new System.Drawing.Point(16, 33);
+ this.check_updateCheck.Location = new System.Drawing.Point(114, 18);
this.check_updateCheck.Name = "check_updateCheck";
this.check_updateCheck.Size = new System.Drawing.Size(131, 17);
- this.check_updateCheck.TabIndex = 55;
+ this.check_updateCheck.TabIndex = 68;
this.check_updateCheck.Text = "Check for updates";
+ this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" +
+ " starts.");
this.check_updateCheck.UseVisualStyleBackColor = false;
this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged);
//
@@ -171,11 +225,12 @@ namespace Handbrake this.check_userDefaultSettings.AutoSize = true;
this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent;
this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 79);
+ this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 64);
this.check_userDefaultSettings.Name = "check_userDefaultSettings";
this.check_userDefaultSettings.Size = new System.Drawing.Size(166, 17);
- this.check_userDefaultSettings.TabIndex = 56;
+ this.check_userDefaultSettings.TabIndex = 69;
this.check_userDefaultSettings.Text = "Load my default settings";
+ this.ToolTip.SetToolTip(this.check_userDefaultSettings, "Loads the users default settings rather than the Normal preset.");
this.check_userDefaultSettings.UseVisualStyleBackColor = false;
this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged);
//
@@ -184,142 +239,59 @@ namespace Handbrake this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(13, 13);
+ this.label1.Location = new System.Drawing.Point(21, 19);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(76, 13);
- this.label1.TabIndex = 0;
- this.label1.Text = "On Startup";
- //
- // tabPage1
- //
- this.tabPage1.Controls.Add(this.check_cli_minimized);
- this.tabPage1.Controls.Add(this.label12);
- this.tabPage1.Controls.Add(this.btn_drive_detect);
- this.tabPage1.Controls.Add(this.label6);
- this.tabPage1.Controls.Add(this.btn_browse);
- this.tabPage1.Controls.Add(this.label10);
- this.tabPage1.Controls.Add(this.text_an_path);
- this.tabPage1.Controls.Add(this.check_autoNaming);
- this.tabPage1.Controls.Add(this.label9);
- this.tabPage1.Controls.Add(this.label2);
- this.tabPage1.Controls.Add(this.drp_completeOption);
- this.tabPage1.Controls.Add(this.label5);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
- this.tabPage1.Name = "tabPage1";
- this.tabPage1.Size = new System.Drawing.Size(411, 288);
- this.tabPage1.TabIndex = 3;
- this.tabPage1.Text = "General";
- this.tabPage1.UseVisualStyleBackColor = true;
- //
- // btn_drive_detect
- //
- this.btn_drive_detect.AutoSize = true;
- this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btn_drive_detect.Location = new System.Drawing.Point(17, 204);
- this.btn_drive_detect.Name = "btn_drive_detect";
- this.btn_drive_detect.Size = new System.Drawing.Size(383, 17);
- this.btn_drive_detect.TabIndex = 64;
- this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu";
- this.btn_drive_detect.UseVisualStyleBackColor = true;
- this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(14, 182);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(108, 13);
- this.label6.TabIndex = 63;
- this.label6.Text = "Drive Detection";
- //
- // btn_browse
- //
- this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;
- this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_browse.Location = new System.Drawing.Point(326, 146);
- this.btn_browse.Name = "btn_browse";
- this.btn_browse.Size = new System.Drawing.Size(68, 22);
- this.btn_browse.TabIndex = 62;
- this.btn_browse.Text = "Browse";
- this.btn_browse.UseVisualStyleBackColor = true;
- this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click);
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(14, 131);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(145, 13);
- this.label10.TabIndex = 61;
- this.label10.Text = "Default AutoName Path:";
- //
- // text_an_path
- //
- this.text_an_path.Location = new System.Drawing.Point(17, 147);
- this.text_an_path.Name = "text_an_path";
- this.text_an_path.Size = new System.Drawing.Size(303, 21);
- this.text_an_path.TabIndex = 60;
- this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);
- //
- // check_autoNaming
- //
- this.check_autoNaming.AutoSize = true;
- this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_autoNaming.Location = new System.Drawing.Point(17, 101);
- this.check_autoNaming.Name = "check_autoNaming";
- this.check_autoNaming.Size = new System.Drawing.Size(340, 17);
- this.check_autoNaming.TabIndex = 56;
- this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)";
- this.check_autoNaming.UseVisualStyleBackColor = true;
- this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);
- //
- // label9
- //
- this.label9.AutoSize = true;
- this.label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label9.Location = new System.Drawing.Point(14, 78);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(90, 13);
- this.label9.TabIndex = 55;
- this.label9.Text = "Auto Naming";
+ this.label1.Size = new System.Drawing.Size(75, 13);
+ this.label1.TabIndex = 67;
+ this.label1.Text = "At Launch:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label2.Location = new System.Drawing.Point(14, 19);
+ this.label2.Location = new System.Drawing.Point(12, 106);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(80, 13);
+ this.label2.Size = new System.Drawing.Size(84, 13);
this.label2.TabIndex = 54;
- this.label2.Text = "When Done";
- //
- // tab_debug
- //
- this.tab_debug.Controls.Add(this.label3);
- this.tab_debug.Controls.Add(this.drp_Priority);
- this.tab_debug.Controls.Add(this.Label11);
- this.tab_debug.Controls.Add(this.drp_processors);
- this.tab_debug.Controls.Add(this.Label4);
- this.tab_debug.Location = new System.Drawing.Point(4, 22);
- this.tab_debug.Name = "tab_debug";
- this.tab_debug.Size = new System.Drawing.Size(411, 232);
- this.tab_debug.TabIndex = 2;
- this.tab_debug.Text = "Performance";
- this.tab_debug.UseVisualStyleBackColor = true;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(13, 13);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(176, 13);
- this.label3.TabIndex = 44;
- this.label3.Text = "Process(or) Configuration";
+ this.label2.Text = "When Done:";
+ //
+ // tab_cli
+ //
+ this.tab_cli.Controls.Add(this.check_cli_minimized);
+ this.tab_cli.Controls.Add(this.label12);
+ this.tab_cli.Controls.Add(this.drp_Priority);
+ this.tab_cli.Controls.Add(this.Label11);
+ this.tab_cli.Controls.Add(this.drp_processors);
+ this.tab_cli.Controls.Add(this.Label4);
+ this.tab_cli.Location = new System.Drawing.Point(4, 22);
+ this.tab_cli.Name = "tab_cli";
+ this.tab_cli.Size = new System.Drawing.Size(482, 252);
+ this.tab_cli.TabIndex = 2;
+ this.tab_cli.Text = "CLI";
+ this.tab_cli.UseVisualStyleBackColor = true;
+ //
+ // check_cli_minimized
+ //
+ this.check_cli_minimized.AutoSize = true;
+ this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.check_cli_minimized.Location = new System.Drawing.Point(71, 18);
+ this.check_cli_minimized.Name = "check_cli_minimized";
+ this.check_cli_minimized.Size = new System.Drawing.Size(155, 17);
+ this.check_cli_minimized.TabIndex = 76;
+ this.check_cli_minimized.Text = "Use window minimized";
+ this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized.");
+ this.check_cli_minimized.UseVisualStyleBackColor = true;
+ this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label12.Location = new System.Drawing.Point(21, 19);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(32, 13);
+ this.label12.TabIndex = 75;
+ this.label12.Text = "CLI:";
//
// drp_Priority
//
@@ -333,10 +305,12 @@ namespace Handbrake "Normal",
"Below Normal",
"Low"});
- this.drp_Priority.Location = new System.Drawing.Point(163, 68);
+ this.drp_Priority.Location = new System.Drawing.Point(177, 72);
this.drp_Priority.Name = "drp_Priority";
this.drp_Priority.Size = new System.Drawing.Size(111, 21);
this.drp_Priority.TabIndex = 43;
+ this.ToolTip.SetToolTip(this.drp_Priority, "Set the application priority level for the CLI. \r\nIt\'s best to leave this on Belo" +
+ "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n");
this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);
//
// Label11
@@ -344,11 +318,11 @@ namespace Handbrake this.Label11.AutoSize = true;
this.Label11.BackColor = System.Drawing.Color.Transparent;
this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label11.Location = new System.Drawing.Point(15, 44);
+ this.Label11.Location = new System.Drawing.Point(68, 48);
this.Label11.Name = "Label11";
- this.Label11.Size = new System.Drawing.Size(142, 13);
+ this.Label11.Size = new System.Drawing.Size(103, 13);
this.Label11.TabIndex = 40;
- this.Label11.Text = "Number of processors: ";
+ this.Label11.Text = "Processor cores:";
//
// drp_processors
//
@@ -365,10 +339,12 @@ namespace Handbrake "6",
"7",
"8"});
- this.drp_processors.Location = new System.Drawing.Point(163, 41);
+ this.drp_processors.Location = new System.Drawing.Point(177, 45);
this.drp_processors.Name = "drp_processors";
this.drp_processors.Size = new System.Drawing.Size(111, 21);
this.drp_processors.TabIndex = 41;
+ this.ToolTip.SetToolTip(this.drp_processors, "The number of processor\'s / processor cores. Unless your having problems, leave o" +
+ "n Automatic.");
this.drp_processors.SelectedIndexChanged += new System.EventHandler(this.drp_processors_SelectedIndexChanged);
//
// Label4
@@ -376,11 +352,47 @@ namespace Handbrake this.Label4.AutoSize = true;
this.Label4.BackColor = System.Drawing.Color.Transparent;
this.Label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label4.Location = new System.Drawing.Point(15, 71);
+ this.Label4.Location = new System.Drawing.Point(68, 75);
this.Label4.Name = "Label4";
- this.Label4.Size = new System.Drawing.Size(132, 13);
+ this.Label4.Size = new System.Drawing.Size(84, 13);
this.Label4.TabIndex = 42;
- this.Label4.Text = "Default Priority Level:";
+ this.Label4.Text = "Priority level:";
+ //
+ // tab_advanced
+ //
+ this.tab_advanced.Controls.Add(this.btn_drive_detect);
+ this.tab_advanced.Controls.Add(this.label6);
+ this.tab_advanced.Location = new System.Drawing.Point(4, 22);
+ this.tab_advanced.Name = "tab_advanced";
+ this.tab_advanced.Padding = new System.Windows.Forms.Padding(3);
+ this.tab_advanced.Size = new System.Drawing.Size(482, 252);
+ this.tab_advanced.TabIndex = 4;
+ this.tab_advanced.Text = "Advanced";
+ this.tab_advanced.UseVisualStyleBackColor = true;
+ //
+ // btn_drive_detect
+ //
+ this.btn_drive_detect.AutoSize = true;
+ this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_drive_detect.Location = new System.Drawing.Point(62, 19);
+ this.btn_drive_detect.Name = "btn_drive_detect";
+ this.btn_drive_detect.Size = new System.Drawing.Size(383, 17);
+ this.btn_drive_detect.TabIndex = 72;
+ this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu";
+ this.ToolTip.SetToolTip(this.btn_drive_detect, "Enables the Source button\'s ability to detect DVD\'s.\r\nIf this option is enabled, " +
+ "DVD\'s will be listed in the source menu.");
+ this.btn_drive_detect.UseVisualStyleBackColor = true;
+ this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged);
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label6.Location = new System.Drawing.Point(21, 19);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(35, 13);
+ this.label6.TabIndex = 71;
+ this.label6.Text = "GUI:";
//
// label8
//
@@ -401,41 +413,16 @@ namespace Handbrake this.pictureBox2.TabIndex = 60;
this.pictureBox2.TabStop = false;
//
- // label7
+ // ToolTip
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(50, 39);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(146, 13);
- this.label7.TabIndex = 59;
- this.label7.Text = "Modify program options.";
- //
- // check_cli_minimized
- //
- this.check_cli_minimized.AutoSize = true;
- this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.check_cli_minimized.Location = new System.Drawing.Point(17, 257);
- this.check_cli_minimized.Name = "check_cli_minimized";
- this.check_cli_minimized.Size = new System.Drawing.Size(138, 17);
- this.check_cli_minimized.TabIndex = 66;
- this.check_cli_minimized.Text = "Start CLI Minimized";
- this.check_cli_minimized.UseVisualStyleBackColor = true;
- this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged);
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label12.Location = new System.Drawing.Point(14, 235);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(28, 13);
- this.label12.TabIndex = 65;
- this.label12.Text = "CLI";
+ this.ToolTip.Active = false;
+ this.ToolTip.AutomaticDelay = 1000;
+ this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
+ this.ToolTip.ToolTipTitle = "Tooltip";
//
// frmOptions
//
- this.ClientSize = new System.Drawing.Size(443, 412);
- this.Controls.Add(this.label7);
+ this.ClientSize = new System.Drawing.Size(521, 374);
this.Controls.Add(this.label8);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.tab_options);
@@ -451,10 +438,10 @@ namespace Handbrake this.tab_options.ResumeLayout(false);
this.tab_general.ResumeLayout(false);
this.tab_general.PerformLayout();
- this.tabPage1.ResumeLayout(false);
- this.tabPage1.PerformLayout();
- this.tab_debug.ResumeLayout(false);
- this.tab_debug.PerformLayout();
+ this.tab_cli.ResumeLayout(false);
+ this.tab_cli.PerformLayout();
+ this.tab_advanced.ResumeLayout(false);
+ this.tab_advanced.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -465,33 +452,31 @@ namespace Handbrake internal System.Windows.Forms.Button btn_close;
internal System.Windows.Forms.ComboBox drp_completeOption;
- internal System.Windows.Forms.Label label5;
private System.Windows.Forms.TabControl tab_options;
- private System.Windows.Forms.TabPage tab_general;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label1;
- internal System.Windows.Forms.CheckBox check_tooltip;
- internal System.Windows.Forms.CheckBox check_updateCheck;
- internal System.Windows.Forms.CheckBox check_userDefaultSettings;
- private System.Windows.Forms.TabPage tab_debug;
+ private System.Windows.Forms.TabPage tab_cli;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.PictureBox pictureBox2;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.TabPage tabPage1;
- private System.Windows.Forms.Label label9;
- internal System.Windows.Forms.CheckBox check_autoNaming;
- private System.Windows.Forms.TextBox text_an_path;
- internal System.Windows.Forms.Button btn_browse;
- internal System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TabPage tab_general;
private System.Windows.Forms.FolderBrowserDialog pathFinder;
- private System.Windows.Forms.Label label3;
internal System.Windows.Forms.ComboBox drp_Priority;
internal System.Windows.Forms.Label Label11;
internal System.Windows.Forms.Label Label4;
internal System.Windows.Forms.ComboBox drp_processors;
+ internal System.Windows.Forms.CheckBox check_tooltip;
+ internal System.Windows.Forms.CheckBox check_updateCheck;
+ internal System.Windows.Forms.CheckBox check_userDefaultSettings;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TabPage tab_advanced;
internal System.Windows.Forms.CheckBox btn_drive_detect;
private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label13;
+ internal System.Windows.Forms.Button btn_browse;
+ internal System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TextBox text_an_path;
+ internal System.Windows.Forms.CheckBox check_autoNaming;
internal System.Windows.Forms.CheckBox check_cli_minimized;
private System.Windows.Forms.Label label12;
+ internal System.Windows.Forms.ToolTip ToolTip;
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 66e5460d5..a314046e4 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -16,45 +16,41 @@ namespace Handbrake {
public partial class frmOptions : Form
{
+ private frmMain mainWindow;
/// <summary>
/// When the form loads, Initialise all the setting components with their correct values
/// </summary>
- public frmOptions()
+ public frmOptions(frmMain window)
{
InitializeComponent();
+ mainWindow = window;
+
+ // Enable Tooltips.
+ if (Properties.Settings.Default.tooltipEnable == "Checked")
+ ToolTip.Active = true;
+ // Setup Widgets to match settings.
if (Properties.Settings.Default.updateStatus == "Checked")
- {
check_updateCheck.CheckState = CheckState.Checked;
- }
if (Properties.Settings.Default.defaultSettings == "Checked")
- {
check_userDefaultSettings.CheckState = CheckState.Checked;
- }
+
drp_processors.Text = Properties.Settings.Default.Processors;
drp_Priority.Text = Properties.Settings.Default.processPriority;
drp_completeOption.Text = Properties.Settings.Default.CompletionOption;
if (Properties.Settings.Default.tooltipEnable == "Checked")
- {
check_tooltip.CheckState = CheckState.Checked;
- }
if (Properties.Settings.Default.autoNaming == "Checked")
- {
check_autoNaming.CheckState = CheckState.Checked;
- }
if (Properties.Settings.Default.drive_detection == "Checked")
- {
btn_drive_detect.CheckState = CheckState.Checked;
- }
if (Properties.Settings.Default.cli_minimized == "Checked")
- {
check_cli_minimized.CheckState = CheckState.Checked;
- }
text_an_path.Text = Properties.Settings.Default.autoNamePath;
@@ -92,6 +88,16 @@ namespace Handbrake private void check_tooltip_CheckedChanged(object sender, EventArgs e)
{
Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();
+ if (check_tooltip.Checked)
+ {
+ ToolTip.Active = true;
+ mainWindow.ToolTip.Active = true;
+ }
+ else
+ {
+ ToolTip.Active = false;
+ mainWindow.ToolTip.Active = false;
+ }
}
private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)
@@ -132,5 +138,6 @@ namespace Handbrake }
#endregion
+
}
}
\ No newline at end of file diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx index 49352476c..74bf18620 100644 --- a/win/C#/frmOptions.resx +++ b/win/C#/frmOptions.resx @@ -117,6 +117,9 @@ <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>132, 18</value>
+ </metadata>
<metadata name="pathFinder.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
|
