Changeset 23580 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h

Timestamp:

Oct 6, 2009 11:10:01 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Storage Settings UI: Removing 'device' combo from the right pane, updating context menu, updating icons, few fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h (modified) (6 diffs)

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

@@ -62 +62 @@
     enum PixmapType
     {
-        InvalidPixmap      = -1,
-
-        AddControllerEn    =  0,
-        AddControllerDis   =  1,
-        DelControllerEn    =  2,
-        DelControllerDis   =  3,
-
-        AddAttachmentEn    =  4,
-        AddAttachmentDis   =  5,
-        DelAttachmentEn    =  6,
-        DelAttachmentDis   =  7,
-
-        IDEController      =  8,
-        IDEExpand          =  9,
-        IDECollapse        = 10,
-        SATAController     = 11,
-        SATAExpand         = 12,
-        SATACollapse       = 13,
-        SCSIController     = 14,
-        SCSIExpand         = 15,
-        SCSICollapse       = 16,
-        FloppyController   = 17,
-        FloppyExpand       = 18,
-        FloppyCollapse     = 19,
-
-        HDAttachmentEn     = 20,
-        CDAttachmentEn     = 21,
-        FDAttachmentEn     = 22,
-
-        HDAttachmentAddEn  = 23,
-        HDAttachmentAddDis = 24,
-        CDAttachmentAddEn  = 25,
-        CDAttachmentAddDis = 26,
-        FDAttachmentAddEn  = 27,
-        FDAttachmentAddDis = 28,
-
-        VMMEn              = 29,
-        VMMDis             = 30,
+        InvalidPixmap            = -1,
+
+        ControllerAddEn          =  0,
+        ControllerAddDis         =  1,
+        ControllerDelEn          =  2,
+        ControllerDelDis         =  3,
+
+        AttachmentAddEn          =  4,
+        AttachmentAddDis         =  5,
+        AttachmentDelEn          =  6,
+        AttachmentDelDis         =  7,
+
+        IDEControllerNormal      =  8,
+        IDEControllerExpand      =  9,
+        IDEControllerCollapse    = 10,
+        SATAControllerNormal     = 11,
+        SATAControllerExpand     = 12,
+        SATAControllerCollapse   = 13,
+        SCSIControllerNormal     = 14,
+        SCSIControllerExpand     = 15,
+        SCSIControllerCollapse   = 16,
+        FloppyControllerNormal   = 17,
+        FloppyControllerExpand   = 18,
+        FloppyControllerCollapse = 19,
+
+        IDEControllerAddEn       = 20,
+        IDEControllerAddDis      = 21,
+        SATAControllerAddEn      = 22,
+        SATAControllerAddDis     = 23,
+        SCSIControllerAddEn      = 24,
+        SCSIControllerAddDis     = 25,
+        FloppyControllerAddEn    = 26,
+        FloppyControllerAddDis   = 27,
+
+        HDAttachmentNormal       = 28,
+        CDAttachmentNormal       = 29,
+        FDAttachmentNormal       = 30,
+
+        HDAttachmentAddEn        = 31,
+        HDAttachmentAddDis       = 32,
+        CDAttachmentAddEn        = 33,
+        CDAttachmentAddDis       = 34,
+        FDAttachmentAddEn        = 35,
+        FDAttachmentAddDis       = 36,
+
+        VMMEn                    = 37,
+        VMMDis                   = 38,
 
         MaxIndex
@@ -255 +264 @@
     RootItem();
    ~RootItem();
+
+    ULONG childCount (KStorageBus aBus) const;
 
 private:
@@ -395 +406 @@
 
         R_ToolTipType,
-        R_IsMoreControllersPossible,
+        R_IsMoreIDEControllersPossible,
+        R_IsMoreSATAControllersPossible,
+        R_IsMoreSCSIControllersPossible,
+        R_IsMoreFloppyControllersPossible,
         R_IsMoreAttachmentsPossible,
 
@@ -538 +552 @@
     void delController();
 
-    void addAttachment (KDeviceType aDeviceType = KDeviceType_Null);
+    void addAttachment();
+    void addHDAttachment();
+    void addCDAttachment();
+    void addFDAttachment();
     void delAttachment();
 
@@ -561 +578 @@
 
 private:
+
+    void addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType);
+    void addAttachmentWrapper (KDeviceType aDevice);
 
     QString getWithNewHDWizard();
@@ -581 +601 @@
     QAction *mDelCtrAction;
     QAction *mAddAttAction;
+    QAction *mAddHDAttAction;
+    QAction *mAddCDAttAction;
+    QAction *mAddFDAttAction;
     QAction *mDelAttAction;