Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 52583) @@ -70,9 +70,9 @@ template<> bool canConvert(); template<> bool canConvert(); -template<> bool canConvert(); +template<> bool canConvert(); #ifdef Q_WS_MAC template<> bool canConvert(); #endif /* Q_WS_MAC */ -template<> bool canConvert(); +template<> bool canConvert(); template<> bool canConvert(); template<> bool canConvert(); @@ -123,12 +123,12 @@ template<> QString toString(const StorageSlot &storageSlot); template<> StorageSlot fromString(const QString &strStorageSlot); -template<> QString toInternalString(const UIExtraDataMetaDefs::MenuHelpActionType &menuHelpActionType); -template<> UIExtraDataMetaDefs::MenuHelpActionType fromInternalString(const QString &strMenuHelpActionType); +template<> QString toInternalString(const UIExtraDataMetaDefs::MenuType &menuType); +template<> UIExtraDataMetaDefs::MenuType fromInternalString(const QString &strMenuType); #ifdef Q_WS_MAC template<> QString toInternalString(const UIExtraDataMetaDefs::MenuApplicationActionType &runtimeMenuApplicationActionType); template<> UIExtraDataMetaDefs::MenuApplicationActionType fromInternalString(const QString &strRuntimeMenuApplicationActionType); #endif /* Q_WS_MAC */ -template<> QString toInternalString(const UIExtraDataMetaDefs::RuntimeMenuType &runtimeMenuType); -template<> UIExtraDataMetaDefs::RuntimeMenuType fromInternalString(const QString &strRuntimeMenuType); +template<> QString toInternalString(const UIExtraDataMetaDefs::MenuHelpActionType &menuHelpActionType); +template<> UIExtraDataMetaDefs::MenuHelpActionType fromInternalString(const QString &strMenuHelpActionType); template<> QString toInternalString(const UIExtraDataMetaDefs::RuntimeMenuMachineActionType &runtimeMenuMachineActionType); template<> UIExtraDataMetaDefs::RuntimeMenuMachineActionType fromInternalString(const QString &strRuntimeMenuMachineActionType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 52583) @@ -34,9 +34,9 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } -template<> bool canConvert() { return true; } +template<> bool canConvert() { return true; } #ifdef Q_WS_MAC template<> bool canConvert() { return true; } #endif /* Q_WS_MAC */ -template<> bool canConvert() { return true; } +template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } @@ -357,4 +357,92 @@ } +/* QString <= UIExtraDataMetaDefs::MenuType: */ +template<> QString toInternalString(const UIExtraDataMetaDefs::MenuType &menuType) +{ + QString strResult; + switch (menuType) + { +#ifdef RT_OS_DARWIN + case UIExtraDataMetaDefs::MenuType_Application: strResult = "Application"; break; +#endif /* RT_OS_DARWIN */ + case UIExtraDataMetaDefs::MenuType_Machine: strResult = "Machine"; break; + case UIExtraDataMetaDefs::MenuType_View: strResult = "View"; break; + case UIExtraDataMetaDefs::MenuType_Devices: strResult = "Devices"; break; +#ifdef VBOX_WITH_DEBUGGER_GUI + case UIExtraDataMetaDefs::MenuType_Debug: strResult = "Debug"; break; +#endif /* VBOX_WITH_DEBUGGER_GUI */ + case UIExtraDataMetaDefs::MenuType_Help: strResult = "Help"; break; + case UIExtraDataMetaDefs::MenuType_All: strResult = "All"; break; + default: + { + AssertMsgFailed(("No text for indicator type=%d", menuType)); + break; + } + } + return strResult; +} + +/* UIExtraDataMetaDefs::MenuType <= QString: */ +template<> UIExtraDataMetaDefs::MenuType fromInternalString(const QString &strMenuType) +{ + /* Here we have some fancy stuff allowing us + * to search through the keys using 'case-insensitive' rule: */ + QStringList keys; QList values; +#ifdef RT_OS_DARWIN + keys << "Application"; values << UIExtraDataMetaDefs::MenuType_Application; +#endif /* RT_OS_DARWIN */ + keys << "Machine"; values << UIExtraDataMetaDefs::MenuType_Machine; + keys << "View"; values << UIExtraDataMetaDefs::MenuType_View; + keys << "Devices"; values << UIExtraDataMetaDefs::MenuType_Devices; +#ifdef VBOX_WITH_DEBUGGER_GUI + keys << "Debug"; values << UIExtraDataMetaDefs::MenuType_Debug; +#endif /* VBOX_WITH_DEBUGGER_GUI */ + keys << "Help"; values << UIExtraDataMetaDefs::MenuType_Help; + keys << "All"; values << UIExtraDataMetaDefs::MenuType_All; + /* Invalid type for unknown words: */ + if (!keys.contains(strMenuType, Qt::CaseInsensitive)) + return UIExtraDataMetaDefs::MenuType_Invalid; + /* Corresponding type for known words: */ + return values.at(keys.indexOf(QRegExp(strMenuType, Qt::CaseInsensitive))); +} + +#ifdef Q_WS_MAC +/* QString <= UIExtraDataMetaDefs::MenuApplicationActionType: */ +template<> QString toInternalString(const UIExtraDataMetaDefs::MenuApplicationActionType &runtimeMenuApplicationActionType) +{ + QString strResult; + switch (runtimeMenuApplicationActionType) + { + case UIExtraDataMetaDefs::MenuApplicationActionType_About: strResult = "About"; break; + case UIExtraDataMetaDefs::MenuApplicationActionType_Preferences: strResult = "Preferences"; break; + case UIExtraDataMetaDefs::MenuApplicationActionType_Close: strResult = "Close"; break; + case UIExtraDataMetaDefs::MenuApplicationActionType_All: strResult = "All"; break; + default: + { + AssertMsgFailed(("No text for action type=%d", runtimeMenuApplicationActionType)); + break; + } + } + return strResult; +} + +/* UIExtraDataMetaDefs::MenuApplicationActionType <= QString: */ +template<> UIExtraDataMetaDefs::MenuApplicationActionType fromInternalString(const QString &strRuntimeMenuApplicationActionType) +{ + /* Here we have some fancy stuff allowing us + * to search through the keys using 'case-insensitive' rule: */ + QStringList keys; QList values; + keys << "About"; values << UIExtraDataMetaDefs::MenuApplicationActionType_About; + keys << "Preferences"; values << UIExtraDataMetaDefs::MenuApplicationActionType_Preferences; + keys << "Close"; values << UIExtraDataMetaDefs::MenuApplicationActionType_Close; + keys << "All"; values << UIExtraDataMetaDefs::MenuApplicationActionType_All; + /* Invalid type for unknown words: */ + if (!keys.contains(strRuntimeMenuApplicationActionType, Qt::CaseInsensitive)) + return UIExtraDataMetaDefs::MenuApplicationActionType_Invalid; + /* Corresponding type for known words: */ + return values.at(keys.indexOf(QRegExp(strRuntimeMenuApplicationActionType, Qt::CaseInsensitive))); +} +#endif /* Q_WS_MAC */ + /* QString <= UIExtraDataMetaDefs::MenuHelpActionType: */ template<> QString toInternalString(const UIExtraDataMetaDefs::MenuHelpActionType &menuHelpActionType) @@ -407,92 +495,4 @@ /* Corresponding type for known words: */ return values.at(keys.indexOf(QRegExp(strMenuHelpActionType, Qt::CaseInsensitive))); -} - -#ifdef Q_WS_MAC -/* QString <= UIExtraDataMetaDefs::MenuApplicationActionType: */ -template<> QString toInternalString(const UIExtraDataMetaDefs::MenuApplicationActionType &runtimeMenuApplicationActionType) -{ - QString strResult; - switch (runtimeMenuApplicationActionType) - { - case UIExtraDataMetaDefs::MenuApplicationActionType_About: strResult = "About"; break; - case UIExtraDataMetaDefs::MenuApplicationActionType_Preferences: strResult = "Preferences"; break; - case UIExtraDataMetaDefs::MenuApplicationActionType_Close: strResult = "Close"; break; - case UIExtraDataMetaDefs::MenuApplicationActionType_All: strResult = "All"; break; - default: - { - AssertMsgFailed(("No text for action type=%d", runtimeMenuApplicationActionType)); - break; - } - } - return strResult; -} - -/* UIExtraDataMetaDefs::MenuApplicationActionType <= QString: */ -template<> UIExtraDataMetaDefs::MenuApplicationActionType fromInternalString(const QString &strRuntimeMenuApplicationActionType) -{ - /* Here we have some fancy stuff allowing us - * to search through the keys using 'case-insensitive' rule: */ - QStringList keys; QList values; - keys << "About"; values << UIExtraDataMetaDefs::MenuApplicationActionType_About; - keys << "Preferences"; values << UIExtraDataMetaDefs::MenuApplicationActionType_Preferences; - keys << "Close"; values << UIExtraDataMetaDefs::MenuApplicationActionType_Close; - keys << "All"; values << UIExtraDataMetaDefs::MenuApplicationActionType_All; - /* Invalid type for unknown words: */ - if (!keys.contains(strRuntimeMenuApplicationActionType, Qt::CaseInsensitive)) - return UIExtraDataMetaDefs::MenuApplicationActionType_Invalid; - /* Corresponding type for known words: */ - return values.at(keys.indexOf(QRegExp(strRuntimeMenuApplicationActionType, Qt::CaseInsensitive))); -} -#endif /* Q_WS_MAC */ - -/* QString <= UIExtraDataMetaDefs::RuntimeMenuType: */ -template<> QString toInternalString(const UIExtraDataMetaDefs::RuntimeMenuType &runtimeMenuType) -{ - QString strResult; - switch (runtimeMenuType) - { -#ifdef RT_OS_DARWIN - case UIExtraDataMetaDefs::RuntimeMenuType_Application: strResult = "Application"; break; -#endif /* RT_OS_DARWIN */ - case UIExtraDataMetaDefs::RuntimeMenuType_Machine: strResult = "Machine"; break; - case UIExtraDataMetaDefs::RuntimeMenuType_View: strResult = "View"; break; - case UIExtraDataMetaDefs::RuntimeMenuType_Devices: strResult = "Devices"; break; -#ifdef VBOX_WITH_DEBUGGER_GUI - case UIExtraDataMetaDefs::RuntimeMenuType_Debug: strResult = "Debug"; break; -#endif /* VBOX_WITH_DEBUGGER_GUI */ - case UIExtraDataMetaDefs::RuntimeMenuType_Help: strResult = "Help"; break; - case UIExtraDataMetaDefs::RuntimeMenuType_All: strResult = "All"; break; - default: - { - AssertMsgFailed(("No text for indicator type=%d", runtimeMenuType)); - break; - } - } - return strResult; -} - -/* UIExtraDataMetaDefs::RuntimeMenuType <= QString: */ -template<> UIExtraDataMetaDefs::RuntimeMenuType fromInternalString(const QString &strRuntimeMenuType) -{ - /* Here we have some fancy stuff allowing us - * to search through the keys using 'case-insensitive' rule: */ - QStringList keys; QList values; -#ifdef RT_OS_DARWIN - keys << "Application"; values << UIExtraDataMetaDefs::RuntimeMenuType_Application; -#endif /* RT_OS_DARWIN */ - keys << "Machine"; values << UIExtraDataMetaDefs::RuntimeMenuType_Machine; - keys << "View"; values << UIExtraDataMetaDefs::RuntimeMenuType_View; - keys << "Devices"; values << UIExtraDataMetaDefs::RuntimeMenuType_Devices; -#ifdef VBOX_WITH_DEBUGGER_GUI - keys << "Debug"; values << UIExtraDataMetaDefs::RuntimeMenuType_Debug; -#endif /* VBOX_WITH_DEBUGGER_GUI */ - keys << "Help"; values << UIExtraDataMetaDefs::RuntimeMenuType_Help; - keys << "All"; values << UIExtraDataMetaDefs::RuntimeMenuType_All; - /* Invalid type for unknown words: */ - if (!keys.contains(strRuntimeMenuType, Qt::CaseInsensitive)) - return UIExtraDataMetaDefs::RuntimeMenuType_Invalid; - /* Corresponding type for known words: */ - return values.at(keys.indexOf(QRegExp(strRuntimeMenuType, Qt::CaseInsensitive))); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 52583) @@ -268,9 +268,9 @@ { Q_OBJECT; - Q_ENUMS(MenuHelpActionType); + Q_ENUMS(MenuType); #ifdef RT_OS_DARWIN Q_ENUMS(MenuApplicationActionType); #endif /* RT_OS_DARWIN */ - Q_ENUMS(RuntimeMenuType); + Q_ENUMS(MenuHelpActionType); Q_ENUMS(RuntimeMenuMachineActionType); Q_ENUMS(RuntimeMenuViewActionType); @@ -281,4 +281,33 @@ public: + + /** Common UI: Menu types. */ + enum MenuType + { + MenuType_Invalid = 0, +#ifdef RT_OS_DARWIN + MenuType_Application = RT_BIT(0), +#endif /* RT_OS_DARWIN */ + MenuType_Machine = RT_BIT(1), + MenuType_View = RT_BIT(2), + MenuType_Devices = RT_BIT(3), +#ifdef VBOX_WITH_DEBUGGER_GUI + MenuType_Debug = RT_BIT(4), +#endif /* VBOX_WITH_DEBUGGER_GUI */ + MenuType_Help = RT_BIT(5), + MenuType_All = 0xFF + }; + +#ifdef RT_OS_DARWIN + /** Menu "Application": Action types. */ + enum MenuApplicationActionType + { + MenuApplicationActionType_Invalid = 0, + MenuApplicationActionType_About = RT_BIT(0), + MenuApplicationActionType_Preferences = RT_BIT(1), + MenuApplicationActionType_Close = RT_BIT(2), + MenuApplicationActionType_All = 0xFFFF + }; +#endif /* RT_OS_DARWIN */ /** Menu "Help": Action types. */ @@ -298,33 +327,4 @@ #endif /* !RT_OS_DARWIN */ MenuHelpActionType_All = 0xFFFF - }; - -#ifdef RT_OS_DARWIN - /** Menu "Application": Action types. */ - enum MenuApplicationActionType - { - MenuApplicationActionType_Invalid = 0, - MenuApplicationActionType_About = RT_BIT(0), - MenuApplicationActionType_Preferences = RT_BIT(1), - MenuApplicationActionType_Close = RT_BIT(2), - MenuApplicationActionType_All = 0xFFFF - }; -#endif /* RT_OS_DARWIN */ - - /** Runtime UI: Menu types. */ - enum RuntimeMenuType - { - RuntimeMenuType_Invalid = 0, -#ifdef RT_OS_DARWIN - RuntimeMenuType_Application = RT_BIT(0), -#endif /* RT_OS_DARWIN */ - RuntimeMenuType_Machine = RT_BIT(1), - RuntimeMenuType_View = RT_BIT(2), - RuntimeMenuType_Devices = RT_BIT(3), -#ifdef VBOX_WITH_DEBUGGER_GUI - RuntimeMenuType_Debug = RT_BIT(4), -#endif /* VBOX_WITH_DEBUGGER_GUI */ - RuntimeMenuType_Help = RT_BIT(5), - RuntimeMenuType_All = 0xFF }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 52583) @@ -2489,14 +2489,14 @@ } -UIExtraDataMetaDefs::RuntimeMenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QString &strID) +UIExtraDataMetaDefs::MenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QString &strID) { /* Prepare result: */ - UIExtraDataMetaDefs::RuntimeMenuType result = UIExtraDataMetaDefs::RuntimeMenuType_Invalid; + UIExtraDataMetaDefs::MenuType result = UIExtraDataMetaDefs::MenuType_Invalid; /* Get restricted runtime-menu-types: */ foreach (const QString &strValue, extraDataStringList(GUI_RestrictedRuntimeMenus, strID)) { - UIExtraDataMetaDefs::RuntimeMenuType value = gpConverter->fromInternalString(strValue); - if (value != UIExtraDataMetaDefs::RuntimeMenuType_Invalid) - result = static_cast(result | value); + UIExtraDataMetaDefs::MenuType value = gpConverter->fromInternalString(strValue); + if (value != UIExtraDataMetaDefs::MenuType_Invalid) + result = static_cast(result | value); } /* Return result: */ @@ -2504,15 +2504,15 @@ } -void UIExtraDataManager::setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::RuntimeMenuType types, const QString &strID) -{ - /* We have RuntimeMenuType enum registered, so we can enumerate it: */ +void UIExtraDataManager::setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QString &strID) +{ + /* We have MenuType enum registered, so we can enumerate it: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; - const int iEnumIndex = smo.indexOfEnumerator("RuntimeMenuType"); + const int iEnumIndex = smo.indexOfEnumerator("MenuType"); QMetaEnum metaEnum = smo.enumerator(iEnumIndex); /* Prepare result: */ QStringList result; - /* Handle RuntimeMenuType_All enum-value: */ - if (types == UIExtraDataMetaDefs::RuntimeMenuType_All) + /* Handle MenuType_All enum-value: */ + if (types == UIExtraDataMetaDefs::MenuType_All) result << gpConverter->toInternalString(types); else @@ -2522,9 +2522,9 @@ { /* Get iterated enum-value: */ - const UIExtraDataMetaDefs::RuntimeMenuType enumValue = - static_cast(metaEnum.keyToValue(metaEnum.key(iKeyIndex))); - /* Skip RuntimeMenuType_Invalid & RuntimeMenuType_All enum-values: */ - if (enumValue == UIExtraDataMetaDefs::RuntimeMenuType_Invalid || - enumValue == UIExtraDataMetaDefs::RuntimeMenuType_All) + const UIExtraDataMetaDefs::MenuType enumValue = + static_cast(metaEnum.keyToValue(metaEnum.key(iKeyIndex))); + /* Skip MenuType_Invalid & MenuType_All enum-values: */ + if (enumValue == UIExtraDataMetaDefs::MenuType_Invalid || + enumValue == UIExtraDataMetaDefs::MenuType_All) continue; if (types & enumValue) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 52583) @@ -287,7 +287,7 @@ /** Returns restricted Runtime UI menu types. */ - UIExtraDataMetaDefs::RuntimeMenuType restrictedRuntimeMenuTypes(const QString &strID); + UIExtraDataMetaDefs::MenuType restrictedRuntimeMenuTypes(const QString &strID); /** Defines restricted Runtime UI menu types. */ - void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::RuntimeMenuType types, const QString &strID); + void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QString &strID); #ifdef Q_WS_MAC Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 52583) @@ -326,7 +326,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Application; } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Application; } /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Application); } + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Application); } void retranslateUi() @@ -388,7 +388,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Help; } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Help; } /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Help); } + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Help); } void retranslateUi() @@ -724,4 +724,34 @@ } +bool UIActionPool::isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType type) const +{ + foreach (const UIExtraDataMetaDefs::MenuType &restriction, m_restrictedMenus.values()) + if (restriction & type) + return false; + return true; +} + +void UIActionPool::setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuType restriction) +{ + m_restrictedMenus[level] = restriction; + updateMenus(); +} + +#ifdef Q_WS_MAC +bool UIActionPool::isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType type) const +{ + foreach (const UIExtraDataMetaDefs::MenuApplicationActionType &restriction, m_restrictedActionsMenuApplication.values()) + if (restriction & type) + return false; + return true; +} + +void UIActionPool::setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction) +{ + m_restrictedActionsMenuApplication[level] = restriction; + m_invalidations << UIActionIndex_M_Application; +} +#endif /* Q_WS_MAC */ + bool UIActionPool::isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType type) const { @@ -737,20 +767,4 @@ m_invalidations << UIActionIndex_Menu_Help; } - -#ifdef Q_WS_MAC -bool UIActionPool::isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType type) const -{ - foreach (const UIExtraDataMetaDefs::MenuApplicationActionType &restriction, m_restrictedActionsMenuApplication.values()) - if (restriction & type) - return false; - return true; -} - -void UIActionPool::setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction) -{ - m_restrictedActionsMenuApplication[level] = restriction; - m_invalidations << UIActionIndex_M_Application; -} -#endif /* Q_WS_MAC */ void UIActionPool::sltHandleMenuPrepare() Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 52583) @@ -355,8 +355,8 @@ QList actions() const { return m_pool.values(); } - /** 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); + /** 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); #ifdef Q_WS_MAC @@ -366,4 +366,9 @@ void setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction); #endif /* Q_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); /** Hot-key processing delegate. */ @@ -437,10 +442,12 @@ QSet m_invalidations; - /** Holds restricted action types of the Help menu. */ - QMap m_restrictedActionsMenuHelp; + /** Holds restricted menu types. */ + QMap m_restrictedMenus; #ifdef Q_WS_MAC /** Holds restricted action types of the Application menu. */ QMap m_restrictedActionsMenuApplication; #endif /* Q_WS_MAC */ + /** Holds restricted action types of the Help menu. */ + QMap m_restrictedActionsMenuHelp; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 52583) @@ -46,7 +46,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Machine; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Machine); } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Machine; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Machine); } void retranslateUi() @@ -574,7 +574,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_View; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_View); } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_View; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_View); } void retranslateUi() @@ -596,7 +596,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_View; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_View); } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_View; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_View); } void retranslateUi() {} @@ -917,7 +917,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Devices; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Devices); } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Devices; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Devices); } void retranslateUi() @@ -1408,7 +1408,7 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Debug; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Debug); } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Debug; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Debug); } void retranslateUi() @@ -1643,18 +1643,4 @@ /* Invalidate View menu: */ m_invalidations << UIActionIndexRT_M_View; -} - -bool UIActionPoolRuntime::isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType type) const -{ - foreach (const UIExtraDataMetaDefs::RuntimeMenuType &restriction, m_restrictedMenus.values()) - if (restriction & type) - return false; - return true; -} - -void UIActionPoolRuntime::setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::RuntimeMenuType restriction) -{ - m_restrictedMenus[level] = restriction; - updateMenus(); } @@ -2009,5 +1995,5 @@ /* 'Machine' menu: */ - const bool fAllowToShowMenuMachine = isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType_Machine); + const bool fAllowToShowMenuMachine = isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Machine); action(UIActionIndexRT_M_Machine)->setVisible(fAllowToShowMenuMachine); if (fAllowToShowMenuMachine) @@ -2016,5 +2002,5 @@ /* 'View' menu: */ - const bool fAllowToShowMenuView = isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType_View); + const bool fAllowToShowMenuView = isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_View); action(UIActionIndexRT_M_View)->setVisible(fAllowToShowMenuView); action(UIActionIndexRT_M_ViewPopup)->setVisible(fAllowToShowMenuView); @@ -2025,5 +2011,5 @@ /* 'Devices' menu: */ - const bool fAllowToShowMenuDevices = isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType_Devices); + const bool fAllowToShowMenuDevices = isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Devices); action(UIActionIndexRT_M_Devices)->setVisible(fAllowToShowMenuDevices); if (fAllowToShowMenuDevices) @@ -2033,5 +2019,5 @@ #ifdef VBOX_WITH_DEBUGGER_GUI /* 'Debug' menu: */ - const bool fAllowToShowMenuDebug = isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType_Debug); + const bool fAllowToShowMenuDebug = isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Debug); action(UIActionIndexRT_M_Debug)->setVisible(fAllowToShowMenuDebug); if (fAllowToShowMenuDebug) @@ -2041,5 +2027,5 @@ /* 'Help' menu: */ - const bool fAllowToShowMenuHelp = isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType_Help); + const bool fAllowToShowMenuHelp = isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Help); action(UIActionIndex_Menu_Help)->setVisible(fAllowToShowMenuHelp); if (fAllowToShowMenuHelp) Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 52583) @@ -146,9 +146,4 @@ /** Returns UI multi-screen layout object reference. */ UIMultiScreenLayout* multiScreenLayout() const { return m_pMultiScreenLayout; } - - /** Returns whether the menu with passed @a type is allowed in menu-bar. */ - bool isAllowedInMenuBar(UIExtraDataMetaDefs::RuntimeMenuType type) const; - /** Defines menu-bar @a restriction for passed @a level. */ - void setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::RuntimeMenuType restriction); /** Returns whether the action with passed @a type is allowed in the 'Machine' menu. */ @@ -267,6 +262,4 @@ QList m_mainMenus; - /** Holds restricted menu types. */ - QMap m_restrictedMenus; /** Holds restricted action types of the Machine menu. */ QMap m_restrictedActionsMenuMachine; Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 52582) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 52583) @@ -172,13 +172,13 @@ switch (pAction->property("class").toInt()) { - case UIExtraDataMetaDefs::RuntimeMenuType_All: + case UIExtraDataMetaDefs::MenuType_All: { /* Get sender type: */ - const UIExtraDataMetaDefs::RuntimeMenuType type = - static_cast(pAction->property("type").toInt()); + const UIExtraDataMetaDefs::MenuType type = + static_cast(pAction->property("type").toInt()); /* Load current menu-bar restrictions: */ - UIExtraDataMetaDefs::RuntimeMenuType restrictions = gEDataManager->restrictedRuntimeMenuTypes(vboxGlobal().managedVMUuid()); + UIExtraDataMetaDefs::MenuType restrictions = gEDataManager->restrictedRuntimeMenuTypes(vboxGlobal().managedVMUuid()); /* Invert restriction for sender type: */ - restrictions = (UIExtraDataMetaDefs::RuntimeMenuType)(restrictions ^ type); + restrictions = (UIExtraDataMetaDefs::MenuType)(restrictions ^ type); /* Save updated menu-bar restrictions: */ gEDataManager->setRestrictedRuntimeMenuTypes(restrictions, vboxGlobal().managedVMUuid()); @@ -186,5 +186,5 @@ } #ifdef Q_WS_MAC - case UIExtraDataMetaDefs::RuntimeMenuType_Application: + case UIExtraDataMetaDefs::MenuType_Application: { /* Get sender type: */ @@ -200,5 +200,5 @@ } #endif /* Q_WS_MAC */ - case UIExtraDataMetaDefs::RuntimeMenuType_Machine: + case UIExtraDataMetaDefs::MenuType_Machine: { /* Get sender type: */ @@ -213,5 +213,5 @@ break; } - case UIExtraDataMetaDefs::RuntimeMenuType_View: + case UIExtraDataMetaDefs::MenuType_View: { /* Get sender type: */ @@ -226,5 +226,5 @@ break; } - case UIExtraDataMetaDefs::RuntimeMenuType_Devices: + case UIExtraDataMetaDefs::MenuType_Devices: { /* Get sender type: */ @@ -240,5 +240,5 @@ } #ifdef VBOX_WITH_DEBUGGER_GUI - case UIExtraDataMetaDefs::RuntimeMenuType_Debug: + case UIExtraDataMetaDefs::MenuType_Debug: { /* Get sender type: */ @@ -254,5 +254,5 @@ } #endif /* VBOX_WITH_DEBUGGER_GUI */ - case UIExtraDataMetaDefs::RuntimeMenuType_Help: + case UIExtraDataMetaDefs::MenuType_Help: { /* Get sender type: */ @@ -350,5 +350,5 @@ { /* Configure named menu: */ - pNamedMenu->setProperty("class", UIExtraDataMetaDefs::RuntimeMenuType_Application); + pNamedMenu->setProperty("class", UIExtraDataMetaDefs::MenuType_Application); /* Get named menu action: */ QAction *pNamedMenuAction = pNamedMenu->menuAction(); @@ -395,5 +395,5 @@ /* Configure copied menu action: */ pCopiedMenuAction->setCheckable(true); - pCopiedMenuAction->setProperty("class", UIExtraDataMetaDefs::RuntimeMenuType_All); + pCopiedMenuAction->setProperty("class", UIExtraDataMetaDefs::MenuType_All); pCopiedMenuAction->setProperty("type", pAction->extraDataID()); connect(pCopiedMenuAction, SIGNAL(triggered(bool)), this, SLOT(sltHandleMenuBarMenuClick())); @@ -591,10 +591,10 @@ { /* Recache menu-bar configuration: */ - const UIExtraDataMetaDefs::RuntimeMenuType restrictionsMenuBar = gEDataManager->restrictedRuntimeMenuTypes(vboxGlobal().managedVMUuid()); + const UIExtraDataMetaDefs::MenuType restrictionsMenuBar = gEDataManager->restrictedRuntimeMenuTypes(vboxGlobal().managedVMUuid()); /* Get static meta-object: */ const QMetaObject &smo = UIExtraDataMetaDefs::staticMetaObject; - /* We have UIExtraDataMetaDefs::RuntimeMenuType enum registered, so we can enumerate it: */ - const int iEnumIndex = smo.indexOfEnumerator("RuntimeMenuType"); + /* We have UIExtraDataMetaDefs::MenuType enum registered, so we can enumerate it: */ + const int iEnumIndex = smo.indexOfEnumerator("MenuType"); const QMetaEnum metaEnum = smo.enumerator(iEnumIndex); /* Handle other enum-values: */ @@ -602,9 +602,9 @@ { /* Get iterated enum-value: */ - const UIExtraDataMetaDefs::RuntimeMenuType enumValue = - static_cast(metaEnum.keyToValue(metaEnum.key(iKeyIndex))); - /* Skip RuntimeMenuType_Invalid & RuntimeMenuType_All enum-value: */ - if (enumValue == UIExtraDataMetaDefs::RuntimeMenuType_Invalid || - enumValue == UIExtraDataMetaDefs::RuntimeMenuType_All) + const UIExtraDataMetaDefs::MenuType enumValue = + static_cast(metaEnum.keyToValue(metaEnum.key(iKeyIndex))); + /* Skip MenuType_Invalid & MenuType_All enum-value: */ + if (enumValue == UIExtraDataMetaDefs::MenuType_Invalid || + enumValue == UIExtraDataMetaDefs::MenuType_All) continue; /* Which key required action registered under? */