Skip to content

Commit 62bd93d

Browse files
committed
#3494 icons: fix low-contrast search icons in "Link to a URL or note" and Settings dialogs
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent 47b593a commit 62bd93d

File tree

3 files changed

+49
-0
lines changed

3 files changed

+49
-0
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
- Fixed a build failure with older Qt5 versions in XDG global shortcut portal token
66
generation by only using `QUuid::WithoutBraces` on Qt >= 5.11 and falling back to
77
brace removal on older Qt5 (for [#2462](https://github.com/pbek/QOwnNotes/issues/2462))
8+
- Fixed low-contrast search icons in the "Link to a URL or note" and Settings dialogs
9+
by switching the search field icon between light and dark variants based on the
10+
active dark mode color setting (for [#3494](https://github.com/pbek/QOwnNotes/issues/3494))
811

912
## 26.3.10
1013

src/dialogs/linkdialog.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,26 @@ LinkDialog::LinkDialog(int page, const QString &dialogTitle, QWidget *parent)
7878
ui->notesListWidget->installEventFilter(this);
7979
ui->notesListWidget->setRootIsDecorated(false);
8080

81+
// Change the search icon between dark and light mode
82+
const QString searchIconFileName =
83+
SettingsService().value(QStringLiteral("darkModeColors")).toBool()
84+
? QStringLiteral("search-notes-dark.svg")
85+
: QStringLiteral("search-notes.svg");
86+
static const QRegularExpression searchIconRegex(
87+
QStringLiteral("background-image: url\\(:.+\\);"));
88+
89+
QString searchLineEditStyleSheet = ui->searchLineEdit->styleSheet();
90+
searchLineEditStyleSheet.replace(
91+
searchIconRegex,
92+
QStringLiteral("background-image: url(:/images/%1);").arg(searchIconFileName));
93+
ui->searchLineEdit->setStyleSheet(searchLineEditStyleSheet);
94+
95+
QString headingSearchLineEditStyleSheet = ui->headingSearchLineEdit->styleSheet();
96+
headingSearchLineEditStyleSheet.replace(
97+
searchIconRegex,
98+
QStringLiteral("background-image: url(:/images/%1);").arg(searchIconFileName));
99+
ui->headingSearchLineEdit->setStyleSheet(headingSearchLineEditStyleSheet);
100+
81101
const bool showSubfolders = NoteFolder::isCurrentShowSubfolders();
82102
ui->notesListWidget->setColumnHidden(1, !showSubfolders);
83103
ui->notesListWidget->setColumnHidden(2, !showSubfolders);

src/dialogs/settingsdialog.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,32 @@ SettingsDialog::SettingsDialog(int page, QWidget *parent)
107107
ui->calDavCalendarGroupBox->hide();
108108
_newScriptName = tr("New script");
109109

110+
// Change the search icon between dark and light mode
111+
const QString searchIconFileName =
112+
SettingsService().value(QStringLiteral("darkModeColors")).toBool()
113+
? QStringLiteral("search-notes-dark.svg")
114+
: QStringLiteral("search-notes.svg");
115+
static const QRegularExpression searchIconRegex(
116+
QStringLiteral("background-image: url\\(:.+\\);"));
117+
const QString searchIconStyle =
118+
QStringLiteral("background-image: url(:/images/%1);").arg(searchIconFileName);
119+
120+
QString styleSheet = ui->searchLineEdit->styleSheet();
121+
styleSheet.replace(searchIconRegex, searchIconStyle);
122+
ui->searchLineEdit->setStyleSheet(styleSheet);
123+
124+
styleSheet = ui->languageSearchLineEdit->styleSheet();
125+
styleSheet.replace(searchIconRegex, searchIconStyle);
126+
ui->languageSearchLineEdit->setStyleSheet(styleSheet);
127+
128+
styleSheet = ui->shortcutSearchLineEdit->styleSheet();
129+
styleSheet.replace(searchIconRegex, searchIconStyle);
130+
ui->shortcutSearchLineEdit->setStyleSheet(styleSheet);
131+
132+
styleSheet = ui->scriptSearchLineEdit->styleSheet();
133+
styleSheet.replace(searchIconRegex, searchIconStyle);
134+
ui->scriptSearchLineEdit->setStyleSheet(styleSheet);
135+
110136
#ifdef Q_OS_WIN32
111137
QString downloadText =
112138
tr("You can download your git client here: <a "

0 commit comments

Comments
 (0)