diff --git a/doomsday/client/data/defaultstyle.pack/graphics/progress-mini.png b/doomsday/client/data/defaultstyle.pack/graphics/progress-mini.png index 318473e860..002d762928 100644 Binary files a/doomsday/client/data/defaultstyle.pack/graphics/progress-mini.png and b/doomsday/client/data/defaultstyle.pack/graphics/progress-mini.png differ 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.