Merge remote-tracking branch 'origin/kenric' into frank

# Conflicts:
#	PRS.Avalonia/PRS.Avalonia/PRS.Avalonia.csproj

PRS.Avalonia/PRS.Avalonia/App.axaml

@@ -16,6 +16,7 @@
         <StyleInclude Source="avares://InABox.Avalonia/Theme/Styles.axaml" />
 		
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
+        <StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
 
 		<StyleInclude Source="avares://AvaloniaProgressRing/Styles/ProgressRing.xaml"/>
 		<StyleInclude Source="avares://PRS.Avalonia/Theme/ProgressRing.axaml"/>

PRS.Avalonia/PRS.Avalonia/Components/FormsEditor/DigitalFormsHostView.axaml

@@ -6,7 +6,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PRS.Avalonia.DigitalForms.DigitalFormsHostView"
 			 x:DataType="forms:IDigitalFormsHostViewModel">
-	<TabControl TabStripPlacement="Bottom">
+	<TabControl Classes="Standard" TabStripPlacement="Bottom">
 		<TabItem Header="Form">
 			<ScrollViewer>
 				<forms:DigitalFormViewer Name="Viewer"

PRS.Avalonia/PRS.Avalonia/Components/FormsEditor/Fields/DFOptionFieldControl.cs

@@ -40,6 +40,7 @@ public class ButtonsOptionControl : ContentControl, IOptionControl
 
         _tabStrip = new TabStrip();
         _tabStrip.Classes.Add("ButtonsList");
+        _tabStrip.Classes.Add("Standard");
 
         foreach (var option in options)
         {

PRS.Avalonia/PRS.Avalonia/Components/FormsList/FormsList.axaml

@@ -83,7 +83,7 @@
 				</DataTemplate>
 			</listView:PrsListView.ItemTemplate>
 		</listView:PrsListView>
-		<TabStrip Name="_tabList"
+		<TabStrip Name="_tabList" Classes="Standard"
 				  Grid.Row="1" Grid.Column="0"
 				  IsVisible="{Binding $parent[local:FormsList].SeparateHistory}"
 				  SelectionChanged="TabStrip_SelectionChanged"

PRS.Avalonia/PRS.Avalonia/Modules/DeliveryModule/Delivery/DeliveryView.axaml

@@ -6,7 +6,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PRS.Avalonia.Modules.DeliveryView"
              x:DataType="modules:DeliveryViewModel">
-    <TabControl TabStripPlacement="Bottom">
+    <TabControl TabStripPlacement="Bottom" Classes="Standard">
         
         <TabItem Header="Info">
             <modules:DeliveryDetailsView DataContext="{Binding .}"/>

PRS.Avalonia/PRS.Avalonia/Modules/Site/SiteDeliveries/SiteDeliveriesView.axaml

@@ -95,7 +95,7 @@
         </DataTemplate>
     </UserControl.Resources>
     
-    <TabControl TabStripPlacement="Bottom" SelectedIndex="0">
+    <TabControl TabStripPlacement="Bottom" SelectedIndex="0" Classes="Standard">
         <TabItem Header="Current">
             <listView:PrsListView 
                 ItemTemplate="{StaticResource DeliveryShellTemplate}"

PRS.Avalonia/PRS.Avalonia/Modules/WarehouseModule/WarehouseReceive/ConsignmentEdit/ConsignmentEditView.axaml

@@ -130,7 +130,7 @@
         
     </UserControl.Resources>
     
-    <TabControl TabStripPlacement="Bottom" SelectedIndex="0">
+    <TabControl Classes="Standard" TabStripPlacement="Bottom" SelectedIndex="0">
         <TabItem Header="Parcels">
             <listView:PrsListView
                 ItemTemplate="{StaticResource ConsignmentParcelShellTemplate}"

PRS.Avalonia/PRS.Avalonia/PRS.Avalonia.csproj

@@ -304,13 +304,10 @@
     <ItemGroup>
         
         <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
-        
+        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.2" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
-        
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-        
         <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.10" />
-        
         <PackageReference Include="Mapsui.Avalonia" Version="4.1.9" />
         <PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.71" />
         

PRS.Avalonia/PRS.Avalonia/TestView.axaml

@@ -3,7 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:prs="using:PRS.Avalonia"
+			 xmlns:components="using:InABox.Avalonia.Components"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PRS.Avalonia.TestView"
 			 x:DataType="prs:TestViewModel">
+	<components:ImageEditor Source="{SvgImage ../Images/cross.svg}"/>
 </UserControl>

PRS.Avalonia/PRS.Avalonia/TestViewModel.cs

@@ -12,4 +12,5 @@ namespace PRS.Avalonia;
 public partial class TestViewModel : ModuleViewModel
 {
     public override string Title => "Test";
+
 }