VirtualBox

Changeset 46682 in vbox for trunk/src


Ignore:
Timestamp:
Jun 19, 2013 5:27:42 PM (12 years ago)
Author:
vboxsync
Message:

FE/Qt: UI status-bar indicator-pool interface: Cleanup (part 4): Moving *indicator* types into global UI defs.

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

Legend:

Unmodified
Added
Removed

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

    r46647 r46682  
    240240Q_DECLARE_METATYPE(DetailsElementType);
    241241
     242/* Indicator type: */
     243enum IndicatorType
     244{
     245    IndicatorType_HardDisks,
     246    IndicatorType_OpticalDisks,
     247    IndicatorType_FloppyDisks,
     248    IndicatorType_Network,
     249    IndicatorType_USB,
     250    IndicatorType_SharedFolders,
     251    IndicatorType_VideoCapture,
     252    IndicatorType_Features,
     253    IndicatorType_Mouse,
     254    IndicatorType_Keyboard,
     255    IndicatorType_Max
     256};
     257Q_DECLARE_METATYPE(IndicatorType);
     258
    242259#endif // __UIDefs_h__
    243260

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

    r46680 r46682  
    737737    : QObject(pParent)
    738738    , m_session(session)
    739     , m_pool(UIIndicatorIndex_Max)
     739    , m_pool(IndicatorType_Max)
    740740{
    741741    /* Prepare: */
    … …  
    749749}
    750750
    751 QIStateIndicator* UIIndicatorsPool::indicator(UIIndicatorIndex index)
     751QIStateIndicator* UIIndicatorsPool::indicator(IndicatorType index)
    752752{
    753753    /* Just return what already exists: */
    … …  
    758758{
    759759    /* Populate indicator-pool: */
    760     for (int iIndex = 0; iIndex < UIIndicatorIndex_Max; ++iIndex)
     760    for (int iIndex = 0; iIndex < IndicatorType_Max; ++iIndex)
    761761    {
    762762        /* Prepare indicator: */
    763         UIIndicatorIndex index = static_cast<UIIndicatorIndex>(iIndex);
     763        IndicatorType index = static_cast<IndicatorType>(iIndex);
    764764        switch (index)
    765765        {
    766             case UIIndicatorIndex_HardDisks:     m_pool[index] = new UIIndicatorHardDisks(m_session); break;
    767             case UIIndicatorIndex_OpticalDisks:  m_pool[index] = new UIIndicatorOpticalDisks(m_session); break;
    768             case UIIndicatorIndex_FloppyDisks:   m_pool[index] = new UIIndicatorFloppyDisks(m_session); break;
    769             case UIIndicatorIndex_Network:       m_pool[index] = new UIIndicatorNetwork(m_session); break;
    770             case UIIndicatorIndex_USB:           m_pool[index] = new UIIndicatorUSB(m_session); break;
    771             case UIIndicatorIndex_SharedFolders: m_pool[index] = new UIIndicatorSharedFolders(m_session); break;
    772             case UIIndicatorIndex_VideoCapture:  m_pool[index] = new UIIndicatorVideoCapture(m_session); break;
    773             case UIIndicatorIndex_Features:      m_pool[index] = new UIIndicatorFeatures(m_session); break;
    774             case UIIndicatorIndex_Mouse:         m_pool[index] = new UIIndicatorMouse(m_session); break;
    775             case UIIndicatorIndex_Keyboard:      m_pool[index] = new UIIndicatorKeyboard(m_session); break;
     766            case IndicatorType_HardDisks:     m_pool[index] = new UIIndicatorHardDisks(m_session); break;
     767            case IndicatorType_OpticalDisks:  m_pool[index] = new UIIndicatorOpticalDisks(m_session); break;
     768            case IndicatorType_FloppyDisks:   m_pool[index] = new UIIndicatorFloppyDisks(m_session); break;
     769            case IndicatorType_Network:       m_pool[index] = new UIIndicatorNetwork(m_session); break;
     770            case IndicatorType_USB:           m_pool[index] = new UIIndicatorUSB(m_session); break;
     771            case IndicatorType_SharedFolders: m_pool[index] = new UIIndicatorSharedFolders(m_session); break;
     772            case IndicatorType_VideoCapture:  m_pool[index] = new UIIndicatorVideoCapture(m_session); break;
     773            case IndicatorType_Features:      m_pool[index] = new UIIndicatorFeatures(m_session); break;
     774            case IndicatorType_Mouse:         m_pool[index] = new UIIndicatorMouse(m_session); break;
     775            case IndicatorType_Keyboard:      m_pool[index] = new UIIndicatorKeyboard(m_session); break;
    776776            default: break;
    777777        }
    … …  
    782782{
    783783    /* Wipe-out indicator-pool: */
    784     for (int iIndex = 0; iIndex < UIIndicatorIndex_Max; ++iIndex)
     784    for (int iIndex = 0; iIndex < IndicatorType_Max; ++iIndex)
    785785    {
    786786        /* Wipe-out indicator: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h

    r46680 r46682  
    2222/* GUI includes: */
    2323#include "QIStateIndicator.h"
     24#include "UIDefs.h"
    2425
    2526/* Forward declarations: */
    2627class CSession;
    27 
    28 /* Indicator types: */
    29 enum UIIndicatorIndex
    30 {
    31     UIIndicatorIndex_HardDisks,
    32     UIIndicatorIndex_OpticalDisks,
    33     UIIndicatorIndex_FloppyDisks,
    34     UIIndicatorIndex_Network,
    35     UIIndicatorIndex_USB,
    36     UIIndicatorIndex_SharedFolders,
    37     UIIndicatorIndex_VideoCapture,
    38     UIIndicatorIndex_Features,
    39     UIIndicatorIndex_Mouse,
    40     UIIndicatorIndex_Keyboard,
    41     UIIndicatorIndex_Max
    42 };
    4328
    4429/* Indicator pool interface/prototype: */
    … …  
    5439
    5540    /* API indicator access stuff: */
    56     QIStateIndicator* indicator(UIIndicatorIndex index);
     41    QIStateIndicator* indicator(IndicatorType index);
    5742
    5843private:

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r46680 r46682  
    115115{
    116116    /* Update indicators: */
    117     updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_HardDisks), KDeviceType_HardDisk);
    118     updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks), KDeviceType_DVD);
    119     updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks), KDeviceType_Floppy);
    120     updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_USB), KDeviceType_USB);
    121     updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_Network), KDeviceType_Network);
    122     updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders), KDeviceType_SharedFolder);
     117    updateIndicatorState(indicatorsPool()->indicator(IndicatorType_HardDisks), KDeviceType_HardDisk);
     118    updateIndicatorState(indicatorsPool()->indicator(IndicatorType_OpticalDisks), KDeviceType_DVD);
     119    updateIndicatorState(indicatorsPool()->indicator(IndicatorType_FloppyDisks), KDeviceType_Floppy);
     120    updateIndicatorState(indicatorsPool()->indicator(IndicatorType_USB), KDeviceType_USB);
     121    updateIndicatorState(indicatorsPool()->indicator(IndicatorType_Network), KDeviceType_Network);
     122    updateIndicatorState(indicatorsPool()->indicator(IndicatorType_SharedFolders), KDeviceType_SharedFolder);
    123123}
    124124
    … …  
    126126{
    127127    /* Show optical-disks LED context menu: */
    128     if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks))
     128    if (pIndicator == indicatorsPool()->indicator(IndicatorType_OpticalDisks))
    129129    {
    130130        if (gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices)->isEnabled())
    … …  
    132132    }
    133133    /* Show floppy-disks LED context menu: */
    134     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks))
     134    else if (pIndicator == indicatorsPool()->indicator(IndicatorType_FloppyDisks))
    135135    {
    136136        if (gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->isEnabled())
    … …  
    138138    }
    139139    /* Show usb LED context menu: */
    140     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_USB))
     140    else if (pIndicator == indicatorsPool()->indicator(IndicatorType_USB))
    141141    {
    142142        if (gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->isEnabled())
    … …  
    144144    }
    145145    /* Show network LED context menu: */
    146     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_Network))
     146    else if (pIndicator == indicatorsPool()->indicator(IndicatorType_Network))
    147147    {
    148148        if (gActionPool->action(UIActionIndexRuntime_Menu_Network)->isEnabled())
    … …  
    150150    }
    151151    /* Show shared-folders LED context menu: */
    152     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders))
     152    else if (pIndicator == indicatorsPool()->indicator(IndicatorType_SharedFolders))
    153153    {
    154154        if (gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)->isEnabled())
    … …  
    156156    }
    157157    /* Show video-capture LED context menu: */
    158     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_VideoCapture))
     158    else if (pIndicator == indicatorsPool()->indicator(IndicatorType_VideoCapture))
    159159    {
    160160        if (gActionPool->action(UIActionIndexRuntime_Menu_VideoCapture)->isEnabled())
    … …  
    162162    }
    163163    /* Show mouse LED context menu: */
    164     else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_Mouse))
     164    else if (pIndicator == indicatorsPool()->indicator(IndicatorType_Mouse))
    165165    {
    166166        if (gActionPool->action(UIActionIndexRuntime_Menu_MouseIntegration)->isEnabled())
    … …  
    233233
    234234    /* Hard Disks: */
    235     pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(UIIndicatorIndex_HardDisks));
     235    pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(IndicatorType_HardDisks));
    236236
    237237    /* Optical Disks: */
    238     QIStateIndicator *pLedOpticalDisks = indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks);
     238    QIStateIndicator *pLedOpticalDisks = indicatorsPool()->indicator(IndicatorType_OpticalDisks);
    239239    pIndicatorBoxHLayout->addWidget(pLedOpticalDisks);
    240240    connect(pLedOpticalDisks, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    242242
    243243    /* Floppy Disks: */
    244     QIStateIndicator *pLedFloppyDisks = indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks);
     244    QIStateIndicator *pLedFloppyDisks = indicatorsPool()->indicator(IndicatorType_FloppyDisks);
    245245    pIndicatorBoxHLayout->addWidget(pLedFloppyDisks);
    246246    connect(pLedFloppyDisks, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    248248
    249249    /* USB: */
    250     QIStateIndicator *pLedUSB = indicatorsPool()->indicator(UIIndicatorIndex_USB);
     250    QIStateIndicator *pLedUSB = indicatorsPool()->indicator(IndicatorType_USB);
    251251    pIndicatorBoxHLayout->addWidget(pLedUSB);
    252252    connect(pLedUSB, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    254254
    255255    /* Network: */
    256     QIStateIndicator *pLedNetwork = indicatorsPool()->indicator(UIIndicatorIndex_Network);
     256    QIStateIndicator *pLedNetwork = indicatorsPool()->indicator(IndicatorType_Network);
    257257    pIndicatorBoxHLayout->addWidget(pLedNetwork);
    258258    connect(pLedNetwork, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    260260
    261261    /* Shared Folders: */
    262     QIStateIndicator *pLedSharedFolders = indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders);
     262    QIStateIndicator *pLedSharedFolders = indicatorsPool()->indicator(IndicatorType_SharedFolders);
    263263    pIndicatorBoxHLayout->addWidget(pLedSharedFolders);
    264264    connect(pLedSharedFolders, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    266266
    267267    /* Video Capture: */
    268     QIStateIndicator *pLedVideoCapture = indicatorsPool()->indicator(UIIndicatorIndex_VideoCapture);
     268    QIStateIndicator *pLedVideoCapture = indicatorsPool()->indicator(IndicatorType_VideoCapture);
    269269    pIndicatorBoxHLayout->addWidget(pLedVideoCapture);
    270270    connect(pLedVideoCapture, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    272272
    273273    /* Features: */
    274     pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(UIIndicatorIndex_Features));
     274    pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(IndicatorType_Features));
    275275
    276276    /* Separator: */
    … …  
    280280
    281281    /* Mouse: */
    282     QIStateIndicator *pLedMouse = indicatorsPool()->indicator(UIIndicatorIndex_Mouse);
     282    QIStateIndicator *pLedMouse = indicatorsPool()->indicator(IndicatorType_Mouse);
    283283    pIndicatorBoxHLayout->addWidget(pLedMouse);
    284284    connect(pLedMouse, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)),
    … …  
    291291    pHostkeyLedContainerLayout->setSpacing(3);
    292292    pIndicatorBoxHLayout->addWidget(m_pCntHostkey);
    293     pHostkeyLedContainerLayout->addWidget(indicatorsPool()->indicator(UIIndicatorIndex_Keyboard));
     293    pHostkeyLedContainerLayout->addWidget(indicatorsPool()->indicator(IndicatorType_Keyboard));
    294294    m_pNameHostkey = new QLabel(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo()));
    295295    pHostkeyLedContainerLayout->addWidget(m_pNameHostkey);
    … …  
    343343
    344344    /* Connect keyboard state-change handler: */
    345     connect(machineLogic()->keyboardHandler(), SIGNAL(keyboardStateChanged(int)), indicatorsPool()->indicator(UIIndicatorIndex_Keyboard), SLOT(setState(int)));
     345    connect(machineLogic()->keyboardHandler(), SIGNAL(keyboardStateChanged(int)), indicatorsPool()->indicator(IndicatorType_Keyboard), SLOT(setState(int)));
    346346    /* Connect mouse state-change handler: */
    347     connect(machineLogic()->mouseHandler(), SIGNAL(mouseStateChanged(int)), indicatorsPool()->indicator(UIIndicatorIndex_Mouse), SLOT(setState(int)));
     347    connect(machineLogic()->mouseHandler(), SIGNAL(mouseStateChanged(int)), indicatorsPool()->indicator(IndicatorType_Mouse), SLOT(setState(int)));
    348348    /* Early initialize created connections: */
    349     indicatorsPool()->indicator(UIIndicatorIndex_Keyboard)->setState(machineLogic()->keyboardHandler()->keyboardState());
    350     indicatorsPool()->indicator(UIIndicatorIndex_Mouse)->setState(machineLogic()->mouseHandler()->mouseState());
     349    indicatorsPool()->indicator(IndicatorType_Keyboard)->setState(machineLogic()->keyboardHandler()->keyboardState());
     350    indicatorsPool()->indicator(IndicatorType_Mouse)->setState(machineLogic()->mouseHandler()->mouseState());
    351351}
    352352
    … …  
    436436        {
    437437            /* Hide USB menu: */
    438             indicatorsPool()->indicator(UIIndicatorIndex_USB)->setHidden(true);
     438            indicatorsPool()->indicator(IndicatorType_USB)->setHidden(true);
    439439        }
    440440        else
    441441        {
    442442            /* Toggle USB LED: */
    443             indicatorsPool()->indicator(UIIndicatorIndex_USB)->setState(
     443            indicatorsPool()->indicator(IndicatorType_USB)->setState(
    444444                usbController.GetEnabled() ? KDeviceActivity_Idle : KDeviceActivity_Null);
    445445        }
    … …  
    566566    }
    567567    if (iElement & UIVisualElement_HDStuff)
    568         indicatorsPool()->indicator(UIIndicatorIndex_HardDisks)->updateAppearance();
     568        indicatorsPool()->indicator(IndicatorType_HardDisks)->updateAppearance();
    569569    if (iElement & UIVisualElement_CDStuff)
    570         indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks)->updateAppearance();
     570        indicatorsPool()->indicator(IndicatorType_OpticalDisks)->updateAppearance();
    571571    if (iElement & UIVisualElement_FDStuff)
    572         indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks)->updateAppearance();
     572        indicatorsPool()->indicator(IndicatorType_FloppyDisks)->updateAppearance();
    573573    if (iElement & UIVisualElement_NetworkStuff)
    574         indicatorsPool()->indicator(UIIndicatorIndex_Network)->updateAppearance();
     574        indicatorsPool()->indicator(IndicatorType_Network)->updateAppearance();
    575575    if (iElement & UIVisualElement_USBStuff &&
    576         !indicatorsPool()->indicator(UIIndicatorIndex_USB)->isHidden())
    577         indicatorsPool()->indicator(UIIndicatorIndex_USB)->updateAppearance();
     576        !indicatorsPool()->indicator(IndicatorType_USB)->isHidden())
     577        indicatorsPool()->indicator(IndicatorType_USB)->updateAppearance();
    578578    if (iElement & UIVisualElement_SharedFolderStuff)
    579         indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders)->updateAppearance();
     579        indicatorsPool()->indicator(IndicatorType_SharedFolders)->updateAppearance();
    580580    if (iElement & UIVisualElement_VideoCapture)
    581         indicatorsPool()->indicator(UIIndicatorIndex_VideoCapture)->updateAppearance();
     581        indicatorsPool()->indicator(IndicatorType_VideoCapture)->updateAppearance();
    582582    if (iElement & UIVisualElement_FeaturesStuff)
    583         indicatorsPool()->indicator(UIIndicatorIndex_Features)->updateAppearance();
     583        indicatorsPool()->indicator(IndicatorType_Features)->updateAppearance();
    584584}
    585585
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