From 67b87324c671c0b6d16a8c3b70f1575dd7d2ec7e Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Wed, 1 Jun 2016 01:42:37 +0200
Subject: [PATCH] Theme tweaks

---
 Artemis/Artemis/App.xaml                         |  3 ++-
 .../Artemis/Styles/Accents/CorsairYellow.xaml    |  4 ++--
 .../Profiles/ProfileEditorViewModel.cs           | 16 ++++++++++++++++
 .../Views/Flyouts/FlyoutSettingsView.xaml        |  2 +-
 Artemis/Artemis/Views/ShellView.xaml             | 16 ++++++++++++----
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Artemis/Artemis/App.xaml b/Artemis/Artemis/App.xaml
index 0adfe9d47..7acc3be4c 100644
--- a/Artemis/Artemis/App.xaml
+++ b/Artemis/Artemis/App.xaml
@@ -16,7 +16,8 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
                 <!-- Accent and AppTheme setting -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Teal.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
+                <ResourceDictionary
+                    Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <ResourceDictionary Source="/Resources/Icons.xaml" />
                 <ResourceDictionary Source="Styles/ColorBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
diff --git a/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml b/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml
index 47be7f224..5dceebc18 100644
--- a/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml
+++ b/Artemis/Artemis/Styles/Accents/CorsairYellow.xaml
@@ -24,7 +24,7 @@
     <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
     <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource AccentColor4}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="#f0cf1e" options:Freeze="True" />
 
     <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5" options:Freeze="True">
         <GradientStop Color="{StaticResource HighlightColor}" Offset="0" />
@@ -34,7 +34,7 @@
     <SolidColorBrush x:Key="CheckmarkFill" Color="{StaticResource AccentColor}" options:Freeze="True" />
     <SolidColorBrush x:Key="RightArrowFill" Color="{StaticResource AccentColor}" options:Freeze="True" />
 
-    <Color x:Key="IdealForegroundColor">White</Color>
+    <Color x:Key="IdealForegroundColor">#222222</Color>
     <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{StaticResource IdealForegroundColor}"
                      options:Freeze="True" />
     <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{StaticResource IdealForegroundColor}" Opacity="0.4"
diff --git a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
index 1cfb5d850..1fc6b8911 100644
--- a/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
+++ b/Artemis/Artemis/ViewModels/Profiles/ProfileEditorViewModel.cs
@@ -3,9 +3,13 @@ using System.Dynamic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using Artemis.DAL;
 using Artemis.DeviceProviders;
 using Artemis.Events;
@@ -19,6 +23,7 @@ using Caliburn.Micro;
 using GongSolutions.Wpf.DragDrop;
 using MahApps.Metro.Controls.Dialogs;
 using Ninject;
+using Application = System.Windows.Application;
 using DragDropEffects = System.Windows.DragDropEffects;
 using IDropTarget = GongSolutions.Wpf.DragDrop.IDropTarget;
 using MouseEventArgs = System.Windows.Input.MouseEventArgs;
@@ -248,8 +253,19 @@ namespace Artemis.ViewModels.Profiles
             IWindowManager manager = new WindowManager();
             _editorVm = new LayerEditorViewModel(_gameModel.GameDataModel, layer);
             dynamic settings = new ExpandoObject();
+            var iconImage = new Image
+            {
+                Source = (DrawingImage) Application.Current.MainWindow.Resources["BowIcon"],
+                Stretch = Stretch.Uniform,
+                Margin = new Thickness(20)
+            };
+            iconImage.Arrange(new Rect(0, 0, 100, 100));
+            var bitmap = new RenderTargetBitmap(100, 100, 96, 96, PixelFormats.Pbgra32);
+            bitmap.Render(iconImage);
 
             settings.Title = "Artemis | Edit " + layer.Name;
+            settings.Icon = bitmap;
+
             manager.ShowDialog(_editorVm, null, settings);
 
             // If the layer was a folder, but isn't anymore, assign it's children to it's parent.
diff --git a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
index 7d91ed6f7..5b4e162c7 100644
--- a/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
+++ b/Artemis/Artemis/Views/Flyouts/FlyoutSettingsView.xaml
@@ -105,7 +105,7 @@
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Row="0" Grid.ColumnSpan="2" x:Name="ActiveEffectName" />
-            <TextBlock Grid.Row="1" Grid.Column="0" Text="Artemis 1.0.3" VerticalAlignment="Center"
+            <TextBlock Grid.Row="1" Grid.Column="0" Text="Artemis 1.1.0" VerticalAlignment="Center"
                        HorizontalAlignment="Left" />
             <Button Grid.Row="1" Grid.Column="1" Focusable="False"
                     Style="{StaticResource AccentedSquareButtonStyle}"
