diff --git a/SmartAquaViewer/MainWindow.xaml b/SmartAquaViewer/MainWindow.xaml index 5358c03..7b198a2 100644 --- a/SmartAquaViewer/MainWindow.xaml +++ b/SmartAquaViewer/MainWindow.xaml @@ -20,7 +20,7 @@ - + diff --git a/SmartAquaViewer/Resources/Images/ListImage.png b/SmartAquaViewer/Resources/Images/ListImage.png index 648d86c..e9728ae 100644 Binary files a/SmartAquaViewer/Resources/Images/ListImage.png and b/SmartAquaViewer/Resources/Images/ListImage.png differ diff --git a/SmartAquaViewer/Resources/Images/add_folder.png b/SmartAquaViewer/Resources/Images/add_folder.png new file mode 100644 index 0000000..8c86c0c Binary files /dev/null and b/SmartAquaViewer/Resources/Images/add_folder.png differ diff --git a/SmartAquaViewer/Resources/Images/file_logo.png b/SmartAquaViewer/Resources/Images/file_logo.png new file mode 100644 index 0000000..5b76cdd Binary files /dev/null and b/SmartAquaViewer/Resources/Images/file_logo.png differ diff --git a/SmartAquaViewer/SmartAquaViewer.csproj b/SmartAquaViewer/SmartAquaViewer.csproj index 6867d65..e2f8d82 100644 --- a/SmartAquaViewer/SmartAquaViewer.csproj +++ b/SmartAquaViewer/SmartAquaViewer.csproj @@ -20,11 +20,13 @@ + + @@ -72,6 +74,7 @@ + PreserveNewest @@ -81,6 +84,7 @@ + diff --git a/SmartAquaViewer/View/FileListView.xaml b/SmartAquaViewer/View/FileListView.xaml index c532093..c15089a 100644 --- a/SmartAquaViewer/View/FileListView.xaml +++ b/SmartAquaViewer/View/FileListView.xaml @@ -7,7 +7,7 @@ xmlns:vm="clr-namespace:SmartAquaViewer.ViewModel" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - d:DesignHeight="1040" d:DesignWidth="270"> + d:DesignHeight="1040" d:DesignWidth="260"> @@ -16,25 +16,38 @@ - + - - - @@ -54,33 +67,44 @@ - - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml index 25e66bf..5d71e71 100644 --- a/SmartAquaViewer/View/MonitoringView.xaml +++ b/SmartAquaViewer/View/MonitoringView.xaml @@ -567,7 +567,7 @@ - + @@ -583,7 +583,7 @@ helper:ComboBoxHelper.SelectFirstOnItemsChange="True" IsEditable="False" IsTextSearchEnabled="False"/> - + @@ -598,7 +598,7 @@ DisplayMemberPath="Display"/> - + @@ -682,7 +682,7 @@ - + @@ -700,7 +700,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -780,7 +780,7 @@ Style="{StaticResource ComboBoxStyle}"/> - + @@ -799,7 +799,7 @@ - + @@ -818,7 +818,7 @@ FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/> - + @@ -833,7 +833,7 @@ Style="{StaticResource ComboBoxStyle}"/> - +