From 08e7f0ab9179691fe869bab8fee5585364c846c7 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 31 Mar 2016 09:31:57 +0200 Subject: UPDATES: Got rid of hardcoded update intervals list --- gui/options.cpp | 10 ++++++---- gui/updates-dialog.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'gui') diff --git a/gui/options.cpp b/gui/options.cpp index 96db1d74ce..06f79e94b7 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1234,10 +1234,12 @@ GlobalOptionsDialog::GlobalOptionsDialog() _updatesPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.UpdatesPopupDesc", _("Update check:"), _("How often to check ScummVM updates")); _updatesPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.UpdatesPopup"); - _updatesPopUp->appendEntry(_("Never"), Common::UpdateManager::kUpdateIntervalNotSupported); - _updatesPopUp->appendEntry(_("Daily"), Common::UpdateManager::kUpdateIntervalOneDay); - _updatesPopUp->appendEntry(_("Weekly"), Common::UpdateManager::kUpdateIntervalOneWeek); - _updatesPopUp->appendEntry(_("Monthly"), Common::UpdateManager::kUpdateIntervalOneMonth); + const int *vals = Common::UpdateManager::getUpdateIntervals(); + + while (*vals != -1) { + _updatesPopUp->appendEntry(Common::UpdateManager::updateIntervalToString(*vals), *vals); + vals++; + } if (ConfMan.hasKey("updates_check")) _updatesPopUp->setSelectedTag(ConfMan.getInt("updates_check")); diff --git a/gui/updates-dialog.cpp b/gui/updates-dialog.cpp index 260bc590d6..960b3f397a 100644 --- a/gui/updates-dialog.cpp +++ b/gui/updates-dialog.cpp @@ -95,10 +95,12 @@ UpdatesDialog::UpdatesDialog() : Dialog(30, 20, 260, 124) { _updatesPopUp = new PopUpWidget(this, 10, y, _w - 20, g_gui.xmlEval()->getVar("Globals.PopUp.Height", kLineHeight)); - _updatesPopUp->appendEntry(_("Never"), Common::UpdateManager::kUpdateIntervalNotSupported); - _updatesPopUp->appendEntry(_("Daily"), Common::UpdateManager::kUpdateIntervalOneDay); - _updatesPopUp->appendEntry(_("Weekly"), Common::UpdateManager::kUpdateIntervalOneWeek); - _updatesPopUp->appendEntry(_("Monthly"), Common::UpdateManager::kUpdateIntervalOneMonth); + const int *vals = Common::UpdateManager::getUpdateIntervals(); + + while (*vals != -1) { + _updatesPopUp->appendEntry(Common::UpdateManager::updateIntervalToString(*vals), *vals); + vals++; + } _updatesPopUp->setSelectedTag(Common::UpdateManager::kUpdateIntervalOneWeek); -- cgit v1.2.3