Changeset 42760 in vbox for trunk/src/VBox

Timestamp:

Aug 10, 2012 4:53:11 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM Selector: Action pool refactoring/cleanup (part 1).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• selector/UIActionPoolSelector.cpp (modified) (19 diffs)
• selector/UIActionPoolSelector.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (29 diffs)
• selector/UISelectorWindow.h (modified) (3 diffs)
• selector/graphics/chooser/UIGChooserItemMachine.cpp (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (4 diffs)

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

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

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

@@ -179 +179 @@
 };
 
-class UIActionSimpleGroupNewWizard : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupNewWizard(QObject *pParent)
+class UIActionSimpleGroupRename : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleGroupRename(QObject *pParent)
+        : UIActionSimple(pParent, ":/name_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "Rena&me Group..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Rename the selected virtual machine group"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::RenameVMGroupShortcut));
+    }
+};
+
+class UIActionSimpleGroupRemove : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleGroupRemove(QObject *pParent)
+        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+                         ":/vm_delete_32px.png", ":/delete_16px.png",
+                         ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "&Break Group..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Break the selected virtual machine group"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::BreakVMGroupShortcut));
+    }
+};
+
+class UIActionSimpleGroupSort : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleGroupSort(QObject *pParent)
+        : UIActionSimple(pParent/*, ":/settings_16px.png", ":/settings_dis_16px.png"*/)
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "Sort Group"));
+        setStatusTip(QApplication::translate("UIActionPool", "Sort the items of the selected virtual machine group alphabetically"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::SortGroup));
+    }
+};
+
+
+class UIActionMenuMachine : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionMenuMachine(QObject *pParent)
+        : UIActionMenu(pParent)
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        menu()->setTitle(QApplication::translate("UIActionPool", "&Machine"));
+    }
+};
+
+class UIActionSimpleMachineAddGroup : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleMachineAddGroup(QObject *pParent)
+        : UIActionSimple(pParent, ":/add_shared_folder_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "&Add Group..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Add a new group based on the items selected"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::AddVMGroupShortcut));
+    }
+};
+
+class UIActionSimpleMachineSettings : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleMachineSettings(QObject *pParent)
+        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+                         ":/vm_settings_32px.png", ":/settings_16px.png",
+                         ":/vm_settings_disabled_32px.png", ":/settings_dis_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "&Settings..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Manage the virtual machine settings"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::SettingsVMShortcut));
+        setToolTip(text().remove('&').remove('.') +
+                   (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+class UIActionSimpleMachineClone : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleMachineClone(QObject *pParent)
+        : UIActionSimple(pParent, ":/vm_clone_16px.png", ":/vm_clone_disabled_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "Cl&one..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Clone the selected virtual machine"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::CloneVMShortcut));
+    }
+};
+
+class UIActionSimpleMachineRemove : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleMachineRemove(QObject *pParent)
+        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+                         ":/vm_delete_32px.png", ":/delete_16px.png",
+                         ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setText(QApplication::translate("UIActionPool", "&Remove..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Remove the selected virtual machines"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::RemoveVMShortcut));
+    }
+};
+
+
+class UIActionSimpleCommonNew : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonNew(QObject *pParent)
         : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/new_16px.png")
     {
@@ -195 +379 @@
     void retranslateUi()
     {
-        setText(QApplication::translate("UIActionPool", "&New Machine..."));
+        setText(QApplication::translate("UIActionPool", "&New..."));
         setStatusTip(QApplication::translate("UIActionPool", "Create a new virtual machine"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::NewVMShortcut));
@@ -203 +387 @@
 };
 
-class UIActionSimpleGroupAddDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupAddDialog(QObject *pParent)
+class UIActionSimpleCommonAdd : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonAdd(QObject *pParent)
         : UIActionSimple(pParent, ":/vm_add_16px.png")
     {
@@ -219 +403 @@
     void retranslateUi()
     {
-        setText(QApplication::translate("UIActionPool", "&Add Machine..."));
+        setText(QApplication::translate("UIActionPool", "&Add..."));
         setStatusTip(QApplication::translate("UIActionPool", "Add an existing virtual machine"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::AddVMShortcut));
@@ -225 +409 @@
 };
 
-class UIActionSimpleGroupRenameDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupRenameDialog(QObject *pParent)
-        : UIActionSimple(pParent, ":/name_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "Rena&me Group..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Rename the selected virtual machine group"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::RenameVMGroupShortcut));
-    }
-};
-
-class UIActionSimpleGroupRemoveDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupRemoveDialog(QObject *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_delete_32px.png", ":/delete_16px.png",
-                         ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Break Group..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Break the selected virtual machine group"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::BreakVMGroupShortcut));
-    }
-};
-
-class UIActionStateGroupStartOrShow : public UIActionState
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionStateGroupStartOrShow(QObject *pParent)
+class UIActionStateCommonStartOrShow : public UIActionState
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionStateCommonStartOrShow(QObject *pParent)
         : UIActionState(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_start_32px.png", ":/start_16px.png",
-                         ":/vm_start_disabled_32px.png", ":/start_dis_16px.png")
+                        ":/vm_start_32px.png", ":/start_16px.png",
+                        ":/vm_start_disabled_32px.png", ":/start_dis_16px.png")
     {
         retranslateUi();
@@ -294 +432 @@
             {
                 setText(QApplication::translate("UIActionPool", "S&tart"));
-                setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machine"));
+                setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machines"));
                 setShortcut(gSS->keySequence(UISelectorShortcuts::StartVMShortcut));
                 setToolTip(text().remove('&').remove('.') +
@@ -303 +441 @@
             {
                 setText(QApplication::translate("UIActionPool", "S&how"));
-                setStatusTip(QApplication::translate("UIActionPool", "Switch to the window of the selected virtual machine"));
+                setStatusTip(QApplication::translate("UIActionPool", "Switch to the windows of the selected virtual machines"));
                 setShortcut(gSS->keySequence(UISelectorShortcuts::StartVMShortcut));
                 setToolTip(text().remove('&').remove('.') +
@@ -315 +453 @@
 };
 
-class UIActionToggleGroupPauseAndResume : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionToggleGroupPauseAndResume(QObject *pParent)
+class UIActionToggleCommonPauseAndResume : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionToggleCommonPauseAndResume(QObject *pParent)
         : UIActionToggle(pParent, QSize(32, 32), QSize(16, 16),
                          ":/vm_pause_32px.png", ":/pause_16px.png",
@@ -334 +472 @@
     {
         setText(QApplication::translate("UIActionPool", "&Pause"));
-        setStatusTip(QApplication::translate("UIActionPool", "Suspend the execution of the virtual machine"));
+        setStatusTip(QApplication::translate("UIActionPool", "Suspend the execution of the selected virtual machines"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::PauseVMShortcut));
     }
 };
 
-class UIActionSimpleGroupReset : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupReset(QObject *pParent)
+class UIActionSimpleCommonReset : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonReset(QObject *pParent)
         : UIActionSimple(pParent, ":/reset_16px.png", ":/reset_disabled_16px.png")
     {
@@ -356 +494 @@
     {
         setText(QApplication::translate("UIActionPool", "&Reset"));
-        setStatusTip(QApplication::translate("UIActionPool", "Reset the virtual machine"));
+        setStatusTip(QApplication::translate("UIActionPool", "Reset the selected virtual machines"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::ResetVMShortcut));
     }
 };
 
-class UIActionSimpleGroupRefresh : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupRefresh(QObject *pParent)
+class UIActionSimpleCommonDiscard : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonDiscard(QObject *pParent)
+        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
+                         ":/vm_discard_32px.png", ":/discard_16px.png",
+                         ":/vm_discard_disabled_32px.png", ":/discard_dis_16px.png")
+    {
+        retranslateUi();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        setIconText(QApplication::translate("UIActionPool", "Discard"));
+        setText(QApplication::translate("UIActionPool", "D&iscard saved state..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Discard the saved state of the selected virtual machines"));
+        setShortcut(gSS->keySequence(UISelectorShortcuts::DiscardVMShortcut));
+        setToolTip(text().remove('&').remove('.') +
+                   (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+class UIActionSimpleCommonRefresh : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonRefresh(QObject *pParent)
         : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
                          ":/refresh_32px.png", ":/refresh_16px.png",
@@ -385 +550 @@
 };
 
-class UIActionSimpleGroupShowInFileManager : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupShowInFileManager(QObject *pParent)
+class UIActionSimpleCommonShowInFileManager : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonShowInFileManager(QObject *pParent)
         : UIActionSimple(pParent, ":/vm_open_filemanager_16px.png", ":/vm_open_filemanager_disabled_16px.png")
     {
@@ -403 +568 @@
 #if defined(Q_WS_MAC)
         setText(QApplication::translate("UIActionPool", "Show in Finder"));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in Finder."));
+        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in Finder"));
 #elif defined(Q_WS_WIN)
         setText(QApplication::translate("UIActionPool", "Show in Explorer"));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in Explorer."));
+        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in Explorer"));
 #else
         setText(QApplication::translate("UIActionPool", "Show in File Manager"));
@@ -415 +580 @@
 };
 
-class UIActionSimpleGroupCreateShortcut : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupCreateShortcut(QObject *pParent)
+class UIActionSimpleCommonCreateShortcut : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleCommonCreateShortcut(QObject *pParent)
         : UIActionSimple(pParent, ":/vm_create_shortcut_16px.png", ":/vm_create_shortcut_disabled_16px.png")
     {
@@ -433 +598 @@
 #if defined(Q_WS_MAC)
         setText(QApplication::translate("UIActionPool", "Create Alias on Desktop"));
-        setStatusTip(QApplication::translate("UIActionPool", "Creates an alias file to the VirtualBox Machine Definition file on your desktop."));
+        setStatusTip(QApplication::translate("UIActionPool", "Creates an alias file to the VirtualBox Machine Definition file on your desktop"));
 #else
         setText(QApplication::translate("UIActionPool", "Create Shortcut on Desktop"));
-        setStatusTip(QApplication::translate("UIActionPool", "Creates an shortcut file to the VirtualBox Machine Definition file on your desktop."));
-#endif
-        setShortcut(gSS->keySequence(UISelectorShortcuts::CreateVMAliasShortcut));
-    }
-};
-
-class UIActionSimpleGroupSort : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleGroupSort(QObject *pParent)
-        : UIActionSimple(pParent/*, ":/settings_16px.png", ":/settings_dis_16px.png"*/)
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "Sort Group"));
-        setStatusTip(QApplication::translate("UIActionPool", "Sort the items of the selected group alphabetically"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::SortGroup));
-    }
-};
-
-
-class UIActionMenuMachine : public UIActionMenu
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionMenuMachine(QObject *pParent)
-        : UIActionMenu(pParent)
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        menu()->setTitle(QApplication::translate("UIActionPool", "&Machine"));
-    }
-};
-
-class UIActionSimpleMachineNewWizard : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineNewWizard(QObject *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16), ":/vm_new_32px.png", ":/new_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&New..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Create a new virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::NewVMShortcut));
-        setToolTip(text().remove('&').remove('.') +
-                   (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
-    }
-};
-
-class UIActionSimpleMachineAddDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineAddDialog(QObject *pParent)
-        : UIActionSimple(pParent, ":/vm_add_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Add..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Add an existing virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::AddVMShortcut));
-    }
-};
-
-class UIActionSimpleMachineAddGroupDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineAddGroupDialog(QObject *pParent)
-        : UIActionSimple(pParent, ":/add_shared_folder_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Add Group..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Add a new group based on the items selected"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::AddVMGroupShortcut));
-    }
-};
-
-class UIActionSimpleMachineSettingsDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineSettingsDialog(QObject *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_settings_32px.png", ":/settings_16px.png",
-                         ":/vm_settings_disabled_32px.png", ":/settings_dis_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Manage the virtual machine settings"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::SettingsVMShortcut));
-        setToolTip(text().remove('&').remove('.') +
-                   (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
-    }
-};
-
-class UIActionSimpleMachineCloneWizard : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineCloneWizard(QObject *pParent)
-        : UIActionSimple(pParent, ":/vm_clone_16px.png", ":/vm_clone_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "Cl&one..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Clone the selected virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::CloneVMShortcut));
-    }
-};
-
-class UIActionSimpleMachineRemoveDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineRemoveDialog(QObject *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_delete_32px.png", ":/delete_16px.png",
-                         ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Remove..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Remove the selected virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::RemoveVMShortcut));
-    }
-};
-
-class UIActionStateMachineStartOrShow : public UIActionState
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionStateMachineStartOrShow(QObject *pParent)
-        : UIActionState(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_start_32px.png", ":/start_16px.png",
-                         ":/vm_start_disabled_32px.png", ":/start_dis_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        switch (m_iState)
-        {
-            case 1:
-            {
-                setText(QApplication::translate("UIActionPool", "S&tart"));
-                setStatusTip(QApplication::translate("UIActionPool", "Start the selected virtual machine"));
-                setShortcut(gSS->keySequence(UISelectorShortcuts::StartVMShortcut));
-                setToolTip(text().remove('&').remove('.') +
-                           (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
-                break;
-            }
-            case 2:
-            {
-                setText(QApplication::translate("UIActionPool", "S&how"));
-                setStatusTip(QApplication::translate("UIActionPool", "Switch to the window of the selected virtual machine"));
-                setShortcut(gSS->keySequence(UISelectorShortcuts::StartVMShortcut));
-                setToolTip(text().remove('&').remove('.') +
-                           (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
-                break;
-            }
-            default:
-                break;
-        }
-    }
-};
-
-class UIActionSimpleMachineDiscard : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineDiscard(QObject *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_discard_32px.png", ":/discard_16px.png",
-                         ":/vm_discard_disabled_32px.png", ":/discard_dis_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setIconText(QApplication::translate("UIActionPool", "Discard"));
-        setText(QApplication::translate("UIActionPool", "D&iscard saved state..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Discard the saved state of the selected virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::DiscardVMShortcut));
-        setToolTip(text().remove('&').remove('.') +
-                   (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
-    }
-};
-
-class UIActionToggleMachinePauseAndResume : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionToggleMachinePauseAndResume(QObject *pParent)
-        : UIActionToggle(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/vm_pause_32px.png", ":/pause_16px.png",
-                         ":/vm_pause_disabled_32px.png", ":/pause_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Pause"));
-        setStatusTip(QApplication::translate("UIActionPool", "Suspend the execution of the virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::PauseVMShortcut));
-    }
-};
-
-class UIActionSimpleMachineReset : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineReset(QObject *pParent)
-        : UIActionSimple(pParent, ":/reset_16px.png", ":/reset_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "&Reset"));
-        setStatusTip(QApplication::translate("UIActionPool", "Reset the virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::ResetVMShortcut));
-    }
-};
-
-class UIActionSimpleMachineRefresh : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineRefresh(QObject *pParent)
-        : UIActionSimple(pParent, QSize(32, 32), QSize(16, 16),
-                         ":/refresh_32px.png", ":/refresh_16px.png",
-                         ":/refresh_disabled_32px.png", ":/refresh_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-        setText(QApplication::translate("UIActionPool", "Re&fresh..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Refresh the accessibility state of the selected virtual machine"));
-        setShortcut(gSS->keySequence(UISelectorShortcuts::RefreshVMShortcut));
-    }
-};
-
-class UIActionSimpleMachineShowInFileManager : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineShowInFileManager(QObject *pParent)
-        : UIActionSimple(pParent, ":/vm_open_filemanager_16px.png", ":/vm_open_filemanager_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-#if defined(Q_WS_MAC)
-        setText(QApplication::translate("UIActionPool", "Show in Finder"));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in Finder."));
-#elif defined(Q_WS_WIN)
-        setText(QApplication::translate("UIActionPool", "Show in Explorer"));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in Explorer."));
-#else
-        setText(QApplication::translate("UIActionPool", "Show in File Manager"));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the VirtualBox Machine Definition file in the File Manager"));
-#endif
-        setShortcut(gSS->keySequence(UISelectorShortcuts::ShowVMInFileManagerShortcut));
-    }
-};
-
-class UIActionSimpleMachineCreateShortcut : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleMachineCreateShortcut(QObject *pParent)
-        : UIActionSimple(pParent, ":/vm_create_shortcut_16px.png", ":/vm_create_shortcut_disabled_16px.png")
-    {
-        retranslateUi();
-    }
-
-protected:
-
-    void retranslateUi()
-    {
-#if defined(Q_WS_MAC)
-        setText(QApplication::translate("UIActionPool", "Create Alias on Desktop"));
-        setStatusTip(QApplication::translate("UIActionPool", "Creates an alias file to the VirtualBox Machine Definition file on your desktop."));
-#else
-        setText(QApplication::translate("UIActionPool", "Create Shortcut on Desktop"));
-        setStatusTip(QApplication::translate("UIActionPool", "Creates an shortcut file to the VirtualBox Machine Definition file on your desktop."));
+        setStatusTip(QApplication::translate("UIActionPool", "Creates an shortcut file to the VirtualBox Machine Definition file on your desktop"));
 #endif
         setShortcut(gSS->keySequence(UISelectorShortcuts::CreateVMAliasShortcut));
@@ -863 +647 @@
     {
         menu()->setTitle(QApplication::translate("UIActionPool", "&Close"));
-        menu()->setStatusTip(QApplication::translate("UIActionPool", "Close the virtual machine"));
     }
 };
@@ -884 +667 @@
     {
         setText(QApplication::translate("UIActionPool", "Save State"));
-        setStatusTip(QApplication::translate("UIActionPool", "Save the machine state of the selected virtual machine"));
+        setStatusTip(QApplication::translate("UIActionPool", "Save the machine state of the selected virtual machines"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::SaveVMShortcut));
     }
@@ -906 +689 @@
     {
         setText(QApplication::translate("UIActionPool", "ACPI Sh&utdown"));
-        setStatusTip(QApplication::translate("UIActionPool", "Send the ACPI Power Button press event to the virtual machine"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send the ACPI Power Button press event to the selected virtual machines"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::ACPIShutdownVMShortcut));
     }
@@ -928 +711 @@
     {
         setText(QApplication::translate("UIActionPool", "Po&wer Off"));
-        setStatusTip(QApplication::translate("UIActionPool", "Power off the virtual machine"));
+        setStatusTip(QApplication::translate("UIActionPool", "Power off the selected virtual machines"));
         setShortcut(gSS->keySequence(UISelectorShortcuts::PowerOffVMShortcut));
     }
@@ -973 +756 @@
 
     /* 'Group' actions: */
-    m_pool[UIActionIndexSelector_Simple_Group_NewWizard] = new UIActionSimpleGroupNewWizard(this);
-    m_pool[UIActionIndexSelector_Simple_Group_AddDialog] = new UIActionSimpleGroupAddDialog(this);
-    m_pool[UIActionIndexSelector_Simple_Group_RenameDialog] = new UIActionSimpleGroupRenameDialog(this);
-    m_pool[UIActionIndexSelector_Simple_Group_RemoveDialog] = new UIActionSimpleGroupRemoveDialog(this);
-    m_pool[UIActionIndexSelector_State_Group_StartOrShow] = new UIActionStateGroupStartOrShow(this);
-    m_pool[UIActionIndexSelector_Toggle_Group_PauseAndResume] = new UIActionToggleGroupPauseAndResume(this);
-    m_pool[UIActionIndexSelector_Simple_Group_Reset] = new UIActionSimpleGroupReset(this);
-    m_pool[UIActionIndexSelector_Simple_Group_Refresh] = new UIActionSimpleGroupRefresh(this);
-    m_pool[UIActionIndexSelector_Simple_Group_ShowInFileManager] = new UIActionSimpleGroupShowInFileManager(this);
-    m_pool[UIActionIndexSelector_Simple_Group_CreateShortcut] = new UIActionSimpleGroupCreateShortcut(this);
+    m_pool[UIActionIndexSelector_Simple_Group_Rename] = new UIActionSimpleGroupRename(this);
+    m_pool[UIActionIndexSelector_Simple_Group_Remove] = new UIActionSimpleGroupRemove(this);
     m_pool[UIActionIndexSelector_Simple_Group_Sort] = new UIActionSimpleGroupSort(this);
 
     /* 'Machine' actions: */
-    m_pool[UIActionIndexSelector_Simple_Machine_NewWizard] = new UIActionSimpleMachineNewWizard(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_AddDialog] = new UIActionSimpleMachineAddDialog(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_AddGroupDialog] = new UIActionSimpleMachineAddGroupDialog(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_SettingsDialog] = new UIActionSimpleMachineSettingsDialog(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_CloneWizard] = new UIActionSimpleMachineCloneWizard(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_RemoveDialog] = new UIActionSimpleMachineRemoveDialog(this);
-    m_pool[UIActionIndexSelector_State_Machine_StartOrShow] = new UIActionStateMachineStartOrShow(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_Discard] = new UIActionSimpleMachineDiscard(this);
-    m_pool[UIActionIndexSelector_Toggle_Machine_PauseAndResume] = new UIActionToggleMachinePauseAndResume(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_Reset] = new UIActionSimpleMachineReset(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_Refresh] = new UIActionSimpleMachineRefresh(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_ShowInFileManager] = new UIActionSimpleMachineShowInFileManager(this);
-    m_pool[UIActionIndexSelector_Simple_Machine_CreateShortcut] = new UIActionSimpleMachineCreateShortcut(this);
+    m_pool[UIActionIndexSelector_Simple_Machine_Settings] = new UIActionSimpleMachineSettings(this);
+    m_pool[UIActionIndexSelector_Simple_Machine_Clone] = new UIActionSimpleMachineClone(this);
+    m_pool[UIActionIndexSelector_Simple_Machine_Remove] = new UIActionSimpleMachineRemove(this);
+    m_pool[UIActionIndexSelector_Simple_Machine_AddGroup] = new UIActionSimpleMachineAddGroup(this);
 
     /* Common actions: */
+    m_pool[UIActionIndexSelector_Simple_Common_New] = new UIActionSimpleCommonNew(this);
+    m_pool[UIActionIndexSelector_Simple_Common_Add] = new UIActionSimpleCommonAdd(this);
+    m_pool[UIActionIndexSelector_State_Common_StartOrShow] = new UIActionStateCommonStartOrShow(this);
+    m_pool[UIActionIndexSelector_Toggle_Common_PauseAndResume] = new UIActionToggleCommonPauseAndResume(this);
+    m_pool[UIActionIndexSelector_Simple_Common_Reset] = new UIActionSimpleCommonReset(this);
+    m_pool[UIActionIndexSelector_Simple_Common_Discard] = new UIActionSimpleCommonDiscard(this);
+    m_pool[UIActionIndexSelector_Simple_Common_Refresh] = new UIActionSimpleCommonRefresh(this);
+    m_pool[UIActionIndexSelector_Simple_Common_ShowInFileManager] = new UIActionSimpleCommonShowInFileManager(this);
+    m_pool[UIActionIndexSelector_Simple_Common_CreateShortcut] = new UIActionSimpleCommonCreateShortcut(this);
     m_pool[UIActionIndexSelector_Simple_Common_SortParent] = new UIActionSimpleCommonSortParent(this);
 

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

@@ -36 +36 @@
     /* 'Group' menu actions: */
     UIActionIndexSelector_Menu_Group,
-    UIActionIndexSelector_Simple_Group_NewWizard,
-    UIActionIndexSelector_Simple_Group_AddDialog,
-    UIActionIndexSelector_Simple_Group_RenameDialog,
-    UIActionIndexSelector_Simple_Group_RemoveDialog,
-    UIActionIndexSelector_State_Group_StartOrShow,
-    UIActionIndexSelector_Toggle_Group_PauseAndResume,
-    UIActionIndexSelector_Simple_Group_Reset,
-    UIActionIndexSelector_Simple_Group_Refresh,
-    UIActionIndexSelector_Simple_Group_ShowInFileManager,
-    UIActionIndexSelector_Simple_Group_CreateShortcut,
+    UIActionIndexSelector_Simple_Group_Rename,
+    UIActionIndexSelector_Simple_Group_Remove,
     UIActionIndexSelector_Simple_Group_Sort,
 
     /* 'Machine' menu actions: */
     UIActionIndexSelector_Menu_Machine,
-    UIActionIndexSelector_Simple_Machine_NewWizard,
-    UIActionIndexSelector_Simple_Machine_AddDialog,
-    UIActionIndexSelector_Simple_Machine_AddGroupDialog,
-    UIActionIndexSelector_Simple_Machine_SettingsDialog,
-    UIActionIndexSelector_Simple_Machine_CloneWizard,
-    UIActionIndexSelector_Simple_Machine_RemoveDialog,
-    UIActionIndexSelector_State_Machine_StartOrShow,
-    UIActionIndexSelector_Simple_Machine_Discard,
-    UIActionIndexSelector_Toggle_Machine_PauseAndResume,
-    UIActionIndexSelector_Simple_Machine_Reset,
-    UIActionIndexSelector_Simple_Machine_Refresh,
-    UIActionIndexSelector_Simple_Machine_ShowInFileManager,
-    UIActionIndexSelector_Simple_Machine_CreateShortcut,
+    UIActionIndexSelector_Simple_Machine_Settings,
+    UIActionIndexSelector_Simple_Machine_Clone,
+    UIActionIndexSelector_Simple_Machine_Remove,
+    UIActionIndexSelector_Simple_Machine_AddGroup,
 
-    /* Common menu action: */
+    /* Common 'Group' / 'Machine' menu actions: */
+    UIActionIndexSelector_Simple_Common_New,
+    UIActionIndexSelector_Simple_Common_Add,
+    UIActionIndexSelector_State_Common_StartOrShow,
+    UIActionIndexSelector_Toggle_Common_PauseAndResume,
+    UIActionIndexSelector_Simple_Common_Reset,
+    UIActionIndexSelector_Simple_Common_Discard,
+    UIActionIndexSelector_Simple_Common_Refresh,
+    UIActionIndexSelector_Simple_Common_ShowInFileManager,
+    UIActionIndexSelector_Simple_Common_CreateShortcut,
     UIActionIndexSelector_Simple_Common_SortParent,
 

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

@@ -371 +371 @@
 {
     /* Check that we do NOT handling that already: */
-    if (m_pActionMachineSettingsDialog->data().toBool())
+    if (m_pAction_Machine_Settings->data().toBool())
         return;
     /* Remember that we handling that already: */
-    m_pActionMachineSettingsDialog->setData(true);
+    m_pAction_Machine_Settings->setData(true);
 
     /* Process href from VM details / description: */
@@ -407 +407 @@
 
     /* Remember that we do NOT handling that already: */
-    m_pActionMachineSettingsDialog->setData(false);
+    m_pAction_Machine_Settings->setData(false);
 }
 
@@ -423 +423 @@
 void UISelectorWindow::sltPerformStartOrShowAction()
 {
-    /* Check if the action is enabled: */
-    if (!m_pActionMachineStartOrShow->isEnabled())
-        return;
-
     /* Get selected items: */
     QList<UIVMItem*> items = currentItems();
@@ -435 +431 @@
     {
         /* Check if current item could be started/showed: */
-        if (!isActionEnabled(UIActionIndexSelector_State_Machine_StartOrShow, items))
+        if (!isActionEnabled(UIActionIndexSelector_State_Common_StartOrShow, items))
             continue;
 
@@ -488 +484 @@
 
         /* Check if current item could be paused/resumed: */
-        if (!isActionEnabled(UIActionIndexSelector_Toggle_Machine_PauseAndResume, items))
+        if (!isActionEnabled(UIActionIndexSelector_Toggle_Common_PauseAndResume, items))
             continue;
 
@@ -547 +543 @@
 
         /* Check if current item could be reseted: */
-        if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_Reset, items))
+        if (!isActionEnabled(UIActionIndexSelector_Simple_Common_Reset, items))
             continue;
 
@@ -732 +728 @@
 
         /* Check if that item could be shown in file-browser: */
-        if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, items))
+        if (!isActionEnabled(UIActionIndexSelector_Simple_Common_ShowInFileManager, items))
             continue;
 
@@ -753 +749 @@
 
         /* Check if shortcuts could be created for this item: */
-        if (!isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, items))
+        if (!isActionEnabled(UIActionIndexSelector_Simple_Common_CreateShortcut, items))
             continue;
 
@@ -1066 +1062 @@
     prepareMenuMachineClose(m_pMachineCloseMenu);
 
+    /* Create actions for 'Group' and 'Machine' menus: */
+    prepareCommonActions();
+    prepareGroupActions();
+    prepareMachineActions();
+
     /* Prepare Group-menu: */
     m_pGroupMenu = gActionPool->action(UIActionIndexSelector_Menu_Group)->menu();
@@ -1114 +1115 @@
 }
 
+void UISelectorWindow::prepareCommonActions()
+{
+    m_pAction_Common_New               = gActionPool->action(UIActionIndexSelector_Simple_Common_New);
+    m_pAction_Common_Add               = gActionPool->action(UIActionIndexSelector_Simple_Common_Add);
+    m_pAction_Common_StartOrShow       = gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow);
+    m_pAction_Common_PauseAndResume    = gActionPool->action(UIActionIndexSelector_Toggle_Common_PauseAndResume);
+    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);
+    m_pAction_Common_CreateShortcut    = gActionPool->action(UIActionIndexSelector_Simple_Common_CreateShortcut);
+    m_pAction_Common_SortParent        = gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent);
+}
+
+void UISelectorWindow::prepareGroupActions()
+{
+    m_pAction_Group_Rename = gActionPool->action(UIActionIndexSelector_Simple_Group_Rename);
+    m_pAction_Group_Remove = gActionPool->action(UIActionIndexSelector_Simple_Group_Remove);
+    m_pAction_Group_Sort   = gActionPool->action(UIActionIndexSelector_Simple_Group_Sort);
+}
+
+void UISelectorWindow::prepareMachineActions()
+{
+    m_pAction_Machine_Settings = gActionPool->action(UIActionIndexSelector_Simple_Machine_Settings);
+    m_pAction_Machine_Clone    = gActionPool->action(UIActionIndexSelector_Simple_Machine_Clone);
+    m_pAction_Machine_Remove   = gActionPool->action(UIActionIndexSelector_Simple_Machine_Remove);
+    m_pAction_Machine_AddGroup = gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroup);
+}
+
 void UISelectorWindow::prepareMenuGroup(QMenu *pMenu)
 {
@@ -1121 +1152 @@
 
     /* Populate Machine-menu: */
-    m_pActionGroupNewWizard = gActionPool->action(UIActionIndexSelector_Simple_Group_NewWizard);
-    pMenu->addAction(m_pActionGroupNewWizard);
-    m_pActionGroupAddDialog = gActionPool->action(UIActionIndexSelector_Simple_Group_AddDialog);
-    pMenu->addAction(m_pActionGroupAddDialog);
+    pMenu->addAction(m_pAction_Common_New);
+    pMenu->addAction(m_pAction_Common_Add);
     pMenu->addSeparator();
-    m_pActionGroupRenameDialog = gActionPool->action(UIActionIndexSelector_Simple_Group_RenameDialog);
-    pMenu->addAction(m_pActionGroupRenameDialog);
-    m_pActionGroupRemoveDialog = gActionPool->action(UIActionIndexSelector_Simple_Group_RemoveDialog);
-    pMenu->addAction(m_pActionGroupRemoveDialog);
+    pMenu->addAction(m_pAction_Group_Rename);
+    pMenu->addAction(m_pAction_Group_Remove);
     pMenu->addSeparator();
-    m_pActionGroupStartOrShow = gActionPool->action(UIActionIndexSelector_State_Group_StartOrShow);
-    pMenu->addAction(m_pActionGroupStartOrShow);
-    m_pActionGroupPauseAndResume = gActionPool->action(UIActionIndexSelector_Toggle_Group_PauseAndResume);
-    pMenu->addAction(m_pActionGroupPauseAndResume);
-    m_pActionGroupReset = gActionPool->action(UIActionIndexSelector_Simple_Group_Reset);
-    pMenu->addAction(m_pActionGroupReset);
+    pMenu->addAction(m_pAction_Common_StartOrShow);
+    pMenu->addAction(m_pAction_Common_PauseAndResume);
+    pMenu->addAction(m_pAction_Common_Reset);
     pMenu->addMenu(m_pMachineCloseMenu);
     pMenu->addSeparator();
-    m_pActionGroupRefresh = gActionPool->action(UIActionIndexSelector_Simple_Group_Refresh);
-    pMenu->addAction(m_pActionGroupRefresh);
-    m_pActionGroupLogDialog = gActionPool->action(UIActionIndex_Simple_LogDialog);
-    pMenu->addAction(m_pActionGroupLogDialog);
+    pMenu->addAction(m_pAction_Common_Discard);
+    pMenu->addAction(m_pAction_Common_LogDialog);
+    pMenu->addAction(m_pAction_Common_Refresh);
     pMenu->addSeparator();
-    m_pActionGroupShowInFileManager = gActionPool->action(UIActionIndexSelector_Simple_Group_ShowInFileManager);
-    pMenu->addAction(m_pActionGroupShowInFileManager);
-    m_pActionGroupCreateShortcut = gActionPool->action(UIActionIndexSelector_Simple_Group_CreateShortcut);
-    pMenu->addAction(m_pActionGroupCreateShortcut);
+    pMenu->addAction(m_pAction_Common_ShowInFileManager);
+    pMenu->addAction(m_pAction_Common_CreateShortcut);
     pMenu->addSeparator();
-    m_pActionGroupSortParent = gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent);
-    pMenu->addAction(m_pActionGroupSortParent);
-    m_pActionGroupSort = gActionPool->action(UIActionIndexSelector_Simple_Group_Sort);
-    pMenu->addAction(m_pActionGroupSort);
+    pMenu->addAction(m_pAction_Common_SortParent);
+    pMenu->addAction(m_pAction_Group_Sort);
 
     /* 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;
+    m_groupActions << m_pAction_Group_Rename
+                   << m_pAction_Group_Remove
+                   << m_pAction_Group_Sort;
 }
 
@@ -1170 +1186 @@
 
     /* Populate Machine-menu: */
