Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 71581) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 71582) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2010-2017 Oracle Corporation + * Copyright (C) 2010-2018 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -25,12 +25,12 @@ /* GUI includes: */ +# include "VBoxGlobal.h" # include "UIActionPool.h" # include "UIActionPoolSelector.h" # include "UIActionPoolRuntime.h" -# include "UIShortcutPool.h" # include "UIConverter.h" # include "UIIconPool.h" -# include "VBoxGlobal.h" # include "UIMessageCenter.h" +# include "UIShortcutPool.h" # ifdef VBOX_GUI_WITH_NETWORK_MANAGER # include "UIExtraDataManager.h" @@ -42,5 +42,4 @@ - /** QEvent extension * representing action-activation event. */ @@ -49,19 +48,24 @@ public: - /** Constructor. */ + /** Constructs @a pAction event. */ ActivateActionEvent(QAction *pAction) : QEvent((QEvent::Type)ActivateActionEventType) - , m_pAction(pAction) {} - - /** Returns the action this event corresponding to. */ - QAction* action() const { return m_pAction; } + , m_pAction(pAction) + {} + + /** Returns the action this event corresponds to. */ + QAction *action() const { return m_pAction; } private: - /** Ho0lds the action this event corresponding to. */ + /** Holds the action this event corresponds to. */ QAction *m_pAction; }; +/********************************************************************************************************************************* +* Class UIMenu implementation. * +*********************************************************************************************************************************/ + UIMenu::UIMenu() : m_fShowToolTip(false) @@ -69,5 +73,5 @@ , m_fConsumable(false) , m_fConsumed(false) -#endif /* VBOX_WS_MAC */ +#endif { } @@ -98,9 +102,13 @@ -UIAction::UIAction(UIActionPool *pParent, UIActionType type) +/********************************************************************************************************************************* +* Class UIAction implementation. * +*********************************************************************************************************************************/ + +UIAction::UIAction(UIActionPool *pParent, UIActionType enmType) : QAction(pParent) - , m_type(type) + , m_enmType(enmType) , m_pActionPool(pParent) - , m_actionPoolType(pParent->type()) + , m_enmActionPoolType(pParent->type()) , m_fShortcutHidden(false) { @@ -116,15 +124,15 @@ } -UIMenu* UIAction::menu() const +UIMenu *UIAction::menu() const { return QAction::menu() ? qobject_cast(QAction::menu()) : 0; } -UIActionPolymorphic* UIAction::toActionPolymorphic() +UIActionPolymorphic *UIAction::toActionPolymorphic() { return qobject_cast(this); } -UIActionPolymorphicMenu* UIAction::toActionPolymorphicMenu() +UIActionPolymorphicMenu *UIAction::toActionPolymorphicMenu() { return qobject_cast(this); @@ -142,5 +150,5 @@ { /* Only for selector's action-pool: */ - if (m_actionPoolType == UIActionPoolType_Selector) + if (m_enmActionPoolType == UIActionPoolType_Selector) { /* If shortcut is visible: */ @@ -172,5 +180,5 @@ { /* Action-name format depends on action-pool type: */ - switch (m_actionPoolType) + switch (m_enmActionPoolType) { /* Unchanged name for Selector UI: */ @@ -186,5 +194,5 @@ { /* Action-text format depends on action-pool type: */ - switch (m_actionPoolType) + switch (m_enmActionPoolType) { /* The same as menu name for Selector UI: */ @@ -201,10 +209,14 @@ +/********************************************************************************************************************************* +* Class UIActionMenu implementation. * +*********************************************************************************************************************************/ + UIActionMenu::UIActionMenu(UIActionPool *pParent, - const QString &strIcon, const QString &strIconDis) + const QString &strIcon, const QString &strIconDisabled) : UIAction(pParent, UIActionType_Menu) { if (!strIcon.isNull()) - setIcon(UIIconPool::iconSet(strIcon, strIconDis)); + setIcon(UIIconPool::iconSet(strIcon, strIconDisabled)); prepare(); } @@ -241,4 +253,8 @@ } + +/********************************************************************************************************************************* +* Class UIActionSimple implementation. * +*********************************************************************************************************************************/ UIActionSimple::UIActionSimple(UIActionPool *pParent, @@ -259,5 +275,5 @@ UIActionSimple::UIActionSimple(UIActionPool *pParent, - const QIcon& icon) + const QIcon &icon) : UIAction(pParent, UIActionType_Simple) { @@ -265,4 +281,8 @@ } + +/********************************************************************************************************************************* +* Class UIActionToggle implementation. * +*********************************************************************************************************************************/ UIActionToggle::UIActionToggle(UIActionPool *pParent, @@ -298,4 +318,8 @@ } + +/********************************************************************************************************************************* +* Class UIActionPolymorphic implementation. * +*********************************************************************************************************************************/ UIActionPolymorphic::UIActionPolymorphic(UIActionPool *pParent, @@ -326,4 +350,8 @@ } + +/********************************************************************************************************************************* +* Class UIActionPolymorphicMenu implementation. * +*********************************************************************************************************************************/ UIActionPolymorphicMenu::UIActionPolymorphicMenu(UIActionPool *pParent, @@ -409,4 +437,5 @@ +/** Menu action extension, used as 'Application' menu class. */ class UIActionMenuApplication : public UIActionMenu { @@ -415,10 +444,11 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionMenuApplication(UIActionPool *pParent) : UIActionMenu(pParent) { -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC menu()->setConsumable(true); -#endif /* RT_OS_DARWIN */ +#endif retranslateUi(); } @@ -433,14 +463,17 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Application); } - void retranslateUi() - { -#ifdef RT_OS_DARWIN + /** Handles translation event. */ + virtual void retranslateUi() /* override */ + { +#ifdef VBOX_WS_MAC setName(QApplication::translate("UIActionPool", "&VirtualBox")); -#else /* !RT_OS_DARWIN */ +#else setName(QApplication::translate("UIActionPool", "&File")); -#endif /* !RT_OS_DARWIN */ +#endif } }; + +/** Simple action extension, used as 'Close' action class. */ class UIActionSimplePerformClose : public UIActionSimple { @@ -449,4 +482,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimplePerformClose(UIActionPool *pParent) : UIActionSimple(pParent, ":/exit_16px.png") @@ -464,4 +498,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Close); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -469,4 +504,5 @@ } + /** Returns default shortcut. */ QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const { @@ -479,5 +515,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Close...")); @@ -486,5 +523,6 @@ }; -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC +/** Menu action extension, used as 'Window' menu class. */ class UIActionMenuWindow : public UIActionMenu { @@ -493,6 +531,8 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionMenuWindow(UIActionPool *pParent) - : UIActionMenu(pParent) {} + : UIActionMenu(pParent) + {} protected: @@ -505,5 +545,6 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Window); } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Window")); @@ -511,4 +552,6 @@ }; + +/** Simple action extension, used as 'Minimize' action class. */ class UIActionSimpleMinimize : public UIActionSimple { @@ -517,6 +560,8 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleMinimize(UIActionPool *pParent) - : UIActionSimple(pParent) {} + : UIActionSimple(pParent) + {} protected: @@ -529,4 +574,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType_Minimize); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -534,5 +580,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Minimize")); @@ -540,6 +587,8 @@ } }; -#endif /* RT_OS_DARWIN */ - +#endif /* VBOX_WS_MAC */ + + +/** Menu action extension, used as 'Help' menu class. */ class UIActionMenuHelp : public UIActionMenu { @@ -548,4 +597,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionMenuHelp(UIActionPool *pParent) : UIActionMenu(pParent) @@ -563,5 +613,6 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Help); } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Help")); @@ -569,4 +620,6 @@ }; + +/** Simple action extension, used as 'Contents' action class. */ class UIActionSimpleContents : public UIActionSimple { @@ -575,4 +628,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleContents(UIActionPool *pParent) : UIActionSimple(pParent, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_DialogHelp)) @@ -590,4 +644,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Contents); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -595,4 +650,5 @@ } + /** Returns default shortcut. */ QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const { @@ -605,5 +661,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Contents...")); @@ -612,4 +669,6 @@ }; + +/** Simple action extension, used as 'Web Site' action class. */ class UIActionSimpleWebSite : public UIActionSimple { @@ -618,4 +677,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleWebSite(UIActionPool *pParent) : UIActionSimple(pParent, ":/site_16px.png") @@ -633,4 +693,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_WebSite); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -638,5 +699,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&VirtualBox Web Site...")); @@ -645,4 +707,6 @@ }; + +/** Simple action extension, used as 'Bug Tracker' action class. */ class UIActionSimpleBugTracker : public UIActionSimple { @@ -651,4 +715,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleBugTracker(UIActionPool *pParent) : UIActionSimple(pParent, ":/site_bugtracker_16px.png") @@ -666,4 +731,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_BugTracker); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -671,5 +737,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&VirtualBox Bug Tracker...")); @@ -678,4 +745,6 @@ }; + +/** Simple action extension, used as 'Forums' action class. */ class UIActionSimpleForums : public UIActionSimple { @@ -684,4 +753,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleForums(UIActionPool *pParent) : UIActionSimple(pParent, ":/site_forum_16px.png") @@ -699,4 +769,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Forums); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -704,5 +775,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&VirtualBox Forums...")); @@ -711,4 +783,6 @@ }; + +/** Simple action extension, used as 'Oracle' action class. */ class UIActionSimpleOracle : public UIActionSimple { @@ -717,4 +791,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleOracle(UIActionPool *pParent) : UIActionSimple(pParent, ":/site_oracle_16px.png") @@ -732,4 +807,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Oracle); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -737,5 +813,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Oracle Web Site...")); @@ -744,4 +821,6 @@ }; + +/** Simple action extension, used as 'Reset Warnings' action class. */ class UIActionSimpleResetWarnings : public UIActionSimple { @@ -750,4 +829,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleResetWarnings(UIActionPool *pParent) : UIActionSimple(pParent, ":/reset_warnings_16px.png") @@ -766,4 +846,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -771,5 +852,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Reset All Warnings")); @@ -778,5 +860,7 @@ }; + #ifdef VBOX_GUI_WITH_NETWORK_MANAGER +/** Simple action extension, used as 'Network Access Manager' action class. */ class UIActionSimpleNetworkAccessManager : public UIActionSimple { @@ -785,4 +869,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleNetworkAccessManager(UIActionPool *pParent) : UIActionSimple(pParent, ":/download_manager_16px.png") @@ -801,4 +886,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -806,5 +892,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Network Operations Manager...")); @@ -813,4 +900,6 @@ }; + +/** Simple action extension, used as 'Check for Updates' action class. */ class UIActionSimpleCheckForUpdates : public UIActionSimple { @@ -819,4 +908,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleCheckForUpdates(UIActionPool *pParent) : UIActionSimple(pParent, ":/refresh_16px.png", ":/refresh_disabled_16px.png") @@ -835,4 +925,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -840,5 +931,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "C&heck for Updates...")); @@ -848,4 +940,6 @@ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + +/** Simple action extension, used as 'About' action class. */ class UIActionSimpleAbout : public UIActionSimple { @@ -854,4 +948,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimpleAbout(UIActionPool *pParent) : UIActionSimple(pParent, ":/about_16px.png") @@ -866,29 +961,30 @@ virtual int extraDataID() const { -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC return UIExtraDataMetaDefs::MenuApplicationActionType_About; -#else /* !RT_OS_DARWIN */ +#else return UIExtraDataMetaDefs::MenuHelpActionType_About; -#endif /* !RT_OS_DARWIN */ +#endif } /** Returns action extra-data key. */ virtual QString extraDataKey() const { -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_About); -#else /* !RT_OS_DARWIN */ +#else return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_About); -#endif /* !RT_OS_DARWIN */ +#endif } /** Returns whether action is allowed. */ virtual bool isAllowed() const { -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_About); -#else /* !RT_OS_DARWIN */ +#else return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_About); -#endif /* !RT_OS_DARWIN */ - } - +#endif + } + + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -896,5 +992,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&About VirtualBox...")); @@ -903,4 +1000,6 @@ }; + +/** Simple action extension, used as 'Preferences' action class. */ class UIActionSimplePreferences : public UIActionSimple { @@ -909,4 +1008,5 @@ public: + /** Constructs action passing @a pParent to the base-class. */ UIActionSimplePreferences(UIActionPool *pParent) : UIActionSimple(pParent, ":/global_settings_16px.png") @@ -925,4 +1025,5 @@ virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); } + /** Returns shortcut extra-data ID. */ QString shortcutExtraDataID() const { @@ -930,4 +1031,5 @@ } + /** Returns default shortcut. */ QKeySequence defaultShortcut(UIActionPoolType) const { @@ -940,5 +1042,6 @@ } - void retranslateUi() + /** Handles translation event. */ + virtual void retranslateUi() /* override */ { setName(QApplication::translate("UIActionPool", "&Preferences...", "global preferences window")); @@ -948,9 +1051,13 @@ +/********************************************************************************************************************************* +* Class UIActionPool implementation. * +*********************************************************************************************************************************/ + /* static */ -UIActionPool* UIActionPool::create(UIActionPoolType type) +UIActionPool *UIActionPool::create(UIActionPoolType enmType) { UIActionPool *pActionPool = 0; - switch (type) + switch (enmType) { case UIActionPoolType_Selector: pActionPool = new UIActionPoolSelector; break; @@ -972,8 +1079,8 @@ /* static */ -void UIActionPool::createTemporary(UIActionPoolType type) +void UIActionPool::createTemporary(UIActionPoolType enmType) { UIActionPool *pActionPool = 0; - switch (type) + switch (enmType) { case UIActionPoolType_Selector: pActionPool = new UIActionPoolSelector(true); break; @@ -987,75 +1094,75 @@ } -UIActionPool::UIActionPool(UIActionPoolType type, bool fTemporary /* = false */) - : m_type(type) +UIActionPool::UIActionPool(UIActionPoolType enmType, bool fTemporary /* = false */) + : m_enmType(enmType) , m_fTemporary(fTemporary) { } -UIActionPoolRuntime* UIActionPool::toRuntime() +UIActionPoolRuntime *UIActionPool::toRuntime() { return qobject_cast(this); } -UIActionPoolSelector* UIActionPool::toSelector() +UIActionPoolSelector *UIActionPool::toSelector() { return qobject_cast(this); } -bool UIActionPool::isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType type) const -{ - foreach (const UIExtraDataMetaDefs::MenuType &restriction, m_restrictedMenus.values()) - if (restriction & type) +bool UIActionPool::isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType enmType) const +{ + foreach (const UIExtraDataMetaDefs::MenuType &enmRestriction, m_restrictedMenus.values()) + if (enmRestriction & enmType) return false; return true; } -void UIActionPool::setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuType restriction) -{ - m_restrictedMenus[level] = restriction; +void UIActionPool::setRestrictionForMenuBar(UIActionRestrictionLevel enmLevel, UIExtraDataMetaDefs::MenuType enmRestriction) +{ + m_restrictedMenus[enmLevel] = enmRestriction; updateMenus(); } -bool UIActionPool::isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType type) const -{ - foreach (const UIExtraDataMetaDefs::MenuApplicationActionType &restriction, m_restrictedActionsMenuApplication.values()) - if (restriction & type) +bool UIActionPool::isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType enmType) const +{ + foreach (const UIExtraDataMetaDefs::MenuApplicationActionType &enmRestriction, m_restrictedActionsMenuApplication.values()) + if (enmRestriction & enmType) return false; return true; } -void UIActionPool::setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction) -{ - m_restrictedActionsMenuApplication[level] = restriction; +void UIActionPool::setRestrictionForMenuApplication(UIActionRestrictionLevel enmLevel, UIExtraDataMetaDefs::MenuApplicationActionType enmRestriction) +{ + m_restrictedActionsMenuApplication[enmLevel] = enmRestriction; m_invalidations << UIActionIndex_M_Application; } #ifdef VBOX_WS_MAC -bool UIActionPool::isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType type) const -{ - foreach (const UIExtraDataMetaDefs::MenuWindowActionType &restriction, m_restrictedActionsMenuWindow.values()) - if (restriction & type) +bool UIActionPool::isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType enmType) const +{ + foreach (const UIExtraDataMetaDefs::MenuWindowActionType &enmRestriction, m_restrictedActionsMenuWindow.values()) + if (enmRestriction & enmType) return false; return true; } -void UIActionPool::setRestrictionForMenuWindow(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuWindowActionType restriction) -{ - m_restrictedActionsMenuWindow[level] = restriction; +void UIActionPool::setRestrictionForMenuWindow(UIActionRestrictionLevel enmLevel, UIExtraDataMetaDefs::MenuWindowActionType enmRestriction) +{ + m_restrictedActionsMenuWindow[enmLevel] = enmRestriction; m_invalidations << UIActionIndex_M_Window; } #endif /* VBOX_WS_MAC */ -bool UIActionPool::isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType type) const -{ - foreach (const UIExtraDataMetaDefs::MenuHelpActionType &restriction, m_restrictedActionsMenuHelp.values()) - if (restriction & type) +bool UIActionPool::isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType enmType) const +{ + foreach (const UIExtraDataMetaDefs::MenuHelpActionType &enmRestriction, m_restrictedActionsMenuHelp.values()) + if (enmRestriction & enmType) return false; return true; } -void UIActionPool::setRestrictionForMenuHelp(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuHelpActionType restriction) -{ - m_restrictedActionsMenuHelp[level] = restriction; +void UIActionPool::setRestrictionForMenuHelp(UIActionRestrictionLevel enmLevel, UIExtraDataMetaDefs::MenuHelpActionType enmRestriction) +{ + m_restrictedActionsMenuHelp[enmLevel] = enmRestriction; m_invalidations << UIActionIndex_Menu_Help; } @@ -1111,20 +1218,20 @@ /* Create 'Application' actions: */ m_pool[UIActionIndex_M_Application] = new UIActionMenuApplication(this); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC m_pool[UIActionIndex_M_Application_S_About] = new UIActionSimpleAbout(this); -#endif /* RT_OS_DARWIN */ +#endif m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this); #ifdef VBOX_GUI_WITH_NETWORK_MANAGER m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this); m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this); -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ +#endif m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this); m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* Create 'Window' actions: */ m_pool[UIActionIndex_M_Window] = new UIActionMenuWindow(this); m_pool[UIActionIndex_M_Window_S_Minimize] = new UIActionSimpleMinimize(this); -#endif /* RT_OS_DARWIN */ +#endif /* Create 'Help' actions: */ @@ -1135,13 +1242,13 @@ m_pool[UIActionIndex_Simple_Forums] = new UIActionSimpleForums(this); m_pool[UIActionIndex_Simple_Oracle] = new UIActionSimpleOracle(this); -#ifndef RT_OS_DARWIN +#ifndef VBOX_WS_MAC m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this); -#endif /* !RT_OS_DARWIN */ +#endif /* Prepare update-handlers for known menus: */ -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC m_menuUpdateHandlers[UIActionIndex_M_Application].ptf = &UIActionPool::updateMenuApplication; m_menuUpdateHandlers[UIActionIndex_M_Window].ptf = &UIActionPool::updateMenuWindow; -#endif /* RT_OS_DARWIN */ +#endif m_menuUpdateHandlers[UIActionIndex_Menu_Help].ptf = &UIActionPool::updateMenuHelp; @@ -1156,8 +1263,8 @@ { /* 'Application' menu connections: */ -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC connect(action(UIActionIndex_M_Application_S_About), &UIAction::triggered, &msgCenter(), &UIMessageCenter::sltShowHelpAboutDialog, Qt::UniqueConnection); -#endif /* RT_OS_DARWIN */ +#endif #ifdef VBOX_GUI_WITH_NETWORK_MANAGER connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered, @@ -1165,5 +1272,5 @@ connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered, gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection); -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ +#endif connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered, &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection); @@ -1180,8 +1287,8 @@ connect(action(UIActionIndex_Simple_Oracle), &UIAction::triggered, &msgCenter(), &UIMessageCenter::sltShowOracle, Qt::UniqueConnection); -#ifndef RT_OS_DARWIN +#ifndef VBOX_WS_MAC connect(action(UIActionIndex_Simple_About), &UIAction::triggered, &msgCenter(), &UIMessageCenter::sltShowHelpAboutDialog, Qt::UniqueConnection); -#endif /* !RT_OS_DARWIN */ +#endif } @@ -1265,11 +1372,11 @@ UIMenu *pMenu = action(UIActionIndex_M_Application)->menu(); AssertPtrReturnVoid(pMenu); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC AssertReturnVoid(pMenu->isConsumable()); -#endif /* RT_OS_DARWIN */ +#endif /* Clear contents: */ -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC if (!pMenu->isConsumed()) -#endif /* RT_OS_DARWIN */ +#endif pMenu->clear(); @@ -1277,13 +1384,13 @@ bool fSeparator = false; -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* 'About' action: */ fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_About)) || fSeparator; -#endif /* RT_OS_DARWIN */ +#endif /* 'Preferences' action: */ fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_Preferences)) || fSeparator; -#ifndef RT_OS_DARWIN +#ifndef VBOX_WS_MAC /* Separator: */ if (fSeparator) @@ -1292,14 +1399,14 @@ fSeparator = false; } -#endif /* !RT_OS_DARWIN */ +#endif #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* 'Network Manager' action: */ fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_NetworkAccessManager)) || fSeparator; -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ +#endif /* 'Reset Warnings' action: */ fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_ResetWarnings)) || fSeparator; -#ifndef RT_OS_DARWIN +#ifndef VBOX_WS_MAC /* Separator: */ if (fSeparator) @@ -1308,5 +1415,5 @@ fSeparator = false; } -#endif /* !RT_OS_DARWIN */ +#endif /* 'Close' action: */ @@ -1317,5 +1424,5 @@ } -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC void UIActionPool::updateMenuWindow() { @@ -1341,5 +1448,5 @@ /* This menu always remains invalid.. */ } -#endif /* RT_OS_DARWIN */ +#endif /* VBOX_WS_MAC */ void UIActionPool::updateMenuHelp() @@ -1372,8 +1479,8 @@ } -#ifndef RT_OS_DARWIN +#ifndef VBOX_WS_MAC /* 'About' action: */ fSeparator = addAction(pMenu, action(UIActionIndex_Simple_About)) || fSeparator;; -#endif /* !RT_OS_DARWIN */ +#endif /* Mark menu as valid: */ @@ -1415,10 +1522,10 @@ const bool fIsActionAllowed = pAction->isAllowed(); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* Check if menu is consumable: */ const bool fIsMenuConsumable = pMenu->isConsumable(); /* Check if menu is NOT yet consumed: */ const bool fIsMenuConsumed = pMenu->isConsumed(); -#endif /* RT_OS_DARWIN */ +#endif /* Make this action visible @@ -1426,5 +1533,5 @@ pAction->setVisible(fIsActionAllowed); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* If menu is consumable: */ if (fIsMenuConsumable) @@ -1436,5 +1543,5 @@ /* If menu is NOT consumable: */ else -#endif /* RT_OS_DARWIN */ +#endif { /* Add action only if is allowed: */ @@ -1455,20 +1562,20 @@ UIMenu *pMenu = pAction->menu(); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* Check if menu is consumable: */ const bool fIsMenuConsumable = pMenu->isConsumable(); /* Check if menu is NOT yet consumed: */ const bool fIsMenuConsumed = pMenu->isConsumed(); -#endif /* RT_OS_DARWIN */ +#endif /* Make this action visible * depending on clearance state. */ pAction->setVisible( fIsActionAllowed -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC && !fIsMenuConsumable -#endif /* RT_OS_DARWIN */ +#endif ); -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* If menu is consumable: */ if (fIsMenuConsumable) @@ -1480,5 +1587,5 @@ /* If menu is NOT consumable: */ else -#endif /* RT_OS_DARWIN */ +#endif { /* Add action only if is allowed: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 71581) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 71582) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2010-2017 Oracle Corporation + * Copyright (C) 2010-2018 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -28,4 +28,6 @@ /* Forward declarations: */ +class QKeySequence; +class QString; class UIActionPolymorphic; class UIActionPolymorphicMenu; @@ -57,7 +59,7 @@ /* 'Application' menu actions: */ UIActionIndex_M_Application, -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC UIActionIndex_M_Application_S_About, -#endif /* RT_OS_DARWIN */ +#endif UIActionIndex_M_Application_S_Preferences, #ifdef VBOX_GUI_WITH_NETWORK_MANAGER @@ -68,9 +70,9 @@ UIActionIndex_M_Application_S_Close, -#ifdef RT_OS_DARWIN +#ifdef VBOX_WS_MAC /* 'Window' menu actions: */ UIActionIndex_M_Window, UIActionIndex_M_Window_S_Minimize, -#endif /* RT_OS_DARWIN */ +#endif /* 'Help' menu actions: */ @@ -81,7 +83,7 @@ UIActionIndex_Simple_Forums, UIActionIndex_Simple_Oracle, -#ifndef RT_OS_DARWIN +#ifndef VBOX_WS_MAC UIActionIndex_Simple_About, -#endif /* !RT_OS_DARWIN */ +#endif /* Maximum index: */ @@ -105,5 +107,5 @@ public: - /** Constructor. */ + /** Constructs menu. */ UIMenu(); @@ -125,5 +127,5 @@ protected: - /** General event handler. */ + /** Handles any Qt @a pEvent. */ virtual bool event(QEvent *pEvent); @@ -150,19 +152,19 @@ /** Returns action type. */ - UIActionType type() const { return m_type; } + UIActionType type() const { return m_enmType; } /** Returns menu contained by this action. */ - UIMenu* menu() const; + UIMenu *menu() const; /** Returns action-pool this action belongs to. */ - UIActionPool* actionPool() const { return m_pActionPool; } + UIActionPool *actionPool() const { return m_pActionPool; } /** Casts action to polymorphic-action. */ - UIActionPolymorphic* toActionPolymorphic(); + UIActionPolymorphic *toActionPolymorphic(); /** Casts action to polymorphic-menu-action. */ - UIActionPolymorphicMenu* toActionPolymorphicMenu(); + UIActionPolymorphicMenu *toActionPolymorphicMenu(); /** Returns current action name. */ - const QString& name() const { return m_strName; } + const QString &name() const { return m_strName; } /** Defines current action name. */ void setName(const QString &strName); @@ -189,10 +191,11 @@ /** Retranslates action. */ virtual void retranslateUi() = 0; - virtual ~UIAction() { delete menu(); } - -protected: - - /** Constructor. */ - UIAction(UIActionPool *pParent, UIActionType type); + virtual ~UIAction() /* override */ { delete menu(); } + +protected: + + /** Constructs action passing @a pParent to the base-class. + * @param enmType Brings the action type. */ + UIAction(UIActionPool *pParent, UIActionType enmType); /** Returns current action name in menu. */ @@ -205,17 +208,17 @@ /** Holds the action type. */ - UIActionType m_type; + UIActionType m_enmType; /** Holds the reference to the action-pool this action belongs to. */ - UIActionPool *m_pActionPool; + UIActionPool *m_pActionPool; /** Holds the type of the action-pool this action belongs to. */ - UIActionPoolType m_actionPoolType; + UIActionPoolType m_enmActionPoolType; /** Holds the action name. */ - QString m_strName; + QString m_strName; /** Holds the action shortcut. */ - QKeySequence m_shortcut; + QKeySequence m_shortcut; /** Holds whether action shortcut hidden. */ - bool m_fShortcutHidden; + bool m_fShortcutHidden; }; @@ -228,8 +231,12 @@ protected: - /** Constructor, taking normal icon name and name for disabled analog. */ + /** Constructs menu action passing @a pParent to the base-class. + * @param strIcon Brings the normal-icon name. + * @param strIconDisabled Brings the disabled-icon name. */ UIActionMenu(UIActionPool *pParent, - const QString &strIcon = QString(), const QString &strIconDis = QString()); - /** Constructor, taking copy of existing icon. */ + const QString &strIcon = QString(), + const QString &strIconDisabled = QString()); + /** Constructs menu action passing @a pParent to the base-class. + * @param icon Brings the icon. */ UIActionMenu(UIActionPool *pParent, const QIcon &icon); @@ -255,12 +262,20 @@ protected: - /** Constructor, taking normal icon name and name for disabled analog. */ + /** Constructs simple action passing @a pParent to the base-class. + * @param strIcon Brings the normal-icon name. + * @param strIconDisabled Brings the disabled-icon name. */ UIActionSimple(UIActionPool *pParent, - const QString &strIcon = QString(), const QString &strIconDisabled = QString()); - /** Constructor, taking normal, small icon names and names for disabled analogs. */ + const QString &strIcon = QString(), + const QString &strIconDisabled = QString()); + /** Constructs simple action passing @a pParent to the base-class. + * @param strIconNormal Brings the normal-icon name. + * @param strIconSmall Brings the small-icon name. + * @param strIconNormalDisabled Brings the normal-disabled-icon name. + * @param strIconSmallDisabled Brings the small-disabled-icon name. */ UIActionSimple(UIActionPool *pParent, const QString &strIconNormal, const QString &strIconSmall, const QString &strIconNormalDisabled, const QString &strIconSmallDisabled); - /** Constructor, taking copy of existing icon. */ + /** Constructs simple action passing @a pParent to the base-class. + * @param icon Brings the icon. */ UIActionSimple(UIActionPool *pParent, const QIcon& icon); @@ -275,12 +290,19 @@ protected: - /** Constructor, taking normal icon name and name for disabled analog. */ + /** Constructs toggle action passing @a pParent to the base-class. + * @param strIcon Brings the normal-icon name. + * @param strIconDisabled Brings the disabled-icon name. */ UIActionToggle(UIActionPool *pParent, const QString &strIcon = QString(), const QString &strIconDisabled = QString()); - /** Constructor, taking normal on/off icon names and names for disabled analogs. */ + /** Constructs toggle action passing @a pParent to the base-class. + * @param strIconOn Brings the on-icon name. + * @param strIconOff Brings the off-icon name. + * @param strIconOnDisabled Brings the on-disabled-icon name. + * @param strIconOffDisabled Brings the off-disabled-icon name. */ UIActionToggle(UIActionPool *pParent, const QString &strIconOn, const QString &strIconOff, const QString &strIconOnDisabled, const QString &strIconOffDisabled); - /** Constructor, taking copy of existing icon. */ + /** Constructs toggle action passing @a pParent to the base-class. + * @param icon Brings the icon. */ UIActionToggle(UIActionPool *pParent, const QIcon &icon); @@ -307,14 +329,21 @@ protected: - /** Constructor, taking normal icon name and name for disabled analog. */ + /** Constructs polymorphic action passing @a pParent to the base-class. + * @param strIcon Brings the normal-icon name. + * @param strIconDisabled Brings the disabled-icon name. */ UIActionPolymorphic(UIActionPool *pParent, - const QString &strIcon = QString(), const QString &strIconDisabled = QString()); - /** Constructor, taking normal, small icon names and names for disabled analogs. */ + const QString &strIcon = QString(), const QString &strIconDisabled = QString()); + /** Constructs polymorphic action passing @a pParent to the base-class. + * @param strIconNormal Brings the normal-icon name. + * @param strIconSmall Brings the small-icon name. + * @param strIconNormalDisabled Brings the normal-disabled-icon name. + * @param strIconSmallDisabled Brings the small-disabled-icon name. */ UIActionPolymorphic(UIActionPool *pParent, - const QString &strIconNormal, const QString &strIconSmall, - const QString &strIconNormalDisabled, const QString &strIconSmallDisabled); - /** Constructor, taking copy of existing icon. */ + const QString &strIconNormal, const QString &strIconSmall, + const QString &strIconNormalDisabled, const QString &strIconSmallDisabled); + /** Constructs polymorphic action passing @a pParent to the base-class. + * @param icon Brings the icon. */ UIActionPolymorphic(UIActionPool *pParent, - const QIcon& icon); + const QIcon& icon); private: @@ -339,16 +368,23 @@ protected: - /** Constructor, taking normal icon name and name for disabled analog. */ + /** Constructs polymorphic menu action passing @a pParent to the base-class. + * @param strIcon Brings the normal-icon name. + * @param strIconDisabled Brings the disabled-icon name. */ UIActionPolymorphicMenu(UIActionPool *pParent, - const QString &strIcon = QString(), const QString &strIconDis = QString()); - /** Constructor, taking normal, small icon names and names for disabled analogs. */ + const QString &strIcon = QString(), const QString &strIconDisabled = QString()); + /** Constructs polymorphic menu action passing @a pParent to the base-class. + * @param strIconNormal Brings the normal-icon name. + * @param strIconSmall Brings the small-icon name. + * @param strIconNormalDisabled Brings the normal-disabled-icon name. + * @param strIconSmallDisabled Brings the small-disabled-icon name. */ UIActionPolymorphicMenu(UIActionPool *pParent, const QString &strIconNormal, const QString &strIconSmall, const QString &strIconNormalDisabled, const QString &strIconSmallDisabled); - /** Constructor, taking copy of existing icon. */ + /** Constructs polymorphic menu action passing @a pParent to the base-class. + * @param icon Brings the icon. */ UIActionPolymorphicMenu(UIActionPool *pParent, const QIcon &icon); - /** Destructor. */ + /** Destructs polymorphic menu action. */ ~UIActionPolymorphicMenu(); @@ -374,5 +410,5 @@ UIMenu *m_pMenu; /** Holds current action state. */ - int m_iState; + int m_iState; }; @@ -403,27 +439,27 @@ /** Notifies about @a pAction hovered. */ void sigActionHovered(UIAction *pAction); -#endif /* VBOX_WS_MAC */ +#endif public: - /** Static factory constructor. */ - static UIActionPool* create(UIActionPoolType type); - /** Static factory destructor. */ + /** Creates singleton instance. */ + static UIActionPool *create(UIActionPoolType enmType); + /** Destroys singleton instance. */ static void destroy(UIActionPool *pActionPool); - /** Static factory constructor (temporary), - * used to initialize shortcuts-pool from action-pool of passed @a type. */ - static void createTemporary(UIActionPoolType type); + /** Creates temporary singleton instance, + * used to initialize shortcuts-pool from action-pool of passed @a enmType. */ + static void createTemporary(UIActionPoolType enmType); /** Cast action-pool to Runtime one. */ - UIActionPoolRuntime* toRuntime(); + UIActionPoolRuntime *toRuntime(); /** Cast action-pool to Selector one. */ - UIActionPoolSelector* toSelector(); + UIActionPoolSelector *toSelector(); /** Returns action-pool type. */ - UIActionPoolType type() const { return m_type; } + UIActionPoolType type() const { return m_enmType; } /** Returns the action for the passed @a iIndex. */ - UIAction* action(int iIndex) const { return m_pool.value(iIndex); } + UIAction *action(int iIndex) const { return m_pool.value(iIndex); } /** Returns all the actions action-pool contains. */ QList actions() const { return m_pool.values(); } @@ -431,23 +467,23 @@ /** Returns whether the menu with passed @a type is allowed in menu-bar. */ bool isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType type) const; - /** Defines menu-bar @a restriction for passed @a level. */ - void setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuType restriction); + /** Defines menu-bar @a enmRestriction for passed @a level. */ + void setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuType enmRestriction); /** Returns whether the action with passed @a type is allowed in the 'Application' menu. */ bool isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType type) const; - /** Defines 'Application' menu @a restriction for passed @a level. */ - void setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction); + /** Defines 'Application' menu @a enmRestriction for passed @a level. */ + void setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType enmRestriction); #ifdef VBOX_WS_MAC /** Mac OS X: Returns whether the action with passed @a type is allowed in the 'Window' menu. */ bool isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType type) const; - /** Mac OS X: Defines 'Window' menu @a restriction for passed @a level. */ - void setRestrictionForMenuWindow(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuWindowActionType restriction); + /** Mac OS X: Defines 'Window' menu @a enmRestriction for passed @a level. */ + void setRestrictionForMenuWindow(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuWindowActionType enmRestriction); #endif /* VBOX_WS_MAC */ /** Returns whether the action with passed @a type is allowed in the 'Help' menu. */ - bool isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType type) const; - /** Defines 'Help' menu @a restriction for passed @a level. */ - void setRestrictionForMenuHelp(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuHelpActionType restriction); + bool isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType enmType) const; + /** Defines 'Help' menu @a enmRestriction for passed @a level. */ + void setRestrictionForMenuHelp(UIActionRestrictionLevel enmLevel, UIExtraDataMetaDefs::MenuHelpActionType enmRestriction); /** Hot-key processing delegate. */ @@ -477,44 +513,44 @@ protected: - /** Constructor of the action-pool of passed @a type. */ - UIActionPool(UIActionPoolType type, bool fTemporary = false); - - /** Prepare routine. */ + /** Constructs probably @a fTemporary action-pool of passed @a enmType. */ + UIActionPool(UIActionPoolType enmType, bool fTemporary = false); + + /** Prepares all. */ void prepare(); - /** Prepare pool routine. */ + /** Prepares pool. */ virtual void preparePool(); - /** Prepare connections routine. */ + /** Prepares connections. */ virtual void prepareConnections(); - /** Cleanup connections routine. */ + /** Cleanups connections. */ virtual void cleanupConnections() {} - /** Cleanup pool routine. */ + /** Cleanups pool. */ virtual void cleanupPool(); - /** Cleanup routine. */ + /** Cleanups all. */ void cleanup(); - /** Update configuration routine. */ + /** Updates configuration. */ virtual void updateConfiguration(); - /** Update menu routine. */ + /** Updates menu with certain @a iIndex. */ virtual void updateMenu(int iIndex); - /** Update menus routine. */ + /** Updates menus. */ virtual void updateMenus() = 0; - /** Update 'Application' menu routine. */ + /** Updates 'Application' menu. */ virtual void updateMenuApplication(); -#ifdef RT_OS_DARWIN - /** Mac OS X: Update 'Window' menu routine. */ +#ifdef VBOX_WS_MAC + /** Mac OS X: Updates 'Window' menu. */ virtual void updateMenuWindow(); -#endif /* RT_OS_DARWIN */ - /** Update 'Help' menu routine. */ +#endif + /** Updates 'Help' menu. */ virtual void updateMenuHelp(); - /** Update shortcuts. */ + /** Updates shortcuts. */ virtual void updateShortcuts(); - /** Translation handler. */ - virtual void retranslateUi(); - - /** General event handler. */ - virtual bool event(QEvent *pEvent); + /** Hadles translation event. */ + virtual void retranslateUi() /* override */; + + /** Handles any Qt @a pEvent */ + virtual bool event(QEvent *pEvent) /* override */; /** Adds action into corresponding menu. */ @@ -524,26 +560,28 @@ /** Holds the action-pool type. */ - const UIActionPoolType m_type; + const UIActionPoolType m_enmType; /** Holds whether this action-pool is temporary. */ - const bool m_fTemporary; + const bool m_fTemporary; /** Holds the map of actions. */ - QMap m_pool; + QMap m_pool; /** Holds the map of validation handlers. */ - QMap m_menuUpdateHandlers; + QMap m_menuUpdateHandlers; /** Holds the set of invalidated action indexes. */ - QSet m_invalidations; + QSet m_invalidations; /** Holds restricted menu types. */ - QMap m_restrictedMenus; + QMap m_restrictedMenus; /** Holds restricted action types of the 'Application' menu. */ - QMap m_restrictedActionsMenuApplication; + QMap m_restrictedActionsMenuApplication; #ifdef VBOX_WS_MAC /** Mac OS X: Holds restricted action types of the 'Window' menu. */ - QMap m_restrictedActionsMenuWindow; -#endif /* VBOX_WS_MAC */ + QMap m_restrictedActionsMenuWindow; +#endif /** Holds restricted action types of the Help menu. */ - QMap m_restrictedActionsMenuHelp; -}; + QMap m_restrictedActionsMenuHelp; +}; + #endif /* !___UIActionPool_h___ */ +