Default Style|ProgressWidget: Icon tweaks

doomsday/client/data/defaultstyle.pack/colors.dei

@@ -43,11 +43,11 @@ group choice {
 
 group progress {
     group light {
-        color wheel  { rgb <1.0, 1.0, 1.0, 0.5> }
+        color wheel  { rgb <1.0, 1.0, 1.0, 0.25> }
         color shadow { rgb <0.0, 0.0, 0.0, 0.54> }
     }
     group dark {
-        color wheel  { rgb <0.0, 0.0, 0.0, 0.5> }
+        color wheel  { rgb <0.0, 0.0, 0.0, 0.25> }
         color shadow { rgb <1.0, 1.0, 1.0, 0.54> }
     }
 }

doomsday/client/data/defaultstyle.pack/images.dei

@@ -34,4 +34,5 @@ group toggle {
 group progress {
     image wheel { path = "graphics/progress-wheel.png" }
     image gear  { path = "graphics/progress-gear.png" }
+    image mini  { path = "graphics/progress-mini.png" }
 }

doomsday/client/src/ui/widgets/progresswidget.cpp

@@ -55,7 +55,7 @@ DENG_GUI_PIMPL(ProgressWidget), public Lockable
 
     void updateStyle()
     {
-        self.setImageColor(style().colors().colorf(colorId) * Vector4f(1, 1, 1, .5f));
+        self.setImageColor(style().colors().colorf(colorId) /* * Vector4f(1, 1, 1, .5f)*/);
     }
 
     void glInit()
@@ -86,16 +86,16 @@ ProgressWidget::ProgressWidget(String const &name) : d(new Instance(this))
 
 void ProgressWidget::useMiniStyle()
 {
-    /// @todo Make this look better.
+    // Don't use the normal wheel.
+    setImage(de::Image());
 
-    d->gearId = "gear"; // Mini gear icon.
+    d->gearId = "progress.mini";
     d->colorId = "text";
     setImageScale(1);
     setAlignment(ui::AlignCenter, LabelWidget::AlignByCombination);
 
     // Resize to the height of the default font.
-    float hgt = style().fonts().font("default").height().value();
-    setOverrideImageSize(Vector2f(hgt, hgt));
+    setOverrideImageSize(style().fonts().font("default").height().value());
 }
 
 ProgressWidget::Mode ProgressWidget::mode() const
@@ -239,7 +239,7 @@ void ProgressWidget::glMakeGeometry(DefaultVertexBuf::Builder &verts)
 
     DefaultVertexBuf::Builder gear;
     DefaultVertexBuf::Type v;
-    v.rgba = style().colors().colorf(d->colorId);
+    v.rgba = style().colors().colorf(d->colorId) * Vector4f(1, 1, 1, 2);
 
     for(int i = 0; i <= edgeCount; ++i)
     {

doomsday/client/src/updater/updater.cpp

@@ -119,6 +119,7 @@ class UpdaterStatusWidget : public ProgressWidget
     UpdaterStatusWidget()
     {
         useMiniStyle();
+        setColor("text");
         setSizePolicy(ui::Expand, ui::Expand);
 
         // The notification has a hidden button that can be clicked.
@@ -266,10 +267,24 @@ DENG2_OBSERVES(App, StartupComplete)
         ClientWindow::main().notifications().showOrHide(status, show);
     }
 
-    void queryLatestVersion(bool notifyAlways)
+    void showCheckingNotification()
+    {
+        status->setRange(Rangei(0, 1));
+        status->setProgress(0, 0);
+        status->setImage(ClientApp::windowSystem().style().images().image("updater"));
+        showNotification(true);
+    }
+
+    void showDownloadNotification()
     {
         status->setMode(ProgressWidget::Indefinite);
+        status->setImage(Image());
         showNotification(true);
+    }
+
+    void queryLatestVersion(bool notifyAlways)
+    {
+        showCheckingNotification();
 
         UpdaterSettings().setLastCheckTime(de::Time());
         alwaysShowNotification = notifyAlways;
@@ -354,8 +369,7 @@ DENG2_OBSERVES(App, StartupComplete)
             //availableDlg = 0;
 
             // The notification provides access to the download dialog.
-            showNotification(true);
-            status->setMode(ProgressWidget::Indefinite);
+            showDownloadNotification();
 
             LOG_MSG("Download and install.");
 
@@ -520,7 +534,7 @@ void Updater::downloadCompleted(int)
                                   _E(.) "Doomsday will be shut down before the installation can start. "
                                   "The game is not saved automatically, so you will have to "
                                   "save the game before installing the update."));
-        msg->buttons().items()
+        msg->buttons()
                 << new DialogButtonItem(DialogWidget::Accept | DialogWidget::Default, tr("I'll Save First"))
                 << new DialogButtonItem(DialogWidget::Reject, tr("Discard Progress & Install"));