ubuntu-system-settings

Merge lp:~ken-vandine/ubuntu-system-settings/update_progress into lp:ubuntu-system-settings

update_progress
Merge into trunk

Proposed by Ken VanDine on 2014-09-18

Status:

Merged

Approved by:

Ken VanDine on 2014-09-29

Approved revision:

1078

Merged at revision:

1096

Proposed branch:

lp:~ken-vandine/ubuntu-system-settings/update_progress

Merge into:

lp:ubuntu-system-settings

Diff against target:

531 lines (+213/-122)

5 files modified

plugins/system-update/PageComponent.qml (+166/-120)
plugins/system-update/system_update.cpp (+2/-0)
plugins/system-update/system_update.h (+1/-0)
plugins/system-update/update_manager.cpp (+40/-2)
plugins/system-update/update_manager.h (+4/-0)

To merge this branch:

bzr merge lp:~ken-vandine/ubuntu-system-settings/update_progress

Related bugs:

Bug #1312587: Update downloading incorrectly presented as "Installing"	Critical	Fix Released
Bug #1316933: Pressing the pause button on update page sets progress to 0	High	Fix Released
Bug #1318593: Completed updates show as 0% downloaded	Low	Fix Released
Bug #1371157: Restart prompt interrupts immediately when visiting "Updates"	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Diego Sarmentero (community)			Approve on 2014-09-29
PS Jenkins bot	continuous-integration		Approve on 2014-09-26
Matthew Paul Thomas (community)	design	2014-09-23	Abstain on 2014-09-24
Ubuntu Touch System Settings		2014-09-18	Pending
Review via email: mp+235199@code.launchpad.net

Commit message

* Fixed handling of the Downloading/Installing label based on actual state.
* Forward updateProgress signals for system updates
* Layout fixes

Description of the change

* Fixed handling of the Downloading/Installing label based on actual state.
* Forward updateProgress signals for system updates
* Layout fixes

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-18

1062. By Ken VanDine on 2014-09-18

Forward rebooting signals for system updates

1063. By Ken VanDine on 2014-09-18

Display the "Restarting" string when we get the Rebooting signal from
system-image-dbus.

Added the spinning animation to the logo per the design.

1064. By Ken VanDine on 2014-09-18

Make the installingImageUpdate overlay fill the screen

1065. By Ken VanDine on 2014-09-18

installingImageUpdate shouldn't start out visible

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-18

1066. By Ken VanDine on 2014-09-18: Show downloaded sizes in while downloading

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-19

1067. By Ken VanDine on 2014-09-19: Display the downloaded size
1068. By Ken VanDine on 2014-09-19: Change the progress bar to indeterment for installing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-19

