From 20bd17260fe5735dd75e8c7d2289b2a70c94b249 Mon Sep 17 00:00:00 2001 From: Ciaran Fisher Date: Thu, 26 Nov 2015 20:52:18 +0000 Subject: [PATCH] Added new Dark theme --- RadioGui/App.xaml | 8 +- RadioGui/MainWindow.xaml | 6 +- RadioGui/MainWindow.xaml.cs | 4 +- RadioGui/RadioControlGroup.xaml | 7 +- RadioGui/RadioGui.csproj | 6 + .../Themes/LeftMarginMultiplierConverter.cs | 31 + RadioGui/Themes/Styles.xaml | 3096 +++++++++++++++++ RadioGui/Themes/TreeViewItemExtensions.cs | 38 + RadioGui/packages.config | 1 + 9 files changed, 3190 insertions(+), 7 deletions(-) create mode 100644 RadioGui/Themes/LeftMarginMultiplierConverter.cs create mode 100644 RadioGui/Themes/Styles.xaml create mode 100644 RadioGui/Themes/TreeViewItemExtensions.cs diff --git a/RadioGui/App.xaml b/RadioGui/App.xaml index a7145cb..7af06ea 100644 --- a/RadioGui/App.xaml +++ b/RadioGui/App.xaml @@ -4,6 +4,12 @@ xmlns:local="clr-namespace:RadioGui" StartupUri="MainWindow.xaml"> - + + + + + + + diff --git a/RadioGui/MainWindow.xaml b/RadioGui/MainWindow.xaml index 2a043f5..b27b03a 100644 --- a/RadioGui/MainWindow.xaml +++ b/RadioGui/MainWindow.xaml @@ -4,10 +4,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:RadioGui" - + + Style="{StaticResource {x:Type Window}}" Topmost="True" - - Opacity="1.0" + Opacity="1.0" ResizeMode="CanResizeWithGrip" diff --git a/RadioGui/MainWindow.xaml.cs b/RadioGui/MainWindow.xaml.cs index 80ab40f..7cdd865 100644 --- a/RadioGui/MainWindow.xaml.cs +++ b/RadioGui/MainWindow.xaml.cs @@ -54,7 +54,6 @@ public MainWindow() InitializeComponent(); - // this.SourceInitialized += MainWindow_SourceInitialized; if (Is_SimpleRadio_running()) @@ -66,10 +65,13 @@ public MainWindow() this.containerPanel.MouseLeftButtonDown += WrapPanel_MouseLeftButtonDown; radio1.radioId = 0; + // this.radio1.radioControlContainer.MouseLeftButtonDown += WrapPanel_MouseLeftButtonDown; radio2.radioId = 1; + // this.radio2.radioControlContainer.MouseLeftButtonDown += WrapPanel_MouseLeftButtonDown; radio3.radioId = 2; + // this.radio3.radioControlContainer.MouseLeftButtonDown += WrapPanel_MouseLeftButtonDown; SetupActiveRadio(); SetupRadioStatus(); diff --git a/RadioGui/RadioControlGroup.xaml b/RadioGui/RadioControlGroup.xaml index 52dae39..e9640d6 100644 --- a/RadioGui/RadioControlGroup.xaml +++ b/RadioGui/RadioControlGroup.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:RadioGui" + Name="radioControlContainer" Width="120" Height="70" > @@ -26,7 +27,9 @@