diff --git a/BallanceTasEditor/BallanceTasEditor/App.xaml b/BallanceTasEditor/BallanceTasEditor/App.xaml index 9ebaeb1..84042f5 100644 --- a/BallanceTasEditor/BallanceTasEditor/App.xaml +++ b/BallanceTasEditor/BallanceTasEditor/App.xaml @@ -6,10 +6,9 @@ - - + diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/AccessoryIcon.cs b/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/AccessoryIcon.cs deleted file mode 100644 index 1042eb8..0000000 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/AccessoryIcon.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; - -namespace BallanceTasEditor.Frontend.Styles { - - public class AccessoryIcon { - public static ImageSource GetIcon(DependencyObject obj) { - return (ImageSource)obj.GetValue(IconProperty); - } - - public static void SetIcon(DependencyObject obj, ImageSource value) { - obj.SetValue(IconProperty, value); - } - - // Using a DependencyProperty as the backing store for Icon. This enables animation, styling, binding, etc... - public static readonly DependencyProperty IconProperty = - DependencyProperty.RegisterAttached("Icon", typeof(ImageSource), typeof(AccessoryIcon), new PropertyMetadata(null)); - - public static double GetIconWidth(DependencyObject obj) { - return (double)obj.GetValue(IconWidthProperty); - } - - public static void SetIconWidth(DependencyObject obj, double value) { - obj.SetValue(IconWidthProperty, value); - } - - // Using a DependencyProperty as the backing store for IconWidth. This enables animation, styling, binding, etc... - public static readonly DependencyProperty IconWidthProperty = - DependencyProperty.RegisterAttached("IconWidth", typeof(double), typeof(AccessoryIcon), new PropertyMetadata(0.0)); - - public static double GetIconHeight(DependencyObject obj) { - return (double)obj.GetValue(IconHeightProperty); - } - - public static void SetIconHeight(DependencyObject obj, double value) { - obj.SetValue(IconHeightProperty, value); - } - - // Using a DependencyProperty as the backing store for IconHeight. This enables animation, styling, binding, etc... - public static readonly DependencyProperty IconHeightProperty = - DependencyProperty.RegisterAttached("IconHeight", typeof(double), typeof(AccessoryIcon), new PropertyMetadata(0.0)); - - } - -} diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/AccessoryIconControl.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/AccessoryIconControl.xaml deleted file mode 100644 index 9b81796..0000000 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/AccessoryIconControl.xaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/GenericButton.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/GenericButton.xaml deleted file mode 100644 index 568d762..0000000 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/GenericButton.xaml +++ /dev/null @@ -1,35 +0,0 @@ - - - - \ No newline at end of file diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/ViewModels/MainWindow.cs b/BallanceTasEditor/BallanceTasEditor/Frontend/ViewModels/MainWindow.cs index 9baeee5..fb3d629 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/ViewModels/MainWindow.cs +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/ViewModels/MainWindow.cs @@ -20,6 +20,8 @@ namespace BallanceTasEditor.Frontend.ViewModels { private Shared.IDialogService m_DialogService; + #region File Menu + #region File Operation [ObservableProperty] @@ -153,6 +155,22 @@ namespace BallanceTasEditor.Frontend.ViewModels { #endregion + #endregion + + #region Edit Menu + + + #region Preference + + [RelayCommand] + private void Preference() { + m_DialogService.ShowPreferenceDialog(); + } + + #endregion + + #endregion + #region Help Menu [RelayCommand] diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AboutDialog.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AboutDialog.xaml index a9b8867..27ed7cc 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AboutDialog.xaml +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/AboutDialog.xaml @@ -5,6 +5,7 @@ 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:AboutDialog}" mc:Ignorable="d" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" ShowInTaskbar="False" Title="About Ballance TAS Editor" Width="340" Height="480" Icon="/Frontend/Assets/About.ico"> @@ -35,6 +36,8 @@ Version: 1.2 stable Build Date: October 21, 2025 "/> -