1069. By Ken VanDine on 2014-09-19: removed debug output

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Approve (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-19

1070. By Ken VanDine on 2014-09-19: merged trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-19

1071. By Ken VanDine on 2014-09-19: Some layout fixes for updates

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-09-23:

@mpt, here are some instructions for trying this branch:

Add silo 1, and install ubuntu-system-settings, libsystemsettings1, and ubuntu-system-settings-wizard from the silo. You can trick it into finding a system-update. Edit /etc/system-image/channel.ini with your favorite editor, reduce build_number by 1. Then kill the system-image-dbus process.

You can also unregister the latest version of a click package so you can see a click update. Run:

$ click list --all --user=@all

This will list all versions of all click packages installed, find a package that has multiple versions installed, unregister the latest and then register the previous version. For example, I have two versions of com.canonical.payui.

    $ click list --all --user=@all
    com.canonical.payui 0.3.17
    com.canonical.payui 0.3.21
    $ sudo click unregister --user=$USER com.canonical.payui
    $ sudo click register --user=$USER com.canonical.payui 0.3.17

Now you should be able to launch ubuntu-system-settings an find a system-update as well as a click update.

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-23:

just tried this, seemed to work but noticed a couple of things:

- After the system update finished downloading, the main button at the top changed to "Pause All" which seemed wrong as there was nothing to pause. If I pressed "Pause All" it toggles to "Install 1 update.." and pressing it again changes to "Pause All". Is this intended?

- the buttons on the right of each item that says "Install..." seem a bit narrow. Was hard to actually press them. Perhaps make them a taller so they look more like buttons?

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-09-23:

> just tried this, seemed to work but noticed a couple of things:
>
> - After the system update finished downloading, the main button at the top
> changed to "Pause All" which seemed wrong as there was nothing to pause. If I
> pressed "Pause All" it toggles to "Install 1 update.." and pressing it again
> changes to "Pause All". Is this intended?

That's a bug, but not a new bug from this branch. It's just more noticeable now that the download and install states are more defined. I'll fix that.

>
> - the buttons on the right of each item that says "Install..." seem a bit
> narrow. Was hard to actually press them. Perhaps make them a taller so they
> look more like buttons?

Yeah, I'll make them larger.

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-23

1072. By Ken VanDine on 2014-09-23: Make the download/update/install button larger

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-24

1073. By Ken VanDine on 2014-09-24: merged trunk

Revision history for this message

Matthew Paul Thomas (mpt) wrote on 2014-09-24:

I'm sorry, I tried for several hours to test this, with lots of help from #ubuntu-touch. Eventually I got stuck trying to save the edited version of /etc/system-image/channel.ini.

review: Abstain (design)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

FAILED: Continuous integration, rev:1073
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1543/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/735
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6394
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6394/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13681
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4057
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4057/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-24

1074. By Ken VanDine on 2014-09-24: merged trunk
1075. By Ken VanDine on 2014-09-24: Ensure the pause/install all button shows the correct state after update is downloaded

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

FAILED: Continuous integration, rev:1074
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1550/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/742
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4900
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4071
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4071/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

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

review: Needs Fixing (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-26

1076. By Ken VanDine on 2014-09-26: merged trunk
1077. By Ken VanDine on 2014-09-26: Control visibility of the installAllButton, not the ListItem
1078. By Ken VanDine on 2014-09-26: merged trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-26:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-26:

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

review: Approve (continuous-integration)

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-26

1079. By Ken VanDine on 2014-09-26: merged trunk

Revision history for this message

Diego Sarmentero (diegosarmentero) wrote on 2014-09-29:

review: Approve

lp:~ken-vandine/ubuntu-system-settings/update_progress updated on 2014-09-29

1080. By Ken VanDine on 2014-09-29: Don't highlight the installAllButton on press
1081. By Ken VanDine on 2014-09-29: merged trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ken VanDine

Ubuntu Touch System Settings

 === modified file 'plugins/system-update/PageComponent.qml'
 --- plugins/system-update/PageComponent.qml	2014-09-17 13:19:24 +0000
 +++ plugins/system-update/PageComponent.qml	2014-09-29 16:29:38 +0000
@@ -34,8 +34,8 @@
      id: root
      objectName: "systemUpdatesPage"
--    title: i18n.tr("Updates")
--    flickable: scrollWidget
++    title: installingImageUpdate.visible ? "" : i18n.tr("Updates")
++    flickable: installingImageUpdate.visible ? null : scrollWidget
      property bool installAll: false
      property bool includeSystemUpdate: false
@@ -147,7 +147,7 @@
          State {
              name: "UPDATE"
              PropertyChanges { target: updateList; visible: true}
--            PropertyChanges { target: installAllButton; visible: true && root.updatesAvailable > 1}
++            PropertyChanges { target: installAllButton; visible: root.updatesAvailable > 1}
              PropertyChanges { target: updateNotification; visible: false}
+         }
+     ]
@@ -186,10 +186,7 @@
+         }
          onSystemUpdateDownloaded: {
--            if (!root.systemUpdateInProgress && !installingImageUpdate.visible) {
--                root.systemUpdateInProgress = true;
--                PopupUtils.open(dialogInstallComponent);
--            }
++            root.installAll = false;
+         }
          onSystemUpdateFailed: {
@@ -199,6 +196,10 @@
          onUpdateProcessFailed: {
              root.state = "SYSTEMUPDATEFAILED";
+         }
++
++        onRebooting: {
++            installingImageUpdate.message = i18n.tr("Restarting…");
++        }
+     }
      Flickable {
          id: scrollWidget
@@ -217,10 +218,12 @@
          Column {
              id: columnId
--
--            anchors.left: parent.left
--            anchors.right: parent.right
--
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
++            height: childrenRect.height
++
              ListItem.Base {
                  id: checkForUpdatesArea
                  objectName: "checkForUpdatesArea"
@@ -253,10 +256,11 @@
+             }
              ListItem.SingleControl {
--                id: installAllButton
--                objectName: "installAllButton"
--
++                height: installAllButton.visible ? units.gu(8) : units.gu(2)
++                highlightWhenPressed: false
                  control: Button {
++                    id: installAllButton
++                    objectName: "installAllButton"
                      property string primaryText: includeSystemUpdate ?
                                                       i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) :
                                                       i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)
@@ -277,6 +281,7 @@
+                         }
+                     }
+                 }
++                showDivider: false
+             }
              ListView {
@@ -289,126 +294,155 @@
                  model: UpdateManager.model
                  height: childrenRect.height
                  interactive: false
++                spacing: units.gu(2)
                  delegate: ListItem.Subtitled {
                      id: listItem
++                    anchors {
++                        left: parent.left
++                        right: parent.right
++                    }
                      iconSource: Qt.resolvedUrl(modelData.iconUrl)
                      iconFrame: modelData.systemUpdate ? false : true
--                    height: modelData.selected ? units.gu(14) : units.gu(8)
++                    height: textArea.height
                      highlightWhenPressed: false
                      showDivider: false
                      property alias actionButton: buttonAppUpdate
                      property alias progressBar: progress
++                    property bool installing: modelData.updateReady || (progressBar.value === progressBar.maximumValue)
--                    Rectangle {
++                    Column {
                          id: textArea
                          objectName: "textArea"
--                        color: "transparent"
--                        anchors.fill: parent
--                        anchors.topMargin: units.gu(1)
--
++                        anchors {
++                            left: parent.left
++                            right: parent.right
++                        }
++                        spacing: units.gu(0.5)
                          property string message: modelData.error
                          property bool retry: false
                          onMessageChanged: {
                              if(message.length > 0) {
                                  labelVersion.text = message;
--                                buttonAppUpdate.text = i18n.tr("Retry");
                                  modelData.updateState = false;
                                  modelData.selected = false;
                                  textArea.retry = true;
+                             }
+                         }
--                        Button {
--                            id: buttonAppUpdate
--                            objectName: "buttonAppUpdate"
--                            anchors.top: parent.top
--                            anchors.right: parent.right
--                            anchors.topMargin: units.gu(1)
--                            anchors.rightMargin: units.gu(1)
--                            height: labelTitle.height
--
--                            property string actionText: modelData.systemUpdate ? i18n.tr("Download") : i18n.tr("Update")
--                            property string primaryText: modelData.selected ? i18n.tr("Resume") : actionText
--                            property string secondaryText: i18n.tr("Pause")
--
--                            text: modelData.updateState ? secondaryText : primaryText
--
--                            onClicked: {
--                                if (textArea.retry) {
--                                    textArea.retry = false;
--                                    UpdateManager.retryDownload(modelData.packageName);
--                                } else if (modelData.updateReady) {
--                                    PopupUtils.open(dialogInstallComponent);
--                                } else if (modelData.updateState) {
++                        Item {
++                            anchors {
++                                left: parent.left
++                                right: parent.right
++                            }
++                            height: buttonAppUpdate.height
++
++                            Label {
++                                id: labelTitle
++                                objectName: "labelTitle"
++                                anchors {
++                                    left: parent.left
++                                    verticalCenter: parent.verticalCenter
++                                }
++                                text: modelData.title
++                                font.bold: true
++                                elide: buttonAppUpdate.visible ? Text.ElideRight : Text.ElideNone
++                            }
++
++                            Button {
++                                id: buttonAppUpdate
++                                objectName: "buttonAppUpdate"
++                                anchors.right: parent.right
++                                height: labelTitle.height + units.gu(1)
++                                text: {
++                                    if (textArea.retry) {
++                                        return i18n.tr("Retry");
++                                    }
                                      if (modelData.systemUpdate) {
--                                        UpdateManager.pauseDownload(modelData.packageName);
--                                    } else {
--                                        modelData.updateState = false;
--                                        tracker.pause();
--                                    }
--                                } else {
--                                    if (!modelData.selected || modelData.systemUpdate) {
--                                        modelData.selected = true;
--                                        UpdateManager.startDownload(modelData.packageName);
--                                    } else {
--                                        modelData.updateState = true;
--                                        tracker.resume();
--                                    }
--                                }
--                            }
--                        }
--
--                        Label {
--                            id: labelSize
--                            objectName: "labelSize"
--                            text: convert_bytes_to_size(modelData.binaryFilesize)
--                            anchors.bottom: labelVersion.bottom
--                            anchors.right: parent.right
--                            anchors.rightMargin: units.gu(1)
--                            visible: !modelData.selected
--                        }
--
--                        Label {
--                            id: labelTitle
--                            objectName: "labelTitle"
--                            anchors {
--                                top: parent.top
--                                left: parent.left
--                                right: buttonAppUpdate.left
--                                topMargin: units.gu(1)
--                                rightMargin: units.gu(1)
--                            }
--                            height: units.gu(3)
--                            text: modelData.title
--                            font.bold: true
--                            elide: buttonAppUpdate.visible ? Text.ElideRight : Text.ElideNone
--                        }
--
--                        Label {
++                                        if (modelData.updateReady) {
++                                            return i18n.tr("Install…");
++                                        } else if (!modelData.updateState && !modelData.selected) {
++                                            return i18n.tr("Download");
++                                        }
++                                    }
++                                    if (modelData.updateState) {
++                                        return i18n.tr("Pause");
++                                    } else if (modelData.selected) {
++                                        return i18n.tr("Resume");
++                                    }
++                                    return i18n.tr("Update");
++                                }
++
++                                onClicked: {
++                                    if (textArea.retry) {
++                                        textArea.retry = false;
++                                        UpdateManager.retryDownload(modelData.packageName);
++                                    } else if (modelData.updateReady) {
++                                        PopupUtils.open(dialogInstallComponent);
++                                    } else if (modelData.updateState) {
++                                        if (modelData.systemUpdate) {
++                                            UpdateManager.pauseDownload(modelData.packageName);
++                                        } else {
++                                            modelData.updateState = false;
++                                            tracker.pause();
++                                        }
++                                    } else {
++                                        if (!modelData.selected || modelData.systemUpdate) {
++                                            modelData.selected = true;
++                                            UpdateManager.startDownload(modelData.packageName);
++                                        } else {
++                                            modelData.updateState = true;
++                                            tracker.resume();
++                                        }
++                                    }
++                                }
++                            }
++                        }
++
++                        Item {
                              id: labelUpdateStatus
--                            objectName: "labelUpdateStatus"
--                            text: i18n.tr("Installing")
--                            anchors.top: labelTitle.bottom
--                            anchors.left: parent.left
--                            anchors.right: parent.right
--                            opacity: modelData.selected ? 1 : 0
--                            anchors.bottomMargin: units.gu(1)
--
++                            anchors {
++                                left: parent.left
++                                right: parent.right
++                            }
++                            height: childrenRect.height
++                            visible: opacity > 0
++                            opacity: modelData.selected && !modelData.updateReady ? 1 : 0
                              Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } }
++                            Label {
++                                objectName: "labelUpdateStatus"
++                                anchors.left: parent.left
++                                fontSize: "small"
++                                text: installing ? i18n.tr("Installing") : i18n.tr("Downloading")
++                            }
++                            Label {
++                                anchors.right: parent.right
++                                visible: !labelSize.visible && !installing
++                                fontSize: "small"
++                                text: {
++                                    if (!labelUpdateStatus.visible)
++                                        return convert_bytes_to_size(modelData.binaryFilesize);
++
++                                    return i18n.tr("%1 of %2").arg(
++                                        convert_bytes_to_size(modelData.binaryFilesize * (progress.value * 0.01))).arg(
++                                        convert_bytes_to_size(modelData.binaryFilesize)
++                                    );
++                                }
++                            }
+                         }
                          ProgressBar {
                              id: progress
                              objectName: "progress"
                              height: units.gu(2)
--                            anchors.left: parent.left
--                            anchors.top: labelUpdateStatus.bottom
--                            anchors.topMargin: units.gu(1)
--                            anchors.right: parent.right
--                            opacity: modelData.selected ? 1 : 0
++                            anchors {
++                                left: parent.left
++                                right: parent.right
++                            }
++                            visible: opacity > 0
++                            opacity: modelData.selected && !modelData.updateReady && !installing ? 1 : 0
                              value: modelData.systemUpdate ? modelData.downloadProgress : tracker.progress
                              minimumValue: 0
                              maximumValue: 100
@@ -438,20 +472,29 @@
                              Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } }
+                         }
--                        Label {
--                            id: labelVersion
--                            objectName: "labelVersion"
++                        Item {
                              anchors {
                                  left: parent.left
--                                right: buttonAppUpdate.right
--                                top: (!progress.visible || progress.opacity == 0) ? labelTitle.bottom : progress.bottom
--                                topMargin: (!progress.visible || progress.opacity == 0) ? 0 : units.gu(1)
--                                bottom: parent.bottom
--                                bottomMargin: units.gu(1)
--                            }
--                            text: modelData.remoteVersion ? i18n.tr("Version: ") + modelData.remoteVersion : ""
--                            color: "black"
--                            elide: Text.ElideRight
++                                right: parent.right
++                            }
++                            height: childrenRect.height
++                            Label {
++                                id: labelVersion
++                                objectName: "labelVersion"
++                                anchors.left: parent.left
++                                text: modelData.remoteVersion ? i18n.tr("Version: ") + modelData.remoteVersion : ""
++                                elide: Text.ElideRight
++                                fontSize: "small"
++                            }
++
++                            Label {
++                                id: labelSize
++                                objectName: "labelSize"
++                                anchors.right: parent.right
++                                text: convert_bytes_to_size(modelData.binaryFilesize)
++                                fontSize: "small"
++                                visible: !labelUpdateStatus.visible && !installing
++                            }
+                         }
+                     }
+                 }
@@ -522,15 +565,11 @@
      Rectangle {
          id: installingImageUpdate
          objectName: "installingImageUpdate"
--        anchors {
--            bottom: configuration.top
--            left: parent.left
--            right: parent.right
--            top: parent.top
--        }
++        anchors.fill: root
          visible: false
--
++        z: 10
          color: "#221e1c"
++        property string message: i18n.tr("Installing update…")
          Column {
              anchors.centerIn: parent
@@ -539,6 +578,13 @@
              Image {
                  source: Qt.resolvedUrl("file:///usr/share/ubuntu/settings/system/icons/distributor-logo.png")
                  anchors.horizontalCenter: parent.horizontalCenter
++                NumberAnimation on rotation {
++                    from: 0
++                    to: 360
++                    running: installingImageUpdate.visible == true
++                    loops: Animation.Infinite
++                    duration: 2000
++                }
+             }
              ProgressBar {
@@ -547,7 +593,7 @@
+             }
              Label {
--                text: i18n.tr("Installing update…")
++                text: installingImageUpdate.message
                  anchors.horizontalCenter: parent.horizontalCenter
+             }
+         }
 === modified file 'plugins/system-update/system_update.cpp'
 --- plugins/system-update/system_update.cpp	2014-09-22 18:40:18 +0000
 +++ plugins/system-update/system_update.cpp	2014-09-29 16:29:38 +0000
@@ -67,6 +67,8 @@
                  this, SIGNAL(updateFailed(int, QString)));
      connect(&m_SystemServiceIface, SIGNAL(SettingChanged(QString, QString)),
                  this, SLOT(ProcessSettingChanged(QString, QString)));
