Fix problem with the loading of the word wrapping setting

mgrojo · mgrojo · commit 7518ce2da8fa · 2024-12-14T14:41:10.000+01:00
All settings are reloaded in `reloadSettings` and not only the ones set in Preferences. This is important for the Scintilla word wrapping, otherwise the value is changed in the base class (for Execute SQL). Now it is correctly overwritten after calling `sciEdit->reloadSettings();`. See issue #3753 and #3061.
diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
@@ -95,13 +95,6 @@ EditDialog::EditDialog(QWidget* parent)
     });
     connect(ui->actionOpenInExternal, &QAction::triggered, this, &EditDialog::openDataWithExternal);
 
-    mustIndentAndCompact = Settings::getValue("databrowser", "indent_compact").toBool();
-    ui->actionIndent->setChecked(mustIndentAndCompact);
-
-    ui->buttonAutoSwitchMode->setChecked(Settings::getValue("databrowser", "auto_switch_mode").toBool());
-    ui->actionWordWrap->setChecked(Settings::getValue("databrowser", "editor_word_wrap").toBool());
-    setWordWrapping(ui->actionWordWrap->isChecked());
-
     reloadSettings();
 }
 
@@ -1136,6 +1129,11 @@ void EditDialog::updateCellInfoAndMode(const QByteArray& bArrdata)
 
 void EditDialog::reloadSettings()
 {
+    mustIndentAndCompact = Settings::getValue("databrowser", "indent_compact").toBool();
+    ui->actionIndent->setChecked(mustIndentAndCompact);
+
+    ui->buttonAutoSwitchMode->setChecked(Settings::getValue("databrowser", "auto_switch_mode").toBool());
+
     // Set the (SQL) editor font for hex editor, since it needs a
     // Monospace font and the databrowser font would be usually of
     // variable width.
@@ -1152,6 +1150,9 @@ void EditDialog::reloadSettings()
                                             (Settings::getValue("General", "toolbarStyleEditCell").toInt()));
 
     sciEdit->reloadSettings();
+
+    ui->actionWordWrap->setChecked(Settings::getValue("databrowser", "editor_word_wrap").toBool());
+    setWordWrapping(ui->actionWordWrap->isChecked());
 }
 
 void EditDialog::setStackCurrentIndex(int editMode)
