mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-12-23 22:39:43 -05:00
Add system tray icon for "Toggle Window" (#3244)
* Fixes #3145 The system tray menu used to have three items (toggle window, lock database, quit) of which only two had an icon, which looked strange and unintended. This commit adds an icon for the "Toggle window" menu item. * Use a padlock icon for the "Lock DB" tray menu item Originally, icon `document-encryt.png` was used, however theming seems to be getting in the way by sometimes displaying a plain "document" icon instead. Copied the icon files to `database-lock.png` and used that one for the "lock database" tray menu item instead. * In Database Settings, use the "security-high" icon for "Security" Previously, the "document-encrypt" icon was used, which should be something like a padlock but which, due to theming, somethings fell back to a generic document icon (page of paper). The "document-encrypt" icon is no longer used and was removed.
This commit is contained in:
parent
b13454eeb4
commit
293ef357fc
2
COPYING
2
COPYING
@ -160,11 +160,11 @@ Comment: based on Nuvola icon theme
|
||||
Files: share/icons/application/*/actions/application-exit.png
|
||||
share/icons/application/*/actions/chronometer.png
|
||||
share/icons/application/*/actions/configure.png
|
||||
share/icons/application/*/actions/database-lock.png
|
||||
share/icons/application/*/actions/dialog-close.png
|
||||
share/icons/application/*/actions/dialog-ok.png
|
||||
share/icons/application/*/actions/document-close.png
|
||||
share/icons/application/*/actions/document-edit.png
|
||||
share/icons/application/*/actions/document-encrypt.png
|
||||
share/icons/application/*/actions/document-new.png
|
||||
share/icons/application/*/actions/document-open.png
|
||||
share/icons/application/*/actions/document-properties.png
|
||||
|
Before Width: | Height: | Size: 454 B After Width: | Height: | Size: 454 B |
Before Width: | Height: | Size: 583 B After Width: | Height: | Size: 583 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@ -290,7 +290,7 @@ MainWindow::MainWindow()
|
||||
m_ui->actionDatabaseClose->setIcon(filePath()->icon("actions", "document-close"));
|
||||
m_ui->actionChangeDatabaseSettings->setIcon(filePath()->icon("actions", "document-edit"));
|
||||
m_ui->actionChangeMasterKey->setIcon(filePath()->icon("actions", "database-change-key"));
|
||||
m_ui->actionLockDatabases->setIcon(filePath()->icon("actions", "document-encrypt"));
|
||||
m_ui->actionLockDatabases->setIcon(filePath()->icon("actions", "database-lock"));
|
||||
m_ui->actionQuit->setIcon(filePath()->icon("actions", "application-exit"));
|
||||
|
||||
m_ui->actionEntryNew->setIcon(filePath()->icon("actions", "entry-new"));
|
||||
@ -977,6 +977,7 @@ void MainWindow::updateTrayIcon()
|
||||
|
||||
QAction* actionToggle = new QAction(tr("Toggle window"), menu);
|
||||
menu->addAction(actionToggle);
|
||||
actionToggle->setIcon(filePath()->icon("apps", "keepassxc"));
|
||||
|
||||
menu->addAction(m_ui->actionLockDatabases);
|
||||
|
||||
|
@ -77,7 +77,7 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent)
|
||||
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
|
||||
|
||||
m_ui->categoryList->addCategory(tr("General"), FilePath::instance()->icon("categories", "preferences-other"));
|
||||
m_ui->categoryList->addCategory(tr("Security"), FilePath::instance()->icon("actions", "document-encrypt"));
|
||||
m_ui->categoryList->addCategory(tr("Security"), FilePath::instance()->icon("actions", "security-high"));
|
||||
m_ui->stackedWidget->addWidget(m_generalWidget);
|
||||
|
||||
m_ui->stackedWidget->addWidget(m_securityTabWidget);
|
||||
|
Loading…
Reference in New Issue
Block a user