Changeset 86242 in vbox

Timestamp:

Sep 23, 2020 2:55:37 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UICloudProfileManager: Make sure closeEvent handler checks for an unsaved changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/profilemanager/UICloudProfileManager.cpp (modified) (3 diffs)
• cloud/profilemanager/UICloudProfileManager.h (modified) (2 diffs)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -24 +24 @@
 #include "QIDialogButtonBox.h"
 #include "QIInputDialog.h"
+#include "QIMessageBox.h"
 #include "QITreeWidget.h"
 #include "UICommon.h"
@@ -184 +185 @@
                                    << tr("Source")
                                    << tr("List VMs"));
+}
+
+bool UICloudProfileManagerWidget::makeSureChangesResolved()
+{
+    /* Check if currently selected item is of profile type: */
+    QITreeWidgetItem *pItem = QITreeWidgetItem::toItem(m_pTreeWidget->currentItem());
+    UIItemCloudProfile *pProfileItem = qobject_cast<UIItemCloudProfile*>(pItem);
+    if (!pProfileItem)
+        return true;
+
+    /* Get item data: */
+    UIDataCloudProfile oldData = *pProfileItem;
+    UIDataCloudProfile newData = m_pDetailsWidget->data();
+
+    /* Check if data has changed: */
+    if (newData == oldData)
+        return true;
+
+    /* Ask whether user wants to Accept/Reset changes or still not sure: */
+    const int iResult = msgCenter().confirmCloudProfileManagerClosing(window());
+    switch (iResult)
+    {
+        case AlertButton_Choice1:
+        {
+            sltApplyCloudProfileDetailsChanges();
+            return true;
+        }
+        case AlertButton_Choice2:
+        {
+            sltResetCloudProfileDetailsChanges();
+            return true;
+        }
+        default:
+            break;
+    }
+
+    /* False by default: */
+    return false;
 }
 
@@ -1072 +1111 @@
 }
 
+void UICloudProfileManager::closeEvent(QCloseEvent *pEvent)
+{
+    /* Make sure all changes resolved: */
+    if (widget()->makeSureChangesResolved())
+    {
+        /* Call to base class: */
+        QIWithRetranslateUI<QIManagerDialog>::closeEvent(pEvent);
+    }
+    else
+    {
+        /* Just ignore the event otherwise: */
+        pEvent->ignore();
+    }
+}
+
 
 #include "UICloudProfileManager.moc"

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.h

@@ -72 +72 @@
     QIToolBar *toolbar() const { return m_pToolBar; }
 #endif
+
+    /** Check for changes committed.
+      * @returns Whether changes were resolved (accepted or discarded) or still a problem otherwise. */
+    bool makeSureChangesResolved();
 
 protected:
@@ -274 +278 @@
     /** @} */
 
+    /** @name Event-handling stuff.
+      * @{ */
+        /** Handles close @a pEvent. */
+        virtual void closeEvent(QCloseEvent *pEvent) /* override */;
+    /** @} */
+
     /** @name Action related variables.
       * @{ */

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

@@ -2022 +2022 @@
 }
 
+int UIMessageCenter::confirmCloudProfileManagerClosing(QWidget *pParent /* = 0 */) const
+{
+    return question(pParent, MessageType_Question,
+                    tr("<p>Do you want to close the Cloud Profile Manager?</p>"
+                       "<p>There seems to be an unsaved changes. "
+                       "You can choose to <b>Accept</b> or <b>Reject</b> them automatically "
+                       "or cancel to keep the dialog opened.</p>"),
+                    0 /* auto-confirm id */,
+                    AlertButton_Choice1,
+                    AlertButton_Choice2,
+                    AlertButton_Cancel | AlertButtonOption_Default | AlertButtonOption_Escape,
+                    tr("Accept", "cloud profile manager changes"),
+                    tr("Reject", "cloud profile manager changes"));
+}
+
 bool UIMessageCenter::confirmCloudConsoleApplicationRemoval(const QString &strName, QWidget *pParent /* = 0 */) const
 {

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

@@ -416 +416 @@
     void cannotAssignFormValue(const CRangedIntegerFormValue &comValue, QWidget *pParent = 0) const;
     void cannotAssignFormValue(const CProgress &comProgress, QWidget *pParent = 0) const;
+    int confirmCloudProfileManagerClosing(QWidget *pParent = 0) const;
 
     /* API: Cloud Console Manager warnings: */