Update ActionsView.axaml

wieslawsoltes · Dec 10, 2023 · 6450f53 · 6450f53
1 parent b112b75
commit 6450f53
Showing 1 changed file with 68 additions and 56 deletions.
diff --git a/src/SvgToXaml.Base/Views/ActionsView.axaml b/src/SvgToXaml.Base/Views/ActionsView.axaml
@@ -16,87 +16,88 @@
              Background="Transparent"
              LastChildFill="False">
 
-    <Button x:Name="ThemeButton"
-            Background="Transparent"
+    <Button Command="{Binding CopySelectedCommand}"
+            CommandParameter="XAML"
+            IsEnabled="{Binding !!Project.SelectedItem}"
             Padding="6,6,6,7"
             Margin="0,0,12,0"
             DockPanel.Dock="Left"
-            ToolTip.Tip="Switch between the Light and Dark mode theme.">
+            ToolTip.Tip="Copy Selected">
       <StackPanel Orientation="Horizontal">
         <PathIcon Width="16" Height="16" 
-                  Margin="6,0,6,0"
-                  Opacity="0.6"
-                  Data="{DynamicResource DarkTheme}"/>
+                  Margin="6,0,0,0"
+                  Data="{DynamicResource CopyIcon}"/>
+        <TextBlock Margin="0" Padding="12,0,12,0" Text="Selected"/>
       </StackPanel>
     </Button>
 
-    <Button Margin="0,0,6,0" 
-            Padding="6,7,6,7"
-            IsEnabled="{Binding !!Project.SelectedItem}"
-            DockPanel.Dock="Right"
-            ToolTip.Tip="Preview">
-      <Button.Flyout>
-        <Flyout ShowMode="TransientWithDismissOnPointerMoveAway" 
-                Placement="BottomEdgeAlignedRight">
-          <views:PreviewView MaxHeight="400" MaxWidth="400" />
-        </Flyout>
-      </Button.Flyout>
-      <PathIcon Width="16" Height="16" 
-                Margin="6,0,6,0"
-                Data="{DynamicResource PreviewIcon}"/>
-    </Button>
-
-    <Button Command="{Binding CopySelectedCommand}"
+    <Button Command="{Binding CopyAllCommand}"
             CommandParameter="XAML"
-            IsEnabled="{Binding !!Project.SelectedItem}"
+            IsEnabled="{Binding !!Project.Items.Count}"
             Padding="6,6,6,7"
-            Margin="0,0,12,0"
-            DockPanel.Dock="Right"
-            ToolTip.Tip="Copy Selected">
+            Margin="0,0,6,0"
+            DockPanel.Dock="Left"
+            ToolTip.Tip="Copy All">
       <StackPanel Orientation="Horizontal">
         <PathIcon Width="16" Height="16" 
                   Margin="6,0,0,0"
                   Data="{DynamicResource CopyIcon}"/>
-        <TextBlock Margin="0" Padding="12,0,12,0" Text="Selected"/>
+        <TextBlock Margin="0" Padding="12,0,12,0" Text="All"/>
       </StackPanel>
     </Button>
 
-    <Button Command="{Binding ExportSelectedCommand}"
+    <Separator DockPanel.Dock="Left" Background="{DynamicResource SystemChromeAltLowColor}" 
+               Opacity="0.3" 
+               Width="0.55" 
+               Height="NaN"
+               Margin="6,6,6,7"/>
+
+    <Button Command="{Binding ClipboardCommand}"
             CommandParameter="XAML"
-            IsEnabled="{Binding !!Project.SelectedItem}"
             Padding="6,6,6,7"
-            Margin="0,0,12,0"
-            DockPanel.Dock="Right"
-            ToolTip.Tip="Export Selected">
+            Margin="6,0,6,0"
+            DockPanel.Dock="Left"
+            ToolTip.Tip="Paste Svg from Clipboard and Copy as Xaml">
       <StackPanel Orientation="Horizontal">
         <PathIcon Width="16" Height="16" 
                   Margin="6,0,0,0"
