diff options
author | Lorenzo Tucci <yamabiiko@protonmail.com> | 2021-07-02 12:33:12 +0300 |
---|---|---|
committer | Jonathan White <support@dmapps.us> | 2021-12-13 07:40:59 +0300 |
commit | c88d8c870fbbc1aaacc72975e046f0f777140145 (patch) | |
tree | 5c3913ae2bb3936372fa38a54d59db92b6c1d377 /src/gui | |
parent | 456726556dbf288fd881fcf453d7bb13c335f155 (diff) |
Add lock selected database action on toolbar
Closes #6445
Switch tab when locking a database and move Lock Database actions to the Database section of the toolbar.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/DatabaseTabWidget.cpp | 27 | ||||
-rw-r--r-- | src/gui/DatabaseTabWidget.h | 1 | ||||
-rw-r--r-- | src/gui/MainWindow.cpp | 30 | ||||
-rw-r--r-- | src/gui/MainWindow.ui | 29 |
4 files changed, 76 insertions, 11 deletions
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index bcdf8f10d..74ecc0a60 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -180,6 +180,33 @@ void DatabaseTabWidget::addDatabaseTab(const QString& filePath, } /** + * Tries to lock the database at the given index and if + * it succeeds proceed to switch to the first unlocked database tab + */ +void DatabaseTabWidget::lockAndSwitchToFirstUnlockedDatabase(int index) +{ + if (index == -1) { + index = currentIndex(); + } + auto dbWidget = databaseWidgetFromIndex(index); + if (!dbWidget) { + return; + } + + if (dbWidget->isLocked()) { + // Database is already locked, act like lock all databases instead + lockDatabases(); + } else if (dbWidget->lock()) { + for (int i = 0, c = count(); i < c; ++i) { + if (!databaseWidgetFromIndex(i)->isLocked()) { + setCurrentIndex(i); + return; + } + } + } +} + +/** * Add a new database tab containing the given DatabaseWidget * @param filePath * @param inBackground optional, don't focus tab after opening diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h index faad74552..ffcd9748f 100644 --- a/src/gui/DatabaseTabWidget.h +++ b/src/gui/DatabaseTabWidget.h @@ -47,6 +47,7 @@ public: bool hasLockableDatabases() const; public slots: + void lockAndSwitchToFirstUnlockedDatabase(int index = -1); void addDatabaseTab(const QString& filePath, bool inBackground = false, const QString& password = {}, diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 5aa39ad58..4d88b6e68 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -168,6 +168,15 @@ MainWindow::MainWindow() autoTypeButton->setPopupMode(QToolButton::MenuButtonPopup); } + auto databaseLockMenu = new QMenu({}, this); + databaseLockMenu->addAction(m_ui->actionLockAllDatabases); + m_ui->actionLockDatabaseToolbar->setMenu(databaseLockMenu); + auto databaseLockButton = + qobject_cast<QToolButton*>(m_ui->toolBar->widgetForAction(m_ui->actionLockDatabaseToolbar)); + if (databaseLockButton) { + databaseLockButton->setPopupMode(QToolButton::MenuButtonPopup); + } + restoreGeometry(config()->get(Config::GUI_MainWindowGeometry).toByteArray()); restoreState(config()->get(Config::GUI_MainWindowState).toByteArray()); @@ -261,7 +270,8 @@ MainWindow::MainWindow() setShortcut(m_ui->actionDatabaseSave, QKeySequence::Save, Qt::CTRL + Qt::Key_S); setShortcut(m_ui->actionDatabaseSaveAs, QKeySequence::SaveAs, Qt::CTRL + Qt::SHIFT + Qt::Key_S); setShortcut(m_ui->actionDatabaseClose, QKeySequence::Close, Qt::CTRL + Qt::Key_W); - m_ui->actionLockDatabases->setShortcut(Qt::CTRL + Qt::Key_L); + m_ui->actionLockDatabase->setShortcut(Qt::CTRL + Qt::Key_L); + m_ui->actionLockAllDatabases->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_L); setShortcut(m_ui->actionQuit, QKeySequence::Quit, Qt::CTRL + Qt::Key_Q); setShortcut(m_ui->actionEntryNew, QKeySequence::New, Qt::CTRL + Qt::Key_N); m_ui->actionEntryEdit->setShortcut(Qt::CTRL + Qt::Key_E); @@ -369,7 +379,9 @@ MainWindow::MainWindow() m_ui->actionReports->setIcon(icons()->icon("reports")); m_ui->actionDatabaseSettings->setIcon(icons()->icon("document-edit")); m_ui->actionDatabaseSecurity->setIcon(icons()->icon("database-change-key")); - m_ui->actionLockDatabases->setIcon(icons()->icon("database-lock")); + m_ui->actionLockDatabase->setIcon(icons()->icon("database-lock")); + m_ui->actionLockDatabaseToolbar->setIcon(icons()->icon("database-lock")); + m_ui->actionLockAllDatabases->setIcon(icons()->icon("database-lock-all")); m_ui->actionQuit->setIcon(icons()->icon("application-exit")); m_ui->actionDatabaseMerge->setIcon(icons()->icon("database-merge")); m_ui->menuImport->setIcon(icons()->icon("document-import")); @@ -460,7 +472,10 @@ MainWindow::MainWindow() connect(m_ui->actionImportOpVault, SIGNAL(triggered()), m_ui->tabWidget, SLOT(importOpVaultDatabase())); connect(m_ui->actionExportCsv, SIGNAL(triggered()), m_ui->tabWidget, SLOT(exportToCsv())); connect(m_ui->actionExportHtml, SIGNAL(triggered()), m_ui->tabWidget, SLOT(exportToHtml())); - connect(m_ui->actionLockDatabases, SIGNAL(triggered()), m_ui->tabWidget, SLOT(lockDatabases())); + connect( + m_ui->actionLockDatabase, SIGNAL(triggered()), m_ui->tabWidget, SLOT(lockAndSwitchToFirstUnlockedDatabase())); + connect(m_ui->actionLockDatabaseToolbar, SIGNAL(triggered()), m_ui->actionLockDatabase, SIGNAL(triggered())); + connect(m_ui->actionLockAllDatabases, SIGNAL(triggered()), m_ui->tabWidget, SLOT(lockDatabases())); connect(m_ui->actionQuit, SIGNAL(triggered()), SLOT(appExit())); m_actionMultiplexer.connect(m_ui->actionEntryNew, SIGNAL(triggered()), SLOT(createEntry())); @@ -781,7 +796,9 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode) m_ui->actionDatabaseOpen->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->menuRecentDatabases->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); m_ui->menuImport->setEnabled(inDatabaseTabWidgetOrWelcomeWidget); - m_ui->actionLockDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); + m_ui->actionLockDatabase->setEnabled(m_ui->tabWidget->hasLockableDatabases()); + m_ui->actionLockDatabaseToolbar->setEnabled(m_ui->tabWidget->hasLockableDatabases()); + m_ui->actionLockAllDatabases->setEnabled(m_ui->tabWidget->hasLockableDatabases()); if (inDatabaseTabWidget && m_ui->tabWidget->currentIndex() != -1) { DatabaseWidget* dbWidget = m_ui->tabWidget->currentDatabaseWidget(); @@ -924,6 +941,9 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode) m_ui->actionExportCsv->setEnabled(false); m_ui->actionExportHtml->setEnabled(false); m_ui->actionDatabaseMerge->setEnabled(false); + // Only disable the action in the database menu so that the + // menu remains active in the toolbar, if necessary + m_ui->actionLockDatabase->setEnabled(false); m_searchWidgetAction->setEnabled(false); break; @@ -1392,7 +1412,7 @@ void MainWindow::updateTrayIcon() menu->addAction(actionToggle); actionToggle->setIcon(icons()->icon("keepassxc-monochrome-dark")); - menu->addAction(m_ui->actionLockDatabases); + menu->addAction(m_ui->actionLockAllDatabases); #ifdef Q_OS_MACOS auto actionQuit = new QAction(tr("Quit KeePassXC"), menu); diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui index f83e8077d..c877313b9 100644 --- a/src/gui/MainWindow.ui +++ b/src/gui/MainWindow.ui @@ -216,7 +216,7 @@ <x>0</x> <y>0</y> <width>800</width> - <height>21</height> + <height>22</height> </rect> </property> <property name="contextMenuPolicy"> @@ -254,6 +254,9 @@ <addaction name="actionDatabaseSaveBackup"/> <addaction name="actionDatabaseClose"/> <addaction name="separator"/> + <addaction name="actionLockDatabase"/> + <addaction name="actionLockAllDatabases"/> + <addaction name="separator"/> <addaction name="actionReports"/> <addaction name="actionDatabaseSettings"/> <addaction name="actionDatabaseSecurity"/> @@ -355,7 +358,6 @@ <property name="title"> <string>&Tools</string> </property> - <addaction name="actionLockDatabases"/> <addaction name="actionPasswordGenerator"/> <addaction name="actionSettings"/> </widget> @@ -409,6 +411,7 @@ </attribute> <addaction name="actionDatabaseOpen"/> <addaction name="actionDatabaseSave"/> + <addaction name="actionLockDatabaseToolbar"/> <addaction name="separator"/> <addaction name="actionEntryNew"/> <addaction name="actionEntryEdit"/> @@ -419,8 +422,6 @@ <addaction name="actionEntryCopyURL"/> <addaction name="actionEntryAutoType"/> <addaction name="separator"/> - <addaction name="actionLockDatabases"/> - <addaction name="separator"/> <addaction name="actionPasswordGenerator"/> <addaction name="actionSettings"/> <addaction name="separator"/> @@ -773,12 +774,20 @@ <string>Open &URL</string> </property> </action> - <action name="actionLockDatabases"> + <action name="actionLockDatabase"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>&Lock Database</string> + </property> + </action> + <action name="actionLockAllDatabases"> <property name="enabled"> <bool>false</bool> </property> <property name="text"> - <string>&Lock Databases</string> + <string>Lock &All Databases</string> </property> </action> <action name="actionEntryCopyTitle"> @@ -1084,6 +1093,14 @@ <string notr="true">Ctrl+R</string> </property> </action> + <action name="actionLockDatabaseToolbar"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>&Lock Database</string> + </property> + </action> </widget> <customwidgets> <customwidget> |