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

3 files changed, 33 insertions, 53 deletions

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