WinGui:

- Added an Activity window which can view a verbose log from the CLI after an encode has completed. (it would be nice if someone could find a way of making this live!)
- The main GUI window now has an icon based toolbar similar to the macGUI instead of having standard buttons along the bottom for Encode and Queue.
- Some of the controls on the Options panel have had transparent backgrounds added so they don't look out of place on theme'd computers.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1181 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 22 insertions, 24 deletions

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 0b717dcc4..ff3fd0b26 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -1,10 +1,4 @@
-/*  Resources.Designer.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.m0k.org/>.

- 	   It may be used under the terms of the GNU General Public License. */

-

-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

 //     Runtime Version:2.0.50727.1433

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

         }

         

+        internal static System.Drawing.Bitmap AddToQueue {

+            get {

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

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

+            }

+        }

+        

         internal static System.Drawing.Bitmap Delete {

             get {

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

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index 37de7b238..081c86c1e 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -124,15 +124,9 @@
   <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="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>

   <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="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="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>

@@ -148,6 +142,15 @@
   <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>

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

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

   </data>

@@ -169,13 +172,13 @@
   <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="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 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>

-  <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 name="AddToQueue" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\AddToQueue.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#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index a6190cca6..607a238e5 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,10 +1,4 @@
-/*  Settings.Designer.cs $

- 	

- 	   This file is part of the HandBrake source code.

- 	   Homepage: <http://handbrake.m0k.org/>.

- 	   It may be used under the terms of the GNU General Public License. */

-

-//------------------------------------------------------------------------------

+//------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

 //     Runtime Version:2.0.50727.1433