-    m_pActionMachineNewWizard = gActionPool->action(UIActionIndexSelector_Simple_Machine_NewWizard);
-    pMenu->addAction(m_pActionMachineNewWizard);
-    m_pActionMachineAddDialog = gActionPool->action(UIActionIndexSelector_Simple_Machine_AddDialog);
-    pMenu->addAction(m_pActionMachineAddDialog);
-    m_pActionMachineSettingsDialog = gActionPool->action(UIActionIndexSelector_Simple_Machine_SettingsDialog);
-    pMenu->addAction(m_pActionMachineSettingsDialog);
-    m_pActionMachineCloneWizard = gActionPool->action(UIActionIndexSelector_Simple_Machine_CloneWizard);
-    pMenu->addAction(m_pActionMachineCloneWizard);
-    m_pActionMachineRemoveDialog = gActionPool->action(UIActionIndexSelector_Simple_Machine_RemoveDialog);
-    pMenu->addAction(m_pActionMachineRemoveDialog);
-    m_pActionMachineAddGroupDialog = gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroupDialog);
-    pMenu->addAction(m_pActionMachineAddGroupDialog);
+    pMenu->addAction(m_pAction_Common_New);
+    pMenu->addAction(m_pAction_Common_Add);
+    pMenu->addAction(m_pAction_Machine_Settings);
+    pMenu->addAction(m_pAction_Machine_Clone);
+    pMenu->addAction(m_pAction_Machine_Remove);
+    pMenu->addAction(m_pAction_Machine_AddGroup);
     pMenu->addSeparator();
