Changeset 77186 in vbox for trunk/src/VBox

Timestamp:

Feb 6, 2019 7:52:33 PM (6 years ago)

Author:

vboxsync

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

128675

Message:

FE/Qt: bugref:9340. Remove an intermediate popup dialog in machine settings storage attachement

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (9 diffs)
• medium/UIMediumSelector.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (2 diffs)

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

@@ -2735 +2735 @@
 }
 
-QUuid VBoxGlobal::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
-                                           const QString &strMachineName, const QString &strMachineFolder,
-                                           const QString &strMachineGuestOSTypeId  /* = QString() */)
+int VBoxGlobal::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, QUuid &outUuid,
+                                         const QString &strMachineName, const QString &strMachineFolder,
+                                         const QString &strMachineGuestOSTypeId  /* = QString() */)
 {
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
@@ -2744 +2744 @@
 
     if (!pSelector)
-        return QUuid();
+        return static_cast<int>(UIMediumSelector::ReturnCode_Rejected);
+
     windowManager().registerNewParent(pSelector, pDialogParent);
-    if (pSelector->exec(false))
+
+    int iResult = pSelector->exec(false);
+    UIMediumSelector::ReturnCode returnCode;
+
+    if (iResult >= static_cast<int>(UIMediumSelector::ReturnCode_Max) || iResult < 0)
+        returnCode = UIMediumSelector::ReturnCode_Rejected;
+    else
+        returnCode = static_cast<UIMediumSelector::ReturnCode>(iResult);
+
+    if (returnCode == UIMediumSelector::ReturnCode_Accepted)
     {
         QList<QUuid> selectedMediumIds = pSelector->selectedMediumIds();
-        delete pSelector;
+
         /* Currently we only care about the 0th since we support single selection by intention: */
         if (selectedMediumIds.isEmpty())
-            return QUuid();
+            returnCode = UIMediumSelector::ReturnCode_Rejected;
         else
-            return selectedMediumIds[0];
+            outUuid = selectedMediumIds[0];
     }
     delete pSelector;
-    return QUuid();
+    return static_cast<int>(returnCode);
 }
 

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

@@ -518 +518 @@
           * @param  strMachineFolder         Passes the machine folder,
           * @param  strMachineGuestOSTypeId  Passes the type ID of machine's guest os,
-          * returns the ID of the  selected/created medium if successful, a null QUuid otherwise.*/
-        QUuid openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
+          * returns the return code of the UIMediumSelector::ReturnCode as int. In case of a medium selection
+          *         UUID of the selected medium is stored in @param outUuid.*/
+        int openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, QUuid &outUuid,
                                        const QString &strMachineName, const QString &strMachineFolder,
                                        const QString &strMachineGuestOSTypeId = QString());

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -63 +63 @@
     , m_enmMediumType(enmMediumType)
     , m_pButtonBox(0)
+    , m_pCancelButton(0)
+    , m_pChooseButton(0)
+    , m_pLeaveEmptyButton(0)
     , m_pMainMenu(0)
     , m_pToolBar(0)
@@ -123 +126 @@
     }
 
-    if (m_pButtonBox)
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setText(tr("Choose"));
+    if (m_pCancelButton)
+        m_pCancelButton->setText(tr("Cancel"));
+    if (m_pLeaveEmptyButton)
+        m_pLeaveEmptyButton->setText(tr("Leave Empty"));
+    if (m_pChooseButton)
+        m_pChooseButton->setText(tr("Choose"));
 
     if (m_pTreeWidget)
@@ -231 +238 @@
     }
 
-    if (m_pButtonBox)
-    {
-        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIMediumSelector::close);
-        connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIMediumSelector::accept);
-    }
+    if (m_pCancelButton)
+        connect(m_pCancelButton, &QPushButton::clicked, this, &UIMediumSelector::sltButtonCancel);
+    if (m_pChooseButton)
+        connect(m_pChooseButton, &QPushButton::clicked, this, &UIMediumSelector::sltButtonChoose);
+    if (m_pLeaveEmptyButton)
+        connect(m_pLeaveEmptyButton, &QPushButton::clicked, this, &UIMediumSelector::sltButtonLeaveEmpty);
+
 
     if (m_pSearchWidget)