-                  Data="{DynamicResource SaveIcon}"/>
-        <TextBlock Margin="0" Padding="12,0,12,0" Text="Selected"/>
+                  Data="{DynamicResource PasteIcon}"/>
+        <PathIcon Width="16" Height="16" 
+                  Margin="6,0,6,0"
+                  Data="{DynamicResource ArrowIcon}"/>
+        <PathIcon Width="16" Height="16" 
+                  Margin="0,0,6,0"
+                  Data="{DynamicResource CopyIcon}"/>
       </StackPanel>
     </Button>
 
-    <Button Command="{Binding CopyAllCommand}"
+    <Separator DockPanel.Dock="Left" Background="{DynamicResource SystemChromeAltLowColor}" 
+               Opacity="0.3" 
+               Width="0.55" 
+               Height="NaN"
+               Margin="6,6,6,7"/>
+
+    <Button Command="{Binding ExportSelectedCommand}"
             CommandParameter="XAML"
-            IsEnabled="{Binding !!Project.Items.Count}"
+            IsEnabled="{Binding !!Project.SelectedItem}"
             Padding="6,6,6,7"
-            Margin="0,0,12,0"
-            DockPanel.Dock="Right"
-            ToolTip.Tip="Copy All">
+            Margin="6,0,12,0"
+            DockPanel.Dock="Left"
+            ToolTip.Tip="Export Selected">
       <StackPanel Orientation="Horizontal">
         <PathIcon Width="16" Height="16" 
                   Margin="6,0,0,0"
-                  Data="{DynamicResource CopyIcon}"/>
-        <TextBlock Margin="0" Padding="12,0,12,0" Text="All"/>
+                  Data="{DynamicResource SaveIcon}"/>
+        <TextBlock Margin="0" Padding="12,0,12,0" Text="Selected"/>
       </StackPanel>
     </Button>
 
     <Button Command="{Binding ExportAllCommand}"
             CommandParameter="XAML"
             IsEnabled="{Binding !!Project.Items.Count}"
             Padding="6,6,6,7"
-            Margin="0,0,12,0"
-            DockPanel.Dock="Right"
+            Margin="0,0,7,0"
+            DockPanel.Dock="Left"
             ToolTip.Tip="Export All">
       <StackPanel Orientation="Horizontal">
         <PathIcon Width="16" Height="16" 
@@ -106,25 +107,36 @@
       </StackPanel>
     </Button>
 
-    <Button Command="{Binding ClipboardCommand}"
-            CommandParameter="XAML"
-            Padding="6,6,6,7"
-            Margin="0,0,12,0"
+    <Button x:Name="ThemeButton"
+            Background="Transparent"
+            Padding="0,6,0,7"
+            Margin="0,0,0,0"
             DockPanel.Dock="Right"
-            ToolTip.Tip="Paste Svg from Clipboard and Copy as Xaml">
+            ToolTip.Tip="Switch between the Light and Dark mode theme.">
       <StackPanel Orientation="Horizontal">
-        <PathIcon Width="16" Height="16" 
-                  Margin="6,0,0,0"
-                  Data="{DynamicResource PasteIcon}"/>
         <PathIcon Width="16" Height="16" 
                   Margin="6,0,6,0"
-                  Data="{DynamicResource ArrowIcon}"/>
-        <PathIcon Width="16" Height="16" 
-                  Margin="0,0,6,0"
-                  Data="{DynamicResource CopyIcon}"/>
+                  Opacity="0.6"
+                  Data="{DynamicResource DarkTheme}"/>
       </StackPanel>
     </Button>
 
+    <Button Margin="0,0,6,0" 
+            Padding="6,7,6,7"
+            IsEnabled="{Binding !!Project.SelectedItem}"
+            DockPanel.Dock="Right"
+            ToolTip.Tip="Preview">
+      <Button.Flyout>
+        <Flyout ShowMode="TransientWithDismissOnPointerMoveAway" 
+                Placement="BottomEdgeAlignedRight">
+          <views:PreviewView MaxHeight="400" MaxWidth="400" />
+        </Flyout>
+      </Button.Flyout>
+      <PathIcon Width="16" Height="16" 
+                Margin="6,0,6,0"
+                Data="{DynamicResource PreviewIcon}"/>
+    </Button>
+
   </DockPanel>
 
 </UserControl>