-    m_pActionMachineStartOrShow = gActionPool->action(UIActionIndexSelector_State_Machine_StartOrShow);
-    pMenu->addAction(m_pActionMachineStartOrShow);
-    m_pActionMachinePauseAndResume = gActionPool->action(UIActionIndexSelector_Toggle_Machine_PauseAndResume);
-    pMenu->addAction(m_pActionMachinePauseAndResume);
-    m_pActionMachineReset = gActionPool->action(UIActionIndexSelector_Simple_Machine_Reset);
-    pMenu->addAction(m_pActionMachineReset);
+    pMenu->addAction(m_pAction_Common_StartOrShow);
+    pMenu->addAction(m_pAction_Common_PauseAndResume);
+    pMenu->addAction(m_pAction_Common_Reset);
     pMenu->addMenu(m_pMachineCloseMenu);
     pMenu->addSeparator();
-    m_pActionMachineDiscard = gActionPool->action(UIActionIndexSelector_Simple_Machine_Discard);
-    pMenu->addAction(m_pActionMachineDiscard);
-    m_pActionMachineRefresh = gActionPool->action(UIActionIndexSelector_Simple_Machine_Refresh);
-    pMenu->addAction(m_pActionMachineRefresh);
-    m_pActionMachineLogDialog = gActionPool->action(UIActionIndex_Simple_LogDialog);
-    pMenu->addAction(m_pActionMachineLogDialog);
+    pMenu->addAction(m_pAction_Common_Discard);
+    pMenu->addAction(m_pAction_Common_LogDialog);
+    pMenu->addAction(m_pAction_Common_Refresh);
     pMenu->addSeparator();
