Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-08 18:58:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix on/off icons not being redrawn on theme change

Browse Source
This commit is contained in:
Janek Bevendorff 2021-01-31 20:08:03 +01:00
parent b55f419386
commit 4e90cb5818
4 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/EntryPreviewWidget.cpp
View File

@ -50,9 +50,9 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
// Entry // Entry
m_ui->entryTotpButton->setIcon(icons()->icon("chronometer")); m_ui->entryTotpButton->setIcon(icons()->icon("chronometer"));
m_ui->entryCloseButton->setIcon(icons()->icon("dialog-close")); m_ui->entryCloseButton->setIcon(icons()->icon("dialog-close"));
m_ui->togglePasswordButton->setIcon(icons()->onOffIcon("password-show")); m_ui->togglePasswordButton->setIcon(icons()->onOffIcon("password-show", true));
m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show")); m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show", true));
m_ui->toggleGroupNotesButton->setIcon(icons()->onOffIcon("password-show")); m_ui->toggleGroupNotesButton->setIcon(icons()->onOffIcon("password-show", true));
m_ui->entryAttachmentsWidget->setReadOnly(true); m_ui->entryAttachmentsWidget->setReadOnly(true);
m_ui->entryAttachmentsWidget->setButtonsVisible(false); m_ui->entryAttachmentsWidget->setButtonsVisible(false);
@ -199,16 +199,19 @@ void EntryPreviewWidget::setPasswordVisible(bool state)
} else { } else {
m_ui->entryPasswordLabel->setText(QString("\u25cf").repeated(6)); m_ui->entryPasswordLabel->setText(QString("\u25cf").repeated(6));
} }
m_ui->togglePasswordButton->setIcon(icons()->onOffIcon("password-show", state));
} }
void EntryPreviewWidget::setEntryNotesVisible(bool state) void EntryPreviewWidget::setEntryNotesVisible(bool state)
{ {
setNotesVisible(m_ui->entryNotesTextEdit, m_currentEntry->notes(), state); setNotesVisible(m_ui->entryNotesTextEdit, m_currentEntry->notes(), state);
m_ui->toggleEntryNotesButton->setIcon(icons()->onOffIcon("password-show", state));
} }
void EntryPreviewWidget::setGroupNotesVisible(bool state) void EntryPreviewWidget::setGroupNotesVisible(bool state)
{ {
setNotesVisible(m_ui->groupNotesTextEdit, m_currentGroup->notes(), state); setNotesVisible(m_ui->groupNotesTextEdit, m_currentGroup->notes(), state);
m_ui->toggleGroupNotesButton->setIcon(icons()->onOffIcon("password-show", state));
} }
void EntryPreviewWidget::setNotesVisible(QTextEdit* notesWidget, const QString& notes, bool state) void EntryPreviewWidget::setNotesVisible(QTextEdit* notesWidget, const QString& notes, bool state)

25
src/gui/Icons.cpp
View File

@ -194,30 +194,9 @@ QIcon Icons::icon(const QString& name, bool recolor, const QColor& overrideColor
return icon; return icon;
} }
QIcon Icons::onOffIcon(const QString& name, bool recolor) QIcon Icons::onOffIcon(const QString& name, bool on, bool recolor)
{ {
QString cacheName = "onoff/" + name; return icon(name + (on ? "-on" : "-off"), recolor);
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::instance() Icons* Icons::instance()

2
src/gui/Icons.h
View File

@ -33,7 +33,7 @@ public:
QIcon trayIconUnlocked(); QIcon trayIconUnlocked();
QString trayIconAppearance() const; QString trayIconAppearance() const;
QIcon icon(const QString& name, bool recolor = true, const QColor& overrideColor = QColor::Invalid); QIcon icon(const QString& name, bool recolor = true, const QColor& overrideColor = QColor::Invalid);
QIcon onOffIcon(const QString& name, bool recolor = true); QIcon onOffIcon(const QString& name, bool on, bool recolor = true);
static Icons* instance(); static Icons* instance();

4
src/gui/PasswordEdit.cpp
View File

@ -58,7 +58,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
#endif #endif
m_toggleVisibleAction = new QAction( m_toggleVisibleAction = new QAction(
icons()->icon("password-show-off"), icons()->onOffIcon("password-show", false),
tr("Toggle Password (%1)").arg(QKeySequence(modifier + Qt::Key_H).toString(QKeySequence::NativeText)), tr("Toggle Password (%1)").arg(QKeySequence(modifier + Qt::Key_H).toString(QKeySequence::NativeText)),
this); this);
m_toggleVisibleAction->setCheckable(true); m_toggleVisibleAction->setCheckable(true);
@ -113,7 +113,7 @@ void PasswordEdit::enablePasswordGenerator()
void PasswordEdit::setShowPassword(bool show) void PasswordEdit::setShowPassword(bool show)
{ {
setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password); setEchoMode(show ? QLineEdit::Normal : QLineEdit::Password);
m_toggleVisibleAction->setIcon(icons()->icon(show ? "password-show-on" : "password-show-off")); m_toggleVisibleAction->setIcon(icons()->onOffIcon("password-show", show));
m_toggleVisibleAction->setChecked(show); m_toggleVisibleAction->setChecked(show);
if (m_repeatPasswordEdit) { if (m_repeatPasswordEdit) {