diff --git a/BallanceTasEditor/BallanceTasEditor/App.xaml b/BallanceTasEditor/BallanceTasEditor/App.xaml index 16b1f43..2d2de7c 100644 --- a/BallanceTasEditor/BallanceTasEditor/App.xaml +++ b/BallanceTasEditor/BallanceTasEditor/App.xaml @@ -7,7 +7,6 @@ - diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/NoteBanner.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/NoteBanner.xaml deleted file mode 100644 index 678cfd4..0000000 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/NoteBanner.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AddFrameDialog.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AddFrameDialog.xaml index 4961901..cd89ada 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AddFrameDialog.xaml +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AddFrameDialog.xaml @@ -5,9 +5,11 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views" xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels" + xmlns:conveter="clr-namespace:BallanceTasEditor.Frontend.Converters" + xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets" d:DataContext="{d:DesignInstance vm:AddFrameDialog}" mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False" - Title="Add Frame" Height="250" Width="400" Icon="/Frontend/Assets/AddFrame.ico"> + Title="Add Frame" Height="250" Width="400" Icon="/Frontend/Assets/App.ico"> @@ -15,8 +17,9 @@ - + @@ -45,9 +48,15 @@ - - - + + + diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/EditFpsDialog.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/EditFpsDialog.xaml index c440824..5e999da 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/EditFpsDialog.xaml +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/EditFpsDialog.xaml @@ -5,9 +5,11 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views" xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels" + xmlns:conveter="clr-namespace:BallanceTasEditor.Frontend.Converters" + xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets" d:DataContext="{d:DesignInstance vm:EditFpsDialog}" mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False" - Title="Edit FPS" Height="220" Width="400" Icon="/Frontend/Assets/SetFps.ico"> + Title="Edit FPS" Height="220" Width="400" Icon="/Frontend/Assets/App.ico"> @@ -15,8 +17,9 @@ - + @@ -41,8 +44,12 @@ - - + + diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/GotoDialog.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/GotoDialog.xaml index 872ab38..7a1f60a 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/GotoDialog.xaml +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/GotoDialog.xaml @@ -5,9 +5,10 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:BallanceTasEditor.Frontend.Views" xmlns:vm="clr-namespace:BallanceTasEditor.Frontend.ViewModels" + xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets" d:DataContext="{d:DesignInstance vm:GotoDialog}" mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False" - Title="Goto..." Height="180" Width="400" Icon="/Frontend/Assets/Goto.ico"> + Title="Goto..." Height="180" Width="400" Icon="/Frontend/Assets/App.ico"> @@ -15,8 +16,9 @@ - +