Update main UI

imesense · Dec 3, 2024 · ca2501c · ca2501c
1 parent a45183e
commit ca2501c
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 117 deletions.
diff --git a/src/ImeSense.ShaderPlayground/App.axaml.cs b/src/ImeSense.ShaderPlayground/App.axaml.cs
@@ -24,9 +24,6 @@ private static IServiceCollection ConfigureServices() {
         services.AddSingleton<MainViewModel>();
         services.AddSingleton<MainWindow>();
 
-        services.AddTransient<MenuViewModel>();
-        services.AddTransient<MenuView>();
-
         services.AddTransient<ShaderViewModel>();
         services.AddTransient<ShaderView>();
 

diff --git a/src/ImeSense.ShaderPlayground/ViewModels/MainViewModel.cs b/src/ImeSense.ShaderPlayground/ViewModels/MainViewModel.cs
@@ -10,15 +10,11 @@
 namespace ImeSense.ShaderPlayground.ViewModels;
 
 public class MainViewModel : ReactiveObject {
-    private readonly MenuViewModel _menuViewModel;
-
     private readonly ShaderViewModel _shaderViewModel;
     private readonly ViewportViewModel _viewPortViewModel;
     private readonly LogViewModel _logViewModel;
 
     public MainViewModel(IServiceProvider serviceProvider) {
-        _menuViewModel = serviceProvider.GetRequiredService<MenuViewModel>();
-
         _shaderViewModel = serviceProvider.GetRequiredService<ShaderViewModel>();
         _viewPortViewModel = serviceProvider.GetRequiredService<ViewportViewModel>();
         _logViewModel = serviceProvider.GetRequiredService<LogViewModel>();
@@ -27,22 +23,16 @@ public MainViewModel(IServiceProvider serviceProvider) {
         WindowWidth = 900;
         WindowTitle = "Shader Playground";
 
-        MenuContext = _menuViewModel;
-
         ShaderContext = _shaderViewModel;
         ViewportContext = _viewPortViewModel;
         LogContext = _logViewModel; 
     }
 
     public MainViewModel() {
-        _menuViewModel = null!;
-
         _shaderViewModel = null!;
         _viewPortViewModel = null!;
         _logViewModel = null!;
 
-        MenuContext = null!;
-
         ShaderContext = null!;
     }
 
@@ -76,13 +66,6 @@ public string WindowTitle {
         set => this.RaiseAndSetIfChanged(ref _windowTitle, value);
     }
 
-    private ReactiveObject _menuContext = new();
-
-    public ReactiveObject MenuContext {
-        get => _menuContext;
-        init => this.RaiseAndSetIfChanged(ref _menuContext, value);
-    }
-
     private ReactiveObject _shaderContext = new();
 
     public ReactiveObject ShaderContext {

diff --git a/src/ImeSense.ShaderPlayground/ViewModels/MenuViewModel.cs b/src/ImeSense.ShaderPlayground/ViewModels/MenuViewModel.cs
diff --git a/src/ImeSense.ShaderPlayground/Views/MainWindow.axaml b/src/ImeSense.ShaderPlayground/Views/MainWindow.axaml
@@ -17,9 +17,55 @@
     </Design.DataContext>
 
     <Grid RowDefinitions="Auto,*">
-        <ContentControl
-            Grid.Row="0"
-            Content="{Binding MenuContext}" />
+        <Menu Grid.Row="0">
+            <MenuItem
+                Header="Файд"
+                Margin="0,4">
+                <MenuItem Header="Создать проект" />
+                <MenuItem Header="Открыть проект" />
+                <MenuItem Header="Закрыть проект" />
+
+                <Separator />
+
+                <MenuItem Header="Выход" />
+            </MenuItem>
+
+            <MenuItem
+                Header="Настройки"
+                Margin="0,4">
+                <MenuItem Header="Открыть настройки" />
+            </MenuItem>
+
+            <MenuItem
+                Header="Окно"
+                Margin="0,4">
+                <MenuItem Header="Шейдер">
+                    <MenuItem.Icon>
+                        <CheckBox />
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Предпросмотр">
+                    <MenuItem.Icon>
+                        <CheckBox />
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Лог">
+                    <MenuItem.Icon>
+                        <CheckBox />
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+
+            <MenuItem
+                Header="Справка"
+                Margin="0,4">
+                <MenuItem Header="Открыть справку" />
+
+                <Separator />
+
+                <MenuItem Header="О программе" />
+            </MenuItem>
+        </Menu>
 
         <Grid
             Grid.Row="1"

diff --git a/src/ImeSense.ShaderPlayground/Views/MenuView.axaml b/src/ImeSense.ShaderPlayground/Views/MenuView.axaml
diff --git a/src/ImeSense.ShaderPlayground/Views/MenuView.axaml.cs b/src/ImeSense.ShaderPlayground/Views/MenuView.axaml.cs
diff --git a/src/ImeSense.ShaderPlayground/Views/Toolbars/ViewportView.axaml b/src/ImeSense.ShaderPlayground/Views/Toolbars/ViewportView.axaml
@@ -19,14 +19,11 @@
             HorizontalAlignment="Center"
             Orientation="Horizontal">
             <Button
-                Content="Play"
+                Content="Запустить"
                 Command="{Binding PlayCommand}" />
             <Button
-                Content="Stop"
+                Content="Остановить"
                 Command="{Binding StopCommand}" />
-            <Button
-                Content="Settings"
-                Command="{Binding SettingsCommand}" />
         </StackPanel>
 
         <Grid
@@ -35,14 +32,14 @@
             ColumnDefinitions="*,*,*,*">
             <Label
                 Grid.Column="0"
-                Content="Resolution:" />
+                Content="Разрешение:" />
             <Label
                 Grid.Column="1"
                 Content="{Binding Resolution}" />
 
             <Label
                 Grid.Column="2"
-                Content="Frame:" />
+                Content="Частота кадров:" />
             <Label
                 Grid.Column="3"
                 Content="{Binding Frame}" />