Overhaul action states and add icons to toolbar

* Fixes #10981
keepassxreboot · Jul 28, 2024 · bf44f82 · bf44f82
1 parent e48ef80
commit bf44f82
Show file tree

Hide file tree

Showing 12 changed files with 249 additions and 260 deletions.
diff --git a/COPYING b/COPYING
@@ -155,6 +155,7 @@ Files: share/icons/application/scalable/actions/application-exit.svg
        share/icons/application/scalable/actions/database-lock-all.svg
        share/icons/application/scalable/actions/database-merge.svg
        share/icons/application/scalable/actions/database-search.svg
+       share/icons/application/scalable/actions/database-settings.svg
        share/icons/application/scalable/actions/dialog-close.svg
        share/icons/application/scalable/actions/dialog-ok.svg
        share/icons/application/scalable/actions/document-close.svg

diff --git a/share/icons/application/scalable/actions/database-settings.svg b/share/icons/application/scalable/actions/database-settings.svg
diff --git a/share/icons/application/scalable/actions/entry-delete.svg b/share/icons/application/scalable/actions/entry-delete.svg
diff --git a/share/icons/icons.qrc b/share/icons/icons.qrc
@@ -20,6 +20,7 @@
         <file>application/scalable/actions/database-lock-all.svg</file>
         <file>application/scalable/actions/database-merge.svg</file>
         <file>application/scalable/actions/database-search.svg</file>
+        <file>application/scalable/actions/database-settings.svg</file>
         <file>application/scalable/actions/dialog-close.svg</file>
         <file>application/scalable/actions/dialog-ok.svg</file>
         <file>application/scalable/actions/document-close.svg</file>

diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
@@ -537,25 +537,41 @@ bool DatabaseTabWidget::warnOnExport()
     return ans == MessageBox::Yes;
 }
 
-void DatabaseTabWidget::showDatabaseSecurity()
+void DatabaseTabWidget::showDatabaseSecurity(bool state)
 {
-    currentDatabaseWidget()->switchToDatabaseSecurity();
+    if (state) {
+        currentDatabaseWidget()->switchToDatabaseSecurity();
+    } else {
+        currentDatabaseWidget()->switchToMainView();
+    }
 }
 
-void DatabaseTabWidget::showDatabaseReports()
+void DatabaseTabWidget::showDatabaseReports(bool state)
 {
-    currentDatabaseWidget()->switchToDatabaseReports();
+    if (state) {
+        currentDatabaseWidget()->switchToDatabaseReports();
+    } else {
+        currentDatabaseWidget()->switchToMainView();
+    }
 }
 
-void DatabaseTabWidget::showDatabaseSettings()
+void DatabaseTabWidget::showDatabaseSettings(bool state)
 {
-    currentDatabaseWidget()->switchToDatabaseSettings();
+    if (state) {
+        currentDatabaseWidget()->switchToDatabaseSettings();
+    } else {
+        currentDatabaseWidget()->switchToMainView();
+    }
 }
 
 #ifdef WITH_XC_BROWSER_PASSKEYS
-void DatabaseTabWidget::showPasskeys()
+void DatabaseTabWidget::showPasskeys(bool state)
 {
-    currentDatabaseWidget()->switchToPasskeys();
+    if (state) {
+        currentDatabaseWidget()->switchToPasskeys();
+    } else {
+        currentDatabaseWidget()->switchToMainView();
+    }
 }
 
 void DatabaseTabWidget::importPasskey()

diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h
@@ -81,11 +81,11 @@ public slots:
     void unlockAnyDatabaseInDialog(DatabaseOpenDialog::Intent intent);
     void relockPendingDatabase();
 
-    void showDatabaseSecurity();
-    void showDatabaseReports();
-    void showDatabaseSettings();
+    void showDatabaseSecurity(bool state);
+    void showDatabaseReports(bool state);
+    void showDatabaseSettings(bool state);
 #ifdef WITH_XC_BROWSER_PASSKEYS
-    void showPasskeys();
+    void showPasskeys(bool state);
     void importPasskey();
     void importPasskeyToEntry();
     void removePasskeyFromEntry();

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -265,15 +265,26 @@ QSharedPointer<Database> DatabaseWidget::database() const
 
 DatabaseWidget::Mode DatabaseWidget::currentMode() const
 {
-    if (currentWidget() == nullptr) {
-        return Mode::None;
-    } else if (currentWidget() == m_mainWidget) {
-        return Mode::ViewMode;
-    } else if (currentWidget() == m_databaseOpenWidget) {
-        return Mode::LockedMode;
+    auto mode = Mode::None;
+    auto widget = currentWidget();
+    if (widget == m_mainWidget) {
+        mode = Mode::ViewMode;
+    } else if (widget == m_databaseOpenWidget) {
+        mode = Mode::LockedMode;
+    } else if (widget == m_reportsDialog) {
+        mode = m_reportsDialog->onPassKeysPage() ? Mode::PassKeysMode : Mode::ReportsMode;
+    } else if (widget == m_databaseSettingDialog) {
+        mode = Mode::DatabaseSettingsMode;
+    } else if (widget == m_editEntryWidget) {
+        mode = Mode::EditEntryMode;
+    } else if (widget == m_editGroupWidget) {
+        mode = Mode::EditGroupMode;
     } else {
-        return Mode::EditMode;
+        // We are missing a condition if we reach here
+        Q_ASSERT(false);
     }
+
+    return mode;
 }
 
 bool DatabaseWidget::isLocked() const

diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
@@ -64,8 +64,12 @@ class DatabaseWidget : public QStackedWidget
     {
         None,
         ViewMode,
-        EditMode,
-        LockedMode
+        EditEntryMode,
+        EditGroupMode,
+        LockedMode,
+        ReportsMode,
+        PassKeysMode,
+        DatabaseSettingsMode
     };
 
     explicit DatabaseWidget(QSharedPointer<Database> db, QWidget* parent = nullptr);