VirtualBox

Changeset 23580 in vbox


Ignore:
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.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
8 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

    r23429 r23580  
    208208    <file alias="ide_expand_16px.png">images/ide_expand_16px.png</file>
    209209    <file alias="ide_collapse_16px.png">images/ide_collapse_16px.png</file>
     210    <file alias="ide_add_16px.png">images/ide_add_16px.png</file>
     211    <file alias="ide_add_disabled_16px.png">images/ide_add_disabled_16px.png</file>
    210212    <file alias="sata_16px.png">images/sata_16px.png</file>
    211213    <file alias="sata_expand_16px.png">images/sata_expand_16px.png</file>
    212214    <file alias="sata_collapse_16px.png">images/sata_collapse_16px.png</file>
     215    <file alias="sata_add_16px.png">images/sata_add_16px.png</file>
     216    <file alias="sata_add_disabled_16px.png">images/sata_add_disabled_16px.png</file>
    213217    <file alias="scsi_16px.png">images/scsi_16px.png</file>
    214218    <file alias="scsi_expand_16px.png">images/scsi_expand_16px.png</file>
    215219    <file alias="scsi_collapse_16px.png">images/scsi_collapse_16px.png</file>
     220    <file alias="scsi_add_16px.png">images/scsi_add_16px.png</file>
     221    <file alias="scsi_add_disabled_16px.png">images/scsi_add_disabled_16px.png</file>
    216222    <file alias="floppy_16px.png">images/floppy_16px.png</file>
    217223    <file alias="floppy_expand_16px.png">images/floppy_expand_16px.png</file>
    218224    <file alias="floppy_collapse_16px.png">images/floppy_collapse_16px.png</file>
     225    <file alias="floppy_add_16px.png">images/floppy_add_16px.png</file>
     226    <file alias="floppy_add_disabled_16px.png">images/floppy_add_disabled_16px.png</file>
    219227    <file alias="import_16px.png">images/import_16px.png</file>
    220228    <file alias="export_16px.png">images/export_16px.png</file>

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxMediaComboBox.h

    r23238 r23580  
    4444    QString id (int = -1) const;
    4545    QString location (int = -1) const;
     46    VBoxDefs::MediumType type() const { return mType; }
    4647
    4748    void setCurrentItem (const QString &aItemId);

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

    r23429 r23580  
    6262    enum PixmapType
    6363    {
    64         InvalidPixmap      = -1,
    65 
    66         AddControllerEn    =  0,
    67         AddControllerDis   =  1,
    68         DelControllerEn    =  2,
    69         DelControllerDis   =  3,
    70 
    71         AddAttachmentEn    =  4,
    72         AddAttachmentDis   =  5,
    73         DelAttachmentEn    =  6,
    74         DelAttachmentDis   =  7,
    75 
    76         IDEController      =  8,
    77         IDEExpand          =  9,
    78         IDECollapse        = 10,
    79         SATAController     = 11,
    80         SATAExpand         = 12,
    81         SATACollapse       = 13,
    82         SCSIController     = 14,
    83         SCSIExpand         = 15,
    84         SCSICollapse       = 16,
    85         FloppyController   = 17,
    86         FloppyExpand       = 18,
    87         FloppyCollapse     = 19,
    88 
    89         HDAttachmentEn     = 20,
    90         CDAttachmentEn     = 21,
    91         FDAttachmentEn     = 22,
    92 
    93         HDAttachmentAddEn  = 23,
    94         HDAttachmentAddDis = 24,
    95         CDAttachmentAddEn  = 25,
    96         CDAttachmentAddDis = 26,
    97         FDAttachmentAddEn  = 27,
    98         FDAttachmentAddDis = 28,
    99 
    100         VMMEn              = 29,
    101         VMMDis             = 30,
     64        InvalidPixmap            = -1,
     65
     66        ControllerAddEn          =  0,
     67        ControllerAddDis         =  1,
     68        ControllerDelEn          =  2,
     69        ControllerDelDis         =  3,
     70
     71        AttachmentAddEn          =  4,
     72        AttachmentAddDis         =  5,
     73        AttachmentDelEn          =  6,
     74        AttachmentDelDis         =  7,
     75
     76        IDEControllerNormal      =  8,
     77        IDEControllerExpand      =  9,
     78        IDEControllerCollapse    = 10,
     79        SATAControllerNormal     = 11,
     80        SATAControllerExpand     = 12,
     81        SATAControllerCollapse   = 13,
     82        SCSIControllerNormal     = 14,
     83        SCSIControllerExpand     = 15,
     84        SCSIControllerCollapse   = 16,
     85        FloppyControllerNormal   = 17,
     86        FloppyControllerExpand   = 18,
     87        FloppyControllerCollapse = 19,
     88
     89        IDEControllerAddEn       = 20,
     90        IDEControllerAddDis      = 21,
     91        SATAControllerAddEn      = 22,
     92        SATAControllerAddDis     = 23,
     93        SCSIControllerAddEn      = 24,
     94        SCSIControllerAddDis     = 25,
     95        FloppyControllerAddEn    = 26,
     96        FloppyControllerAddDis   = 27,
     97
     98        HDAttachmentNormal       = 28,
     99        CDAttachmentNormal       = 29,
     100        FDAttachmentNormal       = 30,
     101
     102        HDAttachmentAddEn        = 31,
     103        HDAttachmentAddDis       = 32,
     104        CDAttachmentAddEn        = 33,
     105        CDAttachmentAddDis       = 34,
     106        FDAttachmentAddEn        = 35,
     107        FDAttachmentAddDis       = 36,
     108
     109        VMMEn                    = 37,
     110        VMMDis                   = 38,
    102111
    103112        MaxIndex
    … …  
    255264    RootItem();
    256265   ~RootItem();
     266
     267    ULONG childCount (KStorageBus aBus) const;
    257268
    258269private:
    … …  
    395406
    396407        R_ToolTipType,
    397         R_IsMoreControllersPossible,
     408        R_IsMoreIDEControllersPossible,
     409        R_IsMoreSATAControllersPossible,
     410        R_IsMoreSCSIControllersPossible,
     411        R_IsMoreFloppyControllersPossible,
    398412        R_IsMoreAttachmentsPossible,
    399413
    … …  
    538552    void delController();
    539553
    540     void addAttachment (KDeviceType aDeviceType = KDeviceType_Null);
     554    void addAttachment();
     555    void addHDAttachment();
     556    void addCDAttachment();
     557    void addFDAttachment();
    541558    void delAttachment();
    542559
    … …  
    561578
    562579private:
     580
     581    void addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType);
     582    void addAttachmentWrapper (KDeviceType aDevice);
    563583
    564584    QString getWithNewHDWizard();
    … …  
    581601    QAction *mDelCtrAction;
    582602    QAction *mAddAttAction;
     603    QAction *mAddHDAttAction;
     604    QAction *mAddCDAttAction;
     605    QAction *mAddFDAttAction;
    583606    QAction *mDelAttAction;
    584607

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp

    r23444 r23580  
    114114    mPool.resize (MaxIndex);
    115115
    116     mPool [AddControllerEn]    = QPixmap (":/controller_add_16px.png");
    117     mPool [AddControllerDis]   = QPixmap (":/controller_add_disabled_16px.png");
    118     mPool [DelControllerEn]    = QPixmap (":/controller_remove_16px.png");
    119     mPool [DelControllerDis]   = QPixmap (":/controller_remove_disabled_16px.png");
    120 
    121     mPool [AddAttachmentEn]    = QPixmap (":/attachment_add_16px.png");
    122     mPool [AddAttachmentDis]   = QPixmap (":/attachment_add_disabled_16px.png");
    123     mPool [DelAttachmentEn]    = QPixmap (":/attachment_remove_16px.png");
    124     mPool [DelAttachmentDis]   = QPixmap (":/attachment_remove_disabled_16px.png");
    125 
    126     mPool [IDEController]      = QPixmap (":/ide_16px.png");
    127     mPool [IDEExpand]          = QPixmap (":/ide_expand_16px.png");
    128     mPool [IDECollapse]        = QPixmap (":/ide_collapse_16px.png");
    129     mPool [SATAController]     = QPixmap (":/sata_16px.png");
    130     mPool [SATAExpand]         = QPixmap (":/sata_expand_16px.png");
    131     mPool [SATACollapse]       = QPixmap (":/sata_collapse_16px.png");
    132     mPool [SCSIController]     = QPixmap (":/scsi_16px.png");
    133     mPool [SCSIExpand]         = QPixmap (":/scsi_expand_16px.png");
    134     mPool [SCSICollapse]       = QPixmap (":/scsi_collapse_16px.png");
    135     mPool [FloppyController]   = QPixmap (":/floppy_16px.png");
    136     mPool [FloppyExpand]       = QPixmap (":/floppy_expand_16px.png");
    137     mPool [FloppyCollapse]     = QPixmap (":/floppy_collapse_16px.png");
    138 
    139     mPool [HDAttachmentEn]     = QPixmap (":/hd_16px.png");
    140     mPool [CDAttachmentEn]     = QPixmap (":/cd_16px.png");
    141     mPool [FDAttachmentEn]     = QPixmap (":/fd_16px.png");
    142 
    143     mPool [HDAttachmentAddEn]  = QPixmap (":/hd_add_16px.png");
    144     mPool [HDAttachmentAddDis] = QPixmap (":/hd_add_disabled_16px.png");
    145     mPool [CDAttachmentAddEn]  = QPixmap (":/cd_add_16px.png");
    146     mPool [CDAttachmentAddDis] = QPixmap (":/cd_add_disabled_16px.png");
    147     mPool [FDAttachmentAddEn]  = QPixmap (":/fd_add_16px.png");
    148     mPool [FDAttachmentAddDis] = QPixmap (":/fd_add_disabled_16px.png");
    149 
    150     mPool [VMMEn]              = QPixmap (":/select_file_16px.png");
    151     mPool [VMMDis]             = QPixmap (":/select_file_dis_16px.png");
     116    mPool [ControllerAddEn]          = QPixmap (":/controller_add_16px.png");
     117    mPool [ControllerAddDis]         = QPixmap (":/controller_add_disabled_16px.png");
     118    mPool [ControllerDelEn]          = QPixmap (":/controller_remove_16px.png");
     119    mPool [ControllerDelDis]         = QPixmap (":/controller_remove_disabled_16px.png");
     120
     121    mPool [AttachmentAddEn]          = QPixmap (":/attachment_add_16px.png");
     122    mPool [AttachmentAddDis]         = QPixmap (":/attachment_add_disabled_16px.png");
     123    mPool [AttachmentDelEn]          = QPixmap (":/attachment_remove_16px.png");
     124    mPool [AttachmentDelDis]         = QPixmap (":/attachment_remove_disabled_16px.png");
     125
     126    mPool [IDEControllerNormal]      = QPixmap (":/ide_16px.png");
     127    mPool [IDEControllerExpand]      = QPixmap (":/ide_expand_16px.png");
     128    mPool [IDEControllerCollapse]    = QPixmap (":/ide_collapse_16px.png");
     129    mPool [SATAControllerNormal]     = QPixmap (":/sata_16px.png");
     130    mPool [SATAControllerExpand]     = QPixmap (":/sata_expand_16px.png");
     131    mPool [SATAControllerCollapse]   = QPixmap (":/sata_collapse_16px.png");
     132    mPool [SCSIControllerNormal]     = QPixmap (":/scsi_16px.png");
     133    mPool [SCSIControllerExpand]     = QPixmap (":/scsi_expand_16px.png");
     134    mPool [SCSIControllerCollapse]   = QPixmap (":/scsi_collapse_16px.png");
     135    mPool [FloppyControllerNormal]   = QPixmap (":/floppy_16px.png");
     136    mPool [FloppyControllerExpand]   = QPixmap (":/floppy_expand_16px.png");
     137    mPool [FloppyControllerCollapse] = QPixmap (":/floppy_collapse_16px.png");
     138
     139    mPool [IDEControllerAddEn]       = QPixmap (":/ide_add_16px.png");
     140    mPool [IDEControllerAddDis]      = QPixmap (":/ide_add_disabled_16px.png");
     141    mPool [SATAControllerAddEn]      = QPixmap (":/sata_add_16px.png");
     142    mPool [SATAControllerAddDis]     = QPixmap (":/sata_add_disabled_16px.png");
     143    mPool [SCSIControllerAddEn]      = QPixmap (":/scsi_add_16px.png");
     144    mPool [SCSIControllerAddDis]     = QPixmap (":/scsi_add_disabled_16px.png");
     145    mPool [FloppyControllerAddEn]    = QPixmap (":/floppy_add_16px.png");
     146    mPool [FloppyControllerAddDis]   = QPixmap (":/floppy_add_disabled_16px.png");
     147
     148    mPool [HDAttachmentNormal]       = QPixmap (":/hd_16px.png");
     149    mPool [CDAttachmentNormal]       = QPixmap (":/cd_16px.png");
     150    mPool [FDAttachmentNormal]       = QPixmap (":/fd_16px.png");
     151
     152    mPool [HDAttachmentAddEn]        = QPixmap (":/hd_add_16px.png");
     153    mPool [HDAttachmentAddDis]       = QPixmap (":/hd_add_disabled_16px.png");
     154    mPool [CDAttachmentAddEn]        = QPixmap (":/cd_add_16px.png");
     155    mPool [CDAttachmentAddDis]       = QPixmap (":/cd_add_disabled_16px.png");
     156    mPool [FDAttachmentAddEn]        = QPixmap (":/fd_add_16px.png");
     157    mPool [FDAttachmentAddDis]       = QPixmap (":/fd_add_disabled_16px.png");
     158
     159    mPool [VMMEn]                    = QPixmap (":/select_file_16px.png");
     160    mPool [VMMDis]                   = QPixmap (":/select_file_dis_16px.png");
    152161}
    153162
    … …  
    171180        {
    172181            case KStorageBus_IDE:
    173                 mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::IDEController + i);
     182                mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::IDEControllerNormal + i);
    174183                break;
    175184            case KStorageBus_SATA:
    176                 mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::SATAController + i);
     185                mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::SATAControllerNormal + i);
    177186                break;
    178187            case KStorageBus_SCSI:
    179                 mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::SCSIController + i);
     188                mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::SCSIControllerNormal + i);
    180189                break;
    181190            case KStorageBus_Floppy:
    182                 mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::FloppyController + i);
     191                mPixmaps [i] = (PixmapPool::PixmapType) (PixmapPool::FloppyControllerNormal + i);
    183192                break;
    184193            default:
    … …  
    344353    while (!mControllers.isEmpty())
    345354        delete mControllers.first();
     355}
     356
     357ULONG RootItem::childCount (KStorageBus aBus) const
     358{
     359    ULONG result = 0;
     360    foreach (AbstractItem *item, mControllers)
     361    {
     362        ControllerItem *ctrItem = static_cast <ControllerItem*> (item);
     363        if (ctrItem->ctrBusType() == aBus)
     364            ++ result;
     365    }
     366    return result;
    346367}
    347368
    … …  
    817838        {
    818839            case KDeviceType_HardDisk:
    819                 mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentEn);
     840                mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentNormal);
    820841                break;
    821842            case KDeviceType_DVD:
    822                 mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentEn);
     843                mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentNormal);
    823844                break;
    824845            case KDeviceType_Floppy:
    825                 mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentEn);
     846                mAttPixmap = PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentNormal);
    826847                break;
    827848            default:
    … …  
    10121033            return QVariant::fromValue (mToolTipType);
    10131034        }
    1014         case R_IsMoreControllersPossible:
    1015         {
    1016             return rowCount (root()) < 16;
     1035        case R_IsMoreIDEControllersPossible:
     1036        {
     1037            return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_IDE) <
     1038                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (KStorageBus_IDE);
     1039        }
     1040        case R_IsMoreSATAControllersPossible:
     1041        {
     1042            return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_SATA) <
     1043                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (KStorageBus_SATA);
     1044        }
     1045        case R_IsMoreSCSIControllersPossible:
     1046        {
     1047            return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_SCSI) <
     1048                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (KStorageBus_SCSI);
     1049        }
     1050        case R_IsMoreFloppyControllersPossible:
     1051        {
     1052            return static_cast <RootItem*> (mRootItem)->childCount (KStorageBus_Floppy) <
     1053                   vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus (KStorageBus_Floppy);
    10171054        }
    10181055        case R_IsMoreAttachmentsPossible:
    … …  
    11811218        case R_HDPixmapEn:
    11821219        {
    1183             return PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentEn);
     1220            return PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentNormal);
    11841221        }
    11851222        case R_CDPixmapEn:
    11861223        {
    1187             return PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentEn);
     1224            return PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentNormal);
    11881225        }
    11891226        case R_FDPixmapEn:
    11901227        {
    1191             return PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentEn);
     1228            return PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentNormal);
    11921229        }
    11931230
    … …  
    15241561    /* Controller Actions */
    15251562    mAddCtrAction = new QAction (this);
    1526     mAddCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::AddControllerEn),
    1527                                                  PixmapPool::pool()->pixmap (PixmapPool::AddControllerDis)));
     1563    mAddCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::ControllerAddEn),
     1564                                                 PixmapPool::pool()->pixmap (PixmapPool::ControllerAddDis)));
    15281565
    15291566    mAddIDECtrAction = new QAction (this);
    1530     mAddIDECtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::IDEController)));
     1567    mAddIDECtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::IDEControllerAddEn),
     1568                                                    PixmapPool::pool()->pixmap (PixmapPool::IDEControllerAddDis)));
    15311569
    15321570    mAddSATACtrAction = new QAction (this);
    1533     mAddSATACtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SATAController)));
     1571    mAddSATACtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SATAControllerAddEn),
     1572                                                     PixmapPool::pool()->pixmap (PixmapPool::SATAControllerAddDis)));
    15341573
    15351574    mAddSCSICtrAction = new QAction (this);
    1536     mAddSCSICtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SCSIController)));
     1575    mAddSCSICtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::SCSIControllerAddEn),
     1576                                                     PixmapPool::pool()->pixmap (PixmapPool::SCSIControllerAddDis)));
    15371577
    15381578    mAddFloppyCtrAction = new QAction (this);
    1539     mAddFloppyCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::FloppyController)));
     1579    mAddFloppyCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::FloppyControllerAddEn),
     1580                                                       PixmapPool::pool()->pixmap (PixmapPool::FloppyControllerAddDis)));
    15401581
    15411582    mDelCtrAction = new QAction (this);
    1542     mDelCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::DelControllerEn),
    1543                                                  PixmapPool::pool()->pixmap (PixmapPool::DelControllerDis)));
     1583    mDelCtrAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::ControllerDelEn),
     1584                                                 PixmapPool::pool()->pixmap (PixmapPool::ControllerDelDis)));
    15441585
    15451586    /* Attachment Actions */
    15461587    mAddAttAction = new QAction (this);
    1547     mAddAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::AddAttachmentEn),
    1548                                                  PixmapPool::pool()->pixmap (PixmapPool::AddAttachmentDis)));
     1588    mAddAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::AttachmentAddEn),
     1589                                                 PixmapPool::pool()->pixmap (PixmapPool::AttachmentAddDis)));
     1590
     1591    mAddHDAttAction = new QAction (this);
     1592    mAddHDAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentAddEn),
     1593                                                   PixmapPool::pool()->pixmap (PixmapPool::HDAttachmentAddDis)));
     1594
     1595    mAddCDAttAction = new QAction (this);
     1596    mAddCDAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentAddEn),
     1597                                                   PixmapPool::pool()->pixmap (PixmapPool::CDAttachmentAddDis)));
     1598
     1599    mAddFDAttAction = new QAction (this);
     1600    mAddFDAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentAddEn),
     1601                                                   PixmapPool::pool()->pixmap (PixmapPool::FDAttachmentAddDis)));
    15491602
    15501603    mDelAttAction = new QAction (this);
    1551     mDelAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::DelAttachmentEn),
    1552                                                  PixmapPool::pool()->pixmap (PixmapPool::DelAttachmentDis)));
     1604    mDelAttAction->setIcon (VBoxGlobal::iconSet (PixmapPool::pool()->pixmap (PixmapPool::AttachmentDelEn),
     1605                                                 PixmapPool::pool()->pixmap (PixmapPool::AttachmentDelDis)));
    15531606
    15541607    /* Storage Model/View */
    … …  
    16051658    connect (mDelCtrAction, SIGNAL (triggered (bool)), this, SLOT (delController()));
    16061659    connect (mAddAttAction, SIGNAL (triggered (bool)), this, SLOT (addAttachment()));
     1660    connect (mAddHDAttAction, SIGNAL (triggered (bool)), this, SLOT (addHDAttachment()));
     1661    connect (mAddCDAttAction, SIGNAL (triggered (bool)), this, SLOT (addCDAttachment()));
     1662    connect (mAddFDAttAction, SIGNAL (triggered (bool)), this, SLOT (addFDAttachment()));
    16071663    connect (mDelAttAction, SIGNAL (triggered (bool)), this, SLOT (delAttachment()));
    16081664    connect (mStorageModel, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
    … …  
    16251681    connect (mCbType, SIGNAL (activated (int)), this, SLOT (setInformation()));
    16261682    connect (mCbSlot, SIGNAL (activated (int)), this, SLOT (setInformation()));
    1627     connect (mCbDevice, SIGNAL (activated (int)), this, SLOT (setInformation()));
    16281683    connect (mCbVdi, SIGNAL (activated (int)), this, SLOT (setInformation()));
    16291684    connect (mTbVmm, SIGNAL (clicked (bool)), this, SLOT (onVmmInvoked()));
    … …  
    16391694    /* Initial setup */
    16401695    setMinimumWidth (500);
    1641     mSplitter->setSizes (QList<int>() << 0.45 * minimumWidth() << 0.55 * minimumWidth());
     1696    mSplitter->setSizes (QList<int>() << (int) (0.45 * minimumWidth()) << (int) (0.55 * minimumWidth()));
    16421697}
    16431698
    … …  
    17651820    mDelCtrAction->setText (tr ("Remove Controller"));
    17661821    mAddAttAction->setText (tr ("Add Attachment"));
     1822    mAddHDAttAction->setText (tr ("Add Hard Disk"));
     1823    mAddCDAttAction->setText (tr ("Add CD/DVD Device"));
     1824    mAddFDAttAction->setText (tr ("Add Floppy Device"));
    17671825    mDelAttAction->setText (tr ("Remove Attachment"));
    17681826
    … …  
    17971855        mLtController->setColumnMinimumWidth (0, 10);
    17981856        mLtAttachment->setColumnMinimumWidth (0, 10);
    1799 
     1857#if 0
    18001858        /* Second column indent minimum width */
    18011859        QList <QLabel*> labelsList;
    1802         labelsList << mLbSlot << mLbDevice << mLbVdi
     1860        labelsList << mLbSlot << mLbVdi
    18031861                   << mLbHDVirtualSize << mLbHDActualSize << mLbSize
    18041862                   << mLbLocation << mLbHDFormat << mLbUsage;
    … …  
    18111869        }
    18121870        mLtAttachment->setColumnMinimumWidth (1, maxWidth);
     1871#endif
    18131872    }
    18141873    VBoxSettingsPage::showEvent (aEvent);
    … …  
    18651924void VBoxVMSettingsHD::addIDEController()
    18661925{
    1867     mStorageModel->addController (generateUniqueName (tr ("IDE Controller")),
    1868                                   KStorageBus_IDE, KStorageControllerType_PIIX4);
    1869     emit storageChanged();
     1926    addControllerWrapper (generateUniqueName (tr ("IDE Controller")), KStorageBus_IDE, KStorageControllerType_PIIX4);
    18701927}
    18711928
    18721929void VBoxVMSettingsHD::addSATAController()
    18731930{
    1874     mStorageModel->addController (generateUniqueName (tr ("SATA Controller")),
    1875                                   KStorageBus_SATA, KStorageControllerType_IntelAhci);
    1876     emit storageChanged();
     1931    addControllerWrapper (generateUniqueName (tr ("SATA Controller")), KStorageBus_SATA, KStorageControllerType_IntelAhci);
    18771932}
    18781933
    18791934void VBoxVMSettingsHD::addSCSIController()
    18801935{
    1881     mStorageModel->addController (generateUniqueName (tr ("SCSI Controller")),
    1882                                   KStorageBus_SCSI, KStorageControllerType_LsiLogic);
    1883     emit storageChanged();
     1936    addControllerWrapper (generateUniqueName (tr ("SCSI Controller")), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
    18841937}
    18851938
    18861939void VBoxVMSettingsHD::addFloppyController()
    18871940{
    1888     mStorageModel->addController (generateUniqueName (tr ("Floppy Controller")),
    1889                                   KStorageBus_Floppy, KStorageControllerType_I82078);
    1890     emit storageChanged();
     1941    addControllerWrapper (generateUniqueName (tr ("Floppy Controller")), KStorageBus_Floppy, KStorageControllerType_I82078);
    18911942}
    18921943
    … …  
    19011952}
    19021953
    1903 void VBoxVMSettingsHD::addAttachment (KDeviceType aDeviceType)
     1954void VBoxVMSettingsHD::addAttachment()
    19041955{
    19051956    QModelIndex index = mTwStorageTree->currentIndex();
    1906     if (!mStorageModel->data (index, StorageModel::R_IsController).toBool()) return;
    1907 
    1908     if (aDeviceType == KDeviceType_Null)
    1909         aDeviceType = mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>() [0];
    1910 
    1911     mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDeviceType);
    1912     emit storageChanged();
    1913     mValidator->revalidate();
     1957    Assert (mStorageModel->data (index, StorageModel::R_IsController).toBool());
     1958
     1959    if (mStorageModel->data (index, StorageModel::R_CtrBusType).value <KStorageBus>() == KStorageBus_Floppy)
     1960    {
     1961        Assert (mAddFDAttAction->isEnabled());
     1962        mAddFDAttAction->trigger();
     1963    }
     1964    else
     1965    {
     1966        QMenu menu;
     1967        menu.addAction (mAddHDAttAction);
     1968        menu.addAction (mAddCDAttAction);
     1969        menu.exec (QCursor::pos());
     1970    }
     1971}
     1972
     1973void VBoxVMSettingsHD::addHDAttachment()
     1974{
     1975    addAttachmentWrapper (KDeviceType_HardDisk);
     1976}
     1977
     1978void VBoxVMSettingsHD::addCDAttachment()
     1979{
     1980    addAttachmentWrapper (KDeviceType_DVD);
     1981}
     1982
     1983void VBoxVMSettingsHD::addFDAttachment()
     1984{
     1985    addAttachmentWrapper (KDeviceType_Floppy);
    19141986}
    19151987
    … …  
    19722044                mCbSlot->setCurrentIndex (attSlotPos == -1 ? 0 : attSlotPos);
    19732045
    1974                 /* Getting Attachment Device */
    1975                 mCbDevice->clear();
    1976                 DeviceTypeList deviceTypeList (mStorageModel->data (index, StorageModel::R_AttDevices).value <DeviceTypeList>());
    1977                 for (int i = 0; i < deviceTypeList.size(); ++ i)
    1978                     mCbDevice->insertItem (mCbDevice->count(), vboxGlobal().toString (deviceTypeList [i]));
    1979                 KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
    1980                 int attDevicePos = mCbDevice->findText (vboxGlobal().toString (device));
    1981                 mCbDevice->setCurrentIndex (attDevicePos == -1 ? 0 : attDevicePos);
    1982 
    19832046                /* Getting Show Diffs state */
    19842047                bool isShowDiffs = mStorageModel->data (index, StorageModel::R_AttIsShowDiffs).toBool();
    … …  
    19862049
    19872050                /* Getting Attachment Medium */
     2051                KDeviceType device = mStorageModel->data (index, StorageModel::R_AttDevice).value <KDeviceType>();
     2052                switch (device)
     2053                {
     2054                    case KDeviceType_HardDisk:
     2055                        mLbVdi->setText (tr ("Hard &Disk:"));
     2056                        break;
     2057                    case KDeviceType_DVD:
     2058                        mLbVdi->setText (tr ("&CD/DVD Device:"));
     2059                        break;
     2060                    case KDeviceType_Floppy:
     2061                        mLbVdi->setText (tr ("&Floppy Device:"));
     2062                        break;
     2063                    default:
     2064                        break;
     2065                }
    19882066                mCbVdi->setType (typeToLocal (device));
    19892067                mCbVdi->setShowDiffs (isShowDiffs);
    … …  
    20462124                mStorageModel->setData (index, QVariant::fromValue (vboxGlobal().toStorageSlot (mCbSlot->currentText())),
    20472125                                        StorageModel::R_AttSlot);
    2048             /* Setting Attachment Device-Type */
    2049             else if (sdr == mCbDevice)
    2050             {
    2051                 KDeviceType device = vboxGlobal().toDeviceType (mCbDevice->currentText());
    2052                 mStorageModel->setData (index, QVariant::fromValue (device), StorageModel::R_AttDevice);
    2053                 mCbVdi->setType (typeToLocal (device));
    2054                 mCbVdi->setShowDiffs (mCbShowDiffs->isChecked());
    2055                 mCbVdi->refresh();
    2056             }
    20572126            /* Setting Attachment Medium */
    20582127            else if (sdr == mCbVdi)
    … …  
    20772146void VBoxVMSettingsHD::onVmmInvoked()
    20782147{
    2079     QString id = getWithMediaManager (typeToLocal (vboxGlobal().toDeviceType (mCbDevice->currentText())));
     2148    QString id = getWithMediaManager (mCbVdi->type());
    20802149    if (!id.isNull())
    20812150        mCbVdi->setCurrentItem (id);
    … …  
    20862155    QModelIndex index = mTwStorageTree->currentIndex();
    20872156
    2088     mAddCtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
    2089     mAddIDECtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
    2090     mAddSATACtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
    2091     mAddSCSICtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
    2092     mAddFloppyCtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsMoreControllersPossible).toBool());
    2093     mAddAttAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsController).toBool() &&
    2094                                mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
    2095 
    2096     mDelCtrAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsController).toBool());
    2097     mDelAttAction->setEnabled (mStorageModel->data (index, StorageModel::R_IsAttachment).toBool());
     2157    bool isIDEPossible = mStorageModel->data (index, StorageModel::R_IsMoreIDEControllersPossible).toBool();
     2158    bool isSATAPossible = mStorageModel->data (index, StorageModel::R_IsMoreSATAControllersPossible).toBool();
     2159    bool isSCSIPossible = mStorageModel->data (index, StorageModel::R_IsMoreSCSIControllersPossible).toBool();
     2160    bool isFloppyPossible = mStorageModel->data (index, StorageModel::R_IsMoreFloppyControllersPossible).toBool();
     2161
     2162    bool isController = mStorageModel->data (index, StorageModel::R_IsController).toBool();
     2163    bool isAttachment = mStorageModel->data (index, StorageModel::R_IsAttachment).toBool();
     2164    bool isAttachmentsPossible = mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool();
     2165
     2166    mAddCtrAction->setEnabled (isIDEPossible || isSATAPossible || isSCSIPossible || isFloppyPossible);
     2167    mAddIDECtrAction->setEnabled (isIDEPossible);
     2168    mAddSATACtrAction->setEnabled (isSATAPossible);
     2169    mAddSCSICtrAction->setEnabled (isSCSIPossible);
     2170    mAddFloppyCtrAction->setEnabled (isFloppyPossible);
     2171
     2172    mAddAttAction->setEnabled (isController && isAttachmentsPossible);
     2173    mAddHDAttAction->setEnabled (isController && isAttachmentsPossible);
     2174    mAddCDAttAction->setEnabled (isController && isAttachmentsPossible);
     2175    mAddFDAttAction->setEnabled (isController && isAttachmentsPossible);
     2176
     2177    mDelCtrAction->setEnabled (isController);
     2178    mDelAttAction->setEnabled (isAttachment);
    20982179}
    20992180
    … …  
    21402221void VBoxVMSettingsHD::onRowRemoved()
    21412222{
     2223    if (mStorageModel->rowCount (mStorageModel->root()) == 0)
     2224        mTwStorageTree->setCurrentIndex (mStorageModel->root());
     2225
    21422226    updateActionsState();
    21432227    getInformation();
    … …  
    21602244        case AbstractItem::Type_ControllerItem:
    21612245        {
    2162             menu.addAction (mAddAttAction);
     2246            DeviceTypeList deviceTypeList (mStorageModel->data (index, StorageModel::R_CtrDevices).value <DeviceTypeList>());
     2247            foreach (KDeviceType deviceType, deviceTypeList)
     2248            {
     2249                switch (deviceType)
     2250                {
     2251                    case KDeviceType_HardDisk:
     2252                        menu.addAction (mAddHDAttAction);
     2253                        break;
     2254                    case KDeviceType_DVD:
     2255                        menu.addAction (mAddCDAttAction);
     2256                        break;
     2257                    case KDeviceType_Floppy:
     2258                        menu.addAction (mAddFDAttAction);
     2259                        break;
     2260                    default:
     2261                        break;
     2262                }
     2263            }
    21632264            menu.addAction (mDelCtrAction);
    21642265            break;
    … …  
    23412442                aEvent->setAccepted (true);
    23422443                if (mAddAttAction->isEnabled())
    2343                     addAttachment (deviceType);
     2444                    addAttachmentWrapper (deviceType);
    23442445                return;
    23452446            }
    23462447        }
    23472448    }
     2449}
     2450
     2451void VBoxVMSettingsHD::addControllerWrapper (const QString &aName, KStorageBus aBus, KStorageControllerType aType)
     2452{
     2453    QModelIndex index = mTwStorageTree->currentIndex();
     2454    switch (aBus)
     2455    {
     2456        case KStorageBus_IDE:
     2457            Assert (mStorageModel->data (index, StorageModel::R_IsMoreIDEControllersPossible).toBool());
     2458            break;
     2459        case KStorageBus_SATA:
     2460            Assert (mStorageModel->data (index, StorageModel::R_IsMoreSATAControllersPossible).toBool());
     2461            break;
     2462        case KStorageBus_SCSI:
     2463            Assert (mStorageModel->data (index, StorageModel::R_IsMoreSCSIControllersPossible).toBool());
     2464            break;
     2465        case KStorageBus_Floppy:
     2466            Assert (mStorageModel->data (index, StorageModel::R_IsMoreFloppyControllersPossible).toBool());
     2467            break;
     2468        default:
     2469            break;
     2470    }
     2471
     2472    mStorageModel->addController (aName, aBus, aType);
     2473    emit storageChanged();
     2474}
     2475
     2476void VBoxVMSettingsHD::addAttachmentWrapper (KDeviceType aDevice)
     2477{
     2478    QModelIndex index = mTwStorageTree->currentIndex();
     2479    Assert (mStorageModel->data (index, StorageModel::R_IsController).toBool());
     2480    Assert (mStorageModel->data (index, StorageModel::R_IsMoreAttachmentsPossible).toBool());
     2481
     2482    mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDevice);
     2483    emit storageChanged();
     2484    mValidator->revalidate();
    23482485}
    23492486

  • trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsHD.ui

    r23260 r23580  
    7272          <widget class="QITreeView" native="1" name="mTwStorageTree" >
    7373           <property name="whatsThis" >
    74             <string>Contains all the created storage controllers and all the attached mediums representing virtual images and real host-drives.</string>
     74            <string>Contains all the created storage controllers and all the attached virtual images and host-drives.</string>
    7575           </property>
    7676          </widget>
    … …  
    277277        </item>
    278278        <item row="2" column="1" >
    279          <widget class="QLabel" name="mLbDevice" >
    280           <property name="text" >
    281            <string>&amp;Device:</string>
    282           </property>
    283           <property name="buddy" >
    284            <cstring>mCbDevice</cstring>
    285           </property>
    286           <property name="alignment" >
    287            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    288           </property>
    289          </widget>
    290         </item>
    291         <item row="2" column="2" colspan="2" >
    292          <widget class="QComboBox" name="mCbDevice" >
    293           <property name="whatsThis" >
    294            <string>Allows to select the type of the device represented by the currently selected attachment. The list of possible device types depends on parent controller type.</string>
    295           </property>
    296           <property name="sizePolicy" >
    297            <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
    298             <horstretch>0</horstretch>
    299             <verstretch>0</verstretch>
    300            </sizepolicy>
    301           </property>
    302          </widget>
    303         </item>
    304         <item row="3" column="1" >
    305279         <widget class="QLabel" name="mLbVdi" >
    306           <property name="text" >
    307            <string>&amp;Medium:</string>
    308           </property>
    309280          <property name="buddy" >
    310281           <cstring>mCbVdi</cstring>
    … …  
    315286         </widget>
    316287        </item>
    317         <item row="3" column="2" >
     288        <item row="2" column="2" >
    318289         <widget class="VBoxMediaComboBox" native="1" name="mCbVdi" >
    319290          <property name="whatsThis" >
    320            <string>Allows to select the medium assigned for the currently selected attachment according to device type of this attachment. Available mediums list could contain virtual images and real host drives corresponding to device type currently chosen for this attachment.</string>
     291           <string>Allows to select virtual image or host-drive assigned for the currently selected attachment according to device type of this attachment.</string>
    321292          </property>
    322293          <property name="sizePolicy" >
    … …  
    328299         </widget>
    329300        </item>
    330         <item row="3" column="3" >
     301        <item row="2" column="3" >
    331302         <widget class="QIToolButton" name="mTbVmm" >
    332303          <property name="whatsThis" >
    333            <string>Invokes the Virtual Media Manager to select a medium to mount.</string>
     304           <string>Opens the Virtual Media Manager to select a virtual image for this attachment.</string>
    334305          </property>
    335306          <property name="toolTip" >
    … …  
    344315         </widget>
    345316        </item>
    346         <item row="4" column="2" colspan="2" >
     317        <item row="3" column="2" colspan="2" >
    347318         <widget class="QCheckBox" name="mCbShowDiffs">
    348319          <property name="sizePolicy" >
    … …  
    360331         </widget>
    361332        </item>
    362         <item row="5" column="2" colspan="2" >
     333        <item row="4" column="2" colspan="2" >
    363334         <widget class="QCheckBox" name="mCbPassthrough" >
    364335          <property name="sizePolicy" >
    … …  
    369340          </property>
    370341          <property name="whatsThis" >
    371            <string>When checked, allows the guest to send ATAPI commands directly to the host drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</string>
     342           <string>When checked, allows the guest to send ATAPI commands directly to the host-drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</string>
    372343          </property>
    373344          <property name="text" >
    … …  
    376347         </widget>
    377348        </item>
    378         <item row="6" column="0" colspan="4" >
     349        <item row="5" column="0" colspan="4" >
    379350         <widget class="QILabelSeparator" native="1" name="mLsInformation" >
    380351          <property name="text" >
    … …  
    383354         </widget>
    384355        </item>
     356        <item row="6" column="1" >
     357         <widget class="QLabel" name="mLbHDVirtualSize" >
     358          <property name="text" >
     359           <string>Virtual Size:</string>
     360          </property>
     361          <property name="alignment" >
     362           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
     363          </property>
     364         </widget>
     365        </item>
     366        <item row="6" column="2" colspan="2" >
     367         <widget class="QILabel" name="mLbHDVirtualSizeValue" >
     368          <property name="sizePolicy" >
     369           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
     370            <horstretch>0</horstretch>
     371            <verstretch>0</verstretch>
     372           </sizepolicy>
     373          </property>
     374         </widget>
     375        </item>
    385376        <item row="7" column="1" >
    386          <widget class="QLabel" name="mLbHDVirtualSize" >
    387           <property name="text" >
    388            <string>Virtual Size:</string>
     377         <widget class="QLabel" name="mLbHDActualSize" >
     378          <property name="text" >
     379           <string>Actual Size:</string>
    389380          </property>
    390381          <property name="alignment" >
    … …  
    394385        </item>
    395386        <item row="7" column="2" colspan="2" >
    396          <widget class="QILabel" name="mLbHDVirtualSizeValue" >
     387         <widget class="QILabel" name="mLbHDActualSizeValue" >
    397388          <property name="sizePolicy" >
    398389           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
    … …  
    404395        </item>
    405396        <item row="8" column="1" >
    406          <widget class="QLabel" name="mLbHDActualSize" >
    407           <property name="text" >
    408            <string>Actual Size:</string>
     397         <widget class="QLabel" name="mLbSize" >
     398          <property name="text" >
     399           <string>Size:</string>
    409400          </property>
    410401          <property name="alignment" >
    … …  
    414405        </item>
    415406        <item row="8" column="2" colspan="2" >
    416          <widget class="QILabel" name="mLbHDActualSizeValue" >
     407         <widget class="QILabel" name="mLbSizeValue" >
    417408          <property name="sizePolicy" >
    418409           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
    … …  
    424415        </item>
    425416        <item row="9" column="1" >
    426          <widget class="QLabel" name="mLbSize" >
    427           <property name="text" >
    428            <string>Size:</string>
     417         <widget class="QLabel" name="mLbLocation" >
     418          <property name="text" >
     419           <string>Location:</string>
    429420          </property>
    430421          <property name="alignment" >
    … …  
    434425        </item>
    435426        <item row="9" column="2" colspan="2" >
    436          <widget class="QILabel" name="mLbSizeValue" >
     427         <widget class="QILabel" name="mLbLocationValue" >
    437428          <property name="sizePolicy" >
    438429           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
    … …  
    444435        </item>
    445436        <item row="10" column="1" >
    446          <widget class="QLabel" name="mLbLocation" >
    447           <property name="text" >
    448            <string>Location:</string>
     437         <widget class="QLabel" name="mLbHDFormat" >
     438          <property name="text" >
     439           <string>Type (Format):</string>
    449440          </property>
    450441          <property name="alignment" >
    … …  
    454445        </item>
    455446        <item row="10" column="2" colspan="2" >
    456          <widget class="QILabel" name="mLbLocationValue" >
     447         <widget class="QILabel" name="mLbHDFormatValue" >
    457448          <property name="sizePolicy" >
    458449           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
    … …  
    464455        </item>
    465456        <item row="11" column="1" >
    466          <widget class="QLabel" name="mLbHDFormat" >
    467           <property name="text" >
    468            <string>Type (Format):</string>
     457         <widget class="QLabel" name="mLbUsage" >
     458          <property name="text" >
     459           <string>Attached To:</string>
    469460          </property>
    470461          <property name="alignment" >
    … …  
    474465        </item>
    475466        <item row="11" column="2" colspan="2" >
    476          <widget class="QILabel" name="mLbHDFormatValue" >
     467         <widget class="QILabel" name="mLbUsageValue" >
    477468          <property name="sizePolicy" >
    478469           <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
    … …  
    483474         </widget>
    484475        </item>
    485         <item row="12" column="1" >
    486          <widget class="QLabel" name="mLbUsage" >
    487           <property name="text" >
    488            <string>Attached To:</string>
    489           </property>
    490           <property name="alignment" >
    491            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    492           </property>
    493          </widget>
    494         </item>
    495         <item row="12" column="2" colspan="2" >
    496          <widget class="QILabel" name="mLbUsageValue" >
    497           <property name="sizePolicy" >
    498            <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
    499             <horstretch>0</horstretch>
    500             <verstretch>0</verstretch>
    501            </sizepolicy>
    502           </property>
    503          </widget>
    504         </item>
    505         <item row="13" column="0" colspan="4" >
     476        <item row="12" column="0" colspan="4" >
    506477         <spacer name="mSp6" >
    507478          <property name="orientation" >
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette