2011-01-16 07:19:36 +01:00
|
|
|
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
2010-12-23 11:08:49 +01:00
|
|
|
===================================================================
|
2011-01-16 07:19:36 +01:00
|
|
|
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
|
|
|
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
|
|
|
@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
|
|
|
|
void UIGlobalSettingsUpdate::getFromCache()
|
2010-12-23 11:08:49 +01:00
|
|
|
{
|
2011-01-16 07:19:36 +01:00
|
|
|
/* Apply internal variables data to QWidget(s): */
|
|
|
|
- m_pEnableUpdateCheckbox->setChecked(m_cache.m_fCheckEnabled);
|
|
|
|
+ m_pEnableUpdateCheckbox->setChecked(false);
|
|
|
|
if (m_pEnableUpdateCheckbox->isChecked())
|
2010-12-23 11:08:49 +01:00
|
|
|
{
|
2011-01-16 07:19:36 +01:00
|
|
|
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
|
|
|
|
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
|
2010-12-23 11:08:49 +01:00
|
|
|
===================================================================
|
2011-01-16 07:19:36 +01:00
|
|
|
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
|
|
|
|
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
|
|
|
|
@@ -91,8 +91,7 @@ void VBoxHelpActions::addTo (QMenu *aMen
|
2010-12-23 11:08:49 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
aMenu->addAction (updateAction);
|
|
|
|
- updateAction->setEnabled (vboxGlobal().virtualBox().
|
|
|
|
- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty());
|
2011-01-16 07:19:36 +01:00
|
|
|
+ updateAction->setDisabled ( true );
|
2010-12-23 11:08:49 +01:00
|
|
|
|
|
|
|
#ifndef Q_WS_MAC
|
|
|
|
aMenu->addSeparator();
|
2011-01-17 13:39:27 +01:00
|
|
|
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
2010-12-23 11:08:49 +01:00
|
|
|
===================================================================
|
2011-01-17 13:39:27 +01:00
|
|
|
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
|
|
|
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
|
|
|
@@ -322,16 +322,6 @@ UIGLSettingsDlg::UIGLSettingsDlg(QWidget
|
|
|
|
i, "#input", pSettingsPage);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
- /* Update page: */
|
|
|
|
- case GLSettingsPage_Update:
|
|
|
|
- {
|
|
|
|
- UISettingsPage *pSettingsPage = new UIGlobalSettingsUpdate;
|
|
|
|
- pSettingsPage->setId(i);
|
|
|
|
- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
|
|
|
|
- ":/refresh_16px.png", ":/refresh_disabled_16px.png",
|
|
|
|
- i, "#update", pSettingsPage);
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
/* Language page: */
|
|
|
|
case GLSettingsPage_Language:
|
|
|
|
{
|
|
|
|
@@ -442,9 +432,6 @@ void UIGLSettingsDlg::retranslateUi()
|
|
|
|
/* Input page: */
|
|
|
|
m_pSelector->setItemText(GLSettingsPage_Input, tr("Input"));
|
|
|
|
|
|
|
|
- /* Update page: */
|
|
|
|
- m_pSelector->setItemText(GLSettingsPage_Update, tr("Update"));
|
|
|
|
-
|
|
|
|
/* Language page: */
|
|
|
|
m_pSelector->setItemText(GLSettingsPage_Language, tr("Language"));
|
|
|
|
|
|
|
|
Index: VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
|
|
|
===================================================================
|
|
|
|
--- VirtualBox-4.0.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
|
|
|
+++ VirtualBox-4.0.0_OSE/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
|
|
|
@@ -34,7 +34,6 @@ public:
|
|
|
|
{
|
|
|
|
GLSettingsPage_General = 0,
|
|
|
|
GLSettingsPage_Input,
|
|
|
|
- GLSettingsPage_Update,
|
|
|
|
GLSettingsPage_Language,
|
|
|
|
GLSettingsPage_USB,
|
|
|
|
GLSettingsPage_Network,
|