Changeset 91414 in vbox

Timestamp:

Sep 27, 2021 5:46:20 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9340. Setting current medium in the medium selector when it is started from vm window.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (3 diffs)
• globals/UICommon.h (modified) (2 diffs)
• medium/UIMediumSelector.cpp (modified) (3 diffs)
• medium/UIMediumSelector.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (4 diffs)
• wizards/firstrun/UIWizardFirstRunPageBasic.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMDiskPage.cpp (modified) (1 diff)

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

@@ -1850 +1850 @@
 }
 
-int UICommon::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, QUuid &inOutUuid,
-                                       const QString &strMachineFolder, const QString &strMachineName,
-                                       const QString &strMachineGuestOSTypeId, bool fEnableCreate, const QUuid &uMachineID /* = QUuid() */)
+int UICommon::openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, const QUuid &uCurrentMediumId,
+                                       QUuid &uSelectedMediumUuid, const QString &strMachineFolder, const QString &strMachineName,
+                                       const QString &strMachineGuestOSTypeId, bool fEnableCreate, const QUuid &uMachineID)
 {
     QUuid uMachineOrGlobalId = uMachineID == QUuid() ? gEDataManager->GlobalID : uMachineID;
 
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
-    QPointer<UIMediumSelector> pSelector = new UIMediumSelector(inOutUuid, enmMediumType, strMachineName,
+    QPointer<UIMediumSelector> pSelector = new UIMediumSelector(uCurrentMediumId, enmMediumType, strMachineName,
                                                                 strMachineFolder, strMachineGuestOSTypeId,
                                                                 uMachineOrGlobalId, pDialogParent);
@@ -1883 +1883 @@
         else
         {
-            inOutUuid = selectedMediumIds[0];
-            updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(inOutUuid).location());
+            uSelectedMediumUuid = selectedMediumIds[0];
+            updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uSelectedMediumUuid).location());
         }
     }