-    m_pActionMachineShowInFileManager = gActionPool->action(UIActionIndexSelector_Simple_Machine_ShowInFileManager);
-    pMenu->addAction(m_pActionMachineShowInFileManager);
-    m_pActionMachineCreateShortcut = gActionPool->action(UIActionIndexSelector_Simple_Machine_CreateShortcut);
-    pMenu->addAction(m_pActionMachineCreateShortcut);
+    pMenu->addAction(m_pAction_Common_ShowInFileManager);
+    pMenu->addAction(m_pAction_Common_CreateShortcut);
     pMenu->addSeparator();
-    m_pActionMachineSortParent = gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent);
-    pMenu->addAction(m_pActionMachineSortParent);
+    pMenu->addAction(m_pAction_Common_SortParent);
 
     /* Remember action list: */
-    m_machineActions << m_pActionMachineNewWizard << m_pActionMachineAddDialog
-                     << m_pActionMachineSettingsDialog << m_pActionMachineCloneWizard
-                     << m_pActionMachineAddGroupDialog
-                     << m_pActionMachineRemoveDialog << m_pActionMachineStartOrShow
-                     << m_pActionMachineDiscard << m_pActionMachinePauseAndResume
-                     << m_pActionMachineReset << m_pActionMachineRefresh
-                     << m_pActionMachineLogDialog << m_pActionMachineShowInFileManager
-                     << m_pActionMachineCreateShortcut;
+    m_machineActions << m_pAction_Machine_Settings
+                     << m_pAction_Machine_Clone
+                     << m_pAction_Machine_Remove
+                     << m_pAction_Machine_AddGroup;
 }
 
