2012-10-02 16:03:09 +02:00
|
|
|
Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
|
|
|
===================================================================
|
|
|
|
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
|
2011-08-28 09:05:37 +02:00
|
|
|
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
2012-10-02 16:03:09 +02:00
|
|
|
@@ -61,11 +61,11 @@ void UIGlobalSettingsUpdate::loadToCache
|
|
|
|
/* Load data to corresponding widgets from cache,
|
|
|
|
* this task SHOULD be performed in GUI thread only: */
|
2011-01-16 07:19:36 +01:00
|
|
|
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);
|
2012-10-02 16:03:09 +02:00
|
|
|
if (m_cache.m_branchIndex == VBoxUpdateData::BranchWithBetas)
|
|
|
|
m_pUpdateFilterBetasRadio->setChecked(true);
|
|
|
|
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
|
|
|
===================================================================
|
|
|
|
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h.orig
|
2011-08-28 09:05:37 +02:00
|
|
|
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
2012-10-02 16:03:09 +02:00
|
|
|
@@ -37,11 +37,10 @@ public:
|
|
|
|
|
|
|
|
enum GLSettingsPage
|
2011-07-21 12:51:05 +02:00
|
|
|
{
|
|
|
|
GLSettingsPage_General = 0,
|
|
|
|
GLSettingsPage_Input,
|
|
|
|
- GLSettingsPage_Update,
|
|
|
|
GLSettingsPage_Language,
|
2012-10-02 16:03:09 +02:00
|
|
|
GLSettingsPage_Display,
|
2011-07-21 12:51:05 +02:00
|
|
|
GLSettingsPage_USB,
|
|
|
|
GLSettingsPage_Network,
|
2012-10-02 16:03:09 +02:00
|
|
|
GLSettingsPage_Extension,
|
|
|
|
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
|
|
|
===================================================================
|
|
|
|
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig
|
2011-08-28 09:05:37 +02:00
|
|
|
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
2012-10-02 16:03:09 +02:00
|
|
|
@@ -327,19 +327,10 @@ UISettingsDialogGlobal::UISettingsDialog
|
|
|
|
addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png",
|
|
|
|
":/hostkey_16px.png", ":/hostkey_disabled_16px.png",
|
2011-07-21 12:51:05 +02:00
|
|
|
iPageIndex, "#input", pSettingsPage);
|
2011-01-17 13:39:27 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
- /* Update page: */
|
|
|
|
- case GLSettingsPage_Update:
|
|
|
|
- {
|
2011-07-21 12:51:05 +02:00
|
|
|
- pSettingsPage = new UIGlobalSettingsUpdate;
|
2011-01-17 13:39:27 +01:00
|
|
|
- addItem(":/refresh_32px.png", ":/refresh_disabled_32px.png",
|
|
|
|
- ":/refresh_16px.png", ":/refresh_disabled_16px.png",
|
2011-07-21 12:51:05 +02:00
|
|
|
- iPageIndex, "#update", pSettingsPage);
|
2011-01-17 13:39:27 +01:00
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
/* Language page: */
|
|
|
|
case GLSettingsPage_Language:
|
|
|
|
{
|
2012-10-02 16:03:09 +02:00
|
|
|
pSettingsPage = new UIGlobalSettingsLanguage;
|
|
|
|
addItem(":/site_32px.png", ":/site_disabled_32px.png",
|
|
|
|
@@ -474,13 +465,10 @@ void UISettingsDialogGlobal::retranslate
|
|
|
|
m_pSelector->setItemText(GLSettingsPage_General, tr("General"));
|
|
|
|
|
2011-01-17 13:39:27 +01:00
|
|
|
/* 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"));
|
|
|
|
|
2012-10-02 16:03:09 +02:00
|
|
|
/* Display page: */
|
|
|
|
m_pSelector->setItemText(GLSettingsPage_Display, tr("Display"));
|