From 86cadcb8b3a59ea690f2c8a80ea1e868f60f19a5 Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sf.net>
Date: Sat, 14 Sep 2013 16:44:16 +0300
Subject: [PATCH] UI|Updater: Stop progress rotation when download complete

Also tweaked the mini progress icon.
---
 .../graphics/progress-mini.png                 | Bin 886 -> 1483 bytes
 .../client/include/ui/widgets/progresswidget.h |   1 +
 .../client/src/ui/widgets/progresswidget.cpp   |   9 ++++++++-
 .../client/src/ui/widgets/taskbarwidget.cpp    |   2 +-
 doomsday/client/src/updater/downloaddialog.cpp |   6 ++++--
 doomsday/client/src/updater/updater.cpp        |   1 +
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/doomsday/client/data/defaultstyle.pack/graphics/progress-mini.png b/doomsday/client/data/defaultstyle.pack/graphics/progress-mini.png
index 318473e860fcf4f572316bb673795a73de3ec336..002d762928ad1aeb3e51cf5f498516b3e720fa90 100644
GIT binary patch
delta 1418
zcmV;51$FxN2FnYOQ-2N(CpYCAG%5f91z1T$K~z}7y_nmJRdp1{Kfg0)#!1a`G)-+(
zywLrg^^jettSE@=B|?ZU4<Yr?OB58;e-P1A1VZ!>6edMjgjvuXqKjsUSg3g`6GwBL
z@ywj_>7lh_d)#~6XU1BvnVB>D_dDyi)^~l^cl{C-O(mst(tl@Rsc6Z+|IDo`+Gi|F
z<8&+mbzn+7Q-NNf3upnyfx&o=0wX|cJdRdB%0HWS0h56x!1=&@U~W9qfl0t9a2VJJ
z>;-lM+ku~eBf#isiD3SO5wYpOmB2D!IdBbdW<;$PPqtqxo+dB^{0wXaz5~7n_NSCu
zRU(-xI9CUj0)O`bcLA3~TDv+3ehU}|eg!@R)&f7Ilm<J-We)hLlhxbQwd#I#)QMS3
zJ)~|>SE)0KzPGA#Q`P&`Pt{>huZ^gi)u+|D+4qj=WI^N}P`^<d6(cjG4ywm0M!Ko)
zP@h-NDT`#i0CU~I^}yr6<=Hz0){JWX9oQcgI~bKb8-JJsoD1{;-39Aw!2+v*UFusY
zrK2gO6a1;?i8QKpDX==KwO&HNe*l|-FMtn#9Y7<Bp%w*n4zL2a3Ah62FDR@8ECL=2
zCqGFkHBTs*w$%2i&qYBL*{HfneL=k_a9SG!HofY6b+!7rdc0)cqv~tw;!-@SUFxl|
zQM1IkZ-3MW)tN<rE(3WS<PLRxV6_Otzo?I@J!P9rQ=d@}mjHUR`jC2dC;huEnzySP
zql(*YNL`~Y%tx^nztjSIHwFo}+n>NXV0}typelFev6NC84$Q6rw&le{SZ{Qw>+-cx
zi!bSp-g<Qbkek33;7#B_r_DZph?LS%;1l5c5PuZyHa7xwM!wXE5BfuuwA&HjOJHY8
z$xd5SMjJW%9e5YmRS?DQpr*5eQT}ysN_bz?U-tp;g>33r&lRM41o#Zt8QIBOS4415
zrV}y+GPT6PR&d^qEP9<fSCa0(g4i1c4lWE1t>q)w8;sx1X(N%65l(~U4%Y$>mFzn+
z4}Y~<&htqnGHED&R#O}mgPH3*?befTjkTO3BPDvVC&R-;(p#`^y+n_W=CPSM*obOv
zKT$nGUOz2iJ8{UGRw5z>fMa<FjSAgc;^6E6EfY<1E(4k3=_!EJ&fwctK7xbc;Ap|V
z=K^=ClP8kqT>Gj4R{;x3n!>iAHuDZ11Aq3EuzO!frrA}5L51k`#eB24fHg)VPy-pQ
z)nZ{IM#HTIY3>Ft1@2a-jnN^h2!<Zu+Gweh3tm4M9cHM#NSZOXZj9-x-OdZ;yIh@A
z)FCQNhc)10;E_0RD&X9&;%S_eCAF^J8-lb|Acq?2`|2$j9!oG*<Y>2gsrsrqP=6v?
z_o`2-y`>wg^VAnhG-0OMK2jf!ck8E!U@gS$J?a}{ICorqN4+c)37KE@ECqq7{lMEX
zEZtDRf4!j@`+=K*b?T<zu93iR3fxYKE0UG5*M+gZs9S9V-T=0?_xuy4x|C8={T6ry
zm=U)KwE}Kj61ZFzoHY>OJ`|4i$A9|17>dpu<C<k3@H(&|rPQdTnAGX&6Y91SJmzPK
zR^ao9dN9&B9AiT36tnRG^<{NImfB7zVV3%oy0v76nCKPA9`z-4X*=#ZadKu9#HS_G
z*m$g={-8b^15)ak_zSK<Zd6~7ln+-(UD<ui?x@z40i#noSM`3d3z!!zZ+}JH6wHrq
zP#@z8xEbwpU))4|415G^uUZhPlk4ATRsGQs76BJTS6C1fQp<_ay)g~`7z$-ewA11L
z^o}~x(iL1cD<U~F{!Y23e+c+3L`VZ@W*qmQ+)<BlnVt%`G9zH~PK|de9Iq<=U)KE%
Yr#)^fmr2=400000NkvXXt^-0~f*bCiMF0Q*

delta 816
zcmV-01JC@+3-$((Q-2K-6(oroY9;^x0|QA!K~z}7#h6V<R8bVi|L18X1!brRQQ3#s
zml>^s5~4Oit)&mbMYL#Dgtcf9xCx>*ZK9x6BrSqAMMTh6f=GgDlNd&ckrb(;Ep(b+
z3-8D?-rV=z%$w;C!yS0%ocq7$ew+_e3IH;*;{OIoosv4-*ncLe(TV0HjY;|-X;{*G
zGt2#JBQpTSF#y&BPe_kfzz(23Y%@!8hk)-?jw#?&mfl+hydZnL0XCN9&5+j)P<`~I
zA{ioghT7p~S`VJ3_P7`2NsA!2U(#U8qneZSPSS*=f~00iyWE%ty=L~H<kkX>DONlQ
zJOtW3JJAf>27e|}*zNRfZPMF%w~PySIic;5$V&qpNuZnu_NILrLL|2Uzkx!`JpGII
z-PYCt;|a)hRT>3=rUVcEk0tW}Z3(>BomFH4b|#qbcv$IqjPRXI<L82{6ESn<B*}o4
zl4d=&W+XL9n#(E+aSL7MY%eb%R*<wIaH*0HFU@Q&%YPKf%w%Tsk}i3~0!i%xPRF=<
ztEzy|&Hm$=`$iyXx5v)3nSD}qG3@!)9k@)m9Oa6)+2NZ<Y<mz&)1&ZH)yI_Q+u9&1
zVF(|U8W8l(5lEW$t)K=3SNpQ0K+;!_Kzr5?bOc&`cOY=3VJS2L&6$^p5l$$9!9dc-
z7z5X<c7OO5;%$RR<f#FTl74xFCMC5<%4Zzv>f9@_#uMr`6%}5`M3bvk@ZPbQIcI^z
zHpZR==}%WisaCNRh{O4?Vts<Tq2Mx~vTk))2N;d(J`{BV7k2WJF2+SCN#npeGfPd<
z=@{^N@obgG{UzZrlvxZVENuFsJQL%!URO56VSmDRJ~~pAhtoh0&>B;J90tZx*gY6t
zSXAMDRMN8)yH{}Ikb6@Lk~T})C#l|r)1<g)X17ZA5JOwt_a9mxj}l$L5XoybBsWk=
zhbv!Ya{WGX7T1pkS|p9cq($XmUeY!*8_lF|?TV|}jJ$RMSW%T!4mbx4mO<(*a3#t6
unJIO^9{|3%cHE5nO}SprW8h>Zr2Yba8Uz$y$E}e70000<MNUMnLSTYM1b`y|

diff --git a/doomsday/client/include/ui/widgets/progresswidget.h b/doomsday/client/include/ui/widgets/progresswidget.h
index b9e1cfa727..e389801b13 100644
--- a/doomsday/client/include/ui/widgets/progresswidget.h
+++ b/doomsday/client/include/ui/widgets/progresswidget.h
@@ -47,6 +47,7 @@ class ProgressWidget : public LabelWidget
     ProgressWidget(de::String const &name = "");
 
     void useMiniStyle();
+    void setRotationSpeed(float anglesPerSecond);
 
     Mode mode() const;
     de::Rangei range() const;
diff --git a/doomsday/client/src/ui/widgets/progresswidget.cpp b/doomsday/client/src/ui/widgets/progresswidget.cpp
index 60df82fcb3..24f6e16885 100644
--- a/doomsday/client/src/ui/widgets/progresswidget.cpp
+++ b/doomsday/client/src/ui/widgets/progresswidget.cpp
@@ -31,6 +31,7 @@ DENG_GUI_PIMPL(ProgressWidget), public Lockable
     Rangef visualRange;
     Animation pos;
     float angle;
+    float rotationSpeed;
     Id gearTex;
     DotPath colorId;
     DotPath shadowColorId;
@@ -44,6 +45,7 @@ DENG_GUI_PIMPL(ProgressWidget), public Lockable
           visualRange(0, 1),
           pos(0, Animation::Linear),
           angle(0),
+          rotationSpeed(20),
           colorId("progress.light.wheel"),
           shadowColorId("progress.light.shadow"),
           gearId("progress.gear"),
@@ -98,6 +100,11 @@ void ProgressWidget::useMiniStyle()
     setOverrideImageSize(style().fonts().font("default").height().value());
 }
 
+void ProgressWidget::setRotationSpeed(float anglesPerSecond)
+{
+    d->rotationSpeed = anglesPerSecond;
+}
+
 ProgressWidget::Mode ProgressWidget::mode() const
 {
     DENG2_GUARD(d);
@@ -169,7 +176,7 @@ void ProgressWidget::update()
     TimeDelta const elapsed = d->updateAt.since();
     d->updateAt = now;
 
-    d->angle = de::wrap(d->angle + float(elapsed * 20), 0.f, 360.f);
+    d->angle = de::wrap(d->angle + float(elapsed * d->rotationSpeed), 0.f, 360.f);
 
     requestGeometry();
 }
diff --git a/doomsday/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/client/src/ui/widgets/taskbarwidget.cpp
index ab3aa379c6..44d399e116 100644
--- a/doomsday/client/src/ui/widgets/taskbarwidget.cpp
+++ b/doomsday/client/src/ui/widgets/taskbarwidget.cpp
@@ -312,8 +312,8 @@ TaskBarWidget::TaskBarWidget() : GuiWidget("taskbar"), d(new Instance(this))
     d->mainMenu->items()
             << unloadMenu // hidden with null-game
             << new ui::Item(ui::Item::Separator) // hidden with null-game
-            << new ui::ActionItem(tr("About Doomsday"), new SignalAction(this, SLOT(showAbout())))
             << new ui::ActionItem(tr("Check for Updates..."), new CommandAction("updateandnotify"))
+            << new ui::ActionItem(tr("About Doomsday"), new SignalAction(this, SLOT(showAbout())))
             << new ui::Item(ui::Item::Separator)
             << new ui::ActionItem(tr("Quit Doomsday"), new CommandAction("quit"));
 
diff --git a/doomsday/client/src/updater/downloaddialog.cpp b/doomsday/client/src/updater/downloaddialog.cpp
index 51655ec3f5..9b7647ef4f 100644
--- a/doomsday/client/src/updater/downloaddialog.cpp
+++ b/doomsday/client/src/updater/downloaddialog.cpp
@@ -264,11 +264,12 @@ void DownloadDialog::finished(QNetworkReply *reply)
     }
 
     buttons().clear()
-            << new DialogButtonItem(DialogWidget::Reject, tr("Abort"),
+            << new DialogButtonItem(DialogWidget::Reject, tr("Delete"),
                                     new SignalAction(this, SLOT(cancel())))
-            << new DialogButtonItem(DialogWidget::Accept | DialogWidget::Default, tr("Install"));
+            << new DialogButtonItem(DialogWidget::Accept | DialogWidget::Default, tr("Install Update"));
 
     d->state = Instance::Finished;
+    d->progress->setRotationSpeed(0);
     d->updateProgress();
 
     // Make sure the finished download is noticed by the user.
@@ -282,6 +283,7 @@ void DownloadDialog::cancel()
     LOG_INFO("Download cancelled via user request");
 
     d->state = Instance::Error;
+    d->progress->setRotationSpeed(0);
 
     if(d->reply)
     {
diff --git a/doomsday/client/src/updater/updater.cpp b/doomsday/client/src/updater/updater.cpp
index cd06b88aee..6153559ac7 100644
--- a/doomsday/client/src/updater/updater.cpp
+++ b/doomsday/client/src/updater/updater.cpp
@@ -120,6 +120,7 @@ class UpdaterStatusWidget : public ProgressWidget
     {
         useMiniStyle();
         setColor("text");
+        setRotationSpeed(0);
         setSizePolicy(ui::Expand, ui::Expand);
 
         // The notification has a hidden button that can be clicked.