++    connect(&m_SystemServiceIface, SIGNAL(Rebooting(bool)),
++                this, SIGNAL(rebooting(bool)));
      setCurrentDetailedVersion();
+ }
 === modified file 'plugins/system-update/system_update.h'
 --- plugins/system-update/system_update.h	2014-07-17 09:51:33 +0000
 +++ plugins/system-update/system_update.h	2014-09-29 16:29:38 +0000
@@ -69,6 +69,7 @@
      void downloadModeChanged();
      void versionChanged();
      void updateProcessFailed(const QString& reason);
++    void rebooting(bool status);
  private Q_SLOTS:
      void updateDownloadProgress(int percentage, double eta);
 === modified file 'plugins/system-update/update_manager.cpp'
 --- plugins/system-update/update_manager.cpp	2014-09-12 15:25:50 +0000
 +++ plugins/system-update/update_manager.cpp	2014-09-29 16:29:38 +0000
@@ -77,13 +77,17 @@
      QObject::connect(&m_systemUpdate, SIGNAL(downloadModeChanged()),
                    SIGNAL(downloadModeChanged()));
      QObject::connect(&m_systemUpdate, SIGNAL(updateDownloaded()),
--                  SIGNAL(systemUpdateDownloaded()));
++                  SLOT(updateDownloaded()));
      QObject::connect(&m_systemUpdate, SIGNAL(updateProcessFailed(const QString&)),
                    SIGNAL(updateProcessFailed(QString)));
      QObject::connect(&m_systemUpdate, SIGNAL(updateFailed(int, QString)),
--                  SIGNAL(systemUpdateFailed(int, QString)));
++                  SLOT(updateFailed(int, QString)));
      QObject::connect(&m_systemUpdate, SIGNAL(updatePaused(int)),
                    SLOT(systemUpdatePaused(int)));
