Просмотр исходного кода

Requried class "Standard" on all Borders

Kenric Nugteren 4 месяцев назад
Родитель
Сommit
72ed001eb6

+ 4 - 4
PRS.Avalonia/PRS.Avalonia/Components/ListView/PrsListView.axaml

@@ -76,10 +76,10 @@
             >
         </ListBox>
         
-        <Border
-            Grid.Row="3"
-            Grid.Column="0"
-            IsVisible="{Binding RefreshVisible}">
+        <Border Classes="Standard"
+				Grid.Row="3"
+				Grid.Column="0"
+				IsVisible="{Binding RefreshVisible}">
             <DockPanel>
                 <Label Content="{Binding Repository.ItemCount, FallbackValue={x:Null}, StringFormat=' {0} records'}" DockPanel.Dock="Right"></Label>
                 <Label Content="{Binding Repository.LastUpdated, FallbackValue={x:Null}, Converter={StaticResource DateTimeToAgeConverter}}" DockPanel.Dock="Right"></Label>

+ 6 - 7
PRS.Avalonia/PRS.Avalonia/HomePage/HomePageView.axaml

@@ -28,13 +28,12 @@
             Content="CLOCK ON"
             IsVisible="{Binding ClockOnVisible}" />
 
-        <Border
-            Classes="Standard"
-            Grid.Row="0"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Padding="10"
-            IsVisible="{Binding SplashVisible}">
+        <Border Classes="Standard"
+				Grid.Row="0"
+				Grid.Column="0"
+				Grid.ColumnSpan="2"
+				Padding="10"
+				IsVisible="{Binding SplashVisible}">
             <Image>
                 <Image.Source>
                     <SvgImage Source="../Images/badge.svg" />

+ 20 - 21
PRS.Avalonia/PRS.Avalonia/Login/PinView.axaml

@@ -43,42 +43,41 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <Border
-                Grid.Column="0"
-                Margin="10,0,10,0"
-                Padding="10"
-                Background="{Binding Char1, Converter={StaticResource BooleanToColorConverter}}">
+            <Border Classes="Standard"
+					Grid.Column="0"
+					Margin="10,0,10,0"
+					Padding="10"
+					Background="{Binding Char1, Converter={StaticResource BooleanToColorConverter}}">
                 <Image IsVisible="{Binding Char1}">
                     <SvgImage Source="../Images/tick.svg" />
                 </Image>
             </Border>
 
-            <Border
-                Grid.Column="1"
-                Margin="10,0"
-                Padding="10"
-                Background="{Binding Char2, Converter={StaticResource BooleanToColorConverter}}">
+            <Border Classes="Standard"
+					Grid.Column="1"
+					Margin="10,0"
+					Padding="10"
+					Background="{Binding Char2, Converter={StaticResource BooleanToColorConverter}}">
                 <Image IsVisible="{Binding Char2}">
                     <SvgImage Source="../Images/tick.svg" />
                 </Image>
             </Border>
 
-            <Border
-                Grid.Column="2"
-                Margin="10,0,10,0"
-                Padding="10"
-                Background="{Binding Char3, Converter={StaticResource BooleanToColorConverter}}">
+            <Border Classes="Standard"
+					Grid.Column="2"
+					Margin="10,0,10,0"
+					Padding="10"
+					Background="{Binding Char3, Converter={StaticResource BooleanToColorConverter}}">
                 <Image IsVisible="{Binding Char3}">
                     <SvgImage Source="../Images/tick.svg" />
                 </Image>
             </Border>
 
-            <Border
-                
-                Grid.Column="3"
-                Margin="10,0,10,0"
-                Padding="10"
-                Background="{Binding Char4, Converter={StaticResource BooleanToColorConverter}}">
+            <Border Classes="Standard"
+					Grid.Column="3"
+					Margin="10,0,10,0"
+					Padding="10"
+					Background="{Binding Char4, Converter={StaticResource BooleanToColorConverter}}">
                 <Image IsVisible="{Binding Char4}">
                     <SvgImage Source="../Images/tick.svg" />
                 </Image>

+ 4 - 4
PRS.Avalonia/PRS.Avalonia/Modules/MyHR/MyHRDetails/MyHRDetailsView.axaml

@@ -46,8 +46,8 @@
             Grid.Row="4"
             Content="Profile Image" />
 
-        <Border
-            Grid.Row="5">
+        <Border Classes="Standard"
+				Grid.Row="5">
             <Grid>
                 <Image
                     Grid.Row="0"
@@ -78,8 +78,8 @@
             Content="Signature" />
 
 
-        <Border
-            Grid.Row="7">
+        <Border Classes="Standard"
+				Grid.Row="7">
             <Grid>
                 <Image
                     Grid.Row="0"

+ 3 - 1
PRS.Avalonia/PRS.Avalonia/Settings/SettingsViewModel.cs

@@ -54,7 +54,7 @@ public partial class SettingsViewModel : ViewModelBase
                 );
             menu.AddSeparator();
             menu.AddItem("Add Profile", AddProfile);
-            menu.AddItem("Delete Profile", DeleteProfile);
+            menu.AddItem("Delete Profile", DeleteProfile, () => DatabaseSettings.Count > 1);
             menu.AddSeparator();
             menu.AddItem("Import", ImportProfiles);
             menu.AddItem("Export", ExportProfiles);
@@ -147,6 +147,8 @@ public partial class SettingsViewModel : ViewModelBase
 
     private Task<bool> DeleteProfile()
     {
+        if (DatabaseSettings.Count <= 1) return Task.FromResult(false);
+
         DatabaseSettings.Remove(CurrentDatabaseName);
         OpenProfile(CurrentDatabaseName);
         return Task.FromResult(true);