diff --git a/Artemis/Artemis/Views/ShellView.xaml b/Artemis/Artemis/Views/ShellView.xaml
index 52066421f..2b7738e90 100644
--- a/Artemis/Artemis/Views/ShellView.xaml
+++ b/Artemis/Artemis/Views/ShellView.xaml
@@ -12,15 +12,23 @@
                       MinHeight="800" MinWidth="1210"
                       GlowBrush="{DynamicResource AccentColorBrush}" Icon="../logo.ico">
     <!-- Bit of extra code to use a different icon than in the taskbar -->
+    <Controls:MetroWindow.Resources>
+        <DrawingImage x:Key="BowIcon">
+            <DrawingImage.Drawing>
+                <DrawingGroup>
+                    <GeometryDrawing Brush="{DynamicResource IdealForegroundColorBrush}"
+                                         Geometry="M1518 3378 c-48 -63 -61 -101 -66 -184 -4 -70 -1 -91 27 -170 l31 -89 -27 -20 c-32 -24 -849 -601 -981 -693 l-93 -64 -87 40 c-48 22 -91 37 -95 32 -5 -4 9 -41 29 -83 l37 -75 -28 -24 c-23 -20 -29 -35 -33 -81 l-4 -56 -82 -19 c-109 -25 -109 -41 4 -91 l85 -38 7 -64 c15 -137 90 -1279 85 -1293 -3 -7 -35 -24 -70 -35 -159 -53 -257 -168 -257 -302 0 -35 2 -38 47 -53 54 -18 185 -21 232 -5 29 10 31 14 31 58 0 26 6 56 14 66 13 18 15 18 46 -8 44 -37 78 -35 119 7 l34 35 -17 41 c-9 23 -12 39 -6 35 6 -4 43 -1 83 6 39 6 219 14 398 18 l327 6 113 57 c158 78 256 166 317 282 24 46 27 62 27 152 0 98 -1 103 -41 184 l-42 83 44 69 c24 37 51 68 59 68 9 0 44 -14 78 -32 l62 -31 -93 -44 c-58 -26 -92 -48 -90 -55 9 -27 353 -68 570 -68 108 0 108 0 108 24 0 34 -105 171 -220 286 -122 122 -238 216 -250 204 -6 -6 -1 -42 16 -98 14 -49 23 -91 19 -94 -3 -3 -36 9 -73 27 l-69 33 24 71 c13 39 23 76 23 82 0 6 28 17 63 24 279 58 399 300 314 632 -32 121 -49 155 -134 255 -37 45 -106 126 -152 180 -73 87 -241 326 -241 343 0 3 15 13 32 21 21 10 35 25 40 45 15 60 -16 103 -81 108 -43 3 -39 22 14 74 l45 43 -25 50 c-35 69 -77 114 -130 139 -63 30 -88 27 -117 -11z m215 -835 c188 -279 250 -417 250 -548 0 -133 -74 -214 -243 -265 l-55 -16 -37 -138 c-21 -76 -39 -140 -40 -141 -6 -5 -814 377 -823 390 -6 7 -19 46 -29 86 -10 41 -25 81 -33 91 -8 9 -57 35 -109 59 -52 23 -93 46 -92 51 2 4 233 169 513 366 l510 358 26 -46 c15 -25 88 -136 162 -247z m-1108 -898 c61 21 88 26 107 19 14 -5 204 -92 421 -194 l395 -185 -27 -35 c-15 -19 -53 -72 -84 -117 l-57 -81 30 -90 c39 -117 40 -179 2 -253 -45 -90 -147 -145 -347 -189 -71 -15 -435 -59 -600 -73 l-29 -2 -37 540 c-20 297 -40 581 -43 632 l-7 92 98 -46 97 -46 81 28z" />
+                </DrawingGroup>
+            </DrawingImage.Drawing>
+        </DrawingImage>
+    </Controls:MetroWindow.Resources>
     <Controls:MetroWindow.IconTemplate>
         <DataTemplate>
             <Grid Width="{TemplateBinding Width}"
                   Height="{TemplateBinding Height}"
-                  Margin="0,0,-10,0"
                   Background="Transparent"
-                  RenderOptions.EdgeMode="Aliased"
-                  RenderOptions.BitmapScalingMode="HighQuality">
-                <Image Source="/Artemis;component/Resources/bow.png" />
+                  RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,-10,0">
+                <Image Source="{DynamicResource BowIcon}" Stretch="Uniform" Margin="6" />
             </Grid>
         </DataTemplate>
     </Controls:MetroWindow.IconTemplate>