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://svn.handbrake.fr/HandBrake/trunk@3291 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 130 insertions, 45 deletions

diff --git a/win/C#/HandBrakeCS.sln b/win/C#/HandBrakeCS.sln
index bde8c131b..fcda37ea8 100644
--- 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

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HBEngine", "HBEngine\HBEngine.csproj", "{AB2ACEE2-F530-42C1-AAF4-130FA782B231}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Any CPU = Debug|Any CPU

@@ -31,6 +33,18 @@ Global
 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86

 		{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Debug|x86.ActiveCfg = Debug|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Install|Any CPU.ActiveCfg = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Install|Any CPU.Build.0 = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Install|x86.ActiveCfg = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.NightlyBuild|Any CPU.ActiveCfg = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.NightlyBuild|Any CPU.Build.0 = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.NightlyBuild|x86.ActiveCfg = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Release|Any CPU.Build.0 = Release|Any CPU

+		{AB2ACEE2-F530-42C1-AAF4-130FA782B231}.Release|x86.ActiveCfg = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 65b127d23..0a1aa80ac 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:4.0.30128.1

+//     Runtime Version:2.0.50727.4927

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -19,7 +19,7 @@ namespace Handbrake.Properties {
     // class via a tool like ResGen or Visual Studio.

     // To add or remove a member, edit your .ResX file then rerun ResGen

     // with the /str option, or rebuild your VS project.

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

     internal class Resources {

@@ -74,6 +74,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Add {

+            get {

+                object obj = ResourceManager.GetObject("Add", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap AddToQueue {

             get {

                 object obj = ResourceManager.GetObject("AddToQueue", resourceCulture);

@@ -88,6 +95,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Bat {

+            get {

+                object obj = ResourceManager.GetObject("Bat", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap copy {

             get {

                 object obj = ResourceManager.GetObject("copy", resourceCulture);

@@ -95,6 +109,13 @@ 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_small {

             get {

                 object obj = ResourceManager.GetObject("disc_small", resourceCulture);

@@ -102,6 +123,20 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Down {

+            get {

+                object obj = ResourceManager.GetObject("Down", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

+        internal static System.Drawing.Bitmap Down2 {

+            get {

+                object obj = ResourceManager.GetObject("Down2", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap Download {

             get {

                 object obj = ResourceManager.GetObject("Download", resourceCulture);

@@ -109,6 +144,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Edit {

+            get {

+                object obj = ResourceManager.GetObject("Edit", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap folder {

             get {

                 object obj = ResourceManager.GetObject("folder", resourceCulture);

@@ -235,6 +277,20 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Refresh {

+            get {

+                object obj = ResourceManager.GetObject("Refresh", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

+        internal static System.Drawing.Bitmap Restore {

+            get {

+                object obj = ResourceManager.GetObject("Restore", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap save {

             get {

                 object obj = ResourceManager.GetObject("save", resourceCulture);

@@ -256,6 +312,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap Up {

+            get {

+                object obj = ResourceManager.GetObject("Up", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap window {

             get {

                 object obj = ResourceManager.GetObject("window", resourceCulture);

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index bb7f7bc02..64e4a37ab 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="General_Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

@@ -202,8 +202,34 @@
   <data name="Play_small" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\Play_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="Download" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

+  <data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Bat" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Bat.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="Down" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Down2" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Down2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Edit" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Restore" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Restore.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

+  <data name="Up" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\Up.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/folder.png b/win/C#/Resources/folder.png
index 41fa2c693..a54316ea6 100644
--- a/win/C#/Resources/folder.png
+++ b/win/C#/Resources/folder.png
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 475635027..dfff15a6a 100644
--- 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();

             this.check_iPodAtom = new System.Windows.Forms.CheckBox();

             this.data_chpt = new System.Windows.Forms.DataGridView();

+            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();

+            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();

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

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

             this.btn_addPreset = new System.Windows.Forms.Button();

@@ -171,8 +173,6 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();

             this.openPreset = new System.Windows.Forms.OpenFileDialog();

             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();

-            this.number = new System.Windows.Forms.DataGridViewTextBoxColumn();

-            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();

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

             notifyIconMenu.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

@@ -395,6 +395,24 @@ namespace Handbrake
             this.data_chpt.TabIndex = 3;

             this.ToolTip.SetToolTip(this.data_chpt, resources.GetString("data_chpt.ToolTip"));

             // 

+            // number

+            // 

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            this.number.Frozen = true;

+            this.number.HeaderText = "Chapter Number";

+            this.number.MaxInputLength = 3;

+            this.number.Name = "number";

+            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;

+            this.number.Width = 165;

+            // 

+            // name

+            // 

+            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;

+            this.name.HeaderText = "Chapter Name";

+            this.name.Name = "name";

+            // 

             // ChaptersMenu

             // 

             this.ChaptersMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

@@ -1288,7 +1306,7 @@ namespace Handbrake
             // 

             // btn_dvd_source

             // 

-            this.btn_dvd_source.Image = ((System.Drawing.Image)(resources.GetObject("btn_dvd_source.Image")));

+            this.btn_dvd_source.Image = global::Handbrake.Properties.Resources.folder;

             this.btn_dvd_source.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.btn_dvd_source.Name = "btn_dvd_source";

             this.btn_dvd_source.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)

@@ -1621,24 +1639,6 @@ namespace Handbrake
             // 

             this.File_ChapterImport.Filter = "CSV Files|*.csv";

             // 

-            // number

-            // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

-            this.number.Frozen = true;

-            this.number.HeaderText = "Chapter Number";

-            this.number.MaxInputLength = 3;

-            this.number.Name = "number";

-            this.number.Resizable = System.Windows.Forms.DataGridViewTriState.False;

-            this.number.Width = 165;

-            // 

-            // name

-            // 

-            this.name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;

-            this.name.HeaderText = "Chapter Name";

-            this.name.Name = "name";

-            // 

             // frmMain

             // 

             this.AllowDrop = true;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bfa405412..cd804087c 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -994,8 +994,6 @@ namespace Handbrake
             this.Activate();

             this.WindowState = FormWindowState.Normal;

             notifyIcon.Visible = false;

-

-            this.StartScan(null, 2);

         }

 

         #endregion

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 5ea49074f..7f7acfbab 100644
--- 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">

     <value>767, 15</value>

   </metadata>

-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-  <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-    <value>

-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp

-        olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc

-        8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5

-        u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc

-        08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3

-        DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i

-        l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM

-        PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/

-        hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU

-        pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp

-        41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC

-</value>

-  </data>

   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>871, 15</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

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 89303b6cb..049cf40dc 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -407,7 +407,7 @@ namespace Handbrake
         /// </param>

         private void MnuEditClick(object sender, EventArgs e)

         {

-            if (list_queue.SelectedIndices != null)

+            if (list_queue.SelectedIndices != null && list_queue.SelectedIndices.Count != 0)

             {

                 lock (queue)

                 {