@@ -1286 +1283 @@
     mVMToolBar->setIconSize(QSize(32, 32));
     mVMToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-    mVMToolBar->addAction(m_pActionMachineNewWizard);
-    mVMToolBar->addAction(m_pActionMachineSettingsDialog);
-    mVMToolBar->addAction(m_pActionMachineStartOrShow);
-    mVMToolBar->addAction(m_pActionMachineDiscard);
+    mVMToolBar->addAction(m_pAction_Common_New);
+    mVMToolBar->addAction(m_pAction_Machine_Settings);
+    mVMToolBar->addAction(m_pAction_Common_StartOrShow);
+    mVMToolBar->addAction(m_pAction_Common_Discard);
 
     /* Prepare graphics VM list: */
@@ -1299 +1296 @@
 
     /* Prepare details and snapshots tabs: */
-    m_pVMDesktop = new UIVMDesktop(mVMToolBar, m_pActionMachineRefresh, this);
+    m_pVMDesktop = new UIVMDesktop(mVMToolBar, m_pAction_Common_Refresh, this);
 
     /* Crate container: */
@@ -1349 +1346 @@
     connect(m_pExitAction, SIGNAL(triggered()), this, SLOT(sltPerformExit()));
 
-    /* 'Group' menu connections: */
-    connect(m_pActionGroupAddDialog, SIGNAL(triggered()), this, SLOT(sltShowAddMachineDialog()));
-    connect(m_pActionGroupStartOrShow, SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
-    connect(m_pActionGroupPauseAndResume, SIGNAL(toggled(bool)), this, SLOT(sltPerformPauseResumeAction(bool)));
-    connect(m_pActionGroupReset, SIGNAL(triggered()), this, SLOT(sltPerformResetAction()));
-    connect(m_pActionGroupRefresh, SIGNAL(triggered()), this, SLOT(sltPerformRefreshAction()));
-    connect(m_pActionGroupLogDialog, SIGNAL(triggered()), this, SLOT(sltShowLogDialog()));
-    connect(m_pActionGroupShowInFileManager, SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager()));
-    connect(m_pActionGroupCreateShortcut, SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction()));
+    /* 'Group'/'Machine' menu common connections: */
+    connect(m_pAction_Common_Add, SIGNAL(triggered()), this, SLOT(sltShowAddMachineDialog()));
+    connect(m_pAction_Common_StartOrShow, SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
+    connect(m_pAction_Common_PauseAndResume, SIGNAL(toggled(bool)), this, SLOT(sltPerformPauseResumeAction(bool)));
+    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()));
+    connect(m_pAction_Common_CreateShortcut, SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction()));
 
     /* 'Machine' menu connections: */
