diff --git a/BallanceTasEditor/Assets/AppIcons/FieldError.svg b/BallanceTasEditor/Assets/AppIcons/FieldError.svg new file mode 100644 index 0000000..2bfa93e --- /dev/null +++ b/BallanceTasEditor/Assets/AppIcons/FieldError.svg @@ -0,0 +1,41 @@ + + + + + + + diff --git a/BallanceTasEditor/BallanceTasEditor/App.xaml b/BallanceTasEditor/BallanceTasEditor/App.xaml index abfc769..16b1f43 100644 --- a/BallanceTasEditor/BallanceTasEditor/App.xaml +++ b/BallanceTasEditor/BallanceTasEditor/App.xaml @@ -9,9 +9,7 @@ - - - + diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Assets/FieldError.ico b/BallanceTasEditor/BallanceTasEditor/Frontend/Assets/FieldError.ico new file mode 100644 index 0000000..bba838e Binary files /dev/null and b/BallanceTasEditor/BallanceTasEditor/Frontend/Assets/FieldError.ico differ diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/TextBoxErrorTemplate.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/TextBoxErrorTemplate.xaml new file mode 100644 index 0000000..5794434 --- /dev/null +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Styles/TextBoxErrorTemplate.xaml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml index 00acedd..46453ef 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml @@ -47,9 +47,11 @@ + Text="{Binding Count, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}" + Style="{StaticResource TextBoxWithErrorNotifyStyle}"/> + Text="{Binding Fps, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}" + Style="{StaticResource TextBoxWithErrorNotifyStyle}"/> diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml.cs b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml.cs index 46f9cb5..66b22c9 100644 --- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml.cs +++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml.cs @@ -20,12 +20,14 @@ namespace BallanceTasEditor.Frontend.Views { public NewFileDialog() { InitializeComponent(); - ViewModel = new ViewModels.NewFileDialog(); - ViewModel.RequestCloseDialog += ViewModel_RequestCloseDialog; - this.DataContext = ViewModel; + var vm = new ViewModels.NewFileDialog(); + vm.RequestCloseDialog += ViewModel_RequestCloseDialog; + this.DataContext = vm; } - public ViewModels.NewFileDialog ViewModel { get; private set; } + public ViewModels.NewFileDialog ViewModel { + get => (this.DataContext as ViewModels.NewFileDialog).Unwrap(); + } private void ViewModel_RequestCloseDialog(Shared.RequestCloseDialogEventArgs e) { this.DialogResult = e.Result;