@@ -382 +391 @@
     {
         /* Configure button-box: */
-        m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
-        m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
+        m_pCancelButton = m_pButtonBox->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
+
+        /* Only DVDs and Floppies can be left empty: */
+        if (m_enmMediumType == UIMediumDeviceType_DVD || m_enmMediumType == UIMediumDeviceType_Floppy)
+            m_pLeaveEmptyButton = m_pButtonBox->addButton(tr("Leave Empty"), QDialogButtonBox::ActionRole);
+
+        m_pChooseButton = m_pButtonBox->addButton(tr("Choose"), QDialogButtonBox::AcceptRole);
+        m_pCancelButton->setShortcut(Qt::Key_Escape);
 
         /* Add button-box into main layout: */
@@ -390 +405 @@
 
     repopulateTreeWidget();
+}
+
+void UIMediumSelector::sltButtonChoose()
+{
+    done(static_cast<int>(ReturnCode_Accepted));
+}
+
+void UIMediumSelector::sltButtonCancel()
+{
+    done(static_cast<int>(ReturnCode_Rejected));
+}
+
+void UIMediumSelector::sltButtonLeaveEmpty()
+{
+    done(static_cast<int>(ReturnCode_LeftEmpty));
 }
 
@@ -423 +453 @@
 void UIMediumSelector::sltHandleItemSelectionChanged()
 {
-    updateOkButton();
+    updateChooseButton();
 }
 
@@ -517 +547 @@
 }
 
-void UIMediumSelector::updateOkButton()
-{
-
-    if (!m_pTreeWidget || !m_pButtonBox || !m_pButtonBox->button(QDialogButtonBox::Ok))
+void UIMediumSelector::updateChooseButton()
+{
+
+    if (!m_pTreeWidget || !m_pChooseButton)
         return;
     QList<QTreeWidgetItem*> selectedItems = m_pTreeWidget->selectedItems();
     if (selectedItems.isEmpty())
     {
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+        m_pChooseButton->setEnabled(false);
         return;
     }
@@ -537 +567 @@
     }
     if (mediumItemSelected)
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+        m_pChooseButton->setEnabled(true);
     else
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+        m_pChooseButton->setEnabled(false);
 }
 
@@ -628 +658 @@
     restoreSelection(selectedMedia, menuItemVector);
     saveDefaultForeground();
-    updateOkButton();
+    updateChooseButton();
     if (m_pAttachedSubTreeRoot)
         m_pTreeWidget->expandItem(m_pAttachedSubTreeRoot);

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h

@@ -57 +57 @@
     QList<QUuid> selectedMediumIds() const;
 
+    enum ReturnCode
+    {
+        ReturnCode_Rejected = 0,
+        ReturnCode_Accepted,
+        ReturnCode_LeftEmpty,
+        ReturnCode_Max
+    };
+
 protected:
 
     void showEvent(QShowEvent *pEvent);
 
+
 private slots:
 
+    void sltButtonLeaveEmpty();
+    void sltButtonCancel();
+    void sltButtonChoose();
     void sltAddMedium();
     void sltCreateMedium();
@@ -98 +110 @@
     void          repopulateTreeWidget();
     /** Disable/enable 'ok' button on the basis of having a selected item */
-    void          updateOkButton();
+    void          updateChooseButton();
     UIMediumItem* addTreeItem(const UIMedium &medium, QITreeWidgetItem *pParent);
     void          restoreSelection(const QList<QUuid> &selectedMediums, QVector<UIMediumItem*> &mediumList);
@@ -113 +125 @@
     UIMediumDeviceType    m_enmMediumType;
     QIDialogButtonBox    *m_pButtonBox;
+    QPushButton          *m_pCancelButton;
+    QPushButton          *m_pChooseButton;
+    QPushButton          *m_pLeaveEmptyButton;
     QMenu                *m_pMainMenu;
     UIToolBar            *m_pToolBar;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3798 +3798 @@
     const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
 
-    bool fCancelled = false;
-    bool fCreateEmpty = false;
     QUuid uMediumId;
