Merge lp:~ken-vandine/ubuntu-system-settings/slotslayout into lp:ubuntu-system-settings
- slotslayout
- Merge into trunk
Proposed by
Ken VanDine
| Status: | Merged |
|---|---|
| Merged at revision: | 1678 |
| Proposed branch: | lp:~ken-vandine/ubuntu-system-settings/slotslayout |
| Merge into: | lp:ubuntu-system-settings |
| Prerequisite: | lp:~phablet-team/ubuntu-system-settings/settings-listitems |
| Diff against target: |
1513 lines (+456/-377) 16 files modified
plugins/security-privacy/AppAccess.qml (+11/-10) plugins/security-privacy/AppAccessControl.qml (+7/-6) plugins/security-privacy/Location.qml (+9/-9) plugins/security-privacy/LockSecurity.qml (+6/-5) plugins/security-privacy/PageComponent.qml (+18/-22) plugins/security-privacy/PhoneLocking.qml (+12/-13) plugins/security-privacy/SimPin.qml (+14/-13) plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+2/-2) plugins/security-privacy/diagnostics/PageComponent.qml (+9/-10) plugins/system-update/CMakeLists.txt (+1/-1) plugins/system-update/Configuration.qml (+3/-3) plugins/system-update/EntryComponent.qml (+8/-7) plugins/system-update/PageComponent.qml (+98/-276) plugins/system-update/UpdateItem.qml (+251/-0) plugins/system-update/network.cpp (+2/-0) plugins/system-update/update.h (+5/-0) |
| To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-system-settings/slotslayout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Needs Fixing | |
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Ubuntu Touch System Settings | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-11-18.
Commit message
migrating to slotslayout and new designs
Description of the change
migrating to slotslayout and new designs
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1561
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1563
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1565
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1566
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:1567
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1569
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1570. By Ken VanDine
-
merged trunk
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1570
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 1571. By Ken VanDine
-
added changelog
- 1572. By Ken VanDine
-
Merged stub-update-server branch
- 1573. By Ken VanDine
-
merged
- 1574. By Ken VanDine
-
Visual improvements and added the dialog to show the changelog info
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1574
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1574
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1574
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'plugins/security-privacy/AppAccess.qml' | |||
| 2 | --- plugins/security-privacy/AppAccess.qml 2015-09-18 14:18:11 +0000 | |||
| 3 | +++ plugins/security-privacy/AppAccess.qml 2015-12-09 19:33:29 +0000 | |||
| 4 | @@ -1,5 +1,5 @@ | |||
| 5 | 1 | /* | 1 | /* |
| 7 | 2 | * Copyright (C) 2013 Canonical Ltd | 2 | * Copyright (C) 2013-2015 Canonical Ltd |
| 8 | 3 | * | 3 | * |
| 9 | 4 | * This program is free software: you can redistribute it and/or modify | 4 | * This program is free software: you can redistribute it and/or modify |
| 10 | 5 | * it under the terms of the GNU General Public License version 3 as | 5 | * it under the terms of the GNU General Public License version 3 as |
| 11 | @@ -18,10 +18,11 @@ | |||
| 12 | 18 | */ | 18 | */ |
| 13 | 19 | 19 | ||
| 14 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 15 | 21 | import SystemSettings 1.0 | ||
| 16 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 17 | 21 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 19 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 20 | 23 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 25 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 21 | 24 | import SystemSettings 1.0 | ||
| 22 | 25 | 26 | ||
| 23 | 26 | ItemPage { | 27 | ItemPage { |
| 24 | 27 | id: root | 28 | id: root |
| 25 | @@ -42,7 +43,7 @@ | |||
| 26 | 42 | anchors.left: parent.left | 43 | anchors.left: parent.left |
| 27 | 43 | anchors.right: parent.right | 44 | anchors.right: parent.right |
| 28 | 44 | 45 | ||
| 30 | 45 | ListItem.Caption { | 46 | ListItems.Caption { |
| 31 | 46 | text: i18n.tr("Apps that you have granted access to:") | 47 | text: i18n.tr("Apps that you have granted access to:") |
| 32 | 47 | } | 48 | } |
| 33 | 48 | 49 | ||
| 34 | @@ -68,10 +69,10 @@ | |||
| 35 | 68 | Repeater { | 69 | Repeater { |
| 36 | 69 | model: appsModel | 70 | model: appsModel |
| 37 | 70 | 71 | ||
| 39 | 71 | ListItem.SingleValue { | 72 | SettingsListItems.SingleValueProgression { |
| 40 | 72 | text: i18n.tr(model.name) | 73 | text: i18n.tr(model.name) |
| 41 | 73 | enabled: trustStoreModel.count > 0 | 74 | enabled: trustStoreModel.count > 0 |
| 43 | 74 | progression: enabled ? true : false | 75 | progressionVisible: enabled ? true : false |
| 44 | 75 | value: trustStoreModel.count > 0 ? | 76 | value: trustStoreModel.count > 0 ? |
| 45 | 76 | i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) : | 77 | i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) : |
| 46 | 77 | i18n.tr("0") | 78 | i18n.tr("0") |
| 47 | @@ -81,19 +82,19 @@ | |||
| 48 | 81 | "model": trustStoreModel, | 82 | "model": trustStoreModel, |
| 49 | 82 | }) | 83 | }) |
| 50 | 83 | 84 | ||
| 52 | 84 | TrustStoreModel { | 85 | resources: TrustStoreModel { |
| 53 | 85 | id: trustStoreModel | 86 | id: trustStoreModel |
| 54 | 86 | serviceName: model.trustStoreService | 87 | serviceName: model.trustStoreService |
| 55 | 87 | } | 88 | } |
| 56 | 88 | } | 89 | } |
| 57 | 89 | } | 90 | } |
| 58 | 90 | 91 | ||
| 60 | 91 | ListItem.Caption { | 92 | ListItems.Caption { |
| 61 | 92 | text: i18n.tr("Apps may also request access to online accounts.") | 93 | text: i18n.tr("Apps may also request access to online accounts.") |
| 62 | 93 | } | 94 | } |
| 63 | 94 | 95 | ||
| 66 | 95 | ListItem.SingleControl { | 96 | SettingsListItems.SingleControl { |
| 67 | 96 | control: Button { | 97 | Button { |
| 68 | 97 | text: i18n.tr("Online Accounts…") | 98 | text: i18n.tr("Online Accounts…") |
| 69 | 98 | width: parent.width - units.gu(4) | 99 | width: parent.width - units.gu(4) |
| 70 | 99 | onClicked: { | 100 | onClicked: { |
| 71 | 100 | 101 | ||
| 72 | === modified file 'plugins/security-privacy/AppAccessControl.qml' | |||
| 73 | --- plugins/security-privacy/AppAccessControl.qml 2015-08-10 13:31:45 +0000 | |||
| 74 | +++ plugins/security-privacy/AppAccessControl.qml 2015-12-09 19:33:29 +0000 | |||
| 75 | @@ -1,5 +1,5 @@ | |||
| 76 | 1 | /* | 1 | /* |
| 78 | 2 | * Copyright (C) 2013 Canonical Ltd | 2 | * Copyright (C) 2013-2015 Canonical Ltd |
| 79 | 3 | * | 3 | * |
| 80 | 4 | * This program is free software: you can redistribute it and/or modify | 4 | * This program is free software: you can redistribute it and/or modify |
| 81 | 5 | * it under the terms of the GNU General Public License version 3 as | 5 | * it under the terms of the GNU General Public License version 3 as |
| 82 | @@ -18,9 +18,10 @@ | |||
| 83 | 18 | */ | 18 | */ |
| 84 | 19 | 19 | ||
| 85 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 86 | 21 | import SystemSettings 1.0 | ||
| 87 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 88 | 21 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 91 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 90 | 23 | import SystemSettings 1.0 | ||
| 92 | 24 | 25 | ||
| 93 | 25 | ItemPage { | 26 | ItemPage { |
| 94 | 26 | id: root | 27 | id: root |
| 95 | @@ -43,17 +44,17 @@ | |||
| 96 | 43 | anchors.left: parent.left | 44 | anchors.left: parent.left |
| 97 | 44 | anchors.right: parent.right | 45 | anchors.right: parent.right |
| 98 | 45 | 46 | ||
| 100 | 46 | ListItem.Caption { | 47 | ListItems.Caption { |
| 101 | 47 | id: captionLabel | 48 | id: captionLabel |
| 102 | 48 | } | 49 | } |
| 103 | 49 | 50 | ||
| 104 | 50 | Repeater { | 51 | Repeater { |
| 105 | 51 | id: repeater | 52 | id: repeater |
| 106 | 52 | 53 | ||
| 108 | 53 | ListItem.Standard { | 54 | SettingsListItems.Standard { |
| 109 | 54 | text: model.applicationName | 55 | text: model.applicationName |
| 110 | 55 | iconSource: model.iconName | 56 | iconSource: model.iconName |
| 112 | 56 | control: Switch { | 57 | Switch { |
| 113 | 57 | id: welcomeStatsSwitch | 58 | id: welcomeStatsSwitch |
| 114 | 58 | checked: model.granted | 59 | checked: model.granted |
| 115 | 59 | onClicked: root.model.setEnabled(index, !model.granted) | 60 | onClicked: root.model.setEnabled(index, !model.granted) |
| 116 | 60 | 61 | ||
| 117 | === modified file 'plugins/security-privacy/Location.qml' | |||
| 118 | --- plugins/security-privacy/Location.qml 2015-09-18 14:18:11 +0000 | |||
| 119 | +++ plugins/security-privacy/Location.qml 2015-12-09 19:33:29 +0000 | |||
| 120 | @@ -1,5 +1,5 @@ | |||
| 121 | 1 | /* | 1 | /* |
| 123 | 2 | * Copyright (C) 2013 Canonical Ltd | 2 | * Copyright (C) 2013-2015 Canonical Ltd |
| 124 | 3 | * | 3 | * |
| 125 | 4 | * This program is free software: you can redistribute it and/or modify | 4 | * This program is free software: you can redistribute it and/or modify |
| 126 | 5 | * it under the terms of the GNU General Public License version 3 as | 5 | * it under the terms of the GNU General Public License version 3 as |
| 127 | @@ -22,10 +22,11 @@ | |||
| 128 | 22 | import QMenuModel 0.1 | 22 | import QMenuModel 0.1 |
| 129 | 23 | import Qt.labs.folderlistmodel 2.1 | 23 | import Qt.labs.folderlistmodel 2.1 |
| 130 | 24 | import QtQuick 2.4 | 24 | import QtQuick 2.4 |
| 131 | 25 | import SystemSettings 1.0 | ||
| 132 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 133 | 25 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 135 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | 28 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 136 | 27 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 137 | 28 | import SystemSettings 1.0 | ||
| 138 | 29 | 30 | ||
| 139 | 30 | ItemPage { | 31 | ItemPage { |
| 140 | 31 | id: locationPage | 32 | id: locationPage |
| 141 | @@ -94,7 +95,7 @@ | |||
| 142 | 94 | text: i18n.tr("Let the phone detect your location:") | 95 | text: i18n.tr("Let the phone detect your location:") |
| 143 | 95 | } | 96 | } |
| 144 | 96 | 97 | ||
| 146 | 97 | ListItem.ItemSelector { | 98 | ListItems.ItemSelector { |
| 147 | 98 | id: detection | 99 | id: detection |
| 148 | 99 | 100 | ||
| 149 | 100 | /* Helper that toggles location detection and HERE based on | 101 | /* Helper that toggles location detection and HERE based on |
| 150 | @@ -199,7 +200,7 @@ | |||
| 151 | 199 | } | 200 | } |
| 152 | 200 | } | 201 | } |
| 153 | 201 | 202 | ||
| 155 | 202 | ListItem.Caption { | 203 | ListItems.Caption { |
| 156 | 203 | /* TODO: replace by real info from the location service */ | 204 | /* TODO: replace by real info from the location service */ |
| 157 | 204 | property int locationInfo: 0 | 205 | property int locationInfo: 0 |
| 158 | 205 | 206 | ||
| 159 | @@ -235,10 +236,10 @@ | |||
| 160 | 235 | 236 | ||
| 161 | 236 | Repeater { | 237 | Repeater { |
| 162 | 237 | model: trustStoreModel | 238 | model: trustStoreModel |
| 164 | 238 | ListItem.Standard { | 239 | SettingsListItems.Icon { |
| 165 | 239 | text: model.applicationName | 240 | text: model.applicationName |
| 166 | 240 | iconSource: model.iconName | 241 | iconSource: model.iconName |
| 168 | 241 | control: Switch { | 242 | Switch { |
| 169 | 242 | checked: model.granted | 243 | checked: model.granted |
| 170 | 243 | onClicked: trustStoreModel.setEnabled(index, !model.granted) | 244 | onClicked: trustStoreModel.setEnabled(index, !model.granted) |
| 171 | 244 | } | 245 | } |
| 172 | @@ -246,12 +247,11 @@ | |||
| 173 | 246 | } | 247 | } |
| 174 | 247 | } | 248 | } |
| 175 | 248 | 249 | ||
| 177 | 249 | ListItem.Standard { | 250 | SettingsListItems.Standard { |
| 178 | 250 | text: i18n.tr("None requested") | 251 | text: i18n.tr("None requested") |
| 179 | 251 | visible: trustStoreModel.count === 0 | 252 | visible: trustStoreModel.count === 0 |
| 180 | 252 | enabled: false | 253 | enabled: false |
| 181 | 253 | } | 254 | } |
| 182 | 254 | } | 255 | } |
| 183 | 255 | |||
| 184 | 256 | } | 256 | } |
| 185 | 257 | } | 257 | } |
| 186 | 258 | 258 | ||
| 187 | === modified file 'plugins/security-privacy/LockSecurity.qml' | |||
| 188 | --- plugins/security-privacy/LockSecurity.qml 2015-08-10 13:31:45 +0000 | |||
| 189 | +++ plugins/security-privacy/LockSecurity.qml 2015-12-09 19:33:29 +0000 | |||
| 190 | @@ -21,11 +21,12 @@ | |||
| 191 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 192 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 193 | 23 | import QtQuick.Layouts 1.1 | 23 | import QtQuick.Layouts 1.1 |
| 194 | 24 | import SystemSettings 1.0 | ||
| 195 | 25 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 196 | 24 | import Ubuntu.Components 1.3 | 26 | import Ubuntu.Components 1.3 |
| 198 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 27 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 199 | 26 | import Ubuntu.Components.Popups 1.3 | 28 | import Ubuntu.Components.Popups 1.3 |
| 200 | 27 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 201 | 28 | import SystemSettings 1.0 | ||
| 202 | 29 | 30 | ||
| 203 | 30 | ItemPage { | 31 | ItemPage { |
| 204 | 31 | id: page | 32 | id: page |
| 205 | @@ -445,7 +446,7 @@ | |||
| 206 | 445 | text: i18n.tr("Unlock the phone using:") | 446 | text: i18n.tr("Unlock the phone using:") |
| 207 | 446 | } | 447 | } |
| 208 | 447 | 448 | ||
| 210 | 448 | ListItem.ItemSelector { | 449 | ListItems.ItemSelector { |
| 211 | 449 | property string swipe: i18n.tr("Swipe (no security)") | 450 | property string swipe: i18n.tr("Swipe (no security)") |
| 212 | 450 | property string passcode: i18n.tr("4-digit passcode") | 451 | property string passcode: i18n.tr("4-digit passcode") |
| 213 | 451 | property string passphrase: i18n.tr("Passphrase") | 452 | property string passphrase: i18n.tr("Passphrase") |
| 214 | @@ -487,13 +488,13 @@ | |||
| 215 | 487 | value: methodToIndex(securityPrivacy.securityType) | 488 | value: methodToIndex(securityPrivacy.securityType) |
| 216 | 488 | } | 489 | } |
| 217 | 489 | 490 | ||
| 219 | 490 | ListItem.SingleControl { | 491 | SettingsListItems.SingleControl { |
| 220 | 491 | 492 | ||
| 221 | 492 | id: changeControl | 493 | id: changeControl |
| 222 | 493 | visible: securityPrivacy.securityType !== | 494 | visible: securityPrivacy.securityType !== |
| 223 | 494 | UbuntuSecurityPrivacyPanel.Swipe | 495 | UbuntuSecurityPrivacyPanel.Swipe |
| 224 | 495 | 496 | ||
| 226 | 496 | control: Button { | 497 | Button { |
| 227 | 497 | property string changePasscode: i18n.tr("Change passcode…") | 498 | property string changePasscode: i18n.tr("Change passcode…") |
| 228 | 498 | property string changePassphrase: i18n.tr("Change passphrase…") | 499 | property string changePassphrase: i18n.tr("Change passphrase…") |
| 229 | 499 | 500 | ||
| 230 | 500 | 501 | ||
| 231 | === modified file 'plugins/security-privacy/PageComponent.qml' | |||
| 232 | --- plugins/security-privacy/PageComponent.qml 2015-10-16 13:42:50 +0000 | |||
| 233 | +++ plugins/security-privacy/PageComponent.qml 2015-12-09 19:33:29 +0000 | |||
| 234 | @@ -1,7 +1,7 @@ | |||
| 235 | 1 | /* | 1 | /* |
| 236 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 237 | 3 | * | 3 | * |
| 239 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 240 | 5 | * | 5 | * |
| 241 | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> |
| 242 | 7 | * | 7 | * |
| 243 | @@ -21,8 +21,9 @@ | |||
| 244 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 245 | 22 | import QMenuModel 0.1 | 22 | import QMenuModel 0.1 |
| 246 | 23 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 247 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 248 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 250 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 26 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 251 | 26 | import SystemSettings 1.0 | 27 | import SystemSettings 1.0 |
| 252 | 27 | import Ubuntu.SystemSettings.Battery 1.0 | 28 | import Ubuntu.SystemSettings.Battery 1.0 |
| 253 | 28 | import Ubuntu.SystemSettings.Diagnostics 1.0 | 29 | import Ubuntu.SystemSettings.Diagnostics 1.0 |
| 254 | @@ -110,18 +111,17 @@ | |||
| 255 | 110 | anchors.left: parent.left | 111 | anchors.left: parent.left |
| 256 | 111 | anchors.right: parent.right | 112 | anchors.right: parent.right |
| 257 | 112 | 113 | ||
| 259 | 113 | ListItem.Header { | 114 | SettingsItemTitle { |
| 260 | 114 | id: securityTitle | 115 | id: securityTitle |
| 261 | 115 | text: i18n.tr("Security") | 116 | text: i18n.tr("Security") |
| 262 | 116 | } | 117 | } |
| 264 | 117 | ListItem.SingleValue { | 118 | SettingsListItems.SingleValueProgression { |
| 265 | 118 | id: lockingControl | 119 | id: lockingControl |
| 266 | 119 | objectName: "lockingControl" | 120 | objectName: "lockingControl" |
| 269 | 120 | text: i18n.tr("Locking and unlocking") | 121 | text: i18n.tr("Screen Lock") |
| 268 | 121 | progression: true | ||
| 270 | 122 | onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"), {usePowerd: usePowerd, powerSettings: powerSettings}) | 122 | onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"), {usePowerd: usePowerd, powerSettings: powerSettings}) |
| 271 | 123 | } | 123 | } |
| 273 | 124 | ListItem.SingleValue { | 124 | SettingsListItems.SingleValueProgression { |
| 274 | 125 | id: simControl | 125 | id: simControl |
| 275 | 126 | objectName: "simControl" | 126 | objectName: "simControl" |
| 276 | 127 | text: i18n.tr("SIM PIN") | 127 | text: i18n.tr("SIM PIN") |
| 277 | @@ -134,28 +134,27 @@ | |||
| 278 | 134 | return i18n.tr("Off"); | 134 | return i18n.tr("Off"); |
| 279 | 135 | } | 135 | } |
| 280 | 136 | visible: simsPresent > 0 | 136 | visible: simsPresent > 0 |
| 281 | 137 | progression: true | ||
| 282 | 138 | onClicked: pageStack.push(Qt.resolvedUrl("SimPin.qml"), { sims: sims }) | 137 | onClicked: pageStack.push(Qt.resolvedUrl("SimPin.qml"), { sims: sims }) |
| 283 | 139 | } | 138 | } |
| 285 | 140 | ListItem.Standard { | 139 | SettingsListItems.Standard { |
| 286 | 141 | text: i18n.tr("Encryption") | 140 | text: i18n.tr("Encryption") |
| 288 | 142 | control: Switch { | 141 | Switch { |
| 289 | 143 | id: encryptionSwitch | 142 | id: encryptionSwitch |
| 290 | 144 | checked: false | 143 | checked: false |
| 291 | 145 | } | 144 | } |
| 292 | 146 | visible: showAllUI | 145 | visible: showAllUI |
| 293 | 147 | } | 146 | } |
| 295 | 148 | ListItem.Caption { | 147 | ListItems.Caption { |
| 296 | 149 | text: i18n.tr( | 148 | text: i18n.tr( |
| 297 | 150 | "Encryption protects against access to phone data when the phone is connected to a PC or other device.") | 149 | "Encryption protects against access to phone data when the phone is connected to a PC or other device.") |
| 298 | 151 | visible: showAllUI | 150 | visible: showAllUI |
| 299 | 152 | } | 151 | } |
| 301 | 153 | ListItem.Header { | 152 | SettingsItemTitle { |
| 302 | 154 | text: i18n.tr("Privacy") | 153 | text: i18n.tr("Privacy") |
| 303 | 155 | } | 154 | } |
| 305 | 156 | ListItem.Standard { | 155 | SettingsListItems.Standard { |
| 306 | 157 | text: i18n.tr("Stats on welcome screen") | 156 | text: i18n.tr("Stats on welcome screen") |
| 308 | 158 | control: Switch { | 157 | Switch { |
| 309 | 159 | property bool serverChecked: securityPrivacy.statsWelcomeScreen | 158 | property bool serverChecked: securityPrivacy.statsWelcomeScreen |
| 310 | 160 | onServerCheckedChanged: checked = serverChecked | 159 | onServerCheckedChanged: checked = serverChecked |
| 311 | 161 | Component.onCompleted: checked = serverChecked | 160 | Component.onCompleted: checked = serverChecked |
| 312 | @@ -163,9 +162,9 @@ | |||
| 313 | 163 | } | 162 | } |
| 314 | 164 | } | 163 | } |
| 315 | 165 | 164 | ||
| 317 | 166 | ListItem.Standard { | 165 | SettingsListItems.Standard { |
| 318 | 167 | text: i18n.tr("Messages on welcome screen") | 166 | text: i18n.tr("Messages on welcome screen") |
| 320 | 168 | control: Switch { | 167 | Switch { |
| 321 | 169 | property bool serverChecked: securityPrivacy.messagesWelcomeScreen | 168 | property bool serverChecked: securityPrivacy.messagesWelcomeScreen |
| 322 | 170 | onServerCheckedChanged: checked = serverChecked | 169 | onServerCheckedChanged: checked = serverChecked |
| 323 | 171 | Component.onCompleted: checked = serverChecked | 170 | Component.onCompleted: checked = serverChecked |
| 324 | @@ -184,12 +183,11 @@ | |||
| 325 | 184 | 183 | ||
| 326 | 185 | Component.onCompleted: start() | 184 | Component.onCompleted: start() |
| 327 | 186 | } | 185 | } |
| 329 | 187 | ListItem.SingleValue { | 186 | SettingsListItems.SingleValueProgression { |
| 330 | 188 | id: locationItem | 187 | id: locationItem |
| 331 | 189 | objectName: "locationItem" | 188 | objectName: "locationItem" |
| 332 | 190 | text: i18n.tr("Location") | 189 | text: i18n.tr("Location") |
| 333 | 191 | value: "" | 190 | value: "" |
| 334 | 192 | progression: true | ||
| 335 | 193 | onClicked: pageStack.push(Qt.resolvedUrl("Location.qml")) | 191 | onClicked: pageStack.push(Qt.resolvedUrl("Location.qml")) |
| 336 | 194 | visible: true | 192 | visible: true |
| 337 | 195 | enabled: true | 193 | enabled: true |
| 338 | @@ -204,14 +202,12 @@ | |||
| 339 | 204 | property: "locationEnabled" | 202 | property: "locationEnabled" |
| 340 | 205 | value: locationActionGroup.enabled.state | 203 | value: locationActionGroup.enabled.state |
| 341 | 206 | } | 204 | } |
| 343 | 207 | ListItem.SingleValue { | 205 | SettingsListItems.SingleValueProgression { |
| 344 | 208 | text: i18n.tr("App permissions") | 206 | text: i18n.tr("App permissions") |
| 345 | 209 | progression: true | ||
| 346 | 210 | onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager}) | 207 | onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager}) |
| 347 | 211 | } | 208 | } |
| 349 | 212 | ListItem.SingleValue { | 209 | SettingsListItems.SingleValueProgression { |
| 350 | 213 | text: i18n.tr("Diagnostics") | 210 | text: i18n.tr("Diagnostics") |
| 351 | 214 | progression: true | ||
| 352 | 215 | value: diagnosticsWidget.reportCrashes ? | 211 | value: diagnosticsWidget.reportCrashes ? |
| 353 | 216 | /* TRANSLATORS: This string is shown when crash | 212 | /* TRANSLATORS: This string is shown when crash |
| 354 | 217 | reports are to be sent by the system. */ | 213 | reports are to be sent by the system. */ |
| 355 | 218 | 214 | ||
| 356 | === modified file 'plugins/security-privacy/PhoneLocking.qml' | |||
| 357 | --- plugins/security-privacy/PhoneLocking.qml 2015-09-18 14:18:11 +0000 | |||
| 358 | +++ plugins/security-privacy/PhoneLocking.qml 2015-12-09 19:33:29 +0000 | |||
| 359 | @@ -1,7 +1,7 @@ | |||
| 360 | 1 | /* | 1 | /* |
| 361 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 362 | 3 | * | 3 | * |
| 364 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 365 | 5 | * | 5 | * |
| 366 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 367 | 7 | * | 7 | * |
| 368 | @@ -21,8 +21,9 @@ | |||
| 369 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 370 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 371 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 372 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 373 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 375 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 26 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 376 | 26 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 27 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 377 | 27 | 28 | ||
| 378 | 28 | ItemPage { | 29 | ItemPage { |
| 379 | @@ -52,7 +53,7 @@ | |||
| 380 | 52 | anchors.left: parent.left | 53 | anchors.left: parent.left |
| 381 | 53 | anchors.right: parent.right | 54 | anchors.right: parent.right |
| 382 | 54 | 55 | ||
| 384 | 55 | ListItem.SingleValue { | 56 | SettingsListItems.SingleValueProgression { |
| 385 | 56 | property string swipe: i18n.ctr("Unlock with swipe", "None") | 57 | property string swipe: i18n.ctr("Unlock with swipe", "None") |
| 386 | 57 | property string passcode: i18n.tr("Passcode") | 58 | property string passcode: i18n.tr("Passcode") |
| 387 | 58 | property string passphrase: i18n.tr("Passphrase") | 59 | property string passphrase: i18n.tr("Passphrase") |
| 388 | @@ -69,11 +70,10 @@ | |||
| 389 | 69 | return passphrase | 70 | return passphrase |
| 390 | 70 | } | 71 | } |
| 391 | 71 | } | 72 | } |
| 392 | 72 | progression: true | ||
| 393 | 73 | onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml")) | 73 | onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml")) |
| 394 | 74 | } | 74 | } |
| 395 | 75 | 75 | ||
| 397 | 76 | ListItem.SingleValue { | 76 | SettingsListItems.SingleValueProgression { |
| 398 | 77 | objectName: "lockTimeout" | 77 | objectName: "lockTimeout" |
| 399 | 78 | property bool lockOnSuspend: securityPrivacy.securityType !== | 78 | property bool lockOnSuspend: securityPrivacy.securityType !== |
| 400 | 79 | UbuntuSecurityPrivacyPanel.Swipe | 79 | UbuntuSecurityPrivacyPanel.Swipe |
| 401 | @@ -99,15 +99,14 @@ | |||
| 402 | 99 | i18n.tr("Never") | 99 | i18n.tr("Never") |
| 403 | 100 | } | 100 | } |
| 404 | 101 | } | 101 | } |
| 405 | 102 | progression: true | ||
| 406 | 103 | onClicked: | 102 | onClicked: |
| 407 | 104 | pageStack.push( | 103 | pageStack.push( |
| 408 | 105 | Qt.resolvedUrl("../battery/SleepValues.qml"), | 104 | Qt.resolvedUrl("../battery/SleepValues.qml"), |
| 409 | 106 | { title: text, lockOnSuspend: lockOnSuspend } ) | 105 | { title: text, lockOnSuspend: lockOnSuspend } ) |
| 410 | 107 | } | 106 | } |
| 411 | 108 | 107 | ||
| 414 | 109 | ListItem.Standard { | 108 | SettingsListItems.Standard { |
| 415 | 110 | control: CheckBox { | 109 | CheckBox { |
| 416 | 111 | checked: true | 110 | checked: true |
| 417 | 112 | } | 111 | } |
| 418 | 113 | text: i18n.tr("Sleep locks immediately") | 112 | text: i18n.tr("Sleep locks immediately") |
| 419 | @@ -118,9 +117,9 @@ | |||
| 420 | 118 | text: i18n.tr("When locked, allow:") | 117 | text: i18n.tr("When locked, allow:") |
| 421 | 119 | } | 118 | } |
| 422 | 120 | 119 | ||
| 424 | 121 | ListItem.Standard { | 120 | SettingsListItems.Standard { |
| 425 | 122 | text: i18n.tr("Launcher") | 121 | text: i18n.tr("Launcher") |
| 427 | 123 | control: CheckBox { | 122 | CheckBox { |
| 428 | 124 | id: launcherCheck | 123 | id: launcherCheck |
| 429 | 125 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe | 124 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe |
| 430 | 126 | 125 | ||
| 431 | @@ -131,9 +130,9 @@ | |||
| 432 | 131 | } | 130 | } |
| 433 | 132 | } | 131 | } |
| 434 | 133 | 132 | ||
| 436 | 134 | ListItem.Standard { | 133 | SettingsListItems.Standard { |
| 437 | 135 | text: i18n.tr("Notifications and quick settings") | 134 | text: i18n.tr("Notifications and quick settings") |
| 439 | 136 | control: CheckBox { | 135 | CheckBox { |
| 440 | 137 | id: indicatorsCheck | 136 | id: indicatorsCheck |
| 441 | 138 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe | 137 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe |
| 442 | 139 | 138 | ||
| 443 | @@ -144,7 +143,7 @@ | |||
| 444 | 144 | } | 143 | } |
| 445 | 145 | } | 144 | } |
| 446 | 146 | 145 | ||
| 448 | 147 | ListItem.Caption { | 146 | ListItems.Caption { |
| 449 | 148 | text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ? | 147 | text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ? |
| 450 | 149 | i18n.tr("Turn on lock security to restrict access when the phone is locked.") : | 148 | i18n.tr("Turn on lock security to restrict access when the phone is locked.") : |
| 451 | 150 | i18n.tr("Other apps and functions will prompt you to unlock.") | 149 | i18n.tr("Other apps and functions will prompt you to unlock.") |
| 452 | 151 | 150 | ||
| 453 | === modified file 'plugins/security-privacy/SimPin.qml' | |||
| 454 | --- plugins/security-privacy/SimPin.qml 2015-08-10 13:31:45 +0000 | |||
| 455 | +++ plugins/security-privacy/SimPin.qml 2015-12-09 19:33:29 +0000 | |||
| 456 | @@ -19,14 +19,15 @@ | |||
| 457 | 19 | */ | 19 | */ |
| 458 | 20 | 20 | ||
| 459 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 460 | 22 | import MeeGo.QOfono 0.2 | ||
| 461 | 22 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 462 | 23 | import QtQuick.Layouts 1.1 | 24 | import QtQuick.Layouts 1.1 |
| 463 | 25 | import SystemSettings 1.0 | ||
| 464 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 465 | 24 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 467 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 28 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 468 | 26 | import Ubuntu.Components.Popups 1.3 | 29 | import Ubuntu.Components.Popups 1.3 |
| 469 | 27 | import SystemSettings 1.0 | ||
| 470 | 28 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 30 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 471 | 29 | import MeeGo.QOfono 0.2 | ||
| 472 | 30 | import "sims.js" as Sims | 31 | import "sims.js" as Sims |
| 473 | 31 | 32 | ||
| 474 | 32 | 33 | ||
| 475 | @@ -388,14 +389,14 @@ | |||
| 476 | 388 | } | 389 | } |
| 477 | 389 | } | 390 | } |
| 478 | 390 | 391 | ||
| 480 | 391 | ListItem.Standard { | 392 | SettingsListItems.Standard { |
| 481 | 392 | text: sims[index].title | 393 | text: sims[index].title |
| 482 | 393 | visible: sims.length > 1 | 394 | visible: sims.length > 1 |
| 483 | 394 | } | 395 | } |
| 484 | 395 | 396 | ||
| 486 | 396 | ListItem.Standard { | 397 | SettingsListItems.Standard { |
| 487 | 397 | text: i18n.tr("SIM PIN") | 398 | text: i18n.tr("SIM PIN") |
| 489 | 398 | control: Switch { | 399 | Switch { |
| 490 | 399 | id: simPinSwitch | 400 | id: simPinSwitch |
| 491 | 400 | objectName: "simPinSwitch" | 401 | objectName: "simPinSwitch" |
| 492 | 401 | checked: sims[index].simMng.lockedPins.length > 0 | 402 | checked: sims[index].simMng.lockedPins.length > 0 |
| 493 | @@ -406,11 +407,11 @@ | |||
| 494 | 406 | } | 407 | } |
| 495 | 407 | } | 408 | } |
| 496 | 408 | 409 | ||
| 498 | 409 | ListItem.Standard { | 410 | SettingsListItems.Standard { |
| 499 | 410 | id: changeControl | 411 | id: changeControl |
| 500 | 411 | visible: sim.state === "unlocked" | 412 | visible: sim.state === "unlocked" |
| 501 | 412 | text: i18n.tr("Unlocked") | 413 | text: i18n.tr("Unlocked") |
| 503 | 413 | control: Button { | 414 | Button { |
| 504 | 414 | enabled: parent.visible | 415 | enabled: parent.visible |
| 505 | 415 | text: i18n.tr("Change PIN…") | 416 | text: i18n.tr("Change PIN…") |
| 506 | 416 | onClicked: { | 417 | onClicked: { |
| 507 | @@ -420,11 +421,11 @@ | |||
| 508 | 420 | } | 421 | } |
| 509 | 421 | } | 422 | } |
| 510 | 422 | 423 | ||
| 512 | 423 | ListItem.Standard { | 424 | SettingsListItems.Standard { |
| 513 | 424 | id: lockControl | 425 | id: lockControl |
| 514 | 425 | visible: sim.state === "locked" | 426 | visible: sim.state === "locked" |
| 515 | 426 | text: i18n.tr("Locked") | 427 | text: i18n.tr("Locked") |
| 517 | 427 | control: Button { | 428 | Button { |
| 518 | 428 | objectName: "unlock" | 429 | objectName: "unlock" |
| 519 | 429 | enabled: sims[index].simMng.pinRequired !== 'none' | 430 | enabled: sims[index].simMng.pinRequired !== 'none' |
| 520 | 430 | text: i18n.tr("Unlock…") | 431 | text: i18n.tr("Unlock…") |
| 521 | @@ -433,18 +434,18 @@ | |||
| 522 | 433 | } | 434 | } |
| 523 | 434 | } | 435 | } |
| 524 | 435 | 436 | ||
| 526 | 436 | ListItem.Divider { | 437 | ListItems.Divider { |
| 527 | 437 | visible: index < (sims.length - 1) | 438 | visible: index < (sims.length - 1) |
| 528 | 438 | } | 439 | } |
| 529 | 439 | 440 | ||
| 530 | 440 | } | 441 | } |
| 531 | 441 | } | 442 | } |
| 532 | 442 | 443 | ||
| 534 | 443 | ListItem.Caption { | 444 | ListItems.Caption { |
| 535 | 444 | text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the phone or swapping the SIM.") | 445 | text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the phone or swapping the SIM.") |
| 536 | 445 | } | 446 | } |
| 537 | 446 | 447 | ||
| 539 | 447 | ListItem.Caption { | 448 | ListItems.Caption { |
| 540 | 448 | text: i18n.tr("Entering an incorrect PIN repeatedly may lock the SIM permanently.") | 449 | text: i18n.tr("Entering an incorrect PIN repeatedly may lock the SIM permanently.") |
| 541 | 449 | } | 450 | } |
| 542 | 450 | } | 451 | } |
| 543 | 451 | 452 | ||
| 544 | === modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml' | |||
| 545 | --- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2015-08-10 13:31:45 +0000 | |||
| 546 | +++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2015-12-09 19:33:29 +0000 | |||
| 547 | @@ -20,9 +20,9 @@ | |||
| 548 | 20 | 20 | ||
| 549 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 550 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 552 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | 23 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 553 | 24 | 24 | ||
| 555 | 25 | ListItem.Base { | 25 | ListItems.Base { |
| 556 | 26 | property string textEntry: ""; | 26 | property string textEntry: ""; |
| 557 | 27 | property alias checked: checkBox.checked; | 27 | property alias checked: checkBox.checked; |
| 558 | 28 | onClicked: checked = !checked; | 28 | onClicked: checked = !checked; |
| 559 | 29 | 29 | ||
| 560 | === modified file 'plugins/security-privacy/diagnostics/PageComponent.qml' | |||
| 561 | --- plugins/security-privacy/diagnostics/PageComponent.qml 2015-10-16 13:42:50 +0000 | |||
| 562 | +++ plugins/security-privacy/diagnostics/PageComponent.qml 2015-12-09 19:33:29 +0000 | |||
| 563 | @@ -20,8 +20,9 @@ | |||
| 564 | 20 | 20 | ||
| 565 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 566 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 567 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 568 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 570 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 571 | 25 | import Ubuntu.SystemSettings.Diagnostics 1.0 | 26 | import Ubuntu.SystemSettings.Diagnostics 1.0 |
| 572 | 26 | 27 | ||
| 573 | 27 | ItemPage { | 28 | ItemPage { |
| 574 | @@ -54,15 +55,14 @@ | |||
| 575 | 54 | anchors.left: parent.left | 55 | anchors.left: parent.left |
| 576 | 55 | anchors.right: parent.right | 56 | anchors.right: parent.right |
| 577 | 56 | 57 | ||
| 579 | 57 | ListItem.SingleValue { | 58 | SettingsListItems.SingleValueProgression { |
| 580 | 58 | text: i18n.tr("Privacy policy") | 59 | text: i18n.tr("Privacy policy") |
| 581 | 59 | progression: true | ||
| 582 | 60 | onClicked: { | 60 | onClicked: { |
| 583 | 61 | Qt.openUrlExternally("http://www.ubuntu.com/aboutus/privacypolicy?crashdb") | 61 | Qt.openUrlExternally("http://www.ubuntu.com/aboutus/privacypolicy?crashdb") |
| 584 | 62 | } | 62 | } |
| 585 | 63 | } | 63 | } |
| 586 | 64 | 64 | ||
| 588 | 65 | ListItem.Standard { | 65 | SettingsListItems.Standard { |
| 589 | 66 | text: i18n.tr("Report to Canonical:") | 66 | text: i18n.tr("Report to Canonical:") |
| 590 | 67 | } | 67 | } |
| 591 | 68 | 68 | ||
| 592 | @@ -80,20 +80,19 @@ | |||
| 593 | 80 | textEntry: i18n.tr("App crashes and errors") | 80 | textEntry: i18n.tr("App crashes and errors") |
| 594 | 81 | } | 81 | } |
| 595 | 82 | 82 | ||
| 597 | 83 | ListItem.SingleValue { | 83 | SettingsListItems.SingleValueProgression { |
| 598 | 84 | id: previousReports | 84 | id: previousReports |
| 599 | 85 | property string ident: diagnosticsWidget.systemIdentifier() | 85 | property string ident: diagnosticsWidget.systemIdentifier() |
| 600 | 86 | text: i18n.tr("Previous error reports") | 86 | text: i18n.tr("Previous error reports") |
| 602 | 87 | progression: previousReports.ident != "" | 87 | enabled: previousReports.ident != "" |
| 603 | 88 | progressionVisible: enabled | ||
| 604 | 88 | onClicked: { | 89 | onClicked: { |
| 605 | 89 | var base = "https://errors.ubuntu.com/user/" | 90 | var base = "https://errors.ubuntu.com/user/" |
| 609 | 90 | if (previousReports.progression) { | 91 | Qt.openUrlExternally(base + ident) |
| 607 | 91 | Qt.openUrlExternally(base + ident) | ||
| 608 | 92 | } | ||
| 610 | 93 | } | 92 | } |
| 611 | 94 | } | 93 | } |
| 612 | 95 | 94 | ||
| 614 | 96 | ListItem.Caption { | 95 | ListItems.Caption { |
| 615 | 97 | text: i18n.tr("Includes info about what an app was doing when it failed.") | 96 | text: i18n.tr("Includes info about what an app was doing when it failed.") |
| 616 | 98 | } | 97 | } |
| 617 | 99 | } | 98 | } |
| 618 | 100 | 99 | ||
| 619 | === modified file 'plugins/system-update/CMakeLists.txt' | |||
| 620 | --- plugins/system-update/CMakeLists.txt 2015-08-26 16:35:05 +0000 | |||
| 621 | +++ plugins/system-update/CMakeLists.txt 2015-12-09 19:33:29 +0000 | |||
| 622 | @@ -1,4 +1,4 @@ | |||
| 624 | 1 | set(QML_SOURCES PageComponent.qml Configuration.qml) | 1 | set(QML_SOURCES PageComponent.qml Configuration.qml UpdateItem.qml) |
| 625 | 2 | SET (CMAKE_AUTOMOC ON) | 2 | SET (CMAKE_AUTOMOC ON) |
| 626 | 3 | 3 | ||
| 627 | 4 | add_library(UbuntuUpdatePanel MODULE plugin.h plugin.cpp | 4 | add_library(UbuntuUpdatePanel MODULE plugin.h plugin.cpp |
| 628 | 5 | 5 | ||
| 629 | === modified file 'plugins/system-update/Configuration.qml' | |||
| 630 | --- plugins/system-update/Configuration.qml 2015-08-10 13:31:45 +0000 | |||
| 631 | +++ plugins/system-update/Configuration.qml 2015-12-09 19:33:29 +0000 | |||
| 632 | @@ -1,7 +1,7 @@ | |||
| 633 | 1 | /* | 1 | /* |
| 634 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 635 | 3 | * | 3 | * |
| 637 | 4 | * Copyright (C) 2013-2014 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 638 | 5 | * | 5 | * |
| 639 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 640 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 641 | @@ -19,7 +19,7 @@ | |||
| 642 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
| 643 | 20 | import SystemSettings 1.0 | 20 | import SystemSettings 1.0 |
| 644 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
| 646 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 22 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 647 | 23 | import Ubuntu.SystemSettings.Update 1.0 | 23 | import Ubuntu.SystemSettings.Update 1.0 |
| 648 | 24 | 24 | ||
| 649 | 25 | 25 | ||
| 650 | @@ -28,7 +28,7 @@ | |||
| 651 | 28 | objectName: "configurationPage" | 28 | objectName: "configurationPage" |
| 652 | 29 | title: i18n.tr("Auto download") | 29 | title: i18n.tr("Auto download") |
| 653 | 30 | 30 | ||
| 655 | 31 | ListItem.ItemSelector { | 31 | ListItems.ItemSelector { |
| 656 | 32 | id: upgradePolicySelector | 32 | id: upgradePolicySelector |
| 657 | 33 | expanded: true | 33 | expanded: true |
| 658 | 34 | text: i18n.tr ("Download future updates automatically:") | 34 | text: i18n.tr ("Download future updates automatically:") |
| 659 | 35 | 35 | ||
| 660 | === modified file 'plugins/system-update/EntryComponent.qml' | |||
| 661 | --- plugins/system-update/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 662 | +++ plugins/system-update/EntryComponent.qml 2015-12-09 19:33:29 +0000 | |||
| 663 | @@ -1,7 +1,7 @@ | |||
| 664 | 1 | /* | 1 | /* |
| 665 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 666 | 3 | * | 3 | * |
| 668 | 4 | * Copyright (C) 2014 Canonical Ltd. | 4 | * Copyright (C) 2014-2015 Canonical Ltd. |
| 669 | 5 | * | 5 | * |
| 670 | 6 | * Contact: Diego Sarmentero <diego.sarmentero@canonical.com> | 6 | * Contact: Diego Sarmentero <diego.sarmentero@canonical.com> |
| 671 | 7 | * | 7 | * |
| 672 | @@ -19,18 +19,15 @@ | |||
| 673 | 19 | */ | 19 | */ |
| 674 | 20 | 20 | ||
| 675 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 676 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 677 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 678 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 679 | 24 | import Ubuntu.SystemSettings.Update 1.0 | 24 | import Ubuntu.SystemSettings.Update 1.0 |
| 680 | 25 | 25 | ||
| 682 | 26 | ListItem.SingleValue { | 26 | SettingsListItems.IconProgression { |
| 683 | 27 | id: root | 27 | id: root |
| 684 | 28 | text: i18n.tr(model.displayName) | 28 | text: i18n.tr(model.displayName) |
| 685 | 29 | objectName: "entryComponent-updates" | 29 | objectName: "entryComponent-updates" |
| 686 | 30 | iconSource: Qt.resolvedUrl(model.icon) | 30 | iconSource: Qt.resolvedUrl(model.icon) |
| 687 | 31 | iconFrame: false | ||
| 688 | 32 | progression: true | ||
| 689 | 33 | value: updatesAvailable > 0 ? updatesAvailable : "" | ||
| 690 | 34 | 31 | ||
| 691 | 35 | property int updatesAvailable: 0 | 32 | property int updatesAvailable: 0 |
| 692 | 36 | 33 | ||
| 693 | @@ -43,7 +40,7 @@ | |||
| 694 | 43 | updatesAvailable = _updatesAvailable; | 40 | updatesAvailable = _updatesAvailable; |
| 695 | 44 | } | 41 | } |
| 696 | 45 | 42 | ||
| 698 | 46 | Connections { | 43 | resources: Connections { |
| 699 | 47 | id: updateManager | 44 | id: updateManager |
| 700 | 48 | objectName: "updateManager" | 45 | objectName: "updateManager" |
| 701 | 49 | target: UpdateManager | 46 | target: UpdateManager |
| 702 | @@ -52,4 +49,8 @@ | |||
| 703 | 52 | } | 49 | } |
| 704 | 53 | 50 | ||
| 705 | 54 | onClicked: main.loadPluginByName("system-update"); | 51 | onClicked: main.loadPluginByName("system-update"); |
| 706 | 52 | Label { | ||
| 707 | 53 | SlotsLayout.position: SlotsLayout.Trailing | ||
| 708 | 54 | text: updatesAvailable > 0 ? updatesAvailable : "" | ||
| 709 | 55 | } | ||
| 710 | 55 | } | 56 | } |
| 711 | 56 | 57 | ||
| 712 | === modified file 'plugins/system-update/PageComponent.qml' | |||
| 713 | --- plugins/system-update/PageComponent.qml 2015-11-03 16:26:27 +0000 | |||
| 714 | +++ plugins/system-update/PageComponent.qml 2015-12-09 19:33:29 +0000 | |||
| 715 | @@ -22,8 +22,9 @@ | |||
| 716 | 22 | import QMenuModel 0.1 | 22 | import QMenuModel 0.1 |
| 717 | 23 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 718 | 24 | import SystemSettings 1.0 | 24 | import SystemSettings 1.0 |
| 719 | 25 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 720 | 25 | import Ubuntu.Components 1.3 | 26 | import Ubuntu.Components 1.3 |
| 722 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | 27 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 723 | 27 | import Ubuntu.Components.Popups 1.3 | 28 | import Ubuntu.Components.Popups 1.3 |
| 724 | 28 | import Ubuntu.OnlineAccounts.Client 0.1 | 29 | import Ubuntu.OnlineAccounts.Client 0.1 |
| 725 | 29 | import Ubuntu.SystemSettings.Update 1.0 | 30 | import Ubuntu.SystemSettings.Update 1.0 |
| 726 | @@ -99,7 +100,7 @@ | |||
| 727 | 99 | Button { | 100 | Button { |
| 728 | 100 | text: i18n.tr("Restart & Install") | 101 | text: i18n.tr("Restart & Install") |
| 729 | 101 | visible: root.batterySafeForUpdate ? true : false | 102 | visible: root.batterySafeForUpdate ? true : false |
| 731 | 102 | color: UbuntuColors.orange | 103 | color: UbuntuColors.green |
| 732 | 103 | onClicked: { | 104 | onClicked: { |
| 733 | 104 | installingImageUpdate.visible = true; | 105 | installingImageUpdate.visible = true; |
| 734 | 105 | UpdateManager.applySystemUpdate(); | 106 | UpdateManager.applySystemUpdate(); |
| 735 | @@ -108,12 +109,12 @@ | |||
| 736 | 108 | } | 109 | } |
| 737 | 109 | Button { | 110 | Button { |
| 738 | 110 | text: i18n.tr("Cancel") | 111 | text: i18n.tr("Cancel") |
| 740 | 111 | color: UbuntuColors.warmGrey | 112 | color: UbuntuColors.lightGrey |
| 741 | 112 | onClicked: { | 113 | onClicked: { |
| 742 | 113 | updateList.currentIndex = 0; | 114 | updateList.currentIndex = 0; |
| 743 | 114 | var item = updateList.currentItem; | 115 | var item = updateList.currentItem; |
| 744 | 115 | var modelItem = UpdateManager.model[0]; | 116 | var modelItem = UpdateManager.model[0]; |
| 746 | 116 | item.actionButton.text = i18n.tr("Install"); | 117 | item.actionButton.text = i18n.tr("Update"); |
| 747 | 117 | item.progressBar.opacity = 0; | 118 | item.progressBar.opacity = 0; |
| 748 | 118 | modelItem.updateReady = true; | 119 | modelItem.updateReady = true; |
| 749 | 119 | modelItem.selected = false; | 120 | modelItem.selected = false; |
| 750 | @@ -133,7 +134,7 @@ | |||
| 751 | 133 | 134 | ||
| 752 | 134 | Button { | 135 | Button { |
| 753 | 135 | text: i18n.tr("OK") | 136 | text: i18n.tr("OK") |
| 755 | 136 | color: UbuntuColors.orange | 137 | color: UbuntuColors.green |
| 756 | 137 | onClicked: { | 138 | onClicked: { |
| 757 | 138 | PopupUtils.close(dialogueError); | 139 | PopupUtils.close(dialogueError); |
| 758 | 139 | } | 140 | } |
| 759 | @@ -261,10 +262,9 @@ | |||
| 760 | 261 | } | 262 | } |
| 761 | 262 | height: childrenRect.height | 263 | height: childrenRect.height |
| 762 | 263 | 264 | ||
| 764 | 264 | ListItem.Base { | 265 | ListItems.Base { |
| 765 | 265 | id: checkForUpdatesArea | 266 | id: checkForUpdatesArea |
| 766 | 266 | objectName: "checkForUpdatesArea" | 267 | objectName: "checkForUpdatesArea" |
| 767 | 267 | showDivider: false | ||
| 768 | 268 | visible: false | 268 | visible: false |
| 769 | 269 | 269 | ||
| 770 | 270 | ActivityIndicator { | 270 | ActivityIndicator { |
| 771 | @@ -293,20 +293,18 @@ | |||
| 772 | 293 | } | 293 | } |
| 773 | 294 | } | 294 | } |
| 774 | 295 | 295 | ||
| 776 | 296 | ListItem.SingleControl { | 296 | SettingsListItems.SingleValue { |
| 777 | 297 | height: installAllButton.visible ? units.gu(8) : units.gu(2) | 297 | height: installAllButton.visible ? units.gu(8) : units.gu(2) |
| 778 | 298 | highlightWhenPressed: false | 298 | highlightWhenPressed: false |
| 780 | 299 | control: Button { | 299 | text: includeSystemUpdate ? |
| 781 | 300 | i18n.tr("%1 update available", "%1 updates available", root.updatesAvailable).arg(root.updatesAvailable) : | ||
| 782 | 301 | i18n.tr("%1 update available", "%1 updates available", root.updatesAvailable).arg(root.updatesAvailable) | ||
| 783 | 302 | Button { | ||
| 784 | 300 | id: installAllButton | 303 | id: installAllButton |
| 785 | 301 | objectName: "installAllButton" | 304 | objectName: "installAllButton" |
| 794 | 302 | property string primaryText: includeSystemUpdate ? | 305 | SlotsLayout.position: SlotsLayout.Trailing |
| 795 | 303 | i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) : | 306 | color: UbuntuColors.green |
| 796 | 304 | i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable) | 307 | text: root.installAll ? i18n.tr("Pause all") : i18n.tr("Update all") |
| 789 | 305 | property string secondaryText: i18n.tr("Pause All") | ||
| 790 | 306 | color: UbuntuColors.orange | ||
| 791 | 307 | text: root.installAll ? secondaryText : primaryText | ||
| 792 | 308 | width: parent.width - units.gu(4) | ||
| 793 | 309 | |||
| 797 | 310 | onClicked: { | 308 | onClicked: { |
| 798 | 311 | for (var i=0; i < updateList.count; i++) { | 309 | for (var i=0; i < updateList.count; i++) { |
| 799 | 312 | updateList.currentIndex = i; | 310 | updateList.currentIndex = i; |
| 800 | @@ -339,7 +337,6 @@ | |||
| 801 | 339 | root.installAll = !root.installAll; | 337 | root.installAll = !root.installAll; |
| 802 | 340 | } | 338 | } |
| 803 | 341 | } | 339 | } |
| 804 | 342 | showDivider: false | ||
| 805 | 343 | } | 340 | } |
| 806 | 344 | 341 | ||
| 807 | 345 | ListView { | 342 | ListView { |
| 808 | @@ -354,270 +351,95 @@ | |||
| 809 | 354 | interactive: false | 351 | interactive: false |
| 810 | 355 | spacing: 0 | 352 | spacing: 0 |
| 811 | 356 | 353 | ||
| 819 | 357 | delegate: ListItem.Subtitled { | 354 | delegate: UpdateItem { |
| 820 | 358 | id: listItem | 355 | id: updateItem |
| 821 | 359 | anchors { | 356 | updateData: modelData |
| 822 | 360 | left: parent.left | 357 | tracker: DownloadTracker { |
| 823 | 361 | right: parent.right | 358 | id: tracker |
| 824 | 362 | topMargin: units.gu(1) | 359 | objectName: "tracker" |
| 825 | 363 | bottomMargin: units.gu(1) | 360 | packageName: updateData.packageName |
| 826 | 361 | clickToken: updateData.clickToken | ||
| 827 | 362 | download: updateData.downloadUrl | ||
| 828 | 363 | downloadSha512: updateData.downloadSha512 | ||
| 829 | 364 | |||
| 830 | 365 | onFinished: { | ||
| 831 | 366 | updateItem.progress.visible = false; | ||
| 832 | 367 | updateItem.buttonAppUpdate.visible = false; | ||
| 833 | 368 | updateItem.installed = true; | ||
| 834 | 369 | updateItem.installing = false; | ||
| 835 | 370 | root.updatesAvailable -= 1; | ||
| 836 | 371 | updateData.updateRequired = false; | ||
| 837 | 372 | UpdateManager.updateClickScope(); | ||
| 838 | 373 | } | ||
| 839 | 374 | |||
| 840 | 375 | onProcessing: { | ||
| 841 | 376 | console.warn("onProcessing: " + updateData.packageName + " " + path); | ||
| 842 | 377 | updateItem.buttonAppUpdate.enabled = false; | ||
| 843 | 378 | updateItem.installing = true; | ||
| 844 | 379 | updateData.updateState = false; | ||
| 845 | 380 | } | ||
| 846 | 381 | |||
| 847 | 382 | onStarted: { | ||
| 848 | 383 | console.warn("onStarted: " + updateData.packageName + " " + success); | ||
| 849 | 384 | if (success) | ||
| 850 | 385 | updateData.updateState = true; | ||
| 851 | 386 | else | ||
| 852 | 387 | updateData.updateState = false; | ||
| 853 | 388 | } | ||
| 854 | 389 | |||
| 855 | 390 | onPaused: { | ||
| 856 | 391 | console.warn("onPaused: " + updateData.packageName + " " + success); | ||
| 857 | 392 | if (success) | ||
| 858 | 393 | updateData.updateState = false; | ||
| 859 | 394 | else | ||
| 860 | 395 | updateData.updateState = true; | ||
| 861 | 396 | } | ||
| 862 | 397 | |||
| 863 | 398 | onResumed: { | ||
| 864 | 399 | console.warn("onResumed: " + updateData.packageName + " " + success); | ||
| 865 | 400 | if (success) | ||
| 866 | 401 | updateData.updateState = true; | ||
| 867 | 402 | else | ||
| 868 | 403 | updateData.updateState = false; | ||
| 869 | 404 | } | ||
| 870 | 405 | |||
| 871 | 406 | onCanceled: { | ||
| 872 | 407 | console.warn("onCanceled: " + updateData.packageName + " " + success); | ||
| 873 | 408 | if (success) { | ||
| 874 | 409 | updateData.updateState = false; | ||
| 875 | 410 | updateData.selected = false; | ||
| 876 | 411 | } | ||
| 877 | 412 | } | ||
| 878 | 413 | |||
| 879 | 414 | onErrorFound: { | ||
| 880 | 415 | console.warn("onErrorFound: " + updateData.packageName + " " + error); | ||
| 881 | 416 | updateData.updateState = false; | ||
| 882 | 417 | updateItem.retry = true; | ||
| 883 | 418 | updateItem.installing = false; | ||
| 884 | 419 | } | ||
| 885 | 364 | } | 420 | } |
| 901 | 365 | iconSource: Qt.resolvedUrl(modelData.iconUrl) | 421 | |
| 887 | 366 | iconFrame: modelData.systemUpdate ? false : true | ||
| 888 | 367 | height: visible ? textArea.height + units.gu(2) : 0 | ||
| 889 | 368 | highlightWhenPressed: false | ||
| 890 | 369 | showDivider: false | ||
| 891 | 370 | visible: opacity > 0 | ||
| 892 | 371 | opacity: installed ? 0 : 1 | ||
| 893 | 372 | Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } } | ||
| 894 | 373 | |||
| 895 | 374 | property alias actionButton: buttonAppUpdate | ||
| 896 | 375 | property alias progressBar: progress | ||
| 897 | 376 | property bool installing: !modelData.systemUpdate && (modelData.updateReady || (progressBar.value === progressBar.maximumValue)) | ||
| 898 | 377 | property bool installed: false | ||
| 899 | 378 | property bool retry: false | ||
| 900 | 379 | |||
| 902 | 380 | function pause () { | 422 | function pause () { |
| 907 | 381 | console.warn("PAUSE: " + modelData.packageName); | 423 | console.warn("PAUSE: " + updateData.packageName); |
| 908 | 382 | if (modelData.systemUpdate) | 424 | if (updateData.systemUpdate) |
| 909 | 383 | return UpdateManager.pauseDownload(modelData.packageName); | 425 | return UpdateManager.pauseDownload(updateData.packageName); |
| 910 | 384 | modelData.updateState = false; | 426 | updateData.updateState = false; |
| 911 | 385 | tracker.pause(); | 427 | tracker.pause(); |
| 912 | 386 | } | 428 | } |
| 913 | 387 | 429 | ||
| 914 | 388 | function resume () { | 430 | function resume () { |
| 919 | 389 | console.warn("RESUME: " + modelData.packageName); | 431 | console.warn("RESUME: " + updateData.packageName); |
| 920 | 390 | if (modelData.systemUpdate) | 432 | if (updateData.systemUpdate) |
| 921 | 391 | return UpdateManager.startDownload(modelData.packageName); | 433 | return UpdateManager.startDownload(updateData.packageName); |
| 922 | 392 | modelData.updateState = true; | 434 | updateData.updateState = true; |
| 923 | 393 | tracker.resume(); | 435 | tracker.resume(); |
| 924 | 394 | } | 436 | } |
| 925 | 395 | 437 | ||
| 926 | 396 | function start () { | 438 | function start () { |
| 1151 | 397 | console.warn("START: " + modelData.packageName); | 439 | console.warn("START: " + updateData.packageName); |
| 1152 | 398 | modelData.selected = true; | 440 | updateData.selected = true; |
| 1153 | 399 | modelData.updateState = true; | 441 | updateData.updateState = true; |
| 1154 | 400 | UpdateManager.startDownload(modelData.packageName); | 442 | UpdateManager.startDownload(updateData.packageName); |
| 931 | 401 | } | ||
| 932 | 402 | Column { | ||
| 933 | 403 | id: textArea | ||
| 934 | 404 | objectName: "textArea" | ||
| 935 | 405 | anchors { | ||
| 936 | 406 | left: parent.left | ||
| 937 | 407 | right: parent.right | ||
| 938 | 408 | } | ||
| 939 | 409 | spacing: units.gu(0.5) | ||
| 940 | 410 | |||
| 941 | 411 | Item { | ||
| 942 | 412 | anchors { | ||
| 943 | 413 | left: parent.left | ||
| 944 | 414 | right: parent.right | ||
| 945 | 415 | } | ||
| 946 | 416 | height: buttonAppUpdate.height | ||
| 947 | 417 | |||
| 948 | 418 | Label { | ||
| 949 | 419 | id: labelTitle | ||
| 950 | 420 | objectName: "labelTitle" | ||
| 951 | 421 | anchors { | ||
| 952 | 422 | left: parent.left | ||
| 953 | 423 | right: buttonAppUpdate.visible ? buttonAppUpdate.left : parent.right | ||
| 954 | 424 | verticalCenter: parent.verticalCenter | ||
| 955 | 425 | } | ||
| 956 | 426 | text: modelData.title | ||
| 957 | 427 | font.bold: true | ||
| 958 | 428 | elide: Text.ElideMiddle | ||
| 959 | 429 | } | ||
| 960 | 430 | |||
| 961 | 431 | Button { | ||
| 962 | 432 | id: buttonAppUpdate | ||
| 963 | 433 | objectName: "buttonAppUpdate" | ||
| 964 | 434 | anchors.right: parent.right | ||
| 965 | 435 | height: labelTitle.height + units.gu(1) | ||
| 966 | 436 | enabled: !installing | ||
| 967 | 437 | text: { | ||
| 968 | 438 | if (retry) | ||
| 969 | 439 | return i18n.tr("Retry"); | ||
| 970 | 440 | if (modelData.systemUpdate) { | ||
| 971 | 441 | if (modelData.updateReady) { | ||
| 972 | 442 | return i18n.tr("Install…"); | ||
| 973 | 443 | } else if (!modelData.updateState && !modelData.selected) { | ||
| 974 | 444 | return i18n.tr("Download"); | ||
| 975 | 445 | } | ||
| 976 | 446 | } | ||
| 977 | 447 | if (modelData.updateState) { | ||
| 978 | 448 | return i18n.tr("Pause"); | ||
| 979 | 449 | } else if (modelData.selected) { | ||
| 980 | 450 | return i18n.tr("Resume"); | ||
| 981 | 451 | } | ||
| 982 | 452 | return i18n.tr("Update"); | ||
| 983 | 453 | } | ||
| 984 | 454 | |||
| 985 | 455 | onClicked: { | ||
| 986 | 456 | if (retry) { | ||
| 987 | 457 | retry = false; | ||
| 988 | 458 | return UpdateManager.retryDownload(modelData.packageName); | ||
| 989 | 459 | } | ||
| 990 | 460 | if (modelData.updateState) | ||
| 991 | 461 | return pause(); | ||
| 992 | 462 | if (!modelData.updateState && modelData.selected) | ||
| 993 | 463 | return resume(); | ||
| 994 | 464 | if (!modelData.updateState && !modelData.selected && !modelData.updateReady) | ||
| 995 | 465 | return start(); | ||
| 996 | 466 | if (modelData.updateReady) | ||
| 997 | 467 | PopupUtils.open(dialogInstallComponent); | ||
| 998 | 468 | } | ||
| 999 | 469 | } | ||
| 1000 | 470 | } | ||
| 1001 | 471 | |||
| 1002 | 472 | Item { | ||
| 1003 | 473 | id: labelUpdateStatus | ||
| 1004 | 474 | anchors { | ||
| 1005 | 475 | left: parent.left | ||
| 1006 | 476 | right: parent.right | ||
| 1007 | 477 | } | ||
| 1008 | 478 | height: childrenRect.height | ||
| 1009 | 479 | visible: opacity > 0 | ||
| 1010 | 480 | opacity: (modelData.updateState && modelData.selected && !modelData.updateReady) || (installing || installed) ? 1 : 0 | ||
| 1011 | 481 | Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } } | ||
| 1012 | 482 | Label { | ||
| 1013 | 483 | objectName: "labelUpdateStatus" | ||
| 1014 | 484 | anchors.left: parent.left | ||
| 1015 | 485 | anchors.right: updateStatusLabel.left | ||
| 1016 | 486 | elide: Text.ElideMiddle | ||
| 1017 | 487 | fontSize: "small" | ||
| 1018 | 488 | text: { | ||
| 1019 | 489 | if (retry) | ||
| 1020 | 490 | return modelData.error; | ||
| 1021 | 491 | if (installing) | ||
| 1022 | 492 | return i18n.tr("Installing"); | ||
| 1023 | 493 | if (installed) | ||
| 1024 | 494 | return i18n.tr("Installed"); | ||
| 1025 | 495 | return i18n.tr("Downloading"); | ||
| 1026 | 496 | } | ||
| 1027 | 497 | } | ||
| 1028 | 498 | Label { | ||
| 1029 | 499 | id: updateStatusLabel | ||
| 1030 | 500 | anchors.right: parent.right | ||
| 1031 | 501 | visible: !labelSize.visible && !installing && !installed | ||
| 1032 | 502 | fontSize: "small" | ||
| 1033 | 503 | text: { | ||
| 1034 | 504 | if (!labelUpdateStatus.visible) | ||
| 1035 | 505 | return Utilities.formatSize(modelData.binaryFilesize); | ||
| 1036 | 506 | |||
| 1037 | 507 | return i18n.tr("%1 of %2").arg( | ||
| 1038 | 508 | Utilities.formatSize(modelData.binaryFilesize * (progress.value * 0.01))).arg( | ||
| 1039 | 509 | Utilities.formatSize(modelData.binaryFilesize) | ||
| 1040 | 510 | ); | ||
| 1041 | 511 | } | ||
| 1042 | 512 | } | ||
| 1043 | 513 | } | ||
| 1044 | 514 | |||
| 1045 | 515 | ProgressBar { | ||
| 1046 | 516 | id: progress | ||
| 1047 | 517 | objectName: "progress" | ||
| 1048 | 518 | height: units.gu(2) | ||
| 1049 | 519 | anchors { | ||
| 1050 | 520 | left: parent.left | ||
| 1051 | 521 | right: parent.right | ||
| 1052 | 522 | } | ||
| 1053 | 523 | visible: opacity > 0 | ||
| 1054 | 524 | opacity: modelData.selected && !modelData.updateReady && !installed ? 1 : 0 | ||
| 1055 | 525 | value: modelData.systemUpdate ? modelData.downloadProgress : tracker.progress | ||
| 1056 | 526 | minimumValue: 0 | ||
| 1057 | 527 | maximumValue: 100 | ||
| 1058 | 528 | |||
| 1059 | 529 | DownloadTracker { | ||
| 1060 | 530 | id: tracker | ||
| 1061 | 531 | objectName: "tracker" | ||
| 1062 | 532 | packageName: modelData.packageName | ||
| 1063 | 533 | clickToken: modelData.clickToken | ||
| 1064 | 534 | download: modelData.downloadUrl | ||
| 1065 | 535 | downloadSha512: modelData.downloadSha512 | ||
| 1066 | 536 | |||
| 1067 | 537 | onFinished: { | ||
| 1068 | 538 | progress.visible = false; | ||
| 1069 | 539 | buttonAppUpdate.visible = false; | ||
| 1070 | 540 | installed = true; | ||
| 1071 | 541 | installing = false; | ||
| 1072 | 542 | root.updatesAvailable -= 1; | ||
| 1073 | 543 | modelData.updateRequired = false; | ||
| 1074 | 544 | UpdateManager.updateClickScope(); | ||
| 1075 | 545 | } | ||
| 1076 | 546 | |||
| 1077 | 547 | onProcessing: { | ||
| 1078 | 548 | console.warn("onProcessing: " + modelData.packageName + " " + path); | ||
| 1079 | 549 | buttonAppUpdate.enabled = false; | ||
| 1080 | 550 | installing = true; | ||
| 1081 | 551 | modelData.updateState = false; | ||
| 1082 | 552 | } | ||
| 1083 | 553 | |||
| 1084 | 554 | onStarted: { | ||
| 1085 | 555 | console.warn("onStarted: " + modelData.packageName + " " + success); | ||
| 1086 | 556 | if (success) | ||
| 1087 | 557 | modelData.updateState = true; | ||
| 1088 | 558 | else | ||
| 1089 | 559 | modelData.updateState = false; | ||
| 1090 | 560 | } | ||
| 1091 | 561 | |||
| 1092 | 562 | onPaused: { | ||
| 1093 | 563 | console.warn("onPaused: " + modelData.packageName + " " + success); | ||
| 1094 | 564 | if (success) | ||
| 1095 | 565 | modelData.updateState = false; | ||
| 1096 | 566 | else | ||
| 1097 | 567 | modelData.updateState = true; | ||
| 1098 | 568 | } | ||
| 1099 | 569 | |||
| 1100 | 570 | onResumed: { | ||
| 1101 | 571 | console.warn("onResumed: " + modelData.packageName + " " + success); | ||
| 1102 | 572 | if (success) | ||
| 1103 | 573 | modelData.updateState = true; | ||
| 1104 | 574 | else | ||
| 1105 | 575 | modelData.updateState = false; | ||
| 1106 | 576 | } | ||
| 1107 | 577 | |||
| 1108 | 578 | onCanceled: { | ||
| 1109 | 579 | console.warn("onCanceled: " + modelData.packageName + " " + success); | ||
| 1110 | 580 | if (success) { | ||
| 1111 | 581 | modelData.updateState = false; | ||
| 1112 | 582 | modelData.selected = false; | ||
| 1113 | 583 | } | ||
| 1114 | 584 | } | ||
| 1115 | 585 | |||
| 1116 | 586 | onErrorFound: { | ||
| 1117 | 587 | console.warn("onErrorFound: " + modelData.packageName + " " + error); | ||
| 1118 | 588 | modelData.updateState = false; | ||
| 1119 | 589 | retry = true; | ||
| 1120 | 590 | installing = false; | ||
| 1121 | 591 | } | ||
| 1122 | 592 | } | ||
| 1123 | 593 | |||
| 1124 | 594 | Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } } | ||
| 1125 | 595 | } | ||
| 1126 | 596 | |||
| 1127 | 597 | Item { | ||
| 1128 | 598 | anchors { | ||
| 1129 | 599 | left: parent.left | ||
| 1130 | 600 | right: parent.right | ||
| 1131 | 601 | } | ||
| 1132 | 602 | height: childrenRect.height | ||
| 1133 | 603 | Label { | ||
| 1134 | 604 | id: labelVersion | ||
| 1135 | 605 | objectName: "labelVersion" | ||
| 1136 | 606 | anchors.left: parent.left | ||
| 1137 | 607 | text: modelData.remoteVersion ? i18n.tr("Version: ") + modelData.remoteVersion : "" | ||
| 1138 | 608 | elide: Text.ElideRight | ||
| 1139 | 609 | fontSize: "small" | ||
| 1140 | 610 | } | ||
| 1141 | 611 | |||
| 1142 | 612 | Label { | ||
| 1143 | 613 | id: labelSize | ||
| 1144 | 614 | objectName: "labelSize" | ||
| 1145 | 615 | anchors.right: parent.right | ||
| 1146 | 616 | text: Utilities.formatSize(modelData.binaryFilesize) | ||
| 1147 | 617 | fontSize: "small" | ||
| 1148 | 618 | visible: !labelUpdateStatus.visible && !installing && !installed | ||
| 1149 | 619 | } | ||
| 1150 | 620 | } | ||
| 1155 | 621 | } | 443 | } |
| 1156 | 622 | } | 444 | } |
| 1157 | 623 | } | 445 | } |
| 1158 | @@ -633,7 +455,7 @@ | |||
| 1159 | 633 | left: parent.left | 455 | left: parent.left |
| 1160 | 634 | right: parent.right | 456 | right: parent.right |
| 1161 | 635 | } | 457 | } |
| 1163 | 636 | ListItem.ThinDivider {} | 458 | ListItems.ThinDivider {} |
| 1164 | 637 | 459 | ||
| 1165 | 638 | Label { | 460 | Label { |
| 1166 | 639 | text: i18n.tr("Sign in to Ubuntu One to receive updates for apps.") | 461 | text: i18n.tr("Sign in to Ubuntu One to receive updates for apps.") |
| 1167 | @@ -652,6 +474,7 @@ | |||
| 1168 | 652 | leftMargin: units.gu(2) | 474 | leftMargin: units.gu(2) |
| 1169 | 653 | rightMargin: units.gu(2) | 475 | rightMargin: units.gu(2) |
| 1170 | 654 | } | 476 | } |
| 1171 | 477 | color: UbuntuColors.lightGrey | ||
| 1172 | 655 | onClicked: uoaConfig.exec() | 478 | onClicked: uoaConfig.exec() |
| 1173 | 656 | } | 479 | } |
| 1174 | 657 | 480 | ||
| 1175 | @@ -727,8 +550,8 @@ | |||
| 1176 | 727 | anchors.bottom: parent.bottom | 550 | anchors.bottom: parent.bottom |
| 1177 | 728 | anchors.left: parent.left | 551 | anchors.left: parent.left |
| 1178 | 729 | anchors.right: parent.right | 552 | anchors.right: parent.right |
| 1181 | 730 | ListItem.ThinDivider {} | 553 | ListItems.ThinDivider {} |
| 1182 | 731 | ListItem.SingleValue { | 554 | SettingsListItems.SingleValueProgression { |
| 1183 | 732 | objectName: "configuration" | 555 | objectName: "configuration" |
| 1184 | 733 | text: i18n.tr("Auto download") | 556 | text: i18n.tr("Auto download") |
| 1185 | 734 | value: { | 557 | value: { |
| 1186 | @@ -739,7 +562,6 @@ | |||
| 1187 | 739 | else if (UpdateManager.downloadMode === 2) | 562 | else if (UpdateManager.downloadMode === 2) |
| 1188 | 740 | return i18n.tr("Always") | 563 | return i18n.tr("Always") |
| 1189 | 741 | } | 564 | } |
| 1190 | 742 | progression: true | ||
| 1191 | 743 | onClicked: pageStack.push(Qt.resolvedUrl("Configuration.qml")) | 565 | onClicked: pageStack.push(Qt.resolvedUrl("Configuration.qml")) |
| 1192 | 744 | } | 566 | } |
| 1193 | 745 | } | 567 | } |
| 1194 | 746 | 568 | ||
| 1195 | === added file 'plugins/system-update/UpdateItem.qml' | |||
| 1196 | --- plugins/system-update/UpdateItem.qml 1970-01-01 00:00:00 +0000 | |||
| 1197 | +++ plugins/system-update/UpdateItem.qml 2015-12-09 19:33:29 +0000 | |||
| 1198 | @@ -0,0 +1,251 @@ | |||
| 1199 | 1 | /* | ||
| 1200 | 2 | * This file is part of system-settings | ||
| 1201 | 3 | * | ||
| 1202 | 4 | * Copyright (C) 2015 Canonical Ltd. | ||
| 1203 | 5 | * | ||
| 1204 | 6 | * This program is free software: you can redistribute it and/or modify it | ||
| 1205 | 7 | * under the terms of the GNU General Public License version 3, as published | ||
| 1206 | 8 | * by the Free Software Foundation. | ||
| 1207 | 9 | * | ||
| 1208 | 10 | * This program is distributed in the hope that it will be useful, but | ||
| 1209 | 11 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 1210 | 12 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 1211 | 13 | * PURPOSE. See the GNU General Public License for more details. | ||
| 1212 | 14 | * | ||
| 1213 | 15 | * You should have received a copy of the GNU General Public License along | ||
| 1214 | 16 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1215 | 17 | */ | ||
| 1216 | 18 | |||
| 1217 | 19 | import QtQuick 2.4 | ||
| 1218 | 20 | import Ubuntu.Components 1.3 | ||
| 1219 | 21 | import Ubuntu.Components.Popups 1.3 | ||
| 1220 | 22 | |||
| 1221 | 23 | ListItem { | ||
| 1222 | 24 | id: updateItem | ||
| 1223 | 25 | property alias actionButton: buttonAppUpdate | ||
| 1224 | 26 | property alias progressBar: progress | ||
| 1225 | 27 | property variant updateData | ||
| 1226 | 28 | property variant tracker | ||
| 1227 | 29 | property bool installing: !updateData.systemUpdate && (updateData.updateReady || (progressBar.value === progressBar.maximumValue)) | ||
| 1228 | 30 | property bool installed: false | ||
| 1229 | 31 | property bool retry: false | ||
| 1230 | 32 | height: layout.height + divider.height | ||
| 1231 | 33 | |||
| 1232 | 34 | SlotsLayout { | ||
| 1233 | 35 | id: layout | ||
| 1234 | 36 | padding { | ||
| 1235 | 37 | top: units.gu(1) | ||
| 1236 | 38 | bottom: units.gu(1) | ||
| 1237 | 39 | } | ||
| 1238 | 40 | visible: opacity > 0 | ||
| 1239 | 41 | opacity: installed ? 0 : 1 | ||
| 1240 | 42 | Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } } | ||
| 1241 | 43 | |||
| 1242 | 44 | UbuntuShape { | ||
| 1243 | 45 | SlotsLayout.position: SlotsLayout.Leading | ||
| 1244 | 46 | width: units.gu(4) | ||
| 1245 | 47 | height: width | ||
| 1246 | 48 | source: Image { | ||
| 1247 | 49 | anchors.fill: parent | ||
| 1248 | 50 | source: Qt.resolvedUrl(updateData.iconUrl) | ||
| 1249 | 51 | } | ||
| 1250 | 52 | aspect: updateData.systemUpdate ? UbuntuShape.Flat : UbuntuShape.Inset | ||
| 1251 | 53 | } | ||
| 1252 | 54 | |||
| 1253 | 55 | Column { | ||
| 1254 | 56 | SlotsLayout.position: SlotsLayout.Trailing | ||
| 1255 | 57 | width: buttonAppUpdate.width | ||
| 1256 | 58 | |||
| 1257 | 59 | Button { | ||
| 1258 | 60 | id: buttonAppUpdate | ||
| 1259 | 61 | objectName: "buttonAppUpdate" | ||
| 1260 | 62 | anchors { | ||
| 1261 | 63 | right: parent.right | ||
| 1262 | 64 | } | ||
| 1263 | 65 | height: labelTitle.height + units.gu(1) | ||
| 1264 | 66 | enabled: !installing | ||
| 1265 | 67 | text: { | ||
| 1266 | 68 | if (retry) | ||
| 1267 | 69 | return i18n.tr("Retry"); | ||
| 1268 | 70 | if (updateData.systemUpdate) { | ||
| 1269 | 71 | if (updateData.updateReady) { | ||
| 1270 | 72 | return i18n.tr("Update"); | ||
| 1271 | 73 | } else if (!updateData.updateState && !updateData.selected) { | ||
| 1272 | 74 | return i18n.tr("Download"); | ||
| 1273 | 75 | } | ||
| 1274 | 76 | } | ||
| 1275 | 77 | if (updateData.updateState) { | ||
| 1276 | 78 | return i18n.tr("Pause"); | ||
| 1277 | 79 | } else if (updateData.selected) { | ||
| 1278 | 80 | return i18n.tr("Resume"); | ||
| 1279 | 81 | } | ||
| 1280 | 82 | return i18n.tr("Update"); | ||
| 1281 | 83 | } | ||
| 1282 | 84 | |||
| 1283 | 85 | onClicked: { | ||
| 1284 | 86 | if (retry) { | ||
| 1285 | 87 | retry = false; | ||
| 1286 | 88 | return UpdateManager.retryDownload(updateData.packageName); | ||
| 1287 | 89 | } | ||
| 1288 | 90 | if (updateData.updateState) | ||
| 1289 | 91 | return pause(); | ||
| 1290 | 92 | if (!updateData.updateState && updateData.selected) | ||
| 1291 | 93 | return resume(); | ||
| 1292 | 94 | if (!updateData.updateState && !updateData.selected && !updateData.updateReady) | ||
| 1293 | 95 | return start(); | ||
| 1294 | 96 | if (updateData.updateReady) | ||
| 1295 | 97 | PopupUtils.open(dialogInstallComponent); | ||
| 1296 | 98 | } | ||
| 1297 | 99 | } | ||
| 1298 | 100 | |||
| 1299 | 101 | Label { | ||
| 1300 | 102 | id: updateStatusLabel | ||
| 1301 | 103 | anchors.right: parent.right | ||
| 1302 | 104 | visible: updateData.updateState && !retry | ||
| 1303 | 105 | fontSize: "small" | ||
| 1304 | 106 | text: { | ||
| 1305 | 107 | if (installing) | ||
| 1306 | 108 | return i18n.tr("Installing"); | ||
| 1307 | 109 | if (installed) | ||
| 1308 | 110 | return i18n.tr("Installed"); | ||
| 1309 | 111 | return i18n.tr("%1 of %2").arg( | ||
| 1310 | 112 | Utilities.formatSize(updateData.binaryFilesize * (progress.value * 0.01))).arg( | ||
| 1311 | 113 | Utilities.formatSize(updateData.binaryFilesize) | ||
| 1312 | 114 | ); | ||
| 1313 | 115 | } | ||
| 1314 | 116 | } | ||
| 1315 | 117 | } | ||
| 1316 | 118 | |||
| 1317 | 119 | mainSlot: Column { | ||
| 1318 | 120 | id: updateColumn | ||
| 1319 | 121 | objectName: "updateColumn" | ||
| 1320 | 122 | SlotsLayout.padding.top: 0 | ||
| 1321 | 123 | spacing: units.gu(0.5) | ||
| 1322 | 124 | height: childrenRect.height | ||
| 1323 | 125 | |||
| 1324 | 126 | Label { | ||
| 1325 | 127 | id: labelTitle | ||
| 1326 | 128 | objectName: "labelTitle" | ||
| 1327 | 129 | text: updateData.title | ||
| 1328 | 130 | font.bold: true | ||
| 1329 | 131 | elide: Text.ElideMiddle | ||
| 1330 | 132 | } | ||
| 1331 | 133 | |||
| 1332 | 134 | Item { | ||
| 1333 | 135 | anchors { | ||
| 1334 | 136 | left: parent.left | ||
| 1335 | 137 | right: parent.right | ||
| 1336 | 138 | } | ||
| 1337 | 139 | height: childrenRect.height | ||
| 1338 | 140 | Row { | ||
| 1339 | 141 | spacing: units.gu(1) | ||
| 1340 | 142 | Label { | ||
| 1341 | 143 | id: labelVersion | ||
| 1342 | 144 | objectName: "labelVersion" | ||
| 1343 | 145 | text: updateData.remoteVersion ? i18n.tr("Version: ") + updateData.remoteVersion : "" | ||
| 1344 | 146 | elide: Text.ElideRight | ||
| 1345 | 147 | fontSize: "small" | ||
| 1346 | 148 | } | ||
| 1347 | 149 | |||
| 1348 | 150 | Icon { | ||
| 1349 | 151 | name: "info" | ||
| 1350 | 152 | height: labelVersion.height | ||
| 1351 | 153 | width: height | ||
| 1352 | 154 | MouseArea { | ||
| 1353 | 155 | anchors.fill: parent | ||
| 1354 | 156 | onClicked: { | ||
| 1355 | 157 | PopupUtils.open(infoDialogComponent, undefined, {"title": updateData.title, "version": updateData.remoteVersion, "changelog": updateData.changelog}) | ||
| 1356 | 158 | console.warn(updateData.changelog) | ||
| 1357 | 159 | } | ||
| 1358 | 160 | } | ||
| 1359 | 161 | } | ||
| 1360 | 162 | } | ||
| 1361 | 163 | } | ||
| 1362 | 164 | |||
| 1363 | 165 | /* Not in the new design? | ||
| 1364 | 166 | Item { | ||
| 1365 | 167 | id: labelUpdateStatus | ||
| 1366 | 168 | anchors { | ||
| 1367 | 169 | left: parent.left | ||
| 1368 | 170 | right: parent.right | ||
| 1369 | 171 | } | ||
| 1370 | 172 | height: childrenRect.height | ||
| 1371 | 173 | visible: opacity > 0 | ||
| 1372 | 174 | opacity: (updateData.updateState && updateData.selected && !updateData.updateReady) || (installing || installed) ? 1 : 0 | ||
| 1373 | 175 | Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } } | ||
| 1374 | 176 | Label { | ||
| 1375 | 177 | objectName: "labelUpdateStatus" | ||
| 1376 | 178 | anchors.left: parent.left | ||
| 1377 | 179 | elide: Text.ElideMiddle | ||
| 1378 | 180 | fontSize: "small" | ||
| 1379 | 181 | text: { | ||
| 1380 | 182 | if (retry) | ||
| 1381 | 183 | return updateData.error; | ||
| 1382 | 184 | if (installing) | ||
| 1383 | 185 | return i18n.tr("Installing"); | ||
| 1384 | 186 | if (installed) | ||
| 1385 | 187 | return i18n.tr("Installed"); | ||
| 1386 | 188 | return i18n.tr("Downloading"); | ||
| 1387 | 189 | } | ||
| 1388 | 190 | } | ||
| 1389 | 191 | } | ||
| 1390 | 192 | */ | ||
| 1391 | 193 | |||
| 1392 | 194 | ProgressBar { | ||
| 1393 | 195 | id: progress | ||
| 1394 | 196 | objectName: "progress" | ||
| 1395 | 197 | height: units.gu(2) | ||
| 1396 | 198 | anchors { | ||
| 1397 | 199 | left: parent.left | ||
| 1398 | 200 | right: parent.right | ||
| 1399 | 201 | } | ||
| 1400 | 202 | visible: opacity > 0 | ||
| 1401 | 203 | opacity: updateData.selected && !updateData.updateReady && !installed ? 1 : 0 | ||
| 1402 | 204 | value: updateData.systemUpdate ? updateData.downloadProgress : tracker.progress | ||
| 1403 | 205 | minimumValue: 0 | ||
| 1404 | 206 | maximumValue: 100 | ||
| 1405 | 207 | |||
| 1406 | 208 | Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.SleepyDuration } } | ||
| 1407 | 209 | } | ||
| 1408 | 210 | } | ||
| 1409 | 211 | |||
| 1410 | 212 | Component { | ||
| 1411 | 213 | id: infoDialogComponent | ||
| 1412 | 214 | Dialog { | ||
| 1413 | 215 | id: infoDialog | ||
| 1414 | 216 | property string title | ||
| 1415 | 217 | property string version | ||
| 1416 | 218 | property string changelog | ||
| 1417 | 219 | |||
| 1418 | 220 | Column { | ||
| 1419 | 221 | spacing: units.gu(2) | ||
| 1420 | 222 | Label { | ||
| 1421 | 223 | anchors.left: parent.left | ||
| 1422 | 224 | text: title | ||
| 1423 | 225 | fontSize: "x-large" | ||
| 1424 | 226 | font.bold: true | ||
| 1425 | 227 | } | ||
| 1426 | 228 | Label { | ||
| 1427 | 229 | anchors.left: parent.left | ||
| 1428 | 230 | text: version | ||
| 1429 | 231 | fontSize: "medium" | ||
| 1430 | 232 | } | ||
| 1431 | 233 | Label { | ||
| 1432 | 234 | anchors.left: parent.left | ||
| 1433 | 235 | text: changelog | ||
| 1434 | 236 | fontSize: "medium" | ||
| 1435 | 237 | } | ||
| 1436 | 238 | |||
| 1437 | 239 | Button { | ||
| 1438 | 240 | anchors.right: parent.right | ||
| 1439 | 241 | text: i18n.tr("OK") | ||
| 1440 | 242 | width: units.gu(6) | ||
| 1441 | 243 | onClicked: { | ||
| 1442 | 244 | PopupUtils.close(infoDialog); | ||
| 1443 | 245 | } | ||
| 1444 | 246 | } | ||
| 1445 | 247 | } | ||
| 1446 | 248 | } | ||
| 1447 | 249 | } | ||
| 1448 | 250 | } | ||
| 1449 | 251 | } | ||
| 1450 | 0 | 252 | ||
| 1451 | === modified file 'plugins/system-update/network.cpp' | |||
| 1452 | --- plugins/system-update/network.cpp 2015-12-01 17:55:31 +0000 | |||
| 1453 | +++ plugins/system-update/network.cpp 2015-12-09 19:33:29 +0000 | |||
| 1454 | @@ -231,6 +231,7 @@ | |||
| 1455 | 231 | auto icon_url = object["icon_url"].toString(); | 231 | auto icon_url = object["icon_url"].toString(); |
| 1456 | 232 | auto url = object["download_url"].toString(); | 232 | auto url = object["download_url"].toString(); |
| 1457 | 233 | auto download_sha512 = object["download_sha512"].toString(); | 233 | auto download_sha512 = object["download_sha512"].toString(); |
| 1458 | 234 | auto changelog = object["changelog"].toString(); | ||
| 1459 | 234 | auto size = object["binary_filesize"].toInt(); | 235 | auto size = object["binary_filesize"].toInt(); |
| 1460 | 235 | if (m_apps.contains(name)) { | 236 | if (m_apps.contains(name)) { |
| 1461 | 236 | m_apps[name]->setRemoteVersion(version); | 237 | m_apps[name]->setRemoteVersion(version); |
| 1462 | @@ -239,6 +240,7 @@ | |||
| 1463 | 239 | m_apps[name]->setDownloadUrl(url); | 240 | m_apps[name]->setDownloadUrl(url); |
| 1464 | 240 | m_apps[name]->setBinaryFilesize(size); | 241 | m_apps[name]->setBinaryFilesize(size); |
| 1465 | 241 | m_apps[name]->setDownloadSha512(download_sha512); | 242 | m_apps[name]->setDownloadSha512(download_sha512); |
| 1466 | 243 | m_apps[name]->setChangelog(changelog); | ||
| 1467 | 242 | updates = true; | 244 | updates = true; |
| 1468 | 243 | } | 245 | } |
| 1469 | 244 | } | 246 | } |
| 1470 | 245 | 247 | ||
| 1471 | === modified file 'plugins/system-update/update.h' | |||
| 1472 | --- plugins/system-update/update.h 2015-08-27 09:40:29 +0000 | |||
| 1473 | +++ plugins/system-update/update.h 2015-12-09 19:33:29 +0000 | |||
| 1474 | @@ -57,6 +57,7 @@ | |||
| 1475 | 57 | Q_PROPERTY(QString downloadUrl READ downloadUrl NOTIFY downloadUrlChanged) | 57 | Q_PROPERTY(QString downloadUrl READ downloadUrl NOTIFY downloadUrlChanged) |
| 1476 | 58 | Q_PROPERTY(QString clickToken READ clickToken NOTIFY clickTokenChanged) | 58 | Q_PROPERTY(QString clickToken READ clickToken NOTIFY clickTokenChanged) |
| 1477 | 59 | Q_PROPERTY(QString downloadSha512 READ downloadSha512 NOTIFY downloadSha512Changed) | 59 | Q_PROPERTY(QString downloadSha512 READ downloadSha512 NOTIFY downloadSha512Changed) |
| 1478 | 60 | Q_PROPERTY(QString changelog READ changelog WRITE setChangelog NOTIFY changelogChanged) | ||
| 1479 | 60 | 61 | ||
| 1480 | 61 | Q_SIGNALS: | 62 | Q_SIGNALS: |
| 1481 | 62 | void systemUpdateChanged(); | 63 | void systemUpdateChanged(); |
| 1482 | @@ -76,6 +77,7 @@ | |||
| 1483 | 76 | void clickTokenChanged(); | 77 | void clickTokenChanged(); |
| 1484 | 77 | void packageNameChanged(); | 78 | void packageNameChanged(); |
| 1485 | 78 | void downloadSha512Changed(); | 79 | void downloadSha512Changed(); |
| 1486 | 80 | void changelogChanged(); | ||
| 1487 | 79 | 81 | ||
| 1488 | 80 | public: | 82 | public: |
| 1489 | 81 | explicit Update(QObject *parent = 0); | 83 | explicit Update(QObject *parent = 0); |
| 1490 | @@ -99,6 +101,7 @@ | |||
| 1491 | 99 | QString downloadUrl() { return m_downloadUrl; } | 101 | QString downloadUrl() { return m_downloadUrl; } |
| 1492 | 100 | QString clickToken() { return m_clickToken; } | 102 | QString clickToken() { return m_clickToken; } |
| 1493 | 101 | QString downloadSha512() { return m_download_sha512; } | 103 | QString downloadSha512() { return m_download_sha512; } |
| 1494 | 104 | QString changelog() { return m_changelog; } | ||
| 1495 | 102 | 105 | ||
| 1496 | 103 | void setSystemUpdate(bool isSystem); | 106 | void setSystemUpdate(bool isSystem); |
| 1497 | 104 | void initializeApplication(QString packagename, QString title, | 107 | void initializeApplication(QString packagename, QString title, |
| 1498 | @@ -118,6 +121,7 @@ | |||
| 1499 | 118 | void setDownloadUrl(const QString &url); | 121 | void setDownloadUrl(const QString &url); |
| 1500 | 119 | void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); } | 122 | void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); } |
| 1501 | 120 | void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; Q_EMIT downloadSha512Changed(); } | 123 | void setDownloadSha512(const QString &sha512) { m_download_sha512 = sha512; Q_EMIT downloadSha512Changed(); } |
| 1502 | 124 | void setChangelog(const QString &changelog) { m_changelog = changelog; Q_EMIT changelogChanged(); } | ||
| 1503 | 121 | 125 | ||
| 1504 | 122 | private: | 126 | private: |
| 1505 | 123 | int m_binary_filesize; | 127 | int m_binary_filesize; |
| 1506 | @@ -138,6 +142,7 @@ | |||
| 1507 | 138 | bool m_update_ready; | 142 | bool m_update_ready; |
| 1508 | 139 | bool m_update_state; | 143 | bool m_update_state; |
| 1509 | 140 | QString m_download_sha512; | 144 | QString m_download_sha512; |
| 1510 | 145 | QString m_changelog; | ||
| 1511 | 141 | 146 | ||
| 1512 | 142 | bool getIgnoreUpdates(); | 147 | bool getIgnoreUpdates(); |
| 1513 | 143 | }; | 148 | }; |
FAILED: Continuous integration, rev:1558
http://
Executed test runs:
ABORTED: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://