Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move icon handling from Resources to gui/Icons (#5506)

Browse Source
This commit is contained in:
louib 2020-10-05 20:41:00 -04:00 committed by GitHub
parent ba8611cf4c
commit af4ecb4aa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 411 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -126,6 +126,7 @@ set(keepassx_SOURCES
gui/PasswordEdit.cpp
gui/PasswordGeneratorWidget.cpp
gui/ApplicationSettingsWidget.cpp
gui/Icons.cpp
gui/SearchWidget.cpp
gui/SortFilterHideProxyModel.cpp
gui/SquareSvgWidget.cpp

6
src/autotype/AutoTypeSelectDialog.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -34,7 +34,7 @@
#include "autotype/AutoTypeSelectView.h"
#include "core/AutoTypeMatch.h"
#include "core/Config.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "gui/entry/AutoTypeMatchModel.h"
AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
@ -49,7 +49,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
setAttribute(Qt::WA_X11BypassTransientForHint);
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
setWindowTitle(tr("Auto-Type - KeePassXC"));
setWindowIcon(resources()->applicationIcon());
setWindowIcon(icons()->applicationIcon());
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
QRect screenGeometry = QApplication::screenAt(QCursor::pos())->availableGeometry();

4
src/browser/BrowserSettingsPage.cpp
View File

@ -20,7 +20,7 @@
#include "BrowserService.h"
#include "BrowserSettings.h"
#include "BrowserSettingsWidget.h"
#include "core/Resources.h"
#include "gui/Icons.h"
QString BrowserSettingsPage::name()
{
@ -29,7 +29,7 @@ QString BrowserSettingsPage::name()
QIcon BrowserSettingsPage::icon()
{
return Resources::instance()->icon("internet-web-browser");
return icons()->icon("internet-web-browser");
}
QWidget* BrowserSettingsPage::createWidget()

142
src/core/Resources.cpp
View File

@ -18,17 +18,13 @@
#include "Resources.h"
#include <QBitmap>
#include <QCoreApplication>
#include <QDir>
#include <QLibrary>
#include <QPainter>
#include <QStyle>
#include "config-keepassx.h"
#include "core/Config.h"
#include "core/Global.h"
#include "gui/MainWindow.h"
#include "gui/osutils/OSUtils.h"
Resources* Resources::m_instance(nullptr);
@ -96,138 +92,6 @@ QString Resources::wordlistPath(const QString& name) const
return dataPath(QStringLiteral("wordlists/%1").arg(name));
}
QIcon Resources::applicationIcon()
{
return icon("keepassxc", false);
}
QString Resources::trayIconAppearance() const
{
auto iconAppearance = config()->get(Config::GUI_TrayIconAppearance).toString();
if (iconAppearance.isNull()) {
#ifdef Q_OS_MACOS
iconAppearance = osUtils->isDarkMode() ? "monochrome-light" : "monochrome-dark";
#else
iconAppearance = "monochrome-light";
#endif
}
return iconAppearance;
}
QIcon Resources::trayIcon()
{
return trayIconUnlocked();
}
QIcon Resources::trayIconLocked()
{
auto iconApperance = trayIconAppearance();
if (iconApperance == "monochrome-light") {
return icon("keepassxc-monochrome-light-locked", false);
}
if (iconApperance == "monochrome-dark") {
return icon("keepassxc-monochrome-dark-locked", false);
}
return icon("keepassxc-locked", false);
}
QIcon Resources::trayIconUnlocked()
{
auto iconApperance = trayIconAppearance();
if (iconApperance == "monochrome-light") {
return icon("keepassxc-monochrome-light", false);
}
if (iconApperance == "monochrome-dark") {
return icon("keepassxc-monochrome-dark", false);
}
return icon("keepassxc", false);
}
QIcon Resources::icon(const QString& name, bool recolor, const QColor& overrideColor)
{
QIcon icon = m_iconCache.value(name);
if (!icon.isNull() && !overrideColor.isValid()) {
return icon;
}
// Resetting the application theme name before calling QIcon::fromTheme() is required for hacky
// QPA platform themes such as qt5ct, which randomly mess with the configured icon theme.
// If we do not reset the theme name here, it will become empty at some point, causing
// Qt to look for icons at the user-level and global default locations.
//
// See issue #4963: https://github.com/keepassxreboot/keepassxc/issues/4963
// and qt5ct issue #80: https://sourceforge.net/p/qt5ct/tickets/80/
QIcon::setThemeName("application");
icon = QIcon::fromTheme(name);
if (getMainWindow() && recolor) {
const QRect rect(0, 0, 48, 48);
QImage img = icon.pixmap(rect.width(), rect.height()).toImage();
img = img.convertToFormat(QImage::Format_ARGB32_Premultiplied);
icon = {};
QPainter painter(&img);
painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
if (!overrideColor.isValid()) {
QPalette palette = getMainWindow()->palette();
painter.fillRect(rect, palette.color(QPalette::Normal, QPalette::WindowText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal);
painter.fillRect(rect, palette.color(QPalette::Active, QPalette::ButtonText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Active);
painter.fillRect(rect, palette.color(QPalette::Active, QPalette::HighlightedText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Selected);
painter.fillRect(rect, palette.color(QPalette::Disabled, QPalette::WindowText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Disabled);
} else {
painter.fillRect(rect, overrideColor);
icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal);
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
icon.setIsMask(true);
#endif
}
if (!overrideColor.isValid()) {
m_iconCache.insert(name, icon);
}
return icon;
}
QIcon Resources::onOffIcon(const QString& name, bool recolor)
{
QString cacheName = "onoff/" + name;
QIcon icon = m_iconCache.value(cacheName);
if (!icon.isNull()) {
return icon;
}
const QSize size(48, 48);
QIcon on = Resources::icon(name + "-on", recolor);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::On);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::On);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::On);
QIcon off = Resources::icon(name + "-off", recolor);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::Off);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::Off);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::Off);
m_iconCache.insert(cacheName, icon);
return icon;
}
Resources::Resources()
{
const QString appDirPath = QCoreApplication::applicationDirPath();
@ -265,10 +129,6 @@ Resources* Resources::instance()
{
if (!m_instance) {
m_instance = new Resources();
Q_INIT_RESOURCE(icons);
QIcon::setThemeSearchPaths(QStringList{":/icons"} << QIcon::themeSearchPaths());
QIcon::setThemeName("application");
}
return m_instance;

11
src/core/Resources.h
View File

@ -19,9 +19,6 @@
#ifndef KEEPASSX_RESOURCES_H
#define KEEPASSX_RESOURCES_H
#include <QColor>
#include <QHash>
#include <QIcon>
#include <QString>
class Resources
@ -30,13 +27,6 @@ public:
QString dataPath(const QString& name) const;
QString pluginPath(const QString& name) const;
QString wordlistPath(const QString& name) const;
QIcon applicationIcon();
QIcon trayIcon();
QIcon trayIconLocked();
QIcon trayIconUnlocked();
QString trayIconAppearance() const;
QIcon icon(const QString& name, bool recolor = true, const QColor& overrideColor = QColor::Invalid);
QIcon onOffIcon(const QString& name, bool recolor = true);
static Resources* instance();
@ -47,7 +37,6 @@ private:
static Resources* m_instance;
QString m_dataPath;
QHash<QString, QIcon> m_iconCache;
Q_DISABLE_COPY(Resources)
};

4
src/fdosecrets/DatabaseSettingsPageFdoSecrets.cpp
View File

@ -19,7 +19,7 @@
#include "fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.h"
#include "core/Resources.h"
#include "gui/Icons.h"
QString DatabaseSettingsPageFdoSecrets::name()
{
@ -28,7 +28,7 @@ QString DatabaseSettingsPageFdoSecrets::name()
QIcon DatabaseSettingsPageFdoSecrets::icon()
{
return resources()->icon(QStringLiteral("freedesktop"));
return icons()->icon(QStringLiteral("freedesktop"));
}
QWidget* DatabaseSettingsPageFdoSecrets::createWidget()

4
src/fdosecrets/FdoSecretsPlugin.h
View File

@ -18,8 +18,8 @@
#ifndef KEEPASSXC_FDOSECRETSPLUGIN_H
#define KEEPASSXC_FDOSECRETSPLUGIN_H
#include "core/Resources.h"
#include "gui/ApplicationSettingsWidget.h"
#include "gui/Icons.h"
#include <QPointer>
#include <QScopedPointer>
@ -45,7 +45,7 @@ public:
QIcon icon() override
{
return Resources::instance()->icon("freedesktop");
return icons()->icon("freedesktop");
}
QWidget* createWidget() override;

6
src/fdosecrets/widgets/SettingsModels.cpp
View File

@ -24,9 +24,9 @@
#include "core/Database.h"
#include "core/DatabaseIcons.h"
#include "core/Resources.h"
#include "gui/DatabaseTabWidget.h"
#include "gui/DatabaseWidget.h"
#include "gui/Icons.h"
#include <QFileInfo>
@ -130,7 +130,7 @@ namespace FdoSecrets
case Qt::DisplayRole:
return tr("Unlock to show");
case Qt::DecorationRole:
return resources()->icon(QStringLiteral("object-locked"));
return icons()->icon(QStringLiteral("object-locked"));
case Qt::FontRole: {
QFont font;
font.setItalic(true);
@ -164,7 +164,7 @@ namespace FdoSecrets
case Qt::DisplayRole:
return tr("None");
case Qt::DecorationRole:
return resources()->icon(QStringLiteral("paint-none"));
return icons()->icon(QStringLiteral("paint-none"));
default:
return {};
}

12
src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
View File

@ -23,8 +23,8 @@
#include "fdosecrets/objects/Session.h"
#include "fdosecrets/widgets/SettingsModels.h"
#include "core/Resources.h"
#include "gui/DatabaseWidget.h"
#include "gui/Icons.h"
#include <QAction>
#include <QDBusConnection>
@ -63,7 +63,7 @@ namespace
// db settings
m_dbSettingsAct = new QAction(tr("Database settings"), this);
m_dbSettingsAct->setIcon(resources()->icon(QStringLiteral("document-edit")));
m_dbSettingsAct->setIcon(icons()->icon(QStringLiteral("document-edit")));
m_dbSettingsAct->setToolTip(tr("Edit database settings"));
m_dbSettingsAct->setEnabled(false);
connect(m_dbSettingsAct, &QAction::triggered, this, [this]() {
@ -77,7 +77,7 @@ namespace
// unlock/lock
m_lockAct = new QAction(tr("Unlock database"), this);
m_lockAct->setIcon(resources()->icon(QStringLiteral("object-locked")));
m_lockAct->setIcon(icons()->icon(QStringLiteral("object-locked")));
m_lockAct->setToolTip(tr("Unlock database to show more information"));
connect(m_lockAct, &QAction::triggered, this, [this]() {
if (!m_dbWidget) {
@ -135,13 +135,13 @@ namespace
}
connect(m_dbWidget, &DatabaseWidget::databaseLocked, this, [this]() {
m_lockAct->setText(tr("Unlock database"));
m_lockAct->setIcon(resources()->icon(QStringLiteral("object-locked")));
m_lockAct->setIcon(icons()->icon(QStringLiteral("object-locked")));
m_lockAct->setToolTip(tr("Unlock database to show more information"));
m_dbSettingsAct->setEnabled(false);
});
connect(m_dbWidget, &DatabaseWidget::databaseUnlocked, this, [this]() {
m_lockAct->setText(tr("Lock database"));
m_lockAct->setIcon(resources()->icon(QStringLiteral("object-unlocked")));
m_lockAct->setIcon(icons()->icon(QStringLiteral("object-unlocked")));
m_lockAct->setToolTip(tr("Lock database"));
m_dbSettingsAct->setEnabled(true);
});
@ -174,7 +174,7 @@ namespace
addWidget(spacer);
m_disconnectAct = new QAction(tr("Disconnect"), this);
m_disconnectAct->setIcon(resources()->icon(QStringLiteral("dialog-close")));
m_disconnectAct->setIcon(icons()->icon(QStringLiteral("dialog-close")));
m_disconnectAct->setToolTip(tr("Disconnect this application"));
connect(m_disconnectAct, &QAction::triggered, this, [this]() {
if (m_session) {

4
src/gui/AboutDialog.cpp
View File

@ -20,9 +20,9 @@
#include "ui_AboutDialog.h"
#include "config-keepassx.h"
#include "core/Resources.h"
#include "core/Tools.h"
#include "crypto/Crypto.h"
#include "gui/Icons.h"
#include <QClipboard>
@ -210,7 +210,7 @@ AboutDialog::AboutDialog(QWidget* parent)
nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4);
m_ui->nameLabel->setFont(nameLabelFont);
m_ui->iconLabel->setPixmap(resources()->applicationIcon().pixmap(48));
m_ui->iconLabel->setPixmap(icons()->applicationIcon().pixmap(48));
QString debugInfo = Tools::debugInfo().append("\n").append(Crypto::debugInfo());
m_ui->debugInfo->setPlainText(debugInfo);

8
src/gui/ApplicationSettingsWidget.cpp
View File

@ -25,8 +25,8 @@
#include "autotype/AutoType.h"
#include "core/Config.h"
#include "core/Global.h"
#include "core/Resources.h"
#include "core/Translator.h"
#include "gui/Icons.h"
#include "gui/MainWindow.h"
#include "gui/osutils/OSUtils.h"
@ -93,8 +93,8 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
m_secUi->setupUi(m_secWidget);
m_generalUi->setupUi(m_generalWidget);
addPage(tr("General"), Resources::instance()->icon("preferences-other"), m_generalWidget);
addPage(tr("Security"), Resources::instance()->icon("security-high"), m_secWidget);
addPage(tr("General"), icons()->icon("preferences-other"), m_generalWidget);
addPage(tr("Security"), icons()->icon("security-high"), m_secWidget);
if (!autoType()->isAvailable()) {
m_generalUi->generalSettingsTabWidget->removeTab(1);
@ -254,7 +254,7 @@ void ApplicationSettingsWidget::loadSettings()
m_generalUi->trayIconAppearance->addItem(tr("Monochrome (light)"), "monochrome-light");
m_generalUi->trayIconAppearance->addItem(tr("Monochrome (dark)"), "monochrome-dark");
m_generalUi->trayIconAppearance->addItem(tr("Colorful"), "colorful");
int trayIconIndex = m_generalUi->trayIconAppearance->findData(resources()->trayIconAppearance());
int trayIconIndex = m_generalUi->trayIconAppearance->findData(icons()->trayIconAppearance());
if (trayIconIndex > 0) {
m_generalUi->trayIconAppearance->setCurrentIndex(trayIconIndex);
}

8
src/gui/DatabaseOpenWidget.cpp
View File

@ -21,10 +21,10 @@
#include "core/Config.h"
#include "core/Database.h"
#include "core/Resources.h"
#include "crypto/Random.h"
#include "format/KeePass2Reader.h"
#include "gui/FileDialog.h"
#include "gui/Icons.h"
#include "gui/MainWindow.h"
#include "gui/MessageBox.h"
#include "keys/FileKey.h"
@ -71,14 +71,14 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(openDatabase()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
m_ui->hardwareKeyLabelHelp->setIcon(resources()->icon("system-help").pixmap(QSize(12, 12)));
m_ui->hardwareKeyLabelHelp->setIcon(icons()->icon("system-help").pixmap(QSize(12, 12)));
connect(m_ui->hardwareKeyLabelHelp, SIGNAL(clicked(bool)), SLOT(openHardwareKeyHelp()));
m_ui->keyFileLabelHelp->setIcon(resources()->icon("system-help").pixmap(QSize(12, 12)));
m_ui->keyFileLabelHelp->setIcon(icons()->icon("system-help").pixmap(QSize(12, 12)));
connect(m_ui->keyFileLabelHelp, SIGNAL(clicked(bool)), SLOT(openKeyFileHelp()));
connect(m_ui->keyFileLineEdit, SIGNAL(textChanged(QString)), SLOT(keyFileTextChanged()));
m_ui->keyFileLineEdit->addAction(m_ui->keyFileClearIcon, QLineEdit::TrailingPosition);
m_ui->keyFileClearIcon->setIcon(resources()->icon("edit-clear-locationbar-rtl"));
m_ui->keyFileClearIcon->setIcon(icons()->icon("edit-clear-locationbar-rtl"));
m_ui->keyFileClearIcon->setVisible(false);
connect(m_ui->keyFileClearIcon, SIGNAL(triggered(bool)), SLOT(clearKeyFileText()));

14
src/gui/EntryPreviewWidget.cpp
View File

@ -24,9 +24,9 @@
#include <QDir>
#include "core/Config.h"
#include "core/Resources.h"
#include "entry/EntryAttachmentsModel.h"
#include "gui/Clipboard.h"
#include "gui/Icons.h"
#if defined(WITH_XC_KEESHARE)
#include "keeshare/KeeShare.h"
#endif
@ -48,11 +48,11 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
m_ui->setupUi(this);
// Entry
m_ui->entryTotpButton->setIcon(resources()->icon("chronometer"));
m_ui->entryCloseButton->setIcon(resources()->icon("dialog-close"));
m_ui->togglePasswordButton->setIcon(resources()->onOffIcon("password-show"));
m_ui->toggleEntryNotesButton->setIcon(resources()->onOffIcon("password-show"));
m_ui->toggleGroupNotesButton->setIcon(resources()->onOffIcon("password-show"));
m_ui->entryTotpButton->setIcon(icons()->icon("chronometer"));
m_ui->entryCloseButton->setIcon(icons()->icon("dialog-close"));
m_ui->togglePasswordButton->setIcon(icons()->onOffIcon("password-show"));
m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show"));
m_ui->toggleGroupNotesButton->setIcon(icons()->onOffIcon("password-show"));
m_ui->entryAttachmentsWidget->setReadOnly(true);
m_ui->entryAttachmentsWidget->setButtonsVisible(false);
@ -83,7 +83,7 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
});
// Group
m_ui->groupCloseButton->setIcon(resources()->icon("dialog-close"));
m_ui->groupCloseButton->setIcon(icons()->icon("dialog-close"));
connect(m_ui->groupCloseButton, SIGNAL(clicked()), SLOT(hide()));
connect(m_ui->groupTabWidget, SIGNAL(tabBarClicked(int)), SLOT(updateTabIndexes()), Qt::QueuedConnection);

179
src/gui/Icons.cpp Normal file
View File

@ -0,0 +1,179 @@
/*
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Icons.h"
#include <QBitmap>
#include <QPainter>
#include <QStyle>
#include "config-keepassx.h"
#include "core/Config.h"
#include "gui/MainWindow.h"
#include "gui/osutils/OSUtils.h"
Icons* Icons::m_instance(nullptr);
QIcon Icons::applicationIcon()
{
return icon("keepassxc", false);
}
QString Icons::trayIconAppearance() const
{
auto iconAppearance = config()->get(Config::GUI_TrayIconAppearance).toString();
if (iconAppearance.isNull()) {
#ifdef Q_OS_MACOS
iconAppearance = osUtils->isDarkMode() ? "monochrome-light" : "monochrome-dark";
#else
iconAppearance = "monochrome-light";
#endif
}
return iconAppearance;
}
QIcon Icons::trayIcon()
{
return trayIconUnlocked();
}
QIcon Icons::trayIconLocked()
{
auto iconApperance = trayIconAppearance();
if (iconApperance == "monochrome-light") {
return icon("keepassxc-monochrome-light-locked", false);
}
if (iconApperance == "monochrome-dark") {
return icon("keepassxc-monochrome-dark-locked", false);
}
return icon("keepassxc-locked", false);
}
QIcon Icons::trayIconUnlocked()
{
auto iconApperance = trayIconAppearance();
if (iconApperance == "monochrome-light") {
return icon("keepassxc-monochrome-light", false);
}
if (iconApperance == "monochrome-dark") {
return icon("keepassxc-monochrome-dark", false);
}
return icon("keepassxc", false);
}
QIcon Icons::icon(const QString& name, bool recolor, const QColor& overrideColor)
{
QIcon icon = m_iconCache.value(name);
if (!icon.isNull() && !overrideColor.isValid()) {
return icon;
}
// Resetting the application theme name before calling QIcon::fromTheme() is required for hacky
// QPA platform themes such as qt5ct, which randomly mess with the configured icon theme.
// If we do not reset the theme name here, it will become empty at some point, causing
// Qt to look for icons at the user-level and global default locations.
//
// See issue #4963: https://github.com/keepassxreboot/keepassxc/issues/4963
// and qt5ct issue #80: https://sourceforge.net/p/qt5ct/tickets/80/
QIcon::setThemeName("application");
icon = QIcon::fromTheme(name);
if (getMainWindow() && recolor) {
const QRect rect(0, 0, 48, 48);
QImage img = icon.pixmap(rect.width(), rect.height()).toImage();
img = img.convertToFormat(QImage::Format_ARGB32_Premultiplied);
icon = {};
QPainter painter(&img);
painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
if (!overrideColor.isValid()) {
QPalette palette = getMainWindow()->palette();
painter.fillRect(rect, palette.color(QPalette::Normal, QPalette::WindowText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal);
painter.fillRect(rect, palette.color(QPalette::Active, QPalette::ButtonText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Active);
painter.fillRect(rect, palette.color(QPalette::Active, QPalette::HighlightedText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Selected);
painter.fillRect(rect, palette.color(QPalette::Disabled, QPalette::WindowText));
icon.addPixmap(QPixmap::fromImage(img), QIcon::Disabled);
} else {
painter.fillRect(rect, overrideColor);
icon.addPixmap(QPixmap::fromImage(img), QIcon::Normal);
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
icon.setIsMask(true);
#endif
}
if (!overrideColor.isValid()) {
m_iconCache.insert(name, icon);
}
return icon;
}
QIcon Icons::onOffIcon(const QString& name, bool recolor)
{
QString cacheName = "onoff/" + name;
QIcon icon = m_iconCache.value(cacheName);
if (!icon.isNull()) {
return icon;
}
const QSize size(48, 48);
QIcon on = Icons::icon(name + "-on", recolor);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::On);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::On);
icon.addPixmap(on.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::On);
QIcon off = Icons::icon(name + "-off", recolor);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Normal), QIcon::Mode::Normal, QIcon::Off);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Selected), QIcon::Mode::Selected, QIcon::Off);
icon.addPixmap(off.pixmap(size, QIcon::Mode::Disabled), QIcon::Mode::Disabled, QIcon::Off);
m_iconCache.insert(cacheName, icon);
return icon;
}
Icons::Icons()
{
}
Icons* Icons::instance()
{
if (!m_instance) {
m_instance = new Icons();
Q_INIT_RESOURCE(icons);
QIcon::setThemeSearchPaths(QStringList{":/icons"} << QIcon::themeSearchPaths());
QIcon::setThemeName("application");
}
return m_instance;
}

55
src/gui/Icons.h Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEEPASSX_ICONS_H
#define KEEPASSX_ICONS_H
#include <QColor>
#include <QHash>
#include <QIcon>
#include <QString>
class Icons
{
public:
QIcon applicationIcon();
QIcon trayIcon();
QIcon trayIconLocked();
QIcon trayIconUnlocked();
QString trayIconAppearance() const;
QIcon icon(const QString& name, bool recolor = true, const QColor& overrideColor = QColor::Invalid);
QIcon onOffIcon(const QString& name, bool recolor = true);
static Icons* instance();
private:
Icons();
static Icons* m_instance;
QHash<QString, QIcon> m_iconCache;
Q_DISABLE_COPY(Icons)
};
inline Icons* icons()
{
return Icons::instance();
}
#endif // KEEPASSX_ICONS_H

4
src/gui/KMessageWidget.cpp
View File

@ -20,8 +20,8 @@
*/
#include "KMessageWidget.h"
#include "core/Resources.h"
#include "core/Global.h"
#include "gui/Icons.h"
#include <QAction>
#include <QEvent>
@ -94,7 +94,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr)
QAction *closeAction = new QAction(q);
closeAction->setText(KMessageWidget::tr("&Close"));
closeAction->setToolTip(KMessageWidget::tr("Close message"));
closeAction->setIcon(Resources::instance()->icon("message-close"));
closeAction->setIcon(icons()->icon("message-close"));
QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(animatedHide()));

4
src/gui/LineEdit.cpp
View File

@ -22,7 +22,7 @@
#include <QStyle>
#include <QToolButton>
#include "core/Resources.h"
#include "gui/Icons.h"
LineEdit::LineEdit(QWidget* parent)
: QLineEdit(parent)
@ -33,7 +33,7 @@ LineEdit::LineEdit(QWidget* parent)
QString iconNameDirected =
QString("edit-clear-locationbar-").append((layoutDirection() == Qt::LeftToRight) ? "rtl" : "ltr");
const auto icon = resources()->icon(iconNameDirected);
const auto icon = icons()->icon(iconNameDirected);
m_clearButton->setIcon(icon);
m_clearButton->setCursor(Qt::ArrowCursor);

117
src/gui/MainWindow.cpp
View File

@ -37,6 +37,7 @@
#include "core/Tools.h"
#include "gui/AboutDialog.h"
#include "gui/DatabaseWidget.h"
#include "gui/Icons.h"
#include "gui/MessageBox.h"
#include "gui/SearchWidget.h"
#include "keys/CompositeKey.h"
@ -165,8 +166,8 @@ MainWindow::MainWindow()
m_entryContextMenu->addAction(m_ui->actionEntryAddToAgent);
m_entryContextMenu->addAction(m_ui->actionEntryRemoveFromAgent);
m_ui->actionEntryAddToAgent->setIcon(resources()->icon("utilities-terminal"));
m_ui->actionEntryRemoveFromAgent->setIcon(resources()->icon("utilities-terminal"));
m_ui->actionEntryAddToAgent->setIcon(icons()->icon("utilities-terminal"));
m_ui->actionEntryRemoveFromAgent->setIcon(icons()->icon("utilities-terminal"));
#endif
m_ui->actionEntryAddToAgent->setVisible(false);
@ -196,7 +197,7 @@ MainWindow::MainWindow()
connect(YubiKey::instance(), SIGNAL(challengeCompleted()), SLOT(hideYubiKeyPopup()), Qt::QueuedConnection);
#endif
setWindowIcon(resources()->applicationIcon());
setWindowIcon(icons()->applicationIcon());
m_ui->globalMessageWidget->hideMessage();
connect(m_ui->globalMessageWidget, &MessageWidget::linkActivated, &MessageWidget::openHttpUrl);
@ -334,59 +335,59 @@ MainWindow::MainWindow()
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_C, this, SLOT(togglePasswordsHidden()));
new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B, this, SLOT(toggleUsernamesHidden()));
m_ui->actionDatabaseNew->setIcon(resources()->icon("document-new"));
m_ui->actionDatabaseOpen->setIcon(resources()->icon("document-open"));
m_ui->menuRecentDatabases->setIcon(resources()->icon("document-open-recent"));
m_ui->actionDatabaseSave->setIcon(resources()->icon("document-save"));
m_ui->actionDatabaseSaveAs->setIcon(resources()->icon("document-save-as"));
m_ui->actionDatabaseSaveBackup->setIcon(resources()->icon("document-save-copy"));
m_ui->actionDatabaseClose->setIcon(resources()->icon("document-close"));
m_ui->actionReports->setIcon(resources()->icon("reports"));
m_ui->actionDatabaseSettings->setIcon(resources()->icon("document-edit"));
m_ui->actionDatabaseSecurity->setIcon(resources()->icon("database-change-key"));
m_ui->actionLockDatabases->setIcon(resources()->icon("database-lock"));
m_ui->actionQuit->setIcon(resources()->icon("application-exit"));
m_ui->actionDatabaseMerge->setIcon(resources()->icon("database-merge"));
m_ui->menuImport->setIcon(resources()->icon("document-import"));
m_ui->menuExport->setIcon(resources()->icon("document-export"));
m_ui->actionDatabaseNew->setIcon(icons()->icon("document-new"));
m_ui->actionDatabaseOpen->setIcon(icons()->icon("document-open"));
m_ui->menuRecentDatabases->setIcon(icons()->icon("document-open-recent"));
m_ui->actionDatabaseSave->setIcon(icons()->icon("document-save"));
m_ui->actionDatabaseSaveAs->setIcon(icons()->icon("document-save-as"));
m_ui->actionDatabaseSaveBackup->setIcon(icons()->icon("document-save-copy"));
m_ui->actionDatabaseClose->setIcon(icons()->icon("document-close"));
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->actionQuit->setIcon(icons()->icon("application-exit"));
m_ui->actionDatabaseMerge->setIcon(icons()->icon("database-merge"));
m_ui->menuImport->setIcon(icons()->icon("document-import"));
m_ui->menuExport->setIcon(icons()->icon("document-export"));
m_ui->actionEntryNew->setIcon(resources()->icon("entry-new"));
m_ui->actionEntryClone->setIcon(resources()->icon("entry-clone"));
m_ui->actionEntryEdit->setIcon(resources()->icon("entry-edit"));
m_ui->actionEntryDelete->setIcon(resources()->icon("entry-delete"));
m_ui->actionEntryAutoType->setIcon(resources()->icon("auto-type"));
m_ui->menuEntryAutoTypeWithSequence->setIcon(resources()->icon("auto-type"));
m_ui->actionEntryAutoTypeUsername->setIcon(resources()->icon("auto-type"));
m_ui->actionEntryAutoTypeUsernameEnter->setIcon(resources()->icon("auto-type"));
m_ui->actionEntryAutoTypePassword->setIcon(resources()->icon("auto-type"));
m_ui->actionEntryAutoTypePasswordEnter->setIcon(resources()->icon("auto-type"));
m_ui->actionEntryMoveUp->setIcon(resources()->icon("move-up"));
m_ui->actionEntryMoveDown->setIcon(resources()->icon("move-down"));
m_ui->actionEntryCopyUsername->setIcon(resources()->icon("username-copy"));
m_ui->actionEntryCopyPassword->setIcon(resources()->icon("password-copy"));
m_ui->actionEntryCopyURL->setIcon(resources()->icon("url-copy"));
m_ui->actionEntryDownloadIcon->setIcon(resources()->icon("favicon-download"));
m_ui->actionGroupSortAsc->setIcon(resources()->icon("sort-alphabetical-ascending"));
m_ui->actionGroupSortDesc->setIcon(resources()->icon("sort-alphabetical-descending"));
m_ui->actionEntryNew->setIcon(icons()->icon("entry-new"));
m_ui->actionEntryClone->setIcon(icons()->icon("entry-clone"));
m_ui->actionEntryEdit->setIcon(icons()->icon("entry-edit"));
m_ui->actionEntryDelete->setIcon(icons()->icon("entry-delete"));
m_ui->actionEntryAutoType->setIcon(icons()->icon("auto-type"));
m_ui->menuEntryAutoTypeWithSequence->setIcon(icons()->icon("auto-type"));
m_ui->actionEntryAutoTypeUsername->setIcon(icons()->icon("auto-type"));
m_ui->actionEntryAutoTypeUsernameEnter->setIcon(icons()->icon("auto-type"));
m_ui->actionEntryAutoTypePassword->setIcon(icons()->icon("auto-type"));
m_ui->actionEntryAutoTypePasswordEnter->setIcon(icons()->icon("auto-type"));
m_ui->actionEntryMoveUp->setIcon(icons()->icon("move-up"));
m_ui->actionEntryMoveDown->setIcon(icons()->icon("move-down"));
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->actionEntryDownloadIcon->setIcon(icons()->icon("favicon-download"));
m_ui->actionGroupSortAsc->setIcon(icons()->icon("sort-alphabetical-ascending"));
m_ui->actionGroupSortDesc->setIcon(icons()->icon("sort-alphabetical-descending"));
m_ui->actionGroupNew->setIcon(resources()->icon("group-new"));
m_ui->actionGroupEdit->setIcon(resources()->icon("group-edit"));
m_ui->actionGroupDelete->setIcon(resources()->icon("group-delete"));
m_ui->actionGroupEmptyRecycleBin->setIcon(resources()->icon("group-empty-trash"));
m_ui->actionEntryOpenUrl->setIcon(resources()->icon("web"));
m_ui->actionGroupDownloadFavicons->setIcon(resources()->icon("favicon-download"));
m_ui->actionGroupNew->setIcon(icons()->icon("group-new"));
m_ui->actionGroupEdit->setIcon(icons()->icon("group-edit"));
m_ui->actionGroupDelete->setIcon(icons()->icon("group-delete"));
m_ui->actionGroupEmptyRecycleBin->setIcon(icons()->icon("group-empty-trash"));
m_ui->actionEntryOpenUrl->setIcon(icons()->icon("web"));
m_ui->actionGroupDownloadFavicons->setIcon(icons()->icon("favicon-download"));
m_ui->actionSettings->setIcon(resources()->icon("configure"));
m_ui->actionPasswordGenerator->setIcon(resources()->icon("password-generator"));
m_ui->actionSettings->setIcon(icons()->icon("configure"));
m_ui->actionPasswordGenerator->setIcon(icons()->icon("password-generator"));
m_ui->actionAbout->setIcon(resources()->icon("help-about"));
m_ui->actionDonate->setIcon(resources()->icon("donate"));
m_ui->actionBugReport->setIcon(resources()->icon("bugreport"));
m_ui->actionGettingStarted->setIcon(resources()->icon("getting-started"));
m_ui->actionUserGuide->setIcon(resources()->icon("user-guide"));
m_ui->actionOnlineHelp->setIcon(resources()->icon("system-help"));
m_ui->actionKeyboardShortcuts->setIcon(resources()->icon("keyboard-shortcuts"));
m_ui->actionCheckForUpdates->setIcon(resources()->icon("system-software-update"));
m_ui->actionAbout->setIcon(icons()->icon("help-about"));
m_ui->actionDonate->setIcon(icons()->icon("donate"));
m_ui->actionBugReport->setIcon(icons()->icon("bugreport"));
m_ui->actionGettingStarted->setIcon(icons()->icon("getting-started"));
m_ui->actionUserGuide->setIcon(icons()->icon("user-guide"));
m_ui->actionOnlineHelp->setIcon(icons()->icon("system-help"));
m_ui->actionKeyboardShortcuts->setIcon(icons()->icon("keyboard-shortcuts"));
m_ui->actionCheckForUpdates->setIcon(icons()->icon("system-software-update"));
m_actionMultiplexer.connect(
SIGNAL(currentModeChanged(DatabaseWidget::Mode)), this, SLOT(setMenuActionState(DatabaseWidget::Mode)));
@ -1282,7 +1283,7 @@ void MainWindow::updateTrayIcon()
auto* actionToggle = new QAction(tr("Toggle window"), menu);
menu->addAction(actionToggle);
actionToggle->setIcon(resources()->icon("keepassxc-monochrome-dark"));
actionToggle->setIcon(icons()->icon("keepassxc-monochrome-dark"));
menu->addAction(m_ui->actionLockDatabases);
@ -1302,16 +1303,16 @@ void MainWindow::updateTrayIcon()
m_trayIcon->setContextMenu(menu);
m_trayIcon->setIcon(resources()->trayIcon());
m_trayIcon->setIcon(icons()->trayIcon());
m_trayIcon->show();
}
if (m_ui->tabWidget->count() == 0) {
m_trayIcon->setIcon(resources()->trayIcon());
m_trayIcon->setIcon(icons()->trayIcon());
} else if (m_ui->tabWidget->hasLockableDatabases()) {
m_trayIcon->setIcon(resources()->trayIconUnlocked());
m_trayIcon->setIcon(icons()->trayIconUnlocked());
} else {
m_trayIcon->setIcon(resources()->trayIconLocked());
m_trayIcon->setIcon(icons()->trayIconLocked());
}
} else {
QApplication::setQuitOnLastWindowClosed(true);
@ -1689,7 +1690,7 @@ void MainWindow::displayDesktopNotification(const QString& msg, QString title, i
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
m_trayIcon->showMessage(title, msg, resources()->applicationIcon(), msTimeoutHint);
m_trayIcon->showMessage(title, msg, icons()->applicationIcon(), msTimeoutHint);
#else
m_trayIcon->showMessage(title, msg, QSystemTrayIcon::Information, msTimeoutHint);
#endif

16
src/gui/PasswordEdit.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,8 +19,8 @@
#include "PasswordEdit.h"
#include "core/Config.h"
#include "core/Resources.h"
#include "gui/Font.h"
#include "gui/Icons.h"
#include "gui/PasswordGeneratorWidget.h"
#include "gui/osutils/OSUtils.h"
#include "gui/styles/StateColorPalette.h"
@ -33,12 +33,12 @@
PasswordEdit::PasswordEdit(QWidget* parent)
: QLineEdit(parent)
{
const QIcon errorIcon = resources()->icon("dialog-error");
const QIcon errorIcon = icons()->icon("dialog-error");
m_errorAction = addAction(errorIcon, QLineEdit::TrailingPosition);
m_errorAction->setVisible(false);
m_errorAction->setToolTip(tr("Passwords do not match"));
const QIcon correctIcon = resources()->icon("dialog-ok");
const QIcon correctIcon = icons()->icon("dialog-ok");
m_correctAction = addAction(correctIcon, QLineEdit::TrailingPosition);
m_correctAction->setVisible(false);
m_correctAction->setToolTip(tr("Passwords match so far"));
@ -58,7 +58,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
#endif
m_toggleVisibleAction = new QAction(
resources()->icon("password-show-off"),
icons()->icon("password-show-off"),
tr("Toggle Password (%1)").arg(QKeySequence(modifier + Qt::Key_H).toString(QKeySequence::NativeText)),
nullptr);
m_toggleVisibleAction->setCheckable(true);
@ -68,7 +68,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
connect(m_toggleVisibleAction, &QAction::triggered, this, &PasswordEdit::setShowPassword);
m_passwordGeneratorAction = new QAction(
resources()->icon("password-generator"),
icons()->icon("password-generator"),
tr("Generate Password (%1)").arg(QKeySequence(modifier + Qt::Key_G).toString(QKeySequence::NativeText)),
nullptr);
m_passwordGeneratorAction->setShortcut(modifier + Qt::Key_G);
@ -77,7 +77,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
m_passwordGeneratorAction->setVisible(false);
m_capslockAction =
new QAction(resources()->icon("dialog-warning", true, StateColorPalette().color(StateColorPalette::Error)),
new QAction(icons()->icon("dialog-warning", true, StateColorPalette().color(StateColorPalette::Error)),
tr("Warning: Caps Lock enabled!"),
nullptr);
addAction(m_capslockAction, QLineEdit::LeadingPosition);
@ -113,7 +113,7 @@ void PasswordEdit::enablePasswordGenerator()
void PasswordEdit::setShowPassword(bool show)
{
setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password);
m_toggleVisibleAction->setIcon(resources()->icon(show ? "password-show-on" : "password-show-off"));
m_toggleVisibleAction->setIcon(icons()->icon(show ? "password-show-on" : "password-show-off"));
m_toggleVisibleAction->setChecked(show);
if (m_repeatPasswordEdit) {

11
src/gui/PasswordGeneratorWidget.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2013 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -29,6 +29,7 @@
#include "core/PasswordHealth.h"
#include "core/Resources.h"
#include "gui/Clipboard.h"
#include "gui/Icons.h"
#include "gui/styles/StateColorPalette.h"
PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
@ -39,17 +40,17 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
{
m_ui->setupUi(this);
m_ui->buttonGenerate->setIcon(resources()->icon("refresh"));
m_ui->buttonGenerate->setIcon(icons()->icon("refresh"));
m_ui->buttonGenerate->setToolTip(
tr("Regenerate password (%1)").arg(m_ui->buttonGenerate->shortcut().toString(QKeySequence::NativeText)));
m_ui->buttonCopy->setIcon(resources()->icon("clipboard-text"));
m_ui->buttonCopy->setIcon(icons()->icon("clipboard-text"));
m_ui->buttonClose->setShortcut(Qt::Key_Escape);
m_ui->clearInclude->setIcon(resources()->icon("edit-clear-locationbar-rtl"));
m_ui->clearInclude->setIcon(icons()->icon("edit-clear-locationbar-rtl"));
m_ui->editAdditionalChars->addAction(m_ui->clearInclude, QLineEdit::TrailingPosition);
m_ui->clearInclude->setVisible(false);
m_ui->clearExclude->setIcon(resources()->icon("edit-clear-locationbar-rtl"));
m_ui->clearExclude->setIcon(icons()->icon("edit-clear-locationbar-rtl"));
m_ui->editExcludedChars->addAction(m_ui->clearExclude, QLineEdit::TrailingPosition);
m_ui->clearExclude->setVisible(false);

10
src/gui/SearchWidget.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@
#include <QToolButton>
#include "core/Config.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "gui/widgets/PopupHelpWidget.h"
SearchWidget::SearchWidget(QWidget* parent)
@ -69,13 +69,13 @@ SearchWidget::SearchWidget(QWidget* parent)
m_actionLimitGroup->setCheckable(true);
m_actionLimitGroup->setChecked(config()->get(Config::SearchLimitGroup).toBool());
m_ui->searchIcon->setIcon(resources()->icon("system-search"));
m_ui->searchIcon->setIcon(icons()->icon("system-search"));
m_ui->searchEdit->addAction(m_ui->searchIcon, QLineEdit::LeadingPosition);
m_ui->helpIcon->setIcon(resources()->icon("system-help"));
m_ui->helpIcon->setIcon(icons()->icon("system-help"));
m_ui->searchEdit->addAction(m_ui->helpIcon, QLineEdit::TrailingPosition);
m_ui->clearIcon->setIcon(resources()->icon("edit-clear-locationbar-rtl"));
m_ui->clearIcon->setIcon(icons()->icon("edit-clear-locationbar-rtl"));
m_ui->clearIcon->setVisible(false);
m_ui->searchEdit->addAction(m_ui->clearIcon, QLineEdit::TrailingPosition);

6
src/gui/URLEdit.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2019 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,15 +21,15 @@
#include <QRegularExpression>
#include "core/Config.h"
#include "core/Resources.h"
#include "core/Tools.h"
#include "gui/Font.h"
#include "gui/Icons.h"
#include "gui/styles/StateColorPalette.h"
URLEdit::URLEdit(QWidget* parent)
: QLineEdit(parent)
{
const QIcon errorIcon = resources()->icon("dialog-error");
const QIcon errorIcon = icons()->icon("dialog-error");
m_errorAction = addAction(errorIcon, QLineEdit::TrailingPosition);
m_errorAction->setVisible(false);
m_errorAction->setToolTip(tr("Invalid URL"));

4
src/gui/UpdateCheckDialog.cpp
View File

@ -16,7 +16,7 @@
*/
#include "UpdateCheckDialog.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "ui_UpdateCheckDialog.h"
#include "updatecheck/UpdateChecker.h"
@ -28,7 +28,7 @@ UpdateCheckDialog::UpdateCheckDialog(QWidget* parent)
setWindowFlags(Qt::Window);
setAttribute(Qt::WA_DeleteOnClose);
m_ui->iconLabel->setPixmap(resources()->applicationIcon().pixmap(48));
m_ui->iconLabel->setPixmap(icons()->applicationIcon().pixmap(48));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
connect(UpdateChecker::instance(),

6
src/gui/WelcomeWidget.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -22,7 +22,7 @@
#include "config-keepassx.h"
#include "core/Config.h"
#include "core/Resources.h"
#include "gui/Icons.h"
WelcomeWidget::WelcomeWidget(QWidget* parent)
: QWidget(parent)
@ -36,7 +36,7 @@ WelcomeWidget::WelcomeWidget(QWidget* parent)
welcomeLabelFont.setPointSize(welcomeLabelFont.pointSize() + 4);
m_ui->welcomeLabel->setFont(welcomeLabelFont);
m_ui->iconLabel->setPixmap(resources()->applicationIcon().pixmap(64));
m_ui->iconLabel->setPixmap(icons()->applicationIcon().pixmap(64));
refreshLastDatabases();

8
src/gui/dbsettings/DatabaseSettingsDialog.cpp
View File

@ -35,7 +35,7 @@
#include "core/Config.h"
#include "core/Database.h"
#include "core/Global.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "touchid/TouchID.h"
class DatabaseSettingsDialog::ExtraPage
@ -76,8 +76,8 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent)
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(save()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
m_ui->categoryList->addCategory(tr("General"), Resources::instance()->icon("preferences-other"));
m_ui->categoryList->addCategory(tr("Security"), Resources::instance()->icon("security-high"));
m_ui->categoryList->addCategory(tr("General"), icons()->icon("preferences-other"));
m_ui->categoryList->addCategory(tr("Security"), icons()->icon("security-high"));
m_ui->stackedWidget->addWidget(m_generalWidget);
m_ui->stackedWidget->addWidget(m_securityTabWidget);
@ -100,7 +100,7 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent)
connect(m_ui->advancedSettingsToggle, SIGNAL(toggled(bool)), SLOT(toggleAdvancedMode(bool)));
#ifdef WITH_XC_BROWSER
m_ui->categoryList->addCategory(tr("Browser Integration"), Resources::instance()->icon("internet-web-browser"));
m_ui->categoryList->addCategory(tr("Browser Integration"), icons()->icon("internet-web-browser"));
m_ui->stackedWidget->addWidget(m_browserWidget);
#endif

24
src/gui/entry/EditEntryWidget.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
* Copyright (C) 2020 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -43,7 +43,6 @@
#include "core/Entry.h"
#include "core/Metadata.h"
#include "core/PasswordHealth.h"
#include "core/Resources.h"
#include "core/TimeDelta.h"
#include "core/Tools.h"
#ifdef WITH_XC_SSHAGENT
@ -60,6 +59,7 @@
#include "gui/EditWidgetProperties.h"
#include "gui/FileDialog.h"
#include "gui/Font.h"
#include "gui/Icons.h"
#include "gui/MessageBox.h"
#include "gui/entry/AutoTypeAssociationsModel.h"
#include "gui/entry/EntryAttachmentsModel.h"
@ -147,7 +147,7 @@ EditEntryWidget::~EditEntryWidget()
void EditEntryWidget::setupMain()
{
m_mainUi->setupUi(m_mainWidget);
addPage(tr("Entry"), Resources::instance()->icon("document-edit"), m_mainWidget);
addPage(tr("Entry"), icons()->icon("document-edit"), m_mainWidget);
m_mainUi->usernameComboBox->setEditable(true);
m_usernameCompleter->setCompletionMode(QCompleter::InlineCompletion);
@ -156,7 +156,7 @@ void EditEntryWidget::setupMain()
m_mainUi->usernameComboBox->setCompleter(m_usernameCompleter);
#ifdef WITH_XC_NETWORKING
m_mainUi->fetchFaviconButton->setIcon(resources()->icon("favicon-download"));
m_mainUi->fetchFaviconButton->setIcon(icons()->icon("favicon-download"));
m_mainUi->fetchFaviconButton->setDisabled(true);
#else
m_mainUi->fetchFaviconButton->setVisible(false);
@ -186,7 +186,7 @@ void EditEntryWidget::setupMain()
void EditEntryWidget::setupAdvanced()
{
m_advancedUi->setupUi(m_advancedWidget);
addPage(tr("Advanced"), Resources::instance()->icon("preferences-other"), m_advancedWidget);
addPage(tr("Advanced"), icons()->icon("preferences-other"), m_advancedWidget);
m_advancedUi->attachmentsWidget->setReadOnly(false);
m_advancedUi->attachmentsWidget->setButtonsVisible(true);
@ -216,7 +216,7 @@ void EditEntryWidget::setupAdvanced()
void EditEntryWidget::setupIcon()
{
m_iconsWidget->setShowApplyIconToButton(false);
addPage(tr("Icon"), Resources::instance()->icon("preferences-desktop-icons"), m_iconsWidget);
addPage(tr("Icon"), icons()->icon("preferences-desktop-icons"), m_iconsWidget);
connect(this, SIGNAL(accepted()), m_iconsWidget, SLOT(abortRequests()));
connect(this, SIGNAL(rejected()), m_iconsWidget, SLOT(abortRequests()));
}
@ -230,9 +230,9 @@ void EditEntryWidget::openAutotypeHelp()
void EditEntryWidget::setupAutoType()
{
m_autoTypeUi->setupUi(m_autoTypeWidget);
addPage(tr("Auto-Type"), Resources::instance()->icon("key-enter"), m_autoTypeWidget);
addPage(tr("Auto-Type"), icons()->icon("key-enter"), m_autoTypeWidget);
m_autoTypeUi->openHelpButton->setIcon(resources()->icon("system-help"));
m_autoTypeUi->openHelpButton->setIcon(icons()->icon("system-help"));
m_autoTypeDefaultSequenceGroup->addButton(m_autoTypeUi->inheritSequenceButton);
m_autoTypeDefaultSequenceGroup->addButton(m_autoTypeUi->customSequenceButton);
@ -271,7 +271,7 @@ void EditEntryWidget::setupBrowser()
m_browserUi->setupUi(m_browserWidget);
if (config()->get(Config::Browser_Enabled).toBool()) {
addPage(tr("Browser Integration"), Resources::instance()->icon("internet-web-browser"), m_browserWidget);
addPage(tr("Browser Integration"), icons()->icon("internet-web-browser"), m_browserWidget);
m_additionalURLsDataModel->setEntryAttributes(m_entryAttributes);
m_browserUi->additionalURLsView->setModel(m_additionalURLsDataModel);
@ -394,13 +394,13 @@ void EditEntryWidget::updateCurrentURL()
void EditEntryWidget::setupProperties()
{
addPage(tr("Properties"), Resources::instance()->icon("document-properties"), m_editWidgetProperties);
addPage(tr("Properties"), icons()->icon("document-properties"), m_editWidgetProperties);
}
void EditEntryWidget::setupHistory()
{
m_historyUi->setupUi(m_historyWidget);
addPage(tr("History"), Resources::instance()->icon("view-history"), m_historyWidget);
addPage(tr("History"), icons()->icon("view-history"), m_historyWidget);
m_sortModel->setSourceModel(m_historyModel);
m_sortModel->setDynamicSortFilter(true);
@ -546,7 +546,7 @@ void EditEntryWidget::setupSSHAgent()
SIGNAL(entryAttachmentsModified()),
SLOT(updateSSHAgentAttachments()));
addPage(tr("SSH Agent"), Resources::instance()->icon("utilities-terminal"), m_sshAgentWidget);
addPage(tr("SSH Agent"), icons()->icon("utilities-terminal"), m_sshAgentWidget);
}
void EditEntryWidget::setSSHAgentSettings()

10
src/gui/entry/EntryModel.cpp
View File

@ -29,7 +29,7 @@
#include "core/Global.h"
#include "core/Group.h"
#include "core/Metadata.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#ifdef Q_OS_MACOS
#include "gui/osutils/macutils/MacUtils.h"
#endif
@ -280,12 +280,12 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
return entry->iconPixmap();
case Paperclip:
if (!entry->attachments()->isEmpty()) {
return resources()->icon("paperclip");
return icons()->icon("paperclip");
}
break;
case Totp:
if (entry->hasTotp()) {
return resources()->icon("chronometer");
return icons()->icon("chronometer");
}
break;
}
@ -358,9 +358,9 @@ QVariant EntryModel::headerData(int section, Qt::Orientation orientation, int ro
} else if (role == Qt::DecorationRole) {
switch (section) {
case Paperclip:
return resources()->icon("paperclip");
return icons()->icon("paperclip");
case Totp:
return resources()->icon("chronometer");
return icons()->icon("chronometer");
}
} else if (role == Qt::ToolTipRole) {
switch (section) {

4
src/gui/entry/EntryURLModel.cpp
View File

@ -19,8 +19,8 @@
#include "EntryURLModel.h"
#include "core/Entry.h"
#include "core/Resources.h"
#include "core/Tools.h"
#include "gui/Icons.h"
#include "gui/styles/StateColorPalette.h"
#include <algorithm>
@ -28,7 +28,7 @@
EntryURLModel::EntryURLModel(QObject* parent)
: QStandardItemModel(parent)
, m_entryAttributes(nullptr)
, m_errorIcon(resources()->icon("dialog-error"))
, m_errorIcon(icons()->icon("dialog-error"))
{
}

8
src/gui/group/EditGroupWidget.cpp
View File

@ -21,9 +21,9 @@
#include "core/Config.h"
#include "core/Metadata.h"
#include "core/Resources.h"
#include "gui/EditWidgetIcons.h"
#include "gui/EditWidgetProperties.h"
#include "gui/Icons.h"
#include "gui/MessageBox.h"
#if defined(WITH_XC_KEESHARE)
@ -69,12 +69,12 @@ EditGroupWidget::EditGroupWidget(QWidget* parent)
{
m_mainUi->setupUi(m_editGroupWidgetMain);
addPage(tr("Group"), Resources::instance()->icon("document-edit"), m_editGroupWidgetMain);
addPage(tr("Icon"), Resources::instance()->icon("preferences-desktop-icons"), m_editGroupWidgetIcons);
addPage(tr("Group"), icons()->icon("document-edit"), m_editGroupWidgetMain);
addPage(tr("Icon"), icons()->icon("preferences-desktop-icons"), m_editGroupWidgetIcons);
#if defined(WITH_XC_KEESHARE)
addEditPage(new EditGroupPageKeeShare(this));
#endif
addPage(tr("Properties"), Resources::instance()->icon("document-properties"), m_editWidgetProperties);
addPage(tr("Properties"), icons()->icon("document-properties"), m_editWidgetProperties);
connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool)));
connect(m_mainUi->autoTypeSequenceCustomRadio,

4
src/gui/reports/ReportsPageHealthcheck.cpp
View File

@ -18,7 +18,7 @@
#include "ReportsPageHealthcheck.h"
#include "ReportsWidgetHealthcheck.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include <QApplication>
@ -34,7 +34,7 @@ QString ReportsPageHealthcheck::name()
QIcon ReportsPageHealthcheck::icon()
{
return Resources::instance()->icon("health");
return icons()->icon("health");
}
QWidget* ReportsPageHealthcheck::createWidget()

4
src/gui/reports/ReportsPageHibp.cpp
View File

@ -18,7 +18,7 @@
#include "ReportsPageHibp.h"
#include "ReportsWidgetHibp.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include <QApplication>
@ -34,7 +34,7 @@ QString ReportsPageHibp::name()
QIcon ReportsPageHibp::icon()
{
return resources()->icon("hibp");
return icons()->icon("hibp");
}
QWidget* ReportsPageHibp::createWidget()

4
src/gui/reports/ReportsPageStatistics.cpp
View File

@ -18,7 +18,7 @@
#include "ReportsPageStatistics.h"
#include "ReportsWidgetStatistics.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include <QApplication>
@ -29,7 +29,7 @@ QString ReportsPageStatistics::name()
QIcon ReportsPageStatistics::icon()
{
return Resources::instance()->icon("statistics");
return icons()->icon("statistics");
}
QWidget* ReportsPageStatistics::createWidget()

8
src/gui/reports/ReportsWidgetHealthcheck.cpp
View File

@ -23,7 +23,7 @@
#include "core/Global.h"
#include "core/Group.h"
#include "core/PasswordHealth.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "gui/styles/StateColorPalette.h"
#include <QMenu>
@ -140,7 +140,7 @@ Health::Health(QSharedPointer<Database> db)
ReportsWidgetHealthcheck::ReportsWidgetHealthcheck(QWidget* parent)
: QWidget(parent)
, m_ui(new Ui::ReportsWidgetHealthcheck())
, m_errorIcon(Resources::instance()->icon("dialog-error"))
, m_errorIcon(icons()->icon("dialog-error"))
, m_referencesModel(new QStandardItemModel(this))
, m_modelProxy(new ReportSortProxyModel(this))
{
@ -325,12 +325,12 @@ void ReportsWidgetHealthcheck::customMenuRequested(QPoint pos)
const auto menu = new QMenu(this);
// Create the "edit entry" menu item
const auto edit = new QAction(Resources::instance()->icon("entry-edit"), tr("Edit Entry..."), this);
const auto edit = new QAction(icons()->icon("entry-edit"), tr("Edit Entry..."), this);
menu->addAction(edit);
connect(edit, SIGNAL(triggered()), SLOT(editFromContextmenu()));
// Create the "exclude from reports" menu item
const auto knownbad = new QAction(Resources::instance()->icon("reports-exclude"), tr("Exclude from reports"), this);
const auto knownbad = new QAction(icons()->icon("reports-exclude"), tr("Exclude from reports"), this);
knownbad->setCheckable(true);
knownbad->setChecked(m_contextmenuEntry->customData()->contains(PasswordHealth::OPTION_KNOWN_BAD)
&& m_contextmenuEntry->customData()->value(PasswordHealth::OPTION_KNOWN_BAD) == TRUE_STR);

6
src/gui/reports/ReportsWidgetHibp.cpp
View File

@ -23,7 +23,7 @@
#include "core/Global.h"
#include "core/Group.h"
#include "core/PasswordHealth.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "gui/MessageBox.h"
#include <QMenu>
@ -387,12 +387,12 @@ void ReportsWidgetHibp::customMenuRequested(QPoint pos)
const auto menu = new QMenu(this);
// Create the "edit entry" menu item
const auto edit = new QAction(Resources::instance()->icon("entry-edit"), tr("Edit Entry..."), this);
const auto edit = new QAction(icons()->icon("entry-edit"), tr("Edit Entry..."), this);
menu->addAction(edit);
connect(edit, SIGNAL(triggered()), SLOT(editFromContextmenu()));
// Create the "exclude from reports" menu item
const auto knownbad = new QAction(Resources::instance()->icon("reports-exclude"), tr("Exclude from reports"), this);
const auto knownbad = new QAction(icons()->icon("reports-exclude"), tr("Exclude from reports"), this);
knownbad->setCheckable(true);
knownbad->setChecked(m_contextmenuEntry->customData()->contains(PasswordHealth::OPTION_KNOWN_BAD)
&& m_contextmenuEntry->customData()->value(PasswordHealth::OPTION_KNOWN_BAD) == TRUE_STR);

4
src/gui/reports/ReportsWidgetStatistics.cpp
View File

@ -24,7 +24,7 @@
#include "core/Group.h"
#include "core/Metadata.h"
#include "core/PasswordHealth.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include <QFileInfo>
#include <QHash>
@ -157,7 +157,7 @@ namespace
ReportsWidgetStatistics::ReportsWidgetStatistics(QWidget* parent)
: QWidget(parent)
, m_ui(new Ui::ReportsWidgetStatistics())
, m_errIcon(Resources::instance()->icon("dialog-error"))
, m_errIcon(icons()->icon("dialog-error"))
{
m_ui->setupUi(this);

4
src/keeshare/DatabaseSettingsPageKeeShare.cpp
View File

@ -19,7 +19,7 @@
#include "core/Database.h"
#include "core/Group.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "keeshare/DatabaseSettingsWidgetKeeShare.h"
#include "keeshare/KeeShare.h"
@ -32,7 +32,7 @@ QString DatabaseSettingsPageKeeShare::name()
QIcon DatabaseSettingsPageKeeShare::icon()
{
return Resources::instance()->icon("preferences-system-network-sharing");
return icons()->icon("preferences-system-network-sharing");
}
QWidget* DatabaseSettingsPageKeeShare::createWidget()

4
src/keeshare/SettingsPageKeeShare.cpp
View File

@ -19,8 +19,8 @@
#include "core/Database.h"
#include "core/Group.h"
#include "core/Resources.h"
#include "gui/DatabaseTabWidget.h"
#include "gui/Icons.h"
#include "gui/MessageWidget.h"
#include "keeshare/KeeShare.h"
#include "keeshare/SettingsWidgetKeeShare.h"
@ -39,7 +39,7 @@ QString SettingsPageKeeShare::name()
QIcon SettingsPageKeeShare::icon()
{
return Resources::instance()->icon("preferences-system-network-sharing");
return icons()->icon("preferences-system-network-sharing");
}
QWidget* SettingsPageKeeShare::createWidget()

4
src/keeshare/group/EditGroupPageKeeShare.cpp
View File

@ -17,7 +17,7 @@
#include "EditGroupPageKeeShare.h"
#include "core/Resources.h"
#include "gui/Icons.h"
#include "keeshare/group/EditGroupWidgetKeeShare.h"
#include <QApplication>
@ -34,7 +34,7 @@ QString EditGroupPageKeeShare::name()
QIcon EditGroupPageKeeShare::icon()
{
return Resources::instance()->icon("preferences-system-network-sharing");
return icons()->icon("preferences-system-network-sharing");
}
QWidget* EditGroupPageKeeShare::createWidget()

4
src/sshagent/AgentSettingsPage.cpp
View File

@ -18,7 +18,7 @@
#include "AgentSettingsPage.h"
#include "AgentSettingsWidget.h"
#include "core/Resources.h"
#include "gui/Icons.h"
QString AgentSettingsPage::name()
{
@ -27,7 +27,7 @@ QString AgentSettingsPage::name()
QIcon AgentSettingsPage::icon()
{
return Resources::instance()->icon("utilities-terminal");
return icons()->icon("utilities-terminal");
}
QWidget* AgentSettingsPage::createWidget()