VirtualBox

Changeset 46759 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Jun 24, 2013 4:00:15 PM (12 years ago)
Author:
vboxsync
Message:

FE/Qt: Settings stuff: Moving setting-page-type enum to global UI defs scope.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

    r46726 r46759  
    242242Q_DECLARE_METATYPE(DetailsElementType);
    243243
     244/* Global settings page type: */
     245enum GlobalSettingsPageType
     246{
     247    GlobalSettingsPageType_General,
     248    GlobalSettingsPageType_Input,
     249    GlobalSettingsPageType_Update,
     250    GlobalSettingsPageType_Language,
     251    GlobalSettingsPageType_Display,
     252    GlobalSettingsPageType_USB,
     253    GlobalSettingsPageType_Network,
     254    GlobalSettingsPageType_Extension,
     255    GlobalSettingsPageType_Proxy,
     256    GlobalSettingsPageType_Max
     257};
     258Q_DECLARE_METATYPE(GlobalSettingsPageType);
     259
     260/* Machine settings page type: */
     261enum MachineSettingsPageType
     262{
     263    MachineSettingsPageType_General,
     264    MachineSettingsPageType_System,
     265    MachineSettingsPageType_Display,
     266    MachineSettingsPageType_Storage,
     267    MachineSettingsPageType_Audio,
     268    MachineSettingsPageType_Network,
     269    MachineSettingsPageType_Ports,
     270    MachineSettingsPageType_Serial,
     271    MachineSettingsPageType_Parallel,
     272    MachineSettingsPageType_USB,
     273    MachineSettingsPageType_SF,
     274    MachineSettingsPageType_Max
     275};
     276Q_DECLARE_METATYPE(MachineSettingsPageType);
     277
    244278/* Indicator type: */
    245279enum IndicatorType

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

    r46519 r46759  
    311311
    312312    /* Creating settings pages: */
    313     for (int iPageIndex = GLSettingsPage_General; iPageIndex < GLSettingsPage_MAX; ++iPageIndex)
     313    for (int iPageIndex = GlobalSettingsPageType_General; iPageIndex < GlobalSettingsPageType_Max; ++iPageIndex)
    314314    {
    315315        if (isPageAvailable(iPageIndex))
    … …  
    319319            {
    320320                /* General page: */
    321                 case GLSettingsPage_General:
     321                case GlobalSettingsPageType_General:
    322322                {
    323323                    pSettingsPage = new UIGlobalSettingsGeneral;
    … …  
    328328                }
    329329                /* Input page: */
    330                 case GLSettingsPage_Input:
     330                case GlobalSettingsPageType_Input:
    331331                {
    332332                    pSettingsPage = new UIGlobalSettingsInput;
    … …  
    337337                }
    338338                /* Update page: */
    339                 case GLSettingsPage_Update:
     339                case GlobalSettingsPageType_Update:
    340340                {
    341341                    pSettingsPage = new UIGlobalSettingsUpdate;
    … …  
    346346                }
    347347                /* Language page: */
    348                 case GLSettingsPage_Language:
     348                case GlobalSettingsPageType_Language:
    349349                {
    350350                    pSettingsPage = new UIGlobalSettingsLanguage;
    … …  
    355355                }
    356356                /* Display page: */
    357                 case GLSettingsPage_Display:
     357                case GlobalSettingsPageType_Display:
    358358                {
    359359                    pSettingsPage = new UIGlobalSettingsDisplay;
    … …  
    364364                }
    365365                /* USB page: */
    366                 case GLSettingsPage_USB:
     366                case GlobalSettingsPageType_USB:
    367367                {
    368368                    pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Global);
    … …  
    373373                }
    374374                /* Network page: */
    375                 case GLSettingsPage_Network:
     375                case GlobalSettingsPageType_Network:
    376376                {
    377377                    pSettingsPage = new UIGlobalSettingsNetwork;
    … …  
    382382                }
    383383                /* Extension page: */
    384                 case GLSettingsPage_Extension:
     384                case GlobalSettingsPageType_Extension:
    385385                {
    386386                    pSettingsPage = new UIGlobalSettingsExtension;
    … …  
    391391                }
    392392                /* Proxy page: */
    393                 case GLSettingsPage_Proxy:
     393                case GlobalSettingsPageType_Proxy:
    394394                {
    395395                    pSettingsPage = new UIGlobalSettingsProxy;
    … …  
    478478{
    479479    /* General page: */
    480     m_pSelector->setItemText(GLSettingsPage_General, tr("General"));
     480    m_pSelector->setItemText(GlobalSettingsPageType_General, tr("General"));
    481481
    482482    /* Input page: */
    483     m_pSelector->setItemText(GLSettingsPage_Input, tr("Input"));
     483    m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
    484484
    485485    /* Update page: */
    486     m_pSelector->setItemText(GLSettingsPage_Update, tr("Update"));
     486    m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
    487487
    488488    /* Language page: */
    489     m_pSelector->setItemText(GLSettingsPage_Language, tr("Language"));
     489    m_pSelector->setItemText(GlobalSettingsPageType_Language, tr("Language"));
    490490
    491491    /* Display page: */
    492     m_pSelector->setItemText(GLSettingsPage_Display, tr("Display"));
     492    m_pSelector->setItemText(GlobalSettingsPageType_Display, tr("Display"));
    493493
    494494    /* USB page: */
    495     m_pSelector->setItemText(GLSettingsPage_USB, tr("USB"));
     495    m_pSelector->setItemText(GlobalSettingsPageType_USB, tr("USB"));
    496496
    497497    /* Network page: */
    498     m_pSelector->setItemText(GLSettingsPage_Network, tr("Network"));
     498    m_pSelector->setItemText(GlobalSettingsPageType_Network, tr("Network"));
    499499
    500500    /* Extension page: */
    501     m_pSelector->setItemText(GLSettingsPage_Extension, tr("Extensions"));
     501    m_pSelector->setItemText(GlobalSettingsPageType_Extension, tr("Extensions"));
    502502
    503503    /* Proxy page: */
    504     m_pSelector->setItemText(GLSettingsPage_Proxy, tr("Proxy"));
     504    m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
    505505
    506506    /* Polish the selector: */
    … …  
    523523    switch (iPageId)
    524524    {
    525         case GLSettingsPage_USB:
     525        case GlobalSettingsPageType_USB:
    526526        {
    527527#ifdef ENABLE_GLOBAL_USB
    … …  
    541541            break;
    542542        }
    543         case GLSettingsPage_Network:
     543        case GlobalSettingsPageType_Network:
    544544        {
    545545#ifndef VBOX_WITH_NETFLT
    … …  
    578578
    579579    /* Creating settings pages: */
    580     for (int iPageIndex = VMSettingsPage_General; iPageIndex < VMSettingsPage_MAX; ++iPageIndex)
     580    for (int iPageIndex = MachineSettingsPageType_General; iPageIndex < MachineSettingsPageType_Max; ++iPageIndex)
    581581    {
    582582        if (isPageAvailable(iPageIndex))
    … …  
    586586            {
    587587                /* General page: */
    588                 case VMSettingsPage_General:
     588                case MachineSettingsPageType_General:
    589589                {
    590590                    pSettingsPage = new UIMachineSettingsGeneral;
    … …  
    595595                }
    596596                /* System page: */
    597                 case VMSettingsPage_System:
     597                case MachineSettingsPageType_System:
    598598                {
    599599                    pSettingsPage = new UIMachineSettingsSystem;
    … …  
    605605                }
    606606                /* Display page: */
    607                 case VMSettingsPage_Display:
     607                case MachineSettingsPageType_Display:
    608608                {
    609609                    pSettingsPage = new UIMachineSettingsDisplay;
    … …  
    614614                }
    615615                /* Storage page: */
    616                 case VMSettingsPage_Storage:
     616                case MachineSettingsPageType_Storage:
    617617                {
    618618                    pSettingsPage = new UIMachineSettingsStorage;
    … …  
    624624                }
    625625                /* Audio page: */
    626                 case VMSettingsPage_Audio:
     626                case MachineSettingsPageType_Audio:
    627627                {
    628628                    pSettingsPage = new UIMachineSettingsAudio;
    … …  
    633633                }
    634634                /* Network page: */
    635                 case VMSettingsPage_Network:
     635                case MachineSettingsPageType_Network:
    636636                {
    637637                    pSettingsPage = new UIMachineSettingsNetworkPage;
    … …  
    642642                }
    643643                /* Ports page: */
    644                 case VMSettingsPage_Ports:
     644                case MachineSettingsPageType_Ports:
    645645                {
    646646                    addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png",
    … …  
    650650                }
    651651                /* Serial page: */
    652                 case VMSettingsPage_Serial:
     652                case MachineSettingsPageType_Serial:
    653653                {
    654654                    pSettingsPage = new UIMachineSettingsSerialPage;
    655655                    addItem(":/serial_port_32px.png", ":/serial_port_disabled_32px.png",
    656656                            ":/serial_port_16px.png", ":/serial_port_disabled_16px.png",
    657                             iPageIndex, "#serialPorts", pSettingsPage, VMSettingsPage_Ports);
     657                            iPageIndex, "#serialPorts", pSettingsPage, MachineSettingsPageType_Ports);
    658658                    break;
    659659                }
    660660                /* Parallel page: */
    661                 case VMSettingsPage_Parallel:
     661                case MachineSettingsPageType_Parallel:
    662662                {
    663663                    pSettingsPage = new UIMachineSettingsParallelPage;
    664664                    addItem(":/parallel_port_32px.png", ":/parallel_port_disabled_32px.png",
    665665                            ":/parallel_port_16px.png", ":/parallel_port_disabled_16px.png",
    666                             iPageIndex, "#parallelPorts", pSettingsPage, VMSettingsPage_Ports);
     666                            iPageIndex, "#parallelPorts", pSettingsPage, MachineSettingsPageType_Ports);
    667667                    break;
    668668                }
    669669                /* USB page: */
    670                 case VMSettingsPage_USB:
     670                case MachineSettingsPageType_USB:
    671671                {
    672672                    pSettingsPage = new UIMachineSettingsUSB(UISettingsPageType_Machine);
    673673                    addItem(":/usb_32px.png", ":/usb_disabled_32px.png",
    674674                            ":/usb_16px.png", ":/usb_disabled_16px.png",
    675                             iPageIndex, "#usb", pSettingsPage, VMSettingsPage_Ports);
     675                            iPageIndex, "#usb", pSettingsPage, MachineSettingsPageType_Ports);
    676676                    break;
    677677                }
    678678                /* Shared Folders page: */
    679                 case VMSettingsPage_SF:
     679                case MachineSettingsPageType_SF:
    680680                {
    681681                    pSettingsPage = new UIMachineSettingsSF;
    … …  
    825825        /* Guest OS type & VT-x/AMD-V option correlation auto-fix: */
    826826        UIMachineSettingsGeneral *pGeneralPage =
    827             qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
     827            qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(MachineSettingsPageType_General));
    828828        UIMachineSettingsSystem *pSystemPage =
    829             qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
     829            qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(MachineSettingsPageType_System));
    830830        if (pGeneralPage && pSystemPage &&
    831831            pGeneralPage->is64BitOSTypeSelected() && !pSystemPage->isHWVirtExEnabled())
    … …  
    837837        {
    838838            UIMachineSettingsDisplay *pDisplayPage =
    839                 qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
     839                qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(MachineSettingsPageType_Display));
    840840            if (pDisplayPage && pDisplayPage->isAcceleration2DVideoSelected())
    841841                m_machine.SetAccelerate2DVideoEnabled(false);
    … …  
    874874     * vboxGlobal which is retranslated at that point already: */
    875875    QEvent event(QEvent::LanguageChange);
    876     if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Network))
     876    if (QWidget *pPage = m_pSelector->idToPage(MachineSettingsPageType_Network))
    877877        qApp->sendEvent(pPage, &event);
    878     if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Serial))
     878    if (QWidget *pPage = m_pSelector->idToPage(MachineSettingsPageType_Serial))
    879879        qApp->sendEvent(pPage, &event);
    880     if (QWidget *pPage = m_pSelector->idToPage(VMSettingsPage_Parallel))
     880    if (QWidget *pPage = m_pSelector->idToPage(MachineSettingsPageType_Parallel))
    881881        qApp->sendEvent(pPage, &event);
    882882
    883883    /* General page: */
    884     m_pSelector->setItemText(VMSettingsPage_General, tr("General"));
     884    m_pSelector->setItemText(MachineSettingsPageType_General, tr("General"));
    885885
    886886    /* System page: */
    887     m_pSelector->setItemText(VMSettingsPage_System, tr("System"));
     887    m_pSelector->setItemText(MachineSettingsPageType_System, tr("System"));
    888888
    889889    /* Display page: */
    890     m_pSelector->setItemText(VMSettingsPage_Display, tr("Display"));
     890    m_pSelector->setItemText(MachineSettingsPageType_Display, tr("Display"));
    891891
    892892    /* Storage page: */
    893     m_pSelector->setItemText(VMSettingsPage_Storage, tr("Storage"));
     893    m_pSelector->setItemText(MachineSettingsPageType_Storage, tr("Storage"));
    894894
    895895    /* Audio page: */
    896     m_pSelector->setItemText(VMSettingsPage_Audio, tr("Audio"));
     896    m_pSelector->setItemText(MachineSettingsPageType_Audio, tr("Audio"));
    897897
    898898    /* Network page: */
    899     m_pSelector->setItemText(VMSettingsPage_Network, tr("Network"));
     899    m_pSelector->setItemText(MachineSettingsPageType_Network, tr("Network"));
    900900
    901901    /* Ports page: */
    902     m_pSelector->setItemText(VMSettingsPage_Ports, tr("Ports"));
     902    m_pSelector->setItemText(MachineSettingsPageType_Ports, tr("Ports"));
    903903
    904904    /* Serial page: */
    905     m_pSelector->setItemText(VMSettingsPage_Serial, tr("Serial Ports"));
     905    m_pSelector->setItemText(MachineSettingsPageType_Serial, tr("Serial Ports"));
    906906
    907907    /* Parallel page: */
    908     m_pSelector->setItemText(VMSettingsPage_Parallel, tr("Parallel Ports"));
     908    m_pSelector->setItemText(MachineSettingsPageType_Parallel, tr("Parallel Ports"));
    909909
    910910    /* USB page: */
    911     m_pSelector->setItemText(VMSettingsPage_USB, tr("USB"));
     911    m_pSelector->setItemText(MachineSettingsPageType_USB, tr("USB"));
    912912
    913913    /* SFolders page: */
    914     m_pSelector->setItemText(VMSettingsPage_SF, tr("Shared Folders"));
     914    m_pSelector->setItemText(MachineSettingsPageType_SF, tr("Shared Folders"));
    915915
    916916    /* Polish the selector: */
    … …  
    938938    switch (pSettingsPage->id())
    939939    {
    940         case VMSettingsPage_General:
     940        case MachineSettingsPageType_General:
    941941        {
    942942            UIMachineSettingsGeneral *pGeneralPage = qobject_cast<UIMachineSettingsGeneral*>(pSettingsPage);
    943             UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
     943            UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(MachineSettingsPageType_System));
    944944            if (pGeneralPage && pSystemPage)
    945945                pGeneralPage->setHWVirtExEnabled(pSystemPage->isHWVirtExEnabled());
    946946            break;
    947947        }
    948         case VMSettingsPage_Display:
     948        case MachineSettingsPageType_Display:
    949949        {
    950950            UIMachineSettingsDisplay *pDisplayPage = qobject_cast<UIMachineSettingsDisplay*>(pSettingsPage);
    951             UIMachineSettingsGeneral *pGeneralPage = qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(VMSettingsPage_General));
     951            UIMachineSettingsGeneral *pGeneralPage = qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(MachineSettingsPageType_General));
    952952            if (pDisplayPage && pGeneralPage)
    953953                pDisplayPage->setGuestOSType(pGeneralPage->guestOSType());
    954954            break;
    955955        }
    956         case VMSettingsPage_System:
     956        case MachineSettingsPageType_System:
    957957        {
    958958            UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(pSettingsPage);
    959             UIMachineSettingsUSB *pUsbPage = qobject_cast<UIMachineSettingsUSB*>(m_pSelector->idToPage(VMSettingsPage_USB));
     959            UIMachineSettingsUSB *pUsbPage = qobject_cast<UIMachineSettingsUSB*>(m_pSelector->idToPage(MachineSettingsPageType_USB));
    960960            if (pSystemPage && pUsbPage)
    961961                pSystemPage->setOHCIEnabled(pUsbPage->isOHCIEnabled());
    962962            break;
    963963        }
    964         case VMSettingsPage_Storage:
     964        case MachineSettingsPageType_Storage:
    965965        {
    966966            UIMachineSettingsStorage *pStoragePage = qobject_cast<UIMachineSettingsStorage*>(pSettingsPage);
    967             UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(VMSettingsPage_System));
     967            UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(MachineSettingsPageType_System));
    968968            if (pStoragePage && pSystemPage)
    969969                pStoragePage->setChipsetType(pSystemPage->chipsetType());
    … …  
    10921092    switch (iPageId)
    10931093    {
    1094         case VMSettingsPage_Serial:
     1094        case MachineSettingsPageType_Serial:
    10951095        {
    10961096            /* Depends on ports availability: */
    1097             if (!isPageAvailable(VMSettingsPage_Ports))
     1097            if (!isPageAvailable(MachineSettingsPageType_Ports))
    10981098                return false;
    10991099            break;
    11001100        }
    1101         case VMSettingsPage_Parallel:
     1101        case MachineSettingsPageType_Parallel:
    11021102        {
    11031103            /* Depends on ports availability: */
    1104             if (!isPageAvailable(VMSettingsPage_Ports))
     1104            if (!isPageAvailable(MachineSettingsPageType_Ports))
    11051105                return false;
    11061106            /* But for now this page is always disabled: */
    11071107            return false;
    11081108        }
    1109         case VMSettingsPage_USB:
     1109        case MachineSettingsPageType_USB:
    11101110        {
    11111111            /* Depends on ports availability: */
    1112             if (!isPageAvailable(VMSettingsPage_Ports))
     1112            if (!isPageAvailable(MachineSettingsPageType_Ports))
    11131113                return false;
    11141114            /* Get the USB controller object: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

    r45198 r46759  
    3636public:
    3737
    38     enum GLSettingsPage
    39     {
    40         GLSettingsPage_General = 0,
    41         GLSettingsPage_Input,
    42         GLSettingsPage_Update,
    43         GLSettingsPage_Language,
    44         GLSettingsPage_Display,
    45         GLSettingsPage_USB,
    46         GLSettingsPage_Network,
    47         GLSettingsPage_Extension,
    48         GLSettingsPage_Proxy,
    49         GLSettingsPage_MAX
    50     };
    51 
    5238    UISettingsDialogGlobal(QWidget *pParent);
    5339    ~UISettingsDialogGlobal();
    … …  
    7359
    7460public:
    75 
    76     enum VMSettingsPage
    77     {
    78         VMSettingsPage_General = 0,
    79         VMSettingsPage_System,
    80         VMSettingsPage_Display,
    81         VMSettingsPage_Storage,
    82         VMSettingsPage_Audio,
    83         VMSettingsPage_Network,
    84         VMSettingsPage_Ports,
    85         VMSettingsPage_Serial,
    86         VMSettingsPage_Parallel,
    87         VMSettingsPage_USB,
    88         VMSettingsPage_SF,
    89         VMSettingsPage_MAX
    90     };
    9161
    9262    UISettingsDialogMachine(QWidget *pParent, const QString &strMachineId,
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