diff --git a/resources/etc/OpenBoard.config b/resources/etc/OpenBoard.config index cdef9239..c332d35a 100644 --- a/resources/etc/OpenBoard.config +++ b/resources/etc/OpenBoard.config @@ -1,7 +1,6 @@ [App] AngleTolerance=4 EnableAutomaticSoftwareUpdates=false -EnableSoftwareUpdates=true EnableStartupHints=true FavoriteToolURIs=openboardtool://openboard/mask, openboardtool://ruler, openboardtool://compass, openboardtool://protractor, openboardtool://triangle, openboardtool://magnifier, openboardtool://cache IsInSoftwareUpdateProcess=false diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index e364027d..c1ebd477 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -511,13 +511,7 @@ void UBApplication::decorateActionMenu(QAction* action) menu->addSeparator(); menu->addAction(mainWindow->actionPreferences); menu->addAction(mainWindow->actionMultiScreen); - // SANKORE-48: Hide the check update action if the setting - // EnableAutomaticSoftwareUpdates is false in Uniboard.config - if(UBSettings::settings()->appEnableAutomaticSoftwareUpdates->get().toBool()) - menu->addAction(mainWindow->actionCheckUpdate); - else - mainWindow->actionCheckUpdate->setEnabled(false); - + menu->addAction(mainWindow->actionCheckUpdate); menu->addSeparator(); #ifndef Q_OS_LINUX // No Podcast on Linux yet diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp index 9fef16a1..8e787e56 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -186,8 +186,6 @@ void UBPreferencesController::wire() // about tab connect(mPreferencesUI->checkSoftwareUpdateAtLaunchCheckBox, SIGNAL(clicked(bool)), settings->appEnableAutomaticSoftwareUpdates, SLOT(setBool(bool))); - // As we (hopefully temporarily) don't have a website to check updates at, this setting is hidden for now - mPreferencesUI->softwareUpdateGroupBox->setVisible(false); connect(mPreferencesUI->checkOpenSankoreAtStartup, SIGNAL(clicked(bool)), settings->appLookForOpenSankoreInstall, SLOT(setBool(bool))); } diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 337ed250..bea6dd66 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -225,7 +225,6 @@ void UBSettings::init() appToolBarPositionedAtTop = new UBSetting(this, "App", "ToolBarPositionedAtTop", true); appToolBarDisplayText = new UBSetting(this, "App", "ToolBarDisplayText", true); appEnableAutomaticSoftwareUpdates = new UBSetting(this, "App", "EnableAutomaticSoftwareUpdates", false); - appEnableSoftwareUpdates = new UBSetting(this, "App", "EnableSoftwareUpdates", true); appSoftwareUpdateURL = new UBSetting(this, "App", "SoftwareUpdateURL", "http://www.openboard.ch/update.json"); appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false); appPreferredLanguage = new UBSetting(this,"App","PreferredLanguage", ""); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 44757652..c191a4cd 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -239,7 +239,6 @@ class UBSettings : public QObject UBSetting* appToolBarPositionedAtTop; UBSetting* appToolBarDisplayText; UBSetting* appEnableAutomaticSoftwareUpdates; - UBSetting* appEnableSoftwareUpdates; UBSetting* appSoftwareUpdateURL; UBSetting* appToolBarOrientationVertical; UBSetting* appPreferredLanguage;