#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
- m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
- #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #endif
m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
@@ -1033,8 +1033,6 @@
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 */
+ #endif
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
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
UIActionIndex_M_Application_S_ResetWarnings,
UIActionIndex_M_Application_S_Close,
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig 2015-07-09 20:09:22.239478146 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2015-07-09 20:17:20.635207663 +0200
-@@ -1211,8 +1211,6 @@
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp.orig 2015-07-09 20:09:22.239478146 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp 2015-07-09 20:17:20.635207663 +0200
+@@ -1211,9 +1211,6 @@
/* 'About' action goes to Application menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
+ pMenu->addAction(action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- /* 'Check for Updates' action goes to Application menu: */
-- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+- if (gEDataManager->applicationUpdateEnabled())
+- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
/* 'Network Access Manager' action goes to Application menu: */
- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
- # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1303,7 +1301,6 @@
- addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
-- addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
- # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
- addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
+ pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
+ # endif
@@ -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));
+ pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
- /* 'Check for Updates' action goes to 'File' menu: */
- 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));
+- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif
+ /* Separator after tool actions of the 'File' menu: */
+ pMenu->addSeparator();
diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
- #endif /* !VBOX_WITH_NETFLT */
+ #endif
break;
}
+ case GlobalSettingsPageType_Update:
default:
break;
}
+--- VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp.orig 2018-12-19 19:53:33.019049148 +0100
++++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp 2018-12-19 19:53:56.902224273 +0100
+@@ -1366,8 +1366,6 @@
+ m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+- if (gEDataManager->applicationUpdateEnabled())
+- m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif
+ #endif /* !VBOX_WS_MAC */
+ }