diff --git a/SmartAquaViewer/App.xaml b/SmartAquaViewer/App.xaml index a067e94..fa3d754 100644 --- a/SmartAquaViewer/App.xaml +++ b/SmartAquaViewer/App.xaml @@ -8,7 +8,7 @@ - + diff --git a/SmartAquaViewer/Fonts/SCDream1.otf b/SmartAquaViewer/Fonts/SCDream1.otf new file mode 100644 index 0000000..c8eac97 Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream1.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream2.otf b/SmartAquaViewer/Fonts/SCDream2.otf new file mode 100644 index 0000000..c5625d9 Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream2.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream3.otf b/SmartAquaViewer/Fonts/SCDream3.otf new file mode 100644 index 0000000..28a160c Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream3.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream4.otf b/SmartAquaViewer/Fonts/SCDream4.otf new file mode 100644 index 0000000..1978ea4 Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream4.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream5.otf b/SmartAquaViewer/Fonts/SCDream5.otf new file mode 100644 index 0000000..628e828 Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream5.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream6.otf b/SmartAquaViewer/Fonts/SCDream6.otf new file mode 100644 index 0000000..4e20297 Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream6.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream7.otf b/SmartAquaViewer/Fonts/SCDream7.otf new file mode 100644 index 0000000..7e38170 Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream7.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream8.otf b/SmartAquaViewer/Fonts/SCDream8.otf new file mode 100644 index 0000000..5d7e4be Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream8.otf differ diff --git a/SmartAquaViewer/Fonts/SCDream9.otf b/SmartAquaViewer/Fonts/SCDream9.otf new file mode 100644 index 0000000..f6db18f Binary files /dev/null and b/SmartAquaViewer/Fonts/SCDream9.otf differ diff --git a/SmartAquaViewer/Helper/RadioButtonHelper.cs b/SmartAquaViewer/Helper/RadioButtonHelper.cs new file mode 100644 index 0000000..5236bdc --- /dev/null +++ b/SmartAquaViewer/Helper/RadioButtonHelper.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Media; + +namespace SmartAquaViewer.Helper +{ + public static class RadioButtonHelper + { + public static readonly DependencyProperty PressedImageProperty = + DependencyProperty.RegisterAttached( + "PressedImage", + typeof(ImageSource), + typeof(RadioButtonHelper), + new PropertyMetadata(null)); + + public static void SetPressedImage(DependencyObject element, ImageSource value) + => element.SetValue(PressedImageProperty, value); + public static ImageSource GetPressedImage(DependencyObject element) + => (ImageSource)element.GetValue(PressedImageProperty); + + public static readonly DependencyProperty UnPressedImageProperty = + DependencyProperty.RegisterAttached( + "UnPressedImage", + typeof(ImageSource), + typeof(RadioButtonHelper), + new PropertyMetadata(null)); + + public static void SetUnPressedImage(DependencyObject element, ImageSource value) + => element.SetValue(UnPressedImageProperty, value); + public static ImageSource GetUnPressedImage(DependencyObject element) + => (ImageSource)element.GetValue(UnPressedImageProperty); + } +} diff --git a/SmartAquaViewer/MainWindow.xaml b/SmartAquaViewer/MainWindow.xaml index d37aa6d..2fc1595 100644 --- a/SmartAquaViewer/MainWindow.xaml +++ b/SmartAquaViewer/MainWindow.xaml @@ -7,6 +7,7 @@ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:view="clr-namespace:SmartAquaViewer.View" xmlns:vm="clr-namespace:SmartAquaViewer.ViewModel" + xmlns:helper="clr-namespace:SmartAquaViewer.Helper" mc:Ignorable="d" Title="MainWindow" Height="1080" Width="1920" WindowStartupLocation="CenterScreen"> @@ -26,25 +27,38 @@ - - - - - - - + + + + + + + + + + + + diff --git a/SmartAquaViewer/Reources/Generic.xaml b/SmartAquaViewer/Reources/Generic.xaml deleted file mode 100644 index b35ade7..0000000 --- a/SmartAquaViewer/Reources/Generic.xaml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - \ No newline at end of file diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml new file mode 100644 index 0000000..36049b9 --- /dev/null +++ b/SmartAquaViewer/Resources/Generic.xaml @@ -0,0 +1,66 @@ + + + pack://application:,,,/Fonts/#S-Core Dream 1 Thin + pack://application:,,,/Fonts/#S-Core Dream 2 ExtraLight + pack://application:,,,/Fonts/#S-Core Dream 3 Light + pack://application:,,,/Fonts/#S-Core Dream 4 Regular + pack://application:,,,/Fonts/#S-Core Dream 5 Medium + pack://application:,,,/Fonts/#S-Core Dream 6 Bold + pack://application:,,,/Fonts/#S-Core Dream 7 ExtraBold + pack://application:,,,/Fonts/#S-Core Dream 8 Heavy + pack://application:,,,/Fonts/#S-Core Dream 9 Black + + + + + + \ No newline at end of file diff --git a/SmartAquaViewer/Reources/Images/ListImage.png b/SmartAquaViewer/Resources/Images/ListImage.png similarity index 100% rename from SmartAquaViewer/Reources/Images/ListImage.png rename to SmartAquaViewer/Resources/Images/ListImage.png diff --git a/SmartAquaViewer/Resources/Images/tab_bg.png b/SmartAquaViewer/Resources/Images/tab_bg.png new file mode 100644 index 0000000..da069cf Binary files /dev/null and b/SmartAquaViewer/Resources/Images/tab_bg.png differ diff --git a/SmartAquaViewer/Resources/Images/tab_bg_off.png b/SmartAquaViewer/Resources/Images/tab_bg_off.png new file mode 100644 index 0000000..4df7c42 Binary files /dev/null and b/SmartAquaViewer/Resources/Images/tab_bg_off.png differ diff --git a/SmartAquaViewer/SmartAquaViewer.csproj b/SmartAquaViewer/SmartAquaViewer.csproj index 63f8823..dac5af2 100644 --- a/SmartAquaViewer/SmartAquaViewer.csproj +++ b/SmartAquaViewer/SmartAquaViewer.csproj @@ -10,7 +10,18 @@ - + + + + + + + + + + + + @@ -19,7 +30,22 @@ - + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml index 52e27e7..381521b 100644 --- a/SmartAquaViewer/View/MonitoringView.xaml +++ b/SmartAquaViewer/View/MonitoringView.xaml @@ -5,12 +5,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:SmartAquaViewer.View" mc:Ignorable="d" - d:DesignHeight="450" d:DesignWidth="800"> - - - + d:DesignHeight="940" d:DesignWidth="1650"> + + + + + + + + + + +