From 16682b853917abbe0416cfd6c892abf0aa1e9b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miskolczi=20Rich=C3=A1rd?= Date: Tue, 28 Oct 2025 11:38:18 +0100 Subject: [PATCH] Placeholder store removed, implemented creating default if none exist --- src/App/UI/MainWindow/MainWindow.cs | 2 +- src/App/UI/MainWindow/MainWindow.xml | 22 +--------------------- src/App/UI/MainWindow/ShortcutSidebar.cs | 3 ++- src/App/ViewModels/PasswordList.cs | 4 ++-- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/App/UI/MainWindow/MainWindow.cs b/src/App/UI/MainWindow/MainWindow.cs index 2249962..3517679 100644 --- a/src/App/UI/MainWindow/MainWindow.cs +++ b/src/App/UI/MainWindow/MainWindow.cs @@ -32,7 +32,7 @@ public partial class MainWindow LoadDefaultShortcuts(); } - passwordCollection = new PasswordList(passwordList); + passwordCollection = new PasswordList(passwordList, passwordStoreService); } private void SetSearchBarVisible(object sender, EventArgs e) diff --git a/src/App/UI/MainWindow/MainWindow.xml b/src/App/UI/MainWindow/MainWindow.xml index 6c22c69..4936161 100644 --- a/src/App/UI/MainWindow/MainWindow.xml +++ b/src/App/UI/MainWindow/MainWindow.xml @@ -120,28 +120,8 @@ - - Default - /home/typo/.password-store - - - center - - - - list-add-symbolic - - - - + - diff --git a/src/App/UI/MainWindow/ShortcutSidebar.cs b/src/App/UI/MainWindow/ShortcutSidebar.cs index 5e39436..836e862 100644 --- a/src/App/UI/MainWindow/ShortcutSidebar.cs +++ b/src/App/UI/MainWindow/ShortcutSidebar.cs @@ -6,6 +6,7 @@ namespace Keychain.UI; public partial class MainWindow { + private const string DEFAULT_SHORTCUT_NAME = "Keychain"; private readonly IPasswordStoreService passwordStoreService; private PreferencesGroup shortcutsGroup; @@ -21,7 +22,7 @@ public partial class MainWindow private void LoadDefaultShortcuts() { - shortcuts.Add(new PasswordStoreViewModel(displayName: "Default", path: Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "/.password_store")); + shortcuts.Add(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "/.password_store", DEFAULT_SHORTCUT_NAME); } // private void UpdateShortcutName(PasswordStoreViewModel shortcut, string newName) diff --git a/src/App/ViewModels/PasswordList.cs b/src/App/ViewModels/PasswordList.cs index 7d43b6d..816f4d1 100644 --- a/src/App/ViewModels/PasswordList.cs +++ b/src/App/ViewModels/PasswordList.cs @@ -8,11 +8,11 @@ namespace Keychain.ViewModels; public class PasswordList : ObservableCollection { - private readonly IPasswordService _passwordService; + private readonly IPasswordStoreService _passwordService; private readonly PreferencesGroup list; private Dictionary itemToRowMap = new(); - public PasswordList(PreferencesGroup list, IPasswordService passwordService) + public PasswordList(PreferencesGroup list, IPasswordStoreService passwordService) : base() { this.list = list;