-    connect(m_pActionMachineAddDialog, SIGNAL(triggered()), this, SLOT(sltShowAddMachineDialog()));
-    connect(m_pActionMachineSettingsDialog, SIGNAL(triggered()), this, SLOT(sltShowMachineSettingsDialog()));
-    connect(m_pActionMachineCloneWizard, SIGNAL(triggered()), this, SLOT(sltShowCloneMachineWizard()));
-    connect(m_pActionMachineStartOrShow, SIGNAL(triggered()), this, SLOT(sltPerformStartOrShowAction()));
-    connect(m_pActionMachineDiscard, SIGNAL(triggered()), this, SLOT(sltPerformDiscardAction()));
-    connect(m_pActionMachinePauseAndResume, SIGNAL(toggled(bool)), this, SLOT(sltPerformPauseResumeAction(bool)));
-    connect(m_pActionMachineReset, SIGNAL(triggered()), this, SLOT(sltPerformResetAction()));
-    connect(m_pActionMachineRefresh, SIGNAL(triggered()), this, SLOT(sltPerformRefreshAction()));
-    connect(m_pActionMachineLogDialog, SIGNAL(triggered()), this, SLOT(sltShowLogDialog()));
-    connect(m_pActionMachineShowInFileManager, SIGNAL(triggered()), this, SLOT(sltShowMachineInFileManager()));
-    connect(m_pActionMachineCreateShortcut, SIGNAL(triggered()), this, SLOT(sltPerformCreateShortcutAction()));
+    connect(m_pAction_Machine_Settings, SIGNAL(triggered()), this, SLOT(sltShowMachineSettingsDialog()));
+    connect(m_pAction_Machine_Clone, SIGNAL(triggered()), this, SLOT(sltShowCloneMachineWizard()));
 
     /* 'Machine/Close' menu connections: */
@@ -1550 +1539 @@
     QList<UIVMItem*> items = currentItems();
 
+    /* Enable/disable common actions: */
+    m_pAction_Common_StartOrShow->setEnabled(isActionEnabled(UIActionIndexSelector_State_Common_StartOrShow, items));
+    m_pAction_Common_PauseAndResume->setEnabled(isActionEnabled(UIActionIndexSelector_Toggle_Common_PauseAndResume, items));
+    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));
+    m_pAction_Common_CreateShortcut->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_CreateShortcut, items));
+    m_pAction_Common_SortParent->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_SortParent, items));
+
     /* Enable/disable group actions: */
-    m_pActionGroupRenameDialog->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_RenameDialog, items));
-    m_pActionGroupRemoveDialog->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_RemoveDialog, items));
-    m_pActionGroupStartOrShow->setEnabled(isActionEnabled(UIActionIndexSelector_State_Group_StartOrShow, items));
-    m_pActionGroupPauseAndResume->setEnabled(isActionEnabled(UIActionIndexSelector_Toggle_Group_PauseAndResume, items));
-    m_pActionGroupReset->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_Reset, items));
-    m_pActionGroupRefresh->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_Refresh, items));
-    m_pActionGroupLogDialog->setEnabled(isActionEnabled(UIActionIndex_Simple_LogDialog, items));
-    m_pActionGroupShowInFileManager->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_ShowInFileManager, items));
-    m_pActionGroupCreateShortcut->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_CreateShortcut, items));
-    m_pActionGroupSortParent->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_SortParent, items));
-    m_pActionGroupSort->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_Sort, items));
+    m_pAction_Group_Rename->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_Rename, items));
+    m_pAction_Group_Remove->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_Remove, items));
+    m_pAction_Group_Sort->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Group_Sort, items));
 
     /* Enable/disable machine actions: */
-    m_pActionMachineSettingsDialog->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_SettingsDialog, items));
-    m_pActionMachineCloneWizard->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CloneWizard, items));
-    m_pActionMachineAddGroupDialog->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_AddGroupDialog, items));
-    m_pActionMachineRemoveDialog->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_RemoveDialog, items));
-    m_pActionMachineStartOrShow->setEnabled(isActionEnabled(UIActionIndexSelector_State_Machine_StartOrShow, items));
-    m_pActionMachineDiscard->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Discard, items));
-    m_pActionMachinePauseAndResume->setEnabled(isActionEnabled(UIActionIndexSelector_Toggle_Machine_PauseAndResume, items));
-    m_pActionMachineReset->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Reset, items));
-    m_pActionMachineRefresh->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Refresh, items));
-    m_pActionMachineLogDialog->setEnabled(isActionEnabled(UIActionIndex_Simple_LogDialog, items));
-    m_pActionMachineShowInFileManager->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_ShowInFileManager, items));
-    m_pActionMachineCreateShortcut->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_CreateShortcut, items));
-    m_pActionMachineSortParent->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Common_SortParent, items));
+    m_pAction_Machine_Settings->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Settings, items));
+    m_pAction_Machine_Clone->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Clone, items));
+    m_pAction_Machine_Remove->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_Remove, items));
+    m_pAction_Machine_AddGroup->setEnabled(isActionEnabled(UIActionIndexSelector_Simple_Machine_AddGroup, items));
 
     /* Enable/disable machine-close actions: */
