From b2c0fb53bc567abe0beb79b5bfd661393be0b62d Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Sat, 3 Sep 2022 09:17:18 -0400 Subject: [PATCH] Improve various application icons --- COPYING | 31 +++++++++++++++++-- .../scalable/actions/attributes-copy.svg | 1 + .../scalable/actions/database-search.svg | 1 + .../application/scalable/actions/qrcode.svg | 1 + .../scalable/actions/tag-multiple.svg | 1 + .../scalable/actions/totp-copy.svg | 1 + .../scalable/actions/totp-edit.svg | 1 + .../actions/{chronometer.svg => totp.svg} | 0 share/icons/icons.qrc | 8 ++++- src/autotype/AutoTypeSelectDialog.cpp | 2 +- src/gui/EntryPreviewWidget.cpp | 2 +- src/gui/MainWindow.cpp | 7 +++++ src/gui/entry/EntryModel.cpp | 4 +-- 13 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 share/icons/application/scalable/actions/attributes-copy.svg create mode 100644 share/icons/application/scalable/actions/database-search.svg create mode 100644 share/icons/application/scalable/actions/qrcode.svg create mode 100644 share/icons/application/scalable/actions/tag-multiple.svg create mode 100644 share/icons/application/scalable/actions/totp-copy.svg create mode 100644 share/icons/application/scalable/actions/totp-edit.svg rename share/icons/application/scalable/actions/{chronometer.svg => totp.svg} (100%) diff --git a/COPYING b/COPYING index 35cfc1b1ee..4325e067b9 100644 --- a/COPYING +++ b/COPYING @@ -144,10 +144,24 @@ Files: share/icons/badges/2_Expired.svg Copyright: 2022 KeePassXC Team License: MIT -Files: share/icons/application/scalable/actions/chevron-double-down.svg +Files: share/icons/application/scalable/actions/application-exit.svg + share/icons/application/scalable/actions/attributes-copy.svg + share/icons/application/scalable/actions/auto-type.svg + share/icons/application/scalable/actions/bugreport.svg + share/icons/application/scalable/actions/chevron-double-down.svg share/icons/application/scalable/actions/chevron-double-right.svg + share/icons/application/scalable/actions/totp.svg + share/icons/application/scalable/actions/totp-copy.svg + share/icons/application/scalable/actions/totp-edit.svg + share/icons/application/scalable/actions/clipboard-text.svg + share/icons/application/scalable/actions/configure.svg + share/icons/application/scalable/actions/database-change-key.svg share/icons/application/scalable/actions/database-lock.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/dialog-close.svg + share/icons/application/scalable/actions/dialog-ok.svg share/icons/application/scalable/actions/document-close.svg share/icons/application/scalable/actions/document-edit.svg share/icons/application/scalable/actions/document-export.svg @@ -159,43 +173,56 @@ Files: share/icons/application/scalable/actions/chevron-double-down.svg share/icons/application/scalable/actions/document-save.svg share/icons/application/scalable/actions/document-save-as.svg share/icons/application/scalable/actions/document-save-copy.svg + share/icons/application/scalable/actions/donate.svg share/icons/application/scalable/actions/edit-clear-locationbar-ltr.svg share/icons/application/scalable/actions/edit-clear-locationbar-rtl.svg share/icons/application/scalable/actions/entry-clone.svg share/icons/application/scalable/actions/entry-delete.svg + share/icons/application/scalable/actions/entry-restore.svg share/icons/application/scalable/actions/entry-edit.svg share/icons/application/scalable/actions/entry-new.svg share/icons/application/scalable/actions/favicon-download.svg share/icons/application/scalable/actions/fingerprint.svg - share/icons/application/scalable/actions/group-clone.svg + share/icons/application/scalable/actions/getting-started.svg share/icons/application/scalable/actions/group-delete.svg share/icons/application/scalable/actions/group-edit.svg + share/icons/application/scalable/actions/group-clone.svg share/icons/application/scalable/actions/group-empty-trash.svg share/icons/application/scalable/actions/group-new.svg share/icons/application/scalable/actions/hammer-wrench.svg share/icons/application/scalable/actions/health.svg share/icons/application/scalable/actions/help-about.svg share/icons/application/scalable/actions/lock-question.svg + share/icons/application/scalable/actions/keyboard-shortcuts.svg share/icons/application/scalable/actions/message-close.svg share/icons/application/scalable/actions/move-down.svg share/icons/application/scalable/actions/move-up.svg + share/icons/application/scalable/actions/object-locked.svg + share/icons/application/scalable/actions/object-unlocked.svg share/icons/application/scalable/actions/paperclip.svg share/icons/application/scalable/actions/password-copy.svg share/icons/application/scalable/actions/password-generator.svg share/icons/application/scalable/actions/password-show-off.svg share/icons/application/scalable/actions/password-show-on.svg + share/icons/application/scalable/actions/qrcode.svg share/icons/application/scalable/actions/refresh.svg share/icons/application/scalable/actions/reports.svg share/icons/application/scalable/actions/reports-exclude.svg + share/icons/application/scalable/actions/sort-alphabetical-ascending.svg + share/icons/application/scalable/actions/sort-alphabetical-descending.svg share/icons/application/scalable/actions/statistics.svg share/icons/application/scalable/actions/system-help.svg share/icons/application/scalable/actions/system-search.svg + share/icons/application/scalable/actions/system-software-update.svg share/icons/application/scalable/actions/tag.svg + share/icons/application/scalable/actions/tag-multiple.svg share/icons/application/scalable/actions/tag-search.svg share/icons/application/scalable/actions/trash.svg share/icons/application/scalable/actions/url-copy.svg + share/icons/application/scalable/actions/user-guide.svg share/icons/application/scalable/actions/username-copy.svg share/icons/application/scalable/actions/view-history.svg + share/icons/application/scalable/actions/web.svg share/icons/application/scalable/apps/internet-web-browser.svg share/icons/application/scalable/apps/keepassxc.svg share/icons/application/scalable/apps/keepassxc-dark.svg diff --git a/share/icons/application/scalable/actions/attributes-copy.svg b/share/icons/application/scalable/actions/attributes-copy.svg new file mode 100644 index 0000000000..b4e4725b77 --- /dev/null +++ b/share/icons/application/scalable/actions/attributes-copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/icons/application/scalable/actions/database-search.svg b/share/icons/application/scalable/actions/database-search.svg new file mode 100644 index 0000000000..a1a30a6758 --- /dev/null +++ b/share/icons/application/scalable/actions/database-search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/icons/application/scalable/actions/qrcode.svg b/share/icons/application/scalable/actions/qrcode.svg new file mode 100644 index 0000000000..7778d10542 --- /dev/null +++ b/share/icons/application/scalable/actions/qrcode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/icons/application/scalable/actions/tag-multiple.svg b/share/icons/application/scalable/actions/tag-multiple.svg new file mode 100644 index 0000000000..925e47ed1e --- /dev/null +++ b/share/icons/application/scalable/actions/tag-multiple.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/icons/application/scalable/actions/totp-copy.svg b/share/icons/application/scalable/actions/totp-copy.svg new file mode 100644 index 0000000000..1f134017cd --- /dev/null +++ b/share/icons/application/scalable/actions/totp-copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/icons/application/scalable/actions/totp-edit.svg b/share/icons/application/scalable/actions/totp-edit.svg new file mode 100644 index 0000000000..b3814fc4dc --- /dev/null +++ b/share/icons/application/scalable/actions/totp-edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/icons/application/scalable/actions/chronometer.svg b/share/icons/application/scalable/actions/totp.svg similarity index 100% rename from share/icons/application/scalable/actions/chronometer.svg rename to share/icons/application/scalable/actions/totp.svg diff --git a/share/icons/icons.qrc b/share/icons/icons.qrc index 209a1d35cc..8c8c78211f 100644 --- a/share/icons/icons.qrc +++ b/share/icons/icons.qrc @@ -6,17 +6,21 @@ application/256x256/apps/keepassxc.png application/scalable/actions/application-exit.svg + application/scalable/actions/attributes-copy.svg application/scalable/actions/auto-type.svg application/scalable/actions/bugreport.svg application/scalable/actions/chevron-double-down.svg application/scalable/actions/chevron-double-right.svg - application/scalable/actions/chronometer.svg + application/scalable/actions/totp.svg + application/scalable/actions/totp-copy.svg + application/scalable/actions/totp-edit.svg application/scalable/actions/clipboard-text.svg application/scalable/actions/configure.svg application/scalable/actions/database-change-key.svg application/scalable/actions/database-lock.svg application/scalable/actions/database-lock-all.svg application/scalable/actions/database-merge.svg + application/scalable/actions/database-search.svg application/scalable/actions/dialog-close.svg application/scalable/actions/dialog-ok.svg application/scalable/actions/document-close.svg @@ -62,6 +66,7 @@ application/scalable/actions/password-generator.svg application/scalable/actions/password-show-off.svg application/scalable/actions/password-show-on.svg + application/scalable/actions/qrcode.svg application/scalable/actions/refresh.svg application/scalable/actions/reports.svg application/scalable/actions/reports-exclude.svg @@ -72,6 +77,7 @@ application/scalable/actions/system-search.svg application/scalable/actions/system-software-update.svg application/scalable/actions/tag.svg + application/scalable/actions/tag-multiple.svg application/scalable/actions/tag-search.svg application/scalable/actions/trash.svg application/scalable/actions/url-copy.svg diff --git a/src/autotype/AutoTypeSelectDialog.cpp b/src/autotype/AutoTypeSelectDialog.cpp index b9d20fe8df..38c1ac58c1 100644 --- a/src/autotype/AutoTypeSelectDialog.cpp +++ b/src/autotype/AutoTypeSelectDialog.cpp @@ -294,7 +294,7 @@ void AutoTypeSelectDialog::buildActionMenu() auto typeTotpAction = new QAction(icons()->icon("auto-type"), tr("Type {TOTP}"), this); auto copyUsernameAction = new QAction(icons()->icon("username-copy"), tr("Copy Username"), this); auto copyPasswordAction = new QAction(icons()->icon("password-copy"), tr("Copy Password"), this); - auto copyTotpAction = new QAction(icons()->icon("chronometer"), tr("Copy TOTP"), this); + auto copyTotpAction = new QAction(icons()->icon("totp"), tr("Copy TOTP"), this); m_actionMenu->addAction(typeUsernameAction); m_actionMenu->addAction(typePasswordAction); m_actionMenu->addAction(typeTotpAction); diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp index d7017a9b43..304fc733f7 100644 --- a/src/gui/EntryPreviewWidget.cpp +++ b/src/gui/EntryPreviewWidget.cpp @@ -45,7 +45,7 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent) m_ui->setupUi(this); // Entry - m_ui->entryTotpButton->setIcon(icons()->icon("chronometer")); + m_ui->entryTotpButton->setIcon(icons()->icon("totp")); m_ui->entryCloseButton->setIcon(icons()->icon("dialog-close")); m_ui->togglePasswordButton->setIcon(icons()->onOffIcon("password-show", true)); m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show", true)); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 7df74fdf9e..163ae70115 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -402,6 +402,13 @@ MainWindow::MainWindow() m_ui->actionEntryCopyUsername->setIcon(icons()->icon("username-copy")); m_ui->actionEntryCopyPassword->setIcon(icons()->icon("password-copy")); m_ui->actionEntryCopyURL->setIcon(icons()->icon("url-copy")); + m_ui->menuEntryCopyAttribute->setIcon(icons()->icon("attributes-copy")); + m_ui->menuEntryTotp->setIcon(icons()->icon("totp")); + m_ui->actionEntryTotp->setIcon(icons()->icon("totp")); + m_ui->actionEntryCopyTotp->setIcon(icons()->icon("totp-copy")); + m_ui->actionEntryTotpQRCode->setIcon(icons()->icon("qrcode")); + m_ui->actionEntrySetupTotp->setIcon(icons()->icon("totp-edit")); + m_ui->menuTags->setIcon(icons()->icon("tag-multiple")); m_ui->actionEntryDownloadIcon->setIcon(icons()->icon("favicon-download")); m_ui->actionGroupSortAsc->setIcon(icons()->icon("sort-alphabetical-ascending")); m_ui->actionGroupSortDesc->setIcon(icons()->icon("sort-alphabetical-descending")); diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp index 8d2bc30cd3..2a125a8818 100644 --- a/src/gui/entry/EntryModel.cpp +++ b/src/gui/entry/EntryModel.cpp @@ -291,7 +291,7 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const break; case Totp: if (entry->hasTotp()) { - return icons()->icon("chronometer"); + return icons()->icon("totp"); } break; case PasswordStrength: @@ -388,7 +388,7 @@ QVariant EntryModel::headerData(int section, Qt::Orientation orientation, int ro case Paperclip: return icons()->icon("paperclip"); case Totp: - return icons()->icon("chronometer"); + return icons()->icon("totp"); case PasswordStrength: return icons()->icon("lock-question"); }