Changeset 41047 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 24, 2012 3:56:03 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77611

Message:

FE/Qt: Move show-log action from selector action-pool to global action-pool, reuse this action in running VM debug menu for developer purposes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (2 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• runtime/UIMachineMenuBar.cpp (modified) (1 diff)
• selector/UIActionPoolSelector.cpp (modified) (2 diffs)
• selector/UIActionPoolSelector.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -200 +200 @@
     setMenu(new UIMenuInterface);
 }
+
+class UISimpleActionLogDialog : public UISimpleAction
+{
+    Q_OBJECT;
+
+public:
+
+    UISimpleActionLogDialog(QObject *pParent)
+        : UISimpleAction(pParent, QSize(32, 32), QSize(16, 16),
+                         ":/vm_show_logs_32px.png", ":/show_logs_16px.png",
+                         ":/vm_show_logs_disabled_32px.png", ":/show_logs_disabled_16px.png")
+    {
+        switch (gActionPool->type())
+        {
+            case UIActionPoolType_Selector:
+                setShortcut(gSS->keySequence(UISelectorShortcuts::ShowVMLogShortcut));
+                break;
+            case UIActionPoolType_Runtime:
+                break;
+        }
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "Show &Log..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Show the log files of the selected virtual machine"));
+    }
+};
 
 class MenuHelpAction : public UIMenuAction
@@ -510 +541 @@
 void UIActionPool::createActions()
 {
+    /* Various dialog actions: */
+    m_pool[UIActionIndex_Simple_LogDialog] = new UISimpleActionLogDialog(this);
     /* 'Help' actions: */
     m_pool[UIActionIndex_Simple_Help] = new ShowHelpAction(this);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -39 +39 @@
 enum UIActionIndex
 {
+    /* Various dialog actions: */
+    UIActionIndex_Simple_LogDialog,
+
     /* 'Help' menu actions: */
     UIActionIndex_Menu_Help,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -40 +40 @@
 #include "VBoxVMInformationDlg.h"
 #include "UISettingsDialogSpecific.h"
+#include "UIVMLogViewer.h"
 #ifdef Q_WS_MAC
 # include "DockIconPreview.h"
@@ -381 +382 @@
     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Logging), SIGNAL(toggled(bool)),
             this, SLOT(sltLoggingToggled(bool)));
+    connect(gActionPool->action(UIActionIndex_Simple_LogDialog), SIGNAL(triggered()),
+            this, SLOT(sltShowLogDialog()));
 #endif
 }
@@ -1572 +1575 @@
 }
 
+void UIMachineLogic::sltShowLogDialog()
+{
+    /* Show VM Log Viewer: */
+    UIVMLogViewer::showLogViewerFor(mainMachineWindow()->machineWindow(), session().GetMachine());
+}
+
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -178 +178 @@
     void sltShowDebugCommandLine();
     void sltLoggingToggled(bool);
+    void sltShowLogDialog();
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -255 +255 @@
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_CommandLine));
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Logging));
+    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_LogDialog));
 }
 #endif /* VBOX_WITH_DEBUGGER_GUI */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -437 +437 @@
 };
 
-class UISimpleActionLogDialog : public UISimpleAction
-{
-    Q_OBJECT;
-
-public:
-
-    UISimpleActionLogDialog(QObject *pParent)
-        : UISimpleAction(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_show_logs_32px.png", ":/show_logs_16px.png",
-                         ":/vm_show_logs_disabled_32px.png", ":/show_logs_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "Show &Log..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the log files of the selected virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::ShowVMLogShortcut));
-    }
-};
-
 class UISimpleActionShowInFileManager : public UISimpleAction
 {
@@ -654 +630 @@
     m_pool[UIActionIndexSelector_Simple_Machine_Reset] = new UISimpleActionReset(this);
     m_pool[UIActionIndexSelector_Simple_Machine_Refresh] = new UISimpleActionRefresh(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_LogDialog] = new UISimpleActionLogDialog(this);
     m_pool[UIActionIndexSelector_Simple_Machine_ShowInFileManager] = new UISimpleActionShowInFileManager(this);
     m_pool[UIActionIndexSelector_Simple_Machine_CreateShortcut] = new UISimpleActionCreateShortcut(this);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

@@ -46 +46 @@
     UIActionIndexSelector_Simple_Machine_Reset,
     UIActionIndexSelector_Simple_Machine_Refresh,
-    UIActionIndexSelector_Simple_Machine_LogDialog,
     UIActionIndexSelector_Simple_Machine_ShowInFileManager,
     UIActionIndexSelector_Simple_Machine_CreateShortcut,

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -690 +690 @@
 
         /* Check if log could be show for the current item: */
-        if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_LogDialog, pItem, items))
+        if (!isActionEnabled(UIActionIndex_Simple_LogDialog, pItem, items))
             continue;
 
@@ -841 +841 @@
     m_pPowerOffAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_PowerOff, pItem, items));
     m_pRefreshAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Refresh, pItem, items));
-    m_pLogDialogAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_LogDialog, pItem, items));
+    m_pLogDialogAction->setEnabled(isActionEnabled(UIActionIndex_Simple_LogDialog, pItem, items));
     m_pShowInFileManagerAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, pItem, items));
     m_pCreateShortcutAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, pItem, items));
@@ -1416 +1416 @@
     m_pRefreshAction = gActionPool->action(UIActionIndexSelector_Simple_Machine_Refresh);
     pMenu->addAction(m_pRefreshAction);
-    m_pLogDialogAction = gActionPool->action(UIActionIndexSelector_Simple_Machine_LogDialog);
+    m_pLogDialogAction = gActionPool->action(UIActionIndex_Simple_LogDialog);
     pMenu->addAction(m_pLogDialogAction);
     pMenu->addSeparator();
@@ -1906 +1906 @@
                 return pItem && !pItem->accessible();
             }
-            case UIActionIndexSelector_Simple_Machine_LogDialog:
+            case UIActionIndex_Simple_LogDialog:
             case UIActionIndexSelector_Simple_Machine_ShowInFileManager:
             case UIActionIndexSelector_Simple_Machine_Sort: