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 @@
-
-
+
+
+
+
diff --git a/RadioGui/RadioGui.csproj b/RadioGui/RadioGui.csproj
index a6ae4fb..b9ac4c4 100644
--- a/RadioGui/RadioGui.csproj
+++ b/RadioGui/RadioGui.csproj
@@ -109,6 +109,8 @@
MSBuild:Compile
Designer
+
+
MSBuild:Compile
Designer
@@ -131,6 +133,10 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
diff --git a/RadioGui/Themes/LeftMarginMultiplierConverter.cs b/RadioGui/Themes/LeftMarginMultiplierConverter.cs
new file mode 100644
index 0000000..95ce71a
--- /dev/null
+++ b/RadioGui/Themes/LeftMarginMultiplierConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace DarkBlendTheme
+{
+ public class LeftMarginMultiplierConverter : IValueConverter
+ {
+ public double Length { get; set; }
+
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ var item = value as TreeViewItem;
+ if (item == null)
+ return new Thickness(0);
+
+ return new Thickness(Length * item.GetDepth(), 0, 0, 0);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+}
diff --git a/RadioGui/Themes/Styles.xaml b/RadioGui/Themes/Styles.xaml
new file mode 100644
index 0000000..95d89b9
--- /dev/null
+++ b/RadioGui/Themes/Styles.xaml
@@ -0,0 +1,3096 @@
+
+
+
+
+
+
+ #444444
+ #333333
+ #595959
+ #3D3D3D
+ #424242
+ #666666
+
+ #EFEFEF
+
+ #BDBDBD
+ #525252
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ M-0.7,5.2 L-2.2,6.7 3.6,12.6 9.5,6.7 8,5.2 3.6,9.6 z
+ M-2.2,10.9 L-0.7,12.4 3.7,8 8,12.4 9.5,10.9 3.7,5 z
+ M1.0E-41,4.2 L0,2.1 2.5,4.5 6.7,4.4E-47 6.7,2.3 2.5,6.7 z
+ M7.2,5 L5.5,7.16 4.16,6.3 3.5,6.7 5.5,8.4 8.6,5.25 C8.6,5.25 8,4.7 7.22,5
+ M 0,0 L 4,3.5 L 0,7 Z
+ M 1,1.5 L 4.5,5 L 8,1.5
+ M 1,4.5 L 4.5,1 L 8,4.5
+ M6.5,2.6C4.767,0.973 2.509,0 0,0 0,0 0,19 0,19L23,19z
+ M3.5445026,0 L7.0890052,7.0890053 L3.0459049E-09,7.0890053 z
+ M-0,6 L-0,8 8,8 8,-0 6,-0 6,6 z
+ M5,-0 L9,5 1,5 z
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RadioGui/Themes/TreeViewItemExtensions.cs b/RadioGui/Themes/TreeViewItemExtensions.cs
new file mode 100644
index 0000000..e6c605c
--- /dev/null
+++ b/RadioGui/Themes/TreeViewItemExtensions.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace DarkBlendTheme
+{
+ public static class TreeViewItemExtensions
+ {
+ public static int GetDepth(this TreeViewItem item)
+ {
+ TreeViewItem parent;
+ while ((parent = GetParent(item)) != null)
+ {
+ return GetDepth(parent) + 1;
+ }
+ return 0;
+ }
+
+ private static TreeViewItem GetParent(TreeViewItem item)
+ {
+ var parent = VisualTreeHelper.GetParent(item);
+
+ while (!(parent is TreeViewItem || parent is TreeView))
+ {
+ if (parent == null) return null;
+ parent = VisualTreeHelper.GetParent(parent);
+ }
+ return parent as TreeViewItem;
+ }
+ }
+}
diff --git a/RadioGui/packages.config b/RadioGui/packages.config
index 64b5d8e..9bad6d1 100644
--- a/RadioGui/packages.config
+++ b/RadioGui/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file