Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 52579) @@ -309,4 +309,307 @@ +#ifdef RT_OS_DARWIN +class UIActionMenuApplication : public UIActionMenu +{ + Q_OBJECT; + +public: + + UIActionMenuApplication(UIActionPool *pParent) + : UIActionMenu(pParent) + { + menu()->setConsumable(true); + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Application; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Application); } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&VirtualBox")); + } +}; + +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::MenuApplicationActionType_Close; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_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 UIActionMenuHelp : public UIActionMenu +{ + Q_OBJECT; + +public: + + UIActionMenuHelp(UIActionPool *pParent) + : UIActionMenu(pParent) + { + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Help; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Help); } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&Help")); + } +}; + +class UIActionSimpleContents : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleContents(UIActionPool *pParent) + : UIActionSimple(pParent, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_DialogHelp)) + { + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_Contents; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Contents); } + + QString shortcutExtraDataID() const + { + return QString("Help"); + } + + QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const + { + switch (actionPoolType) + { + case UIActionPoolType_Selector: return QKeySequence(QKeySequence::HelpContents); + case UIActionPoolType_Runtime: break; + } + return QKeySequence(); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&Contents...")); + setStatusTip(QApplication::translate("UIActionPool", "Show help contents")); + } +}; + +class UIActionSimpleWebSite : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleWebSite(UIActionPool *pParent) + : UIActionSimple(pParent, ":/site_16px.png") + { + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_WebSite; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_WebSite); } + + QString shortcutExtraDataID() const + { + return QString("Web"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&VirtualBox Web Site...")); + setStatusTip(QApplication::translate("UIActionPool", "Open the browser and go to the VirtualBox product web site")); + } +}; + +class UIActionSimpleResetWarnings : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleResetWarnings(UIActionPool *pParent) + : UIActionSimple(pParent, ":/reset_warnings_16px.png") + { + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings); } + + QString shortcutExtraDataID() const + { + return QString("ResetWarnings"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&Reset All Warnings")); + setStatusTip(QApplication::translate("UIActionPool", "Go back to showing all suppressed warnings and messages")); + } +}; + +#ifdef VBOX_GUI_WITH_NETWORK_MANAGER +class UIActionSimpleNetworkAccessManager : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleNetworkAccessManager(UIActionPool *pParent) + : UIActionSimple(pParent, ":/nw_16px.png", ":/nw_disabled_16px.png") + { + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager); } + + QString shortcutExtraDataID() const + { + return QString("NetworkAccessManager"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&Network Operations Manager...")); + setStatusTip(QApplication::translate("UIActionPool", "Show Network Operations Manager")); + } +}; + +class UIActionSimpleCheckForUpdates : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleCheckForUpdates(UIActionPool *pParent) + : UIActionSimple(pParent, ":/refresh_16px.png", ":/refresh_disabled_16px.png") + { + setMenuRole(QAction::ApplicationSpecificRole); + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates); } + + QString shortcutExtraDataID() const + { + return QString("Update"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "C&heck for Updates...")); + setStatusTip(QApplication::translate("UIActionPool", "Check for a new VirtualBox version")); + } +}; +#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ + +class UIActionSimpleAbout : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleAbout(UIActionPool *pParent) + : UIActionSimple(pParent, ":/about_16px.png") + { + setMenuRole(QAction::AboutRole); + retranslateUi(); + } + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const + { +#ifdef Q_WS_MAC + return UIExtraDataMetaDefs::MenuApplicationActionType_About; +#else /* !Q_WS_MAC */ + return UIExtraDataMetaDefs::MenuHelpActionType_About; +#endif /* !Q_WS_MAC */ + } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const + { +#ifdef Q_WS_MAC + return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_About); +#else /* !Q_WS_MAC */ + return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_About); +#endif /* !Q_WS_MAC */ + } + + QString shortcutExtraDataID() const + { + return QString("About"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "&About VirtualBox...")); + setStatusTip(QApplication::translate("UIActionPool", "Show a window with product information")); + } +}; + class UIActionSimplePreferences : public UIActionSimple { @@ -362,364 +665,4 @@ setName(QApplication::translate("UIActionPool", "&Preferences...", "global settings")); setStatusTip(QApplication::translate("UIActionPool", "Display the global settings window")); - } -}; - -class UIActionSimpleLogDialog : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleLogDialog(UIActionPool *pParent) - : UIActionSimple(pParent, - ":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png", - ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png") - { - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const - { -#ifdef VBOX_WITH_DEBUGGER_GUI - return UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_LogDialog; -#else /* !VBOX_WITH_DEBUGGER_GUI */ - return 0; -#endif /* !VBOX_WITH_DEBUGGER_GUI */ - } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const - { -#ifdef VBOX_WITH_DEBUGGER_GUI - return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_LogDialog); -#else /* !VBOX_WITH_DEBUGGER_GUI */ - return QString(); -#endif /* !VBOX_WITH_DEBUGGER_GUI */ - } - - QString shortcutExtraDataID() const - { - return QString("ShowVMLog"); - } - - QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const - { - switch (actionPoolType) - { - case UIActionPoolType_Selector: return QKeySequence("Ctrl+L"); - case UIActionPoolType_Runtime: break; - } - return QKeySequence(); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "Show &Log...")); - setStatusTip(QApplication::translate("UIActionPool", "Show the log files of the selected virtual machine")); - } -}; - -#ifdef RT_OS_DARWIN -class UIActionMenuApplication : public UIActionMenu -{ - Q_OBJECT; - -public: - - UIActionMenuApplication(UIActionPool *pParent) - : UIActionMenu(pParent) - { - menu()->setConsumable(true); - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Application; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Application); } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&VirtualBox")); - } -}; - -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::MenuApplicationActionType_Close; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_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 UIActionMenuHelp : public UIActionMenu -{ - Q_OBJECT; - -public: - - UIActionMenuHelp(UIActionPool *pParent) - : UIActionMenu(pParent) - { - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuType_Help; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuType_Help); } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&Help")); - } -}; - -class UIActionSimpleContents : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleContents(UIActionPool *pParent) - : UIActionSimple(pParent, UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_DialogHelp)) - { - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_Contents; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Contents); } - - QString shortcutExtraDataID() const - { - return QString("Help"); - } - - QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const - { - switch (actionPoolType) - { - case UIActionPoolType_Selector: return QKeySequence(QKeySequence::HelpContents); - case UIActionPoolType_Runtime: break; - } - return QKeySequence(); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&Contents...")); - setStatusTip(QApplication::translate("UIActionPool", "Show help contents")); - } -}; - -class UIActionSimpleWebSite : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleWebSite(UIActionPool *pParent) - : UIActionSimple(pParent, ":/site_16px.png") - { - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_WebSite; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_WebSite); } - - QString shortcutExtraDataID() const - { - return QString("Web"); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&VirtualBox Web Site...")); - setStatusTip(QApplication::translate("UIActionPool", "Open the browser and go to the VirtualBox product web site")); - } -}; - -class UIActionSimpleResetWarnings : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleResetWarnings(UIActionPool *pParent) - : UIActionSimple(pParent, ":/reset_warnings_16px.png") - { - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_ResetWarnings); } - - QString shortcutExtraDataID() const - { - return QString("ResetWarnings"); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&Reset All Warnings")); - setStatusTip(QApplication::translate("UIActionPool", "Go back to showing all suppressed warnings and messages")); - } -}; - -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER -class UIActionSimpleNetworkAccessManager : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleNetworkAccessManager(UIActionPool *pParent) - : UIActionSimple(pParent, ":/nw_16px.png", ":/nw_disabled_16px.png") - { - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_NetworkAccessManager); } - - QString shortcutExtraDataID() const - { - return QString("NetworkAccessManager"); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&Network Operations Manager...")); - setStatusTip(QApplication::translate("UIActionPool", "Show Network Operations Manager")); - } -}; - -class UIActionSimpleCheckForUpdates : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleCheckForUpdates(UIActionPool *pParent) - : UIActionSimple(pParent, ":/refresh_16px.png", ":/refresh_disabled_16px.png") - { - setMenuRole(QAction::ApplicationSpecificRole); - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates; } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_CheckForUpdates); } - - QString shortcutExtraDataID() const - { - return QString("Update"); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "C&heck for Updates...")); - setStatusTip(QApplication::translate("UIActionPool", "Check for a new VirtualBox version")); - } -}; -#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ - -class UIActionSimpleAbout : public UIActionSimple -{ - Q_OBJECT; - -public: - - UIActionSimpleAbout(UIActionPool *pParent) - : UIActionSimple(pParent, ":/about_16px.png") - { - setMenuRole(QAction::AboutRole); - retranslateUi(); - } - -protected: - - /** Returns action extra-data ID. */ - virtual int extraDataID() const - { -#ifdef Q_WS_MAC - return UIExtraDataMetaDefs::MenuApplicationActionType_About; -#else /* !Q_WS_MAC */ - return UIExtraDataMetaDefs::MenuHelpActionType_About; -#endif /* !Q_WS_MAC */ - } - /** Returns action extra-data key. */ - virtual QString extraDataKey() const - { -#ifdef Q_WS_MAC - return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_About); -#else /* !Q_WS_MAC */ - return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_About); -#endif /* !Q_WS_MAC */ - } - - QString shortcutExtraDataID() const - { - return QString("About"); - } - - void retranslateUi() - { - setName(QApplication::translate("UIActionPool", "&About VirtualBox...")); - setStatusTip(QApplication::translate("UIActionPool", "Show a window with product information")); } }; @@ -844,7 +787,4 @@ void UIActionPool::preparePool() { - /* Create various actions: */ - m_pool[UIActionIndex_Simple_LogDialog] = new UIActionSimpleLogDialog(this); - #ifdef RT_OS_DARWIN /* Create 'Application' actions: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 52579) @@ -52,7 +52,4 @@ enum UIActionIndex { - /* Various actions: */ - UIActionIndex_Simple_LogDialog, - #ifdef RT_OS_DARWIN /* 'Application' menu actions: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (revision 52579) @@ -1496,4 +1496,31 @@ { setName(QApplication::translate("UIActionPool", "&Logging...", "debug action")); + } +}; + +class UIActionSimpleShowLogDialog : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleShowLogDialog(UIActionPool *pParent) + : UIActionSimple(pParent) {} + +protected: + + /** Returns action extra-data ID. */ + virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_LogDialog; } + /** Returns action extra-data key. */ + virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_LogDialog); } + + QString shortcutExtraDataID() const + { + return QString("LogWindow"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "Show &Log...", "debug action")); } }; @@ -1822,4 +1849,5 @@ m_pool[UIActionIndexRT_M_Debug_S_ShowCommandLine] = new UIActionSimpleShowCommandLine(this); m_pool[UIActionIndexRT_M_Debug_T_Logging] = new UIActionToggleLogging(this); + m_pool[UIActionIndexRT_M_Debug_S_ShowLogDialog] = new UIActionSimpleShowLogDialog(this); #endif /* VBOX_WITH_DEBUGGER_GUI */ @@ -2881,7 +2909,7 @@ /* 'Log Dialog' action: */ const bool fAllowToShowActionLogDialog = isAllowedInMenuDebug(UIExtraDataMetaDefs::RuntimeMenuDebuggerActionType_LogDialog); - action(UIActionIndex_Simple_LogDialog)->setEnabled(fAllowToShowActionLogDialog); + action(UIActionIndexRT_M_Debug_S_ShowLogDialog)->setEnabled(fAllowToShowActionLogDialog); if (fAllowToShowActionLogDialog) - pMenu->addAction(action(UIActionIndex_Simple_LogDialog)); + pMenu->addAction(action(UIActionIndexRT_M_Debug_S_ShowLogDialog)); /* Mark menu as valid: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h (revision 52579) @@ -103,4 +103,5 @@ UIActionIndexRT_M_Debug_S_ShowCommandLine, UIActionIndexRT_M_Debug_T_Logging, + UIActionIndexRT_M_Debug_S_ShowLogDialog, #endif /* VBOX_WITH_DEBUGGER_GUI */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (revision 52579) @@ -966,5 +966,5 @@ connect(actionPool()->action(UIActionIndexRT_M_Debug_T_Logging), SIGNAL(toggled(bool)), this, SLOT(sltLoggingToggled(bool))); - connect(actionPool()->action(UIActionIndex_Simple_LogDialog), SIGNAL(triggered()), + connect(actionPool()->action(UIActionIndexRT_M_Debug_S_ShowLogDialog), SIGNAL(triggered()), this, SLOT(sltShowLogDialog())); #endif /* VBOX_WITH_DEBUGGER_GUI */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp (revision 52579) @@ -561,5 +561,5 @@ prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Debug_S_ShowCommandLine)); prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Debug_T_Logging)); - prepareCopiedAction(pMenu, actionPool()->action(UIActionIndex_Simple_LogDialog)); + prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Debug_S_ShowLogDialog)); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp (revision 52579) @@ -677,4 +677,37 @@ }; +class UIActionSimpleCommonShowLogDialog : public UIActionSimple +{ + Q_OBJECT; + +public: + + UIActionSimpleCommonShowLogDialog(UIActionPool *pParent) + : UIActionSimple(pParent, + ":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png", + ":/vm_show_logs_disabled_32px.png", ":/vm_show_logs_disabled_16px.png") + { + retranslateUi(); + } + +protected: + + QString shortcutExtraDataID() const + { + return QString("ShowVMLog"); + } + + QKeySequence defaultShortcut(UIActionPoolType) const + { + return QKeySequence("Ctrl+L"); + } + + void retranslateUi() + { + setName(QApplication::translate("UIActionPool", "Show &Log...")); + setStatusTip(QApplication::translate("UIActionPool", "Show the log files of the selected virtual machine")); + } +}; + class UIActionSimpleCommonRefresh : public UIActionSimple { @@ -918,4 +951,5 @@ m_pool[UIActionIndexST_M_Group_M_Close_S_PowerOff] = new UIActionSimplePowerOff(this); m_pool[UIActionIndexST_M_Group_S_Discard] = new UIActionSimpleCommonDiscard(this); + m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleCommonShowLogDialog(this); m_pool[UIActionIndexST_M_Group_S_Refresh] = new UIActionSimpleCommonRefresh(this); m_pool[UIActionIndexST_M_Group_S_ShowInFileManager] = new UIActionSimpleCommonShowInFileManager(this); @@ -939,4 +973,5 @@ m_pool[UIActionIndexST_M_Machine_M_Close_S_PowerOff] = new UIActionSimplePowerOff(this); m_pool[UIActionIndexST_M_Machine_S_Discard] = new UIActionSimpleCommonDiscard(this); + m_pool[UIActionIndexST_M_Machine_S_ShowLogDialog] = new UIActionSimpleCommonShowLogDialog(this); m_pool[UIActionIndexST_M_Machine_S_Refresh] = new UIActionSimpleCommonRefresh(this); m_pool[UIActionIndexST_M_Machine_S_ShowInFileManager] = new UIActionSimpleCommonShowInFileManager(this); Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h (revision 52579) @@ -46,15 +46,16 @@ UIActionIndexST_M_Group_S_Rename, UIActionIndexST_M_Group_S_Remove, - UIActionIndexST_M_Group_P_StartOrShow, // - UIActionIndexST_M_Group_T_Pause, // - UIActionIndexST_M_Group_S_Reset, // + UIActionIndexST_M_Group_P_StartOrShow, + UIActionIndexST_M_Group_T_Pause, + UIActionIndexST_M_Group_S_Reset, UIActionIndexST_M_Group_M_Close, UIActionIndexST_M_Group_M_Close_S_SaveState, UIActionIndexST_M_Group_M_Close_S_Shutdown, UIActionIndexST_M_Group_M_Close_S_PowerOff, - UIActionIndexST_M_Group_S_Discard, // - UIActionIndexST_M_Group_S_Refresh, // - UIActionIndexST_M_Group_S_ShowInFileManager, // - UIActionIndexST_M_Group_S_CreateShortcut, // + UIActionIndexST_M_Group_S_Discard, + UIActionIndexST_M_Group_S_ShowLogDialog, + UIActionIndexST_M_Group_S_Refresh, + UIActionIndexST_M_Group_S_ShowInFileManager, + UIActionIndexST_M_Group_S_CreateShortcut, UIActionIndexST_M_Group_S_Sort, @@ -67,15 +68,16 @@ UIActionIndexST_M_Machine_S_Remove, UIActionIndexST_M_Machine_S_AddGroup, - UIActionIndexST_M_Machine_P_StartOrShow, // - UIActionIndexST_M_Machine_T_Pause, // - UIActionIndexST_M_Machine_S_Reset, // + UIActionIndexST_M_Machine_P_StartOrShow, + UIActionIndexST_M_Machine_T_Pause, + UIActionIndexST_M_Machine_S_Reset, UIActionIndexST_M_Machine_M_Close, UIActionIndexST_M_Machine_M_Close_S_SaveState, UIActionIndexST_M_Machine_M_Close_S_Shutdown, UIActionIndexST_M_Machine_M_Close_S_PowerOff, - UIActionIndexST_M_Machine_S_Discard, // - UIActionIndexST_M_Machine_S_Refresh, // - UIActionIndexST_M_Machine_S_ShowInFileManager, // - UIActionIndexST_M_Machine_S_CreateShortcut, // + UIActionIndexST_M_Machine_S_Discard, + UIActionIndexST_M_Machine_S_ShowLogDialog, + UIActionIndexST_M_Machine_S_Refresh, + UIActionIndexST_M_Machine_S_ShowInFileManager, + UIActionIndexST_M_Machine_S_CreateShortcut, UIActionIndexST_M_Machine_S_SortParent, Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (revision 52579) @@ -760,5 +760,5 @@ { /* Check if log could be show for the current item: */ - if (!isActionEnabled(UIActionIndex_Simple_LogDialog, QList() << pItem)) + if (!isActionEnabled(UIActionIndexST_M_Group_S_ShowLogDialog, QList() << pItem)) continue; @@ -1189,4 +1189,5 @@ pMenu->addSeparator(); pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard)); + pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog)); pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Refresh)); pMenu->addSeparator(); @@ -1205,4 +1206,5 @@ << actionPool()->action(UIActionIndexST_M_Group_S_Reset) << actionPool()->action(UIActionIndexST_M_Group_S_Discard) + << actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog) << actionPool()->action(UIActionIndexST_M_Group_S_Refresh) << actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager) @@ -1231,5 +1233,5 @@ pMenu->addSeparator(); pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard)); - pMenu->addAction(actionPool()->action(UIActionIndex_Simple_LogDialog)); + pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog)); pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh)); pMenu->addSeparator(); @@ -1250,5 +1252,5 @@ << actionPool()->action(UIActionIndexST_M_Machine_S_Reset) << actionPool()->action(UIActionIndexST_M_Machine_S_Discard) - << actionPool()->action(UIActionIndex_Simple_LogDialog) + << actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog) << actionPool()->action(UIActionIndexST_M_Machine_S_Refresh) << actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager) @@ -1397,4 +1399,5 @@ connect(actionPool()->action(UIActionIndexST_M_Group_S_Reset), SIGNAL(triggered()), this, SLOT(sltPerformResetAction())); connect(actionPool()->action(UIActionIndexST_M_Group_S_Discard), SIGNAL(triggered()), this, SLOT(sltPerformDiscardAction())); + connect(actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog), SIGNAL(triggered()), this, SLOT(sltShowLogDialog())); connect(actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager), SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager())); connect(actionPool()->action(UIActionIndexST_M_Group_S_CreateShortcut), SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction())); @@ -1407,6 +1410,6 @@ connect(actionPool()->action(UIActionIndexST_M_Machine_T_Pause), SIGNAL(toggled(bool)), this, SLOT(sltPerformPauseResumeAction(bool))); connect(actionPool()->action(UIActionIndexST_M_Machine_S_Reset), SIGNAL(triggered()), this, SLOT(sltPerformResetAction())); - connect(actionPool()->action(UIActionIndex_Simple_LogDialog), SIGNAL(triggered()), this, SLOT(sltShowLogDialog())); connect(actionPool()->action(UIActionIndexST_M_Machine_S_Discard), SIGNAL(triggered()), this, SLOT(sltPerformDiscardAction())); + connect(actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog), SIGNAL(triggered()), this, SLOT(sltShowLogDialog())); connect(actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager), SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager())); connect(actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut), SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction())); @@ -1569,4 +1572,5 @@ actionPool()->action(UIActionIndexST_M_Group_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Reset, items)); actionPool()->action(UIActionIndexST_M_Group_S_Discard)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Discard, items)); + actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_ShowLogDialog, items)); actionPool()->action(UIActionIndexST_M_Group_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Refresh, items)); actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_ShowInFileManager, items)); @@ -1583,5 +1587,5 @@ actionPool()->action(UIActionIndexST_M_Machine_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Reset, items)); actionPool()->action(UIActionIndexST_M_Machine_S_Discard)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Discard, items)); - actionPool()->action(UIActionIndex_Simple_LogDialog)->setEnabled(isActionEnabled(UIActionIndex_Simple_LogDialog, items)); + actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_ShowLogDialog, items)); actionPool()->action(UIActionIndexST_M_Machine_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Refresh, items)); actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_ShowInFileManager, items)); @@ -1691,4 +1695,9 @@ isAtLeastOneItemDiscardable(items); } + case UIActionIndexST_M_Group_S_ShowLogDialog: + case UIActionIndexST_M_Machine_S_ShowLogDialog: + { + return isAtLeastOneItemAccessible(items); + } case UIActionIndexST_M_Group_T_Pause: case UIActionIndexST_M_Machine_T_Pause: @@ -1705,8 +1714,4 @@ { return isAtLeastOneItemInaccessible(items); - } - case UIActionIndex_Simple_LogDialog: - { - return items.size() == 1 && pItem->accessible(); } case UIActionIndexST_M_Group_S_ShowInFileManager: Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (revision 52578) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (revision 52579) @@ -1145,4 +1145,5 @@ m_pContextMenuGroup->addSeparator(); m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard)); + m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog)); m_pContextMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Refresh)); m_pContextMenuGroup->addSeparator(); @@ -1165,5 +1166,5 @@ m_pContextMenuMachine->addSeparator(); m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard)); - m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndex_Simple_LogDialog)); + m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog)); m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh)); m_pContextMenuMachine->addSeparator();