Changeset 17884 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Mar 15, 2009 12:55:09 PM (16 years ago)

Author:

vboxsync

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

44443

Message:

FE/Qt4: GUI support for the SCSI controllers

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxGlobal.h (modified) (1 diff)
• VBoxProblemReporter.h (modified) (1 diff)
• VBoxVMSettingsHD.h (modified) (7 diffs)

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

@@ -348 +348 @@
     }
 
+    KStorageBus toStorageBusType (KStorageControllerType aControllerType) const
+    {
+        KStorageBus sb = KStorageBus_Null;
+        switch (aControllerType)
+        {
+            case KStorageControllerType_Null: sb = KStorageBus_Null; break;
+            case KStorageControllerType_PIIX3:
+            case KStorageControllerType_PIIX4:
+            case KStorageControllerType_ICH6: sb = KStorageBus_IDE; break;
+            case KStorageControllerType_IntelAhci: sb = KStorageBus_SATA; break;
+            case KStorageControllerType_LsiLogic:
+            case KStorageControllerType_BusLogic: sb = KStorageBus_SCSI; break;
+            default:
+              AssertMsgFailed (("toStorageBusType: %d not handled\n", aControllerType)); break;
+        }
+        return sb;
+    }
+
     QString toString (KStorageBus aBus, LONG aChannel) const;
     LONG toStorageChannel (KStorageBus aBus, const QString &aChannel) const;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -232 +232 @@
                                       const CProgress &aProgress);
 
-    int confirmDetachSATASlots (QWidget *aParent);
+    int confirmDetachAddControllerSlots (QWidget *aParent) const;
+    int confirmChangeAddControllerSlots (QWidget *aParent) const;
     int confirmRunNewHDWzdOrVDM (QWidget* aParent);
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h

@@ -169 +169 @@
     QList<Attachment> fullUsedList();
 
-    void removeSata();
+    void removeAddController();
     void updateDisks();
 
@@ -280 +280 @@
     void setMachine (const CMachine &aMachine) { mMachine = aMachine; }
 
-    int sataCount() const { return mSataCount; }
-    void setSataCount (int aSataCount)
-    {
-        if (mSataCount != aSataCount)
+    int addCount() const { return mAddCount; }
+    void setAddCount (int aAddCount, KStorageBus aAddBus)
+    {
+        if (mAddCount != aAddCount ||
+            aAddBus != mAddBus)
         {
-            mSataCount = aSataCount;
-            makeSATAList();
+            mAddCount = aAddCount;
+            mAddBus = aAddBus;
+            makeAddControllerList();
         }
     }
@@ -313 +315 @@
 
     void makeIDEList();
-    void makeSATAList();
+    void makeAddControllerList();
     void makeMediumList();
+
 
     static HDSettings *mInstance;
@@ -322 +325 @@
 
     QList<SlotValue> mIDEList;
-    QList<SlotValue> mSATAList;
+    QList<SlotValue> mAddControllerList;
     QList<DiskValue> mDisksList;
 
-    int mSataCount;
+    int mAddCount;
+    KStorageBus mAddBus;
     bool mShowDiffs;
 };
@@ -364 +368 @@
     void showMediaManager();
 
-    void onSATACheckToggled (int);
+    void onAddControllerCheckToggled (int);
+    void onAddControllerTypeChanged (int aIndex);
+    bool checkAddControllers (int aWhat);
     void onShowDiffsCheckToggled (int);
 
@@ -379 +385 @@
     QUuid getWithNewHDWizard();
     int maxNameLength() const;
+    void prepareComboboxes();
     void removeFocus();
+    KStorageControllerType currentControllerType() const
+    {
+        return static_cast<KStorageControllerType> (mCbControllerType->itemData (mCbControllerType->currentIndex()).toInt());
+    }
+    KStorageBus currentBusType() const
+    {
+        return vboxGlobal().toStorageBusType (currentControllerType());
+    }
+    int currentMaxPortCount() const
+    {
+        int c = 0;
+        switch (currentBusType())
+        {
+            case KStorageBus_IDE: c = 2; break;
+            case KStorageBus_SATA: c = 30; break;
+            case KStorageBus_SCSI: c = 16; break;
+            default: break;
+        }
+        return c;
+    }
 
     /* variables */
@@ -392 +419 @@
     bool mWasTableSelected;
     bool mPolished;
+
+    int mLastSelAddControllerIndex;
 };