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

Timestamp:

Aug 6, 2012 5:01:21 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Selector menu fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UIActionPoolSelector.cpp (modified) (1 diff)
• UISelectorShortcuts.cpp (modified) (1 diff)
• UISelectorShortcuts.h (modified) (1 diff)
• UISelectorWindow.cpp (modified) (4 diffs)
• UISelectorWindow.h (modified) (1 diff)

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

@@ -265 +265 @@
     void retranslateUi()
     {
-        setText(QApplication::translate("UIActionPool", "&Remove group..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Remove the selected virtual machine group"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::RemoveVMShortcut));
+        setText(QApplication::translate("UIActionPool", "&Break group..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Break the selected virtual machine group"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::BreakVMGroupShortcut));
     }
 };

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

@@ -36 +36 @@
     m_Shortcuts[SettingsVMShortcut]          = UIKeySequence("SettingsVM",          "Ctrl+S");
     m_Shortcuts[CloneVMShortcut]             = UIKeySequence("CloneVM",             "Ctrl+O");
-    m_Shortcuts[RemoveVMGroupShortcut]       = UIKeySequence("RemoveVMGroup",       "Ctrl+R");
+    m_Shortcuts[BreakVMGroupShortcut]        = UIKeySequence("BreakVMGroup",        "Ctrl+B");
     m_Shortcuts[RemoveVMShortcut]            = UIKeySequence("RemoveVM",            "Ctrl+R");
     m_Shortcuts[RenameVMGroupShortcut]       = UIKeySequence("RenameVMGroup",       "Ctrl+M");

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

@@ -38 +38 @@
         SettingsVMShortcut,
         CloneVMShortcut,
-        RemoveVMGroupShortcut,
+        BreakVMGroupShortcut,
         RemoveVMShortcut,
         RenameVMGroupShortcut,

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

@@ -720 +720 @@
                                                  machine.GetName(), machine.GetId());
     }
-}
-
-void UISelectorWindow::sltMachineMenuAboutToShow()
-{
-    /* Get selected items: */
-    QList<UIVMItem*> items = currentItems();
-    /* Enable/disable 'Machine/Close' menu according logic: */
-    m_pMachineCloseMenuAction->setEnabled(isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, items));
 }
 
@@ -1308 +1300 @@
 
     /* 'Group' menu connections: */
-    connect(m_pGroupMenu, SIGNAL(aboutToShow()), this, SLOT(sltMachineMenuAboutToShow()));
     connect(m_pActionGroupAddDialog, SIGNAL(triggered()), this, SLOT(sltShowAddMachineDialog()));
     connect(m_pActionGroupStartOrShow, SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
@@ -1319 +1310 @@
 
     /* 'Machine' menu connections: */
-    connect(m_pMachineMenu, SIGNAL(aboutToShow()), this, SLOT(sltMachineMenuAboutToShow()));
     connect(m_pActionMachineAddDialog, SIGNAL(triggered()), this, SLOT(sltShowAddMachineDialog()));
     connect(m_pActionMachineSettingsDialog, SIGNAL(triggered()), this, SLOT(sltShowMachineSettingsDialog()));
@@ -1534 +1524 @@
 
     /* Enable/disable machine-close actions: */
+    m_pMachineCloseMenuAction->setEnabled(isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, items));
     m_pACPIShutdownAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_ACPIShutdown, items));
     m_pPowerOffAction->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Close_PowerOff, items));

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

@@ -99 +99 @@
     void sltShowMachineInFileManager();
     void sltPerformCreateShortcutAction();
-    void sltMachineMenuAboutToShow();
     void sltMachineCloseMenuAboutToShow();