Changeset 53305 in vbox

Timestamp:

Nov 11, 2014 4:04:16 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96884

Message:

FE/Qt: Action-pool: Restoring missed 'About' action.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -987 +987 @@
     /* 'About' action: */
     addAction(pMenu, action(UIActionIndex_M_Application_S_About));
-    /* 'Preferences' action (only for Runtime pool): */
-    if (type() == UIActionPoolType_Runtime)
-        addAction(pMenu, action(UIActionIndex_M_Application_S_Preferences));
+    /* 'Preferences' action: */
+    addAction(pMenu, action(UIActionIndex_M_Application_S_Preferences));
     /* 'Close' action: */
     addAction(pMenu, action(UIActionIndex_M_Application_S_Close));

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

@@ -1160 +1160 @@
     pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
 #endif /* DEBUG */
-#ifdef RT_OS_DARWIN
+#ifdef Q_WS_MAC
+    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
     pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences));
-#else /* !RT_OS_DARWIN */
+#else /* !Q_WS_MAC */
     pMenu->addAction(actionPool()->action(UIActionIndex_Simple_Preferences));
-#endif /* !RT_OS_DARWIN */
-#ifndef Q_WS_MAC
     pMenu->addSeparator();
 #endif /* Q_WS_MAC */