Changeset 52572 in vbox

Timestamp:

Sep 2, 2014 3:30:19 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Action-pool: Small connections cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (8 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• runtime/UIActionPoolRuntime.cpp (modified) (1 diff)
• selector/UIActionPoolSelector.cpp (modified) (1 diff)

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

@@ -880 +880 @@
     /* Retranslate finally: */
     retranslateUi();
+}
+
+void UIActionPool::prepareConnections()
+{
+    /* 'Help' menu connections: */
+    connect(action(UIActionIndex_Simple_Contents), SIGNAL(triggered()),
+            &msgCenter(), SLOT(sltShowHelpHelpDialog()), Qt::UniqueConnection);
+    connect(action(UIActionIndex_Simple_WebSite), SIGNAL(triggered()),
+            &msgCenter(), SLOT(sltShowHelpWebDialog()), Qt::UniqueConnection);
+    connect(action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
+            &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+    connect(action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
+            gNetworkManager, SLOT(show()), Qt::UniqueConnection);
+    connect(action(UIActionIndex_Simple_CheckForUpdates), SIGNAL(triggered()),
+            gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+#ifdef RT_OS_DARWIN
+    connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()),
+            &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection);
+#else /* !RT_OS_DARWIN */
+    connect(action(UIActionIndex_Simple_About), SIGNAL(triggered()),
+            &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection);
+#endif /* !RT_OS_DARWIN */
 }
 
@@ -971 +995 @@
     action(UIActionIndex_M_Application_S_About)->setVisible(fAllowToShowActionAbout);
     if (!pMenu->isConsumed())
-    {
         pMenu->addAction(action(UIActionIndex_M_Application_S_About));
-        connect(action(UIActionIndex_M_Application_S_About), SIGNAL(triggered()),
-                &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection);
-    }
 
     /* Only for Runtime pool: */
@@ -1018 +1038 @@
     {
         pMenu->addAction(action(UIActionIndex_Simple_Contents));
-        connect(action(UIActionIndex_Simple_Contents), SIGNAL(triggered()),
-                &msgCenter(), SLOT(sltShowHelpHelpDialog()), Qt::UniqueConnection);
         fSeparator = true;
     }
@@ -1029 +1047 @@
     {
         pMenu->addAction(action(UIActionIndex_Simple_WebSite));
-        connect(action(UIActionIndex_Simple_WebSite), SIGNAL(triggered()),
-                &msgCenter(), SLOT(sltShowHelpWebDialog()), Qt::UniqueConnection);
         fSeparator = true;
     }
@@ -1049 +1065 @@
     {
         pMenu->addAction(action(UIActionIndex_Simple_ResetWarnings));
-        connect(action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
-                &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
         fSeparator = true;
     }
@@ -1070 +1084 @@
     {
         pMenu->addAction(action(UIActionIndex_Simple_NetworkAccessManager));
-        connect(action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
-                gNetworkManager, SLOT(show()), Qt::UniqueConnection);
         fSeparator = true;
     }
@@ -1084 +1096 @@
         {
             pMenu->addAction(action(UIActionIndex_Simple_CheckForUpdates));
-            connect(action(UIActionIndex_Simple_CheckForUpdates), SIGNAL(triggered()),
-                    gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
             fSeparator = true;
         }
@@ -1105 +1115 @@
     action(UIActionIndex_Simple_About)->setEnabled(fAllowToShowActionAbout);
     if (fAllowToShowActionAbout)
-    {
         pMenu->addAction(action(UIActionIndex_Simple_About));
-        connect(action(UIActionIndex_Simple_About), SIGNAL(triggered()),
-                &msgCenter(), SLOT(sltShowHelpAboutDialog()), Qt::UniqueConnection);
-    }
 
     /* Only for Runtime pool: */

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

@@ -397 +397 @@
     virtual void preparePool();
     /** Prepare connections routine. */
-    virtual void prepareConnections() = 0;
+    virtual void prepareConnections();
     /** Cleanup connections routine. */
     virtual void cleanupConnections() {}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -1859 +1859 @@
     connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
     connect(gEDataManager, SIGNAL(sigMenuBarConfigurationChange()), this, SLOT(sltHandleConfigurationChange()));
+
+    /* Call to base-class: */
+    UIActionPool::prepareConnections();
 }
 

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

@@ -952 +952 @@
     /* Prepare connections: */
     connect(gShortcutPool, SIGNAL(sigSelectorShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
+
+    /* Call to base-class: */
+    UIActionPool::prepareConnections();
 }