++    QObject::connect(&m_systemUpdate, SIGNAL(updateProgress(int, double)),
++                  SLOT(systemUpdateProgress(int, double)));
++    QObject::connect(&m_systemUpdate, SIGNAL(rebooting(bool)),
++                  SIGNAL(rebooting(bool)));
+ }
  UpdateManager::~UpdateManager()
@@ -227,12 +231,46 @@
      reportCheckState();
+ }
++void UpdateManager::updateDownloaded()
++{
++    QString packagename(UBUNTU_PACKAGE_NAME);
++    if (m_apps.contains(packagename)) {
++        Update *update = m_apps[packagename];
++        update->setSelected(false);
++        update->setUpdateState(false);
++        update->setUpdateReady(true);
++        Q_EMIT systemUpdateDownloaded();
++    }
++}
++void UpdateManager::updateFailed(int consecutiveFailureCount, QString lastReason)
++{
++    QString packagename(UBUNTU_PACKAGE_NAME);
++    if (m_apps.contains(packagename)) {
++        Update *update = m_apps[packagename];
++        update->setSelected(false);
++        update->setUpdateState(false);
++        update->setDownloadProgress(0);
++        Q_EMIT systemUpdateFailed(consecutiveFailureCount, lastReason);
++    }
++}
++
  void UpdateManager::systemUpdatePaused(int value)
+ {
      QString packagename(UBUNTU_PACKAGE_NAME);
      if (m_apps.contains(packagename)) {
          Update *update = m_apps[packagename];
          update->setSelected(true);
++        update->setUpdateState(false);
++        update->setDownloadProgress(value);
++    }
++}
++
++void UpdateManager::systemUpdateProgress(int value, double eta)
++{
++    Q_UNUSED(eta);
++    QString packagename(UBUNTU_PACKAGE_NAME);
++    if (m_apps.contains(packagename)) {
++        Update *update = m_apps[packagename];
          update->setDownloadProgress(value);
+     }
+ }
 === modified file 'plugins/system-update/update_manager.h'
 --- plugins/system-update/update_manager.h	2014-09-08 16:42:27 +0000
 +++ plugins/system-update/update_manager.h	2014-09-29 16:29:38 +0000
@@ -75,6 +75,7 @@
      void updateProcessFailed(QString message);
      void systemUpdateFailed(int consecutiveFailureCount, QString lastReason);
      void versionChanged();
++    void rebooting(bool status);
  public:
      explicit UpdateManager(QObject *parent = 0);
@@ -114,7 +115,10 @@
  private Q_SLOTS:
      void clickUpdateNotAvailable();
++    void updateFailed(int consecutiveFailureCount, QString lastReason);
++    void updateDownloaded();
      void systemUpdatePaused(int value);
++    void systemUpdateProgress(int value, double eta);
      void processOutput();
      void processUpdates();
      void downloadUrlObtained(const QString &packagename, const QString &url);