Changeset 77217 in vbox for trunk/src/VBox

Timestamp:

Feb 8, 2019 1:32:34 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340. Hide the create action from the medium selector when it is opened from the new vm wizard

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -2759 +2759 @@
 int VBoxGlobal::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, QUuid &outUuid,
                                          const QString &strMachineName, const QString &strMachineFolder,
-                                         const QString &strMachineGuestOSTypeId  /* = QString() */)
+                                         const QString &strMachineGuestOSTypeId, bool fEnableCreate)
 {
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
@@ -2767 +2767 @@
     if (!pSelector)
         return static_cast<int>(UIMediumSelector::ReturnCode_Rejected);
-
+    pSelector->setEnableCreateAction(fEnableCreate);
     windowManager().registerNewParent(pSelector, pDialogParent);
 

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,
+          * @param  fEnableCreate            Passes whether to show/enable create action in the medium selector dialog,
           * 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());
+                                     const QString &strMachineName, const QString &strMachineFolder,
+                                     const QString &strMachineGuestOSTypeId, bool fEnableCreate);
 
         /** Creates and shows a UIWizardNewVD wizard.

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

@@ -84 +84 @@
 }
 
+void UIMediumSelector::setEnableCreateAction(bool fEnable)
+{
+    if (!m_pActionCreate)
+        return;
+    m_pActionCreate->setEnabled(fEnable);
+    m_pActionCreate->setVisible(fEnable);
+}
+
 QList<QUuid> UIMediumSelector::selectedMediumIds() const
 {

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

@@ -54 +54 @@
                      const QString &machineSettingsFilePath = QString(), const QString &strMachineGuestOSTypeId = QString(),
                      QWidget *pParent = 0);
-
+    /** Disables/enables the create action and controls its visibility. */
+    void         setEnableCreateAction(bool fEnable);
     QList<QUuid> selectedMediumIds() const;
 

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

@@ -3100 +3100 @@
     int iResult = vboxGlobal().openMediumSelectorDialog(this, m_pMediumIdHolder->type(), uMediumId,
                                                         m_strMachineName, strMachineFolder,
-                                                        m_strMachineGuestOSTypeId);
+                                                        m_strMachineGuestOSTypeId, true /* enable create action: */);
 
     if (iResult == UIMediumSelector::ReturnCode_Rejected ||
@@ -3812 +3812 @@
     int iResult = vboxGlobal().openMediumSelectorDialog(this, UIMediumDefs::mediumTypeToLocal(enmDevice), uMediumId,
                                                         m_strMachineName, strMachineFolder,
-                                                        m_strMachineGuestOSTypeId);
+                                                        m_strMachineGuestOSTypeId, true /* enable cr1eate action: */);
 
     /* Continue only if iResult is either UIMediumSelector::ReturnCode_Accepted or UIMediumSelector::ReturnCode_LeftEmpty: */

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

@@ -69 +69 @@
                                                            fieldImp("machineBaseName").toString(),
                                                            fieldImp("machineFolder").toString(),
-                                                           fieldImp("type").value<CGuestOSType>().GetId());
+                                                           fieldImp("type").value<CGuestOSType>().GetId(),
+                                                           false /* don't show/enable the create action: */);
 
     if (returnCode == static_cast<int>(UIMediumSelector::ReturnCode_Accepted) && !uMediumId.isNull())