Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 46681) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 46682) @@ -240,4 +240,21 @@ Q_DECLARE_METATYPE(DetailsElementType); +/* Indicator type: */ +enum IndicatorType +{ + IndicatorType_HardDisks, + IndicatorType_OpticalDisks, + IndicatorType_FloppyDisks, + IndicatorType_Network, + IndicatorType_USB, + IndicatorType_SharedFolders, + IndicatorType_VideoCapture, + IndicatorType_Features, + IndicatorType_Mouse, + IndicatorType_Keyboard, + IndicatorType_Max +}; +Q_DECLARE_METATYPE(IndicatorType); + #endif // __UIDefs_h__ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 46681) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp (revision 46682) @@ -737,5 +737,5 @@ : QObject(pParent) , m_session(session) - , m_pool(UIIndicatorIndex_Max) + , m_pool(IndicatorType_Max) { /* Prepare: */ @@ -749,5 +749,5 @@ } -QIStateIndicator* UIIndicatorsPool::indicator(UIIndicatorIndex index) +QIStateIndicator* UIIndicatorsPool::indicator(IndicatorType index) { /* Just return what already exists: */ @@ -758,20 +758,20 @@ { /* Populate indicator-pool: */ - for (int iIndex = 0; iIndex < UIIndicatorIndex_Max; ++iIndex) + for (int iIndex = 0; iIndex < IndicatorType_Max; ++iIndex) { /* Prepare indicator: */ - UIIndicatorIndex index = static_cast(iIndex); + IndicatorType index = static_cast(iIndex); switch (index) { - case UIIndicatorIndex_HardDisks: m_pool[index] = new UIIndicatorHardDisks(m_session); break; - case UIIndicatorIndex_OpticalDisks: m_pool[index] = new UIIndicatorOpticalDisks(m_session); break; - case UIIndicatorIndex_FloppyDisks: m_pool[index] = new UIIndicatorFloppyDisks(m_session); break; - case UIIndicatorIndex_Network: m_pool[index] = new UIIndicatorNetwork(m_session); break; - case UIIndicatorIndex_USB: m_pool[index] = new UIIndicatorUSB(m_session); break; - case UIIndicatorIndex_SharedFolders: m_pool[index] = new UIIndicatorSharedFolders(m_session); break; - case UIIndicatorIndex_VideoCapture: m_pool[index] = new UIIndicatorVideoCapture(m_session); break; - case UIIndicatorIndex_Features: m_pool[index] = new UIIndicatorFeatures(m_session); break; - case UIIndicatorIndex_Mouse: m_pool[index] = new UIIndicatorMouse(m_session); break; - case UIIndicatorIndex_Keyboard: m_pool[index] = new UIIndicatorKeyboard(m_session); break; + case IndicatorType_HardDisks: m_pool[index] = new UIIndicatorHardDisks(m_session); break; + case IndicatorType_OpticalDisks: m_pool[index] = new UIIndicatorOpticalDisks(m_session); break; + case IndicatorType_FloppyDisks: m_pool[index] = new UIIndicatorFloppyDisks(m_session); break; + case IndicatorType_Network: m_pool[index] = new UIIndicatorNetwork(m_session); break; + case IndicatorType_USB: m_pool[index] = new UIIndicatorUSB(m_session); break; + case IndicatorType_SharedFolders: m_pool[index] = new UIIndicatorSharedFolders(m_session); break; + case IndicatorType_VideoCapture: m_pool[index] = new UIIndicatorVideoCapture(m_session); break; + case IndicatorType_Features: m_pool[index] = new UIIndicatorFeatures(m_session); break; + case IndicatorType_Mouse: m_pool[index] = new UIIndicatorMouse(m_session); break; + case IndicatorType_Keyboard: m_pool[index] = new UIIndicatorKeyboard(m_session); break; default: break; } @@ -782,5 +782,5 @@ { /* Wipe-out indicator-pool: */ - for (int iIndex = 0; iIndex < UIIndicatorIndex_Max; ++iIndex) + for (int iIndex = 0; iIndex < IndicatorType_Max; ++iIndex) { /* Wipe-out indicator: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h (revision 46681) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h (revision 46682) @@ -22,23 +22,8 @@ /* GUI includes: */ #include "QIStateIndicator.h" +#include "UIDefs.h" /* Forward declarations: */ class CSession; - -/* Indicator types: */ -enum UIIndicatorIndex -{ - UIIndicatorIndex_HardDisks, - UIIndicatorIndex_OpticalDisks, - UIIndicatorIndex_FloppyDisks, - UIIndicatorIndex_Network, - UIIndicatorIndex_USB, - UIIndicatorIndex_SharedFolders, - UIIndicatorIndex_VideoCapture, - UIIndicatorIndex_Features, - UIIndicatorIndex_Mouse, - UIIndicatorIndex_Keyboard, - UIIndicatorIndex_Max -}; /* Indicator pool interface/prototype: */ @@ -54,5 +39,5 @@ /* API indicator access stuff: */ - QIStateIndicator* indicator(UIIndicatorIndex index); + QIStateIndicator* indicator(IndicatorType index); private: Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 46681) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (revision 46682) @@ -115,10 +115,10 @@ { /* Update indicators: */ - updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_HardDisks), KDeviceType_HardDisk); - updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks), KDeviceType_DVD); - updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks), KDeviceType_Floppy); - updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_USB), KDeviceType_USB); - updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_Network), KDeviceType_Network); - updateIndicatorState(indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders), KDeviceType_SharedFolder); + updateIndicatorState(indicatorsPool()->indicator(IndicatorType_HardDisks), KDeviceType_HardDisk); + updateIndicatorState(indicatorsPool()->indicator(IndicatorType_OpticalDisks), KDeviceType_DVD); + updateIndicatorState(indicatorsPool()->indicator(IndicatorType_FloppyDisks), KDeviceType_Floppy); + updateIndicatorState(indicatorsPool()->indicator(IndicatorType_USB), KDeviceType_USB); + updateIndicatorState(indicatorsPool()->indicator(IndicatorType_Network), KDeviceType_Network); + updateIndicatorState(indicatorsPool()->indicator(IndicatorType_SharedFolders), KDeviceType_SharedFolder); } @@ -126,5 +126,5 @@ { /* Show optical-disks LED context menu: */ - if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks)) + if (pIndicator == indicatorsPool()->indicator(IndicatorType_OpticalDisks)) { if (gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices)->isEnabled()) @@ -132,5 +132,5 @@ } /* Show floppy-disks LED context menu: */ - else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks)) + else if (pIndicator == indicatorsPool()->indicator(IndicatorType_FloppyDisks)) { if (gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->isEnabled()) @@ -138,5 +138,5 @@ } /* Show usb LED context menu: */ - else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_USB)) + else if (pIndicator == indicatorsPool()->indicator(IndicatorType_USB)) { if (gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->isEnabled()) @@ -144,5 +144,5 @@ } /* Show network LED context menu: */ - else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_Network)) + else if (pIndicator == indicatorsPool()->indicator(IndicatorType_Network)) { if (gActionPool->action(UIActionIndexRuntime_Menu_Network)->isEnabled()) @@ -150,5 +150,5 @@ } /* Show shared-folders LED context menu: */ - else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders)) + else if (pIndicator == indicatorsPool()->indicator(IndicatorType_SharedFolders)) { if (gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)->isEnabled()) @@ -156,5 +156,5 @@ } /* Show video-capture LED context menu: */ - else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_VideoCapture)) + else if (pIndicator == indicatorsPool()->indicator(IndicatorType_VideoCapture)) { if (gActionPool->action(UIActionIndexRuntime_Menu_VideoCapture)->isEnabled()) @@ -162,5 +162,5 @@ } /* Show mouse LED context menu: */ - else if (pIndicator == indicatorsPool()->indicator(UIIndicatorIndex_Mouse)) + else if (pIndicator == indicatorsPool()->indicator(IndicatorType_Mouse)) { if (gActionPool->action(UIActionIndexRuntime_Menu_MouseIntegration)->isEnabled()) @@ -233,8 +233,8 @@ /* Hard Disks: */ - pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(UIIndicatorIndex_HardDisks)); + pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(IndicatorType_HardDisks)); /* Optical Disks: */ - QIStateIndicator *pLedOpticalDisks = indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks); + QIStateIndicator *pLedOpticalDisks = indicatorsPool()->indicator(IndicatorType_OpticalDisks); pIndicatorBoxHLayout->addWidget(pLedOpticalDisks); connect(pLedOpticalDisks, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -242,5 +242,5 @@ /* Floppy Disks: */ - QIStateIndicator *pLedFloppyDisks = indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks); + QIStateIndicator *pLedFloppyDisks = indicatorsPool()->indicator(IndicatorType_FloppyDisks); pIndicatorBoxHLayout->addWidget(pLedFloppyDisks); connect(pLedFloppyDisks, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -248,5 +248,5 @@ /* USB: */ - QIStateIndicator *pLedUSB = indicatorsPool()->indicator(UIIndicatorIndex_USB); + QIStateIndicator *pLedUSB = indicatorsPool()->indicator(IndicatorType_USB); pIndicatorBoxHLayout->addWidget(pLedUSB); connect(pLedUSB, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -254,5 +254,5 @@ /* Network: */ - QIStateIndicator *pLedNetwork = indicatorsPool()->indicator(UIIndicatorIndex_Network); + QIStateIndicator *pLedNetwork = indicatorsPool()->indicator(IndicatorType_Network); pIndicatorBoxHLayout->addWidget(pLedNetwork); connect(pLedNetwork, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -260,5 +260,5 @@ /* Shared Folders: */ - QIStateIndicator *pLedSharedFolders = indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders); + QIStateIndicator *pLedSharedFolders = indicatorsPool()->indicator(IndicatorType_SharedFolders); pIndicatorBoxHLayout->addWidget(pLedSharedFolders); connect(pLedSharedFolders, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -266,5 +266,5 @@ /* Video Capture: */ - QIStateIndicator *pLedVideoCapture = indicatorsPool()->indicator(UIIndicatorIndex_VideoCapture); + QIStateIndicator *pLedVideoCapture = indicatorsPool()->indicator(IndicatorType_VideoCapture); pIndicatorBoxHLayout->addWidget(pLedVideoCapture); connect(pLedVideoCapture, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -272,5 +272,5 @@ /* Features: */ - pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(UIIndicatorIndex_Features)); + pIndicatorBoxHLayout->addWidget(indicatorsPool()->indicator(IndicatorType_Features)); /* Separator: */ @@ -280,5 +280,5 @@ /* Mouse: */ - QIStateIndicator *pLedMouse = indicatorsPool()->indicator(UIIndicatorIndex_Mouse); + QIStateIndicator *pLedMouse = indicatorsPool()->indicator(IndicatorType_Mouse); pIndicatorBoxHLayout->addWidget(pLedMouse); connect(pLedMouse, SIGNAL(contextMenuRequested(QIStateIndicator*, QContextMenuEvent*)), @@ -291,5 +291,5 @@ pHostkeyLedContainerLayout->setSpacing(3); pIndicatorBoxHLayout->addWidget(m_pCntHostkey); - pHostkeyLedContainerLayout->addWidget(indicatorsPool()->indicator(UIIndicatorIndex_Keyboard)); + pHostkeyLedContainerLayout->addWidget(indicatorsPool()->indicator(IndicatorType_Keyboard)); m_pNameHostkey = new QLabel(UIHostCombo::toReadableString(vboxGlobal().settings().hostCombo())); pHostkeyLedContainerLayout->addWidget(m_pNameHostkey); @@ -343,10 +343,10 @@ /* Connect keyboard state-change handler: */ - connect(machineLogic()->keyboardHandler(), SIGNAL(keyboardStateChanged(int)), indicatorsPool()->indicator(UIIndicatorIndex_Keyboard), SLOT(setState(int))); + connect(machineLogic()->keyboardHandler(), SIGNAL(keyboardStateChanged(int)), indicatorsPool()->indicator(IndicatorType_Keyboard), SLOT(setState(int))); /* Connect mouse state-change handler: */ - connect(machineLogic()->mouseHandler(), SIGNAL(mouseStateChanged(int)), indicatorsPool()->indicator(UIIndicatorIndex_Mouse), SLOT(setState(int))); + connect(machineLogic()->mouseHandler(), SIGNAL(mouseStateChanged(int)), indicatorsPool()->indicator(IndicatorType_Mouse), SLOT(setState(int))); /* Early initialize created connections: */ - indicatorsPool()->indicator(UIIndicatorIndex_Keyboard)->setState(machineLogic()->keyboardHandler()->keyboardState()); - indicatorsPool()->indicator(UIIndicatorIndex_Mouse)->setState(machineLogic()->mouseHandler()->mouseState()); + indicatorsPool()->indicator(IndicatorType_Keyboard)->setState(machineLogic()->keyboardHandler()->keyboardState()); + indicatorsPool()->indicator(IndicatorType_Mouse)->setState(machineLogic()->mouseHandler()->mouseState()); } @@ -436,10 +436,10 @@ { /* Hide USB menu: */ - indicatorsPool()->indicator(UIIndicatorIndex_USB)->setHidden(true); + indicatorsPool()->indicator(IndicatorType_USB)->setHidden(true); } else { /* Toggle USB LED: */ - indicatorsPool()->indicator(UIIndicatorIndex_USB)->setState( + indicatorsPool()->indicator(IndicatorType_USB)->setState( usbController.GetEnabled() ? KDeviceActivity_Idle : KDeviceActivity_Null); } @@ -566,20 +566,20 @@ } if (iElement & UIVisualElement_HDStuff) - indicatorsPool()->indicator(UIIndicatorIndex_HardDisks)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_HardDisks)->updateAppearance(); if (iElement & UIVisualElement_CDStuff) - indicatorsPool()->indicator(UIIndicatorIndex_OpticalDisks)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_OpticalDisks)->updateAppearance(); if (iElement & UIVisualElement_FDStuff) - indicatorsPool()->indicator(UIIndicatorIndex_FloppyDisks)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_FloppyDisks)->updateAppearance(); if (iElement & UIVisualElement_NetworkStuff) - indicatorsPool()->indicator(UIIndicatorIndex_Network)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_Network)->updateAppearance(); if (iElement & UIVisualElement_USBStuff && - !indicatorsPool()->indicator(UIIndicatorIndex_USB)->isHidden()) - indicatorsPool()->indicator(UIIndicatorIndex_USB)->updateAppearance(); + !indicatorsPool()->indicator(IndicatorType_USB)->isHidden()) + indicatorsPool()->indicator(IndicatorType_USB)->updateAppearance(); if (iElement & UIVisualElement_SharedFolderStuff) - indicatorsPool()->indicator(UIIndicatorIndex_SharedFolders)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_SharedFolders)->updateAppearance(); if (iElement & UIVisualElement_VideoCapture) - indicatorsPool()->indicator(UIIndicatorIndex_VideoCapture)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_VideoCapture)->updateAppearance(); if (iElement & UIVisualElement_FeaturesStuff) - indicatorsPool()->indicator(UIIndicatorIndex_Features)->updateAppearance(); + indicatorsPool()->indicator(IndicatorType_Features)->updateAppearance(); }