m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
@@ -1033,8 +1033,6 @@
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
- gNetworkManager, SLOT(show()), Qt::UniqueConnection);
-- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()),
-- gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
+ connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
+ gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
+- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
+- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
- &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
+ connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
+ &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig 2015-07-09 20:13:36.439757556 +0200
+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h 2015-07-09 20:13:40.446396985 +0200
@@ -62,7 +62,6 @@
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1255,8 +1253,6 @@
+@@ -1368,9 +1365,6 @@
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
- /* 'Check for Updates' action goes to 'File' menu: */
-- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+- if (gEDataManager->applicationUpdateEnabled())
+- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
/* 'Reset Warnings' action goes 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));