UX

benapetr · benapetr · commit a8ef81572064 · 2025-11-15T00:11:57.000+01:00
inform user that closing options form leads to unsaved changes
diff --git a/src/huggle_l10n/Localization/en.xml b/src/huggle_l10n/Localization/en.xml
@@ -921,4 +921,6 @@
   <string name="main-clear-talk-page-summary">Cleaned old templates from talk page</string>
   <string name="han-connected">You are now connected to Huggle anti-vandalism network</string>
   <string name="han-disconnected">Lost connection to anti-vandalism network</string>
+  <string name="preferences-unsaved-title">Preferences</string>
+  <string name="preferences-unsaved-text">Closing this form may lose unsaved changes. Do you want to close anyway?</string>
 </resources>
diff --git a/src/huggle_ui/hw.hpp b/src/huggle_ui/hw.hpp
@@ -17,6 +17,7 @@
 
 namespace Huggle
 {
+    //! Huggle Window base class, it provides some basic save / restore layout functionality shared by all Huggle windows
     class HUGGLE_EX_UI HW : public QDialog
     {
         Q_OBJECT
diff --git a/src/huggle_ui/preferences.cpp b/src/huggle_ui/preferences.cpp
@@ -20,6 +20,7 @@
 #include <QFile>
 #include <QDir>
 #include <QMenu>
+#include <QCloseEvent>
 #include <huggle_core/core.hpp>
 #include <huggle_core/configuration.hpp>
 #include <huggle_core/exception.hpp>
@@ -215,6 +216,25 @@ Preferences::~Preferences()
     delete this->ui;
 }
 
+void Preferences::closeEvent(QCloseEvent *event)
+{
+    if (this->forceClose)
+    {
+        event->accept();
+        return;
+    }
+
+    int result = UiGeneric::pMessageBox(this, _l("preferences-unsaved-title"),
+                                       _l("preferences-unsaved-text"),
+                                       MessageBoxStyleQuestion);
+    if (result == QMessageBox::No)
+    {
+        event->ignore();
+        return;
+    }
+    event->accept();
+}
+
 static void SetValue(HuggleQueueFilterMatch matching, QComboBox *item)
 {
     switch (matching)
@@ -404,7 +424,7 @@ void Huggle::Preferences::on_checkBox_InstantReverts_clicked()
 
 void Preferences::RecordKeys(int row, int column)
 {
-    if (this->RewritingForm)
+    if (this->shortcutsRewriting)
         return;
     if (column != 2)
     {
@@ -443,13 +463,13 @@ void Preferences::RecordKeys(int row, int column)
         }
     }
 
-    this->ModifiedForm = true;
-    this->RewritingForm = true;
+    this->shortcutsModified = true;
+    this->shortcutsRewriting = true;
     this->IgnoreConflicts = false;
     hcfg->Shortcuts[id].Modified = true;
     hcfg->Shortcuts[id].QAccel = key;
     this->ui->tableWidget_2->setItem(row, column, new QTableWidgetItem(key));
-    this->RewritingForm = false;
+    this->shortcutsRewriting = false;
     return;
 
     revert:
@@ -848,19 +868,22 @@ void Huggle::Preferences::on_pushButton_OK_clicked()
     {
         hcfg->UserConfig->GoNext = Configuration_OnNext_Next;
     }
-    if (this->ModifiedForm)
+    if (this->shortcutsModified)
     {
         // we need to reload the shortcuts in main form
         hcfg->ReloadOfMainformNeeded = true;
     }
     Configuration::SaveSystemConfig();
     MainWindow::HuggleMain->ReloadInterface();
+
     this->hide();
 }
 
 void Huggle::Preferences::on_pushButton_CloseWin_clicked()
 {
+    this->forceClose = true;
     this->close();
+    this->forceClose = false;
 }
 
 void Huggle::Preferences::on_pushButton_QueueSave_clicked()
@@ -1047,4 +1070,4 @@ void Huggle::Preferences::on_pushButton_ResetConfig_clicked()
     }
     UiGeneric::MessageBox(_l("preferences-reset-config-done"), _l("preferences-reset-config-restart"));
     MainWindow::HuggleMain->Exit();
-}
+}
diff --git a/src/huggle_ui/preferences.hpp b/src/huggle_ui/preferences.hpp
@@ -20,6 +20,7 @@
 #include <QHash>
 
 class QCheckBox;
+class QCloseEvent;
 
 namespace Ui
 {
@@ -39,6 +40,9 @@ namespace Huggle
             ~Preferences();
             void EnableQueues(bool enabled);
 
+        protected:
+            void closeEvent(QCloseEvent *event) override;
+
         private slots:
             void on_listWidget_itemSelectionChanged();
             void on_checkBox_clicked();
@@ -84,10 +88,11 @@ namespace Huggle
             WikiSite *Site;
             bool IgnoreConflicts = false;
             bool isNowReloadingFilters = false;
-            bool RewritingForm = false;
-            bool ModifiedForm = false;
+            bool shortcutsRewriting = false;
+            bool shortcutsModified = false;
             int queueID = 0;
             bool queueModified = false;
+            bool forceClose = false;
             Ui::Preferences *ui;
     };
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`namespace Huggle`
`19`	`19`	`{`
	`20`	`+ //! Huggle Window base class, it provides some basic save / restore layout functionality shared by all Huggle windows`
`20`	`21`	`class HUGGLE_EX_UI HW : public QDialog`
`21`	`22`	`{`
`22`	`23`	`Q_OBJECT`