@@ -1596 +1579 @@
             state == KMachineState_Aborted)
         {
-            m_pActionGroupStartOrShow->setState(1);
-            m_pActionMachineStartOrShow->setState(1);
+            m_pAction_Common_StartOrShow->setState(1);
 #ifdef QT_MAC_USE_COCOA
             /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
@@ -1608 +1590 @@
         else
         {
-            m_pActionGroupStartOrShow->setState(2);
-            m_pActionMachineStartOrShow->setState(2);
+            m_pAction_Common_StartOrShow->setState(2);
 #ifdef QT_MAC_USE_COCOA
             /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
@@ -1623 +1604 @@
             state == KMachineState_TeleportingPausedVM)
         {
-            m_pActionGroupPauseAndResume->blockSignals(true);
-            m_pActionGroupPauseAndResume->setChecked(true);
-            m_pActionGroupPauseAndResume->blockSignals(false);
-            m_pActionMachinePauseAndResume->blockSignals(true);
-            m_pActionMachinePauseAndResume->setChecked(true);
-            m_pActionMachinePauseAndResume->blockSignals(false);
+            m_pAction_Common_PauseAndResume->blockSignals(true);
+            m_pAction_Common_PauseAndResume->setChecked(true);
+            m_pAction_Common_PauseAndResume->blockSignals(false);
         }
         else
         {
-            m_pActionGroupPauseAndResume->blockSignals(true);
-            m_pActionGroupPauseAndResume->setChecked(false);
-            m_pActionGroupPauseAndResume->blockSignals(false);
-            m_pActionMachinePauseAndResume->blockSignals(true);
-            m_pActionMachinePauseAndResume->setChecked(false);
-            m_pActionMachinePauseAndResume->blockSignals(false);
-        }
-        m_pActionGroupPauseAndResume->updateAppearance();
-        m_pActionMachinePauseAndResume->updateAppearance();
+            m_pAction_Common_PauseAndResume->blockSignals(true);
+            m_pAction_Common_PauseAndResume->setChecked(false);
+            m_pAction_Common_PauseAndResume->blockSignals(false);
+        }
+        m_pAction_Common_PauseAndResume->updateAppearance();
     }
     else
     {
         /* Update the Start button action appearance: */
-        m_pActionGroupStartOrShow->setState(1);
-        m_pActionMachineStartOrShow->setState(1);
+        m_pAction_Common_StartOrShow->setState(1);
     }
 }
@@ -1662 +1635 @@
     switch (iActionIndex)
     {
-        case UIActionIndexSelector_Simple_Machine_SettingsDialog:
+        case UIActionIndexSelector_Simple_Machine_Settings:
         {
             /* Check that we are not saving groups,
@@ -1672 +1645 @@
                    pItem->machineState() != KMachineState_Stuck;
         }
-        case UIActionIndexSelector_Simple_Machine_CloneWizard:
+        case UIActionIndexSelector_Simple_Machine_Clone:
         {
             /* Check that there is only one item, its accessible
@@ -1680 +1653 @@
                    pItem->sessionState() == KSessionState_Unlocked;
         }
-        case UIActionIndexSelector_Simple_Machine_AddGroupDialog:
+        case UIActionIndexSelector_Simple_Group_Rename:
+        case UIActionIndexSelector_Simple_Group_Remove:
+        {
+            /* Make sure we are not saving groups: */
+            if (m_pChooser->isGroupSavingInProgress())
+                return false;
+
+            /* Group can be always removed/renamed: */
+            return true;
+        }
+        case UIActionIndexSelector_Simple_Machine_Remove:
+        {
+            /* Make sure we are not saving groups: */
+            if (m_pChooser->isGroupSavingInProgress())
+                return false;
+
+            /* Check that all machines are NOT accessible
+             * or session states of all machines are unlocked. */
+            return isItemsInaccessible(items) || isItemsHasUnlockedSession(items);
+        }
+        case UIActionIndexSelector_Simple_Machine_AddGroup:
         {
             /* Check that there is more than one item,
@@ -1688 +1681 @@
                    isItemsPoweredOff(items);
         }
-        case UIActionIndexSelector_Simple_Group_RenameDialog:
-        case UIActionIndexSelector_Simple_Group_RemoveDialog:
-        {
-            /* Make sure we are not saving groups: */
-            if (m_pChooser->isGroupSavingInProgress())
-                return false;
-
-            /* Group can be always removed/renamed: */
-            return true;
-        }
-        case UIActionIndexSelector_Simple_Machine_RemoveDialog:
-        {
-            /* Make sure we are not saving groups: */
-            if (m_pChooser->isGroupSavingInProgress())
-                return false;
-
-            /* Check that all machines are NOT accessible
-             * or session states of all machines are unlocked. */
-            return isItemsInaccessible(items) || isItemsHasUnlockedSession(items);
-        }
-        case UIActionIndexSelector_State_Group_StartOrShow:
-        case UIActionIndexSelector_State_Machine_StartOrShow:
+        case UIActionIndexSelector_State_Common_StartOrShow:
         {
             /* Make sure all items are accessible: */
@@ -1733 +1705 @@
             return pItem->canSwitchTo();
         }
-        case UIActionIndexSelector_Simple_Machine_Discard:
+        case UIActionIndexSelector_Simple_Common_Discard:
         {
             /* Check that there is only one item, its accessible
@@ -1742 +1714 @@
                    pItem->sessionState() == KSessionState_Unlocked;
         }
-        case UIActionIndexSelector_Toggle_Group_PauseAndResume:
-        case UIActionIndexSelector_Toggle_Machine_PauseAndResume:
+        case UIActionIndexSelector_Toggle_Common_PauseAndResume:
         {
             /* Make sure all items are accessible: */
@@ -1756 +1727 @@
                    pItem->machineState() == KMachineState_TeleportingPausedVM;
         }
-        case UIActionIndexSelector_Simple_Group_Reset:
-        case UIActionIndexSelector_Simple_Machine_Reset:
+        case UIActionIndexSelector_Simple_Common_Reset:
         {
             /* Make sure all items are accessible: */
@@ -1809 +1779 @@
             return isActionEnabled(UIActionIndexSelector_Menu_Machine_Close, items);
         }
-        case UIActionIndexSelector_Simple_Group_Refresh:
-        case UIActionIndexSelector_Simple_Machine_Refresh:
+        case UIActionIndexSelector_Simple_Common_Refresh:
         {
             /* Make sure all items are NOT accessible: */
@@ -1816 +1785 @@
         }
         case UIActionIndex_Simple_LogDialog:
-        case UIActionIndexSelector_Simple_Group_ShowInFileManager:
-        case UIActionIndexSelector_Simple_Machine_ShowInFileManager:
+        case UIActionIndexSelector_Simple_Common_ShowInFileManager:
         case UIActionIndexSelector_Simple_Common_SortParent:
         case UIActionIndexSelector_Simple_Group_Sort:
@@ -1824 +1792 @@
             return items.size() > 0 && isItemsAccessible(items);
         }
