#2986 add: line-edit clear icon for dark-mode to dialogs

CHANGELOG.md

@@ -1,7 +1,12 @@
 # QOwnNotes Changelog
 
+## 24.3.4
+- For the dark-mode there now is a new icon for the clear button for all line edits,
+  like the note search field, in the main window and all dialogs
+  (for [#2986](https://github.com/pbek/QOwnNotes/issues/2986))
+
 ## 24.3.3
-- added a **new editor color schema** *VSCodium* by @nkahe
+- Added a **new editor color schema** *VSCodium* by @nkahe
   (for [#2982](https://github.com/pbek/QOwnNotes/issues/2982))
 
 ## 24.3.2

src/dialogs/aboutdialog.cpp

@@ -13,6 +13,7 @@
 
 AboutDialog::AboutDialog(QWidget *parent) : MasterDialog(parent), ui(new Ui::AboutDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     // load the about.html
     QFile f(QStringLiteral(":/html/about.html"));

src/dialogs/actiondialog.cpp

@@ -12,6 +12,7 @@ ActionDialog::ActionDialog(QMenuBar *menuBar, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::ActionDialog) {
     _menuBar = menuBar;
     ui->setupUi(this);
+    afterSetupUI();
     refreshUi();
 }
 

src/dialogs/attachmentdialog.cpp

@@ -13,6 +13,7 @@
 AttachmentDialog::AttachmentDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::AttachmentDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->fileEdit->setFocus();
     ui->downloadButton->hide();
     ui->downloadFrame->hide();

src/dialogs/dictionarymanagerdialog.cpp

@@ -18,6 +18,7 @@
 DictionaryManagerDialog::DictionaryManagerDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::DictionaryManagerDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     setupMainSplitter();
 
     _networkManager = new QNetworkAccessManager(this);

src/dialogs/evernoteimportdialog.cpp

@@ -22,6 +22,7 @@
 EvernoteImportDialog::EvernoteImportDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::EvernoteImportDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     setupMetaDataTreeWidgetItems();
     resetNoteCount();
     _mediaFileDataHash.clear();

src/dialogs/imagedialog.cpp

@@ -18,6 +18,7 @@ ImageDialog::ImageDialog(QWidget *parent) : MasterDialog(parent), ui(new Ui::Ima
     _rubberBand = nullptr;
 
     ui->setupUi(this);
+    afterSetupUI();
     ui->fileEdit->setFocus();
     ui->previewFrame->setVisible(false);
     ui->toolFrame->hide();

src/dialogs/issueassistantdialog.cpp

@@ -17,6 +17,7 @@
 IssueAssistantDialog::IssueAssistantDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::IssueAssistantDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->backButton->setEnabled(false);
     ui->nextButton->setEnabled(false);
 

src/dialogs/joplinimportdialog.cpp

@@ -16,6 +16,7 @@
 JoplinImportDialog::JoplinImportDialog(QWidget* parent)
     : MasterDialog(parent), ui(new Ui::JoplinImportDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     ui->progressBar->hide();
     ui->progressBar->setMinimum(0);

src/dialogs/linkdialog.cpp

@@ -21,6 +21,7 @@
 LinkDialog::LinkDialog(int page, const QString &dialogTitle, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::LinkDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->tabWidget->setCurrentIndex(page);
     on_tabWidget_currentChanged(page);
     ui->downloadProgressBar->hide();

src/dialogs/localtrashdialog.cpp

@@ -31,6 +31,7 @@ class LocalTrashTreeWidgetItem : public QTreeWidgetItem {
 LocalTrashDialog::LocalTrashDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::LocalTrashDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     // init the note browser search frame
     ui->noteBrowser->initSearchFrame(ui->noteBrowserSearchFrame);

src/dialogs/masterdialog.cpp

@@ -7,6 +7,7 @@
 #include <QSettings>
 
 #include "services/metricsservice.h"
+#include "utils/gui.h"
 
 MasterDialog::MasterDialog(QWidget *parent) : QDialog(parent) { installEventFilter(this); }
 
@@ -15,6 +16,10 @@ void MasterDialog::closeEvent(QCloseEvent *event) {
     QDialog::closeEvent(event);
 }
 
+void MasterDialog::afterSetupUI() {
+    Utils::Gui::fixDarkModeIcons(this);
+}
+
 void MasterDialog::resizeEvent(QResizeEvent *event) {
     // save the geometry of the dialog
     storeGeometrySettings();

src/dialogs/masterdialog.h

@@ -31,6 +31,8 @@ class MasterDialog : public QDialog {
 
     virtual void keyPressEvent(QKeyEvent *keyEvent) override;
 
+    void afterSetupUI();
+
    public:
     void setIgnoreReturnKey(bool ignore);
 };

src/dialogs/nextclouddeckdialog.cpp

@@ -9,6 +9,7 @@
 NextcloudDeckDialog::NextcloudDeckDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::NextcloudDeckDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->dueDateTimeEdit->setDateTime(QDateTime::currentDateTime());
     ui->saveButton->setEnabled(false);
     ui->dueDateTimeCheckBox->setChecked(true);

src/dialogs/notedialog.cpp

@@ -12,6 +12,7 @@
 
 NoteDialog::NoteDialog(QWidget *parent) : MasterDialog(parent), ui(new Ui::NoteDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->textEdit->initSearchFrame(ui->searchFrame);
     ui->textEdit->setReadOnly(true);
     ui->tabWidget->setCurrentIndex(QSettings().value("NoteDialog/tabWidgetIndex").toInt());

src/dialogs/notediffdialog.cpp

@@ -13,6 +13,7 @@
 NoteDiffDialog::NoteDiffDialog(QWidget *parent, const QString &html)
     : MasterDialog(parent), ui(new Ui::NoteDiffDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     _notificationButtonGroup = new QButtonGroup(this);
     _notificationButtonGroup->addButton(ui->ignoreAllExternalChangesCheckBox);

src/dialogs/passworddialog.cpp

@@ -9,6 +9,7 @@ PasswordDialog::PasswordDialog(QWidget *parent, const QString &labelText, bool d
     _doubleEnterPassword = doubleEnterPassword;
 
     ui->setupUi(this);
+    afterSetupUI();
 
     // Set focus to the password line edit manually, because focus by tab order
     // was not working for release builds

src/dialogs/scriptrepositorydialog.cpp

@@ -26,6 +26,7 @@
 ScriptRepositoryDialog::ScriptRepositoryDialog(QWidget *parent, bool checkForUpdates)
     : MasterDialog(parent), ui(new Ui::ScriptRepositoryDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     setupMainSplitter();
 
     _codeSearchUrl = QLatin1String("https://api.github.com/search/code");

src/dialogs/serverbookmarksimportdialog.cpp

@@ -12,6 +12,7 @@
 ServerBookmarksImportDialog::ServerBookmarksImportDialog(const QJSValue &bookmarks, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::ServerBookmarksImportDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->infoLabel->clear();
 
     // init the iterator for the versions

src/dialogs/settingsdialog.cpp

@@ -60,6 +60,7 @@
 SettingsDialog::SettingsDialog(int page, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::SettingsDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     bool fromWelcomeDialog = parent->objectName() == QLatin1String("WelcomeDialog");
 

src/dialogs/sharedialog.cpp

@@ -11,6 +11,7 @@
 ShareDialog::ShareDialog(const Note &note, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::ShareDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     this->note = note;
 
     // update the share link checkbox and link url line edit

src/dialogs/storedattachmentsdialog.cpp

@@ -25,6 +25,7 @@
 StoredAttachmentsDialog::StoredAttachmentsDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::StoredAttachmentsDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->infoFrame->setEnabled(false);
     ui->fileTreeWidget->installEventFilter(this);
 

src/dialogs/storedimagesdialog.cpp

@@ -22,6 +22,7 @@
 StoredImagesDialog::StoredImagesDialog(QWidget *parent)
     : MasterDialog(parent), ui(new Ui::StoredImagesDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->fileTreeWidget->installEventFilter(this);
     ui->noteTreeWidget->installEventFilter(this);
 

src/dialogs/tabledialog.cpp

@@ -12,6 +12,7 @@
 
 TableDialog::TableDialog(QWidget *parent) : MasterDialog(parent), ui(new Ui::TableDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     // ignore the return key so we can better edit text in the table
     setIgnoreReturnKey(true);

src/dialogs/tagadddialog.cpp

@@ -4,6 +4,7 @@
 
 TagAddDialog::TagAddDialog(QWidget *parent) : MasterDialog(parent), ui(new Ui::TagAddDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->nameLineEdit->setFocus();
     resize(1, 1);
 }

src/dialogs/tododialog.cpp

@@ -20,6 +20,7 @@
 TodoDialog::TodoDialog(const QString &taskUid, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::TodoDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     setupUi();
 
     connect(ui->todoItemTreeWidget, &TodoItemTreeWidget::calendarItemUpdated, this,

src/dialogs/trashdialog.cpp

@@ -17,6 +17,7 @@
 TrashDialog::TrashDialog(const QJSValue &notes, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::TrashDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     // init the note browser search frame
     ui->noteBrowser->initSearchFrame(ui->noteBrowserSearchFrame);

src/dialogs/updatedialog.cpp

@@ -23,6 +23,7 @@ UpdateDialog::UpdateDialog(QWidget *parent, const QString &changesHtml, const QS
                            const QString &releaseVersionString)
     : MasterDialog(parent), ui(new Ui::UpdateDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->downloadProgressBar->hide();
 
 #if !defined(Q_OS_WIN)

src/dialogs/versiondialog.cpp

@@ -15,6 +15,7 @@
 VersionDialog::VersionDialog(const QJSValue &versions, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::VersionDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     setWindowTitle(Utils::Misc::replaceOwnCloudText(windowTitle()));
     ui->tabWidget->setCurrentIndex(0);
 

src/dialogs/websockettokendialog.cpp

@@ -8,8 +8,9 @@
 #include "ui_websockettokendialog.h"
 
 WebSocketTokenDialog::WebSocketTokenDialog(QWidget *parent)
-    : QDialog(parent), ui(new Ui::WebSocketTokenDialog) {
+    : MasterDialog(parent), ui(new Ui::WebSocketTokenDialog) {
     ui->setupUi(this);
+    afterSetupUI();
 
     QSettings settings;
     QString token = settings.value(QStringLiteral("webSocketServerService/token")).toString();

src/dialogs/websockettokendialog.h

@@ -3,11 +3,13 @@
 
 #include <QDialog>
 
+#include "masterdialog.h"
+
 namespace Ui {
 class WebSocketTokenDialog;
 }
 
-class WebSocketTokenDialog : public QDialog {
+class WebSocketTokenDialog : public MasterDialog {
     Q_OBJECT
 
    public:

src/dialogs/welcomedialog.cpp

@@ -14,6 +14,7 @@
 
 WelcomeDialog::WelcomeDialog(QWidget *parent) : MasterDialog(parent), ui(new Ui::WelcomeDialog) {
     ui->setupUi(this);
+    afterSetupUI();
     ui->layoutWidget->setManualSettingsStoring(false);
 
     // replace ownCloud text