VirtualBox

Changeset 81164 in vbox


Ignore:
Timestamp:
Oct 8, 2019 5:57:50 PM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9582: VM settings / Storage page: Replacing separate add controller actions with corresponding controller types, listing all of them.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r81146 r81164  
    29002900    : m_pModelStorage(0)
    29012901    , m_pActionAddController(0), m_pActionRemoveController(0)
    2902     , m_pActionAddControllerIDE(0), m_pActionAddControllerSATA(0), m_pActionAddControllerSCSI(0), m_pActionAddControllerSAS(0), m_pActionAddControllerFloppy(0), m_pActionAddControllerUSB(0), m_pActionAddControllerNVMe(0), m_pActionAddControllerVirtioSCSI(0)
     2902    , m_pActionAddControllerPIIX3(0), m_pActionAddControllerPIIX4(0), m_pActionAddControllerICH6(0)
     2903    , m_pActionAddControllerAHCI(0)
     2904    , m_pActionAddControllerLsiLogic(0), m_pActionAddControllerBusLogic(0)
     2905    , m_pActionAddControllerLsiLogicSAS(0)
     2906    , m_pActionAddControllerFloppy(0)
     2907    , m_pActionAddControllerUSB(0)
     2908    , m_pActionAddControllerNVMe(0)
     2909    , m_pActionAddControllerVirtioSCSI(0)
    29032910    , m_pActionAddAttachment(0), m_pActionRemoveAttachment(0)
    29042911    , m_pActionAddAttachmentHD(0), m_pActionAddAttachmentCD(0), m_pActionAddAttachmentFD(0)
    … …  
    32723279
    32733280    m_pActionAddController->setText(tr("Add Controller"));
    3274     m_pActionAddControllerIDE->setText(tr("Add IDE Controller"));
    3275     m_pActionAddControllerSATA->setText(tr("Add SATA Controller"));
    3276     m_pActionAddControllerSCSI->setText(tr("Add SCSI Controller"));
    3277     m_pActionAddControllerSAS->setText(tr("Add SAS Controller"));
    3278     m_pActionAddControllerFloppy->setText(tr("Add Floppy Controller"));
    3279     m_pActionAddControllerUSB->setText(tr("Add USB Controller"));
    3280     m_pActionAddControllerNVMe->setText(tr("Add NVMe Controller"));
    3281     m_pActionAddControllerVirtioSCSI->setText(tr("Add virtio-scsi Controller"));
     3281    m_pActionAddControllerPIIX3->setText(tr("PIIX3 (IDE)"));
     3282    m_pActionAddControllerPIIX4->setText(tr("PIIX4 (Default IDE)"));
     3283    m_pActionAddControllerICH6->setText(tr("ICH6 (IDE)"));
     3284    m_pActionAddControllerAHCI->setText(tr("AHCI (SATA)"));
     3285    m_pActionAddControllerLsiLogic->setText(tr("LsiLogic (Default SCSI)"));
     3286    m_pActionAddControllerBusLogic->setText(tr("BusLogic (SCSI)"));
     3287    m_pActionAddControllerLsiLogicSAS->setText(tr("LsiLogic SAS (SAS)"));
     3288    m_pActionAddControllerFloppy->setText(tr("I82078 (Floppy)"));
     3289    m_pActionAddControllerUSB->setText(tr("USB"));
     3290    m_pActionAddControllerNVMe->setText(tr("NVMe (PCIe)"));
     3291    m_pActionAddControllerVirtioSCSI->setText(tr("virtio-scsi"));
    32823292    m_pActionRemoveController->setText(tr("Remove Controller"));
    32833293    m_pActionAddAttachment->setText(tr("Add Attachment"));
    3284     m_pActionAddAttachmentHD->setText(tr("Add Hard Disk"));
    3285     m_pActionAddAttachmentCD->setText(tr("Add Optical Drive"));
    3286     m_pActionAddAttachmentFD->setText(tr("Add Floppy Drive"));
     3294    m_pActionAddAttachmentHD->setText(tr("Hard Disk"));
     3295    m_pActionAddAttachmentCD->setText(tr("Optical Drive"));
     3296    m_pActionAddAttachmentFD->setText(tr("Floppy Drive"));
    32873297    m_pActionRemoveAttachment->setText(tr("Remove Attachment"));
    32883298
    … …  
    34343444{
    34353445    QMenu menu;
    3436     menu.addAction(m_pActionAddControllerIDE);
    3437     menu.addAction(m_pActionAddControllerSATA);
    3438     menu.addAction(m_pActionAddControllerSCSI);
    3439     menu.addAction(m_pActionAddControllerSAS);
     3446    menu.addAction(m_pActionAddControllerPIIX3);
     3447    menu.addAction(m_pActionAddControllerPIIX4);
     3448    menu.addAction(m_pActionAddControllerICH6);
     3449    menu.addAction(m_pActionAddControllerAHCI);
     3450    menu.addAction(m_pActionAddControllerLsiLogic);
     3451    menu.addAction(m_pActionAddControllerBusLogic);
     3452    menu.addAction(m_pActionAddControllerLsiLogicSAS);
    34403453    menu.addAction(m_pActionAddControllerFloppy);
    34413454    menu.addAction(m_pActionAddControllerUSB);
    … …  
    34453458}
    34463459
    3447 void UIMachineSettingsStorage::sltAddControllerIDE()
    3448 {
    3449     addControllerWrapper(generateUniqueControllerName("IDE"), KStorageBus_IDE, KStorageControllerType_PIIX4);
    3450 }
    3451 
    3452 void UIMachineSettingsStorage::sltAddControllerSATA()
    3453 {
    3454     addControllerWrapper(generateUniqueControllerName("SATA"), KStorageBus_SATA, KStorageControllerType_IntelAhci);
    3455 }
    3456 
    3457 void UIMachineSettingsStorage::sltAddControllerSCSI()
    3458 {
    3459     addControllerWrapper(generateUniqueControllerName("SCSI"), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
     3460void UIMachineSettingsStorage::sltAddControllerPIIX3()
     3461{
     3462    addControllerWrapper(generateUniqueControllerName("PIIX3"), KStorageBus_IDE, KStorageControllerType_PIIX3);
     3463}
     3464
     3465void UIMachineSettingsStorage::sltAddControllerPIIX4()
     3466{
     3467    addControllerWrapper(generateUniqueControllerName("PIIX4"), KStorageBus_IDE, KStorageControllerType_PIIX4);
     3468}
     3469
     3470void UIMachineSettingsStorage::sltAddControllerICH6()
     3471{
     3472    addControllerWrapper(generateUniqueControllerName("ICH6"), KStorageBus_IDE, KStorageControllerType_ICH6);
     3473}
     3474
     3475void UIMachineSettingsStorage::sltAddControllerAHCI()
     3476{
     3477    addControllerWrapper(generateUniqueControllerName("AHCI"), KStorageBus_SATA, KStorageControllerType_IntelAhci);
     3478}
     3479
     3480void UIMachineSettingsStorage::sltAddControllerLsiLogic()
     3481{
     3482    addControllerWrapper(generateUniqueControllerName("LsiLogic"), KStorageBus_SCSI, KStorageControllerType_LsiLogic);
     3483}
     3484
     3485void UIMachineSettingsStorage::sltAddControllerBusLogic()
     3486{
     3487    addControllerWrapper(generateUniqueControllerName("BusLogic"), KStorageBus_SCSI, KStorageControllerType_BusLogic);
    34603488}
    34613489
    … …  
    34653493}
    34663494
    3467 void UIMachineSettingsStorage::sltAddControllerSAS()
    3468 {
    3469     addControllerWrapper(generateUniqueControllerName("SAS"), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
     3495void UIMachineSettingsStorage::sltAddControllerLsiLogicSAS()
     3496{
     3497    addControllerWrapper(generateUniqueControllerName("LsiLogic SAS"), KStorageBus_SAS, KStorageControllerType_LsiLogicSas);
    34703498}
    34713499
    … …  
    39523980    /* Configure "add controller" actions: */
    39533981    m_pActionAddController->setEnabled(fIDEPossible || fSATAPossible || fSCSIPossible || fFloppyPossible || fSASPossible || fUSBPossible || fNVMePossible || fVirtioSCSIPossible);
    3954     m_pActionAddControllerIDE->setEnabled(fIDEPossible);
    3955     m_pActionAddControllerSATA->setEnabled(fSATAPossible);
    3956     m_pActionAddControllerSCSI->setEnabled(fSCSIPossible);
     3982    m_pActionAddControllerPIIX3->setEnabled(fIDEPossible);
     3983    m_pActionAddControllerPIIX4->setEnabled(fIDEPossible);
     3984    m_pActionAddControllerICH6->setEnabled(fIDEPossible);
     3985    m_pActionAddControllerAHCI->setEnabled(fSATAPossible);
     3986    m_pActionAddControllerLsiLogic->setEnabled(fSCSIPossible);
     3987    m_pActionAddControllerBusLogic->setEnabled(fSCSIPossible);
    39573988    m_pActionAddControllerFloppy->setEnabled(fFloppyPossible);
    3958     m_pActionAddControllerSAS->setEnabled(fSASPossible);
     3989    m_pActionAddControllerLsiLogicSAS->setEnabled(fSASPossible);
    39593990    m_pActionAddControllerUSB->setEnabled(fUSBPossible);
    39603991    m_pActionAddControllerNVMe->setEnabled(fNVMePossible);
    … …  
    44464477        }
    44474478
    4448         /* Create 'Add IDE Controller' action: */
    4449         m_pActionAddControllerIDE = new QAction(this);
    4450         AssertPtrReturnVoid(m_pActionAddControllerIDE);
     4479        /* Create 'Add PIIX3 Controller' action: */
     4480        m_pActionAddControllerPIIX3 = new QAction(this);
     4481        AssertPtrReturnVoid(m_pActionAddControllerPIIX3);
    44514482        {
    44524483            /* Configure action: */
    4453             m_pActionAddControllerIDE->setIcon(iconPool()->icon(IDEControllerAddEn, IDEControllerAddDis));
    4454         }
    4455 
    4456         /* Create 'Add SATA Controller' action: */
    4457         m_pActionAddControllerSATA = new QAction(this);
    4458         AssertPtrReturnVoid(m_pActionAddControllerSATA);
     4484            m_pActionAddControllerPIIX3->setIcon(iconPool()->icon(IDEControllerAddEn, IDEControllerAddDis));
     4485        }
     4486
     4487        /* Create 'Add PIIX4 Controller' action: */
     4488        m_pActionAddControllerPIIX4 = new QAction(this);
     4489        AssertPtrReturnVoid(m_pActionAddControllerPIIX4);
    44594490        {
    44604491            /* Configure action: */
    4461             m_pActionAddControllerSATA->setIcon(iconPool()->icon(SATAControllerAddEn, SATAControllerAddDis));
    4462         }
    4463 
    4464         /* Create 'Add SCSI Controller' action: */
    4465         m_pActionAddControllerSCSI = new QAction(this);
    4466         AssertPtrReturnVoid(m_pActionAddControllerSCSI);
     4492            m_pActionAddControllerPIIX4->setIcon(iconPool()->icon(IDEControllerAddEn, IDEControllerAddDis));
     4493        }
     4494
     4495        /* Create 'Add ICH6 Controller' action: */
     4496        m_pActionAddControllerICH6 = new QAction(this);
     4497        AssertPtrReturnVoid(m_pActionAddControllerICH6);
    44674498        {
    44684499            /* Configure action: */
    4469             m_pActionAddControllerSCSI->setIcon(iconPool()->icon(SCSIControllerAddEn, SCSIControllerAddDis));
     4500            m_pActionAddControllerICH6->setIcon(iconPool()->icon(IDEControllerAddEn, IDEControllerAddDis));
     4501        }
     4502
     4503        /* Create 'Add AHCI Controller' action: */
     4504        m_pActionAddControllerAHCI = new QAction(this);
     4505        AssertPtrReturnVoid(m_pActionAddControllerAHCI);
     4506        {
     4507            /* Configure action: */
     4508            m_pActionAddControllerAHCI->setIcon(iconPool()->icon(SATAControllerAddEn, SATAControllerAddDis));
     4509        }
     4510
     4511        /* Create 'Add LsiLogic Controller' action: */
     4512        m_pActionAddControllerLsiLogic = new QAction(this);
     4513        AssertPtrReturnVoid(m_pActionAddControllerLsiLogic);
     4514        {
     4515            /* Configure action: */
     4516            m_pActionAddControllerLsiLogic->setIcon(iconPool()->icon(SCSIControllerAddEn, SCSIControllerAddDis));
     4517        }
     4518
     4519        /* Create 'Add BusLogic Controller' action: */
     4520        m_pActionAddControllerBusLogic = new QAction(this);
     4521        AssertPtrReturnVoid(m_pActionAddControllerBusLogic);
     4522        {
     4523            /* Configure action: */
     4524            m_pActionAddControllerBusLogic->setIcon(iconPool()->icon(SCSIControllerAddEn, SCSIControllerAddDis));
    44704525        }
    44714526
    … …  
    44784533        }
    44794534
    4480         /* Create 'Add SAS Controller' action: */
    4481         m_pActionAddControllerSAS = new QAction(this);
    4482         AssertPtrReturnVoid(m_pActionAddControllerSAS);
     4535        /* Create 'Add LsiLogic SAS Controller' action: */
     4536        m_pActionAddControllerLsiLogicSAS = new QAction(this);
     4537        AssertPtrReturnVoid(m_pActionAddControllerLsiLogicSAS);
    44834538        {
    44844539            /* Configure action: */
    4485             m_pActionAddControllerSAS->setIcon(iconPool()->icon(SASControllerAddEn, SASControllerAddDis));
     4540            m_pActionAddControllerLsiLogicSAS->setIcon(iconPool()->icon(SASControllerAddEn, SASControllerAddDis));
    44864541        }
    44874542
    … …  
    46474702    /* Configure actions: */
    46484703    connect(m_pActionAddController, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddController);
    4649     connect(m_pActionAddControllerIDE, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerIDE);
    4650     connect(m_pActionAddControllerSATA, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerSATA);
    4651     connect(m_pActionAddControllerSCSI, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerSCSI);
     4704    connect(m_pActionAddControllerPIIX3, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerPIIX3);
     4705    connect(m_pActionAddControllerPIIX4, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerPIIX4);
     4706    connect(m_pActionAddControllerICH6, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerICH6);
     4707    connect(m_pActionAddControllerAHCI, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerAHCI);
     4708    connect(m_pActionAddControllerLsiLogic, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerLsiLogic);
     4709    connect(m_pActionAddControllerBusLogic, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerBusLogic);
    46524710    connect(m_pActionAddControllerFloppy, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerFloppy);
    4653     connect(m_pActionAddControllerSAS, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerSAS);
     4711    connect(m_pActionAddControllerLsiLogicSAS, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerLsiLogicSAS);
    46544712    connect(m_pActionAddControllerUSB, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerUSB);
    46554713    connect(m_pActionAddControllerNVMe, &QAction::triggered, this, &UIMachineSettingsStorage::sltAddControllerNVMe);

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

    r81101 r81164  
    107107    /** Handles command to add controller. */
    108108    void sltAddController();
    109     /** Handles command to add IDE controller. */
    110     void sltAddControllerIDE();
    111     /** Handles command to add SATA controller. */
    112     void sltAddControllerSATA();
    113     /** Handles command to add SCSI controller. */
    114     void sltAddControllerSCSI();
     109    /** Handles command to add PIIX3 controller. */
     110    void sltAddControllerPIIX3();
     111    /** Handles command to add PIIX4 controller. */
     112    void sltAddControllerPIIX4();
     113    /** Handles command to add ICH6 controller. */
     114    void sltAddControllerICH6();
     115    /** Handles command to add AHCI controller. */
     116    void sltAddControllerAHCI();
     117    /** Handles command to add LsiLogic controller. */
     118    void sltAddControllerLsiLogic();
     119    /** Handles command to add BusLogic controller. */
     120    void sltAddControllerBusLogic();
    115121    /** Handles command to add Floppy controller. */
    116122    void sltAddControllerFloppy();
    117123    /** Handles command to add SAS controller. */
    118     void sltAddControllerSAS();
     124    void sltAddControllerLsiLogicSAS();
    119125    /** Handles command to add USB controller. */
    120126    void sltAddControllerUSB();
    … …  
    264270    /** Holds the 'Remove Controller' action instance. */
    265271    QAction *m_pActionRemoveController;
    266     /** Holds the 'Add IDE Controller' action instance. */
    267     QAction *m_pActionAddControllerIDE;
    268     /** Holds the 'Add SATA Controller' action instance. */
    269     QAction *m_pActionAddControllerSATA;
    270     /** Holds the 'Add SCSI Controller' action instance. */
    271     QAction *m_pActionAddControllerSCSI;
    272     /** Holds the 'Add SAS Controller' action instance. */
    273     QAction *m_pActionAddControllerSAS;
     272    /** Holds the 'Add PIIX3 Controller' action instance. */
     273    QAction *m_pActionAddControllerPIIX3;
     274    /** Holds the 'Add PIIX4 Controller' action instance. */
     275    QAction *m_pActionAddControllerPIIX4;
     276    /** Holds the 'Add ICH6 Controller' action instance. */
     277    QAction *m_pActionAddControllerICH6;
     278    /** Holds the 'Add AHCI Controller' action instance. */
     279    QAction *m_pActionAddControllerAHCI;
     280    /** Holds the 'Add LsiLogic Controller' action instance. */
     281    QAction *m_pActionAddControllerLsiLogic;
     282    /** Holds the 'Add BusLogic Controller' action instance. */
     283    QAction *m_pActionAddControllerBusLogic;
     284    /** Holds the 'Add LsiLogic SAS Controller' action instance. */
     285    QAction *m_pActionAddControllerLsiLogicSAS;
    274286    /** Holds the 'Add Floppy Controller' action instance. */
    275287    QAction *m_pActionAddControllerFloppy;
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