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

2 files changed, 93 insertions, 4 deletions

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