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

Timestamp:

May 26, 2014 12:18:11 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Move 'Global Preferences' to global action-pool.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -277 +277 @@
 }
 
+
+class UIActionSimplePreferences : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimplePreferences(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/global_settings_16px.png")
+    {
+        setMenuRole(QAction::PreferencesRole);
+        retranslateUi();
+    }
+
+protected:
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("Preferences");
+    }
+
+    QKeySequence defaultShortcut(UIActionPoolType) const
+    {
+        switch (actionPool()->type())
+        {
+            case UIActionPoolType_Selector: return QKeySequence("Ctrl+G");
+            case UIActionPoolType_Runtime: break;
+        }
+        return QKeySequence();
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Preferences...", "global settings"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display the global settings window"));
+    }
+};
 
 class UIActionSimpleLogDialog : public UIActionSimple
@@ -639 +676 @@
 {
     /* Various dialog actions: */
+    m_pool[UIActionIndex_Simple_Preferences] = new UIActionSimplePreferences(this);
     m_pool[UIActionIndex_Simple_LogDialog] = new UIActionSimpleLogDialog(this);
     /* 'Help' actions: */

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

@@ -51 +51 @@
 {
     /* Various dialog actions: */
+    UIActionIndex_Simple_Preferences,
     UIActionIndex_Simple_LogDialog,
 

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

@@ -137 +137 @@
         setName(QApplication::translate("UIActionPool", "&Export Appliance..."));
         setStatusTip(QApplication::translate("UIActionPool", "Export one or more VirtualBox virtual machines as an appliance"));
-    }
-};
-
-class UIActionSimplePreferencesDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimplePreferencesDialog(UIActionPool *pParent)
-        : UIActionSimple(pParent, ":/global_settings_16px.png")
-    {
-        setMenuRole(QAction::PreferencesRole);
-        retranslateUi();
-    }
-
-protected:
-
-    QString shortcutExtraDataID() const
-    {
-        return QString("Preferences");
-    }
-
-    QKeySequence defaultShortcut(UIActionPoolType) const
-    {
-        return QKeySequence("Ctrl+G");
-    }
-
-    void retranslateUi()
-    {
-        setName(QApplication::translate("UIActionPool", "&Preferences...", "global settings"));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the global settings window"));
     }
 };
@@ -1006 +974 @@
     m_pool[UIActionIndexSelector_Simple_File_ImportApplianceWizard] = new UIActionSimpleImportApplianceWizard(this);
     m_pool[UIActionIndexSelector_Simple_File_ExportApplianceWizard] = new UIActionSimpleExportApplianceWizard(this);
-    m_pool[UIActionIndexSelector_Simple_File_PreferencesDialog] = new UIActionSimplePreferencesDialog(this);
     m_pool[UIActionIndexSelector_Simple_File_Exit] = new UIActionSimpleExit(this);
 

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

@@ -31 +31 @@
     UIActionIndexSelector_Simple_File_ImportApplianceWizard,
     UIActionIndexSelector_Simple_File_ExportApplianceWizard,
-    UIActionIndexSelector_Simple_File_PreferencesDialog,
     UIActionIndexSelector_Simple_File_Exit,
 

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

@@ -1162 +1162 @@
     pMenu->addSeparator();
 #endif /* Q_WS_MAC */
-    m_pPreferencesDialogAction = gActionPool->action(UIActionIndexSelector_Simple_File_PreferencesDialog);
+    m_pPreferencesDialogAction = gActionPool->action(UIActionIndex_Simple_Preferences);
     pMenu->addAction(m_pPreferencesDialogAction);
 #ifndef Q_WS_MAC