Browse Source

Added action display

Krzysztof Krysiński 1 year ago
parent
commit
6173b0ab55

+ 8 - 2
src/PixiEditor.AvaloniaUI/Views/Dock/ColorPickerDockView.axaml

@@ -4,10 +4,16 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:colorPicker="clr-namespace:ColorPicker;assembly=ColorPicker.AvaloniaUI"
              xmlns:colorPicker="clr-namespace:ColorPicker;assembly=ColorPicker.AvaloniaUI"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
+             xmlns:subViewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.SubViewModels"
+             xmlns:dock="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Dock"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="dock:ColorPickerDockViewModel"
              x:Class="PixiEditor.AvaloniaUI.Views.Dock.ColorPickerDockView">
              x:Class="PixiEditor.AvaloniaUI.Views.Dock.ColorPickerDockView">
+    <Design.DataContext>
+        <dock:ColorPickerDockViewModel/>
+    </Design.DataContext>
     <colorPicker:StandardColorPicker
     <colorPicker:StandardColorPicker
-        SelectedColor="{Binding DataContext.ColorsSubViewModel.PrimaryColor, Mode=TwoWay, Converter={converters:GenericColorToMediaColorConverter}}"
-        SecondaryColor="{Binding DataContext.ColorsSubViewModel.SecondaryColor, Mode=TwoWay, Converter={converters:GenericColorToMediaColorConverter}}"
+        SelectedColor="{Binding ColorsSubViewModel.PrimaryColor, Mode=TwoWay, Converter={converters:GenericColorToMediaColorConverter}}"
+        SecondaryColor="{Binding ColorsSubViewModel.SecondaryColor, Mode=TwoWay, Converter={converters:GenericColorToMediaColorConverter}}"
         UseHintColor="False"/>
         UseHintColor="False"/>
 </UserControl>
 </UserControl>

+ 60 - 0
src/PixiEditor.AvaloniaUI/Views/Main/ActionDisplayBar.axaml

@@ -0,0 +1,60 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
+             xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
+             xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:DataType="viewModels:ViewModelMain"
+             x:Class="PixiEditor.AvaloniaUI.Views.Main.ActionDisplayBar">
+    <Design.DataContext>
+        <viewModels:ViewModelMain/>
+    </Design.DataContext>
+
+    <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition
+                        Width="*" />
+                    <ColumnDefinition
+                        Width="290" />
+                </Grid.ColumnDefinitions>
+                <DockPanel>
+                    <TextBlock
+                        ui:Translator.LocalizedString="{Binding ActiveActionDisplay}"
+                        Foreground="White"
+                        FontSize="15"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center" />
+                    <StackPanel
+                        DockPanel.Dock="Right"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center">
+                        <TextBlock
+                            Text="{Binding ElementName=mainWindow, Path=DataContext.DocumentManagerSubViewModel.ActiveDocument.CoordinatesString}"
+                            Foreground="White"
+                            FontSize="16" />
+                    </StackPanel>
+                </DockPanel>
+                <StackPanel
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Grid.Row="3"
+                    Grid.Column="3"
+                    Orientation="Horizontal">
+                    <Button
+                        IsVisible="{Binding UpdateSubViewModel.UpdateReadyToInstall, FallbackValue=Hidden}"
+                        FontSize="14"
+                        Height="20"
+                        Command="{xaml:Command PixiEditor.Restart}" ui:Translator.Key="RESTART"/>
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Padding="10"
+                        HorizontalAlignment="Right"
+                        Foreground="White"
+                        FontSize="14"
+                        Text="{Binding UpdateSubViewModel.VersionText}" />
+                </StackPanel>
+            </Grid>
+</UserControl>

+ 14 - 0
src/PixiEditor.AvaloniaUI/Views/Main/ActionDisplayBar.axaml.cs

@@ -0,0 +1,14 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace PixiEditor.AvaloniaUI.Views.Main;
+
+public partial class ActionDisplayBar : UserControl
+{
+    public ActionDisplayBar()
+    {
+        InitializeComponent();
+    }
+}
+

+ 2 - 0
src/PixiEditor.AvaloniaUI/Views/MainView.axaml

@@ -25,6 +25,7 @@
                 <Grid.RowDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40" />
                     <RowDefinition Height="40" />
                     <RowDefinition Height="*" />
                     <RowDefinition Height="*" />
+                    <RowDefinition Height="30"/>
                 </Grid.RowDefinitions>
                 </Grid.RowDefinitions>
 
 
                 <tools:Toolbar Grid.Row="0" DataContext="{Binding .}" />
                 <tools:Toolbar Grid.Row="0" DataContext="{Binding .}" />
@@ -36,6 +37,7 @@
                 <controls:DockableAreaRegion Grid.Row="1"
                 <controls:DockableAreaRegion Grid.Row="1"
                                              Root="{Binding LayoutSubViewModel.LayoutManager.ActiveLayout.Root}"
                                              Root="{Binding LayoutSubViewModel.LayoutManager.ActiveLayout.Root}"
                                              Context="{Binding LayoutSubViewModel.LayoutManager.DockContext}"/>
                                              Context="{Binding LayoutSubViewModel.LayoutManager.DockContext}"/>
+                <main1:ActionDisplayBar Grid.Row="2" DataContext="{Binding .}"/>
             </Grid>
             </Grid>
         </DockPanel>
         </DockPanel>
         <commandSearch:CommandSearchControl
         <commandSearch:CommandSearchControl