WinGui: Initial set of new icons implemented.

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

21 files changed, 9 insertions, 11 deletions

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 17eec09d0..9a7a3fc03 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -377,6 +377,8 @@
     <Content Include="defaultsettings.xml">

       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

+    <Resource Include="Views\Images\information.png" />

+    <Resource Include="Views\Images\picture_small.png" />

     <None Include="Resources\logo64.png" />

     <Resource Include="Views\Images\warningsmall.png" />

     <Resource Include="Views\Images\Refresh.ico" />

@@ -400,7 +402,6 @@
     <Resource Include="Views\Images\Queue.png" />

     <Resource Include="Views\Images\Queue_Small.png" />

     <Resource Include="Views\Images\stop.png" />

-    <Resource Include="Views\Images\save.png" />

     <Resource Include="Views\Images\Play_small.png" />

     <Resource Include="Views\Images\Play.png" />

     <Resource Include="Views\Images\picture.png" />

@@ -408,9 +409,6 @@
     <Resource Include="Views\Images\Movies.png" />

     <Resource Include="Views\Images\logo64.png" />

     <Resource Include="Views\Images\logo128.png" />

-    <Resource Include="Views\Images\Help16.png" />

-    <Resource Include="Views\Images\hb32.png" />

-    <Resource Include="Views\Images\hb16.png" />

     <Resource Include="Views\Images\Preferences.png" />

     <Resource Include="Views\Images\folder.png" />

     <Resource Include="Views\Images\ErrorX.png" />

diff --git a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
index 315e0fa17..9a6157f82 100644
--- a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
+++ b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
index 916b6ef4a..a2de1eead 100644
--- a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png b/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png
index 8eb079b3d..af00717cd 100644
--- a/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png
+++ b/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png b/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png
index 5bb08184f..ca33264cc 100644
--- a/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/ErrorX.png b/win/CS/HandBrakeWPF/Views/Images/ErrorX.png
index 75c63c08a..e4e3262e9 100644
--- a/win/CS/HandBrakeWPF/Views/Images/ErrorX.png
+++ b/win/CS/HandBrakeWPF/Views/Images/ErrorX.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Help16.png b/win/CS/HandBrakeWPF/Views/Images/Help16.png
deleted file mode 100644
index bb5ef99ce..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Help16.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Movies.png b/win/CS/HandBrakeWPF/Views/Images/Movies.png
index ec03eb576..a212d4e58 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Movies.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Movies.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Output_Small.png b/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
index a1017d6fb..a2de1eead 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png b/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png
index a28fb5b27..c188b7603 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Preferences.png b/win/CS/HandBrakeWPF/Views/Images/Preferences.png
index 9814afcc1..350f4bfd5 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Preferences.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Preferences.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Queue.png b/win/CS/HandBrakeWPF/Views/Images/Queue.png
index 51962a1b0..2cbe097e1 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Queue.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Queue.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png b/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png
index 02c7391a9..ffcb4d70a 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/disc_small.png b/win/CS/HandBrakeWPF/Views/Images/disc_small.png
index dca0ad228..74465ef5a 100644
--- a/win/CS/HandBrakeWPF/Views/Images/disc_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/disc_small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/hb16.png b/win/CS/HandBrakeWPF/Views/Images/hb16.png
deleted file mode 100644
index 085966ffc..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/hb16.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/hb32.png b/win/CS/HandBrakeWPF/Views/Images/hb32.png
deleted file mode 100644
index 2a76f9566..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/hb32.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/information.png b/win/CS/HandBrakeWPF/Views/Images/information.png
new file mode 100644
index 000000000..1afd76a36
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/information.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/picture.png b/win/CS/HandBrakeWPF/Views/Images/picture.png
index 0072ccfb6..aa639d55a 100644
--- a/win/CS/HandBrakeWPF/Views/Images/picture.png
+++ b/win/CS/HandBrakeWPF/Views/Images/picture.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/picture_small.png b/win/CS/HandBrakeWPF/Views/Images/picture_small.png
new file mode 100644
index 000000000..d062caffa
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/picture_small.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/save.png b/win/CS/HandBrakeWPF/Views/Images/save.png
deleted file mode 100644
index 40885d2d3..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/save.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index c051786af..78c437eb4 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -122,7 +122,7 @@
                 <MenuItem Header="Help">

                     <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">

                         <MenuItem.Icon>

-                            <Image Width="16" Source="Images/Help16.png" />

+                            <Image Width="16" Height="16"  Source="Images/information.png" />

                         </MenuItem.Icon>

                     </MenuItem>

                     <Separator />

@@ -226,7 +226,7 @@
                                         <Image Width="32"

                                                Height="32"

                                                SnapsToDevicePixels="True"

-                                               Source="Images/AddToQueue.png"

+                                               Source="Images/AddToQueue_small.png"

                                                />

                                         <Label Margin="8,0,0,0"

                                                VerticalAlignment="Center"

@@ -277,7 +277,7 @@
                         <Image Width="32"

                                Height="32"

                                SnapsToDevicePixels="True"

-                               Source="Images/Queue.png"

+                               Source="Images/Queue_small.png"

                                />

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

@@ -293,7 +293,7 @@
                         <Image Width="32"

                                Height="32"

                                SnapsToDevicePixels="True"

-                               Source="Images/window.png"

+                               Source="Images/picture_small.png"

                                />

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

@@ -321,7 +321,7 @@
         <Grid Grid.Row="1">

             <Grid.ColumnDefinitions>

                 <ColumnDefinition Width="*" />

-                <ColumnDefinition Width="260" />

+                <ColumnDefinition Width="270" />

             </Grid.ColumnDefinitions>

             <Grid.RowDefinitions>

                 <RowDefinition Height="Auto" />

@@ -584,8 +584,8 @@
                             <MenuItem ToolBar.OverflowMode="Never">

                                 <MenuItem.Header>

                                     <StackPanel Orientation="Horizontal">

-                                        <Image Width="16"

-                                               Height="16"

+                                        <Image Width="20"

+                                               Height="20"

                                                Source="Images/Options24.png"

                                                />

                                         <TextBlock Margin="2,0,0,0"