Changeset 42853 in vbox for trunk

Timestamp:

Aug 16, 2012 6:08:14 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Show Log action will now only be available for single selected VM.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (10 diffs)
• selector/UISelectorWindow.h (modified) (2 diffs)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)

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

@@ -252 +252 @@
     {
         setText(QApplication::translate("UIActionPool", "Show &Log..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the log files of the selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Show the log files of the selected virtual machine"));
     }
 };

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

@@ -1148 +1148 @@
     m_pAction_Common_Reset             = gActionPool->action(UIActionIndexSelector_Simple_Common_Reset);
     m_pAction_Common_Discard           = gActionPool->action(UIActionIndexSelector_Simple_Common_Discard);
-    m_pAction_Common_LogDialog         = gActionPool->action(UIActionIndex_Simple_LogDialog);
     m_pAction_Common_Refresh           = gActionPool->action(UIActionIndexSelector_Simple_Common_Refresh);
     m_pAction_Common_ShowInFileManager = gActionPool->action(UIActionIndexSelector_Simple_Common_ShowInFileManager);
@@ -1171 +1170 @@
     m_pAction_Machine_Remove     = gActionPool->action(UIActionIndexSelector_Simple_Machine_Remove);
     m_pAction_Machine_AddGroup   = gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroup);
+    m_pAction_Machine_LogDialog  = gActionPool->action(UIActionIndex_Simple_LogDialog);
     m_pAction_Machine_SortParent = gActionPool->action(UIActionIndexSelector_Simple_Machine_SortParent);
 }
@@ -1193 +1193 @@
     pMenu->addSeparator();
     pMenu->addAction(m_pAction_Common_Discard);
-    pMenu->addAction(m_pAction_Common_LogDialog);
     pMenu->addAction(m_pAction_Common_Refresh);
     pMenu->addSeparator();
@@ -1229 +1228 @@
     pMenu->addSeparator();
     pMenu->addAction(m_pAction_Common_Discard);
-    pMenu->addAction(m_pAction_Common_LogDialog);
+    pMenu->addAction(m_pAction_Machine_LogDialog);
     pMenu->addAction(m_pAction_Common_Refresh);
     pMenu->addSeparator();
@@ -1244 +1243 @@
                      << m_pAction_Machine_Remove
                      << m_pAction_Machine_AddGroup
+                     << m_pAction_Machine_LogDialog
                      << m_pAction_Machine_SortParent;
 }
@@ -1399 +1399 @@
     connect(m_pAction_Common_Reset, SIGNAL(triggered()), this, SLOT(sltPerformResetAction()));
     connect(m_pAction_Common_Discard, SIGNAL(triggered()), this, SLOT(sltPerformDiscardAction()));
-    connect(m_pAction_Common_LogDialog, SIGNAL(triggered()), this, SLOT(sltShowLogDialog()));
     connect(m_pAction_Common_Refresh, SIGNAL(triggered()), this, SLOT(sltPerformRefreshAction()));
     connect(m_pAction_Common_ShowInFileManager, SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager()));
@@ -1411 +1410 @@
     connect(m_pAction_Machine_Settings, SIGNAL(triggered()), this, SLOT(sltShowMachineSettingsDialog()));
     connect(m_pAction_Machine_Clone, SIGNAL(triggered()), this, SLOT(sltShowCloneMachineWizard()));
+    connect(m_pAction_Machine_LogDialog, SIGNAL(triggered()), this, SLOT(sltShowLogDialog()));
 
     /* 'Group/Close' menu connections: */
@@ -1606 +1606 @@
     m_pAction_Machine_Remove->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Remove, items));
     m_pAction_Machine_AddGroup->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_AddGroup, items));
+    m_pAction_Machine_LogDialog->setEnabled(isActionEnabled(UIActionIndex_Simple_LogDialog, items));
     m_pAction_Machine_SortParent->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_SortParent, items));
 
@@ -1613 +1614 @@
     m_pAction_Common_Reset->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_Reset, items));
     m_pAction_Common_Discard->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_Discard, items));
-    m_pAction_Common_LogDialog->setEnabled(isActionEnabled(UIActionIndex_Simple_LogDialog, items));
     m_pAction_Common_Refresh->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_Refresh, items));
     m_pAction_Common_ShowInFileManager->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_ShowInFileManager, items));
@@ -1725 +1725 @@
         }
         case UIActionIndex_Simple_LogDialog:
+        {
+            return items.size() == 1 && pItem->accessible();
+        }
         case UIActionIndexSelector_Simple_Common_ShowInFileManager:
         {

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

@@ -199 +199 @@
     UIAction *m_pAction_Common_Reset;
     UIAction *m_pAction_Common_Discard;
-    UIAction *m_pAction_Common_LogDialog;
     UIAction *m_pAction_Common_Refresh;
     UIAction *m_pAction_Common_ShowInFileManager;
@@ -230 +229 @@
     UIAction *m_pAction_Machine_Remove;
     UIAction *m_pAction_Machine_AddGroup;
+    UIAction *m_pAction_Machine_LogDialog;
     UIAction *m_pAction_Machine_SortParent;
     /* 'Machine / Close' menu action pointers: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -979 +979 @@
     m_pContextMenuGroup->addSeparator();
     m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Discard));
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndex_Simple_LogDialog));
     m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Refresh));
     m_pContextMenuGroup->addSeparator();