From 2cde45fe6d94211d005cd32e7368769f8524bdec Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Thu, 31 Mar 2016 13:59:01 +0200
Subject: [PATCH] UPDATES: Implement Check now button in Options

---
 gui/options.cpp                               |  11 ++++++++++-
 gui/themes/scummclassic.zip                   | Bin 111931 -> 112109 bytes
 gui/themes/scummclassic/classic_layout.stx    |   3 +++
 .../scummclassic/classic_layout_lowres.stx    |   3 +++
 gui/themes/scummmodern.zip                    | Bin 1487717 -> 1487883 bytes
 gui/themes/scummmodern/scummmodern_layout.stx |   3 +++
 .../scummmodern/scummmodern_layout_lowres.stx |   3 +++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/gui/options.cpp b/gui/options.cpp
index 06f79e94b75..c4a82982b2f 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
@@ -1518,6 +1521,12 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
 	case kFluidSynthSettingsCmd:
 		_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 028e5f23c7e84ec04bc752e55834217cb09c1289..43fcea12fd3975ca3383608029ae362c30ee24ec 100644
GIT binary patch
delta 521
zcmdn}itX)dHr@blW)=|!5D=PKJCQex#fZP(ePj9_J}_gmIzNo{Ty}yr@5;P-kE%xs
zMbVQO7@{|~L|(TLP(TBd6(@=FI%lLNXZt4Rl_uuoR8HS0#i%h^VLQ)sd2vSG?eVIN
z^Oz=Yn8v<YW@>L3@7lb2kFL~j2`~B?7+!4N_PW=SEF%TNctI{_-Nx-Cz|FuQF#TW~
zqvXU6zU_;v83nn)p4q;mjqwYVxnUBcg#bkK%_7E4{LDf#Yo{;V#Aw6;GQ~>t(d6m!
zn;FHXf84~V239s*dNZQ~gcZM;(GoQzrZ3&hXsm$ZlYRyUNpP@2z>>xvuP5(*Ev*ya
z&B!Fe3<+@*2Xiwph@)r_ubFPYg;7-tq^f*J!^y+k3=ANQsw$?Pks&R!A~nUd!eY9^
yW=3g<8`o}OlwuB<%s74jBu4S++?yGBAmSglFiJ5^SUjC~E29RR%VtIf1_l7NubKP+

delta 394
zcmaF+nr-(hHr@blW)=|!5IE@PG?6!qrPrdzbz}M-J}_gmIzNo{Ty}yruX<>$$L`&Z
zX-tzC7??J<L|(U;ULeURv-!d#qex!U&{_|+uaUw1{R|BKoB7}LTEZmfF>PP3!B`Xw
zHgmgb4WlDBgqhXO_yx*Ln#^b+01=(Hm~j(7^FcqS>A{;BjW|FqvJ!nXdHTi8jAGLl
zZ)Q{jE1Q0HGou59CAfvr64h<f!?!RR%cHocpMgOV>`@3<(l~$m$}Nl<3LxWIw{bfO
za5FG~usDjM)avOUw=k+g?2+2aD8;m@4J0Bm-D@kOAVfHRE29+iqDhR?3nw#*Pv5(l
kkq2z(l*5xgHt;hrfUp>fq4yR|-@lbngKg3#Mg|530ARX((EtDd

diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index b8b0d9a85d1..65724d9faff 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 7481f9ef546..f73f6e864bc 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 52655a510e161c0ff5ec050aad9cfa3efd1599df..70f7672c57afb796904eeea73851bdc7bb69cb67 100644
GIT binary patch
delta 1147
zcma)*Ur19?9LJB_^4~V6p50$!rqhTDOvyiEPR)j(m58e}xAljnoBdIz;UvnI3B`?M
znCs8c3VJB6nQrb+F_6nxFVUkC(Nn#I(nAkDIHUrJ?c6(<PaQb$Ip5#E^ZVU<*48bP
zKP*aPn^dMo@s&U8npSqns#H_06Mc94(%$t+PI8GO%X1Qz=cFvp$ylD-!SY->%X1kl
z&t<Yam&Nj2Hp_GJFwZHr)@ew@tz;wa95&)su@QGJ8*%4_Bkp|9Si&6c%);eTigy&a
zO2B0m=5wfeqd1BBgV>^=>P#Ir$|(M9#1<j!xB;IL9Om1xRZw$I;IjfcI`MhIVdVn0
z398P94RV^yHH0?=938_Z!D00l*5*<N`4rX(*!lwdRaE`!6Mfn4AP#p2)h6Nkp{V*>
zGj)0_V=9G&A2XO*0n_Bnz-g>;j332cI%AcO5Q=X=h`bNL&M>huPxa*MZ6;6MHEgpw
z?IX>X?7jW%R>!DyVBk8jK4JEgmCuZV<d%Yx_##Yt*!Y~OHY;B`#*dP+1DVqvgr>s}
zV$4=ujb__wxOUlg(eBhZtb=w<qh{ZKm+)6Yi;1@NhXrx|rb!UzA0{Bqzvvm96Nc`Z
z1G`k3KkFiEZ=fm>Pj)SUo|1V1w3Hquwbi61UxWr~ZCivRl%|sOX%T9uCijZ@j(J6G
z!V9(3y6lB|O23oVLq5<^ZO{jYDJ}WHKxxAVhRpb5C~euSCQW_-a%u?*sBvgXyh<oZ
zn@Otoi%nil(wtu`_T3M4G>awxO_X{A(3q3@GZ0?@w3?K!=|O0B;;GX0YT`qTL<68E
z^D#zVZfr}FsHOBR$L}32s4#1#2*r1HN|@&!=?IFg^ar7E&#y^9BhI1W9;c(CXK;9X
zD)W8K6%z3RNIGUnGzcXn@d7$!nM|udD87{`1>TaaAQaKoibGH+VO|q`2==DmTmXd7
EKWU?8n*aa+

delta 1075
zcmZvbTSyd97{|}<teWmcx3lvVMi+|c#Y`lZSud4FB$~3tdRsGGZy1y-xglnXLUAe^
zA}vOe)Q6a|T~~LP7>Hrf9-`jtrJl+Zk{*Nzk{$w!*)wNhp#ukg^FROp`98kkjD7ch
z+wfZ5)tt$Jw6$DY@z7dl5{3I`M!Rlz8D4c6FUW~cqRK|1${bN;6H(<fqRQz+l{1Jc
z?;xt2NmMzDsIpm6Wy|&kjl@MOiHkN87qdxR%pq~nuEfQi<AaG~#gmEiIEuF{xKPK}
z*;utv^~Sy=79Yi43somw*lnV?S%$rOtg0M0>xQ`+?9)}-d3;gF9uK~x8&+Czhpq}8
zxZF%H8}j2{I$j^djk@8(Fm~opgZTj#bUZtQ7qhAQC(OL0A&QlTsH0JDKepufa+;bR
zoA_h;h3_)>A{`B8{z|>Qp>C)$=l#9S^$CQu4bs{c&npu?e!5s1DFK^wV3;>6?gE%L
zN-MK`hEh7iKdQI>_6${~t^4)};|K}L=PiEQB^8YD_N4t>BP~9A2iTOh$AC?#WfItw
z-b_J@KAJ->pp)a4Yb&I&AQUF@(sB@rDg6zClaedMwEhs&A|WWHr$0k*ic--$qk(xi
zPPNE9%l=4eN5W7<Pg}!KLTM(<5}(2#Pz^7@2}*SfP)_Mdl2#X3&-@~*+mxiINm^TE
zzFiSUH4#?hZUkKP=C=_zNhvc5Wwz8mC3&LY+@JCn#u3_^ct><S8y%45qL5dry{Dz!
z`Atp^A#G=+m^KNZzE0n@_U`<)tG(`OgVDj!=cwf*dkk_7RZ?CIa%nGBF~~K~Nr3tS
z{@%7gkK~U4G;3bLdeG#wAf#<;N)6i-puYagf%fjUK+pfm+*E5<S$jAo>VGbMjltpc
Jk1qis^bb&FYry~j

diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 8ce9a0007e2..c73ffa1f083 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 7de2c48c60a..43ec0cdee10 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'