From 3f728624d0a2fd6a2d156c7d76c34a8c0c9b1c6a Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Fri, 8 May 2026 17:44:08 +0300
Subject: [PATCH] add Lock button, change labels, reorder buttons

---
 .../ViewModels/RepositoryWindowViewModel.cs   | 11 +++--
 src/KeyKeeper/Views/RepositoryWindow.axaml    | 46 +++++++++++--------
 src/KeyKeeper/Views/RepositoryWindow.axaml.cs |  8 ++++
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
index 0ca216c..e172410 100644
--- a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
+++ b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
@@ -89,6 +89,13 @@ public partial class RepositoryWindowViewModel : ViewModelBase
         LockTimerDisplay = string.Empty;
     }
 
+    public void Lock()
+    {
+        StopLockTimer();
+        passStore.Lock();
+        UpdateLockStatus();
+    }
+
     private void OnLockTimerTick(object? sender, EventArgs e)
     {
         var elapsed = DateTime.UtcNow - _timerStart;
@@ -96,9 +103,7 @@ public partial class RepositoryWindowViewModel : ViewModelBase
 
         if (remaining <= TimeSpan.Zero)
         {
-            StopLockTimer();
-            passStore.Lock();
-            UpdateLockStatus();
+            Lock();
             return;
         }
 
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index 0524298..33f6eee 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -84,30 +84,14 @@
                             </TreeView.ItemTemplate>
                         </TreeView>
 
-                        <!-- Save Passwords -->
-                        <Button Content="Save"
+                        <!-- New Entry -->
+                        <Button Content="New Password"
                                 Classes="accentSidebarButton"
-                                Click="SaveButton_Click"
+                                Click="AddEntryButton_Click"
                                 Height="30"
                                 HorizontalAlignment="Left"
                                 Margin="0,20,0,0"/>
 
-                        <!-- New Entry -->
-                        <Button Content="New Password"
-                                        Classes="accentSidebarButton"
-                                        Click="AddEntryButton_Click"
-                                        Height="30"
-                                        HorizontalAlignment="Left"
-                                        Margin="0,20,0,0"/>
-
-                        <!-- Edit Selected Entry -->
-                        <Button Content="Edit Selected Password"
-                                        Classes="accentSidebarButton"
-                                        Click="EditEntryButton_Click"
-                                        Height="30"
-                                        HorizontalAlignment="Left"
-                                        Margin="0,20,0,0"/>
-
                         <!-- New Group -->
                         <Button Content="New Group"
                                         Classes="accentSidebarButton"
@@ -115,6 +99,30 @@
                                         Height="30"
                                         HorizontalAlignment="Left"
                                         Margin="0,20,0,0"/>
+
+                        <!-- Edit Selected Entry -->
+                        <Button Content="Edit Selected Password"
+                                Classes="accentSidebarButton"
+                                Click="EditEntryButton_Click"
+                                Height="30"
+                                HorizontalAlignment="Left"
+                                Margin="0,20,0,0"/>
+
+                        <!-- Save Passwords -->
+                        <Button Content="Save Vault"
+                                Classes="accentSidebarButton"
+                                Click="SaveButton_Click"
+                                Height="30"
+                                HorizontalAlignment="Left"
+                                Margin="0,20,0,0"/>
+
+                        <!-- Lock -->
+                        <Button Content="Lock Vault"
+                                Classes="accentSidebarButton"
+                                Click="LockButton_Click"
+                                Height="30"
+                                HorizontalAlignment="Left"
+                                Margin="0,20,0,0" />
                     </StackPanel>
                 </Border>
 
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 4c39405..a084220 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -206,6 +206,14 @@ public partial class RepositoryWindow : Window
         }
     }
 
+    private void LockButton_Click(object sender, RoutedEventArgs args)
+    {
+        if (DataContext is RepositoryWindowViewModel vm)
+        {
+            vm.Lock();
+        }
+    }
+
     private void Entry_DoubleTapped(object sender, TappedEventArgs args)
     {
         if (args.Source is StyledElement s && s.DataContext is PassStoreEntry ent)