#3396 textdiffdialog: add checkbox to not show dialog again

Signed-off-by: Patrizio Bekerle <[email protected]>

Author: pbek

CHANGELOG.md

@@ -1,5 +1,11 @@
 # QOwnNotes Changelog
 
+## 25.11.4
+
+- In the diff dialog shown the checksum checking of [#3366](https://github.com/pbek/QOwnNotes/issues/3366)
+  doesn't match you can now choose not to show the dialog again, then the selected
+  dialog result will be chosen automatically the next time [#3396](https://github.com/pbek/QOwnNotes/issues/3396)
+
 ## 25.11.3
 
 - There now is an extra detection of external changes to note files while your

src/dialogs/textdiffdialog.cpp

@@ -4,20 +4,40 @@
 
 #include <QAbstractButton>
 #include <QDebug>
+#include <QTimer>
 
 #include "services/settingsservice.h"
 #include "ui_textdiffdialog.h"
 
 TextDiffDialog::TextDiffDialog(QWidget *parent, const QString &title, const QString &labelText,
-                               const QString &text1, const QString &text2)
+                               const QString &text1, const QString &text2,
+                               const QString &identifier)
     : MasterDialog(parent), ui(new Ui::TextDiffDialog) {
     ui->setupUi(this);
     afterSetupUI();
     this->setWindowTitle(title);
     this->text1 = text1;
+    this->identifier = identifier;
     this->ui->label_2->setText(labelText);
     this->ui->plainTextEdit->setPlainText(text2);
 
+    // Show or hide the "don't show again" checkbox based on identifier
+    if (identifier.isEmpty()) {
+        this->ui->dontShowAgainCheckBox->setVisible(false);
+    } else {
+        this->ui->dontShowAgainCheckBox->setVisible(true);
+
+        // Check if user has previously chosen to not show this dialog
+        QString settingsKey = QStringLiteral("MessageBoxOverride/") + identifier;
+        QVariant storedResult = SettingsService::instance().value(settingsKey);
+
+        if (storedResult.isValid()) {
+            // Use the stored result and close immediately
+            this->accepted = storedResult.toBool();
+            QTimer::singleShot(0, this, &TextDiffDialog::close);
+        }
+    }
+
     connect(this->ui->buttonBox, SIGNAL(clicked(QAbstractButton *)),
             SLOT(dialogButtonClicked(QAbstractButton *)));
 }
@@ -27,6 +47,13 @@ TextDiffDialog::~TextDiffDialog() { delete ui; }
 void TextDiffDialog::dialogButtonClicked(QAbstractButton *button) {
     auto buttonRole = this->ui->buttonBox->buttonRole(button);
     this->accepted = buttonRole == QDialogButtonBox::AcceptRole;
+
+    // Save the user's preference if "don't show again" is checked
+    if (!this->identifier.isEmpty() && this->ui->dontShowAgainCheckBox->isChecked()) {
+        QString settingsKey = QStringLiteral("MessageBoxOverride/") + this->identifier;
+        SettingsService::instance().setValue(settingsKey, this->accepted);
+    }
+
     this->close();
 }
 

src/dialogs/textdiffdialog.h

@@ -16,7 +16,8 @@ class TextDiffDialog : public MasterDialog {
    public:
     explicit TextDiffDialog(QWidget *parent = nullptr, const QString &title = QString(),
                             const QString &labelText = QString(), const QString &text1 = QString(),
-                            const QString &text2 = QString());
+                            const QString &text2 = QString(),
+                            const QString &identifier = QString());
     ~TextDiffDialog();
     bool resultAccepted();
     QString resultText();
@@ -30,4 +31,5 @@ class TextDiffDialog : public MasterDialog {
     Ui::TextDiffDialog *ui;
     bool accepted = false;
     QString text1;
+    QString identifier;
 };

src/dialogs/textdiffdialog.ui

@@ -66,6 +66,13 @@ li.checked::marker { content: "\2612"; }
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QCheckBox" name="dontShowAgainCheckBox">
+       <property name="text">
+        <string>Don't show dialog again</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">

src/entities/note.cpp

@@ -1546,7 +1546,7 @@ bool Note::storeNoteTextFileToDisk(bool &currentNoteTextChanged,
                         "Click 'OK' to save YOUR version and overwrite the external changes.\n"
                         "Click 'Cancel' to discard your changes and keep the external version.")
                         .arg(_fileName),
-                    currentFileText, _noteText);
+                    currentFileText, _noteText, QStringLiteral("note-checksum-diff"));
 
                 int dialogResult = dialog.exec();
 

src/languages/QOwnNotes_en.ts

@@ -9627,6 +9627,11 @@ Your notes will stay intact!</source>
     </message>
     <message>
         <location filename="../dialogs/textdiffdialog.ui" line="72"/>
+        <source>Don&apos;t show dialog again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/textdiffdialog.ui" line="79"/>
         <source>Accept change?</source>
         <translation type="unfinished"></translation>
     </message>