diff --git a/SpineViewer/App.xaml b/SpineViewer/App.xaml index a8ce080..50be1d7 100644 --- a/SpineViewer/App.xaml +++ b/SpineViewer/App.xaml @@ -8,28 +8,11 @@ - - + + - - - - - - - diff --git a/SpineViewer/Resources/Theme.xaml b/SpineViewer/Resources/Theme.xaml index ed1bc87..89ffdbd 100644 --- a/SpineViewer/Resources/Theme.xaml +++ b/SpineViewer/Resources/Theme.xaml @@ -1,5 +1,83 @@ - + + + + + + + + + + + + + + + + + + + + + + - - - - + + diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml index fffca07..1d60ef6 100644 --- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml +++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml @@ -15,9 +15,6 @@ Height="750" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"> - - - @@ -44,17 +41,15 @@ - - - + diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml index b90a980..2da3a98 100644 --- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml +++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml @@ -15,9 +15,6 @@ Height="480" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"> - - - @@ -44,17 +41,15 @@ - - - + diff --git a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml index 991f513..6688872 100644 --- a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml +++ b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml @@ -15,9 +15,6 @@ Height="550" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"> - - - @@ -44,17 +41,15 @@ - - - + diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml index 2999035..2949858 100644 --- a/SpineViewer/Views/MainWindow.xaml +++ b/SpineViewer/Views/MainWindow.xaml @@ -6,7 +6,6 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:vm="clr-namespace:SpineViewer.ViewModels.MainWindow" - xmlns:utils="clr-namespace:SpineViewer.Utils" xmlns:SFMLRenderer="clr-namespace:SFMLRenderer;assembly=SFMLRenderer" mc:Ignorable="d" x:Name="_mainWindow" @@ -20,27 +19,6 @@ LocationChanged="MainWindow_LocationChanged" SizeChanged="MainWindow_SizeChanged"> - - - - - - @@ -139,10 +117,6 @@ MouseLeftButtonUp="SpinesListView_MouseLeftButtonUp" DragEnter="SpinesListView_DragEnter" Drop="SpinesListView_Drop"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - + - - + - - + - + + @@ -825,11 +783,12 @@ - - + + @@ -991,6 +950,7 @@ + @@ -1050,12 +1010,7 @@ - + diff --git a/SpineViewer/Views/PreferenceDialog.xaml b/SpineViewer/Views/PreferenceDialog.xaml index 03a75c5..9384a2c 100644 --- a/SpineViewer/Views/PreferenceDialog.xaml +++ b/SpineViewer/Views/PreferenceDialog.xaml @@ -41,17 +41,16 @@ - - - - + + +