]>
Commit | Line | Data |
---|---|---|
ef335418 | 1 | |
acf12a87 AM |
2 | Description: Disable "Check for Updates" action. |
3 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 | |
ef335418 | 4 | Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>, Gianfranco Costamagna <locutusofborg@debian.org> |
acf12a87 | 5 | |
ef335418 JR |
6 | Index: virtualbox/doc/manual/en_US/user_Introduction.xml |
7 | =================================================================== | |
8 | --- virtualbox.orig/doc/manual/en_US/user_Introduction.xml | |
9 | +++ virtualbox/doc/manual/en_US/user_Introduction.xml | |
10 | @@ -6090,14 +6090,14 @@ | |
11 | <xref linkend="specialcharacters"/>. | |
12 | </para> | |
13 | </listitem> | |
14 | - | |
15 | + <!-- | |
16 | <listitem> | |
17 | <para> | |
18 | <emphasis role="bold">Update.</emphasis> Enables you to | |
19 | specify various settings for Automatic Updates. | |
20 | </para> | |
21 | </listitem> | |
22 | - | |
23 | + --> | |
24 | <listitem> | |
25 | <para> | |
26 | <emphasis role="bold">Language.</emphasis> Enables you to | |
27 | Index: virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp | |
28 | =================================================================== | |
29 | --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp | |
30 | +++ virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp | |
31 | @@ -2421,7 +2421,7 @@ | |
32 | bool UIExtraDataManager::applicationUpdateEnabled() | |
cc827380 | 33 | { |
ef335418 JR |
34 | /* 'True' unless 'restriction' feature allowed: */ |
35 | - return !isFeatureAllowed(GUI_PreventApplicationUpdate); | |
36 | + return false; | |
cc827380 | 37 | } |
ef335418 JR |
38 | |
39 | QString UIExtraDataManager::applicationUpdateData() | |
40 | Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp | |
41 | =================================================================== | |
42 | --- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp | |
43 | +++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp | |
44 | @@ -47,10 +47,10 @@ | |
45 | #ifdef VBOX_WS_WIN | |
46 | # include "UIGlobalSettingsInterface.h" | |
47 | #endif | |
48 | -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER | |
49 | -# include "UIGlobalSettingsProxy.h" | |
50 | -# include "UIGlobalSettingsUpdate.h" | |
51 | -#endif | |
52 | +//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER | |
53 | +//# include "UIGlobalSettingsProxy.h" | |
54 | +//# include "UIGlobalSettingsUpdate.h" | |
55 | +//#endif | |
56 | ||
57 | /* GUI includes: Machine Settings: */ | |
58 | #include "UIMachineSettingsAudio.h" | |
59 | @@ -99,7 +99,7 @@ | |
60 | ||
0190f7b9 | 61 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
ef335418 JR |
62 | /* Update page: */ |
63 | - m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); | |
64 | + //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); | |
ebc5ec73 | 65 | #endif |
ef335418 JR |
66 | |
67 | /* Language page: */ | |
68 | @@ -110,7 +110,7 @@ | |
69 | ||
0190f7b9 | 70 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
ef335418 JR |
71 | /* Proxy page: */ |
72 | - m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); | |
73 | + //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); | |
ebc5ec73 | 74 | #endif |
ef335418 JR |
75 | |
76 | #ifdef VBOX_WS_WIN | |
77 | @@ -226,14 +226,14 @@ | |
78 | } | |
0190f7b9 | 79 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
ef335418 JR |
80 | /* Update page: */ |
81 | - case GlobalSettingsPageType_Update: | |
82 | + /*case GlobalSettingsPageType_Update: | |
83 | { | |
84 | pSettingsPage = new UIGlobalSettingsUpdate; | |
85 | addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png", | |
86 | iPageIndex, "#update", pSettingsPage); | |
87 | addPageHelpKeyword(iPageIndex, "preferences"); | |
88 | break; | |
89 | - } | |
90 | + }*/ | |
0190f7b9 | 91 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ |
ef335418 JR |
92 | /* Language page: */ |
93 | case GlobalSettingsPageType_Language: | |
94 | @@ -255,14 +255,14 @@ | |
95 | } | |
96 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER | |
97 | /* Proxy page: */ | |
98 | - case GlobalSettingsPageType_Proxy: | |
99 | + /*case GlobalSettingsPageType_Proxy: | |
100 | { | |
101 | pSettingsPage = new UIGlobalSettingsProxy; | |
102 | addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png", | |
103 | iPageIndex, "#proxy", pSettingsPage); | |
104 | addPageHelpKeyword(iPageIndex, "preferences"); | |
105 | break; | |
106 | - } | |
107 | + }*/ | |
108 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ | |
109 | #ifdef VBOX_WS_WIN | |
110 | /* Interface page: */ |