-        case UIActionIndexSelector_Simple_Group_CreateShortcut:
-        case UIActionIndexSelector_Simple_Machine_CreateShortcut:
+        case UIActionIndexSelector_Simple_Common_CreateShortcut:
         {
             /* Make sure all items supports shortcuts: */

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

@@ -125 +125 @@
     void prepareMenuBar();
     void prepareMenuFile(QMenu *pMenu);
+    void prepareCommonActions();
+    void prepareGroupActions();
+    void prepareMachineActions();
     void prepareMenuGroup(QMenu *pMenu);
     void prepareMenuMachine(QMenu *pMenu);
@@ -177 +180 @@
     UIAction *m_pExitAction;
 
+    /* Common Group/Machine actions: */
+    UIAction *m_pAction_Common_New;
+    UIAction *m_pAction_Common_Add;
+    UIAction *m_pAction_Common_StartOrShow;
+    UIAction *m_pAction_Common_PauseAndResume;
+    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;
+    UIAction *m_pAction_Common_CreateShortcut;
+    UIAction *m_pAction_Common_SortParent;
+
     /* 'Group' menu action pointers: */
     QList<UIAction*> m_groupActions;
     QAction *m_pGroupMenuAction;
     QMenu *m_pGroupMenu;
-    UIAction *m_pActionGroupNewWizard;
-    UIAction *m_pActionGroupAddDialog;
-    UIAction *m_pActionGroupRenameDialog;
-    UIAction *m_pActionGroupRemoveDialog;
-    UIAction *m_pActionGroupStartOrShow;
-    UIAction *m_pActionGroupPauseAndResume;
-    UIAction *m_pActionGroupReset;
-    UIAction *m_pActionGroupRefresh;
-    UIAction *m_pActionGroupLogDialog;
-    UIAction *m_pActionGroupShowInFileManager;
-    UIAction *m_pActionGroupCreateShortcut;
-    UIAction *m_pActionGroupSortParent;
-    UIAction *m_pActionGroupSort;
+    UIAction *m_pAction_Group_Rename;
+    UIAction *m_pAction_Group_Remove;
+    UIAction *m_pAction_Group_Sort;
 
     /* 'Machine' menu action pointers: */
@@ -199 +205 @@
     QAction *m_pMachineMenuAction;
     QMenu *m_pMachineMenu;
-    UIAction *m_pActionMachineNewWizard;
-    UIAction *m_pActionMachineAddDialog;
-    UIAction *m_pActionMachineSettingsDialog;
-    UIAction *m_pActionMachineCloneWizard;
-    UIAction *m_pActionMachineAddGroupDialog;
-    UIAction *m_pActionMachineRemoveDialog;
-    UIAction *m_pActionMachineStartOrShow;
-    UIAction *m_pActionMachineDiscard;
-    UIAction *m_pActionMachinePauseAndResume;
-    UIAction *m_pActionMachineReset;
-    UIAction *m_pActionMachineRefresh;
-    UIAction *m_pActionMachineLogDialog;
-    UIAction *m_pActionMachineShowInFileManager;
-    UIAction *m_pActionMachineCreateShortcut;
-    UIAction *m_pActionMachineSortParent;
+    UIAction *m_pAction_Machine_Settings;
+    UIAction *m_pAction_Machine_Clone;
+    UIAction *m_pAction_Machine_Remove;
+    UIAction *m_pAction_Machine_AddGroup;
 
     /* 'Machine / Close' menu action pointers: */

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

@@ -814 +814 @@
 
     connect(m_pSettingsButton, SIGNAL(sigButtonClicked()),
-            gActionPool->action(UIActionIndexSelector_Simple_Machine_SettingsDialog), SLOT(trigger()),
+            gActionPool->action(UIActionIndexSelector_Simple_Machine_Settings), SLOT(trigger()),
             Qt::QueuedConnection);
     connect(m_pStartButton, SIGNAL(sigButtonClicked()),
-            gActionPool->action(UIActionIndexSelector_State_Machine_StartOrShow), SLOT(trigger()),
+            gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow), SLOT(trigger()),
             Qt::QueuedConnection);
     connect(m_pPauseButton, SIGNAL(sigButtonClicked()),
-            gActionPool->action(UIActionIndexSelector_Toggle_Machine_PauseAndResume), SLOT(trigger()),
+            gActionPool->action(UIActionIndexSelector_Toggle_Common_PauseAndResume), SLOT(trigger()),
             Qt::QueuedConnection);
     connect(m_pCloseButton, SIGNAL(sigButtonClicked()),

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

@@ -465 +465 @@
 void UIGChooserModel::activate()
 {
-    gActionPool->action(UIActionIndexSelector_State_Machine_StartOrShow)->activate(QAction::Trigger);
+    gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow)->activate(QAction::Trigger);
 }
 
@@ -897 +897 @@
     /* Context menu for group: */
     m_pContextMenuGroup = new QMenu;
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_NewWizard));
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_AddDialog));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_New));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Add));
     m_pContextMenuGroup->addSeparator();
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_RenameDialog));
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_RemoveDialog));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_Rename));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_Remove));
     m_pContextMenuGroup->addSeparator();
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_State_Group_StartOrShow));
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Toggle_Group_PauseAndResume));
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_Reset));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Toggle_Common_PauseAndResume));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Reset));
     m_pContextMenuGroup->addMenu(gActionPool->action(UIActionIndexSelector_Menu_Machine_Close)->menu());
     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_Group_Refresh));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Refresh));
     m_pContextMenuGroup->addSeparator();
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_ShowInFileManager));
-    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Group_CreateShortcut));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_ShowInFileManager));
+    m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_CreateShortcut));
     m_pContextMenuGroup->addSeparator();
     m_pContextMenuGroup->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent));
@@ -919 +920 @@
     /* Context menu for machine(s): */
     m_pContextMenuMachine = new QMenu;
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_SettingsDialog));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_CloneWizard));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_RemoveDialog));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroupDialog));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_Settings));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_Clone));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_Remove));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroup));
     m_pContextMenuMachine->addSeparator();
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_State_Machine_StartOrShow));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Toggle_Machine_PauseAndResume));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_Reset));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_State_Common_StartOrShow));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Toggle_Common_PauseAndResume));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Reset));
     m_pContextMenuMachine->addMenu(gActionPool->action(UIActionIndexSelector_Menu_Machine_Close)->menu());
     m_pContextMenuMachine->addSeparator();
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_Discard));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Discard));
     m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndex_Simple_LogDialog));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_Refresh));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_Refresh));
     m_pContextMenuMachine->addSeparator();
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_ShowInFileManager));
-    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Machine_CreateShortcut));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_ShowInFileManager));
+    m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_CreateShortcut));
     m_pContextMenuMachine->addSeparator();
     m_pContextMenuMachine->addAction(gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent));
@@ -941 +942 @@
     connect(m_pContextMenuMachine, SIGNAL(hovered(QAction*)), this, SLOT(sltActionHovered(QAction*)));
 
-    connect(gActionPool->action(UIActionIndexSelector_Simple_Group_NewWizard), SIGNAL(triggered()),
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Common_New), SIGNAL(triggered()),
             this, SLOT(sltCreateNewMachine()));
-    connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_NewWizard), SIGNAL(triggered()),
-            this, SLOT(sltCreateNewMachine()));
-    connect(gActionPool->action(UIActionIndexSelector_Simple_Group_RenameDialog), SIGNAL(triggered()),
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Group_Rename), SIGNAL(triggered()),
             this, SLOT(sltStartEditingSelectedGroup()));
-    connect(gActionPool->action(UIActionIndexSelector_Simple_Group_RemoveDialog), SIGNAL(triggered()),
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Group_Remove), SIGNAL(triggered()),
             this, SLOT(sltRemoveCurrentlySelectedGroup()));
-    connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroupDialog), SIGNAL(triggered()),
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_Remove), SIGNAL(triggered()),
+            this, SLOT(sltRemoveCurrentlySelectedMachine()));
+    connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_AddGroup), SIGNAL(triggered()),
             this, SLOT(sltAddGroupBasedOnChosenItems()));
-    connect(gActionPool->action(UIActionIndexSelector_Simple_Machine_RemoveDialog), SIGNAL(triggered()),
-            this, SLOT(sltRemoveCurrentlySelectedMachine()));
     connect(gActionPool->action(UIActionIndexSelector_Simple_Common_SortParent), SIGNAL(triggered()),
             this, SLOT(sltSortParentGroup()));