Changeset 42533 in vbox for trunk/src/VBox

Timestamp:

Aug 2, 2012 12:58:08 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Group/machine menu shortcuts functionality restored.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• globals/UIActionPool.h (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (3 diffs)
• selector/UISelectorWindow.h (modified) (2 diffs)

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

@@ -52 +52 @@
      * It will be set explicitly later. */
     setMenuRole(QAction::NoRole);
+}
+
+void UIAction::showShortcut()
+{
+    if (!m_shortcut.isEmpty())
+        setShortcut(m_shortcut);
+}
+
+void UIAction::hideShortcut()
+{
+    if (!shortcut().isEmpty())
+    {
+        m_shortcut = shortcut();
+        setShortcut(QKeySequence());
+    }
 }
 

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

@@ -66 +66 @@
     virtual void updateAppearance() {}
 
+    void showShortcut();
+    void hideShortcut();
+
 protected:
 
@@ -75 +78 @@
 
     UIActionType m_type;
+    QKeySequence m_shortcut;
 };
 

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

@@ -729 +729 @@
     m_pGroupMenuAction->setVisible(m_pChooser->singleGroupSelected());
     m_pMachineMenuAction->setVisible(!m_pChooser->singleGroupSelected());
+    if (m_pGroupMenuAction->isVisible())
+    {
+        foreach (UIAction *pAction, m_machineActions)
+            pAction->hideShortcut();
+        foreach (UIAction *pAction, m_groupActions)
+            pAction->showShortcut();
+    }
+    else if (m_pMachineMenuAction->isVisible())
+    {
+        foreach (UIAction *pAction, m_groupActions)
+            pAction->hideShortcut();
+        foreach (UIAction *pAction, m_machineActions)
+            pAction->showShortcut();
+    }
 
     /* Enable/disable group actions: */
@@ -1167 +1181 @@
 //    m_pActionGroupSort = gActionPool->action(UIActionIndexSelector_Simple_Group_Sort);
 //    pMenu->addAction(m_pActionGroupSort);
+
+    /* Remember action list: */
+    m_groupActions << m_pActionGroupNewWizard << m_pActionGroupAddDialog
+                   << m_pActionGroupRenameDialog << m_pActionGroupRemoveDialog
+                   << m_pActionGroupStartOrShow << m_pActionGroupPauseAndResume
+                   << m_pActionGroupReset << m_pActionGroupRefresh
+                   << m_pActionGroupLogDialog << m_pActionGroupShowInFileManager
+                   << m_pActionGroupCreateShortcut /* << m_pActionGroupSort */;
 }
 
@@ -1209 +1231 @@
 //    m_pActionMachineSort = gActionPool->action(UIActionIndexSelector_Simple_Machine_Sort);
 //    pMenu->addAction(m_pActionMachineSort);
+
+    /* Remember action list: */
+    m_machineActions << m_pActionMachineNewWizard << m_pActionMachineAddDialog
+                     << m_pActionMachineSettingsDialog << m_pActionMachineCloneWizard
+                     << m_pActionMachineRemoveDialog << m_pActionMachineStartOrShow
+                     << m_pActionMachineDiscard << m_pActionMachinePauseAndResume
+                     << m_pActionMachineReset << m_pActionMachineRefresh
+                     << m_pActionMachineLogDialog << m_pActionMachineShowInFileManager
+                     << m_pActionMachineCreateShortcut /* << m_pActionMachineSort */;
 }
 

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

@@ -167 +167 @@
     UIAction *m_pExitAction;
 
-    /* 'Machine' menu action pointers: */
+    /* 'Group' menu action pointers: */
+    QList<UIAction*> m_groupActions;
     QAction *m_pGroupMenuAction;
     QMenu *m_pGroupMenu;
@@ -184 +185 @@
 
     /* 'Machine' menu action pointers: */
+    QList<UIAction*> m_machineActions;
     QAction *m_pMachineMenuAction;
     QMenu *m_pMachineMenu;