Changeset 33932 in vbox

Timestamp:

Nov 10, 2010 12:33:46 PM (14 years ago)

Author:

vboxsync

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

67590

Message:

FE/Qt: Machine settings / System & Storage pages correlation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialogSpecific.cpp (modified) (1 diff)
• machine/UIMachineSettingsStorage.cpp (modified) (2 diffs)
• machine/UIMachineSettingsStorage.h (modified) (3 diffs)
• machine/UIMachineSettingsSystem.cpp (modified) (1 diff)
• machine/UIMachineSettingsSystem.h (modified) (1 diff)

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

@@ -892 +892 @@
 #endif /* !VBOX_OSE */
 
+    if (pPage == m_pSelector->idToPage(VMSettingsPage_Storage))
+    {
+        /* Get System & Storage pages: */
+        UIMachineSettingsSystem *pSystemPage =
+            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
+        UIMachineSettingsStorage *pStoragePage =
+            qobject_cast<UIMachineSettingsStorage*>(m_pSelector->idToPage(VMSettingsPage_Storage));
+        if (pSystemPage && pStoragePage)
+        {
+            /* Update chiset type for the Storage settings page: */
+            if (pStoragePage->chipsetType() != pSystemPage->chipsetType())
+                pStoragePage->setChipsetType(pSystemPage->chipsetType());
+            /* Check for excessive controllers on Storage page controllers list: */
+            QStringList excessiveList;
+            QMap<KStorageBus, int> currentType = pStoragePage->currentControllerTypes();
+            QMap<KStorageBus, int> maximumType = pStoragePage->maximumControllerTypes();
+            for (int iStorageBusType = KStorageBus_IDE; iStorageBusType <= KStorageBus_SAS; ++iStorageBusType)
+            {
+                if (currentType[(KStorageBus)iStorageBusType] > maximumType[(KStorageBus)iStorageBusType])
+                {
+                    QString strExcessiveRecord = QString("%1 (%2)");
+                    strExcessiveRecord = strExcessiveRecord.arg(QString("<b>%1</b>").arg(vboxGlobal().toString((KStorageBus)iStorageBusType)));
+                    strExcessiveRecord = strExcessiveRecord.arg(maximumType[(KStorageBus)iStorageBusType] == 1 ?
+                                                                tr("at most one supported") :
+                                                                tr("up to %1 supported").arg(maximumType[(KStorageBus)iStorageBusType]));
+                    excessiveList << strExcessiveRecord;
+                }
+            }
+            if (!excessiveList.isEmpty())
+            {
+                strWarning = tr(
+                    "you are currently using more storage controllers than a %1 chipset supports. "
+                    "Please change the chipset type on the System settings page or reduce the number "
+                    "of the following storage controllers on the Storage settings page: %2.")
+                    .arg(vboxGlobal().toString(pStoragePage->chipsetType()))
+                    .arg(excessiveList.join(", "));
+                return false;
+            }
+        }
+    }
+
     return true;
 }

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

@@ -1507 +1507 @@
 }
 
+KChipsetType StorageModel::chipsetType() const
+{
+    return m_chipsetType;
+}
+
+void StorageModel::setChipsetType(KChipsetType type)
+{
+    m_chipsetType = type;
+}
+
+QMap<KStorageBus, int> StorageModel::currentControllerTypes() const
+{
+    QMap<KStorageBus, int> currentMap;
+    for (int iStorageBusType = KStorageBus_IDE; iStorageBusType <= KStorageBus_SAS; ++iStorageBusType)
+    {
+        currentMap.insert((KStorageBus)iStorageBusType,
+                          static_cast<RootItem*>(mRootItem)->childCount((KStorageBus)iStorageBusType));
+    }
+    return currentMap;
+}
+
+QMap<KStorageBus, int> StorageModel::maximumControllerTypes() const
+{
+    QMap<KStorageBus, int> maximumMap;
+    for (int iStorageBusType = KStorageBus_IDE; iStorageBusType <= KStorageBus_SAS; ++iStorageBusType)
+    {
+        maximumMap.insert((KStorageBus)iStorageBusType,
+                          vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), (KStorageBus)iStorageBusType));
+    }
+    return maximumMap;
+}
+
 Qt::ItemFlags StorageModel::flags (const QModelIndex &aIndex) const
 {
     return !aIndex.isValid() ? QAbstractItemModel::flags (aIndex) :
            Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-}
-
-KChipsetType StorageModel::chipsetType() const
-{
-    CMachine machine = vboxGlobal().virtualBox().FindMachine(mRootItem->machineId());
-    Assert(!machine.isNull());
-    return machine.GetChipsetType();
 }
 
@@ -1797 +1822 @@
 }
 
+KChipsetType UIMachineSettingsStorage::chipsetType() const
+{
+    return mStorageModel->chipsetType();
+}
+
+void UIMachineSettingsStorage::setChipsetType(KChipsetType type)
+{
+    mStorageModel->setChipsetType(type);
+    updateActionsState();
+}
+
+QMap<KStorageBus, int> UIMachineSettingsStorage::currentControllerTypes() const
+{
+    return mStorageModel->currentControllerTypes();
+}
+
+QMap<KStorageBus, int> UIMachineSettingsStorage::maximumControllerTypes() const
+{
+    return mStorageModel->maximumControllerTypes();
+}
+
 /* Load data to cashe from corresponding external object(s),
  * this task COULD be performed in other than GUI thread: */

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

@@ -498 +498 @@
     QModelIndex attachmentBySlot(QModelIndex controllerIndex, StorageSlot attachmentStorageSlot);
 
+    KChipsetType chipsetType() const;
+    void setChipsetType(KChipsetType type);
+
+    QMap<KStorageBus, int> currentControllerTypes() const;
+    QMap<KStorageBus, int> maximumControllerTypes() const;
+
 private:
 
     Qt::ItemFlags flags (const QModelIndex &aIndex) const;
-
-    KChipsetType chipsetType() const;
 
     AbstractItem *mRootItem;
@@ -513 +517 @@
 
     ToolTipType mToolTipType;
+
+    KChipsetType m_chipsetType;
 };
 Q_DECLARE_METATYPE (StorageModel::ToolTipType);
@@ -568 +574 @@
 
     UIMachineSettingsStorage();
+
+    KChipsetType chipsetType() const;
+    void setChipsetType(KChipsetType type);
+
+    QMap<KStorageBus, int> currentControllerTypes() const;
+    QMap<KStorageBus, int> maximumControllerTypes() const;
 
 signals:

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

@@ -158 +158 @@
 {
     return mCbUseAbsHID->isChecked();
+}
+
+KChipsetType UIMachineSettingsSystem::chipsetType() const
+{
+    return (KChipsetType)mCbChipset->itemData(mCbChipset->currentIndex()).toInt();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -62 +62 @@
     int cpuCount() const;
     bool isHIDEnabled() const;
+    KChipsetType chipsetType() const;
 
 signals: