ubuntu-system-settings

Merge lp:~didrocks/ubuntu-system-settings/add-unknown-progress-bar into lp:ubuntu-system-settings

  1. add-unknown-progress-bar
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 404
Merged at revision: 410
Proposed branch: lp:~didrocks/ubuntu-system-settings/add-unknown-progress-bar
Merge into: lp:ubuntu-system-settings
Diff against target: 47 lines (+10/-2)
2 files modified
plugins/system-update/PageComponent.qml (+9/-1)
plugins/system-update/update.h (+1/-1)
To merge this branch: bzr merge lp:~didrocks/ubuntu-system-settings/add-unknown-progress-bar
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+188373@code.launchpad.net

Commit message

Add an indeterminate progress bar until system image answers

Description of the change

Add an indeterminate progress bar until system image answers

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/428

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/428/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

seems fine to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/system-update/PageComponent.qml'
2--- plugins/system-update/PageComponent.qml 2013-09-27 09:52:33 +0000
3+++ plugins/system-update/PageComponent.qml 2013-09-30 15:43:13 +0000
4@@ -72,6 +72,7 @@
5 infoMessage = "";
6 infoSecondaryMessage = "";
7 DownloadUpdate();
8+ currentUpdateState = UbuntuUpdatePanel.DownloadRequested;
9 }
10
11 function applyUpdate() {
12@@ -258,7 +259,7 @@
13 Column {
14 id: updateDownloading
15 spacing: units.gu(1)
16- visible: updateBackend.currentUpdateState === UbuntuUpdatePanel.Downloading || updateBackend.currentUpdateState === UbuntuUpdatePanel.Paused
17+ visible: updateBackend.currentUpdateState === UbuntuUpdatePanel.Downloading || updateBackend.currentUpdateState === UbuntuUpdatePanel.Paused || updateBackend.currentUpdateState === UbuntuUpdatePanel.DownloadRequested
18 width: parent.width
19
20 ProgressBar {
21@@ -266,6 +267,13 @@
22 maximumValue : 100
23 minimumValue : 0
24 value : updateBackend.downloadProgress
25+ visible: updateBackend.currentUpdateState === UbuntuUpdatePanel.Downloading || updateBackend.currentUpdateState === UbuntuUpdatePanel.Paused
26+ width: parent.width
27+ }
28+
29+ ProgressBar {
30+ indeterminate: true
31+ visible: updateBackend.currentUpdateState === UbuntuUpdatePanel.DownloadRequested
32 width: parent.width
33 }
34
35
36=== modified file 'plugins/system-update/update.h'
37--- plugins/system-update/update.h 2013-08-22 16:05:17 +0000
38+++ plugins/system-update/update.h 2013-09-30 15:43:13 +0000
39@@ -44,7 +44,7 @@
40 explicit Update(QObject *parent = 0);
41 ~Update();
42
43- enum State { CheckingError, Checking, NoUpdate, UpdateAvailable, Downloading, Paused, ReadyToInstall, DownloadFailed };
44+ enum State { CheckingError, Checking, NoUpdate, UpdateAvailable, DownloadRequested, Downloading, Paused, ReadyToInstall, DownloadFailed };
45
46 QString InfoMessage();
47 void SetInfoMessage(QString);

Subscribers

People subscribed via source and target branches