+    int iAnswer = static_cast<int>(UIMediumSelector::ReturnCode_Rejected);
     switch (enmDevice)
     {
         case KDeviceType_HardDisk:
         {
-            const int iAnswer = msgCenter().confirmHardDiskAttachmentCreation(strControllerName, this);
-            if (iAnswer == AlertButton_Choice1)
-                uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineSettingsFilePath);
-            else if (iAnswer == AlertButton_Choice2)
-                uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_HardDisk,
-                                                                  m_strMachineName, m_strMachineSettingsFilePath,
-                                                                  m_strMachineGuestOSTypeId);
-            else if (iAnswer == AlertButton_Cancel)
-                fCancelled = true;
+            iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_HardDisk, uMediumId,
+                                                            m_strMachineName, m_strMachineSettingsFilePath,
+                                                            m_strMachineGuestOSTypeId);
             break;
         }
         case KDeviceType_DVD:
         {
-            int iAnswer = msgCenter().confirmOpticalAttachmentCreation(strControllerName, this);
-            if (iAnswer == AlertButton_Choice2)
-                uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_DVD,
-                                                                  m_strMachineName, m_strMachineSettingsFilePath);
-            /* For optical medium we allow creating an empty drive: */
-            else if (iAnswer == AlertButton_Choice1)
-                fCreateEmpty = true;
-            else if (iAnswer == AlertButton_Cancel)
-                fCancelled = true;
+            iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_DVD, uMediumId,
+                                                            m_strMachineName, m_strMachineSettingsFilePath);
             break;
         }
         case KDeviceType_Floppy:
         {
-            int iAnswer = msgCenter().confirmFloppyAttachmentCreation(strControllerName, this);
-            if (iAnswer == AlertButton_Choice2)
-                uMediumId = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_Floppy,
-                                                                  m_strMachineName, m_strMachineSettingsFilePath);
-
-            /* We allow creating an empty floppy drive: */
-            else if (iAnswer == AlertButton_Choice1)
-                fCreateEmpty = true;
-            else if (iAnswer == AlertButton_Cancel)
-                fCancelled = true;
-            break;
+            iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_Floppy, uMediumId,
+                                                            m_strMachineName, m_strMachineSettingsFilePath);
         }
         default: break; /* Shut up, MSC! */
     }
-
-    if (!fCancelled && (!uMediumId.isNull() || fCreateEmpty))
-    {
-        m_pModelStorage->addAttachment(QUuid(m_pModelStorage->data(index, StorageModel::R_ItemId).toString()), enmDevice, uMediumId);
-        m_pModelStorage->sort();
-        emit sigStorageChanged();
-
-        /* Revalidate: */
-        revalidate();
-    }
+    /* continue only if iAnswer is either UIMediumSelector::ReturnCode_Accepted or UIMediumSelector::ReturnCode_LeftEmpty: */
+    if (iAnswer != static_cast<int>(UIMediumSelector::ReturnCode_Accepted) &&
+        iAnswer != static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty))
+        return;
+
+    /* Only DVDs and floppy can be created empty: */
+    if (iAnswer == static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty) &&
+        (enmDevice != KDeviceType_DVD && enmDevice != KDeviceType_Floppy))
+        return;
+
+    /* if iAnswer is UIMediumSelector::ReturnCode_Accepted then we have to have a valid uMediumId: */
+    if (iAnswer == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && uMediumId.isNull())
+        return;
+
+    m_pModelStorage->addAttachment(QUuid(m_pModelStorage->data(index, StorageModel::R_ItemId).toString()), enmDevice, uMediumId);
+    m_pModelStorage->sort();
+    emit sigStorageChanged();
+
+    /* Revalidate: */
+    revalidate();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

@@ -28 +28 @@
 #include "UIMediaComboBox.h"
 #include "UIMedium.h"
+#include "UIMediumSelector.h"
 #include "UIMessageCenter.h"
 #include "UIWizardNewVD.h"
@@ -62 +63 @@
 {
     /* Get opened medium id: */
-    QUuid uMediumId = vboxGlobal().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_HardDisk,
-                                                            fieldImp("machineBaseName").toString(),
-                                                            fieldImp("machineFolder").toString(),
-                                                            fieldImp("type").value<CGuestOSType>().GetFamilyId());
-    if (!uMediumId.isNull())
+    QUuid uMediumId;
+
+    int returnCode = vboxGlobal().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_HardDisk,
+                                                           uMediumId,
+                                                           fieldImp("machineBaseName").toString(),
+                                                           fieldImp("machineFolder").toString(),
+                                                           fieldImp("type").value<CGuestOSType>().GetFamilyId());
+
+    if (returnCode == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && !uMediumId.isNull())
     {
         /* Update medium-combo if necessary: */