@@ -2123 +2123 @@
                 if (target.type == UIMediumTarget::UIMediumTargetType_WithID)
                 {
-                    int iDialogReturn = openMediumSelectorDialog(windowManager().mainWindowShown(), target.mediumType, uMediumID,
+                    int iDialogReturn = openMediumSelectorDialog(windowManager().mainWindowShown(), target.mediumType,
+                                                                 uCurrentID, uMediumID,
                                                                  strMachineFolder, comConstMachine.GetName(),
                                                                  comConstMachine.GetOSTypeId(), true /*fEnableCreate */, comConstMachine.GetId());

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

@@ -406 +406 @@
         /** Creates and shows a UIMediumSelector dialog.
           * @param  parent                   Passes the parent of the dialog,
-          * @param  enmMediumType            Passes the medium type.
-          * @param  inOutUuid                Passes the currently selected medium id if there is one.
+          * @param  enmMediumType            Passes the medium type,
+          * @param  uCurrentMediumId         Passes  the id of the currently selected medium,
+          * @param  uSelectedMediumUuid      Gets  the selected medium id from selection dialog,
           * @param  strMachineFolder         Passes the machine folder,
           * @param  strMachineName           Passes the name of the machine,
@@ -415 +416 @@
           * 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 inOutUuid.*/
-        int openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, QUuid &inOutUuid,
+        int openMediumSelectorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType, const QUuid &uCurrentMediumId, QUuid &uSelectedMediumUuid,
                                      const QString &strMachineFolder, const QString &strMachineName,
-                                     const QString &strMachineGuestOSTypeId, bool fEnableCreate, const QUuid &uMachineID = QUuid());
+                                     const QString &strMachineGuestOSTypeId, bool fEnableCreate, const QUuid &uMachineID);
 
         /** Creates and shows a dialog (wizard) to create a medium of type @a enmMediumType.

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

@@ -559 +559 @@
     UIMediumItem *pMediumItem = searchItem(0, uMediumID);
     if (pMediumItem)
+    {
         m_pTreeWidget->setCurrentItem(pMediumItem);
+        QModelIndex itemIndex = m_pTreeWidget->itemIndex(pMediumItem);
+        if (itemIndex.isValid())
+            m_pTreeWidget->scrollTo(itemIndex, QAbstractItemView::EnsureVisible);
+    }
 }
 
@@ -717 +722 @@
         {
             if (mediumItem->id() == mediumId)
-            {
                 return mediumItem;
-            }
         }
         UIMediumItem *pResult = searchItem(pChild, mediumId);
@@ -726 +729 @@
     }
     return 0;
-}
-
-void UIMediumSelector::scrollToItem(UIMediumItem* pItem)
-{
-    if (!pItem)
-        return;
-
-    QModelIndex itemIndex = m_pTreeWidget->itemIndex(pItem);
-    for (int i = 0; i < m_mediumItemList.size(); ++i)
-    {
-        QFont font = m_mediumItemList[i]->font(0);
-        font.setBold(false);
-        m_mediumItemList[i]->setFont(0, font);
-    }
-    QFont font = pItem->font(0);
-    font.setBold(true);
-    pItem->setFont(0, font);
-
-    m_pTreeWidget->scrollTo(itemIndex);
 }
 

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

@@ -122 +122 @@
     void          saveDefaultForeground();
     void          selectMedium(const QUuid &uMediumID);
-    void          scrollToItem(UIMediumItem* pItem);
     void          setTitle();
     QWidget              *m_pCentralWidget;
@@ -154 +153 @@
     QString               m_strMachineGuestOSTypeId;
     QUuid                 m_uMachineID;
+    QUuid          m_uCurrentMediumId;
 };
 

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

@@ -4002 +4002 @@
     const QString strMachineFolder(QFileInfo(m_strMachineSettingsFilePath).absolutePath());
 
-    QUuid uMediumId;
+
+    QUuid uCurrentMediumId;
     if (m_pMediumIdHolder)
-        uMediumId = m_pMediumIdHolder->id();
-
-    int iResult = uiCommon().openMediumSelectorDialog(this, m_pMediumIdHolder->type(), uMediumId /* in/out parameter */,
+        uCurrentMediumId = m_pMediumIdHolder->id();
+    QUuid uSelectedMediumId;
+    int iResult = uiCommon().openMediumSelectorDialog(this, m_pMediumIdHolder->type(), uCurrentMediumId, uSelectedMediumId,
                                                       strMachineFolder, m_strMachineName,
                                                       m_strMachineGuestOSTypeId,
@@ -4012 +4013 @@
 
     if (iResult == UIMediumSelector::ReturnCode_Rejected ||
-        (iResult == UIMediumSelector::ReturnCode_Accepted && uMediumId.isNull()))
+        (iResult == UIMediumSelector::ReturnCode_Accepted && uSelectedMediumId.isNull()))
         return;
     if (iResult == static_cast<int>(UIMediumSelector::ReturnCode_LeftEmpty) &&
@@ -4018 +4019 @@
         return;
 
-    m_pMediumIdHolder->setId(uMediumId);
+    m_pMediumIdHolder->setId(uSelectedMediumId);
 }
 
@@ -5218 +5219 @@
 
     QUuid uMediumId;
-    int iResult = uiCommon().openMediumSelectorDialog(this, UIMediumDefs::mediumTypeToLocal(enmDeviceType), uMediumId,
+    int iResult = uiCommon().openMediumSelectorDialog(this, UIMediumDefs::mediumTypeToLocal(enmDeviceType),
+                                                      QUuid() /* current medium Id */, uMediumId,
                                                       strMachineFolder, m_strMachineName,
                                                       m_strMachineGuestOSTypeId,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

@@ -41 +41 @@
     /* Get opened vboxMedium id: */
     QUuid uMediumId;
-    uiCommon().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_DVD, uMediumId, "", "", "", true);
+    uiCommon().openMediumSelectorDialog(thisImp(), UIMediumDeviceType_DVD, QUuid() /* current medium Id */,
+                                        uMediumId, "", "", "", true, QUuid() /* Machinie Id */);
     /* Update medium-combo if necessary: */
     if (!uMediumId.isNull())

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

@@ -48 +48 @@
     QUuid uMediumId;
     int returnCode = uiCommon().openMediumSelectorDialog(pCaller, UIMediumDeviceType_HardDisk,
+                                                         QUuid() /* current medium id */,
                                                          uMediumId,
                                                          strMachineFolder,
                                                          strMachineBaseName,
                                                          strOSTypeID,
-                                                         false /* don't show/enable the create action: */);
+                                                         false /* don't show/enable the create action: */,
+                                                         QUuid() /* Machinie Id */);
     if (returnCode != static_cast<int>(UIMediumSelector::ReturnCode_Accepted))
         return QUuid();