aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-03-31 13:59:01 +0200
committerEugene Sandulenko2016-03-31 13:59:01 +0200
commit2cde45fe6d94211d005cd32e7368769f8524bdec (patch)
tree91a874c102b2e69cd6390eeaa8fa459eb9d76f9b
parent82963f7446f336fe71e71f35fa39768aed059541 (diff)
downloadscummvm-rg350-2cde45fe6d94211d005cd32e7368769f8524bdec.tar.gz
scummvm-rg350-2cde45fe6d94211d005cd32e7368769f8524bdec.tar.bz2
scummvm-rg350-2cde45fe6d94211d005cd32e7368769f8524bdec.zip
UPDATES: Implement Check now button in Options
-rw-r--r--gui/options.cpp11
-rw-r--r--gui/themes/scummclassic.zipbin111931 -> 112109 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout.stx3
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx3
-rw-r--r--gui/themes/scummmodern.zipbin1487717 -> 1487883 bytes
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx3
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx3
7 files changed, 22 insertions, 1 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 06f79e94b7..c4a82982b2 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -62,7 +62,8 @@ enum {
kChooseExtraDirCmd = 'chex',
kExtraPathClearCmd = 'clex',
kChoosePluginsDirCmd = 'chpl',
- kChooseThemeCmd = 'chtf'
+ kChooseThemeCmd = 'chtf',
+ kUpdatesCheckCmd = 'updc'
};
enum {
@@ -1245,6 +1246,8 @@ GlobalOptionsDialog::GlobalOptionsDialog()
_updatesPopUp->setSelectedTag(ConfMan.getInt("updates_check"));
else
_updatesPopUp->setSelectedTag(Common::UpdateManager::kUpdateIntervalNotSupported);
+
+ new ButtonWidget(tab, "GlobalOptions_Misc.UpdatesCheckManuallyButton", _("Check now"), 0, kUpdatesCheckCmd);
#endif
// Activate the first tab
@@ -1519,6 +1522,12 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
_fluidSynthSettingsDialog->runModal();
break;
#endif
+#ifdef USE_UPDATES
+ case kUpdatesCheckCmd:
+ if (g_system->getUpdateManager())
+ g_system->getUpdateManager()->checkForUpdates();
+ break;
+#endif
default:
OptionsDialog::handleCommand(sender, cmd, data);
}
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 028e5f23c7..43fcea12fd 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index b8b0d9a85d..65724d9faf 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -514,6 +514,9 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
+ <widget name = 'UpdatesCheckManuallyButton'
+ type = 'Button'
+ />
</layout>
<widget name='KeysButton'
type='Button'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7481f9ef54..f73f6e864b 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -519,6 +519,9 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
+ <widget name = 'UpdatesCheckManuallyButton'
+ type = 'Button'
+ />
</layout>
<widget name='KeysButton'
type='Button'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 52655a510e..70f7672c57 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 8ce9a0007e..c73ffa1f08 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -528,6 +528,9 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
+ <widget name = 'UpdatesCheckManuallyButton'
+ type = 'Button'
+ />
</layout>
<widget name='KeysButton'
type='Button'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 7de2c48c60..43ec0cdee1 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -517,6 +517,9 @@
<widget name = 'UpdatesPopup'
type = 'PopUp'
/>
+ <widget name = 'UpdatesCheckManuallyButton'
+ type = 'Button'
+ />
</layout>
<widget name='KeysButton'
type='Button'