Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 55170) @@ -72,7 +72,5 @@ template<> bool canConvert(); template<> bool canConvert(); -#ifdef Q_WS_MAC template<> bool canConvert(); -#endif /* Q_WS_MAC */ template<> bool canConvert(); template<> bool canConvert(); @@ -133,8 +131,6 @@ template<> QString toInternalString(const UIExtraDataMetaDefs::MenuType &menuType); template<> UIExtraDataMetaDefs::MenuType fromInternalString(const QString &strMenuType); -#ifdef Q_WS_MAC template<> QString toInternalString(const UIExtraDataMetaDefs::MenuApplicationActionType &menuApplicationActionType); template<> UIExtraDataMetaDefs::MenuApplicationActionType fromInternalString(const QString &strMenuApplicationActionType); -#endif /* Q_WS_MAC */ template<> QString toInternalString(const UIExtraDataMetaDefs::MenuHelpActionType &menuHelpActionType); template<> UIExtraDataMetaDefs::MenuHelpActionType fromInternalString(const QString &strMenuHelpActionType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 55170) @@ -40,7 +40,5 @@ 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; } @@ -374,7 +372,5 @@ 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; @@ -404,7 +400,5 @@ * 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; @@ -426,5 +420,4 @@ } -#ifdef Q_WS_MAC /* QString <= UIExtraDataMetaDefs::MenuApplicationActionType: */ template<> QString toInternalString(const UIExtraDataMetaDefs::MenuApplicationActionType &menuApplicationActionType) @@ -433,8 +426,15 @@ switch (menuApplicationActionType) { - 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; +#ifdef Q_WS_MAC + case UIExtraDataMetaDefs::MenuApplicationActionType_About: strResult = "About"; break; +#endif /* Q_WS_MAC */ + case UIExtraDataMetaDefs::MenuApplicationActionType_Preferences: strResult = "Preferences"; break; +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + case UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager: strResult = "NetworkAccessManager"; break; + case UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates: strResult = "CheckForUpdates"; break; +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + case UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings: strResult = "ResetWarnings"; break; + case UIExtraDataMetaDefs::MenuApplicationActionType_Close: strResult = "Close"; break; + case UIExtraDataMetaDefs::MenuApplicationActionType_All: strResult = "All"; break; default: { @@ -451,9 +451,16 @@ /* 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; + QStringList keys; QList values; +#ifdef Q_WS_MAC + keys << "About"; values << UIExtraDataMetaDefs::MenuApplicationActionType_About; +#endif /* Q_WS_MAC */ + keys << "Preferences"; values << UIExtraDataMetaDefs::MenuApplicationActionType_Preferences; +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + keys << "NetworkAccessManager"; values << UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager; + keys << "CheckForUpdates"; values << UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates; +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + keys << "ResetWarnings"; values << UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings; + keys << "Close"; values << UIExtraDataMetaDefs::MenuApplicationActionType_Close; + keys << "All"; values << UIExtraDataMetaDefs::MenuApplicationActionType_All; /* Invalid type for unknown words: */ if (!keys.contains(strMenuApplicationActionType, Qt::CaseInsensitive)) @@ -462,5 +469,4 @@ return values.at(keys.indexOf(QRegExp(strMenuApplicationActionType, Qt::CaseInsensitive))); } -#endif /* Q_WS_MAC */ /* QString <= UIExtraDataMetaDefs::MenuHelpActionType: */ @@ -472,12 +478,6 @@ case UIExtraDataMetaDefs::MenuHelpActionType_Contents: strResult = "Contents"; break; case UIExtraDataMetaDefs::MenuHelpActionType_WebSite: strResult = "WebSite"; break; - case UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings: strResult = "ResetWarnings"; break; -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - case UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager: strResult = "NetworkAccessManager"; break; - case UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates: strResult = "CheckForUpdates"; break; -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ #ifndef Q_WS_MAC case UIExtraDataMetaDefs::MenuHelpActionType_About: strResult = "About"; break; - case UIExtraDataMetaDefs::MenuHelpActionType_Preferences: strResult = "Preferences"; break; #endif /* !Q_WS_MAC */ case UIExtraDataMetaDefs::MenuHelpActionType_All: strResult = "All"; break; @@ -499,12 +499,6 @@ keys << "Contents"; values << UIExtraDataMetaDefs::MenuHelpActionType_Contents; keys << "WebSite"; values << UIExtraDataMetaDefs::MenuHelpActionType_WebSite; - keys << "ResetWarnings"; values << UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings; -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - keys << "NetworkAccessManager"; values << UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager; - keys << "CheckForUpdates"; values << UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates; -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ #ifndef Q_WS_MAC keys << "About"; values << UIExtraDataMetaDefs::MenuHelpActionType_About; - keys << "Preferences"; values << UIExtraDataMetaDefs::MenuHelpActionType_Preferences; #endif /* !Q_WS_MAC */ keys << "All"; values << UIExtraDataMetaDefs::MenuHelpActionType_All; @@ -530,7 +524,4 @@ case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown: strResult = "Shutdown"; break; case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff: strResult = "PowerOff"; break; -#ifndef Q_WS_MAC - case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Close: strResult = "Close"; break; -#endif /* !Q_WS_MAC */ case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing: strResult = "Nothing"; break; case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_All: strResult = "All"; break; @@ -558,7 +549,4 @@ keys << "Shutdown"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown; keys << "PowerOff"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff; -#ifndef Q_WS_MAC - keys << "Close"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Close; -#endif /* !Q_WS_MAC */ keys << "Nothing"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Nothing; keys << "All"; values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_All; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 55170) @@ -92,7 +92,5 @@ #endif /* !Q_WS_MAC */ const char* UIExtraDataDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus"; -#ifdef Q_WS_MAC const char* UIExtraDataDefs::GUI_RestrictedRuntimeApplicationMenuActions = "GUI/RestrictedRuntimeApplicationMenuActions"; -#endif /* Q_WS_MAC */ const char* UIExtraDataDefs::GUI_RestrictedRuntimeMachineMenuActions = "GUI/RestrictedRuntimeMachineMenuActions"; const char* UIExtraDataDefs::GUI_RestrictedRuntimeViewMenuActions = "GUI/RestrictedRuntimeViewMenuActions"; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 55170) @@ -154,8 +154,6 @@ /** Holds restricted Runtime UI menu types. */ extern const char* GUI_RestrictedRuntimeMenus; -#ifdef Q_WS_MAC - /** Mac OS X: Holds restricted Runtime UI action types for 'Application' menu. */ + /** Holds restricted Runtime UI action types for 'Application' menu. */ extern const char* GUI_RestrictedRuntimeApplicationMenuActions; -#endif /* Q_WS_MAC */ /** Holds restricted Runtime UI action types for Machine menu. */ extern const char* GUI_RestrictedRuntimeMachineMenuActions; @@ -295,7 +293,5 @@ Q_OBJECT; Q_ENUMS(MenuType); -#ifdef RT_OS_DARWIN Q_ENUMS(MenuApplicationActionType); -#endif /* RT_OS_DARWIN */ Q_ENUMS(MenuHelpActionType); Q_ENUMS(RuntimeMenuMachineActionType); @@ -316,7 +312,5 @@ { 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), @@ -333,15 +327,20 @@ }; -#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 - }; + MenuApplicationActionType_Invalid = 0, +#ifdef RT_OS_DARWIN + MenuApplicationActionType_About = RT_BIT(0), #endif /* RT_OS_DARWIN */ + MenuApplicationActionType_Preferences = RT_BIT(1), +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + MenuApplicationActionType_NetworkAccessManager = RT_BIT(2), + MenuApplicationActionType_CheckForUpdates = RT_BIT(3), +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + MenuApplicationActionType_ResetWarnings = RT_BIT(4), + MenuApplicationActionType_Close = RT_BIT(5), + MenuApplicationActionType_All = 0xFFFF + }; /** Menu "Help": Action types. */ @@ -351,12 +350,6 @@ MenuHelpActionType_Contents = RT_BIT(0), MenuHelpActionType_WebSite = RT_BIT(1), - MenuHelpActionType_ResetWarnings = RT_BIT(2), -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - MenuHelpActionType_NetworkAccessManager = RT_BIT(3), - MenuHelpActionType_CheckForUpdates = RT_BIT(4), -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ #ifndef RT_OS_DARWIN - MenuHelpActionType_About = RT_BIT(5), - MenuHelpActionType_Preferences = RT_BIT(6), + MenuHelpActionType_About = RT_BIT(2), #endif /* !RT_OS_DARWIN */ MenuHelpActionType_All = 0xFFFF @@ -375,8 +368,5 @@ RuntimeMenuMachineActionType_Shutdown = RT_BIT(6), RuntimeMenuMachineActionType_PowerOff = RT_BIT(7), -#ifndef RT_OS_DARWIN - RuntimeMenuMachineActionType_Close = RT_BIT(8), -#endif /* !RT_OS_DARWIN */ - RuntimeMenuMachineActionType_Nothing = RT_BIT(9), + RuntimeMenuMachineActionType_Nothing = RT_BIT(8), RuntimeMenuMachineActionType_All = 0xFFFF }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 55170) @@ -1758,7 +1758,5 @@ << GUI_LastNormalWindowPosition << GUI_LastScaleWindowPosition << GUI_RestrictedRuntimeMenus -#ifdef Q_WS_MAC << GUI_RestrictedRuntimeApplicationMenuActions -#endif /* Q_WS_MAC */ << GUI_RestrictedRuntimeMachineMenuActions << GUI_RestrictedRuntimeViewMenuActions @@ -2612,5 +2610,4 @@ } -#ifdef Q_WS_MAC UIExtraDataMetaDefs::MenuApplicationActionType UIExtraDataManager::restrictedRuntimeMenuApplicationActionTypes(const QString &strID) { @@ -2659,5 +2656,4 @@ setExtraDataStringList(GUI_RestrictedRuntimeApplicationMenuActions, result, strID); } -#endif /* Q_WS_MAC */ UIExtraDataMetaDefs::RuntimeMenuMachineActionType UIExtraDataManager::restrictedRuntimeMenuMachineActionTypes(const QString &strID) @@ -3675,7 +3671,5 @@ #endif /* !Q_WS_MAC */ strKey == GUI_RestrictedRuntimeMenus || -#ifdef Q_WS_MAC strKey == GUI_RestrictedRuntimeApplicationMenuActions || -#endif /* Q_WS_MAC */ strKey == GUI_RestrictedRuntimeMachineMenuActions || strKey == GUI_RestrictedRuntimeViewMenuActions || Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 55170) @@ -312,10 +312,8 @@ void setRestrictedRuntimeMenuTypes(UIExtraDataMetaDefs::MenuType types, const QString &strID); -#ifdef Q_WS_MAC - /** Mac OS X: Returns restricted Runtime UI action types for Application menu. */ + /** Returns restricted Runtime UI action types for Application menu. */ UIExtraDataMetaDefs::MenuApplicationActionType restrictedRuntimeMenuApplicationActionTypes(const QString &strID); - /** Mac OS X: Defines restricted Runtime UI action types for Application menu. */ + /** Defines restricted Runtime UI action types for Application menu. */ void setRestrictedRuntimeMenuApplicationActionTypes(UIExtraDataMetaDefs::MenuApplicationActionType types, const QString &strID); -#endif /* Q_WS_MAC */ /** Returns restricted Runtime UI action types for Machine menu. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 55170) @@ -316,5 +316,4 @@ -#ifdef RT_OS_DARWIN class UIActionMenuApplication : public UIActionMenu { @@ -326,5 +325,7 @@ : UIActionMenu(pParent) { +#ifdef RT_OS_DARWIN menu()->setConsumable(true); +#endif /* RT_OS_DARWIN */ retranslateUi(); } @@ -341,5 +342,9 @@ void retranslateUi() { +#ifdef RT_OS_DARWIN setName(QApplication::translate("UIActionPool", "&VirtualBox")); +#else /* !RT_OS_DARWIN */ + setName(QApplication::translate("UIActionPool", "&File")); +#endif /* !RT_OS_DARWIN */ } }; @@ -383,4 +388,5 @@ }; +#ifdef RT_OS_DARWIN class UIActionMenuWindow : public UIActionMenu { @@ -550,4 +556,5 @@ : UIActionSimple(pParent, ":/reset_warnings_16px.png") { + setMenuRole(QAction::ApplicationSpecificRole); retranslateUi(); } @@ -556,9 +563,9 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings; } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings; } /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings); } + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings); } /** Returns whether action is allowed. */ - virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings); } + virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings); } QString shortcutExtraDataID() const @@ -584,4 +591,5 @@ : UIActionSimple(pParent, ":/nw_16px.png", ":/nw_disabled_16px.png") { + setMenuRole(QAction::ApplicationSpecificRole); retranslateUi(); } @@ -590,9 +598,9 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager; } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager; } /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager); } + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager); } /** Returns whether action is allowed. */ - virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager); } + virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager); } QString shortcutExtraDataID() const @@ -624,9 +632,9 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates; } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates; } /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates); } + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); } /** Returns whether action is allowed. */ - virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates); } + virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); } QString shortcutExtraDataID() const @@ -661,27 +669,27 @@ virtual int extraDataID() const { -#ifdef Q_WS_MAC +#ifdef RT_OS_DARWIN return UIExtraDataMetaDefs::MenuApplicationActionType_About; -#else /* !Q_WS_MAC */ +#else /* !RT_OS_DARWIN */ return UIExtraDataMetaDefs::MenuHelpActionType_About; -#endif /* !Q_WS_MAC */ +#endif /* !RT_OS_DARWIN */ } /** Returns action extra-data key. */ virtual QString extraDataKey() const { -#ifdef Q_WS_MAC +#ifdef RT_OS_DARWIN return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_About); -#else /* !Q_WS_MAC */ +#else /* !RT_OS_DARWIN */ return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_About); -#endif /* !Q_WS_MAC */ +#endif /* !RT_OS_DARWIN */ } /** Returns whether action is allowed. */ virtual bool isAllowed() const { -#ifdef Q_WS_MAC +#ifdef RT_OS_DARWIN return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_About); -#else /* !Q_WS_MAC */ +#else /* !RT_OS_DARWIN */ return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_About); -#endif /* !Q_WS_MAC */ +#endif /* !RT_OS_DARWIN */ } @@ -714,30 +722,9 @@ /** Returns action extra-data ID. */ - virtual int extraDataID() const - { -#ifdef Q_WS_MAC - return UIExtraDataMetaDefs::MenuApplicationActionType_Preferences; -#else /* !Q_WS_MAC */ - return UIExtraDataMetaDefs::MenuHelpActionType_Preferences; -#endif /* !Q_WS_MAC */ - } + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_Preferences; } /** Returns action extra-data key. */ - virtual QString extraDataKey() const - { -#ifdef Q_WS_MAC - return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); -#else /* !Q_WS_MAC */ - return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Preferences); -#endif /* !Q_WS_MAC */ - } + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); } /** Returns whether action is allowed. */ - virtual bool isAllowed() const - { -#ifdef Q_WS_MAC - return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); -#else /* !Q_WS_MAC */ - return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Preferences); -#endif /* !Q_WS_MAC */ - } + virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); } QString shortcutExtraDataID() const @@ -833,5 +820,4 @@ } -#ifdef Q_WS_MAC bool UIActionPool::isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType type) const { @@ -848,4 +834,5 @@ } +#ifdef Q_WS_MAC bool UIActionPool::isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType type) const { @@ -910,11 +897,18 @@ void UIActionPool::preparePool() { -#ifdef RT_OS_DARWIN /* Create 'Application' actions: */ m_pool[UIActionIndex_M_Application] = new UIActionMenuApplication(this); +#ifdef RT_OS_DARWIN m_pool[UIActionIndex_M_Application_S_About] = new UIActionSimpleAbout(this); +#endif /* RT_OS_DARWIN */ 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 */ + m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this); m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this); +#ifdef RT_OS_DARWIN /* Create 'Window' actions: */ m_pool[UIActionIndex_M_Window] = new UIActionMenuWindow(this); @@ -926,12 +920,6 @@ m_pool[UIActionIndex_Simple_Contents] = new UIActionSimpleContents(this); m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this); - m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this); -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this); - m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this); -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ #ifndef RT_OS_DARWIN m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this); - m_pool[UIActionIndex_Simple_Preferences] = new UIActionSimplePreferences(this); #endif /* !RT_OS_DARWIN */ @@ -952,4 +940,18 @@ void UIActionPool::prepareConnections() { + /* 'Application' menu connections: */ +#ifdef RT_OS_DARWIN + connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()), + &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection); +#endif /* RT_OS_DARWIN */ +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()), + gNetworkManager, SLOT(show()), Qt::UniqueConnection); + connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()), + gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection); +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()), + &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection); + /* 'Help' menu connections: */ connect(action(UIActionIndex_Simple_Contents), SIGNAL(triggered()), @@ -957,16 +959,5 @@ connect(action(UIActionIndex_Simple_WebSite), SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpWebDialog()), Qt::UniqueConnection); - connect(action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()), - &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection); -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - connect(action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()), - gNetworkManager, SLOT(show()), Qt::UniqueConnection); - connect(action(UIActionIndex_Simple_CheckForUpdates), SIGNAL(triggered()), - gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection); -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ -#ifdef RT_OS_DARWIN - connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()), - &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection); -#else /* !RT_OS_DARWIN */ +#ifndef RT_OS_DARWIN connect(action(UIActionIndex_Simple_About), SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection); @@ -1032,6 +1023,6 @@ if (!fUpdateAllowed) { - m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuHelpActionType) - (m_restrictedActionsMenuHelp[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates); + m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType) + (m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); } #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ @@ -1048,20 +1039,56 @@ } -#ifdef RT_OS_DARWIN void UIActionPool::updateMenuApplication() { /* Get corresponding menu: */ UIMenu *pMenu = action(UIActionIndex_M_Application)->menu(); - AssertReturnVoid(pMenu && pMenu->isConsumable()); + AssertPtrReturnVoid(pMenu); +#ifdef RT_OS_DARWIN + AssertReturnVoid(pMenu->isConsumable()); +#endif /* RT_OS_DARWIN */ /* Clear contents: */ +#ifdef RT_OS_DARWIN if (!pMenu->isConsumed()) +#endif /* RT_OS_DARWIN */ pMenu->clear(); + /* Separator: */ + bool fSeparator = false; + +#ifdef RT_OS_DARWIN /* 'About' action: */ - addAction(pMenu, action(UIActionIndex_M_Application_S_About)); + fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_About)) || fSeparator; +#endif /* RT_OS_DARWIN */ + /* 'Preferences' action: */ - addAction(pMenu, action(UIActionIndex_M_Application_S_Preferences)); + fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_Preferences)) || fSeparator; + +#ifndef RT_OS_DARWIN + /* Separator: */ + if (fSeparator) + { + pMenu->addSeparator(); + fSeparator = false; + } +#endif /* !RT_OS_DARWIN */ + +#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 */ + /* 'Reset Warnings' action: */ + fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_ResetWarnings)) || fSeparator; + +#ifndef RT_OS_DARWIN + /* Separator: */ + if (fSeparator) + { + pMenu->addSeparator(); + fSeparator = false; + } +#endif /* !RT_OS_DARWIN */ + /* 'Close' action: */ - addAction(pMenu, action(UIActionIndex_M_Application_S_Close)); + fSeparator = addAction(pMenu, action(UIActionIndex_M_Application_S_Close)) || fSeparator; /* Mark menu as valid: */ @@ -1069,4 +1096,5 @@ } +#ifdef RT_OS_DARWIN void UIActionPool::updateMenuWindow() { @@ -1106,7 +1134,7 @@ /* 'Contents' action: */ - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_Contents)); + fSeparator = addAction(pMenu, action(UIActionIndex_Simple_Contents)) || fSeparator;; /* 'Web Site' action: */ - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_WebSite)); + fSeparator = addAction(pMenu, action(UIActionIndex_Simple_WebSite)) || fSeparator;; /* Separator? */ @@ -1117,35 +1145,7 @@ } - /* 'Reset Warnings' action: */ - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_ResetWarnings)); - - /* Separator? */ - if (fSeparator) - { - pMenu->addSeparator(); - fSeparator = false; - } - -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - /* 'Network Manager' action: */ - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_NetworkAccessManager)); - /* 'Check for Updates' action (only for Selector pool): */ - if (type() == UIActionPoolType_Selector) - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_CheckForUpdates)); - - /* Separator? */ - if (fSeparator) - { - pMenu->addSeparator(); - fSeparator = false; - } -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ - #ifndef RT_OS_DARWIN /* 'About' action: */ - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_About)); - /* 'Preferences' action (only for Runtime pool): */ - if (type() == UIActionPoolType_Runtime) - fSeparator = addAction(pMenu, action(UIActionIndex_Simple_Preferences)); + fSeparator = addAction(pMenu, action(UIActionIndex_Simple_About)) || fSeparator;; #endif /* !RT_OS_DARWIN */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 55170) @@ -52,11 +52,18 @@ enum UIActionIndex { -#ifdef RT_OS_DARWIN /* 'Application' menu actions: */ UIActionIndex_M_Application, +#ifdef RT_OS_DARWIN UIActionIndex_M_Application_S_About, +#endif /* RT_OS_DARWIN */ UIActionIndex_M_Application_S_Preferences, +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + UIActionIndex_M_Application_S_NetworkAccessManager, + UIActionIndex_M_Application_S_CheckForUpdates, +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + UIActionIndex_M_Application_S_ResetWarnings, UIActionIndex_M_Application_S_Close, +#ifdef RT_OS_DARWIN /* 'Window' menu actions: */ UIActionIndex_M_Window, @@ -68,12 +75,6 @@ UIActionIndex_Simple_Contents, UIActionIndex_Simple_WebSite, - UIActionIndex_Simple_ResetWarnings, -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - UIActionIndex_Simple_NetworkAccessManager, - UIActionIndex_Simple_CheckForUpdates, -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ #ifndef RT_OS_DARWIN UIActionIndex_Simple_About, - UIActionIndex_Simple_Preferences, #endif /* !RT_OS_DARWIN */ @@ -366,5 +367,4 @@ void setRestrictionForMenuBar(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuType restriction); -#ifdef Q_WS_MAC /** Returns whether the action with passed @a type is allowed in the 'Application' menu. */ bool isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType type) const; @@ -372,7 +372,8 @@ void setRestrictionForMenuApplication(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuApplicationActionType restriction); - /** Returns whether the action with passed @a type is allowed in the 'Window' menu. */ +#ifdef Q_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; - /** Defines 'Window' menu @a restriction for passed @a level. */ + /** Mac OS X: Defines 'Window' menu @a restriction for passed @a level. */ void setRestrictionForMenuWindow(UIActionRestrictionLevel level, UIExtraDataMetaDefs::MenuWindowActionType restriction); #endif /* Q_WS_MAC */ @@ -425,8 +426,8 @@ /** Update menus routine. */ virtual void updateMenus() = 0; -#ifdef RT_OS_DARWIN /** Update 'Application' menu routine. */ virtual void updateMenuApplication(); - /** Update 'Window' menu routine. */ +#ifdef RT_OS_DARWIN + /** Mac OS X: Update 'Window' menu routine. */ virtual void updateMenuWindow(); #endif /* RT_OS_DARWIN */ @@ -462,8 +463,8 @@ /** Holds restricted menu types. */ QMap m_restrictedMenus; -#ifdef Q_WS_MAC /** Holds restricted action types of the 'Application' menu. */ QMap m_restrictedActionsMenuApplication; - /** Holds restricted action types of the 'Window' menu. */ +#ifdef Q_WS_MAC + /** Mac OS X: Holds restricted action types of the 'Window' menu. */ QMap m_restrictedActionsMenuWindow; #endif /* Q_WS_MAC */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 55170) @@ -342,44 +342,4 @@ }; -#ifndef RT_OS_DARWIN -class UIActionSimplePerformClose : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimplePerformClose(UIActionPool *pParent) - : UIActionSimple(pParent, ":/exit_16px.png") - { - setMenuRole(QAction::QuitRole); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Close;} - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Close);} - /** Returns whether action is allowed. */ - virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Close); } - - QString shortcutExtraDataID() const - { - return QString("Close"); - } - - QKeySequence defaultShortcut(UIActionPoolType) const - { - return QKeySequence("Q"); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&Close...")); - setStatusTip(QApplication::translate("UIActionPool", "Close the virtual machine")); - } -}; -#endif /* !RT_OS_DARWIN */ - class UIActionMenuView : public UIActionMenu { @@ -2064,7 +2024,4 @@ m_pool[UIActionIndexRT_M_Machine_S_Shutdown] = new UIActionSimplePerformShutdown(this); m_pool[UIActionIndexRT_M_Machine_S_PowerOff] = new UIActionSimplePerformPowerOff(this); -#ifndef RT_OS_DARWIN - m_pool[UIActionIndexRT_M_Machine_S_Close] = new UIActionSimplePerformClose(this); -#endif /* !RT_OS_DARWIN */ /* 'View' actions: */ @@ -2182,7 +2139,5 @@ /* Recache common action restrictions: */ m_restrictedMenus[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuTypes(strMachineID); -#ifdef Q_WS_MAC m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuApplicationActionTypes(strMachineID); -#endif /* Q_WS_MAC */ m_restrictedActionsMenuMachine[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuMachineActionTypes(strMachineID); m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] = gEDataManager->restrictedRuntimeMenuViewActionTypes(strMachineID); @@ -2258,11 +2213,6 @@ if (fAllCloseActionsRestricted) { -#ifdef Q_WS_MAC m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType) (m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::MenuApplicationActionType_Close); -#else /* !Q_WS_MAC */ - m_restrictedActionsMenuMachine[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::RuntimeMenuMachineActionType) - (m_restrictedActionsMenuMachine[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Close); -#endif /* !Q_WS_MAC */ } @@ -2287,9 +2237,7 @@ m_mainMenus.clear(); -#ifdef RT_OS_DARWIN /* 'Application' menu: */ addMenu(m_mainMenus, action(UIActionIndex_M_Application)); updateMenuApplication(); -#endif /* RT_OS_DARWIN */ /* 'Machine' menu: */ @@ -2364,16 +2312,4 @@ /* 'PowerOff' action: */ fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_PowerOff)) || fSeparator; - -#ifndef Q_WS_MAC - /* Separator: */ - if (fSeparator) - { - pMenu->addSeparator(); - fSeparator = false; - } - - /* 'Close' action: */ - fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_Close)) || fSeparator; -#endif /* !Q_WS_MAC */ /* Mark menu as valid: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 55170) @@ -49,7 +49,4 @@ UIActionIndexRT_M_Machine_S_Shutdown, UIActionIndexRT_M_Machine_S_PowerOff, -#ifndef RT_OS_DARWIN - UIActionIndexRT_M_Machine_S_Close, -#endif /* !RT_OS_DARWIN */ /* 'View' menu actions: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 55170) @@ -1013,4 +1013,10 @@ void UIMachineLogic::prepareActionConnections() { + /* 'Application' actions connection: */ + connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), SIGNAL(triggered()), + this, SLOT(sltShowGlobalPreferences()), Qt::UniqueConnection); + connect(actionPool()->action(UIActionIndex_M_Application_S_Close), SIGNAL(triggered()), + this, SLOT(sltClose()), Qt::QueuedConnection); + /* 'Machine' actions connections: */ connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Settings), SIGNAL(triggered()), @@ -1030,11 +1036,4 @@ connect(actionPool()->action(UIActionIndexRT_M_Machine_S_PowerOff), SIGNAL(triggered()), this, SLOT(sltPowerOff()), Qt::QueuedConnection); -#ifdef RT_OS_DARWIN - connect(actionPool()->action(UIActionIndex_M_Application_S_Close), SIGNAL(triggered()), - this, SLOT(sltClose()), Qt::QueuedConnection); -#else /* !RT_OS_DARWIN */ - connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SIGNAL(triggered()), - this, SLOT(sltClose()), Qt::QueuedConnection); -#endif /* !RT_OS_DARWIN */ /* 'View' actions connections: */ @@ -1098,13 +1097,4 @@ this, SLOT(sltMinimizeActiveMachineWindow())); #endif /* Q_WS_MAC */ - - /* 'Help' actions connections: */ -#ifdef RT_OS_DARWIN - connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), SIGNAL(triggered()), - this, SLOT(sltShowGlobalPreferences()), Qt::UniqueConnection); -#else /* !RT_OS_DARWIN */ - connect(actionPool()->action(UIActionIndex_Simple_Preferences), SIGNAL(triggered()), - this, SLOT(sltShowGlobalPreferences()), Qt::UniqueConnection); -#endif /* !RT_OS_DARWIN */ } @@ -2407,5 +2397,4 @@ return; -#ifdef RT_OS_DARWIN /* Check that we do NOT handling that already: */ if (actionPool()->action(UIActionIndex_M_Application_S_Preferences)->data().toBool()) @@ -2413,11 +2402,4 @@ /* Remember that we handling that already: */ actionPool()->action(UIActionIndex_M_Application_S_Preferences)->setData(true); -#else /* !RT_OS_DARWIN */ - /* Check that we do NOT handling that already: */ - if (actionPool()->action(UIActionIndex_Simple_Preferences)->data().toBool()) - return; - /* Remember that we handling that already: */ - actionPool()->action(UIActionIndex_Simple_Preferences)->setData(true); -#endif /* !RT_OS_DARWIN */ /* Create and execute global settings window: */ @@ -2428,11 +2410,6 @@ delete pDialog; -#ifdef RT_OS_DARWIN /* Remember that we do NOT handling that already: */ actionPool()->action(UIActionIndex_M_Application_S_Preferences)->setData(false); -#else /* !RT_OS_DARWIN */ - /* Remember that we do NOT handling that already: */ - actionPool()->action(UIActionIndex_Simple_Preferences)->setData(false); -#endif /* !RT_OS_DARWIN */ } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 55170) @@ -135,5 +135,4 @@ break; } -#ifdef Q_WS_MAC case UIExtraDataMetaDefs::MenuType_Application: { @@ -149,5 +148,4 @@ break; } -#endif /* Q_WS_MAC */ case UIExtraDataMetaDefs::MenuType_Machine: { @@ -337,7 +335,5 @@ { /* Create menus: */ -#ifdef Q_WS_MAC prepareMenuApplication(); -#endif /* Q_WS_MAC */ prepareMenuMachine(); prepareMenuView(); @@ -503,16 +499,27 @@ } +void UIMenuBarEditorWidget::prepareMenuApplication() +{ + /* Copy menu: */ #ifdef Q_WS_MAC -void UIMenuBarEditorWidget::prepareMenuApplication() -{ - /* Copy menu: */ - QMenu *pMenu = prepareNamedMenu("VirtualBox"); + QMenu *pMenu = prepareNamedMenu("Application"); +#else /* !Q_WS_MAC */ + QMenu *pMenu = prepareCopiedMenu(actionPool()->action(UIActionIndex_M_Application)); +#endif /* !Q_WS_MAC */ AssertPtrReturnVoid(pMenu); { +#ifdef Q_WS_MAC prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_About)); +#endif /* Q_WS_MAC */ prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_Preferences)); - } -} -#endif /* Q_WS_MAC */ +#ifndef Q_WS_MAC + pMenu->addSeparator(); +#endif /* !Q_WS_MAC */ +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings)); + } +} void UIMenuBarEditorWidget::prepareMenuMachine() @@ -637,13 +644,6 @@ prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_WebSite)); pMenu->addSeparator(); - prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_ResetWarnings)); -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER - pMenu->addSeparator(); - prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_NetworkAccessManager)); -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ #ifndef Q_WS_MAC - pMenu->addSeparator(); prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_About)); - prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_Preferences)); #endif /* !Q_WS_MAC */ } @@ -692,7 +692,5 @@ /* Update known menu-bar menus: */ -#ifdef Q_WS_MAC updateMenuApplication(); -#endif /* Q_WS_MAC */ updateMenuMachine(); updateMenuView(); @@ -708,5 +706,4 @@ } -#ifdef Q_WS_MAC void UIMenuBarEditorWidget::updateMenuApplication() { @@ -737,5 +734,4 @@ } } -#endif /* Q_WS_MAC */ void UIMenuBarEditorWidget::updateMenuMachine() Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.h (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.h (revision 55170) @@ -119,8 +119,6 @@ /** Prepare menus routine. */ void prepareMenus(); -#ifdef Q_WS_MAC - /** Mac OS X: Prepare 'Application' menu routine. */ + /** Prepare 'Application' menu routine. */ void prepareMenuApplication(); -#endif /* Q_WS_MAC */ /** Prepare 'Machine' menu routine. */ void prepareMenuMachine(); @@ -148,8 +146,6 @@ /** Update menus routine. */ void updateMenus(); -#ifdef Q_WS_MAC - /** Mac OS X: Update 'Application' menu routine. */ + /** Update 'Application' menu routine. */ void updateMenuApplication(); -#endif /* Q_WS_MAC */ /** Update 'Machine' menu routine. */ void updateMenuMachine(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (revision 55170) @@ -251,5 +251,5 @@ actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger())); connect(m_pMiniToolBar, SIGNAL(sigCloseAction()), - actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger())); + actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger())); connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()), Qt::QueuedConnection); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (revision 55170) @@ -135,5 +135,5 @@ actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger())); connect(m_pMiniToolBar, SIGNAL(sigCloseAction()), - actionPool()->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger())); + actionPool()->action(UIActionIndex_M_Application_S_Close), SLOT(trigger())); connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()), Qt::QueuedConnection); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 55169) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 55170) @@ -320,5 +320,4 @@ void UISelectorWindow::sltShowPreferencesDialog() { -#ifdef RT_OS_DARWIN /* Check that we do NOT handling that already: */ if (actionPool()->action(UIActionIndex_M_Application_S_Preferences)->data().toBool()) @@ -326,11 +325,4 @@ /* Remember that we handling that already: */ actionPool()->action(UIActionIndex_M_Application_S_Preferences)->setData(true); -#else /* !RT_OS_DARWIN */ - /* Check that we do NOT handling that already: */ - if (actionPool()->action(UIActionIndex_Simple_Preferences)->data().toBool()) - return; - /* Remember that we handling that already: */ - actionPool()->action(UIActionIndex_Simple_Preferences)->setData(true); -#endif /* !RT_OS_DARWIN */ /* Don't show the inaccessible warning @@ -342,11 +334,6 @@ dialog.execute(); -#ifdef RT_OS_DARWIN /* Remember that we do NOT handling that already: */ actionPool()->action(UIActionIndex_M_Application_S_Preferences)->setData(false); -#else /* !RT_OS_DARWIN */ - /* Remember that we do NOT handling that already: */ - actionPool()->action(UIActionIndex_Simple_Preferences)->setData(false); -#endif /* !RT_OS_DARWIN */ } @@ -1151,20 +1138,26 @@ /* Populate File-menu: */ - pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager)); +#ifdef Q_WS_MAC + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About)); + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences)); +#endif /* Q_WS_MAC */ pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance)); pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance)); -#ifndef Q_WS_MAC pMenu->addSeparator(); -#endif /* Q_WS_MAC */ + pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager)); #ifdef DEBUG pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager)); #endif /* DEBUG */ -#ifdef Q_WS_MAC - pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About)); +#ifndef Q_WS_MAC pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences)); -#else /* !Q_WS_MAC */ - pMenu->addAction(actionPool()->action(UIActionIndex_Simple_Preferences)); +#endif /* Q_WS_MAC */ pMenu->addSeparator(); -#endif /* Q_WS_MAC */ +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); + pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates)); +# ifndef Q_WS_MAC + pMenu->addSeparator(); +# endif /* Q_WS_MAC */ +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_Close)); } @@ -1386,9 +1379,5 @@ connect(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager), SIGNAL(triggered()), this, SLOT(sltOpenExtraDataManagerWindow())); #endif /* DEBUG */ -#ifdef RT_OS_DARWIN connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), SIGNAL(triggered()), this, SLOT(sltShowPreferencesDialog())); -#else /* !RT_OS_DARWIN */ - connect(actionPool()->action(UIActionIndex_Simple_Preferences), SIGNAL(triggered()), this, SLOT(sltShowPreferencesDialog())); -#endif /* !RT_OS_DARWIN */ connect(actionPool()->action(UIActionIndexST_M_File_S_Close), SIGNAL(triggered()), this, SLOT(sltPerformExit()));