Changeset 97141 in vbox

Timestamp:

Oct 13, 2022 4:38:35 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154113

Message:

FE/Qt: bugref:9458: Make sure VM settings dialog changes doesn't get lost on accidental dialog closing; Warn user in case if unsaved settings present.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/UISettingsDialog.cpp (modified) (2 diffs)
• settings/UISettingsDialog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -780 +780 @@
 }
 
-bool UIMessageCenter::confirmSettingsReloading(QWidget *pParent /* = 0*/) const
+bool UIMessageCenter::confirmSettingsDiscarding(QWidget *pParent /* = 0 */) const
+{
+    return questionBinary(pParent, MessageType_Question,
+                          tr("<p>The machine settings were changed.</p>"
+                             "<p>Would you like to discard the changed settings or to keep editing them?</p>"),
+                          0 /* auto-confirm id */,
+                          tr("Discard changes"), tr("Keep editing"));
+
+}
+
+bool UIMessageCenter::confirmSettingsReloading(QWidget *pParent /* = 0 */) const
 {
     return questionBinary(pParent, MessageType_Question,

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -307 +307 @@
         void warnAboutUnaccessibleUSB(const COMBaseWithEI &object, QWidget *pParent = 0) const;
         void warnAboutStateChange(QWidget *pParent = 0) const;
+        bool confirmSettingsDiscarding(QWidget *pParent = 0) const;
         bool confirmSettingsReloading(QWidget *pParent = 0) const;
         int confirmRemovingOfLastDVDDevice(QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -343 +343 @@
 }
 
+void UISettingsDialog::closeEvent(QCloseEvent *pEvent)
+{
+    /* Check whether there are unsaved settings
+     * which will be lost in such case: */
+    if (   !isSettingsChanged()
+        || msgCenter().confirmSettingsDiscarding())
+    {
+        /* Call to base-class: */
+        QIWithRetranslateUI<QIMainDialog>::closeEvent(pEvent);
+    }
+    else
+    {
+        /* Otherwise ignore this: */
+        pEvent->ignore();
+    }
+}
+
 void UISettingsDialog::loadData(QVariant &data)
 {
@@ -804 +821 @@
                                                  QDialogButtonBox::NoButton);
 #endif
-                connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UISettingsDialog::reject);
+                connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UISettingsDialog::close);
                 connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UISettingsDialog::accept);
 #ifndef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -103 +103 @@
     /** Handles first show @a pEvent. */
     virtual void polishEvent(QShowEvent *pEvent) RT_OVERRIDE;
+    /** Handles close @a pEvent. */
+    virtual void closeEvent(QCloseEvent *pEvent) RT_OVERRIDE;
 
     /** Returns the serialize process instance. */