WinGui:

- Fixed Exception on restoring window from system tray
- Fixed Exception when trying to edit an item on the queue without first selecting an icon
- Replaced old folder icon on the source menu with the newer windows equiv

git-svn-id: svn://localhost/HandBrake/trunk@3291 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.sln b/win/C#/HandBrakeCS.sln
index bde8c13..fcda37e 100644 (file)
--- a/win/C#/HandBrakeCS.sln
+++ b/win/C#/HandBrakeCS.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}"\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HBEngine", "HBEngine\HBEngine.csproj", "{AB2ACEE2-F530-42C1-AAF4-130FA782B231}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
@@ -31,6 +33,18 @@ Global
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Debug|x86.ActiveCfg = Debug|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Install|Any CPU.ActiveCfg = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Install|Any CPU.Build.0 = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Install|x86.ActiveCfg = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.NightlyBuild|Any CPU.ActiveCfg = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.NightlyBuild|Any CPU.Build.0 = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.NightlyBuild|x86.ActiveCfg = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Release|x86.ActiveCfg = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 65b127d..0a1aa80 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30128.1\r
+//     Runtime Version:2.0.50727.4927\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -19,7 +19,7 @@ namespace Handbrake.Properties {
     // class via a tool like ResGen or Visual Studio.\r
     // To add or remove a member, edit your .ResX file then rerun ResGen\r
     // with the /str option, or rebuild your VS project.\r
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]\r
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]\r
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]\r
     internal class Resources {\r
@@ -74,6 +74,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Add {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Add", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap AddToQueue {\r
             get {\r
                 object obj = ResourceManager.GetObject("AddToQueue", resourceCulture);\r
@@ -88,6 +95,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Bat {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Bat", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap copy {\r
             get {\r
                 object obj = ResourceManager.GetObject("copy", resourceCulture);\r
@@ -95,6 +109,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Delete {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Delete", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap disc_small {\r
             get {\r
                 object obj = ResourceManager.GetObject("disc_small", resourceCulture);\r
@@ -102,6 +123,20 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Down {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Down", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        internal static System.Drawing.Bitmap Down2 {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Down2", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap Download {\r
             get {\r
                 object obj = ResourceManager.GetObject("Download", resourceCulture);\r
@@ -109,6 +144,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Edit {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Edit", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap folder {\r
             get {\r
                 object obj = ResourceManager.GetObject("folder", resourceCulture);\r
@@ -235,6 +277,20 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Refresh {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Refresh", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        internal static System.Drawing.Bitmap Restore {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Restore", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap save {\r
             get {\r
                 object obj = ResourceManager.GetObject("save", resourceCulture);\r
@@ -256,6 +312,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Up {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Up", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap window {\r
             get {\r
                 object obj = ResourceManager.GetObject("window", resourceCulture);\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index bb7f7bc..64e4a37 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
   <data name="General_Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
@@ -202,8 +202,34 @@
   <data name="Play_small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Play_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
   <data name="Download" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Bat" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Bat.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Down" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Down2" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Down2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Restore" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Restore.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Up" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/Resources/folder.png b/win/C#/Resources/folder.png
index 41fa2c6..a54316e 100644 (file)
Binary files a/win/C#/Resources/folder.png and b/win/C#/Resources/folder.png differ

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 4756350..dfff15a 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -55,6 +55,8 @@ namespace Handbrake
             this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
             this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.data_chpt = new System.Windows.Forms.DataGridView();\r
+            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();\r
             this.btn_addPreset = new System.Windows.Forms.Button();\r
@@ -171,8 +173,6 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -395,6 +395,24 @@ namespace Handbrake
             this.data_chpt.TabIndex = 3;\r
             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));\r
             // \r
+            // number\r
+            // \r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            this.number.Frozen = true;\r
+            this.number.HeaderText = "Chapter Number";\r
+            this.number.MaxInputLength = 3;\r
+            this.number.Name = "number";\r
+            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.number.Width = 165;\r
+            // \r
+            // name\r
+            // \r
+            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
+            this.name.HeaderText = "Chapter Name";\r
+            this.name.Name = "name";\r
+            // \r
             // ChaptersMenu\r
             // \r
             this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
@@ -1288,7 +1306,7 @@ namespace Handbrake
             // \r
             // btn_dvd_source\r
             // \r
-            this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));\r
+            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;\r
             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_dvd_source.Name = "btn_dvd_source";\r
             this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)\r
@@ -1621,24 +1639,6 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // number\r
-            // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
-            this.number.Frozen = true;\r
-            this.number.HeaderText = "Chapter Number";\r
-            this.number.MaxInputLength = 3;\r
-            this.number.Name = "number";\r
-            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.number.Width = 165;\r
-            // \r
-            // name\r
-            // \r
-            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
-            this.name.HeaderText = "Chapter Name";\r
-            this.name.Name = "name";\r
-            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bfa4054..cd80408 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -994,8 +994,6 @@ namespace Handbrake
             this.Activate();\r
             this.WindowState = FormWindowState.Normal;\r
             notifyIcon.Visible = false;\r
-\r
-            this.StartScan(null, 2);\r
         }\r
 \r
         #endregion\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 5ea4907..7f7acfb 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -185,26 +185,10 @@ Note: Commas in names are escaped by a \</value>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>767, 15</value>\r
   </metadata>\r
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
-  <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp\r
-        olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc\r
-        8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5\r
-        u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc\r
-        08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3\r
-        DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i\r
-        l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM\r
-        PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/\r
-        hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU\r
-        pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp\r
-        41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC\r
-</value>\r
-  </data>\r
   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>871, 15</value>\r
   </metadata>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 89303b6..049cf40 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -407,7 +407,7 @@ namespace Handbrake
         /// </param>\r
         private void MnuEditClick(object sender, EventArgs e)\r
         {\r
-            if (list_queue.SelectedIndices != null)\r
+            if (list_queue.SelectedIndices != null && list_queue.SelectedIndices.Count != 0)\r
             {\r
                 lock (queue)\r
                 {\r