Merge lp:~jonas-drange/ubuntu-system-settings/slotslayouts into lp:ubuntu-system-settings
- slotslayouts
- Merge into trunk
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Merged at revision: | 1678 |
| Proposed branch: | lp:~jonas-drange/ubuntu-system-settings/slotslayouts |
| Merge into: | lp:ubuntu-system-settings |
| Prerequisite: | lp:~phablet-team/ubuntu-system-settings/settings-listitems |
| Diff against target: |
4348 lines (+1210/-1134) 60 files modified
plugins/about/EntryComponent.qml (+3/-5) plugins/about/PageComponent.qml (+50/-54) plugins/about/settings-about.svg (+136/-35) plugins/battery/PageComponent.qml (+63/-51) plugins/bluetooth/DevicePage.qml (+24/-46) plugins/bluetooth/PageComponent.qml (+55/-93) plugins/brightness/PageComponent.qml (+10/-10) plugins/cellular/Components/MultiSim.qml (+8/-12) plugins/cellular/Components/Sim.qml (+5/-1) plugins/cellular/Components/SingleSim.qml (+18/-23) plugins/cellular/PageCarrierAndApn.qml (+6/-6) plugins/cellular/PageCarriersAndApns.qml (+35/-52) plugins/cellular/PageChooseApn.qml (+18/-49) plugins/cellular/PageComponent.qml (+0/-1) plugins/flight-mode/EntryComponent.qml (+6/-6) plugins/flight-mode/flight-mode.settings (+1/-1) plugins/hotspot/HotspotSetup.qml (+18/-43) plugins/hotspot/PageComponent.qml (+6/-5) plugins/language/KeyboardLayoutItem.qml (+21/-30) plugins/language/PageComponent.qml (+42/-51) plugins/language/SpellChecking.qml (+3/-3) plugins/language/SubsetView.qml (+5/-4) plugins/language/settings-language.svg (+112/-75) plugins/orientation-lock/EntryComponent.qml (+7/-7) plugins/orientation-lock/orientation-lock.settings (+1/-1) plugins/phone/CallForwardItem.qml (+10/-8) plugins/phone/CallForwarding.qml (+1/-2) plugins/phone/CallWaiting.qml (+30/-43) plugins/phone/MultiSim.qml (+5/-12) plugins/phone/NoSims.qml (+5/-11) plugins/phone/PageComponent.qml (+4/-6) plugins/phone/ServiceInfo.qml (+6/-5) plugins/phone/Services.qml (+3/-4) plugins/phone/SingleSim.qml (+5/-12) plugins/reset/EntryComponent.qml (+2/-4) plugins/reset/PageComponent.qml (+54/-19) plugins/sound/PageComponent.qml (+36/-34) plugins/time-date/ChooseTimeZone.qml (+3/-2) plugins/time-date/PageComponent.qml (+8/-8) plugins/time-date/Scroller.qml (+6/-7) plugins/time-date/TimePicker.qml (+0/-1) plugins/time-date/settings-time-date.svg (+139/-55) plugins/wifi/AccessPoint.qml (+11/-22) plugins/wifi/DivMenuItem.qml (+3/-3) plugins/wifi/FramedMenuItem.qml (+7/-3) plugins/wifi/MenuItemFactory.qml (+5/-5) plugins/wifi/NetworkDetails.qml (+25/-28) plugins/wifi/NetworkDetailsBrief.qml (+17/-16) plugins/wifi/PageComponent.qml (+8/-12) plugins/wifi/PreviousNetworks.qml (+2/-3) plugins/wifi/SectionMenuItem.qml (+14/-29) plugins/wifi/StandardMenuItem.qml (+5/-27) plugins/wifi/SwitchMenuItem.qml (+1/-1) src/CMakeLists.txt (+1/-1) src/SystemSettings/qmldir (+1/-0) src/qml/CategorySection.qml (+13/-24) src/qml/EntryComponent.qml (+5/-49) src/qml/MainWindow.qml (+19/-6) src/ui.qrc (+1/-1) tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py (+102/-7) |
| To merge this branch: | bzr merge lp:~jonas-drange/ubuntu-system-settings/slotslayouts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| 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
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:1576
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:1579
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:1580
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)
- 1581. By Jonas G. Drange
-
merge latest from listitems
- 1582. By Jonas G. Drange
-
change to find instead of search icon, and swap FM with orientation lock
- 1583. By Jonas G. Drange
-
change icons that we have
- 1584. By Jonas G. Drange
-
start working on battery panel
- 1585. By Jonas G. Drange
-
undoing drawaxes change
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1585
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
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/about/EntryComponent.qml' | |||
| 2 | --- plugins/about/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 3 | +++ plugins/about/EntryComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 4 | @@ -1,7 +1,7 @@ | |||
| 5 | 1 | /* | 1 | /* |
| 6 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 7 | 3 | * | 3 | * |
| 9 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 10 | 5 | * | 5 | * |
| 11 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 12 | 7 | * | 7 | * |
| 13 | @@ -19,15 +19,13 @@ | |||
| 14 | 19 | */ | 19 | */ |
| 15 | 20 | 20 | ||
| 16 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 17 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 18 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 19 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 20 | 24 | 24 | ||
| 22 | 25 | ListItem.Standard { | 25 | SettingsListItems.IconProgression { |
| 23 | 26 | id: root | 26 | id: root |
| 24 | 27 | 27 | ||
| 25 | 28 | objectName: "entryComponent-about" | 28 | objectName: "entryComponent-about" |
| 26 | 29 | iconSource: Qt.resolvedUrl(model.icon) | 29 | iconSource: Qt.resolvedUrl(model.icon) |
| 27 | 30 | iconFrame: false | ||
| 28 | 31 | text: i18n.tr(model.displayName) | 30 | text: i18n.tr(model.displayName) |
| 29 | 32 | progression: true | ||
| 30 | 33 | } | 31 | } |
| 31 | 34 | 32 | ||
| 32 | === modified file 'plugins/about/PageComponent.qml' | |||
| 33 | --- plugins/about/PageComponent.qml 2015-10-29 15:48:06 +0000 | |||
| 34 | +++ plugins/about/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 35 | @@ -21,8 +21,9 @@ | |||
| 36 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 37 | 22 | import QtSystemInfo 5.0 | 22 | import QtSystemInfo 5.0 |
| 38 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 39 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 40 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 42 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 26 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 43 | 26 | import Ubuntu.SystemSettings.StorageAbout 1.0 | 27 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
| 44 | 27 | import Ubuntu.SystemSettings.Update 1.0 | 28 | import Ubuntu.SystemSettings.Update 1.0 |
| 45 | 28 | import MeeGo.QOfono 0.2 | 29 | import MeeGo.QOfono 0.2 |
| 46 | @@ -69,31 +70,30 @@ | |||
| 47 | 69 | anchors.left: parent.left | 70 | anchors.left: parent.left |
| 48 | 70 | anchors.right: parent.right | 71 | anchors.right: parent.right |
| 49 | 71 | 72 | ||
| 72 | 72 | ListItem.Empty { | 73 | Column { |
| 73 | 73 | height: ubuntuLabel.height + deviceLabel.height + units.gu(6) | 74 | anchors.left: parent.left |
| 74 | 74 | 75 | anchors.right: parent.right | |
| 75 | 75 | Column { | 76 | Label { |
| 76 | 76 | anchors.left: parent.left | 77 | id: ubuntuLabel |
| 77 | 77 | anchors.right: parent.right | 78 | anchors { |
| 78 | 78 | anchors.centerIn: parent | 79 | left: parent.left |
| 79 | 79 | spacing: units.gu(2) | 80 | right: parent.right |
| 80 | 80 | Label { | 81 | } |
| 81 | 81 | id: ubuntuLabel | 82 | height: contentHeight + units.gu(2) |
| 82 | 82 | anchors.horizontalCenter: parent.horizontalCenter | 83 | horizontalAlignment: Text.AlignHCenter |
| 83 | 83 | text: "" | 84 | verticalAlignment: Text.AlignVCenter |
| 84 | 84 | fontSize: "x-large" | 85 | text: "" |
| 85 | 85 | } | 86 | fontSize: "x-large" |
| 86 | 86 | Label { | 87 | } |
| 87 | 87 | id: deviceLabel | 88 | Label { |
| 88 | 88 | objectName: "deviceLabel" | 89 | id: deviceLabel |
| 89 | 89 | anchors.horizontalCenter: parent.horizontalCenter | 90 | objectName: "deviceLabel" |
| 90 | 90 | text: deviceInfos.manufacturer() ? deviceInfos.manufacturer() + " " + deviceInfos.model() : backendInfos.vendorString | 91 | anchors.horizontalCenter: parent.horizontalCenter |
| 91 | 91 | } | 92 | text: deviceInfos.manufacturer() ? deviceInfos.manufacturer() + " " + deviceInfos.model() : backendInfos.vendorString |
| 92 | 92 | } | 93 | } |
| 71 | 93 | highlightWhenPressed: false | ||
| 93 | 94 | } | 94 | } |
| 94 | 95 | 95 | ||
| 96 | 96 | ListItem.SingleValue { | 96 | SettingsListItems.SingleValue { |
| 97 | 97 | id: serialItem | 97 | id: serialItem |
| 98 | 98 | objectName: "serialItem" | 98 | objectName: "serialItem" |
| 99 | 99 | text: i18n.tr("Serial") | 99 | text: i18n.tr("Serial") |
| 100 | @@ -101,7 +101,7 @@ | |||
| 101 | 101 | visible: backendInfos.serialNumber | 101 | visible: backendInfos.serialNumber |
| 102 | 102 | } | 102 | } |
| 103 | 103 | 103 | ||
| 105 | 104 | ListItem.SingleValue { | 104 | SettingsListItems.SingleValue { |
| 106 | 105 | objectName: "imeiItem" | 105 | objectName: "imeiItem" |
| 107 | 106 | property string imeiNumber | 106 | property string imeiNumber |
| 108 | 107 | imeiNumber: deviceInfos.imei(0) | 107 | imeiNumber: deviceInfos.imei(0) |
| 109 | @@ -111,21 +111,21 @@ | |||
| 110 | 111 | visible: modemsSorted.length <= 1 | 111 | visible: modemsSorted.length <= 1 |
| 111 | 112 | } | 112 | } |
| 112 | 113 | 113 | ||
| 126 | 114 | ListItem.MultiValue { | 114 | // ListItem.MultiValue { |
| 127 | 115 | text: "IMEI" | 115 | // text: "IMEI" |
| 128 | 116 | objectName: "imeiItems" | 116 | // objectName: "imeiItems" |
| 129 | 117 | values: { | 117 | // values: { |
| 130 | 118 | var imeis = []; | 118 | // var imeis = []; |
| 131 | 119 | modemsSorted.forEach(function (path, i) { | 119 | // modemsSorted.forEach(function (path, i) { |
| 132 | 120 | var imei = deviceInfos.imei(i); | 120 | // var imei = deviceInfos.imei(i); |
| 133 | 121 | imei ? imeis.push(imei) : imeis.push(i18n.tr("None")); | 121 | // imei ? imeis.push(imei) : imeis.push(i18n.tr("None")); |
| 134 | 122 | }); | 122 | // }); |
| 135 | 123 | return imeis; | 123 | // return imeis; |
| 136 | 124 | } | 124 | // } |
| 137 | 125 | visible: modemsSorted.length > 1 | 125 | // visible: modemsSorted.length > 1 |
| 138 | 126 | } | 126 | // } |
| 139 | 127 | 127 | ||
| 141 | 128 | ListItem.SingleValue { | 128 | SettingsListItems.SingleValue { |
| 142 | 129 | property string address: wlinfo.macAddress(NetworkInfo.WlanMode, 0) | 129 | property string address: wlinfo.macAddress(NetworkInfo.WlanMode, 0) |
| 143 | 130 | text: i18n.tr("Wi-Fi address") | 130 | text: i18n.tr("Wi-Fi address") |
| 144 | 131 | value: address ? address.toUpperCase() : "" | 131 | value: address ? address.toUpperCase() : "" |
| 145 | @@ -133,7 +133,7 @@ | |||
| 146 | 133 | showDivider: bthwaddr.visible | 133 | showDivider: bthwaddr.visible |
| 147 | 134 | } | 134 | } |
| 148 | 135 | 135 | ||
| 150 | 136 | ListItem.SingleValue { | 136 | SettingsListItems.SingleValue { |
| 151 | 137 | id: bthwaddr | 137 | id: bthwaddr |
| 152 | 138 | text: i18n.tr("Bluetooth address") | 138 | text: i18n.tr("Bluetooth address") |
| 153 | 139 | value: network.bluetoothMacAddress | 139 | value: network.bluetoothMacAddress |
| 154 | @@ -141,15 +141,14 @@ | |||
| 155 | 141 | showDivider: false | 141 | showDivider: false |
| 156 | 142 | } | 142 | } |
| 157 | 143 | 143 | ||
| 159 | 144 | ListItem.Divider {} | 144 | ListItems.Divider {} |
| 160 | 145 | 145 | ||
| 162 | 146 | ListItem.SingleValue { | 146 | SettingsListItems.SingleValueProgression { |
| 163 | 147 | id: storageItem | 147 | id: storageItem |
| 164 | 148 | objectName: "storageItem" | 148 | objectName: "storageItem" |
| 165 | 149 | text: i18n.tr("Storage") | 149 | text: i18n.tr("Storage") |
| 166 | 150 | /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */ | 150 | /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */ |
| 167 | 151 | value: i18n.tr("%1 free").arg(Utilities.formatSize(backendInfos.getFreeSpace("/home"))) | 151 | value: i18n.tr("%1 free").arg(Utilities.formatSize(backendInfos.getFreeSpace("/home"))) |
| 168 | 152 | progression: true | ||
| 169 | 153 | onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml")) | 152 | onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml")) |
| 170 | 154 | } | 153 | } |
| 171 | 155 | 154 | ||
| 172 | @@ -158,7 +157,7 @@ | |||
| 173 | 158 | text: i18n.tr("Software:") | 157 | text: i18n.tr("Software:") |
| 174 | 159 | } | 158 | } |
| 175 | 160 | 159 | ||
| 177 | 161 | ListItem.SingleValue { | 160 | SettingsListItems.SingleValueProgression { |
| 178 | 162 | property string versionIdentifier: { | 161 | property string versionIdentifier: { |
| 179 | 163 | var num = UpdateManager.currentBuildNumber; | 162 | var num = UpdateManager.currentBuildNumber; |
| 180 | 164 | var ota = UpdateManager.detailedVersionDetails['tag']; | 163 | var ota = UpdateManager.detailedVersionDetails['tag']; |
| 181 | @@ -170,21 +169,21 @@ | |||
| 182 | 170 | value: "Ubuntu %1%2" | 169 | value: "Ubuntu %1%2" |
| 183 | 171 | .arg(deviceInfos.version(DeviceInfo.Os)) | 170 | .arg(deviceInfos.version(DeviceInfo.Os)) |
| 184 | 172 | .arg(versionIdentifier ? " (%1)".arg(versionIdentifier) : "") | 171 | .arg(versionIdentifier ? " (%1)".arg(versionIdentifier) : "") |
| 185 | 173 | progression: true | ||
| 186 | 174 | onClicked: pageStack.push(Qt.resolvedUrl("Version.qml"), { | 172 | onClicked: pageStack.push(Qt.resolvedUrl("Version.qml"), { |
| 187 | 175 | version: versionIdentifier | 173 | version: versionIdentifier |
| 188 | 176 | }) | 174 | }) |
| 189 | 177 | } | 175 | } |
| 190 | 178 | 176 | ||
| 192 | 179 | ListItem.SingleValue { | 177 | SettingsListItems.SingleValueProgression { |
| 193 | 180 | objectName: "lastUpdatedItem" | 178 | objectName: "lastUpdatedItem" |
| 194 | 181 | text: i18n.tr("Last updated") | 179 | text: i18n.tr("Last updated") |
| 195 | 182 | value: UpdateManager.lastUpdateDate && !isNaN(UpdateManager.lastUpdateDate) ? | 180 | value: UpdateManager.lastUpdateDate && !isNaN(UpdateManager.lastUpdateDate) ? |
| 196 | 183 | Qt.formatDate(UpdateManager.lastUpdateDate) : i18n.tr("Never") | 181 | Qt.formatDate(UpdateManager.lastUpdateDate) : i18n.tr("Never") |
| 197 | 184 | } | 182 | } |
| 198 | 185 | 183 | ||
| 201 | 186 | ListItem.SingleControl { | 184 | SettingsListItems.SingleControl { |
| 202 | 187 | control: Button { | 185 | |
| 203 | 186 | Button { | ||
| 204 | 188 | objectName: "updateButton" | 187 | objectName: "updateButton" |
| 205 | 189 | text: i18n.tr("Check for updates") | 188 | text: i18n.tr("Check for updates") |
| 206 | 190 | width: parent.width - units.gu(4) | 189 | width: parent.width - units.gu(4) |
| 207 | @@ -209,26 +208,23 @@ | |||
| 208 | 209 | text: i18n.tr("Legal:") | 208 | text: i18n.tr("Legal:") |
| 209 | 210 | } | 209 | } |
| 210 | 211 | 210 | ||
| 212 | 212 | ListItem.Standard { | 211 | SettingsListItems.StandardProgression { |
| 213 | 213 | objectName: "licenseItem" | 212 | objectName: "licenseItem" |
| 214 | 214 | text: i18n.tr("Software licenses") | 213 | text: i18n.tr("Software licenses") |
| 215 | 215 | progression: true | ||
| 216 | 216 | onClicked: pageStack.push(Qt.resolvedUrl("Software.qml")) | 214 | onClicked: pageStack.push(Qt.resolvedUrl("Software.qml")) |
| 217 | 217 | } | 215 | } |
| 218 | 218 | 216 | ||
| 220 | 219 | ListItem.Standard { | 217 | SettingsListItems.StandardProgression { |
| 221 | 220 | property var regulatoryInfo: | 218 | property var regulatoryInfo: |
| 222 | 221 | pluginManager.getByName("regulatory-information") | 219 | pluginManager.getByName("regulatory-information") |
| 223 | 222 | text: i18n.tr("Regulatory info") | 220 | text: i18n.tr("Regulatory info") |
| 224 | 223 | progression: true | ||
| 225 | 224 | visible: regulatoryInfo | 221 | visible: regulatoryInfo |
| 226 | 225 | onClicked: pageStack.push(regulatoryInfo.pageComponent) | 222 | onClicked: pageStack.push(regulatoryInfo.pageComponent) |
| 227 | 226 | } | 223 | } |
| 228 | 227 | 224 | ||
| 230 | 228 | ListItem.SingleValue { | 225 | SettingsListItems.SingleValueProgression { |
| 231 | 229 | objectName: "devmodeItem" | 226 | objectName: "devmodeItem" |
| 232 | 230 | text: i18n.tr("Developer mode") | 227 | text: i18n.tr("Developer mode") |
| 233 | 231 | progression: true | ||
| 234 | 232 | onClicked: pageStack.push(Qt.resolvedUrl("DevMode.qml")) | 228 | onClicked: pageStack.push(Qt.resolvedUrl("DevMode.qml")) |
| 235 | 233 | } | 229 | } |
| 236 | 234 | } | 230 | } |
| 237 | 235 | 231 | ||
| 238 | === modified file 'plugins/about/settings-about.svg' | |||
| 239 | --- plugins/about/settings-about.svg 2013-06-18 19:17:18 +0000 | |||
| 240 | +++ plugins/about/settings-about.svg 2015-11-27 13:34:19 +0000 | |||
| 241 | @@ -9,14 +9,15 @@ | |||
| 242 | 9 | xmlns="http://www.w3.org/2000/svg" | 9 | xmlns="http://www.w3.org/2000/svg" |
| 243 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 244 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 248 | 12 | width="90" | 12 | width="96" |
| 249 | 13 | height="90" | 13 | height="96" |
| 250 | 14 | id="svg3180" | 14 | id="svg4874" |
| 251 | 15 | version="1.1" | 15 | version="1.1" |
| 254 | 16 | inkscape:version="0.48+devel r12322" | 16 | inkscape:version="0.91+devel r" |
| 255 | 17 | sodipodi:docname="setting-about.svg"> | 17 | viewBox="0 0 96 96.000001" |
| 256 | 18 | sodipodi:docname="info.svg"> | ||
| 257 | 18 | <defs | 19 | <defs |
| 259 | 19 | id="defs3182" /> | 20 | id="defs4876" /> |
| 260 | 20 | <sodipodi:namedview | 21 | <sodipodi:namedview |
| 261 | 21 | id="base" | 22 | id="base" |
| 262 | 22 | pagecolor="#ffffff" | 23 | pagecolor="#ffffff" |
| 263 | @@ -24,18 +25,94 @@ | |||
| 264 | 24 | borderopacity="1.0" | 25 | borderopacity="1.0" |
| 265 | 25 | inkscape:pageopacity="0.0" | 26 | inkscape:pageopacity="0.0" |
| 266 | 26 | inkscape:pageshadow="2" | 27 | inkscape:pageshadow="2" |
| 270 | 27 | inkscape:zoom="7.9580786" | 28 | inkscape:zoom="8.7812488" |
| 271 | 28 | inkscape:cx="25.634328" | 29 | inkscape:cx="5.3352279" |
| 272 | 29 | inkscape:cy="36.849347" | 30 | inkscape:cy="44.122411" |
| 273 | 30 | inkscape:document-units="px" | 31 | inkscape:document-units="px" |
| 276 | 31 | inkscape:current-layer="layer1" | 32 | inkscape:current-layer="g4780" |
| 277 | 32 | showgrid="false" | 33 | showgrid="true" |
| 278 | 34 | showborder="true" | ||
| 279 | 33 | fit-margin-top="0" | 35 | fit-margin-top="0" |
| 280 | 34 | fit-margin-left="0" | 36 | fit-margin-left="0" |
| 281 | 35 | fit-margin-right="0" | 37 | fit-margin-right="0" |
| 283 | 36 | fit-margin-bottom="0" /> | 38 | fit-margin-bottom="0" |
| 284 | 39 | inkscape:snap-bbox="true" | ||
| 285 | 40 | inkscape:bbox-paths="true" | ||
| 286 | 41 | inkscape:bbox-nodes="true" | ||
| 287 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
| 288 | 43 | inkscape:snap-bbox-midpoints="true" | ||
| 289 | 44 | inkscape:object-paths="true" | ||
| 290 | 45 | inkscape:snap-intersection-paths="true" | ||
| 291 | 46 | inkscape:object-nodes="true" | ||
| 292 | 47 | inkscape:snap-smooth-nodes="true" | ||
| 293 | 48 | inkscape:snap-midpoints="true" | ||
| 294 | 49 | inkscape:snap-object-midpoints="true" | ||
| 295 | 50 | inkscape:snap-center="true" | ||
| 296 | 51 | showguides="true" | ||
| 297 | 52 | inkscape:guide-bbox="true"> | ||
| 298 | 53 | <inkscape:grid | ||
| 299 | 54 | type="xygrid" | ||
| 300 | 55 | id="grid5451" | ||
| 301 | 56 | empspacing="8" /> | ||
| 302 | 57 | <sodipodi:guide | ||
| 303 | 58 | orientation="1,0" | ||
| 304 | 59 | position="8,-8.0000001" | ||
| 305 | 60 | id="guide4063" /> | ||
| 306 | 61 | <sodipodi:guide | ||
| 307 | 62 | orientation="1,0" | ||
| 308 | 63 | position="4,-8.0000001" | ||
| 309 | 64 | id="guide4065" /> | ||
| 310 | 65 | <sodipodi:guide | ||
| 311 | 66 | orientation="0,1" | ||
| 312 | 67 | position="-8,88.000001" | ||
| 313 | 68 | id="guide4067" /> | ||
| 314 | 69 | <sodipodi:guide | ||
| 315 | 70 | orientation="0,1" | ||
| 316 | 71 | position="-8,92.000001" | ||
| 317 | 72 | id="guide4069" /> | ||
| 318 | 73 | <sodipodi:guide | ||
| 319 | 74 | orientation="0,1" | ||
| 320 | 75 | position="104,4" | ||
| 321 | 76 | id="guide4071" /> | ||
| 322 | 77 | <sodipodi:guide | ||
| 323 | 78 | orientation="0,1" | ||
| 324 | 79 | position="-5,8.0000001" | ||
| 325 | 80 | id="guide4073" /> | ||
| 326 | 81 | <sodipodi:guide | ||
| 327 | 82 | orientation="1,0" | ||
| 328 | 83 | position="92,-8.0000001" | ||
| 329 | 84 | id="guide4075" /> | ||
| 330 | 85 | <sodipodi:guide | ||
| 331 | 86 | orientation="1,0" | ||
| 332 | 87 | position="88,-8.0000001" | ||
| 333 | 88 | id="guide4077" /> | ||
| 334 | 89 | <sodipodi:guide | ||
| 335 | 90 | orientation="0,1" | ||
| 336 | 91 | position="-8,84.000001" | ||
| 337 | 92 | id="guide4074" /> | ||
| 338 | 93 | <sodipodi:guide | ||
| 339 | 94 | orientation="1,0" | ||
| 340 | 95 | position="12,-8.0000001" | ||
| 341 | 96 | id="guide4076" /> | ||
| 342 | 97 | <sodipodi:guide | ||
| 343 | 98 | orientation="0,1" | ||
| 344 | 99 | position="-5,12" | ||
| 345 | 100 | id="guide4078" /> | ||
| 346 | 101 | <sodipodi:guide | ||
| 347 | 102 | orientation="1,0" | ||
| 348 | 103 | position="84,-9.0000001" | ||
| 349 | 104 | id="guide4080" /> | ||
| 350 | 105 | <sodipodi:guide | ||
| 351 | 106 | position="48,-8.0000001" | ||
| 352 | 107 | orientation="1,0" | ||
| 353 | 108 | id="guide4170" /> | ||
| 354 | 109 | <sodipodi:guide | ||
| 355 | 110 | position="-8,48" | ||
| 356 | 111 | orientation="0,1" | ||
| 357 | 112 | id="guide4172" /> | ||
| 358 | 113 | </sodipodi:namedview> | ||
| 359 | 37 | <metadata | 114 | <metadata |
| 361 | 38 | id="metadata3185"> | 115 | id="metadata4879"> |
| 362 | 39 | <rdf:RDF> | 116 | <rdf:RDF> |
| 363 | 40 | <cc:Work | 117 | <cc:Work |
| 364 | 41 | rdf:about=""> | 118 | rdf:about=""> |
| 365 | @@ -50,29 +127,53 @@ | |||
| 366 | 50 | inkscape:label="Layer 1" | 127 | inkscape:label="Layer 1" |
| 367 | 51 | inkscape:groupmode="layer" | 128 | inkscape:groupmode="layer" |
| 368 | 52 | id="layer1" | 129 | id="layer1" |
| 370 | 53 | transform="translate(456.42857,-738.79075)"> | 130 | transform="translate(67.857146,-78.50504)"> |
| 371 | 54 | <g | 131 | <g |
| 393 | 55 | transform="translate(-2219.4286,118.57139)" | 132 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
| 394 | 56 | id="g3270"> | 133 | id="g4845" |
| 395 | 57 | <rect | 134 | style="display:inline"> |
| 396 | 58 | style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 135 | <g |
| 397 | 59 | id="rect3272" | 136 | inkscape:export-ydpi="90" |
| 398 | 60 | width="90" | 137 | inkscape:export-xdpi="90" |
| 399 | 61 | height="90" | 138 | inkscape:export-filename="next01.png" |
| 400 | 62 | x="1763" | 139 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" |
| 401 | 63 | y="620.21936" /> | 140 | id="g4778" |
| 402 | 64 | <rect | 141 | inkscape:label="Layer 1"> |
| 403 | 65 | style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 142 | <g |
| 404 | 66 | id="rect3274" | 143 | transform="matrix(-1,0,0,1,575.99999,611)" |
| 405 | 67 | width="90" | 144 | id="g4780" |
| 406 | 68 | height="90" | 145 | style="display:inline"> |
| 407 | 69 | x="1763" | 146 | <rect |
| 408 | 70 | y="620.21936" /> | 147 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" |
| 409 | 71 | <path | 148 | id="rect4782" |
| 410 | 72 | inkscape:connector-curvature="0" | 149 | width="96.037987" |
| 411 | 73 | style="fill:#808080;fill-opacity:1" | 150 | height="96" |
| 412 | 74 | d="m 1808,635.21936 c -16.5688,0 -30,13.4314 -30,30 0,16.5675 13.4311,30 30,30 16.5686,0 30,-13.4325 30,-30 C 1838,648.65076 1824.5688,635.21936 1808,635.21936 z m 9.9375,8.3438 c 0.7694,-0.055 1.5628,0.1167 2.2813,0.5312 1.9159,1.1067 2.5752,3.553 1.4687,5.4688 -1.1053,1.9157 -3.553,2.575 -5.4687,1.4687 -1.9146,-1.1053 -2.5739,-3.554 -1.4688,-5.4687 C 1815.4418,644.36576 1816.6552,643.65406 1817.9375,643.56316 z m -9.9375,4.25 c 1.6106,0 3.176,0.2477 4.6562,0.6562 0.2611,1.6096 1.2269,3.0898 2.75,3.9688 1.5205,0.8764 3.2896,0.9503 4.8126,0.375 2.9615,2.9125 4.8754,6.8692 5.1562,11.2812 l -5.7188,0.094 c -0.5263,-5.9763 -5.5443,-10.6563 -11.6562,-10.6563 -1.7607,0 -3.4091,0.397 -4.9062,1.0937 l -2.7813,-5 C 1802.6368,648.47516 1805.2312,647.81316 1808,647.81316 z m -9.625,2.9374 2.9062,4.9063 c -3.0083,2.1176 -4.9687,5.6043 -4.9687,9.5625 0,3.9583 1.9604,7.4462 4.9687,9.5625 l -2.9062,4.9063 c -3.5057,-2.3425 -6.1366,-5.9003 -7.2188,-10.0938 1.2644,-1.0317 2.0938,-2.6155 2.0938,-4.375 0,-1.7605 -0.8294,-3.312 -2.0938,-4.3438 C 1792.2398,656.68336 1794.8707,653.09306 1798.375,650.75056 z m -10.75,10.4688 c 2.2119,0 4,1.787 4,4 0,2.2119 -1.7881,4 -4,4 -2.2132,0 -4,-1.7881 -4,-4 C 1783.625,663.00636 1785.4118,661.21936 1787.625,661.21936 z m 32.0312,5.0312 5.7188,0.094 c -0.2808,4.412 -2.1947,8.3687 -5.1562,11.2812 -1.523,-0.5753 -3.291,-0.4716 -4.8126,0.4063 -1.5227,0.8805 -2.4889,2.3592 -2.75,3.9687 -1.48,0.4098 -3.0456,0.625 -4.6562,0.625 -2.769,0 -5.3632,-0.6606 -7.6875,-1.8124 l 2.7813,-4.9688 c 1.497,0.6966 3.1455,1.0938 4.9062,1.0938 C 1814.1121,676.93806 1819.1311,672.22846 1819.6562,666.25056 z m -1.9374,12.6563 c 1.5484,-0.1918 3.1398,0.5329 3.9687,1.9687 1.1065,1.916 0.4468,4.3635 -1.4687,5.4688 -1.9158,1.1065 -4.3635,0.447 -5.4688,-1.4688 -1.1067,-1.9147 -0.447,-4.3622 1.4688,-5.4687 C 1816.6973,679.13056 1817.2026,678.97076 1817.7188,678.90686 Z" | 151 | x="-438.00244" |
| 413 | 75 | id="path3" /> | 152 | y="345.36221" |
| 414 | 153 | transform="scale(-1,1)" /> | ||
| 415 | 154 | <path | ||
| 416 | 155 | style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079107;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" | ||
| 417 | 156 | d="m 432,393.36133 c 0,23.17268 -18.83506,42 -42.01562,42 -23.18057,0 -42.01758,-18.82732 -42.01758,-42 0,-23.17268 18.83701,-42 42.01758,-42 23.18056,0 42.01562,18.82732 42.01562,42 z m -4.00195,0 c 0,-21.00964 -16.99444,-37.99805 -38.01367,-37.99805 -21.01924,0 -38.01563,16.98841 -38.01563,37.99805 0,21.00963 16.99639,38 38.01563,38 21.01923,0 38.01367,-16.99037 38.01367,-38 z" | ||
| 418 | 157 | id="path4116" | ||
| 419 | 158 | inkscape:connector-curvature="0" /> | ||
| 420 | 159 | <rect | ||
| 421 | 160 | style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.00118685;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" | ||
| 422 | 161 | id="rect4173" | ||
| 423 | 162 | width="5.9999971" | ||
| 424 | 163 | height="32.012661" | ||
| 425 | 164 | x="-396.36221" | ||
| 426 | 165 | y="-397.98663" | ||
| 427 | 166 | transform="matrix(0,-1,-1,0,0,0)" /> | ||
| 428 | 167 | <ellipse | ||
| 429 | 168 | style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" | ||
| 430 | 169 | id="path4175" | ||
| 431 | 170 | cx="-393.36221" | ||
| 432 | 171 | cy="-408.99097" | ||
| 433 | 172 | transform="matrix(0,-1,-1,0,0,0)" | ||
| 434 | 173 | rx="5.0000143" | ||
| 435 | 174 | ry="5.0019927" /> | ||
| 436 | 175 | </g> | ||
| 437 | 176 | </g> | ||
| 438 | 76 | </g> | 177 | </g> |
| 439 | 77 | </g> | 178 | </g> |
| 440 | 78 | </svg> | 179 | </svg> |
| 441 | 79 | 180 | ||
| 442 | === modified file 'plugins/battery/PageComponent.qml' | |||
| 443 | --- plugins/battery/PageComponent.qml 2015-08-13 13:13:57 +0000 | |||
| 444 | +++ plugins/battery/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 445 | @@ -1,7 +1,7 @@ | |||
| 446 | 1 | /* | 1 | /* |
| 447 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 448 | 3 | * | 3 | * |
| 450 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 451 | 5 | * | 5 | * |
| 452 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> |
| 453 | 7 | * | 7 | * |
| 454 | @@ -23,8 +23,8 @@ | |||
| 455 | 23 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 456 | 24 | import QtSystemInfo 5.0 | 24 | import QtSystemInfo 5.0 |
| 457 | 25 | import SystemSettings 1.0 | 25 | import SystemSettings 1.0 |
| 458 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 459 | 26 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 460 | 27 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 461 | 28 | import Ubuntu.SystemSettings.Battery 1.0 | 28 | import Ubuntu.SystemSettings.Battery 1.0 |
| 462 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 463 | 30 | import Ubuntu.Settings.Components 0.1 as USC | 30 | import Ubuntu.Settings.Components 0.1 as USC |
| 464 | @@ -99,7 +99,7 @@ | |||
| 465 | 99 | anchors.left: parent.left | 99 | anchors.left: parent.left |
| 466 | 100 | anchors.right: parent.right | 100 | anchors.right: parent.right |
| 467 | 101 | 101 | ||
| 469 | 102 | ListItem.SingleValue { | 102 | SettingsListItems.SingleValue { |
| 470 | 103 | id: chargingLevel | 103 | id: chargingLevel |
| 471 | 104 | text: i18n.tr("Charge level") | 104 | text: i18n.tr("Charge level") |
| 472 | 105 | value: { | 105 | value: { |
| 473 | @@ -262,7 +262,7 @@ | |||
| 474 | 262 | } | 262 | } |
| 475 | 263 | } | 263 | } |
| 476 | 264 | 264 | ||
| 478 | 265 | ListItem.SingleValue { | 265 | SettingsListItems.SingleValue { |
| 479 | 266 | id: chargingEntry | 266 | id: chargingEntry |
| 480 | 267 | text: { | 267 | text: { |
| 481 | 268 | if (indicatorPower.deviceState === "charging") | 268 | if (indicatorPower.deviceState === "charging") |
| 482 | @@ -271,6 +271,8 @@ | |||
| 483 | 271 | return i18n.tr("Last full charge") | 271 | return i18n.tr("Last full charge") |
| 484 | 272 | else if (indicatorPower.deviceState === "fully-charged") | 272 | else if (indicatorPower.deviceState === "fully-charged") |
| 485 | 273 | return i18n.tr("Fully charged") | 273 | return i18n.tr("Fully charged") |
| 486 | 274 | else | ||
| 487 | 275 | return "" | ||
| 488 | 274 | } | 276 | } |
| 489 | 275 | 277 | ||
| 490 | 276 | value: { | 278 | value: { |
| 491 | @@ -290,44 +292,6 @@ | |||
| 492 | 290 | text: i18n.tr("Ways to reduce battery use:") | 292 | text: i18n.tr("Ways to reduce battery use:") |
| 493 | 291 | } | 293 | } |
| 494 | 292 | 294 | ||
| 495 | 293 | ListItem.Standard { | ||
| 496 | 294 | text: i18n.tr("Display brightness") | ||
| 497 | 295 | progression: true | ||
| 498 | 296 | onClicked: pageStack.push( | ||
| 499 | 297 | pluginManager.getByName("brightness").pageComponent) | ||
| 500 | 298 | } | ||
| 501 | 299 | |||
| 502 | 300 | ListItem.SingleValue { | ||
| 503 | 301 | property bool lockOnSuspend: | ||
| 504 | 302 | securityPrivacy.securityType !== | ||
| 505 | 303 | UbuntuSecurityPrivacyPanel.Swipe | ||
| 506 | 304 | text: lockOnSuspend ? i18n.tr("Lock when idle") : i18n.tr("Sleep when idle") | ||
| 507 | 305 | value: { | ||
| 508 | 306 | if (batteryBackend.powerdRunning ) { | ||
| 509 | 307 | var timeout = Math.round(powerSettings.activityTimeout/60) | ||
| 510 | 308 | return (powerSettings.activityTimeout != 0) ? | ||
| 511 | 309 | // TRANSLATORS: %1 is the number of minutes | ||
| 512 | 310 | i18n.tr("After %1 minute", | ||
| 513 | 311 | "After %1 minutes", | ||
| 514 | 312 | timeout).arg(timeout) : | ||
| 515 | 313 | i18n.tr("Never") | ||
| 516 | 314 | } | ||
| 517 | 315 | else { | ||
| 518 | 316 | var timeout = Math.round(powerSettings.idleDelay/60) | ||
| 519 | 317 | return (powerSettings.idleDelay != 0) ? | ||
| 520 | 318 | // TRANSLATORS: %1 is the number of minutes | ||
| 521 | 319 | i18n.tr("After %1 minute", | ||
| 522 | 320 | "After %1 minutes", | ||
| 523 | 321 | timeout).arg(timeout) : | ||
| 524 | 322 | i18n.tr("Never") | ||
| 525 | 323 | } | ||
| 526 | 324 | } | ||
| 527 | 325 | progression: true | ||
| 528 | 326 | onClicked: pageStack.push( | ||
| 529 | 327 | Qt.resolvedUrl("SleepValues.qml"), | ||
| 530 | 328 | { title: text, lockOnSuspend: lockOnSuspend }) | ||
| 531 | 329 | } | ||
| 532 | 330 | |||
| 533 | 331 | QDBusActionGroup { | 295 | QDBusActionGroup { |
| 534 | 332 | id: networkActionGroup | 296 | id: networkActionGroup |
| 535 | 333 | busType: 1 | 297 | busType: 1 |
| 536 | @@ -337,10 +301,12 @@ | |||
| 537 | 337 | Component.onCompleted: start() | 301 | Component.onCompleted: start() |
| 538 | 338 | } | 302 | } |
| 539 | 339 | 303 | ||
| 541 | 340 | ListItem.Standard { | 304 | SettingsListItems.Icon { |
| 542 | 341 | // TRANSLATORS: “Wi-Fi used for hotspot” is hidden. | 305 | // TRANSLATORS: “Wi-Fi used for hotspot” is hidden. |
| 543 | 342 | text: showAllUI ? i18n.tr("Wi-Fi used for hotspot") : i18n.tr("Wi-Fi") | 306 | text: showAllUI ? i18n.tr("Wi-Fi used for hotspot") : i18n.tr("Wi-Fi") |
| 545 | 343 | control: Loader { | 307 | iconName: "wifi-high" |
| 546 | 308 | |||
| 547 | 309 | Loader { | ||
| 548 | 344 | active: networkActionGroup.enabled.state != null | 310 | active: networkActionGroup.enabled.state != null |
| 549 | 345 | sourceComponent: Switch { | 311 | sourceComponent: Switch { |
| 550 | 346 | id: wifiSwitch | 312 | id: wifiSwitch |
| 551 | @@ -371,10 +337,12 @@ | |||
| 552 | 371 | Component.onCompleted: start() | 337 | Component.onCompleted: start() |
| 553 | 372 | } | 338 | } |
| 554 | 373 | 339 | ||
| 556 | 374 | ListItem.Standard { | 340 | SettingsListItems.Icon { |
| 557 | 375 | id: btListItem | 341 | id: btListItem |
| 558 | 376 | text: i18n.tr("Bluetooth") | 342 | text: i18n.tr("Bluetooth") |
| 560 | 377 | control: Loader { | 343 | iconName: "bluetooth-active" |
| 561 | 344 | |||
| 562 | 345 | Loader { | ||
| 563 | 378 | active: bluetoothActionGroup.enabled.state != null | 346 | active: bluetoothActionGroup.enabled.state != null |
| 564 | 379 | sourceComponent: Switch { | 347 | sourceComponent: Switch { |
| 565 | 380 | id: btSwitch | 348 | id: btSwitch |
| 566 | @@ -404,10 +372,15 @@ | |||
| 567 | 404 | Component.onCompleted: start() | 372 | Component.onCompleted: start() |
| 568 | 405 | } | 373 | } |
| 569 | 406 | 374 | ||
| 571 | 407 | ListItem.Standard { | 375 | SettingsListItems.Icon { |
| 572 | 408 | id: gpsListItem | 376 | id: gpsListItem |
| 573 | 409 | text: i18n.tr("GPS") | 377 | text: i18n.tr("GPS") |
| 575 | 410 | control: Loader { | 378 | layout.summary.text: i18n.tr( |
| 576 | 379 | "Accurate location detection requires GPS and/or Wi-Fi." | ||
| 577 | 380 | ) | ||
| 578 | 381 | iconName: "gps" | ||
| 579 | 382 | |||
| 580 | 383 | Loader { | ||
| 581 | 411 | active: locationActionGroup.enabled.state != null | 384 | active: locationActionGroup.enabled.state != null |
| 582 | 412 | sourceComponent: Switch { | 385 | sourceComponent: Switch { |
| 583 | 413 | id: gpsSwitch | 386 | id: gpsSwitch |
| 584 | @@ -426,9 +399,48 @@ | |||
| 585 | 426 | visible: locationActionGroup.enabled.state !== undefined | 399 | visible: locationActionGroup.enabled.state !== undefined |
| 586 | 427 | } | 400 | } |
| 587 | 428 | 401 | ||
| 591 | 429 | ListItem.Caption { | 402 | SettingsListItems.SingleValueProgression { |
| 592 | 430 | text: i18n.tr("Accurate location detection requires GPS and/or Wi-Fi.") | 403 | property bool lockOnSuspend: |
| 593 | 431 | visible: gpsListItem.visible | 404 | securityPrivacy.securityType !== |
| 594 | 405 | UbuntuSecurityPrivacyPanel.Swipe | ||
| 595 | 406 | text: lockOnSuspend ? i18n.tr("Lock when idle") : i18n.tr("Sleep when idle") | ||
| 596 | 407 | value: { | ||
| 597 | 408 | if (batteryBackend.powerdRunning ) { | ||
| 598 | 409 | var timeout = Math.round(powerSettings.activityTimeout/60) | ||
| 599 | 410 | return (powerSettings.activityTimeout != 0) ? | ||
| 600 | 411 | // TRANSLATORS: %1 is the number of minutes | ||
| 601 | 412 | i18n.tr("After %1 minute", | ||
| 602 | 413 | "After %1 minutes", | ||
| 603 | 414 | timeout).arg(timeout) : | ||
| 604 | 415 | i18n.tr("Never") | ||
| 605 | 416 | } | ||
| 606 | 417 | else { | ||
| 607 | 418 | var timeout = Math.round(powerSettings.idleDelay/60) | ||
| 608 | 419 | return (powerSettings.idleDelay != 0) ? | ||
| 609 | 420 | // TRANSLATORS: %1 is the number of minutes | ||
| 610 | 421 | i18n.tr("After %1 minute", | ||
| 611 | 422 | "After %1 minutes", | ||
| 612 | 423 | timeout).arg(timeout) : | ||
| 613 | 424 | i18n.tr("Never") | ||
| 614 | 425 | } | ||
| 615 | 426 | } | ||
| 616 | 427 | |||
| 617 | 428 | Icon { | ||
| 618 | 429 | width: units.gu(2.5) | ||
| 619 | 430 | height: width | ||
| 620 | 431 | name: "network-secure" | ||
| 621 | 432 | SlotsLayout.position: SlotsLayout.First | ||
| 622 | 433 | } | ||
| 623 | 434 | |||
| 624 | 435 | onClicked: pageStack.push( | ||
| 625 | 436 | Qt.resolvedUrl("SleepValues.qml"), | ||
| 626 | 437 | { title: text, lockOnSuspend: lockOnSuspend }) | ||
| 627 | 438 | } | ||
| 628 | 439 | |||
| 629 | 440 | SettingsListItems.StandardProgression { | ||
| 630 | 441 | text: i18n.tr("Display brightness") | ||
| 631 | 442 | onClicked: pageStack.push( | ||
| 632 | 443 | pluginManager.getByName("brightness").pageComponent) | ||
| 633 | 432 | } | 444 | } |
| 634 | 433 | } | 445 | } |
| 635 | 434 | } | 446 | } |
| 636 | 435 | 447 | ||
| 637 | === modified file 'plugins/bluetooth/DevicePage.qml' | |||
| 638 | --- plugins/bluetooth/DevicePage.qml 2015-11-12 09:53:00 +0000 | |||
| 639 | +++ plugins/bluetooth/DevicePage.qml 2015-11-27 13:34:19 +0000 | |||
| 640 | @@ -21,9 +21,9 @@ | |||
| 641 | 21 | import QMenuModel 0.1 | 21 | import QMenuModel 0.1 |
| 642 | 22 | import QtQuick 2.0 | 22 | import QtQuick 2.0 |
| 643 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 644 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 645 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 646 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 647 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 648 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 |
| 649 | 28 | 28 | ||
| 650 | 29 | Page { | 29 | Page { |
| 651 | @@ -96,63 +96,37 @@ | |||
| 652 | 96 | right: parent.right | 96 | right: parent.right |
| 653 | 97 | } | 97 | } |
| 654 | 98 | 98 | ||
| 656 | 99 | ListItem.SingleValue { | 99 | SettingsListItems.SingleValue { |
| 657 | 100 | text: i18n.tr("Name") | 100 | text: i18n.tr("Name") |
| 658 | 101 | value: backend.selectedDevice && | 101 | value: backend.selectedDevice && |
| 659 | 102 | backend.selectedDevice.name.length > 0 ? | 102 | backend.selectedDevice.name.length > 0 ? |
| 660 | 103 | backend.selectedDevice.name : | 103 | backend.selectedDevice.name : |
| 661 | 104 | i18n.tr("None") | 104 | i18n.tr("None") |
| 662 | 105 | } | 105 | } |
| 699 | 106 | ListItem.Standard { | 106 | SettingsListItems.SingleValue { |
| 700 | 107 | Rectangle { | 107 | text: i18n.tr("Type") |
| 701 | 108 | color: "transparent" | 108 | value: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER) |
| 702 | 109 | anchors.fill: parent | 109 | Image { |
| 703 | 110 | anchors.topMargin: units.gu(1) | 110 | height: units.gu(4) |
| 704 | 111 | anchors.leftMargin: units.gu(2) | 111 | width: units.gu(4) |
| 705 | 112 | anchors.rightMargin: units.gu(2) | 112 | source: backend.selectedDevice ? backend.selectedDevice.iconName : "" |
| 706 | 113 | 113 | visible: source | |
| 707 | 114 | Label { | 114 | SlotsLayout.position: SlotsLayout.Trailing-1 |
| 672 | 115 | anchors { | ||
| 673 | 116 | top: parent.top | ||
| 674 | 117 | left: parent.left | ||
| 675 | 118 | topMargin: units.gu(1) | ||
| 676 | 119 | } | ||
| 677 | 120 | height: units.gu(3) | ||
| 678 | 121 | text: i18n.tr("Type") | ||
| 679 | 122 | } | ||
| 680 | 123 | Image { | ||
| 681 | 124 | anchors { | ||
| 682 | 125 | right: deviceType.left | ||
| 683 | 126 | rightMargin: units.gu(1) | ||
| 684 | 127 | } | ||
| 685 | 128 | height: units.gu(4) | ||
| 686 | 129 | width: units.gu(4) | ||
| 687 | 130 | source: backend.selectedDevice ? backend.selectedDevice.iconName : "" | ||
| 688 | 131 | } | ||
| 689 | 132 | Label { | ||
| 690 | 133 | id: deviceType | ||
| 691 | 134 | anchors { | ||
| 692 | 135 | top: parent.top | ||
| 693 | 136 | right: parent.right | ||
| 694 | 137 | topMargin: units.gu(1) | ||
| 695 | 138 | } | ||
| 696 | 139 | height: units.gu(3) | ||
| 697 | 140 | text: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER) | ||
| 698 | 141 | } | ||
| 708 | 142 | } | 115 | } |
| 709 | 143 | } | 116 | } |
| 711 | 144 | ListItem.SingleValue { | 117 | SettingsListItems.SingleValue { |
| 712 | 145 | text: i18n.tr("Status") | 118 | text: i18n.tr("Status") |
| 713 | 146 | value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected) | 119 | value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected) |
| 714 | 147 | } | 120 | } |
| 716 | 148 | ListItem.SingleValue { | 121 | SettingsListItems.SingleValue { |
| 717 | 149 | text: i18n.tr("Signal Strength") | 122 | text: i18n.tr("Signal Strength") |
| 718 | 150 | value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None) | 123 | value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None) |
| 719 | 151 | } | 124 | } |
| 721 | 152 | ListItem.Standard { | 125 | SettingsListItems.Standard { |
| 722 | 153 | id: trustedCheck | 126 | id: trustedCheck |
| 723 | 154 | text: i18n.tr("Connect automatically when detected:") | 127 | text: i18n.tr("Connect automatically when detected:") |
| 725 | 155 | control: CheckBox { | 128 | |
| 726 | 129 | CheckBox { | ||
| 727 | 156 | property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false | 130 | property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false |
| 728 | 157 | onServerCheckedChanged: checked = serverChecked | 131 | onServerCheckedChanged: checked = serverChecked |
| 729 | 158 | Component.onCompleted: checked = serverChecked | 132 | Component.onCompleted: checked = serverChecked |
| 730 | @@ -163,8 +137,10 @@ | |||
| 731 | 163 | } | 137 | } |
| 732 | 164 | } | 138 | } |
| 733 | 165 | } | 139 | } |
| 736 | 166 | ListItem.SingleControl { | 140 | |
| 737 | 167 | control: Button { | 141 | SettingsListItems.SingleControl { |
| 738 | 142 | |||
| 739 | 143 | Button { | ||
| 740 | 168 | text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect") | 144 | text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect") |
| 741 | 169 | width: parent.width - units.gu(8) | 145 | width: parent.width - units.gu(8) |
| 742 | 170 | onClicked: { | 146 | onClicked: { |
| 743 | @@ -184,8 +160,10 @@ | |||
| 744 | 184 | enabled: backend.selectedDevice && backend.powered ? (backend.isSupportedType(backend.selectedDevice.type) || backend.selectedDevice.connection != Device.Disconnected) : false | 160 | enabled: backend.selectedDevice && backend.powered ? (backend.isSupportedType(backend.selectedDevice.type) || backend.selectedDevice.connection != Device.Disconnected) : false |
| 745 | 185 | } | 161 | } |
| 746 | 186 | } | 162 | } |
| 749 | 187 | ListItem.SingleControl { | 163 | |
| 750 | 188 | control: Button { | 164 | SettingsListItems.SingleControl { |
| 751 | 165 | |||
| 752 | 166 | Button { | ||
| 753 | 189 | text: i18n.tr("Forget this device") | 167 | text: i18n.tr("Forget this device") |
| 754 | 190 | width: parent.width - units.gu(8) | 168 | width: parent.width - units.gu(8) |
| 755 | 191 | onClicked: { | 169 | onClicked: { |
| 756 | 192 | 170 | ||
| 757 | === modified file 'plugins/bluetooth/PageComponent.qml' | |||
| 758 | --- plugins/bluetooth/PageComponent.qml 2015-11-20 08:47:27 +0000 | |||
| 759 | +++ plugins/bluetooth/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 760 | @@ -21,9 +21,9 @@ | |||
| 761 | 21 | import QMenuModel 0.1 | 21 | import QMenuModel 0.1 |
| 762 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 763 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 764 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 765 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 766 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 767 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 768 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 |
| 769 | 28 | import Ubuntu.Settings.Components 0.1 as USC | 28 | import Ubuntu.Settings.Components 0.1 as USC |
| 770 | 29 | 29 | ||
| 771 | @@ -215,9 +215,10 @@ | |||
| 772 | 215 | Component.onCompleted: start() | 215 | Component.onCompleted: start() |
| 773 | 216 | } | 216 | } |
| 774 | 217 | 217 | ||
| 776 | 218 | ListItem.Standard { | 218 | SettingsListItems.Standard { |
| 777 | 219 | text: i18n.tr("Bluetooth") | 219 | text: i18n.tr("Bluetooth") |
| 779 | 220 | control: Switch { | 220 | |
| 780 | 221 | Switch { | ||
| 781 | 221 | id: btSwitch | 222 | id: btSwitch |
| 782 | 222 | property bool serverChecked: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false | 223 | property bool serverChecked: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false |
| 783 | 223 | USC.ServerPropertySynchroniser { | 224 | USC.ServerPropertySynchroniser { |
| 784 | @@ -232,77 +233,59 @@ | |||
| 785 | 232 | } | 233 | } |
| 786 | 233 | 234 | ||
| 787 | 234 | // Discoverability | 235 | // Discoverability |
| 789 | 235 | ListItem.Standard { | 236 | SettingsListItems.SingleValue { |
| 790 | 237 | text: backend.discoverable ? i18n.tr("Discoverable") : i18n.tr("Not discoverable") | ||
| 791 | 238 | value: backend.discoverable ? backend.adapterName() : "" | ||
| 792 | 236 | enabled: bluetoothActionGroup.enabled | 239 | enabled: bluetoothActionGroup.enabled |
| 793 | 237 | showDivider: false | 240 | showDivider: false |
| 794 | 238 | 241 | ||
| 834 | 239 | Rectangle { | 242 | ActivityIndicator { |
| 835 | 240 | color: "transparent" | 243 | visible: backend.powered && !backend.discoverable |
| 836 | 241 | anchors.fill: parent | 244 | running: visible |
| 798 | 242 | anchors.topMargin: units.gu(1) | ||
| 799 | 243 | anchors.leftMargin: units.gu(2) | ||
| 800 | 244 | anchors.rightMargin: units.gu(2) | ||
| 801 | 245 | |||
| 802 | 246 | Label { | ||
| 803 | 247 | anchors { | ||
| 804 | 248 | top: parent.top | ||
| 805 | 249 | left: parent.left | ||
| 806 | 250 | topMargin: units.gu(1) | ||
| 807 | 251 | } | ||
| 808 | 252 | height: units.gu(3) | ||
| 809 | 253 | text: backend.discoverable ? i18n.tr("Discoverable") : i18n.tr("Not discoverable") | ||
| 810 | 254 | } | ||
| 811 | 255 | |||
| 812 | 256 | Label { | ||
| 813 | 257 | anchors { | ||
| 814 | 258 | top: parent.top | ||
| 815 | 259 | right: parent.right | ||
| 816 | 260 | topMargin: units.gu(1) | ||
| 817 | 261 | } | ||
| 818 | 262 | height: units.gu(3) | ||
| 819 | 263 | text: backend.discoverable ? backend.adapterName() : "" | ||
| 820 | 264 | color: "darkgrey" | ||
| 821 | 265 | visible: backend.discoverable | ||
| 822 | 266 | enabled: false | ||
| 823 | 267 | } | ||
| 824 | 268 | |||
| 825 | 269 | ActivityIndicator { | ||
| 826 | 270 | anchors { | ||
| 827 | 271 | top: parent.top | ||
| 828 | 272 | right: parent.right | ||
| 829 | 273 | topMargin: units.gu(1) | ||
| 830 | 274 | } | ||
| 831 | 275 | visible: backend.powered && !backend.discoverable | ||
| 832 | 276 | running: visible | ||
| 833 | 277 | } | ||
| 837 | 278 | } | 245 | } |
| 838 | 279 | } | 246 | } |
| 839 | 280 | 247 | ||
| 841 | 281 | ListItem.Standard { | 248 | SettingsItemTitle { |
| 842 | 282 | id: connectedHeader | 249 | id: connectedHeader |
| 845 | 283 | text: i18n.tr("Connected devices:") | 250 | text: i18n.tr("Connect a device") |
| 844 | 284 | |||
| 846 | 285 | enabled: bluetoothActionGroup.enabled | 251 | enabled: bluetoothActionGroup.enabled |
| 848 | 286 | visible: connectedList.visible | 252 | visible: connectList.visible |
| 849 | 253 | |||
| 850 | 254 | ActivityIndicator { | ||
| 851 | 255 | anchors { | ||
| 852 | 256 | right: parent.right | ||
| 853 | 257 | top: parent.top | ||
| 854 | 258 | margins: units.gu(1.5) | ||
| 855 | 259 | } | ||
| 856 | 260 | visible: backend.powered && backend.discovering | ||
| 857 | 261 | running: visible | ||
| 858 | 262 | } | ||
| 859 | 287 | } | 263 | } |
| 860 | 288 | 264 | ||
| 861 | 289 | Column { | 265 | Column { |
| 863 | 290 | id: connectedList | 266 | |
| 864 | 291 | anchors { | 267 | anchors { |
| 865 | 292 | left: parent.left | 268 | left: parent.left |
| 866 | 293 | right: parent.right | 269 | right: parent.right |
| 867 | 294 | } | 270 | } |
| 868 | 295 | visible: (bluetoothActionGroup.enabled.state != undefined && bluetoothActionGroup.enabled.state) && (connectedRepeater.count > 0) | ||
| 869 | 296 | objectName: "connectedList" | ||
| 870 | 297 | 271 | ||
| 873 | 298 | Repeater { | 272 | ListView { |
| 874 | 299 | id: connectedRepeater | 273 | id: connectList |
| 875 | 274 | height: contentItem.height | ||
| 876 | 275 | anchors { | ||
| 877 | 276 | left: parent.left | ||
| 878 | 277 | right: parent.right | ||
| 879 | 278 | } | ||
| 880 | 279 | visible: (bluetoothActionGroup.enabled.state != undefined && bluetoothActionGroup.enabled.state) | ||
| 881 | 280 | objectName: "connectedList" | ||
| 882 | 300 | model: backend.connectedDevices | 281 | model: backend.connectedDevices |
| 884 | 301 | delegate: ListItem.Standard { | 282 | delegate: SettingsListItems.IconProgression { |
| 885 | 302 | iconSource: iconPath | 283 | iconSource: iconPath |
| 886 | 303 | iconFrame: false | ||
| 887 | 304 | text: getDisplayName(type, displayName) | 284 | text: getDisplayName(type, displayName) |
| 889 | 305 | control: ActivityIndicator { | 285 | layout.subtitle.text: connection == Device.Connecting ? i18n.tr("Connecting…") : i18n.tr("Connected") |
| 890 | 286 | layout.subtitle.color: UbuntuColors.green | ||
| 891 | 287 | |||
| 892 | 288 | ActivityIndicator { | ||
| 893 | 306 | visible: connection == Device.Connecting | 289 | visible: connection == Device.Connecting |
| 894 | 307 | running: visible | 290 | running: visible |
| 895 | 308 | } | 291 | } |
| 896 | @@ -310,50 +293,31 @@ | |||
| 897 | 310 | backend.setSelectedDevice(addressName); | 293 | backend.setSelectedDevice(addressName); |
| 898 | 311 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); | 294 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); |
| 899 | 312 | } | 295 | } |
| 926 | 313 | progression: true | 296 | } |
| 927 | 314 | } | 297 | } |
| 928 | 315 | } | 298 | |
| 929 | 316 | } | 299 | ListView { |
| 930 | 317 | 300 | id: disconnectedList | |
| 931 | 318 | SettingsItemTitle { | 301 | height: contentItem.height |
| 932 | 319 | id: disconnectedHeader | 302 | anchors { |
| 933 | 320 | text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:") | 303 | left: parent.left |
| 934 | 321 | enabled: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false | 304 | right: parent.right |
| 935 | 322 | control: ActivityIndicator { | 305 | } |
| 910 | 323 | visible: backend.powered && backend.discovering | ||
| 911 | 324 | running: visible | ||
| 912 | 325 | } | ||
| 913 | 326 | } | ||
| 914 | 327 | |||
| 915 | 328 | Column { | ||
| 916 | 329 | id: disconnectedList | ||
| 917 | 330 | anchors { | ||
| 918 | 331 | left: parent.left | ||
| 919 | 332 | right: parent.right | ||
| 920 | 333 | } | ||
| 921 | 334 | visible: (bluetoothActionGroup.enabled.state != undefined && bluetoothActionGroup.enabled.state) && (disconnectedRepeater.count > 0) | ||
| 922 | 335 | objectName: "disconnectedList" | ||
| 923 | 336 | |||
| 924 | 337 | Repeater { | ||
| 925 | 338 | id: disconnectedRepeater | ||
| 936 | 339 | model: backend.disconnectedDevices | 306 | model: backend.disconnectedDevices |
| 938 | 340 | delegate: ListItem.Standard { | 307 | delegate: SettingsListItems.IconProgression { |
| 939 | 341 | iconSource: iconPath | 308 | iconSource: iconPath |
| 940 | 342 | iconFrame: false | ||
| 941 | 343 | text: getDisplayName(type, displayName) | 309 | text: getDisplayName(type, displayName) |
| 942 | 344 | onClicked: { | 310 | onClicked: { |
| 943 | 345 | backend.setSelectedDevice(addressName); | 311 | backend.setSelectedDevice(addressName); |
| 944 | 346 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); | 312 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); |
| 945 | 347 | } | 313 | } |
| 946 | 348 | progression: true | ||
| 947 | 349 | } | 314 | } |
| 948 | 350 | } | 315 | } |
| 955 | 351 | } | 316 | |
| 956 | 352 | ListItem.Standard { | 317 | SettingsListItems.Standard { |
| 957 | 353 | id: disconnectedNone | 318 | text: i18n.tr("None detected") |
| 958 | 354 | text: i18n.tr("None detected") | 319 | visible: connectList.count === 0 && disconnectedList.count === 0 |
| 959 | 355 | visible: !disconnectedList.visible && disconnectedHeader.visible | 320 | } |
| 954 | 356 | enabled: false | ||
| 960 | 357 | } | 321 | } |
| 961 | 358 | 322 | ||
| 962 | 359 | SettingsItemTitle { | 323 | SettingsItemTitle { |
| 963 | @@ -374,15 +338,13 @@ | |||
| 964 | 374 | Repeater { | 338 | Repeater { |
| 965 | 375 | id: autoconnectRepeater | 339 | id: autoconnectRepeater |
| 966 | 376 | model: backend.autoconnectDevices | 340 | model: backend.autoconnectDevices |
| 968 | 377 | delegate: ListItem.Standard { | 341 | delegate: SettingsListItems.IconProgression { |
| 969 | 378 | iconSource: iconPath | 342 | iconSource: iconPath |
| 970 | 379 | iconFrame: false | ||
| 971 | 380 | text: getDisplayName(type, displayName) | 343 | text: getDisplayName(type, displayName) |
| 972 | 381 | onClicked: { | 344 | onClicked: { |
| 973 | 382 | backend.setSelectedDevice(addressName); | 345 | backend.setSelectedDevice(addressName); |
| 974 | 383 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); | 346 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); |
| 975 | 384 | } | 347 | } |
| 976 | 385 | progression: true | ||
| 977 | 386 | } | 348 | } |
| 978 | 387 | } | 349 | } |
| 979 | 388 | } | 350 | } |
| 980 | 389 | 351 | ||
| 981 | === modified file 'plugins/brightness/PageComponent.qml' | |||
| 982 | --- plugins/brightness/PageComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 983 | +++ plugins/brightness/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 984 | @@ -1,7 +1,7 @@ | |||
| 985 | 1 | /* | 1 | /* |
| 986 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 987 | 3 | * | 3 | * |
| 989 | 4 | * Copyright (C) 2013-14 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 990 | 5 | * | 5 | * |
| 991 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 992 | 7 | * | 7 | * |
| 993 | @@ -21,8 +21,8 @@ | |||
| 994 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 995 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 996 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 997 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 998 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 999 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1000 | 26 | import Ubuntu.SystemSettings.Brightness 1.0 | 26 | import Ubuntu.SystemSettings.Brightness 1.0 |
| 1001 | 27 | import Ubuntu.Settings.Menus 0.1 as Menus | 27 | import Ubuntu.Settings.Menus 0.1 as Menus |
| 1002 | 28 | import Ubuntu.Settings.Components 0.1 as USC | 28 | import Ubuntu.Settings.Components 0.1 as USC |
| 1003 | @@ -53,7 +53,7 @@ | |||
| 1004 | 53 | Component.onCompleted: start() | 53 | Component.onCompleted: start() |
| 1005 | 54 | } | 54 | } |
| 1006 | 55 | 55 | ||
| 1008 | 56 | ListItem.Standard { | 56 | SettingsListItems.Standard { |
| 1009 | 57 | text: i18n.tr("Display brightness") | 57 | text: i18n.tr("Display brightness") |
| 1010 | 58 | showDivider: false | 58 | showDivider: false |
| 1011 | 59 | } | 59 | } |
| 1012 | @@ -84,12 +84,17 @@ | |||
| 1013 | 84 | } | 84 | } |
| 1014 | 85 | } | 85 | } |
| 1015 | 86 | 86 | ||
| 1017 | 87 | ListItem.Standard { | 87 | SettingsListItems.Standard { |
| 1018 | 88 | id: adjust | 88 | id: adjust |
| 1019 | 89 | text: i18n.tr("Adjust automatically") | 89 | text: i18n.tr("Adjust automatically") |
| 1020 | 90 | visible: brightnessPanel.powerdRunning && | 90 | visible: brightnessPanel.powerdRunning && |
| 1021 | 91 | brightnessPanel.autoBrightnessAvailable | 91 | brightnessPanel.autoBrightnessAvailable |
| 1023 | 92 | control: CheckBox { | 92 | |
| 1024 | 93 | layout.summary.text: i18n.tr( | ||
| 1025 | 94 | "Brightens and dims the display to suit the surroundings." | ||
| 1026 | 95 | ) | ||
| 1027 | 96 | |||
| 1028 | 97 | CheckBox { | ||
| 1029 | 93 | id: autoAdjustCheck | 98 | id: autoAdjustCheck |
| 1030 | 94 | property bool serverChecked: gsettings.autoBrightness | 99 | property bool serverChecked: gsettings.autoBrightness |
| 1031 | 95 | onServerCheckedChanged: checked = serverChecked | 100 | onServerCheckedChanged: checked = serverChecked |
| 1032 | @@ -98,11 +103,6 @@ | |||
| 1033 | 98 | } | 103 | } |
| 1034 | 99 | showDivider: false | 104 | showDivider: false |
| 1035 | 100 | } | 105 | } |
| 1036 | 101 | ListItem.Caption { | ||
| 1037 | 102 | text: i18n.tr( | ||
| 1038 | 103 | "Brightens and dims the display to suit the surroundings.") | ||
| 1039 | 104 | visible: adjust.visible | ||
| 1040 | 105 | } | ||
| 1041 | 106 | } | 106 | } |
| 1042 | 107 | 107 | ||
| 1043 | 108 | GSettings { | 108 | GSettings { |
| 1044 | 109 | 109 | ||
| 1045 | === modified file 'plugins/cellular/Components/MultiSim.qml' | |||
| 1046 | --- plugins/cellular/Components/MultiSim.qml 2015-09-18 14:18:11 +0000 | |||
| 1047 | +++ plugins/cellular/Components/MultiSim.qml 2015-11-27 13:34:19 +0000 | |||
| 1048 | @@ -20,8 +20,9 @@ | |||
| 1049 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1050 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 1051 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 1052 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1053 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 1055 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 1056 | 25 | 26 | ||
| 1057 | 26 | /* This is a temporary solution to the issue of Hotspots failing on mako. If | 27 | /* This is a temporary solution to the issue of Hotspots failing on mako. If |
| 1058 | 27 | the device is mako, we hide the hotspot entry. Will be removed once lp:1434591 | 28 | the device is mako, we hide the hotspot entry. Will be removed once lp:1434591 |
| 1059 | @@ -53,20 +54,17 @@ | |||
| 1060 | 53 | anchors { left: parent.left; right: parent.right } | 54 | anchors { left: parent.left; right: parent.right } |
| 1061 | 54 | } | 55 | } |
| 1062 | 55 | 56 | ||
| 1064 | 56 | ListItem.Standard { | 57 | SettingsListItems.StandardProgression { |
| 1065 | 57 | id: dataUsage | 58 | id: dataUsage |
| 1066 | 58 | text: i18n.tr("Data usage statistics") | 59 | text: i18n.tr("Data usage statistics") |
| 1067 | 59 | progression: true | ||
| 1068 | 60 | visible: showAllUI | 60 | visible: showAllUI |
| 1069 | 61 | } | 61 | } |
| 1070 | 62 | 62 | ||
| 1074 | 63 | ListItem.Divider {} | 63 | SettingsListItems.SingleValueProgression { |
| 1072 | 64 | |||
| 1073 | 65 | ListItem.SingleValue { | ||
| 1075 | 66 | text: i18n.tr("Carriers") | 64 | text: i18n.tr("Carriers") |
| 1076 | 67 | id: chooseCarrier | 65 | id: chooseCarrier |
| 1077 | 68 | objectName: "carrierApnEntry" | 66 | objectName: "carrierApnEntry" |
| 1079 | 69 | progression: enabled | 67 | progressionVisible: enabled |
| 1080 | 70 | showDivider: false | 68 | showDivider: false |
| 1081 | 71 | onClicked: { | 69 | onClicked: { |
| 1082 | 72 | pageStack.push(Qt.resolvedUrl("../PageCarriersAndApns.qml"), { | 70 | pageStack.push(Qt.resolvedUrl("../PageCarriersAndApns.qml"), { |
| 1083 | @@ -75,26 +73,24 @@ | |||
| 1084 | 75 | } | 73 | } |
| 1085 | 76 | } | 74 | } |
| 1086 | 77 | 75 | ||
| 1087 | 78 | ListItem.Divider {} | ||
| 1088 | 79 | |||
| 1089 | 80 | SimEditor { | 76 | SimEditor { |
| 1090 | 81 | anchors { left: parent.left; right: parent.right } | 77 | anchors { left: parent.left; right: parent.right } |
| 1091 | 82 | } | 78 | } |
| 1092 | 83 | 79 | ||
| 1094 | 84 | ListItem.Divider {} | 80 | ListItems.Divider {} |
| 1095 | 85 | 81 | ||
| 1096 | 86 | DefaultSim { | 82 | DefaultSim { |
| 1097 | 87 | anchors { left: parent.left; right: parent.right } | 83 | anchors { left: parent.left; right: parent.right } |
| 1098 | 88 | } | 84 | } |
| 1099 | 89 | 85 | ||
| 1101 | 90 | ListItem.Divider {} | 86 | ListItems.Divider {} |
| 1102 | 91 | 87 | ||
| 1103 | 92 | SettingsItemTitle { text: i18n.tr("Connection type:") } | 88 | SettingsItemTitle { text: i18n.tr("Connection type:") } |
| 1104 | 93 | 89 | ||
| 1105 | 94 | Repeater { | 90 | Repeater { |
| 1106 | 95 | model: sims | 91 | model: sims |
| 1107 | 96 | 92 | ||
| 1109 | 97 | ListItem.ItemSelector { | 93 | ListItems.ItemSelector { |
| 1110 | 98 | id: radio | 94 | id: radio |
| 1111 | 99 | property var sim: modelData | 95 | property var sim: modelData |
| 1112 | 100 | 96 | ||
| 1113 | 101 | 97 | ||
| 1114 | === modified file 'plugins/cellular/Components/Sim.qml' | |||
| 1115 | --- plugins/cellular/Components/Sim.qml 2015-08-10 13:31:45 +0000 | |||
| 1116 | +++ plugins/cellular/Components/Sim.qml 2015-11-27 13:34:19 +0000 | |||
| 1117 | @@ -37,6 +37,10 @@ | |||
| 1118 | 37 | return name + (number ? " (" + number + ")" : ""); | 37 | return name + (number ? " (" + number + ")" : ""); |
| 1119 | 38 | } | 38 | } |
| 1120 | 39 | 39 | ||
| 1121 | 40 | function getTechString () { | ||
| 1122 | 41 | return techToString(radioSettings.technologyPreference); | ||
| 1123 | 42 | } | ||
| 1124 | 43 | |||
| 1125 | 40 | function techToString (tech) { | 44 | function techToString (tech) { |
| 1126 | 41 | var strings = { | 45 | var strings = { |
| 1127 | 42 | 'gsm': i18n.tr("2G only (saves battery)"), | 46 | 'gsm': i18n.tr("2G only (saves battery)"), |
| 1128 | @@ -44,7 +48,7 @@ | |||
| 1129 | 44 | 'lte': i18n.tr("2G/3G/4G (faster)") | 48 | 'lte': i18n.tr("2G/3G/4G (faster)") |
| 1130 | 45 | }; | 49 | }; |
| 1131 | 46 | strings['umts_enable'] = strings['umts']; | 50 | strings['umts_enable'] = strings['umts']; |
| 1133 | 47 | return strings[tech]; | 51 | return strings[tech] || ""; |
| 1134 | 48 | } | 52 | } |
| 1135 | 49 | 53 | ||
| 1136 | 50 | // adds umts_enable to an copy of model | 54 | // adds umts_enable to an copy of model |
| 1137 | 51 | 55 | ||
| 1138 | === modified file 'plugins/cellular/Components/SingleSim.qml' | |||
| 1139 | --- plugins/cellular/Components/SingleSim.qml 2015-08-21 14:03:29 +0000 | |||
| 1140 | +++ plugins/cellular/Components/SingleSim.qml 2015-11-27 13:34:19 +0000 | |||
| 1141 | @@ -18,9 +18,9 @@ | |||
| 1142 | 18 | * | 18 | * |
| 1143 | 19 | */ | 19 | */ |
| 1144 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1146 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings.ListItems 1.0 as SettingsListItems |
| 1147 | 22 | import Ubuntu.SystemSettings.Cellular 1.0 | ||
| 1148 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1149 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1150 | 24 | 24 | ||
| 1151 | 25 | Column { | 25 | Column { |
| 1152 | 26 | 26 | ||
| 1153 | @@ -32,10 +32,11 @@ | |||
| 1154 | 32 | @prevOnlineModem path to modem that was online before this event */ | 32 | @prevOnlineModem path to modem that was online before this event */ |
| 1155 | 33 | signal umtsModemChanged (var sim, string prevOnlineModem); | 33 | signal umtsModemChanged (var sim, string prevOnlineModem); |
| 1156 | 34 | 34 | ||
| 1158 | 35 | ListItem.Standard { | 35 | SettingsListItems.Standard { |
| 1159 | 36 | id: selector | 36 | id: selector |
| 1160 | 37 | text: i18n.tr("Cellular data:") | 37 | text: i18n.tr("Cellular data:") |
| 1162 | 38 | control: Switch { | 38 | |
| 1163 | 39 | Switch { | ||
| 1164 | 39 | id: dataControl | 40 | id: dataControl |
| 1165 | 40 | objectName: 'data' | 41 | objectName: 'data' |
| 1166 | 41 | property bool serverChecked: sim.connMan.powered | 42 | property bool serverChecked: sim.connMan.powered |
| 1167 | @@ -45,11 +46,12 @@ | |||
| 1168 | 45 | } | 46 | } |
| 1169 | 46 | } | 47 | } |
| 1170 | 47 | 48 | ||
| 1172 | 48 | ListItem.Standard { | 49 | SettingsListItems.Standard { |
| 1173 | 49 | id: dataRoamingItem | 50 | id: dataRoamingItem |
| 1174 | 50 | text: i18n.tr("Data roaming") | 51 | text: i18n.tr("Data roaming") |
| 1175 | 51 | enabled: sim.connMan.powered | 52 | enabled: sim.connMan.powered |
| 1177 | 52 | control: Switch { | 53 | |
| 1178 | 54 | Switch { | ||
| 1179 | 53 | id: dataRoamingControl | 55 | id: dataRoamingControl |
| 1180 | 54 | objectName: "roaming" | 56 | objectName: "roaming" |
| 1181 | 55 | property bool serverChecked: sim.connMan.roamingAllowed | 57 | property bool serverChecked: sim.connMan.roamingAllowed |
| 1182 | @@ -59,31 +61,24 @@ | |||
| 1183 | 59 | } | 61 | } |
| 1184 | 60 | } | 62 | } |
| 1185 | 61 | 63 | ||
| 1187 | 62 | ListItem.Standard { | 64 | SettingsListItems.StandardProgression{ |
| 1188 | 63 | text: i18n.tr("Data usage statistics") | 65 | text: i18n.tr("Data usage statistics") |
| 1189 | 64 | progression: true | ||
| 1190 | 65 | visible: showAllUI | 66 | visible: showAllUI |
| 1191 | 66 | } | 67 | } |
| 1192 | 67 | 68 | ||
| 1207 | 68 | ListItem.Divider { | 69 | SettingsListItems.SingleValueProgression { |
| 1208 | 69 | visible: radio.visible | 70 | text: i18n.tr("Carrier & APN"); |
| 1195 | 70 | } | ||
| 1196 | 71 | |||
| 1197 | 72 | RadioSingleSim { | ||
| 1198 | 73 | id: radio | ||
| 1199 | 74 | anchors { left: parent.left; right: parent.right } | ||
| 1200 | 75 | visible: radio.enabled | ||
| 1201 | 76 | } | ||
| 1202 | 77 | |||
| 1203 | 78 | ListItem.Divider {} | ||
| 1204 | 79 | |||
| 1205 | 80 | ListItem.SingleValue { | ||
| 1206 | 81 | text: i18n.tr("Carrier"); | ||
| 1209 | 82 | id: chooseCarrier | 71 | id: chooseCarrier |
| 1210 | 83 | objectName: "carrierApnEntry" | 72 | objectName: "carrierApnEntry" |
| 1212 | 84 | progression: enabled | 73 | value: sim.netReg.name || "" |
| 1213 | 85 | onClicked: pageStack.push(Qt.resolvedUrl("../PageCarrierAndApn.qml"), { | 74 | onClicked: pageStack.push(Qt.resolvedUrl("../PageCarrierAndApn.qml"), { |
| 1214 | 86 | sim: sim | 75 | sim: sim |
| 1215 | 87 | }) | 76 | }) |
| 1216 | 88 | } | 77 | } |
| 1217 | 78 | |||
| 1218 | 79 | RadioSingleSim { | ||
| 1219 | 80 | id: radio | ||
| 1220 | 81 | anchors { left: parent.left; right: parent.right } | ||
| 1221 | 82 | visible: radio.enabled | ||
| 1222 | 83 | } | ||
| 1223 | 89 | } | 84 | } |
| 1224 | 90 | 85 | ||
| 1225 | === modified file 'plugins/cellular/PageCarrierAndApn.qml' | |||
| 1226 | --- plugins/cellular/PageCarrierAndApn.qml 2015-08-10 13:31:45 +0000 | |||
| 1227 | +++ plugins/cellular/PageCarrierAndApn.qml 2015-11-27 13:34:19 +0000 | |||
| 1228 | @@ -19,12 +19,12 @@ | |||
| 1229 | 19 | */ | 19 | */ |
| 1230 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1231 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1232 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1233 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1234 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1235 | 24 | 24 | ||
| 1236 | 25 | ItemPage { | 25 | ItemPage { |
| 1237 | 26 | id: root | 26 | id: root |
| 1239 | 27 | title: i18n.tr("Carrier") | 27 | title: i18n.tr("Carrier & APN") |
| 1240 | 28 | objectName: "carrierApnPage" | 28 | objectName: "carrierApnPage" |
| 1241 | 29 | flickable: null | 29 | flickable: null |
| 1242 | 30 | 30 | ||
| 1243 | @@ -40,23 +40,23 @@ | |||
| 1244 | 40 | anchors.left: parent.left | 40 | anchors.left: parent.left |
| 1245 | 41 | anchors.right: parent.right | 41 | anchors.right: parent.right |
| 1246 | 42 | 42 | ||
| 1248 | 43 | ListItem.SingleValue { | 43 | SettingsListItems.SingleValueProgression { |
| 1249 | 44 | text: i18n.tr("Carrier") | 44 | text: i18n.tr("Carrier") |
| 1250 | 45 | objectName: "carrier" | 45 | objectName: "carrier" |
| 1251 | 46 | value: sim.netReg.name ? sim.netReg.name : i18n.tr("None") | 46 | value: sim.netReg.name ? sim.netReg.name : i18n.tr("None") |
| 1252 | 47 | enabled: (sim.netReg.status !== "") && | 47 | enabled: (sim.netReg.status !== "") && |
| 1253 | 48 | (sim.netReg.mode !== "auto-only") | 48 | (sim.netReg.mode !== "auto-only") |
| 1255 | 49 | progression: enabled | 49 | progressionVisible: enabled |
| 1256 | 50 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { | 50 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { |
| 1257 | 51 | sim: sim, | 51 | sim: sim, |
| 1258 | 52 | title: i18n.tr("Carrier") | 52 | title: i18n.tr("Carrier") |
| 1259 | 53 | }) | 53 | }) |
| 1260 | 54 | } | 54 | } |
| 1261 | 55 | 55 | ||
| 1263 | 56 | ListItem.Standard { | 56 | SettingsListItems.SingleValueProgression { |
| 1264 | 57 | text: i18n.tr("APN") | 57 | text: i18n.tr("APN") |
| 1265 | 58 | objectName: "apn" | 58 | objectName: "apn" |
| 1267 | 59 | progression: enabled | 59 | progressionVisible: enabled |
| 1268 | 60 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { | 60 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { |
| 1269 | 61 | sim: sim | 61 | sim: sim |
| 1270 | 62 | }) | 62 | }) |
| 1271 | 63 | 63 | ||
| 1272 | === modified file 'plugins/cellular/PageCarriersAndApns.qml' | |||
| 1273 | --- plugins/cellular/PageCarriersAndApns.qml 2015-08-10 13:31:45 +0000 | |||
| 1274 | +++ plugins/cellular/PageCarriersAndApns.qml 2015-11-27 13:34:19 +0000 | |||
| 1275 | @@ -19,12 +19,12 @@ | |||
| 1276 | 19 | */ | 19 | */ |
| 1277 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1278 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1279 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1280 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1281 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1282 | 24 | 24 | ||
| 1283 | 25 | ItemPage { | 25 | ItemPage { |
| 1284 | 26 | id: root | 26 | id: root |
| 1286 | 27 | title: i18n.tr("Carriers") | 27 | title: i18n.tr("Carriers & APNs") |
| 1287 | 28 | objectName: "carrierApnPage" | 28 | objectName: "carrierApnPage" |
| 1288 | 29 | flickable: null | 29 | flickable: null |
| 1289 | 30 | 30 | ||
| 1290 | @@ -40,56 +40,39 @@ | |||
| 1291 | 40 | anchors.left: parent.left | 40 | anchors.left: parent.left |
| 1292 | 41 | anchors.right: parent.right | 41 | anchors.right: parent.right |
| 1293 | 42 | 42 | ||
| 1344 | 43 | SettingsItemTitle { | 43 | Repeater { |
| 1345 | 44 | text: sims[0].title | 44 | model: sims |
| 1346 | 45 | } | 45 | |
| 1347 | 46 | 46 | Column { | |
| 1348 | 47 | ListItem.SingleValue { | 47 | anchors.left: parent.left |
| 1349 | 48 | text: i18n.tr("Carrier") | 48 | anchors.right: parent.right |
| 1350 | 49 | objectName: sims[0].path + "_carriers" | 49 | |
| 1351 | 50 | value: sims[0].netReg.name ? sims[0].netReg.name : | 50 | SettingsItemTitle { |
| 1352 | 51 | i18n.tr("None") | 51 | text: sims[index].title |
| 1353 | 52 | enabled: (sims[0].netReg.status !== "") && | 52 | } |
| 1354 | 53 | (sims[0].netReg.mode !== "auto-only") | 53 | |
| 1355 | 54 | progression: enabled | 54 | SettingsListItems.SingleValueProgression { |
| 1356 | 55 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { | 55 | text: i18n.tr("Carrier") |
| 1357 | 56 | sim: sims[0], | 56 | objectName: sims[index].path + "_carriers" |
| 1358 | 57 | title: sims[0].title | 57 | value: sims[index].netReg.name ? sims[index].netReg.name : |
| 1359 | 58 | }) | 58 | i18n.tr("None") |
| 1360 | 59 | } | 59 | enabled: (sims[index].netReg.status !== "") && |
| 1361 | 60 | 60 | (sims[index].netReg.mode !== "auto-only") | |
| 1362 | 61 | ListItem.Standard { | 61 | progressionVisible: enabled |
| 1363 | 62 | text: i18n.tr("APN") | 62 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { |
| 1364 | 63 | progression: enabled | 63 | sim: sims[index], |
| 1365 | 64 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { | 64 | title: sims[index].title |
| 1366 | 65 | sim: sims[0] | 65 | }) |
| 1367 | 66 | }) | 66 | } |
| 1368 | 67 | } | 67 | |
| 1369 | 68 | 68 | SettingsListItems.StandardProgression { | |
| 1370 | 69 | SettingsItemTitle { | 69 | text: i18n.tr("APN") |
| 1371 | 70 | text: sims[1].title | 70 | progressionVisible: enabled |
| 1372 | 71 | } | 71 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { |
| 1373 | 72 | 72 | sim: sims[index] | |
| 1374 | 73 | ListItem.SingleValue { | 73 | }) |
| 1375 | 74 | text: i18n.tr("Carrier") | 74 | } |
| 1376 | 75 | objectName: sims[1].path + "_carriers" | 75 | } |
| 1327 | 76 | value: sims[1].netReg.name ? sims[1].netReg.name : | ||
| 1328 | 77 | i18n.tr("None") | ||
| 1329 | 78 | enabled: (sims[1].netReg.status !== "") && | ||
| 1330 | 79 | (sims[1].netReg.mode !== "auto-only") | ||
| 1331 | 80 | progression: enabled | ||
| 1332 | 81 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { | ||
| 1333 | 82 | sim: sims[1], | ||
| 1334 | 83 | title: sims[1].title | ||
| 1335 | 84 | }) | ||
| 1336 | 85 | } | ||
| 1337 | 86 | |||
| 1338 | 87 | ListItem.Standard { | ||
| 1339 | 88 | text: i18n.tr("APN") | ||
| 1340 | 89 | progression: enabled | ||
| 1341 | 90 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { | ||
| 1342 | 91 | sim: sims[1] | ||
| 1343 | 92 | }) | ||
| 1377 | 93 | } | 76 | } |
| 1378 | 94 | } | 77 | } |
| 1379 | 95 | } | 78 | } |
| 1380 | 96 | 79 | ||
| 1381 | === modified file 'plugins/cellular/PageChooseApn.qml' | |||
| 1382 | --- plugins/cellular/PageChooseApn.qml 2015-08-10 13:31:45 +0000 | |||
| 1383 | +++ plugins/cellular/PageChooseApn.qml 2015-11-27 13:34:19 +0000 | |||
| 1384 | @@ -25,9 +25,9 @@ | |||
| 1385 | 25 | 25 | ||
| 1386 | 26 | import QtQuick 2.4 | 26 | import QtQuick 2.4 |
| 1387 | 27 | import SystemSettings 1.0 | 27 | import SystemSettings 1.0 |
| 1388 | 28 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1389 | 28 | import Ubuntu.Components 1.3 | 29 | import Ubuntu.Components 1.3 |
| 1390 | 29 | import Ubuntu.Components.Popups 1.3 | 30 | import Ubuntu.Components.Popups 1.3 |
| 1391 | 30 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1392 | 31 | import MeeGo.QOfono 0.2 | 31 | import MeeGo.QOfono 0.2 |
| 1393 | 32 | import Ubuntu.SystemSettings.Cellular 1.0 | 32 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 1394 | 33 | import "apn_manager.js" as Manager | 33 | import "apn_manager.js" as Manager |
| 1395 | @@ -283,16 +283,24 @@ | |||
| 1396 | 283 | Component { | 283 | Component { |
| 1397 | 284 | id: apnDelegate | 284 | id: apnDelegate |
| 1398 | 285 | 285 | ||
| 1400 | 286 | ListItem.Standard { | 286 | |
| 1401 | 287 | |||
| 1402 | 288 | SettingsListItems.StandardProgression { | ||
| 1403 | 287 | id: apnListItem | 289 | id: apnListItem |
| 1405 | 288 | property alias text: apnItemName.text | 290 | text: qml.name |
| 1406 | 291 | layout.subtitle.text: qml.typeString | ||
| 1407 | 289 | objectName: "edit_" + qml.name | 292 | objectName: "edit_" + qml.name |
| 1414 | 290 | height: units.gu(6) | 293 | |
| 1415 | 291 | removable: true | 294 | leadingActions: ListItemActions { |
| 1416 | 292 | confirmRemoval: true | 295 | actions: [ |
| 1417 | 293 | progression: true | 296 | Action { |
| 1418 | 294 | 297 | iconName: "delete" | |
| 1419 | 295 | onItemRemoved: Manager.removeContext(path); | 298 | name: i18n.tr("Delete") |
| 1420 | 299 | onTriggered: Manager.removeContext(path) | ||
| 1421 | 300 | } | ||
| 1422 | 301 | ] | ||
| 1423 | 302 | } | ||
| 1424 | 303 | |||
| 1425 | 296 | onClicked: { | 304 | onClicked: { |
| 1426 | 297 | editor = pageStack.push(Qt.resolvedUrl("PageApnEditor.qml"), { | 305 | editor = pageStack.push(Qt.resolvedUrl("PageApnEditor.qml"), { |
| 1427 | 298 | manager: Manager, | 306 | manager: Manager, |
| 1428 | @@ -303,7 +311,7 @@ | |||
| 1429 | 303 | }); | 311 | }); |
| 1430 | 304 | } | 312 | } |
| 1431 | 305 | 313 | ||
| 1433 | 306 | control: CheckBox { | 314 | CheckBox { |
| 1434 | 307 | id: check | 315 | id: check |
| 1435 | 308 | objectName: qml.name + "_preferred" | 316 | objectName: qml.name + "_preferred" |
| 1436 | 309 | property bool serverChecked: qml && qml.preferred | 317 | property bool serverChecked: qml && qml.preferred |
| 1437 | @@ -311,45 +319,6 @@ | |||
| 1438 | 311 | Component.onCompleted: checked = serverChecked | 319 | Component.onCompleted: checked = serverChecked |
| 1439 | 312 | onTriggered: Manager.setPreferred.call(this, qml, checked) | 320 | onTriggered: Manager.setPreferred.call(this, qml, checked) |
| 1440 | 313 | } | 321 | } |
| 1441 | 314 | |||
| 1442 | 315 | Item { | ||
| 1443 | 316 | anchors { | ||
| 1444 | 317 | top: parent.top | ||
| 1445 | 318 | bottom: parent.bottom | ||
| 1446 | 319 | left: parent.left | ||
| 1447 | 320 | leftMargin: units.gu(2) | ||
| 1448 | 321 | right: parent.right | ||
| 1449 | 322 | } | ||
| 1450 | 323 | |||
| 1451 | 324 | Label { | ||
| 1452 | 325 | id: apnItemName | ||
| 1453 | 326 | anchors { | ||
| 1454 | 327 | topMargin: units.gu(1) | ||
| 1455 | 328 | top: parent.top | ||
| 1456 | 329 | left: parent.left | ||
| 1457 | 330 | right: parent.right | ||
| 1458 | 331 | } | ||
| 1459 | 332 | |||
| 1460 | 333 | text: qml.name | ||
| 1461 | 334 | elide: Text.ElideRight | ||
| 1462 | 335 | opacity: apnListItem.enabled ? 1.0 : 0.5 | ||
| 1463 | 336 | } | ||
| 1464 | 337 | |||
| 1465 | 338 | Label { | ||
| 1466 | 339 | id: apnItemType | ||
| 1467 | 340 | anchors { | ||
| 1468 | 341 | left: parent.left | ||
| 1469 | 342 | right: parent.right | ||
| 1470 | 343 | top: apnItemName.bottom | ||
| 1471 | 344 | } | ||
| 1472 | 345 | |||
| 1473 | 346 | text: qml.typeString | ||
| 1474 | 347 | color: Theme.palette.normal.backgroundText | ||
| 1475 | 348 | fontSize: "small" | ||
| 1476 | 349 | wrapMode: Text.Wrap | ||
| 1477 | 350 | maximumLineCount: 5 | ||
| 1478 | 351 | } | ||
| 1479 | 352 | } | ||
| 1480 | 353 | } | 322 | } |
| 1481 | 354 | } | 323 | } |
| 1482 | 355 | 324 | ||
| 1483 | 356 | 325 | ||
| 1484 | === modified file 'plugins/cellular/PageComponent.qml' | |||
| 1485 | --- plugins/cellular/PageComponent.qml 2015-08-13 13:13:57 +0000 | |||
| 1486 | +++ plugins/cellular/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 1487 | @@ -22,7 +22,6 @@ | |||
| 1488 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 1489 | 23 | import Ubuntu.SystemSettings.Cellular 1.0 | 23 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 1490 | 24 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 1491 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1492 | 26 | import MeeGo.QOfono 0.2 | 25 | import MeeGo.QOfono 0.2 |
| 1493 | 27 | import QMenuModel 0.1 | 26 | import QMenuModel 0.1 |
| 1494 | 28 | import "Components" as LocalComponents | 27 | import "Components" as LocalComponents |
| 1495 | 29 | 28 | ||
| 1496 | === modified file 'plugins/flight-mode/EntryComponent.qml' | |||
| 1497 | --- plugins/flight-mode/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 1498 | +++ plugins/flight-mode/EntryComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 1499 | @@ -1,7 +1,7 @@ | |||
| 1500 | 1 | /* | 1 | /* |
| 1501 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1502 | 3 | * | 3 | * |
| 1504 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 1505 | 5 | * | 5 | * |
| 1506 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 1507 | 7 | * | 7 | * |
| 1508 | @@ -19,17 +19,17 @@ | |||
| 1509 | 19 | */ | 19 | */ |
| 1510 | 20 | 20 | ||
| 1511 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1512 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1513 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1514 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1515 | 24 | import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode | 24 | import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode |
| 1516 | 25 | import Ubuntu.Settings.Components 0.1 as USC | 25 | import Ubuntu.Settings.Components 0.1 as USC |
| 1517 | 26 | 26 | ||
| 1519 | 27 | ListItem.Standard { | 27 | SettingsListItems.Icon { |
| 1520 | 28 | id: root | 28 | id: root |
| 1521 | 29 | iconSource: model.icon | 29 | iconSource: model.icon |
| 1522 | 30 | iconFrame: false | ||
| 1523 | 31 | text: i18n.tr(model.displayName) | 30 | text: i18n.tr(model.displayName) |
| 1525 | 32 | control: Switch { | 31 | |
| 1526 | 32 | Switch { | ||
| 1527 | 33 | id: switchItem | 33 | id: switchItem |
| 1528 | 34 | 34 | ||
| 1529 | 35 | USC.ServerPropertySynchroniser { | 35 | USC.ServerPropertySynchroniser { |
| 1530 | @@ -42,7 +42,7 @@ | |||
| 1531 | 42 | } | 42 | } |
| 1532 | 43 | } | 43 | } |
| 1533 | 44 | 44 | ||
| 1535 | 45 | FlightMode.Helper { | 45 | resources: FlightMode.Helper { |
| 1536 | 46 | id: helper | 46 | id: helper |
| 1537 | 47 | } | 47 | } |
| 1538 | 48 | } | 48 | } |
| 1539 | 49 | 49 | ||
| 1540 | === modified file 'plugins/flight-mode/flight-mode.settings' | |||
| 1541 | --- plugins/flight-mode/flight-mode.settings 2014-09-24 17:10:03 +0000 | |||
| 1542 | +++ plugins/flight-mode/flight-mode.settings 2015-11-27 13:34:19 +0000 | |||
| 1543 | @@ -3,7 +3,7 @@ | |||
| 1544 | 3 | "icon": "airplane-mode", | 3 | "icon": "airplane-mode", |
| 1545 | 4 | "translations": "ubuntu-system-settings", | 4 | "translations": "ubuntu-system-settings", |
| 1546 | 5 | "category": "uncategorized-top", | 5 | "category": "uncategorized-top", |
| 1548 | 6 | "priority": 1, | 6 | "priority": 0, |
| 1549 | 7 | "keywords": [ | 7 | "keywords": [ |
| 1550 | 8 | "flight", | 8 | "flight", |
| 1551 | 9 | "plane", | 9 | "plane", |
| 1552 | 10 | 10 | ||
| 1553 | === modified file 'plugins/hotspot/HotspotSetup.qml' | |||
| 1554 | --- plugins/hotspot/HotspotSetup.qml 2015-09-18 14:18:11 +0000 | |||
| 1555 | +++ plugins/hotspot/HotspotSetup.qml 2015-11-27 13:34:19 +0000 | |||
| 1556 | @@ -19,8 +19,9 @@ | |||
| 1557 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
| 1558 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
| 1559 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1560 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1561 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1563 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 1564 | 24 | import Ubuntu.Components.Popups 1.3 | 25 | import Ubuntu.Components.Popups 1.3 |
| 1565 | 25 | import Ubuntu.Connectivity 1.0 | 26 | import Ubuntu.Connectivity 1.0 |
| 1566 | 26 | import Ubuntu.SystemSettings.Cellular 1.0 | 27 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 1567 | @@ -187,35 +188,23 @@ | |||
| 1568 | 187 | width: parent.width | 188 | width: parent.width |
| 1569 | 188 | } | 189 | } |
| 1570 | 189 | 190 | ||
| 1572 | 190 | ListItem.Empty { | 191 | SettingsListItems.Standard { |
| 1573 | 191 | id: passwordRequired | 192 | id: passwordRequired |
| 1575 | 192 | onClicked: passwordRequiredToggle.trigger() | 193 | text: i18n.tr("Require a password (recommended):") |
| 1576 | 194 | showDivider: false | ||
| 1577 | 195 | layout.padding.leading: 0 | ||
| 1578 | 196 | SlotsLayout.padding.leading: 0 | ||
| 1579 | 193 | 197 | ||
| 1580 | 194 | CheckBox { | 198 | CheckBox { |
| 1581 | 195 | id: passwordRequiredToggle | 199 | id: passwordRequiredToggle |
| 1582 | 196 | objectName: "passwordRequiredToggle" | 200 | objectName: "passwordRequiredToggle" |
| 1583 | 197 | checked: Connectivity.hotspotAuth === "wpa-psk" | 201 | checked: Connectivity.hotspotAuth === "wpa-psk" |
| 1588 | 198 | anchors { | 202 | SlotsLayout.position: SlotsLayout.First |
| 1589 | 199 | left: parent.left | 203 | SlotsLayout.padding.leading: 0 |
| 1586 | 200 | verticalCenter: parent.verticalCenter | ||
| 1587 | 201 | } | ||
| 1590 | 202 | // FIXME: Workaround for lp:1415023 | 204 | // FIXME: Workaround for lp:1415023 |
| 1591 | 203 | activeFocusOnPress: false | 205 | activeFocusOnPress: false |
| 1592 | 204 | } | 206 | } |
| 1607 | 205 | 207 | onClicked: passwordRequiredToggle.trigger() | |
| 1594 | 206 | Label { | ||
| 1595 | 207 | id: passwordRequiredLabel | ||
| 1596 | 208 | anchors { | ||
| 1597 | 209 | left: passwordRequiredToggle.right | ||
| 1598 | 210 | leftMargin: units.gu(1) | ||
| 1599 | 211 | right: parent.right | ||
| 1600 | 212 | verticalCenter: parent.verticalCenter | ||
| 1601 | 213 | } | ||
| 1602 | 214 | |||
| 1603 | 215 | // FIXME: Workaround for label not wrapping (lp:1442851) | ||
| 1604 | 216 | wrapMode: Text.Wrap | ||
| 1605 | 217 | text: i18n.tr("Require a password (recommended):") | ||
| 1606 | 218 | } | ||
| 1608 | 219 | } | 208 | } |
| 1609 | 220 | 209 | ||
| 1610 | 221 | TextField { | 210 | TextField { |
| 1611 | @@ -229,39 +218,25 @@ | |||
| 1612 | 229 | width: parent.width | 218 | width: parent.width |
| 1613 | 230 | } | 219 | } |
| 1614 | 231 | 220 | ||
| 1616 | 232 | ListItem.Empty { | 221 | SettingsListItems.Standard { |
| 1617 | 233 | id: passwordVisible | 222 | id: passwordVisible |
| 1618 | 234 | enabled: passwordRequiredToggle.checked | 223 | enabled: passwordRequiredToggle.checked |
| 1620 | 235 | onClicked: passwordVisibleToggle.trigger() | 224 | text: i18n.tr("Show password") |
| 1621 | 225 | layout.padding.leading: 0 | ||
| 1622 | 226 | SlotsLayout.padding.leading: 0 | ||
| 1623 | 236 | 227 | ||
| 1624 | 237 | CheckBox { | 228 | CheckBox { |
| 1625 | 238 | id: passwordVisibleToggle | 229 | id: passwordVisibleToggle |
| 1626 | 239 | enabled: parent.enabled | 230 | enabled: parent.enabled |
| 1632 | 240 | anchors { | 231 | SlotsLayout.position: SlotsLayout.First |
| 1633 | 241 | left: parent.left | 232 | SlotsLayout.padding.leading: 0 |
| 1629 | 242 | verticalCenter: parent.verticalCenter | ||
| 1630 | 243 | } | ||
| 1631 | 244 | |||
| 1634 | 245 | // FIXME: Workaround for lp:1415023 | 233 | // FIXME: Workaround for lp:1415023 |
| 1635 | 246 | activeFocusOnPress: false | 234 | activeFocusOnPress: false |
| 1636 | 247 | } | 235 | } |
| 1651 | 248 | 236 | onClicked: passwordVisibleToggle.trigger() | |
| 1638 | 249 | Label { | ||
| 1639 | 250 | id: passwordVisibleLabel | ||
| 1640 | 251 | |||
| 1641 | 252 | /* FIXME: use enabled when lp:1491802 is fixed, or use | ||
| 1642 | 253 | CheckBox.text once lp:1323238 is fixed. */ | ||
| 1643 | 254 | opacity: passwordRequiredToggle.checked ? 1 : 0.5 | ||
| 1644 | 255 | anchors { | ||
| 1645 | 256 | left: passwordVisibleToggle.right | ||
| 1646 | 257 | leftMargin: units.gu(1) | ||
| 1647 | 258 | verticalCenter: parent.verticalCenter | ||
| 1648 | 259 | } | ||
| 1649 | 260 | text: i18n.tr("Show password") | ||
| 1650 | 261 | } | ||
| 1652 | 262 | } | 237 | } |
| 1653 | 263 | 238 | ||
| 1655 | 264 | ListItem.Caption { | 239 | ListItems.Caption { |
| 1656 | 265 | id: enableWifiCaption | 240 | id: enableWifiCaption |
| 1657 | 266 | anchors { | 241 | anchors { |
| 1658 | 267 | left: parent.left | 242 | left: parent.left |
| 1659 | 268 | 243 | ||
| 1660 | === modified file 'plugins/hotspot/PageComponent.qml' | |||
| 1661 | --- plugins/hotspot/PageComponent.qml 2015-09-18 14:18:11 +0000 | |||
| 1662 | +++ plugins/hotspot/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 1663 | @@ -20,8 +20,9 @@ | |||
| 1664 | 20 | 20 | ||
| 1665 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1666 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 1667 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1668 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems | ||
| 1669 | 23 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 1670 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1671 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 1672 | 26 | import Ubuntu.Connectivity 1.0 | 27 | import Ubuntu.Connectivity 1.0 |
| 1673 | 27 | 28 | ||
| 1674 | @@ -77,15 +78,15 @@ | |||
| 1675 | 77 | } | 78 | } |
| 1676 | 78 | spacing: units.gu(1) | 79 | spacing: units.gu(1) |
| 1677 | 79 | 80 | ||
| 1679 | 80 | ListItem.Standard { | 81 | SettingsListItems.Standard { |
| 1680 | 81 | id: hotspotItem | 82 | id: hotspotItem |
| 1681 | 82 | text: i18n.tr("Hotspot") | 83 | text: i18n.tr("Hotspot") |
| 1682 | 83 | enabled: Connectivity.hotspotStored | 84 | enabled: Connectivity.hotspotStored |
| 1683 | 84 | onClicked: hotspotSwitch.trigger() | 85 | onClicked: hotspotSwitch.trigger() |
| 1685 | 85 | control: Switch { | 86 | |
| 1686 | 87 | Switch { | ||
| 1687 | 86 | id: hotspotSwitch | 88 | id: hotspotSwitch |
| 1688 | 87 | objectName: "hotspotSwitch" | 89 | objectName: "hotspotSwitch" |
| 1689 | 88 | enabled: parent.enabled | ||
| 1690 | 89 | checked: Connectivity.hotspotEnabled | 90 | checked: Connectivity.hotspotEnabled |
| 1691 | 90 | onTriggered: Connectivity.hotspotEnabled = checked | 91 | onTriggered: Connectivity.hotspotEnabled = checked |
| 1692 | 91 | 92 | ||
| 1693 | @@ -101,7 +102,7 @@ | |||
| 1694 | 101 | } | 102 | } |
| 1695 | 102 | } | 103 | } |
| 1696 | 103 | 104 | ||
| 1698 | 104 | ListItem.Caption { | 105 | ListItems.Caption { |
| 1699 | 105 | anchors { | 106 | anchors { |
| 1700 | 106 | left: parent.left | 107 | left: parent.left |
| 1701 | 107 | right: parent.right | 108 | right: parent.right |
| 1702 | 108 | 109 | ||
| 1703 | === modified file 'plugins/language/KeyboardLayoutItem.qml' | |||
| 1704 | --- plugins/language/KeyboardLayoutItem.qml 2015-08-10 13:31:45 +0000 | |||
| 1705 | +++ plugins/language/KeyboardLayoutItem.qml 2015-11-27 13:34:19 +0000 | |||
| 1706 | @@ -20,18 +20,18 @@ | |||
| 1707 | 20 | 20 | ||
| 1708 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1709 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 1722 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | 23 | |
| 1723 | 24 | 24 | ListItem { | |
| 1724 | 25 | ListItem.Base { | 25 | property string name |
| 1725 | 26 | property alias name: name.text | 26 | property alias checked: checkBox.checked |
| 1726 | 27 | property alias checked: checkBox.checked | 27 | property alias shortName: shortName.text |
| 1727 | 28 | property alias shortName: shortName.text | 28 | |
| 1728 | 29 | 29 | height: layout.height + divider.height | |
| 1729 | 30 | Row { | 30 | |
| 1730 | 31 | anchors.top: parent.top | 31 | ListItemLayout { |
| 1731 | 32 | anchors.left: parent.left | 32 | id: layout |
| 1732 | 33 | anchors.bottom: parent.bottom | 33 | |
| 1733 | 34 | spacing: units.gu(1) | 34 | title.text: name |
| 1734 | 35 | 35 | ||
| 1735 | 36 | Rectangle { | 36 | Rectangle { |
| 1736 | 37 | width: units.gu(3.0) | 37 | width: units.gu(3.0) |
| 1737 | @@ -40,8 +40,6 @@ | |||
| 1738 | 40 | 40 | ||
| 1739 | 41 | color: Theme.palette.normal.backgroundText | 41 | color: Theme.palette.normal.backgroundText |
| 1740 | 42 | 42 | ||
| 1741 | 43 | anchors.verticalCenter: parent.verticalCenter | ||
| 1742 | 44 | |||
| 1743 | 45 | Label { | 43 | Label { |
| 1744 | 46 | id: shortName | 44 | id: shortName |
| 1745 | 47 | 45 | ||
| 1746 | @@ -50,21 +48,14 @@ | |||
| 1747 | 50 | 48 | ||
| 1748 | 51 | anchors.centerIn: parent | 49 | anchors.centerIn: parent |
| 1749 | 52 | } | 50 | } |
| 1766 | 53 | } | 51 | |
| 1767 | 54 | 52 | SlotsLayout.position: SlotsLayout.First | |
| 1768 | 55 | Label { | 53 | } |
| 1769 | 56 | id: name | 54 | |
| 1770 | 57 | 55 | CheckBox { | |
| 1771 | 58 | anchors.verticalCenter: parent.verticalCenter | 56 | id: checkBox |
| 1772 | 59 | } | 57 | SlotsLayout.position: SlotsLayout.Trailing |
| 1773 | 60 | } | 58 | } |
| 1774 | 61 | 59 | } | |
| 1759 | 62 | CheckBox { | ||
| 1760 | 63 | id: checkBox | ||
| 1761 | 64 | |||
| 1762 | 65 | anchors.right: parent.right | ||
| 1763 | 66 | anchors.verticalCenter: parent.verticalCenter | ||
| 1764 | 67 | } | ||
| 1765 | 68 | |||
| 1775 | 69 | onClicked: checked = !checked | 60 | onClicked: checked = !checked |
| 1776 | 70 | } | 61 | } |
| 1777 | 71 | 62 | ||
| 1778 | === modified file 'plugins/language/PageComponent.qml' | |||
| 1779 | --- plugins/language/PageComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 1780 | +++ plugins/language/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 1781 | @@ -21,9 +21,9 @@ | |||
| 1782 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1783 | 22 | import GSettings 1.0 | 22 | import GSettings 1.0 |
| 1784 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 1785 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1786 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 1787 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 1788 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1789 | 27 | import Ubuntu.Settings.Menus 0.1 as Menus | 27 | import Ubuntu.Settings.Menus 0.1 as Menus |
| 1790 | 28 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 | 28 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
| 1791 | 29 | 29 | ||
| 1792 | @@ -96,53 +96,56 @@ | |||
| 1793 | 96 | anchors.left: parent.left | 96 | anchors.left: parent.left |
| 1794 | 97 | anchors.right: parent.right | 97 | anchors.right: parent.right |
| 1795 | 98 | 98 | ||
| 1798 | 99 | Menus.StandardMenu { | 99 | SettingsItemTitle { |
| 1799 | 100 | iconSource: "image://theme/language-chooser" | 100 | text: i18n.tr("Language") |
| 1800 | 101 | } | ||
| 1801 | 102 | |||
| 1802 | 103 | SettingsListItems.Standard { | ||
| 1803 | 104 | id: base | ||
| 1804 | 105 | height: layout.height + divider.height | ||
| 1805 | 106 | objectName: "displayLanguage" | ||
| 1806 | 107 | property int currentLanguage: plugin.currentLanguage | ||
| 1807 | 101 | text: i18n.tr("Display language…") | 108 | text: i18n.tr("Display language…") |
| 1815 | 102 | objectName: "displayLanguage" | 109 | layout.subtitle.text: plugin.languageNames[plugin.currentLanguage] |
| 1816 | 103 | component: Label { | 110 | layout.subtitle.objectName: "currentLanguage" |
| 1817 | 104 | property int currentLanguage: plugin.currentLanguage | 111 | |
| 1818 | 105 | objectName: "currentLanguage" | 112 | Icon { |
| 1819 | 106 | text: plugin.languageNames[plugin.currentLanguage] | 113 | source: "image://theme/language-chooser" |
| 1820 | 107 | elide: Text.ElideRight | 114 | height: units.gu(2.5) |
| 1821 | 108 | opacity: enabled ? 1.0 : 0.5 | 115 | width: height |
| 1822 | 116 | SlotsLayout.position: SlotsLayout.First | ||
| 1823 | 109 | } | 117 | } |
| 1824 | 110 | |||
| 1825 | 111 | onClicked: PopupUtils.open(displayLanguage) | 118 | onClicked: PopupUtils.open(displayLanguage) |
| 1826 | 112 | } | 119 | } |
| 1827 | 113 | 120 | ||
| 1832 | 114 | ListItem.Divider { | 121 | SettingsListItems.SingleValueProgression { |
| 1829 | 115 | } | ||
| 1830 | 116 | |||
| 1831 | 117 | ListItem.SingleValue { | ||
| 1833 | 118 | text: i18n.tr("Keyboard layouts") | 122 | text: i18n.tr("Keyboard layouts") |
| 1834 | 119 | value: plugin.keyboardLayoutsModel.subset.length == 1 ? | 123 | value: plugin.keyboardLayoutsModel.subset.length == 1 ? |
| 1835 | 120 | plugin.keyboardLayoutsModel.superset[plugin.keyboardLayoutsModel.subset[0]][0] : | 124 | plugin.keyboardLayoutsModel.superset[plugin.keyboardLayoutsModel.subset[0]][0] : |
| 1836 | 121 | plugin.keyboardLayoutsModel.subset.length | 125 | plugin.keyboardLayoutsModel.subset.length |
| 1837 | 122 | progression: true | ||
| 1838 | 123 | 126 | ||
| 1839 | 124 | onClicked: pageStack.push(keyboardLayouts) | 127 | onClicked: pageStack.push(keyboardLayouts) |
| 1840 | 125 | } | 128 | } |
| 1841 | 126 | 129 | ||
| 1843 | 127 | ListItem.Divider { | 130 | SettingsItemTitle { |
| 1844 | 131 | text: i18n.tr("Correction") | ||
| 1845 | 128 | } | 132 | } |
| 1846 | 129 | 133 | ||
| 1848 | 130 | ListItem.SingleValue { | 134 | SettingsListItems.SingleValueProgression { |
| 1849 | 131 | visible: showAllUI | 135 | visible: showAllUI |
| 1850 | 132 | 136 | ||
| 1851 | 133 | text: i18n.tr("Spell checking") | 137 | text: i18n.tr("Spell checking") |
| 1852 | 134 | value: plugin.spellCheckingModel.subset.length == 1 ? | 138 | value: plugin.spellCheckingModel.subset.length == 1 ? |
| 1853 | 135 | plugin.spellCheckingModel.superset[plugin.spellCheckingModel.subset[0]][0] : | 139 | plugin.spellCheckingModel.superset[plugin.spellCheckingModel.subset[0]][0] : |
| 1854 | 136 | plugin.spellCheckingModel.subset.length | 140 | plugin.spellCheckingModel.subset.length |
| 1855 | 137 | progression: true | ||
| 1856 | 138 | 141 | ||
| 1857 | 139 | onClicked: pageStack.push(spellChecking) | 142 | onClicked: pageStack.push(spellChecking) |
| 1858 | 140 | } | 143 | } |
| 1859 | 141 | 144 | ||
| 1861 | 142 | ListItem.Standard { | 145 | SettingsListItems.Standard { |
| 1862 | 143 | text: i18n.tr("Spell checking") | 146 | text: i18n.tr("Spell checking") |
| 1863 | 144 | 147 | ||
| 1865 | 145 | control: Switch { | 148 | Switch { |
| 1866 | 146 | property bool serverChecked: settings.spellChecking | 149 | property bool serverChecked: settings.spellChecking |
| 1867 | 147 | onServerCheckedChanged: checked = serverChecked | 150 | onServerCheckedChanged: checked = serverChecked |
| 1868 | 148 | Component.onCompleted: checked = serverChecked | 151 | Component.onCompleted: checked = serverChecked |
| 1869 | @@ -150,10 +153,10 @@ | |||
| 1870 | 150 | } | 153 | } |
| 1871 | 151 | } | 154 | } |
| 1872 | 152 | 155 | ||
| 1874 | 153 | ListItem.Standard { | 156 | SettingsListItems.Standard { |
| 1875 | 154 | text: i18n.tr("Auto correction") | 157 | text: i18n.tr("Auto correction") |
| 1876 | 155 | 158 | ||
| 1878 | 156 | control: Switch { | 159 | Switch { |
| 1879 | 157 | property bool serverChecked: settings.autoCompletion | 160 | property bool serverChecked: settings.autoCompletion |
| 1880 | 158 | onServerCheckedChanged: checked = serverChecked | 161 | onServerCheckedChanged: checked = serverChecked |
| 1881 | 159 | Component.onCompleted: checked = serverChecked | 162 | Component.onCompleted: checked = serverChecked |
| 1882 | @@ -161,10 +164,10 @@ | |||
| 1883 | 161 | } | 164 | } |
| 1884 | 162 | } | 165 | } |
| 1885 | 163 | 166 | ||
| 1887 | 164 | ListItem.Standard { | 167 | SettingsListItems.Standard { |
| 1888 | 165 | text: i18n.tr("Word suggestions") | 168 | text: i18n.tr("Word suggestions") |
| 1889 | 166 | 169 | ||
| 1891 | 167 | control: Switch { | 170 | Switch { |
| 1892 | 168 | property bool serverChecked: settings.predictiveText | 171 | property bool serverChecked: settings.predictiveText |
| 1893 | 169 | onServerCheckedChanged: checked = serverChecked | 172 | onServerCheckedChanged: checked = serverChecked |
| 1894 | 170 | Component.onCompleted: checked = serverChecked | 173 | Component.onCompleted: checked = serverChecked |
| 1895 | @@ -172,13 +175,13 @@ | |||
| 1896 | 172 | } | 175 | } |
| 1897 | 173 | } | 176 | } |
| 1898 | 174 | 177 | ||
| 1903 | 175 | ListItem.Divider { | 178 | SettingsListItems.Standard { |
| 1900 | 176 | } | ||
| 1901 | 177 | |||
| 1902 | 178 | ListItem.Standard { | ||
| 1904 | 179 | text: i18n.tr("Auto capitalization") | 179 | text: i18n.tr("Auto capitalization") |
| 1905 | 180 | layout.summary.text: i18n.tr( | ||
| 1906 | 181 | "Turns on Shift to capitalize the first letter of each sentence." | ||
| 1907 | 182 | ) | ||
| 1908 | 180 | 183 | ||
| 1910 | 181 | control: Switch { | 184 | Switch { |
| 1911 | 182 | property bool serverChecked: settings.autoCapitalization | 185 | property bool serverChecked: settings.autoCapitalization |
| 1912 | 183 | onServerCheckedChanged: checked = serverChecked | 186 | onServerCheckedChanged: checked = serverChecked |
| 1913 | 184 | Component.onCompleted: checked = serverChecked | 187 | Component.onCompleted: checked = serverChecked |
| 1914 | @@ -186,17 +189,13 @@ | |||
| 1915 | 186 | } | 189 | } |
| 1916 | 187 | } | 190 | } |
| 1917 | 188 | 191 | ||
| 1926 | 189 | ListItem.Caption { | 192 | SettingsListItems.Standard { |
| 1919 | 190 | text: i18n.tr("Turns on Shift to capitalize the first letter of each sentence.") | ||
| 1920 | 191 | } | ||
| 1921 | 192 | |||
| 1922 | 193 | ListItem.ThinDivider { | ||
| 1923 | 194 | } | ||
| 1924 | 195 | |||
| 1925 | 196 | ListItem.Standard { | ||
| 1927 | 197 | text: i18n.tr("Auto punctuation") | 193 | text: i18n.tr("Auto punctuation") |
| 1928 | 198 | 194 | ||
| 1930 | 199 | control: Switch { | 195 | /* TODO: update the string to mention quotes/brackets once the osk does that */ |
| 1931 | 196 | layout.summary.text: i18n.tr("Inserts a period when you tap Space twice.") | ||
| 1932 | 197 | |||
| 1933 | 198 | Switch { | ||
| 1934 | 200 | property bool serverChecked: settings.doubleSpaceFullStop | 199 | property bool serverChecked: settings.doubleSpaceFullStop |
| 1935 | 201 | onServerCheckedChanged: checked = serverChecked | 200 | onServerCheckedChanged: checked = serverChecked |
| 1936 | 202 | Component.onCompleted: checked = serverChecked | 201 | Component.onCompleted: checked = serverChecked |
| 1937 | @@ -204,18 +203,10 @@ | |||
| 1938 | 204 | } | 203 | } |
| 1939 | 205 | } | 204 | } |
| 1940 | 206 | 205 | ||
| 1950 | 207 | ListItem.Caption { | 206 | SettingsListItems.Standard { |
| 1942 | 208 | /* TODO: update the string to mention quotes/brackets once the osk does that */ | ||
| 1943 | 209 | text: i18n.tr("Inserts a period when you tap Space twice.") | ||
| 1944 | 210 | } | ||
| 1945 | 211 | |||
| 1946 | 212 | ListItem.ThinDivider { | ||
| 1947 | 213 | } | ||
| 1948 | 214 | |||
| 1949 | 215 | ListItem.Standard { | ||
| 1951 | 216 | text: i18n.tr("Keyboard sound") | 207 | text: i18n.tr("Keyboard sound") |
| 1952 | 217 | 208 | ||
| 1954 | 218 | control: Switch { | 209 | Switch { |
| 1955 | 219 | property bool serverChecked: settings.keyPressFeedback | 210 | property bool serverChecked: settings.keyPressFeedback |
| 1956 | 220 | onServerCheckedChanged: checked = serverChecked | 211 | onServerCheckedChanged: checked = serverChecked |
| 1957 | 221 | Component.onCompleted: checked = serverChecked | 212 | Component.onCompleted: checked = serverChecked |
| 1958 | @@ -223,10 +214,10 @@ | |||
| 1959 | 223 | } | 214 | } |
| 1960 | 224 | } | 215 | } |
| 1961 | 225 | 216 | ||
| 1963 | 226 | ListItem.Standard { | 217 | SettingsListItems.Standard { |
| 1964 | 227 | text: i18n.tr("Keyboard vibration") | 218 | text: i18n.tr("Keyboard vibration") |
| 1965 | 228 | 219 | ||
| 1967 | 229 | control: Switch { | 220 | Switch { |
| 1968 | 230 | property bool serverChecked: settings.keyPressHapticFeedback | 221 | property bool serverChecked: settings.keyPressHapticFeedback |
| 1969 | 231 | onServerCheckedChanged: checked = serverChecked | 222 | onServerCheckedChanged: checked = serverChecked |
| 1970 | 232 | Component.onCompleted: checked = serverChecked | 223 | Component.onCompleted: checked = serverChecked |
| 1971 | 233 | 224 | ||
| 1972 | === modified file 'plugins/language/SpellChecking.qml' | |||
| 1973 | --- plugins/language/SpellChecking.qml 2015-08-10 13:31:45 +0000 | |||
| 1974 | +++ plugins/language/SpellChecking.qml 2015-11-27 13:34:19 +0000 | |||
| 1975 | @@ -21,8 +21,8 @@ | |||
| 1976 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1977 | 22 | import GSettings 1.0 | 22 | import GSettings 1.0 |
| 1978 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 1979 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1980 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 1981 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1982 | 26 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 | 26 | import Ubuntu.SystemSettings.LanguagePlugin 1.0 |
| 1983 | 27 | 27 | ||
| 1984 | 28 | ItemPage { | 28 | ItemPage { |
| 1985 | @@ -38,12 +38,12 @@ | |||
| 1986 | 38 | schema.id: "com.canonical.keyboard.maliit" | 38 | schema.id: "com.canonical.keyboard.maliit" |
| 1987 | 39 | } | 39 | } |
| 1988 | 40 | 40 | ||
| 1990 | 41 | ListItem.Standard { | 41 | SettingsListItems.Standard { |
| 1991 | 42 | id: item | 42 | id: item |
| 1992 | 43 | 43 | ||
| 1993 | 44 | text: i18n.tr("Spell checking") | 44 | text: i18n.tr("Spell checking") |
| 1994 | 45 | 45 | ||
| 1996 | 46 | control: Switch { | 46 | Switch { |
| 1997 | 47 | property bool serverChecked: settings.spellChecking | 47 | property bool serverChecked: settings.spellChecking |
| 1998 | 48 | onServerCheckedChanged: checked = serverChecked | 48 | onServerCheckedChanged: checked = serverChecked |
| 1999 | 49 | Component.onCompleted: checked = serverChecked | 49 | Component.onCompleted: checked = serverChecked |
| 2000 | 50 | 50 | ||
| 2001 | === modified file 'plugins/language/SubsetView.qml' | |||
| 2002 | --- plugins/language/SubsetView.qml 2015-08-10 13:31:45 +0000 | |||
| 2003 | +++ plugins/language/SubsetView.qml 2015-11-27 13:34:19 +0000 | |||
| 2004 | @@ -20,8 +20,8 @@ | |||
| 2005 | 20 | 20 | ||
| 2006 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2007 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 2008 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2009 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 2010 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2011 | 25 | 25 | ||
| 2012 | 26 | ListView { | 26 | ListView { |
| 2013 | 27 | id: root | 27 | id: root |
| 2014 | @@ -41,13 +41,14 @@ | |||
| 2015 | 41 | flickableDirection: Flickable.VerticalFlick | 41 | flickableDirection: Flickable.VerticalFlick |
| 2016 | 42 | 42 | ||
| 2017 | 43 | section.property: "subset" | 43 | section.property: "subset" |
| 2019 | 44 | section.delegate: ListItem.Standard { | 44 | section.delegate: SettingsItemTitle { |
| 2020 | 45 | text: section == "true" ? subsetLabel : supersetLabel | 45 | text: section == "true" ? subsetLabel : supersetLabel |
| 2021 | 46 | } | 46 | } |
| 2022 | 47 | 47 | ||
| 2024 | 48 | delegate: ListItem.Standard { | 48 | delegate: SettingsListItems.Standard { |
| 2025 | 49 | text: model.display | 49 | text: model.display |
| 2027 | 50 | control: CheckBox { | 50 | |
| 2028 | 51 | CheckBox { | ||
| 2029 | 51 | checked: model.checked | 52 | checked: model.checked |
| 2030 | 52 | onCheckedChanged: { | 53 | onCheckedChanged: { |
| 2031 | 53 | var element = model.index < root.model.subset.length ? | 54 | var element = model.index < root.model.subset.length ? |
| 2032 | 54 | 55 | ||
| 2033 | === modified file 'plugins/language/settings-language.svg' | |||
| 2034 | --- plugins/language/settings-language.svg 2013-06-28 14:53:07 +0000 | |||
| 2035 | +++ plugins/language/settings-language.svg 2015-11-27 13:34:19 +0000 | |||
| 2036 | @@ -9,14 +9,15 @@ | |||
| 2037 | 9 | xmlns="http://www.w3.org/2000/svg" | 9 | xmlns="http://www.w3.org/2000/svg" |
| 2038 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 2039 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 2043 | 12 | width="90" | 12 | width="96" |
| 2044 | 13 | height="90" | 13 | height="96" |
| 2045 | 14 | id="svg4230" | 14 | id="svg4874" |
| 2046 | 15 | version="1.1" | 15 | version="1.1" |
| 2049 | 16 | inkscape:version="0.48+devel r12277" | 16 | inkscape:version="0.91+devel r" |
| 2050 | 17 | sodipodi:docname="setting-language-text.svg"> | 17 | viewBox="0 0 96 96.000001" |
| 2051 | 18 | sodipodi:docname="language-chooser.svg"> | ||
| 2052 | 18 | <defs | 19 | <defs |
| 2054 | 19 | id="defs4232" /> | 20 | id="defs4876" /> |
| 2055 | 20 | <sodipodi:namedview | 21 | <sodipodi:namedview |
| 2056 | 21 | id="base" | 22 | id="base" |
| 2057 | 22 | pagecolor="#ffffff" | 23 | pagecolor="#ffffff" |
| 2058 | @@ -24,18 +25,91 @@ | |||
| 2059 | 24 | borderopacity="1.0" | 25 | borderopacity="1.0" |
| 2060 | 25 | inkscape:pageopacity="0.0" | 26 | inkscape:pageopacity="0.0" |
| 2061 | 26 | inkscape:pageshadow="2" | 27 | inkscape:pageshadow="2" |
| 2065 | 27 | inkscape:zoom="5.0931703" | 28 | inkscape:zoom="3.5967995" |
| 2066 | 28 | inkscape:cx="21.204866" | 29 | inkscape:cx="-41.870567" |
| 2067 | 29 | inkscape:cy="6.4792647" | 30 | inkscape:cy="69.839831" |
| 2068 | 30 | inkscape:document-units="px" | 31 | inkscape:document-units="px" |
| 2071 | 31 | inkscape:current-layer="layer1-57" | 32 | inkscape:current-layer="g4780" |
| 2072 | 32 | showgrid="false" | 33 | showgrid="true" |
| 2073 | 34 | showborder="true" | ||
| 2074 | 33 | fit-margin-top="0" | 35 | fit-margin-top="0" |
| 2075 | 34 | fit-margin-left="0" | 36 | fit-margin-left="0" |
| 2076 | 35 | fit-margin-right="0" | 37 | fit-margin-right="0" |
| 2078 | 36 | fit-margin-bottom="0" /> | 38 | fit-margin-bottom="0" |
| 2079 | 39 | inkscape:snap-bbox="true" | ||
| 2080 | 40 | inkscape:bbox-paths="true" | ||
| 2081 | 41 | inkscape:bbox-nodes="true" | ||
| 2082 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
| 2083 | 43 | inkscape:snap-bbox-midpoints="true" | ||
| 2084 | 44 | inkscape:object-paths="true" | ||
| 2085 | 45 | inkscape:snap-intersection-paths="true" | ||
| 2086 | 46 | inkscape:object-nodes="true" | ||
| 2087 | 47 | inkscape:snap-smooth-nodes="true" | ||
| 2088 | 48 | inkscape:snap-midpoints="true" | ||
| 2089 | 49 | inkscape:snap-object-midpoints="true" | ||
| 2090 | 50 | inkscape:snap-center="true" | ||
| 2091 | 51 | showguides="true" | ||
| 2092 | 52 | inkscape:guide-bbox="true" | ||
| 2093 | 53 | inkscape:snap-global="true"> | ||
| 2094 | 54 | <inkscape:grid | ||
| 2095 | 55 | type="xygrid" | ||
| 2096 | 56 | id="grid5451" | ||
| 2097 | 57 | empspacing="8" /> | ||
| 2098 | 58 | <sodipodi:guide | ||
| 2099 | 59 | orientation="1,0" | ||
| 2100 | 60 | position="8,-8.0000001" | ||
| 2101 | 61 | id="guide4063" /> | ||
| 2102 | 62 | <sodipodi:guide | ||
| 2103 | 63 | orientation="1,0" | ||
| 2104 | 64 | position="4,-8.0000001" | ||
| 2105 | 65 | id="guide4065" /> | ||
| 2106 | 66 | <sodipodi:guide | ||
| 2107 | 67 | orientation="0,1" | ||
| 2108 | 68 | position="-8,88.000001" | ||
| 2109 | 69 | id="guide4067" /> | ||
| 2110 | 70 | <sodipodi:guide | ||
| 2111 | 71 | orientation="0,1" | ||
| 2112 | 72 | position="-8,92.000001" | ||
| 2113 | 73 | id="guide4069" /> | ||
| 2114 | 74 | <sodipodi:guide | ||
| 2115 | 75 | orientation="0,1" | ||
| 2116 | 76 | position="104,4" | ||
| 2117 | 77 | id="guide4071" /> | ||
| 2118 | 78 | <sodipodi:guide | ||
| 2119 | 79 | orientation="0,1" | ||
| 2120 | 80 | position="-5,8.0000001" | ||
| 2121 | 81 | id="guide4073" /> | ||
| 2122 | 82 | <sodipodi:guide | ||
| 2123 | 83 | orientation="1,0" | ||
| 2124 | 84 | position="88,-8.0000001" | ||
| 2125 | 85 | id="guide4077" /> | ||
| 2126 | 86 | <sodipodi:guide | ||
| 2127 | 87 | orientation="0,1" | ||
| 2128 | 88 | position="-8,84.000001" | ||
| 2129 | 89 | id="guide4074" /> | ||
| 2130 | 90 | <sodipodi:guide | ||
| 2131 | 91 | orientation="1,0" | ||
| 2132 | 92 | position="12,-8.0000001" | ||
| 2133 | 93 | id="guide4076" /> | ||
| 2134 | 94 | <sodipodi:guide | ||
| 2135 | 95 | orientation="1,0" | ||
| 2136 | 96 | position="84,-8.0000001" | ||
| 2137 | 97 | id="guide4080" /> | ||
| 2138 | 98 | <sodipodi:guide | ||
| 2139 | 99 | position="48,-8.0000001" | ||
| 2140 | 100 | orientation="1,0" | ||
| 2141 | 101 | id="guide4170" /> | ||
| 2142 | 102 | <sodipodi:guide | ||
| 2143 | 103 | position="-8,48" | ||
| 2144 | 104 | orientation="0,1" | ||
| 2145 | 105 | id="guide4172" /> | ||
| 2146 | 106 | <sodipodi:guide | ||
| 2147 | 107 | position="92,-8.0000001" | ||
| 2148 | 108 | orientation="1,0" | ||
| 2149 | 109 | id="guide4760" /> | ||
| 2150 | 110 | </sodipodi:namedview> | ||
| 2151 | 37 | <metadata | 111 | <metadata |
| 2153 | 38 | id="metadata4235"> | 112 | id="metadata4879"> |
| 2154 | 39 | <rdf:RDF> | 113 | <rdf:RDF> |
| 2155 | 40 | <cc:Work | 114 | <cc:Work |
| 2156 | 41 | rdf:about=""> | 115 | rdf:about=""> |
| 2157 | @@ -50,72 +124,35 @@ | |||
| 2158 | 50 | inkscape:label="Layer 1" | 124 | inkscape:label="Layer 1" |
| 2159 | 51 | inkscape:groupmode="layer" | 125 | inkscape:groupmode="layer" |
| 2160 | 52 | id="layer1" | 126 | id="layer1" |
| 2162 | 53 | transform="translate(-0.7143,-261.64789)"> | 127 | transform="translate(67.857146,-78.50504)"> |
| 2163 | 54 | <g | 128 | <g |
| 2167 | 55 | transform="translate(0.7143,-700.42863)" | 129 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
| 2168 | 56 | id="g4081" | 130 | id="g4845" |
| 2169 | 57 | inkscape:label="Layer 1"> | 131 | style="display:inline"> |
| 2170 | 58 | <g | 132 | <g |
| 2173 | 59 | transform="translate(0,-1.1427923)" | 133 | inkscape:export-ydpi="90" |
| 2174 | 60 | id="layer1-57" | 134 | inkscape:export-xdpi="90" |
| 2175 | 135 | inkscape:export-filename="next01.png" | ||
| 2176 | 136 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" | ||
| 2177 | 137 | id="g4778" | ||
| 2178 | 61 | inkscape:label="Layer 1"> | 138 | inkscape:label="Layer 1"> |
| 2179 | 62 | <g | 139 | <g |
| 2236 | 63 | id="g4136" | 140 | transform="matrix(-1,0,0,1,575.99999,611)" |
| 2237 | 64 | transform="matrix(1.875,0,0,1.875,-990,-829.95977)"> | 141 | id="g4780" |
| 2238 | 65 | <rect | 142 | style="display:inline"> |
| 2239 | 66 | style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 143 | <rect |
| 2240 | 67 | id="rect4134" | 144 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" |
| 2241 | 68 | width="48" | 145 | id="rect4782" |
| 2242 | 69 | height="48" | 146 | width="96.037987" |
| 2243 | 70 | x="528" | 147 | height="96" |
| 2244 | 71 | y="544" | 148 | x="-438.00244" |
| 2245 | 72 | transform="translate(0,412.36217)" /> | 149 | y="345.36221" |
| 2246 | 73 | </g> | 150 | transform="scale(-1,1)" /> |
| 2247 | 74 | <g | 151 | <path |
| 2248 | 75 | transform="translate(-528,48.000013)" | 152 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99960446;marker:none;enable-background:accumulate" |
| 2249 | 76 | id="g3466"> | 153 | d="M 48 6.0019531 C 24.82764 6.0019531 6 24.828928 6 48 C 6 71.171082 24.82764 89.998047 48 89.998047 C 71.17237 89.998047 90 71.171082 90 48 C 90 24.828928 71.17237 6.0019531 48 6.0019531 z M 42.53125 10.396484 C 33.296711 20.093908 28.462948 32.967067 28.013672 46 L 10.056641 46 C 10.99887 27.755915 24.765744 12.950862 42.53125 10.396484 z M 53.46875 10.396484 C 71.235181 12.950074 85.003049 27.75526 85.945312 46 L 67.986328 46 C 67.537031 32.967051 62.70334 20.093716 53.46875 10.396484 z M 48 10.671875 C 58.121521 19.777207 63.428064 32.787817 63.914062 46 L 32.085938 46 C 32.571943 32.787634 37.878206 19.777225 48 10.671875 z M 10.056641 50 L 28.013672 50 C 28.462948 63.032933 33.296711 75.906092 42.53125 85.603516 C 24.766398 83.048936 10.999752 68.243289 10.056641 50 z M 32.085938 50 L 63.914062 50 C 63.428064 63.212183 58.121521 76.222793 48 85.328125 C 37.878206 76.222775 32.571943 63.212366 32.085938 50 z M 67.986328 50 L 85.945312 50 C 85.002167 68.243944 71.234526 83.049724 53.46875 85.603516 C 62.703024 75.906274 67.536746 63.032634 67.986328 50 z " |
| 2250 | 77 | <rect | 154 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" |
| 2251 | 78 | y="915.2193" | 155 | id="rect3011" /> |
| 2196 | 79 | x="528" | ||
| 2197 | 80 | height="90" | ||
| 2198 | 81 | width="90" | ||
| 2199 | 82 | id="rect3474" | ||
| 2200 | 83 | style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
| 2201 | 84 | <path | ||
| 2202 | 85 | style="fill:#808080;fill-opacity:1;display:inline" | ||
| 2203 | 86 | d="M 28.96875 16 C 16.52725 16.1641 15 17.5 15 28 L 15 46 C 15 55.9093 16.3891 57.60545 27 57.90625 L 27 70 L 39 58 L 55 58 C 73 58 75 58 75 46 L 75 28 C 75 16 73 16 55 16 L 35 16 C 32.75 16 30.74605 15.9766 28.96875 16 z M 42.78125 24.21875 L 47.1875 24.21875 C 48.04962 26.041523 48.87464 27.877967 49.6875 29.75 C 50.50036 31.622033 51.312147 33.587157 52.125 35.65625 C 52.962493 37.725343 53.82538 39.934587 54.6875 42.25 C 55.574253 44.565407 56.476853 47.07834 57.4375 49.8125 L 52.4375 49.8125 C 52.092647 48.802587 51.71323 47.79778 51.34375 46.8125 C 50.97427 45.827213 50.626097 44.815797 50.28125 43.78125 L 39.5 43.78125 C 39.155153 44.815797 38.80698 45.833837 38.4375 46.84375 L 37.375 49.8125 L 32.5625 49.8125 C 33.523147 47.07834 34.419123 44.565407 35.28125 42.25 C 36.14337 39.934587 36.968397 37.725343 37.78125 35.65625 C 38.618743 33.587157 39.468397 31.622033 40.28125 29.75 C 41.09411 27.877967 41.91913 26.041523 42.78125 24.21875 z M 44.875 29.15625 C 44.308467 30.46175 43.676467 32.065467 42.9375 33.9375 C 42.223173 35.80954 41.475727 37.839003 40.6875 40.03125 L 49.09375 40.03125 C 48.305523 37.839003 47.55146 35.771673 46.8125 33.875 C 46.07354 31.978333 45.416907 30.412483 44.875 29.15625 z " | ||
| 2204 | 87 | transform="translate(528,915.2193)" | ||
| 2205 | 88 | id="path3962" /> | ||
| 2206 | 89 | <path | ||
| 2207 | 90 | sodipodi:type="arc" | ||
| 2208 | 91 | style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 2209 | 92 | id="path3965" | ||
| 2210 | 93 | sodipodi:cx="1731" | ||
| 2211 | 94 | sodipodi:cy="1545" | ||
| 2212 | 95 | sodipodi:rx="3" | ||
| 2213 | 96 | sodipodi:ry="3" | ||
| 2214 | 97 | d="m 1734,1545 c 0,1.6569 -1.3431,3 -3,3 -1.6569,0 -3,-1.3431 -3,-3 0,-1.6569 1.3431,-3 3,-3 C 1732.6569,1542 1734,1543.3431 1734,1545 Z" | ||
| 2215 | 98 | transform="matrix(1.3333333,0,0,1.3333333,-1708.9999,-1072.7807)" /> | ||
| 2216 | 99 | <path | ||
| 2217 | 100 | transform="matrix(1.3333333,0,0,1.3333333,-1720.9999,-1072.7807)" | ||
| 2218 | 101 | d="m 1734,1545 c 0,1.6569 -1.3431,3 -3,3 -1.6569,0 -3,-1.3431 -3,-3 0,-1.6569 1.3431,-3 3,-3 C 1732.6569,1542 1734,1543.3431 1734,1545 Z" | ||
| 2219 | 102 | sodipodi:ry="3" | ||
| 2220 | 103 | sodipodi:rx="3" | ||
| 2221 | 104 | sodipodi:cy="1545" | ||
| 2222 | 105 | sodipodi:cx="1731" | ||
| 2223 | 106 | id="path3976" | ||
| 2224 | 107 | style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 2225 | 108 | sodipodi:type="arc" /> | ||
| 2226 | 109 | <path | ||
| 2227 | 110 | sodipodi:type="arc" | ||
| 2228 | 111 | style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
| 2229 | 112 | id="path3978" | ||
| 2230 | 113 | sodipodi:cx="1731" | ||
| 2231 | 114 | sodipodi:cy="1545" | ||
| 2232 | 115 | sodipodi:rx="3" | ||
| 2233 | 116 | sodipodi:ry="3" | ||
| 2234 | 117 | d="m 1734,1545 c 0,1.6569 -1.3431,3 -3,3 -1.6569,0 -3,-1.3431 -3,-3 0,-1.6569 1.3431,-3 3,-3 C 1732.6569,1542 1734,1543.3431 1734,1545 Z" | ||
| 2235 | 118 | transform="matrix(1.3333333,0,0,1.3333333,-1732.9999,-1072.7807)" /> | ||
| 2252 | 119 | </g> | 156 | </g> |
| 2253 | 120 | </g> | 157 | </g> |
| 2254 | 121 | </g> | 158 | </g> |
| 2255 | 122 | 159 | ||
| 2256 | === modified file 'plugins/orientation-lock/EntryComponent.qml' | |||
| 2257 | --- plugins/orientation-lock/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 2258 | +++ plugins/orientation-lock/EntryComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 2259 | @@ -1,7 +1,7 @@ | |||
| 2260 | 1 | /* | 1 | /* |
| 2261 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2262 | 3 | * | 3 | * |
| 2264 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 2265 | 5 | * | 5 | * |
| 2266 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 2267 | 7 | * | 7 | * |
| 2268 | @@ -21,16 +21,16 @@ | |||
| 2269 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2270 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 2271 | 23 | import QtQuick.Window 2.1 | 23 | import QtQuick.Window 2.1 |
| 2272 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2273 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 2278 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 26 | |
| 2279 | 26 | 27 | ||
| 2280 | 27 | 28 | SettingsListItems.Icon { | |
| 2277 | 28 | ListItem.Standard { | ||
| 2281 | 29 | id: root | 29 | id: root |
| 2282 | 30 | iconSource: model.icon | 30 | iconSource: model.icon |
| 2283 | 31 | iconFrame: false | ||
| 2284 | 32 | text: i18n.tr(model.displayName) | 31 | text: i18n.tr(model.displayName) |
| 2286 | 33 | control: Switch { | 32 | |
| 2287 | 33 | Switch { | ||
| 2288 | 34 | id: control | 34 | id: control |
| 2289 | 35 | objectName: "orientationLockSwitch" | 35 | objectName: "orientationLockSwitch" |
| 2290 | 36 | 36 | ||
| 2291 | 37 | 37 | ||
| 2292 | === modified file 'plugins/orientation-lock/orientation-lock.settings' | |||
| 2293 | --- plugins/orientation-lock/orientation-lock.settings 2014-11-03 22:01:37 +0000 | |||
| 2294 | +++ plugins/orientation-lock/orientation-lock.settings 2015-11-27 13:34:19 +0000 | |||
| 2295 | @@ -3,7 +3,7 @@ | |||
| 2296 | 3 | "name": "Rotation Lock", | 3 | "name": "Rotation Lock", |
| 2297 | 4 | "translations": "ubuntu-system-settings", | 4 | "translations": "ubuntu-system-settings", |
| 2298 | 5 | "category": "uncategorized-top", | 5 | "category": "uncategorized-top", |
| 2300 | 6 | "priority": 0, | 6 | "priority": 1, |
| 2301 | 7 | "form-factors": [ | 7 | "form-factors": [ |
| 2302 | 8 | "phone", | 8 | "phone", |
| 2303 | 9 | "tablet" | 9 | "tablet" |
| 2304 | 10 | 10 | ||
| 2305 | === modified file 'plugins/phone/CallForwardItem.qml' | |||
| 2306 | --- plugins/phone/CallForwardItem.qml 2015-11-06 12:22:09 +0000 | |||
| 2307 | +++ plugins/phone/CallForwardItem.qml 2015-11-27 13:34:19 +0000 | |||
| 2308 | @@ -19,8 +19,9 @@ | |||
| 2309 | 19 | */ | 19 | */ |
| 2310 | 20 | 20 | ||
| 2311 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2312 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2313 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2315 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.0 as ListItems |
| 2316 | 24 | import Ubuntu.Components.Themes.Ambiance 0.1 | 25 | import Ubuntu.Components.Themes.Ambiance 0.1 |
| 2317 | 25 | import MeeGo.QOfono 0.2 | 26 | import MeeGo.QOfono 0.2 |
| 2318 | 26 | import "callForwardingUtils.js" as Utils | 27 | import "callForwardingUtils.js" as Utils |
| 2319 | @@ -135,12 +136,13 @@ | |||
| 2320 | 135 | } | 136 | } |
| 2321 | 136 | ] | 137 | ] |
| 2322 | 137 | 138 | ||
| 2324 | 138 | ListItem.ThinDivider { anchors { left: parent.left; right: parent.right }} | 139 | ListItems.ThinDivider { anchors { left: parent.left; right: parent.right }} |
| 2325 | 139 | 140 | ||
| 2327 | 140 | ListItem.Standard { | 141 | SettingsListItems.Standard { |
| 2328 | 141 | id: control | 142 | id: control |
| 2329 | 142 | onClicked: check.trigger(!check.checked) | 143 | onClicked: check.trigger(!check.checked) |
| 2331 | 143 | control: CheckBox { | 144 | |
| 2332 | 145 | CheckBox { | ||
| 2333 | 144 | id: check | 146 | id: check |
| 2334 | 145 | objectName: "check_" + rule | 147 | objectName: "check_" + rule |
| 2335 | 146 | checked: callForwarding[rule] !== "" | 148 | checked: callForwarding[rule] !== "" |
| 2336 | @@ -149,13 +151,13 @@ | |||
| 2337 | 149 | } | 151 | } |
| 2338 | 150 | } | 152 | } |
| 2339 | 151 | 153 | ||
| 2341 | 152 | ListItem.Standard { | 154 | SettingsListItems.Standard { |
| 2342 | 153 | id: input | 155 | id: input |
| 2343 | 154 | visible: false | 156 | visible: false |
| 2344 | 155 | height: visible ? units.gu(6) : 0 | ||
| 2345 | 156 | /* TRANSLATORS: This string will be truncated on smaller displays. */ | 157 | /* TRANSLATORS: This string will be truncated on smaller displays. */ |
| 2346 | 157 | text: i18n.tr("Forward to") | 158 | text: i18n.tr("Forward to") |
| 2348 | 158 | control: TextField { | 159 | |
| 2349 | 160 | TextField { | ||
| 2350 | 159 | id: field | 161 | id: field |
| 2351 | 160 | objectName: "field_" + rule | 162 | objectName: "field_" + rule |
| 2352 | 161 | horizontalAlignment: TextInput.AlignRight | 163 | horizontalAlignment: TextInput.AlignRight |
| 2353 | @@ -198,7 +200,7 @@ | |||
| 2354 | 198 | } | 200 | } |
| 2355 | 199 | } | 201 | } |
| 2356 | 200 | 202 | ||
| 2358 | 201 | ListItem.SingleValue { | 203 | SettingsListItems.SingleValue { |
| 2359 | 202 | id: current | 204 | id: current |
| 2360 | 203 | objectName: "current_" + rule | 205 | objectName: "current_" + rule |
| 2361 | 204 | visible: value | 206 | visible: value |
| 2362 | 205 | 207 | ||
| 2363 | === modified file 'plugins/phone/CallForwarding.qml' | |||
| 2364 | --- plugins/phone/CallForwarding.qml 2015-11-05 16:40:24 +0000 | |||
| 2365 | +++ plugins/phone/CallForwarding.qml 2015-11-27 13:34:19 +0000 | |||
| 2366 | @@ -1,7 +1,7 @@ | |||
| 2367 | 1 | /* | 1 | /* |
| 2368 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2369 | 3 | * | 3 | * |
| 2371 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 2372 | 5 | * | 5 | * |
| 2373 | 6 | * Contact: | 6 | * Contact: |
| 2374 | 7 | * Sebastien Bacher <sebastien.bacher@canonical.com> | 7 | * Sebastien Bacher <sebastien.bacher@canonical.com> |
| 2375 | @@ -164,7 +164,6 @@ | |||
| 2376 | 164 | SettingsItemTitle { | 164 | SettingsItemTitle { |
| 2377 | 165 | id: fwdSomeTitle | 165 | id: fwdSomeTitle |
| 2378 | 166 | text: i18n.tr("Forward incoming calls when:") | 166 | text: i18n.tr("Forward incoming calls when:") |
| 2379 | 167 | showDivider: false | ||
| 2380 | 168 | } | 167 | } |
| 2381 | 169 | 168 | ||
| 2382 | 170 | CallForwardItem { | 169 | CallForwardItem { |
| 2383 | 171 | 170 | ||
| 2384 | === modified file 'plugins/phone/CallWaiting.qml' | |||
| 2385 | --- plugins/phone/CallWaiting.qml 2015-08-10 13:31:45 +0000 | |||
| 2386 | +++ plugins/phone/CallWaiting.qml 2015-11-27 13:34:19 +0000 | |||
| 2387 | @@ -20,8 +20,9 @@ | |||
| 2388 | 20 | 20 | ||
| 2389 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2390 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 2391 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2392 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 2394 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2395 | 25 | import MeeGo.QOfono 0.2 | 26 | import MeeGo.QOfono 0.2 |
| 2396 | 26 | 27 | ||
| 2397 | 27 | ItemPage { | 28 | ItemPage { |
| 2398 | @@ -42,7 +43,7 @@ | |||
| 2399 | 42 | callWaitingIndicator.running = false; | 43 | callWaitingIndicator.running = false; |
| 2400 | 43 | } | 44 | } |
| 2401 | 44 | onVoiceCallWaitingComplete: { | 45 | onVoiceCallWaitingComplete: { |
| 2403 | 45 | //When the property change is complete, the value of checked should always be in sync with serverChecked | 46 | //When the property change is complete, the value of checked should always be in sync with serverChecked |
| 2404 | 46 | callWaitingSwitch.checked = callWaitingSwitch.serverChecked | 47 | callWaitingSwitch.checked = callWaitingSwitch.serverChecked |
| 2405 | 47 | /* Log some additional output to help debug when things don't work */ | 48 | /* Log some additional output to help debug when things don't work */ |
| 2406 | 48 | console.warn('callSettings, onVoiceCallWaitingComplete modem: ' + modemPath + ' success: ' + success + ' ' + voiceCallWaiting); | 49 | console.warn('callSettings, onVoiceCallWaitingComplete modem: ' + modemPath + ' success: ' + success + ' ' + voiceCallWaiting); |
| 2407 | @@ -50,54 +51,40 @@ | |||
| 2408 | 50 | } | 51 | } |
| 2409 | 51 | } | 52 | } |
| 2410 | 52 | 53 | ||
| 2411 | 53 | ActivityIndicator { | ||
| 2412 | 54 | id: callWaitingIndicator | ||
| 2413 | 55 | running: true | ||
| 2414 | 56 | visible: running && attached | ||
| 2415 | 57 | } | ||
| 2416 | 58 | |||
| 2417 | 59 | Switch { | ||
| 2418 | 60 | id: callWaitingSwitch | ||
| 2419 | 61 | objectName: "callWaitingSwitch" | ||
| 2420 | 62 | visible: !callWaitingIndicator.running | ||
| 2421 | 63 | enabled: callSettings.ready && attached | ||
| 2422 | 64 | property bool serverChecked: callSettings.voiceCallWaiting !== "disabled" | ||
| 2423 | 65 | onServerCheckedChanged: checked = serverChecked | ||
| 2424 | 66 | Component.onCompleted: checked = serverChecked | ||
| 2425 | 67 | onTriggered: { | ||
| 2426 | 68 | callWaitingIndicator.running = true; | ||
| 2427 | 69 | if (checked) | ||
| 2428 | 70 | callSettings.voiceCallWaiting = "enabled"; | ||
| 2429 | 71 | else | ||
| 2430 | 72 | callSettings.voiceCallWaiting = "disabled"; | ||
| 2431 | 73 | } | ||
| 2432 | 74 | } | ||
| 2433 | 75 | |||
| 2434 | 76 | Column { | 54 | Column { |
| 2435 | 77 | anchors.fill: parent | 55 | anchors.fill: parent |
| 2436 | 78 | 56 | ||
| 2438 | 79 | ListItem.Standard { | 57 | SettingsListItems.Standard { |
| 2439 | 80 | id: callWaitingItem | 58 | id: callWaitingItem |
| 2440 | 81 | text: i18n.tr("Call waiting") | 59 | text: i18n.tr("Call waiting") |
| 2441 | 82 | control: callWaitingIndicator.running ? | ||
| 2442 | 83 | callWaitingIndicator : callWaitingSwitch | ||
| 2443 | 84 | } | ||
| 2444 | 85 | 60 | ||
| 2453 | 86 | ListItem.Base { | 61 | Switch { |
| 2454 | 87 | height: textItem.height + units.gu(2) | 62 | id: callWaitingSwitch |
| 2455 | 88 | Label { | 63 | objectName: "callWaitingSwitch" |
| 2456 | 89 | id: textItem | 64 | visible: !callWaitingIndicator.running |
| 2457 | 90 | anchors { | 65 | enabled: callSettings.ready && attached |
| 2458 | 91 | left: parent.left | 66 | property bool serverChecked: callSettings.voiceCallWaiting !== "disabled" |
| 2459 | 92 | right: parent.right | 67 | onServerCheckedChanged: checked = serverChecked |
| 2460 | 93 | verticalCenter: parent.verticalCenter | 68 | Component.onCompleted: checked = serverChecked |
| 2461 | 69 | onTriggered: { | ||
| 2462 | 70 | callWaitingIndicator.running = true; | ||
| 2463 | 71 | if (checked) | ||
| 2464 | 72 | callSettings.voiceCallWaiting = "enabled"; | ||
| 2465 | 73 | else | ||
| 2466 | 74 | callSettings.voiceCallWaiting = "disabled"; | ||
| 2467 | 94 | } | 75 | } |
| 2474 | 95 | 76 | } | |
| 2475 | 96 | text: i18n.tr("Lets you answer or start a new call while on another call, and switch between them") | 77 | |
| 2476 | 97 | horizontalAlignment: Text.AlignHCenter | 78 | ActivityIndicator { |
| 2477 | 98 | wrapMode: Text.WordWrap | 79 | id: callWaitingIndicator |
| 2478 | 99 | } | 80 | running: callWaitingIndicator.running |
| 2479 | 100 | showDivider: false | 81 | visible: running && attached |
| 2480 | 82 | } | ||
| 2481 | 83 | |||
| 2482 | 84 | } | ||
| 2483 | 85 | |||
| 2484 | 86 | ListItems.Caption { | ||
| 2485 | 87 | text: i18n.tr("Lets you answer or start a new call while on another call, and switch between them") | ||
| 2486 | 101 | } | 88 | } |
| 2487 | 102 | } | 89 | } |
| 2488 | 103 | } | 90 | } |
| 2489 | 104 | 91 | ||
| 2490 | === modified file 'plugins/phone/MultiSim.qml' | |||
| 2491 | --- plugins/phone/MultiSim.qml 2015-11-05 16:40:24 +0000 | |||
| 2492 | +++ plugins/phone/MultiSim.qml 2015-11-27 13:34:19 +0000 | |||
| 2493 | @@ -1,5 +1,5 @@ | |||
| 2494 | 1 | /* | 1 | /* |
| 2496 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2015 Canonical Ltd |
| 2497 | 3 | * | 3 | * |
| 2498 | 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 |
| 2499 | 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 |
| 2500 | @@ -21,8 +21,8 @@ | |||
| 2501 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2502 | 22 | import GSettings 1.0 | 22 | import GSettings 1.0 |
| 2503 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 2504 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2505 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 2506 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2507 | 26 | 26 | ||
| 2508 | 27 | Column { | 27 | Column { |
| 2509 | 28 | 28 | ||
| 2510 | @@ -37,20 +37,18 @@ | |||
| 2511 | 37 | 37 | ||
| 2512 | 38 | SettingsItemTitle { text: sims[index].title } | 38 | SettingsItemTitle { text: sims[index].title } |
| 2513 | 39 | 39 | ||
| 2515 | 40 | ListItem.Standard { | 40 | SettingsListItems.StandardProgression { |
| 2516 | 41 | objectName: "callWaitSim" + index | 41 | objectName: "callWaitSim" + index |
| 2517 | 42 | text: i18n.tr("Call waiting") | 42 | text: i18n.tr("Call waiting") |
| 2518 | 43 | progression: true | ||
| 2519 | 44 | onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), { | 43 | onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), { |
| 2520 | 45 | sim: sims[index], | 44 | sim: sims[index], |
| 2521 | 46 | headerTitle: sims[index].title | 45 | headerTitle: sims[index].title |
| 2522 | 47 | }) | 46 | }) |
| 2523 | 48 | } | 47 | } |
| 2524 | 49 | 48 | ||
| 2526 | 50 | ListItem.SingleValue { | 49 | SettingsListItems.SingleValueProgression { |
| 2527 | 51 | objectName: "callFwdSim" + index | 50 | objectName: "callFwdSim" + index |
| 2528 | 52 | text: i18n.tr("Call forwarding") | 51 | text: i18n.tr("Call forwarding") |
| 2529 | 53 | progression: true | ||
| 2530 | 54 | value: sims[index].getCallForwardingSummary() | 52 | value: sims[index].getCallForwardingSummary() |
| 2531 | 55 | onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), { | 53 | onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), { |
| 2532 | 56 | sim: sims[index], | 54 | sim: sims[index], |
| 2533 | @@ -58,10 +56,9 @@ | |||
| 2534 | 58 | }) | 56 | }) |
| 2535 | 59 | } | 57 | } |
| 2536 | 60 | 58 | ||
| 2538 | 61 | ListItem.Standard { | 59 | SettingsListItems.StandardProgression { |
| 2539 | 62 | objectName: "simServicesSim" + index | 60 | objectName: "simServicesSim" + index |
| 2540 | 63 | text: i18n.tr("Services") | 61 | text: i18n.tr("Services") |
| 2541 | 64 | progression: true | ||
| 2542 | 65 | enabled: { | 62 | enabled: { |
| 2543 | 66 | var num; | 63 | var num; |
| 2544 | 67 | var map = sims[index].simMng.serviceNumbers; | 64 | var map = sims[index].simMng.serviceNumbers; |
| 2545 | @@ -82,10 +79,6 @@ | |||
| 2546 | 82 | }) | 79 | }) |
| 2547 | 83 | } | 80 | } |
| 2548 | 84 | 81 | ||
| 2549 | 85 | ListItem.Divider { | ||
| 2550 | 86 | visible: index !== (sims.length - 1) | ||
| 2551 | 87 | } | ||
| 2552 | 88 | |||
| 2553 | 89 | Binding { | 82 | Binding { |
| 2554 | 90 | target: sims[index] | 83 | target: sims[index] |
| 2555 | 91 | property: "name" | 84 | property: "name" |
| 2556 | 92 | 85 | ||
| 2557 | === modified file 'plugins/phone/NoSims.qml' | |||
| 2558 | --- plugins/phone/NoSims.qml 2015-08-10 13:31:45 +0000 | |||
| 2559 | +++ plugins/phone/NoSims.qml 2015-11-27 13:34:19 +0000 | |||
| 2560 | @@ -1,5 +1,5 @@ | |||
| 2561 | 1 | /* | 1 | /* |
| 2563 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2015 Canonical Ltd |
| 2564 | 3 | * | 3 | * |
| 2565 | 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 |
| 2566 | 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 |
| 2567 | @@ -19,28 +19,22 @@ | |||
| 2568 | 19 | * | 19 | * |
| 2569 | 20 | */ | 20 | */ |
| 2570 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2573 | 22 | import Ubuntu.Components 1.3 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems |
| 2572 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2574 | 24 | 23 | ||
| 2575 | 25 | Column { | 24 | Column { |
| 2576 | 26 | 25 | ||
| 2578 | 27 | ListItem.Standard { | 26 | SettingsListItems.StandardProgression { |
| 2579 | 28 | text: i18n.tr("Call forwarding") | 27 | text: i18n.tr("Call forwarding") |
| 2580 | 29 | progression: true | ||
| 2581 | 30 | enabled: false | 28 | enabled: false |
| 2582 | 31 | } | 29 | } |
| 2583 | 32 | 30 | ||
| 2585 | 33 | ListItem.Standard { | 31 | SettingsListItems.StandardProgression { |
| 2586 | 34 | text: i18n.tr("Call waiting") | 32 | text: i18n.tr("Call waiting") |
| 2587 | 35 | progression: true | ||
| 2588 | 36 | enabled: false | 33 | enabled: false |
| 2589 | 37 | } | 34 | } |
| 2590 | 38 | 35 | ||
| 2594 | 39 | ListItem.Divider {} | 36 | SettingsListItems.StandardProgression { |
| 2592 | 40 | |||
| 2593 | 41 | ListItem.Standard { | ||
| 2595 | 42 | text: i18n.tr("Services") | 37 | text: i18n.tr("Services") |
| 2596 | 43 | progression: true | ||
| 2597 | 44 | enabled: false | 38 | enabled: false |
| 2598 | 45 | } | 39 | } |
| 2599 | 46 | } | 40 | } |
| 2600 | 47 | 41 | ||
| 2601 | === modified file 'plugins/phone/PageComponent.qml' | |||
| 2602 | --- plugins/phone/PageComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 2603 | +++ plugins/phone/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 2604 | @@ -1,7 +1,7 @@ | |||
| 2605 | 1 | /* | 1 | /* |
| 2606 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2607 | 3 | * | 3 | * |
| 2609 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 2610 | 5 | * | 5 | * |
| 2611 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 2612 | 7 | * | 7 | * |
| 2613 | @@ -20,8 +20,8 @@ | |||
| 2614 | 20 | 20 | ||
| 2615 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2616 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 2617 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2618 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 2619 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2620 | 25 | import Ubuntu.SystemSettings.Sound 1.0 | 25 | import Ubuntu.SystemSettings.Sound 1.0 |
| 2621 | 26 | import MeeGo.QOfono 0.2 | 26 | import MeeGo.QOfono 0.2 |
| 2622 | 27 | import "sims.js" as Sims | 27 | import "sims.js" as Sims |
| 2623 | @@ -89,10 +89,8 @@ | |||
| 2624 | 89 | anchors { left: parent.left; right: parent.right } | 89 | anchors { left: parent.left; right: parent.right } |
| 2625 | 90 | } | 90 | } |
| 2626 | 91 | 91 | ||
| 2631 | 92 | ListItem.Divider {} | 92 | SettingsListItems.Standard { |
| 2632 | 93 | 93 | Switch { | |
| 2629 | 94 | ListItem.Standard { | ||
| 2630 | 95 | control: Switch { | ||
| 2633 | 96 | objectName: "dialpadSounds" | 94 | objectName: "dialpadSounds" |
| 2634 | 97 | property bool serverChecked: soundPlugin.dialpadSoundsEnabled | 95 | property bool serverChecked: soundPlugin.dialpadSoundsEnabled |
| 2635 | 98 | onServerCheckedChanged: checked = serverChecked | 96 | onServerCheckedChanged: checked = serverChecked |
| 2636 | 99 | 97 | ||
| 2637 | === modified file 'plugins/phone/ServiceInfo.qml' | |||
| 2638 | --- plugins/phone/ServiceInfo.qml 2015-10-16 13:42:50 +0000 | |||
| 2639 | +++ plugins/phone/ServiceInfo.qml 2015-11-27 13:34:19 +0000 | |||
| 2640 | @@ -1,7 +1,7 @@ | |||
| 2641 | 1 | /* | 1 | /* |
| 2642 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2643 | 3 | * | 3 | * |
| 2645 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 2646 | 5 | * | 5 | * |
| 2647 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> |
| 2648 | 7 | * | 7 | * |
| 2649 | @@ -20,8 +20,8 @@ | |||
| 2650 | 20 | 20 | ||
| 2651 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2652 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 2653 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2654 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 2655 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2656 | 25 | import Ubuntu.History 0.1 | 25 | import Ubuntu.History 0.1 |
| 2657 | 26 | import "dateUtils.js" as DateUtils | 26 | import "dateUtils.js" as DateUtils |
| 2658 | 27 | 27 | ||
| 2659 | @@ -83,7 +83,7 @@ | |||
| 2660 | 83 | verticalCenter: parent.verticalCenter | 83 | verticalCenter: parent.verticalCenter |
| 2661 | 84 | } | 84 | } |
| 2662 | 85 | 85 | ||
| 2664 | 86 | ListItem.Base { | 86 | Item { |
| 2665 | 87 | anchors.left: parent.left | 87 | anchors.left: parent.left |
| 2666 | 88 | anchors.right: parent.right | 88 | anchors.right: parent.right |
| 2667 | 89 | height: lastCalledCol.height + units.gu(6) | 89 | height: lastCalledCol.height + units.gu(6) |
| 2668 | @@ -112,9 +112,10 @@ | |||
| 2669 | 112 | } | 112 | } |
| 2670 | 113 | } | 113 | } |
| 2671 | 114 | 114 | ||
| 2673 | 115 | ListItem.SingleControl { | 115 | SettingsListItems.SingleControl { |
| 2674 | 116 | anchors.bottom: parent.bottom | 116 | anchors.bottom: parent.bottom |
| 2676 | 117 | control: Button { | 117 | |
| 2677 | 118 | Button { | ||
| 2678 | 118 | width: parent.width - units.gu(4) | 119 | width: parent.width - units.gu(4) |
| 2679 | 119 | text: i18n.tr("Call") | 120 | text: i18n.tr("Call") |
| 2680 | 120 | onClicked: Qt.openUrlExternally("tel:///" + encodeURIComponent( | 121 | onClicked: Qt.openUrlExternally("tel:///" + encodeURIComponent( |
| 2681 | 121 | 122 | ||
| 2682 | === modified file 'plugins/phone/Services.qml' | |||
| 2683 | --- plugins/phone/Services.qml 2015-08-10 13:31:45 +0000 | |||
| 2684 | +++ plugins/phone/Services.qml 2015-11-27 13:34:19 +0000 | |||
| 2685 | @@ -1,7 +1,7 @@ | |||
| 2686 | 1 | /* | 1 | /* |
| 2687 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2688 | 3 | * | 3 | * |
| 2690 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 2691 | 5 | * | 5 | * |
| 2692 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> |
| 2693 | 7 | * | 7 | * |
| 2694 | @@ -20,8 +20,8 @@ | |||
| 2695 | 20 | 20 | ||
| 2696 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2697 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 2698 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2699 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 2700 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2701 | 25 | 25 | ||
| 2702 | 26 | ItemPage { | 26 | ItemPage { |
| 2703 | 27 | id: root | 27 | id: root |
| 2704 | @@ -60,8 +60,7 @@ | |||
| 2705 | 60 | Repeater { | 60 | Repeater { |
| 2706 | 61 | model: names | 61 | model: names |
| 2707 | 62 | 62 | ||
| 2710 | 63 | ListItem.Standard { | 63 | SettingsListItems.StandardProgression { |
| 2709 | 64 | progression: true | ||
| 2711 | 65 | text: modelData | 64 | text: modelData |
| 2712 | 66 | onClicked: pageStack.push(Qt.resolvedUrl("ServiceInfo.qml"), {serviceName: modelData, serviceNumber: sim.serviceNumbers[modelData]}) | 65 | onClicked: pageStack.push(Qt.resolvedUrl("ServiceInfo.qml"), {serviceName: modelData, serviceNumber: sim.serviceNumbers[modelData]}) |
| 2713 | 67 | } | 66 | } |
| 2714 | 68 | 67 | ||
| 2715 | === modified file 'plugins/phone/SingleSim.qml' | |||
| 2716 | --- plugins/phone/SingleSim.qml 2015-11-05 16:40:24 +0000 | |||
| 2717 | +++ plugins/phone/SingleSim.qml 2015-11-27 13:34:19 +0000 | |||
| 2718 | @@ -1,5 +1,5 @@ | |||
| 2719 | 1 | /* | 1 | /* |
| 2721 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2015 Canonical Ltd |
| 2722 | 3 | * | 3 | * |
| 2723 | 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 |
| 2724 | 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 |
| 2725 | @@ -19,8 +19,8 @@ | |||
| 2726 | 19 | * | 19 | * |
| 2727 | 20 | */ | 20 | */ |
| 2728 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2729 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2730 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2731 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2732 | 24 | 24 | ||
| 2733 | 25 | Column { | 25 | Column { |
| 2734 | 26 | 26 | ||
| 2735 | @@ -29,30 +29,23 @@ | |||
| 2736 | 29 | property string carrierString: carrierName ? carrierName : i18n.tr("SIM") | 29 | property string carrierString: carrierName ? carrierName : i18n.tr("SIM") |
| 2737 | 30 | 30 | ||
| 2738 | 31 | 31 | ||
| 2740 | 32 | ListItem.Standard { | 32 | SettingsListItems.StandardProgression { |
| 2741 | 33 | objectName: "callWait" | 33 | objectName: "callWait" |
| 2742 | 34 | text: i18n.tr("Call waiting") | 34 | text: i18n.tr("Call waiting") |
| 2743 | 35 | progression: true | ||
| 2744 | 36 | onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {sim: sim}) | 35 | onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {sim: sim}) |
| 2745 | 37 | } | 36 | } |
| 2746 | 38 | 37 | ||
| 2748 | 39 | ListItem.SingleValue { | 38 | SettingsListItems.SingleValueProgression { |
| 2749 | 40 | objectName: "callFwd" | 39 | objectName: "callFwd" |
| 2750 | 41 | text: i18n.tr("Call forwarding") | 40 | text: i18n.tr("Call forwarding") |
| 2751 | 42 | showDivider: false | ||
| 2752 | 43 | progression: true | ||
| 2753 | 44 | value: sim.getCallForwardingSummary() | 41 | value: sim.getCallForwardingSummary() |
| 2754 | 45 | onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {sim: sim}) | 42 | onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {sim: sim}) |
| 2755 | 46 | } | 43 | } |
| 2756 | 47 | 44 | ||
| 2760 | 48 | ListItem.Divider {} | 45 | SettingsListItems.StandardProgression { |
| 2758 | 49 | |||
| 2759 | 50 | ListItem.Standard { | ||
| 2761 | 51 | objectName: "simServices" | 46 | objectName: "simServices" |
| 2762 | 52 | // TRANSLATORS: %1 is the name of the (network) carrier | 47 | // TRANSLATORS: %1 is the name of the (network) carrier |
| 2763 | 53 | text: i18n.tr("%1 Services").arg(carrierString) | 48 | text: i18n.tr("%1 Services").arg(carrierString) |
| 2764 | 54 | progression: true | ||
| 2765 | 55 | showDivider: false | ||
| 2766 | 56 | enabled: { | 49 | enabled: { |
| 2767 | 57 | var num; | 50 | var num; |
| 2768 | 58 | var map = sim.simMng.serviceNumbers; | 51 | var map = sim.simMng.serviceNumbers; |
| 2769 | 59 | 52 | ||
| 2770 | === modified file 'plugins/reset/EntryComponent.qml' | |||
| 2771 | --- plugins/reset/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 2772 | +++ plugins/reset/EntryComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 2773 | @@ -19,14 +19,12 @@ | |||
| 2774 | 19 | */ | 19 | */ |
| 2775 | 20 | 20 | ||
| 2776 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2777 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2778 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2779 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2780 | 24 | 24 | ||
| 2782 | 25 | ListItem.Standard { | 25 | SettingsListItems.IconProgression { |
| 2783 | 26 | id: root | 26 | id: root |
| 2784 | 27 | objectName: "entryComponent-reset" | 27 | objectName: "entryComponent-reset" |
| 2785 | 28 | iconSource: model.icon | 28 | iconSource: model.icon |
| 2786 | 29 | iconFrame: false | ||
| 2787 | 30 | text: i18n.tr(model.displayName) | 29 | text: i18n.tr(model.displayName) |
| 2788 | 31 | progression: true | ||
| 2789 | 32 | } | 30 | } |
| 2790 | 33 | 31 | ||
| 2791 | === modified file 'plugins/reset/PageComponent.qml' | |||
| 2792 | --- plugins/reset/PageComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 2793 | +++ plugins/reset/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 2794 | @@ -21,8 +21,8 @@ | |||
| 2795 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2796 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 2797 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 2798 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2799 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 2800 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2801 | 26 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 2802 | 27 | import Ubuntu.SystemSettings.Reset 1.0 | 27 | import Ubuntu.SystemSettings.Reset 1.0 |
| 2803 | 28 | 28 | ||
| 2804 | @@ -66,46 +66,81 @@ | |||
| 2805 | 66 | anchors.left: parent.left | 66 | anchors.left: parent.left |
| 2806 | 67 | anchors.right: parent.right | 67 | anchors.right: parent.right |
| 2807 | 68 | 68 | ||
| 2810 | 69 | ListItem.SingleControl { | 69 | Label { |
| 2811 | 70 | control: Button { | 70 | anchors { |
| 2812 | 71 | left: parent.left | ||
| 2813 | 72 | right: parent.right | ||
| 2814 | 73 | margins: units.gu(2) | ||
| 2815 | 74 | } | ||
| 2816 | 75 | text: i18n.tr("Reset Launcher") | ||
| 2817 | 76 | color: UbuntuColors.orange | ||
| 2818 | 77 | height: units.gu(6) | ||
| 2819 | 78 | verticalAlignment: Text.AlignVCenter | ||
| 2820 | 79 | } | ||
| 2821 | 80 | |||
| 2822 | 81 | SettingsListItems.Standard { | ||
| 2823 | 82 | |||
| 2824 | 83 | Button { | ||
| 2825 | 71 | id: resetLauncherHomeButton | 84 | id: resetLauncherHomeButton |
| 2826 | 72 | objectName: "resetLauncher" | 85 | objectName: "resetLauncher" |
| 2827 | 73 | text: i18n.tr("Reset Launcher") | 86 | text: i18n.tr("Reset Launcher") |
| 2828 | 74 | width: parent.width - units.gu(4) | ||
| 2829 | 75 | onClicked: { | 87 | onClicked: { |
| 2830 | 76 | buttonActions.source = "ResetLauncherHome.qml"; | 88 | buttonActions.source = "ResetLauncherHome.qml"; |
| 2831 | 77 | root.popup = PopupUtils.open(buttonActions.item); | 89 | root.popup = PopupUtils.open(buttonActions.item); |
| 2832 | 78 | } | 90 | } |
| 2833 | 79 | } | 91 | } |
| 2840 | 80 | showDivider: false | 92 | } |
| 2841 | 81 | } | 93 | |
| 2842 | 82 | 94 | Label { | |
| 2843 | 83 | ListItem.SingleControl { | 95 | anchors { |
| 2844 | 84 | visible: false // enabled when backend is ready/useful | 96 | left: parent.left |
| 2845 | 85 | control: Button { | 97 | right: parent.right |
| 2846 | 98 | margins: units.gu(2) | ||
| 2847 | 99 | } | ||
| 2848 | 100 | visible: showAllUI | ||
| 2849 | 101 | text: i18n.tr("Reset all system settings…") | ||
| 2850 | 102 | color: UbuntuColors.orange | ||
| 2851 | 103 | height: units.gu(6) | ||
| 2852 | 104 | verticalAlignment: Text.AlignVCenter | ||
| 2853 | 105 | } | ||
| 2854 | 106 | |||
| 2855 | 107 | SettingsListItems.Standard { | ||
| 2856 | 108 | visible: showAllUI | ||
| 2857 | 109 | |||
| 2858 | 110 | Button { | ||
| 2859 | 86 | id: resetAllSettingsButton | 111 | id: resetAllSettingsButton |
| 2860 | 87 | text: i18n.tr("Reset all system settings…") | 112 | text: i18n.tr("Reset all system settings…") |
| 2861 | 88 | width: parent.width - units.gu(4) | ||
| 2862 | 89 | onClicked: { | 113 | onClicked: { |
| 2863 | 90 | buttonActions.source = "ResetAllSettings.qml"; | 114 | buttonActions.source = "ResetAllSettings.qml"; |
| 2864 | 91 | root.popup = PopupUtils.open(buttonActions.item); | 115 | root.popup = PopupUtils.open(buttonActions.item); |
| 2865 | 92 | } | 116 | } |
| 2866 | 93 | } | 117 | } |
| 2872 | 94 | showDivider: false | 118 | } |
| 2873 | 95 | } | 119 | |
| 2874 | 96 | 120 | Label { | |
| 2875 | 97 | ListItem.SingleControl { | 121 | anchors { |
| 2876 | 98 | control: Button { | 122 | left: parent.left |
| 2877 | 123 | right: parent.right | ||
| 2878 | 124 | margins: units.gu(2) | ||
| 2879 | 125 | } | ||
| 2880 | 126 | text: i18n.tr("Erase & Reset All") | ||
| 2881 | 127 | color: UbuntuColors.orange | ||
| 2882 | 128 | height: units.gu(6) | ||
| 2883 | 129 | verticalAlignment: Text.AlignVCenter | ||
| 2884 | 130 | } | ||
| 2885 | 131 | |||
| 2886 | 132 | SettingsListItems.Standard { | ||
| 2887 | 133 | |||
| 2888 | 134 | Button { | ||
| 2889 | 99 | id: eraseEverythingButton | 135 | id: eraseEverythingButton |
| 2890 | 100 | objectName: "factoryReset" | 136 | objectName: "factoryReset" |
| 2893 | 101 | text: i18n.tr("Erase & Reset Everything…") | 137 | |
| 2894 | 102 | width: parent.width - units.gu(4) | 138 | text: i18n.tr("Erase & Reset All") |
| 2895 | 103 | onClicked: { | 139 | onClicked: { |
| 2896 | 104 | buttonActions.source = "EraseEverything.qml"; | 140 | buttonActions.source = "EraseEverything.qml"; |
| 2897 | 105 | root.popup = PopupUtils.open(buttonActions.item); | 141 | root.popup = PopupUtils.open(buttonActions.item); |
| 2898 | 106 | } | 142 | } |
| 2899 | 107 | } | 143 | } |
| 2900 | 108 | showDivider: false | ||
| 2901 | 109 | } | 144 | } |
| 2902 | 110 | } | 145 | } |
| 2903 | 111 | } | 146 | } |
| 2904 | 112 | 147 | ||
| 2905 | === modified file 'plugins/sound/PageComponent.qml' | |||
| 2906 | --- plugins/sound/PageComponent.qml 2015-10-23 14:57:26 +0000 | |||
| 2907 | +++ plugins/sound/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 2908 | @@ -21,8 +21,8 @@ | |||
| 2909 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2910 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 2911 | 23 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2912 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2913 | 25 | import SystemSettings 1.0 | 24 | import SystemSettings 1.0 |
| 2914 | 25 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2915 | 26 | import Ubuntu.SystemSettings.Sound 1.0 | 26 | import Ubuntu.SystemSettings.Sound 1.0 |
| 2916 | 27 | import Ubuntu.Settings.Menus 0.1 as Menus | 27 | import Ubuntu.Settings.Menus 0.1 as Menus |
| 2917 | 28 | import Ubuntu.Settings.Components 0.1 as USC | 28 | import Ubuntu.Settings.Components 0.1 as USC |
| 2918 | @@ -66,8 +66,10 @@ | |||
| 2919 | 66 | anchors.left: parent.left | 66 | anchors.left: parent.left |
| 2920 | 67 | anchors.right: parent.right | 67 | anchors.right: parent.right |
| 2921 | 68 | 68 | ||
| 2924 | 69 | ListItem.Standard { | 69 | SettingsListItems.Standard { |
| 2925 | 70 | control: Switch { | 70 | text: i18n.tr("Silent Mode") |
| 2926 | 71 | |||
| 2927 | 72 | Switch { | ||
| 2928 | 71 | id: silentModeSwitch | 73 | id: silentModeSwitch |
| 2929 | 72 | objectName: "silentMode" | 74 | objectName: "silentMode" |
| 2930 | 73 | property bool serverChecked: soundActionGroup.silentMode.state | 75 | property bool serverChecked: soundActionGroup.silentMode.state |
| 2931 | @@ -81,7 +83,6 @@ | |||
| 2932 | 81 | onSyncTriggered: soundActionGroup.silentMode.activate() | 83 | onSyncTriggered: soundActionGroup.silentMode.activate() |
| 2933 | 82 | } | 84 | } |
| 2934 | 83 | } | 85 | } |
| 2935 | 84 | text: i18n.tr("Silent Mode") | ||
| 2936 | 85 | } | 86 | } |
| 2937 | 86 | 87 | ||
| 2938 | 87 | SettingsItemTitle { | 88 | SettingsItemTitle { |
| 2939 | @@ -123,7 +124,7 @@ | |||
| 2940 | 123 | } | 124 | } |
| 2941 | 124 | } | 125 | } |
| 2942 | 125 | 126 | ||
| 2944 | 126 | ListItem.Standard { | 127 | SettingsListItems.Standard { |
| 2945 | 127 | id: highVolumeWarning | 128 | id: highVolumeWarning |
| 2946 | 128 | visible: soundActionGroup.highVolume.state == true | 129 | visible: soundActionGroup.highVolume.state == true |
| 2947 | 129 | text: i18n.tr("High volume can damage your hearing.") | 130 | text: i18n.tr("High volume can damage your hearing.") |
| 2948 | @@ -133,22 +134,22 @@ | |||
| 2949 | 133 | text: i18n.tr("Phone calls:") | 134 | text: i18n.tr("Phone calls:") |
| 2950 | 134 | } | 135 | } |
| 2951 | 135 | 136 | ||
| 2953 | 136 | ListItem.SingleValue { | 137 | SettingsListItems.SingleValueProgression { |
| 2954 | 137 | text: i18n.tr("Ringtone") | 138 | text: i18n.tr("Ringtone") |
| 2958 | 138 | value: Utilities.buildDisplayName( | 139 | value: Utilities.buildDisplayName(backendInfo.incomingCallSound) |
| 2959 | 139 | backendInfo.incomingCallSound) | 140 | |
| 2957 | 140 | progression: true | ||
| 2960 | 141 | onClicked: pageStack.push( | 141 | onClicked: pageStack.push( |
| 2967 | 142 | Qt.resolvedUrl("SoundsList.qml"), | 142 | Qt.resolvedUrl("SoundsList.qml"), { |
| 2968 | 143 | { title: i18n.tr("Ringtone"), | 143 | title: i18n.tr("Ringtone"), |
| 2969 | 144 | showStopButton: true, | 144 | showStopButton: true, |
| 2970 | 145 | soundType: 0, | 145 | soundType: 0, |
| 2971 | 146 | soundsDir: | 146 | soundsDir: "/usr/share/sounds/ubuntu/ringtones/" |
| 2972 | 147 | "/usr/share/sounds/ubuntu/ringtones/" }) | 147 | } |
| 2973 | 148 | ) | ||
| 2974 | 148 | } | 149 | } |
| 2975 | 149 | 150 | ||
| 2978 | 150 | ListItem.Standard { | 151 | SettingsListItems.Standard { |
| 2979 | 151 | control: CheckBox { | 152 | CheckBox { |
| 2980 | 152 | objectName: "callVibrate" | 153 | objectName: "callVibrate" |
| 2981 | 153 | property bool serverChecked: backendInfo.incomingCallVibrate | 154 | property bool serverChecked: backendInfo.incomingCallVibrate |
| 2982 | 154 | onServerCheckedChanged: checked = serverChecked | 155 | onServerCheckedChanged: checked = serverChecked |
| 2983 | @@ -158,8 +159,8 @@ | |||
| 2984 | 158 | text: i18n.tr("Vibrate on ring") | 159 | text: i18n.tr("Vibrate on ring") |
| 2985 | 159 | } | 160 | } |
| 2986 | 160 | 161 | ||
| 2989 | 161 | ListItem.Standard { | 162 | SettingsListItems.Standard { |
| 2990 | 162 | control: CheckBox { | 163 | CheckBox { |
| 2991 | 163 | objectName: "callVibrateSilentMode" | 164 | objectName: "callVibrateSilentMode" |
| 2992 | 164 | property bool serverChecked: backendInfo.incomingCallVibrateSilentMode | 165 | property bool serverChecked: backendInfo.incomingCallVibrateSilentMode |
| 2993 | 165 | onServerCheckedChanged: checked = serverChecked | 166 | onServerCheckedChanged: checked = serverChecked |
| 2994 | @@ -169,8 +170,8 @@ | |||
| 2995 | 169 | text: i18n.tr("Vibrate in Silent Mode") | 170 | text: i18n.tr("Vibrate in Silent Mode") |
| 2996 | 170 | } | 171 | } |
| 2997 | 171 | 172 | ||
| 3000 | 172 | ListItem.Standard { | 173 | SettingsListItems.Standard { |
| 3001 | 173 | control: Switch { | 174 | Switch { |
| 3002 | 174 | objectName: "dialpadSounds" | 175 | objectName: "dialpadSounds" |
| 3003 | 175 | property bool serverChecked: backendInfo.dialpadSoundsEnabled | 176 | property bool serverChecked: backendInfo.dialpadSoundsEnabled |
| 3004 | 176 | onServerCheckedChanged: checked = serverChecked | 177 | onServerCheckedChanged: checked = serverChecked |
| 3005 | @@ -184,11 +185,10 @@ | |||
| 3006 | 184 | text: i18n.tr("Messages:") | 185 | text: i18n.tr("Messages:") |
| 3007 | 185 | } | 186 | } |
| 3008 | 186 | 187 | ||
| 3010 | 187 | ListItem.SingleValue { | 188 | SettingsListItems.SingleValueProgression { |
| 3011 | 188 | text: i18n.tr("Message received") | 189 | text: i18n.tr("Message received") |
| 3012 | 189 | value:Utilities.buildDisplayName( | 190 | value:Utilities.buildDisplayName( |
| 3013 | 190 | backendInfo.incomingMessageSound) | 191 | backendInfo.incomingMessageSound) |
| 3014 | 191 | progression: true | ||
| 3015 | 192 | onClicked: pageStack.push( | 192 | onClicked: pageStack.push( |
| 3016 | 193 | Qt.resolvedUrl("SoundsList.qml"), | 193 | Qt.resolvedUrl("SoundsList.qml"), |
| 3017 | 194 | { title: i18n.tr("Message received"), | 194 | { title: i18n.tr("Message received"), |
| 3018 | @@ -197,8 +197,8 @@ | |||
| 3019 | 197 | "/usr/share/sounds/ubuntu/notifications/" }) | 197 | "/usr/share/sounds/ubuntu/notifications/" }) |
| 3020 | 198 | } | 198 | } |
| 3021 | 199 | 199 | ||
| 3024 | 200 | ListItem.Standard { | 200 | SettingsListItems.Standard { |
| 3025 | 201 | control: CheckBox { | 201 | CheckBox { |
| 3026 | 202 | objectName: "messageVibrate" | 202 | objectName: "messageVibrate" |
| 3027 | 203 | property bool serverChecked: backendInfo.incomingMessageVibrate | 203 | property bool serverChecked: backendInfo.incomingMessageVibrate |
| 3028 | 204 | onServerCheckedChanged: checked = serverChecked | 204 | onServerCheckedChanged: checked = serverChecked |
| 3029 | @@ -208,8 +208,8 @@ | |||
| 3030 | 208 | text: i18n.tr("Vibrate with message sound") | 208 | text: i18n.tr("Vibrate with message sound") |
| 3031 | 209 | } | 209 | } |
| 3032 | 210 | 210 | ||
| 3035 | 211 | ListItem.Standard { | 211 | SettingsListItems.Standard { |
| 3036 | 212 | control: CheckBox { | 212 | CheckBox { |
| 3037 | 213 | objectName: "messageVibrateSilentMode" | 213 | objectName: "messageVibrateSilentMode" |
| 3038 | 214 | property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode | 214 | property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode |
| 3039 | 215 | onServerCheckedChanged: checked = serverChecked | 215 | onServerCheckedChanged: checked = serverChecked |
| 3040 | @@ -223,10 +223,10 @@ | |||
| 3041 | 223 | text: i18n.tr("Other sounds:") | 223 | text: i18n.tr("Other sounds:") |
| 3042 | 224 | } | 224 | } |
| 3043 | 225 | 225 | ||
| 3045 | 226 | ListItem.Standard { | 226 | SettingsListItems.Standard { |
| 3046 | 227 | text: i18n.tr("Keyboard sound") | 227 | text: i18n.tr("Keyboard sound") |
| 3047 | 228 | 228 | ||
| 3049 | 229 | control: Switch { | 229 | Switch { |
| 3050 | 230 | objectName: "keyboardSoundSwitch" | 230 | objectName: "keyboardSoundSwitch" |
| 3051 | 231 | property bool serverChecked: keyboardSettings.keyPressFeedback | 231 | property bool serverChecked: keyboardSettings.keyPressFeedback |
| 3052 | 232 | onServerCheckedChanged: checked = serverChecked | 232 | onServerCheckedChanged: checked = serverChecked |
| 3053 | @@ -235,20 +235,22 @@ | |||
| 3054 | 235 | } | 235 | } |
| 3055 | 236 | } | 236 | } |
| 3056 | 237 | 237 | ||
| 3058 | 238 | ListItem.Standard { | 238 | SettingsListItems.Standard { |
| 3059 | 239 | id: lockSound | 239 | id: lockSound |
| 3061 | 240 | control: Switch { | 240 | |
| 3062 | 241 | Switch { | ||
| 3063 | 241 | checked: false | 242 | checked: false |
| 3064 | 242 | } | 243 | } |
| 3065 | 243 | text: i18n.tr("Lock sound") | 244 | text: i18n.tr("Lock sound") |
| 3066 | 244 | visible: showAllUI | 245 | visible: showAllUI |
| 3067 | 245 | } | 246 | } |
| 3068 | 246 | 247 | ||
| 3070 | 247 | ListItem.Divider {} | 248 | // FIXME: Add spacing here. |
| 3071 | 248 | 249 | ||
| 3073 | 249 | ListItem.Standard { | 250 | SettingsListItems.Standard { |
| 3074 | 250 | text: i18n.tr("Other vibrations") | 251 | text: i18n.tr("Other vibrations") |
| 3076 | 251 | control: Switch { | 252 | |
| 3077 | 253 | Switch { | ||
| 3078 | 252 | objectName: "otherVibrateSwitch" | 254 | objectName: "otherVibrateSwitch" |
| 3079 | 253 | property bool serverChecked: backendInfo.otherVibrate | 255 | property bool serverChecked: backendInfo.otherVibrate |
| 3080 | 254 | onServerCheckedChanged: checked = serverChecked | 256 | onServerCheckedChanged: checked = serverChecked |
| 3081 | 255 | 257 | ||
| 3082 | === modified file 'plugins/time-date/ChooseTimeZone.qml' | |||
| 3083 | --- plugins/time-date/ChooseTimeZone.qml 2015-10-16 13:42:50 +0000 | |||
| 3084 | +++ plugins/time-date/ChooseTimeZone.qml 2015-11-27 13:34:19 +0000 | |||
| 3085 | @@ -20,6 +20,7 @@ | |||
| 3086 | 20 | 20 | ||
| 3087 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3088 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 3089 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3090 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 3091 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem |
| 3092 | 25 | import Ubuntu.SystemSettings.TimeDate 1.0 | 26 | import Ubuntu.SystemSettings.TimeDate 1.0 |
| 3093 | @@ -52,7 +53,7 @@ | |||
| 3094 | 52 | visible: showAllUI | 53 | visible: showAllUI |
| 3095 | 53 | } | 54 | } |
| 3096 | 54 | 55 | ||
| 3098 | 55 | ListItem.Standard { | 56 | SettingsListItems.Standard { |
| 3099 | 56 | anchors.top: setTimeZoneSelector.bottom | 57 | anchors.top: setTimeZoneSelector.bottom |
| 3100 | 57 | text: timeDatePanel.timeZone | 58 | text: timeDatePanel.timeZone |
| 3101 | 58 | enabled: false | 59 | enabled: false |
| 3102 | @@ -96,7 +97,7 @@ | |||
| 3103 | 96 | 97 | ||
| 3104 | 97 | model: timeDatePanel.timeZoneModel | 98 | model: timeDatePanel.timeZoneModel |
| 3105 | 98 | visible: setTimeZoneSelector.selectedIndex == 1 && count > 0 | 99 | visible: setTimeZoneSelector.selectedIndex == 1 && count > 0 |
| 3107 | 99 | delegate: ListItem.Standard { | 100 | delegate: SettingsListItems.Standard { |
| 3108 | 100 | text: displayName | 101 | text: displayName |
| 3109 | 101 | // If a timezone is manually selected, record which one so that | 102 | // If a timezone is manually selected, record which one so that |
| 3110 | 102 | // we highlight that one only. Usually all cities in that timezone | 103 | // we highlight that one only. Usually all cities in that timezone |
| 3111 | 103 | 104 | ||
| 3112 | === modified file 'plugins/time-date/PageComponent.qml' | |||
| 3113 | --- plugins/time-date/PageComponent.qml 2015-10-16 13:42:50 +0000 | |||
| 3114 | +++ plugins/time-date/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 3115 | @@ -1,7 +1,7 @@ | |||
| 3116 | 1 | /* | 1 | /* |
| 3117 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 3118 | 3 | * | 3 | * |
| 3120 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 3121 | 5 | * | 5 | * |
| 3122 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 3123 | 7 | * | 7 | * |
| 3124 | @@ -20,8 +20,9 @@ | |||
| 3125 | 20 | 20 | ||
| 3126 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3127 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 3128 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3129 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 3131 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 3132 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 3133 | 26 | import Ubuntu.SystemSettings.TimeDate 1.0 | 27 | import Ubuntu.SystemSettings.TimeDate 1.0 |
| 3134 | 27 | 28 | ||
| 3135 | @@ -62,13 +63,12 @@ | |||
| 3136 | 62 | 63 | ||
| 3137 | 63 | SettingsItemTitle { text: i18n.tr ("Time zone:") } | 64 | SettingsItemTitle { text: i18n.tr ("Time zone:") } |
| 3138 | 64 | 65 | ||
| 3140 | 65 | ListItem.SingleValue { | 66 | SettingsListItems.SingleValueProgression { |
| 3141 | 66 | objectName: "timeZone" | 67 | objectName: "timeZone" |
| 3142 | 67 | id: timeZone | 68 | id: timeZone |
| 3143 | 68 | //e.g. America/New_York -> America/New York | 69 | //e.g. America/New_York -> America/New York |
| 3144 | 69 | text: timeDatePanel.timeZone.replace("_", " ") | 70 | text: timeDatePanel.timeZone.replace("_", " ") |
| 3145 | 70 | value: getUTCOffset() | 71 | value: getUTCOffset() |
| 3146 | 71 | progression: true | ||
| 3147 | 72 | onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"), { | 72 | onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"), { |
| 3148 | 73 | timeDatePanel: timeDatePanel | 73 | timeDatePanel: timeDatePanel |
| 3149 | 74 | }) | 74 | }) |
| 3150 | @@ -78,7 +78,7 @@ | |||
| 3151 | 78 | text: i18n.tr ("Set the time and date:") | 78 | text: i18n.tr ("Set the time and date:") |
| 3152 | 79 | } | 79 | } |
| 3153 | 80 | 80 | ||
| 3155 | 81 | ListItem.ItemSelector { | 81 | ListItems.ItemSelector { |
| 3156 | 82 | id: setTimeAutomatically | 82 | id: setTimeAutomatically |
| 3157 | 83 | objectName: "timeItemSelector" | 83 | objectName: "timeItemSelector" |
| 3158 | 84 | model: [ i18n.tr("Automatically") , i18n.tr("Manually")] | 84 | model: [ i18n.tr("Automatically") , i18n.tr("Manually")] |
| 3159 | @@ -109,11 +109,11 @@ | |||
| 3160 | 109 | TimePicker {} | 109 | TimePicker {} |
| 3161 | 110 | } | 110 | } |
| 3162 | 111 | 111 | ||
| 3164 | 112 | ListItem.Standard { | 112 | SettingsListItems.StandardProgression { |
| 3165 | 113 | id: currentTime | 113 | id: currentTime |
| 3166 | 114 | objectName: "currentTime" | 114 | objectName: "currentTime" |
| 3169 | 115 | progression: setTimeAutomatically.selectedIndex === 1 // Manually | 115 | progressionVisible: setTimeAutomatically.selectedIndex === 1 // Manually |
| 3170 | 116 | enabled: progression | 116 | enabled: progressionVisible |
| 3171 | 117 | onClicked: { | 117 | onClicked: { |
| 3172 | 118 | Qt.inputMethod.hide() | 118 | Qt.inputMethod.hide() |
| 3173 | 119 | var popupObj = PopupUtils.open(timePicker); | 119 | var popupObj = PopupUtils.open(timePicker); |
| 3174 | 120 | 120 | ||
| 3175 | === modified file 'plugins/time-date/Scroller.qml' | |||
| 3176 | --- plugins/time-date/Scroller.qml 2015-08-10 13:31:45 +0000 | |||
| 3177 | +++ plugins/time-date/Scroller.qml 2015-11-27 13:34:19 +0000 | |||
| 3178 | @@ -1,7 +1,8 @@ | |||
| 3179 | 1 | /* | 1 | /* |
| 3180 | 2 | * Copyright (C) 2013 Michael Zanetti <michael_zanetti@gmx.net> | 2 | * Copyright (C) 2013 Michael Zanetti <michael_zanetti@gmx.net> |
| 3183 | 3 | * (C) 2013 Canonical Ltd | 3 | * (C) 2013-2015 Canonical Ltd |
| 3184 | 4 | * Canonical modifications by Iain Lane <iain.lane@canonical.com> | 4 | * Canonical modifications by Iain Lane <iain.lane@canonical.com>, |
| 3185 | 5 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
| 3186 | 5 | * | 6 | * |
| 3187 | 6 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| 3188 | 7 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
| 3189 | @@ -17,6 +18,7 @@ | |||
| 3190 | 17 | */ | 18 | */ |
| 3191 | 18 | 19 | ||
| 3192 | 19 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3193 | 21 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3194 | 20 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 3195 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems | 23 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 3196 | 22 | 24 | ||
| 3197 | @@ -106,13 +108,10 @@ | |||
| 3198 | 106 | preferredHighlightEnd: 0.5 | 108 | preferredHighlightEnd: 0.5 |
| 3199 | 107 | clip: true | 109 | clip: true |
| 3200 | 108 | 110 | ||
| 3202 | 109 | delegate: ListItems.Standard { | 111 | delegate: SettingsListItems.Standard { |
| 3203 | 110 | width: parent.width | 112 | width: parent.width |
| 3204 | 111 | highlightWhenPressed: false | 113 | highlightWhenPressed: false |
| 3209 | 112 | Label { | 114 | text: modelData |
| 3206 | 113 | anchors.centerIn: parent | ||
| 3207 | 114 | text: modelData | ||
| 3208 | 115 | } | ||
| 3210 | 116 | showDivider: false | 115 | showDivider: false |
| 3211 | 117 | onClicked: listView.currentIndex = index | 116 | onClicked: listView.currentIndex = index |
| 3212 | 118 | } | 117 | } |
| 3213 | 119 | 118 | ||
| 3214 | === modified file 'plugins/time-date/TimePicker.qml' | |||
| 3215 | --- plugins/time-date/TimePicker.qml 2015-08-10 13:31:45 +0000 | |||
| 3216 | +++ plugins/time-date/TimePicker.qml 2015-11-27 13:34:19 +0000 | |||
| 3217 | @@ -18,7 +18,6 @@ | |||
| 3218 | 18 | 18 | ||
| 3219 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
| 3220 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 3221 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3222 | 22 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
| 3223 | 23 | 22 | ||
| 3224 | 24 | Dialog { | 23 | Dialog { |
| 3225 | 25 | 24 | ||
| 3226 | === modified file 'plugins/time-date/settings-time-date.svg' | |||
| 3227 | --- plugins/time-date/settings-time-date.svg 2013-06-28 15:20:36 +0000 | |||
| 3228 | +++ plugins/time-date/settings-time-date.svg 2015-11-27 13:34:19 +0000 | |||
| 3229 | @@ -9,14 +9,15 @@ | |||
| 3230 | 9 | xmlns="http://www.w3.org/2000/svg" | 9 | xmlns="http://www.w3.org/2000/svg" |
| 3231 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 3232 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 3236 | 12 | width="90" | 12 | width="96" |
| 3237 | 13 | height="90" | 13 | height="96" |
| 3238 | 14 | id="svg3180" | 14 | id="svg4874" |
| 3239 | 15 | version="1.1" | 15 | version="1.1" |
| 3242 | 16 | inkscape:version="0.48+devel r12322" | 16 | inkscape:version="0.91+devel r" |
| 3243 | 17 | sodipodi:docname="setting-time-date.svg"> | 17 | viewBox="0 0 96 96.000001" |
| 3244 | 18 | sodipodi:docname="calendar.svg"> | ||
| 3245 | 18 | <defs | 19 | <defs |
| 3247 | 19 | id="defs3182" /> | 20 | id="defs4876" /> |
| 3248 | 20 | <sodipodi:namedview | 21 | <sodipodi:namedview |
| 3249 | 21 | id="base" | 22 | id="base" |
| 3250 | 22 | pagecolor="#ffffff" | 23 | pagecolor="#ffffff" |
| 3251 | @@ -24,18 +25,95 @@ | |||
| 3252 | 24 | borderopacity="1.0" | 25 | borderopacity="1.0" |
| 3253 | 25 | inkscape:pageopacity="0.0" | 26 | inkscape:pageopacity="0.0" |
| 3254 | 26 | inkscape:pageshadow="2" | 27 | inkscape:pageshadow="2" |
| 3258 | 27 | inkscape:zoom="5.0931703" | 28 | inkscape:zoom="7.0249991" |
| 3259 | 28 | inkscape:cx="45.796623" | 29 | inkscape:cx="-11.409258" |
| 3260 | 29 | inkscape:cy="25.966145" | 30 | inkscape:cy="72.576504" |
| 3261 | 30 | inkscape:document-units="px" | 31 | inkscape:document-units="px" |
| 3264 | 31 | inkscape:current-layer="g3855" | 32 | inkscape:current-layer="g4780" |
| 3265 | 32 | showgrid="false" | 33 | showgrid="true" |
| 3266 | 34 | showborder="true" | ||
| 3267 | 33 | fit-margin-top="0" | 35 | fit-margin-top="0" |
| 3268 | 34 | fit-margin-left="0" | 36 | fit-margin-left="0" |
| 3269 | 35 | fit-margin-right="0" | 37 | fit-margin-right="0" |
| 3271 | 36 | fit-margin-bottom="0" /> | 38 | fit-margin-bottom="0" |
| 3272 | 39 | inkscape:snap-bbox="true" | ||
| 3273 | 40 | inkscape:bbox-paths="true" | ||
| 3274 | 41 | inkscape:bbox-nodes="true" | ||
| 3275 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
| 3276 | 43 | inkscape:snap-bbox-midpoints="true" | ||
| 3277 | 44 | inkscape:object-paths="true" | ||
| 3278 | 45 | inkscape:snap-intersection-paths="true" | ||
| 3279 | 46 | inkscape:object-nodes="true" | ||
| 3280 | 47 | inkscape:snap-smooth-nodes="true" | ||
| 3281 | 48 | inkscape:snap-midpoints="true" | ||
| 3282 | 49 | inkscape:snap-object-midpoints="true" | ||
| 3283 | 50 | inkscape:snap-center="true" | ||
| 3284 | 51 | showguides="true" | ||
| 3285 | 52 | inkscape:guide-bbox="true" | ||
| 3286 | 53 | inkscape:snap-global="true"> | ||
| 3287 | 54 | <inkscape:grid | ||
| 3288 | 55 | type="xygrid" | ||
| 3289 | 56 | id="grid5451" | ||
| 3290 | 57 | empspacing="8" /> | ||
| 3291 | 58 | <sodipodi:guide | ||
| 3292 | 59 | orientation="1,0" | ||
| 3293 | 60 | position="8,-8.0000001" | ||
| 3294 | 61 | id="guide4063" /> | ||
| 3295 | 62 | <sodipodi:guide | ||
| 3296 | 63 | orientation="1,0" | ||
| 3297 | 64 | position="4,-8.0000001" | ||
| 3298 | 65 | id="guide4065" /> | ||
| 3299 | 66 | <sodipodi:guide | ||
| 3300 | 67 | orientation="0,1" | ||
| 3301 | 68 | position="-8,88.000001" | ||
| 3302 | 69 | id="guide4067" /> | ||
| 3303 | 70 | <sodipodi:guide | ||
| 3304 | 71 | orientation="0,1" | ||
| 3305 | 72 | position="-8,92.000001" | ||
| 3306 | 73 | id="guide4069" /> | ||
| 3307 | 74 | <sodipodi:guide | ||
| 3308 | 75 | orientation="0,1" | ||
| 3309 | 76 | position="104,4" | ||
| 3310 | 77 | id="guide4071" /> | ||
| 3311 | 78 | <sodipodi:guide | ||
| 3312 | 79 | orientation="0,1" | ||
| 3313 | 80 | position="-5,8.0000001" | ||
| 3314 | 81 | id="guide4073" /> | ||
| 3315 | 82 | <sodipodi:guide | ||
| 3316 | 83 | orientation="1,0" | ||
| 3317 | 84 | position="92,-8.0000001" | ||
| 3318 | 85 | id="guide4075" /> | ||
| 3319 | 86 | <sodipodi:guide | ||
| 3320 | 87 | orientation="1,0" | ||
| 3321 | 88 | position="88,-8.0000001" | ||
| 3322 | 89 | id="guide4077" /> | ||
| 3323 | 90 | <sodipodi:guide | ||
| 3324 | 91 | orientation="0,1" | ||
| 3325 | 92 | position="-8,84.000001" | ||
| 3326 | 93 | id="guide4074" /> | ||
| 3327 | 94 | <sodipodi:guide | ||
| 3328 | 95 | orientation="1,0" | ||
| 3329 | 96 | position="12,-8.0000001" | ||
| 3330 | 97 | id="guide4076" /> | ||
| 3331 | 98 | <sodipodi:guide | ||
| 3332 | 99 | orientation="0,1" | ||
| 3333 | 100 | position="-5,12" | ||
| 3334 | 101 | id="guide4078" /> | ||
| 3335 | 102 | <sodipodi:guide | ||
| 3336 | 103 | orientation="1,0" | ||
| 3337 | 104 | position="84,-9.0000001" | ||
| 3338 | 105 | id="guide4080" /> | ||
| 3339 | 106 | <sodipodi:guide | ||
| 3340 | 107 | position="48,-8.0000001" | ||
| 3341 | 108 | orientation="1,0" | ||
| 3342 | 109 | id="guide4170" /> | ||
| 3343 | 110 | <sodipodi:guide | ||
| 3344 | 111 | position="-8,48" | ||
| 3345 | 112 | orientation="0,1" | ||
| 3346 | 113 | id="guide4172" /> | ||
| 3347 | 114 | </sodipodi:namedview> | ||
| 3348 | 37 | <metadata | 115 | <metadata |
| 3350 | 38 | id="metadata3185"> | 116 | id="metadata4879"> |
| 3351 | 39 | <rdf:RDF> | 117 | <rdf:RDF> |
| 3352 | 40 | <cc:Work | 118 | <cc:Work |
| 3353 | 41 | rdf:about=""> | 119 | rdf:about=""> |
| 3354 | @@ -50,49 +128,55 @@ | |||
| 3355 | 50 | inkscape:label="Layer 1" | 128 | inkscape:label="Layer 1" |
| 3356 | 51 | inkscape:groupmode="layer" | 129 | inkscape:groupmode="layer" |
| 3357 | 52 | id="layer1" | 130 | id="layer1" |
| 3359 | 53 | transform="translate(456.42857,-738.79075)"> | 131 | transform="translate(67.857146,-78.50504)"> |
| 3360 | 54 | <g | 132 | <g |
| 3402 | 55 | transform="translate(-2258.4286,438.42854)" | 133 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
| 3403 | 56 | id="g3855"> | 134 | id="g4845" |
| 3404 | 57 | <rect | 135 | style="display:inline"> |
| 3405 | 58 | style="opacity:0.00100002;color:#000000;fill:#000000;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 136 | <g |
| 3406 | 59 | id="rect3508" | 137 | inkscape:export-ydpi="90" |
| 3407 | 60 | width="90" | 138 | inkscape:export-xdpi="90" |
| 3408 | 61 | height="90" | 139 | inkscape:export-filename="next01.png" |
| 3409 | 62 | x="1802" | 140 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" |
| 3410 | 63 | y="300.36221" /> | 141 | id="g4778" |
| 3411 | 64 | <path | 142 | inkscape:label="Layer 1"> |
| 3412 | 65 | style="opacity:0.25;color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 143 | <g |
| 3413 | 66 | d="M 42.03125 17.90625 C 28.696483 17.90625 17.90625 28.696483 17.90625 42.03125 C 17.90625 55.366017 28.696483 66.1875 42.03125 66.1875 C 42.375083 66.1875 42.722167 66.170482 43.0625 66.15625 L 43.0625 57.03125 C 43.0623 57.01015 43.0623 56.9587 43.0625 56.9375 C 43.0754 55.34598 43.14325 53.93091 43.59375 52.4375 C 44.10005 50.75898 45.19045 49.17944 46.90625 48.28125 C 48.739875 47.321381 50.599515 47.104599 52.875 47.0625 C 54.240291 47.037241 55.760413 47.0625 57.5 47.0625 L 64.5 47.0625 C 64.920635 47.0625 65.261076 47.066095 65.65625 47.0625 C 65.999321 45.441705 66.1875 43.75422 66.1875 42.03125 C 66.1875 28.696483 55.366017 17.90625 42.03125 17.90625 z " | 144 | transform="matrix(-1,0,0,1,575.99999,611)" |
| 3414 | 67 | transform="translate(1802,300.36221)" | 145 | id="g4780" |
| 3415 | 68 | id="path3510" /> | 146 | style="display:inline"> |
| 3416 | 69 | <path | 147 | <rect |
| 3417 | 70 | style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;stroke:none;stroke-width:3.3547709;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" | 148 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" |
| 3418 | 71 | d="M 42.03125 15 C 27.12175 15 15 27.12173 15 42.03125 C 15 56.94077 27.12175 69.09375 42.03125 69.09375 C 42.372987 69.09375 42.723784 69.075144 43.0625 69.0625 C 43.062407 69.05177 43.062588 69.041996 43.0625 69.03125 C 43.0624 69.01715 43.0625 68.98285 43.0625 68.96875 L 43.0625 65.03125 C 42.720305 65.046238 42.377238 65.0625 42.03125 65.0625 C 29.28355 65.0625 19 54.779 19 42.03125 C 19 29.28349 29.28355 19 42.03125 19 C 54.77905 19 65.0625 29.28349 65.0625 42.03125 C 65.0625 43.758289 64.857909 45.445501 64.5 47.0625 C 66.037863 47.0625 67.386959 47.021872 68.625 47.03125 C 68.929484 45.410259 69.09375 43.738953 69.09375 42.03125 C 69.09375 27.12173 56.94075 15 42.03125 15 z " | 149 | id="rect4782" |
| 3419 | 72 | transform="translate(1802,300.36221)" | 150 | width="96.037987" |
| 3420 | 73 | id="path3512" /> | 151 | height="96" |
| 3421 | 74 | <path | 152 | x="-438.00244" |
| 3422 | 75 | style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;stroke:none;stroke-width:3.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" | 153 | y="345.36221" |
| 3423 | 76 | d="m 1846,323.34375 -4,0.0312 0,2 0.031,16.0625 0,2 4,-0.0312 0,-2 L 1846,325.34375 1846,323.34375 Z" | 154 | transform="scale(-1,1)" /> |
| 3424 | 77 | id="path3516" | 155 | <g |
| 3425 | 78 | inkscape:connector-curvature="0" /> | 156 | transform="matrix(0,-0.99980223,-1.0001978,0,0,0)" |
| 3426 | 79 | <path | 157 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:48.03580475px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:end;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
| 3427 | 80 | style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;stroke:none;stroke-width:3.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;clip-rule:nonzero;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;font-family:sans-serif;-inkscape-font-specification:sans-serif" | 158 | id="text4416"> |
| 3428 | 81 | d="m 1831,340.375 0,4 2,0 11,0 2,0 0,-4 -2,0 -11,0 L 1831,340.375 Z" | 159 | <path |
| 3429 | 82 | id="path3518" | 160 | d="m -397.70209,-392.6432 q 0,1.72929 -0.72054,3.36251 -0.6725,1.58518 -1.82536,3.17036 -1.15286,1.53715 -2.59393,3.0743 -1.44108,1.48911 -2.88215,2.93018 -0.81661,0.81661 -1.92143,1.92143 -1.05679,1.10483 -2.01751,2.30572 -0.96071,1.2009 -1.63321,2.30572 -0.62447,1.10482 -0.62447,1.92143 l 15.32342,0 0,3.79483 -20.17503,0 q -0.048,-0.28821 -0.048,-0.57643 0,-0.28821 0,-0.52839 0,-2.25769 0.72054,-4.17912 0.76857,-1.96947 1.96946,-3.69876 1.2009,-1.72928 2.69001,-3.26643 1.48911,-1.53715 2.93018,-2.97822 1.2009,-1.15286 2.25769,-2.25768 1.10482,-1.15286 1.92143,-2.25769 0.86464,-1.15286 1.345,-2.35375 0.5284,-1.2009 0.5284,-2.5459 0,-1.44107 -0.48036,-2.44982 -0.43233,-1.00876 -1.2009,-1.68126 -0.76857,-0.6725 -1.82536,-0.96071 -1.00875,-0.33625 -2.16161,-0.33625 -1.39304,0 -2.5459,0.38428 -1.15286,0.38429 -2.06554,0.91268 -0.91268,0.48036 -1.53714,1.05679 -0.62447,0.52839 -0.96072,0.81661 l -2.20965,-3.17036 q 0.43233,-0.48036 1.29697,-1.15286 0.86465,-0.72054 2.06554,-1.34501 1.2009,-0.62446 2.69001,-1.05678 1.48911,-0.43233 3.21839,-0.43233 5.23591,0 7.82984,2.44983 2.64197,2.40179 2.64197,6.82108 z" |
| 3430 | 83 | inkscape:connector-curvature="0" /> | 161 | style="" |
| 3431 | 84 | <path | 162 | id="path4162" /> |
| 3432 | 85 | style="color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:3.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 163 | <path |
| 3433 | 86 | d="M 54.34375 51 C 47.853339 51.092144 47.042087 51.799787 47 57 L 47 69 C 47.048 74.94321 48.1185 75 57.5 75 L 64.5 75 C 73.8815 75 74.952 74.94309 75 69 L 75 57 C 74.9519 51.05662 73.8815 51 64.5 51 L 57.5 51 C 56.327312 51 55.270952 50.986837 54.34375 51 z M 55.375 57 C 55.800753 56.993511 56.274025 57 56.8125 57 L 57.1875 57 C 61.4953 57 61.9779 57.02469 62 60 L 62 66 C 61.9779 68.9752 61.4953 69 57.1875 69 L 56.8125 69 C 52.5047 69 52.022 68.97523 52 66 L 52 60 C 52.019338 57.3967 52.394732 57.045423 55.375 57 z M 66 57 L 69 57 L 69 69 L 66 69 L 66 61 L 64 61 L 64 59 L 66 57 z " | 164 | d="m -383.46173,-388.31997 q 7.25341,0.28821 10.61592,3.17036 3.41054,2.88215 3.41054,7.82984 0,2.20964 -0.76857,4.08304 -0.72054,1.8734 -2.25769,3.2184 -1.48911,1.345 -3.79482,2.11357 -2.30572,0.76858 -5.47609,0.76858 -1.24893,0 -2.54589,-0.19215 -1.29697,-0.19214 -2.40179,-0.48035 -1.10483,-0.28822 -1.96947,-0.57643 -0.86465,-0.28822 -1.24893,-0.48036 l 0.86464,-3.8909 q 0.81661,0.38428 2.64197,1.00875 1.8734,0.62447 4.5634,0.62447 2.16161,0 3.60269,-0.48036 1.48911,-0.48036 2.40179,-1.29697 0.91268,-0.81661 1.29696,-1.8734 0.43233,-1.10482 0.43233,-2.30571 0,-1.82537 -0.62447,-3.2184 -0.62446,-1.44108 -2.20965,-2.40179 -1.58518,-0.96072 -4.22715,-1.44108 -2.64197,-0.52839 -6.67697,-0.52839 0.28821,-2.35376 0.43232,-4.4193 0.19214,-2.06554 0.33625,-4.035 0.14411,-1.96947 0.24018,-3.8909 0.0961,-1.96947 0.19214,-4.13108 l 16.04396,0 0,3.79483 -12.15306,0 q -0.048,0.72053 -0.14411,1.96946 -0.0961,1.2009 -0.19214,2.5459 -0.0961,1.29697 -0.19214,2.5459 -0.0961,1.24893 -0.19215,1.96947 z" |
| 3434 | 87 | transform="translate(1802,300.36221)" | 165 | style="" |
| 3435 | 88 | id="path3520" /> | 166 | id="path4164" /> |
| 3436 | 89 | <rect | 167 | </g> |
| 3437 | 90 | style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 168 | <path |
| 3438 | 91 | id="rect3544" | 169 | style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00079155;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" |
| 3439 | 92 | width="4" | 170 | d="M 23.976562 8.0019531 C 18.943803 8.0601401 15.26124 7.881546 12.25 9.5429688 C 10.74438 10.37368 9.5531414 11.778707 8.8945312 13.533203 C 8.2359314 15.287699 7.9980469 17.369641 7.9980469 20 L 7.9980469 48.001953 L 7.9980469 76 C 7.9980469 78.630359 8.2359314 80.714254 8.8945312 82.46875 C 9.5531414 84.223246 10.74438 85.62632 12.25 86.457031 C 15.26124 88.118454 18.943803 87.941823 23.976562 88 L 23.988281 88 L 47.998047 88 L 72.009766 88 L 72.021484 88 C 77.054244 87.94182 80.736807 88.118454 83.748047 86.457031 C 85.253667 85.62632 86.444916 84.223246 87.103516 82.46875 C 87.762113 80.714254 88 78.630359 88 76 L 88 48.001953 L 83.998047 48.001953 L 83.998047 76 C 83.998047 78.369642 83.747742 80.022711 83.357422 81.0625 C 82.967112 82.102279 82.547973 82.550368 81.814453 82.955078 C 80.350163 83.762988 77.036307 83.941223 71.998047 84 L 71.974609 84 L 47.998047 84 L 24.021484 84 L 24 84 C 18.96042 83.941263 15.648104 83.763108 14.183594 82.955078 C 13.450074 82.550368 13.030935 82.102279 12.640625 81.0625 C 12.250305 80.022711 12 78.369642 12 76 L 12 48.001953 L 12 32 C 12 29.630358 12.250305 27.977279 12.640625 26.9375 C 13.030935 25.897711 13.450074 25.449632 14.183594 25.044922 C 15.650624 24.235492 18.967304 24.058477 24.021484 24 L 47.998047 24 L 71.998047 24 C 77.036307 24.05877 80.350163 24.237002 81.814453 25.044922 C 82.547973 25.449632 82.967112 25.897711 83.357422 26.9375 C 83.747742 27.977279 83.998047 29.630358 83.998047 32 L 83.998047 48 L 88 48 L 88 20 C 88 17.369641 87.762116 15.287699 87.103516 13.533203 C 86.444916 11.778707 85.253667 10.37368 83.748047 9.5429688 C 80.736807 7.881546 77.054244 8.0601301 72.021484 8.0019531 L 72.009766 8.0019531 L 72 8.0019531 L 72 16 L 66 16 L 66 8.0019531 L 30 8.0019531 L 30 16 L 24 16 L 24 8.0019531 L 23.988281 8.0019531 L 23.976562 8.0019531 z " |
| 3440 | 93 | height="6" | 171 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" |
| 3441 | 94 | x="1857" | 172 | id="path4410" /> |
| 3442 | 95 | y="360.36221" /> | 173 | <path |
| 3443 | 174 | style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;enable-background:accumulate" | ||
| 3444 | 175 | d="M 30 0 L 24 1 L 24 8 L 30 8 L 30 0 z M 72 0 L 66 1 L 66 8 L 72 8 L 72 0 z " | ||
| 3445 | 176 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" | ||
| 3446 | 177 | id="path4430" /> | ||
| 3447 | 178 | </g> | ||
| 3448 | 179 | </g> | ||
| 3449 | 96 | </g> | 180 | </g> |
| 3450 | 97 | </g> | 181 | </g> |
| 3451 | 98 | </svg> | 182 | </svg> |
| 3452 | 99 | 183 | ||
| 3453 | === modified file 'plugins/wifi/AccessPoint.qml' | |||
| 3454 | --- plugins/wifi/AccessPoint.qml 2015-08-10 13:31:45 +0000 | |||
| 3455 | +++ plugins/wifi/AccessPoint.qml 2015-11-27 13:34:19 +0000 | |||
| 3456 | @@ -1,5 +1,5 @@ | |||
| 3457 | 1 | /* | 1 | /* |
| 3459 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2015 Canonical Ltd. |
| 3460 | 3 | * | 3 | * |
| 3461 | 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 |
| 3462 | 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
| 3463 | @@ -28,19 +28,6 @@ | |||
| 3464 | 28 | property bool secure: false | 28 | property bool secure: false |
| 3465 | 29 | property bool adHoc: false | 29 | property bool adHoc: false |
| 3466 | 30 | property int signalStrength: 0 | 30 | property int signalStrength: 0 |
| 3467 | 31 | |||
| 3468 | 32 | signal activate() | ||
| 3469 | 33 | |||
| 3470 | 34 | onCheckedChanged: { | ||
| 3471 | 35 | // Can't rely on binding. Checked is assigned on click. | ||
| 3472 | 36 | checkBoxActive.checked = checked; | ||
| 3473 | 37 | |||
| 3474 | 38 | // if stack has NetworkDetailsBrief, pop it | ||
| 3475 | 39 | if (pageStack.depth === 3) { | ||
| 3476 | 40 | pageStack.pop(); | ||
| 3477 | 41 | } | ||
| 3478 | 42 | } | ||
| 3479 | 43 | |||
| 3480 | 44 | iconName: { | 31 | iconName: { |
| 3481 | 45 | var imageName = "nm-signal-100" | 32 | var imageName = "nm-signal-100" |
| 3482 | 46 | 33 | ||
| 3483 | @@ -61,16 +48,18 @@ | |||
| 3484 | 61 | } | 48 | } |
| 3485 | 62 | return imageName; | 49 | return imageName; |
| 3486 | 63 | } | 50 | } |
| 3494 | 64 | 51 | layout.subtitle.text: checked ? i18n.tr("Connected") : "" | |
| 3495 | 65 | iconFrame: false | 52 | |
| 3496 | 66 | control: CheckBox { | 53 | signal activate() |
| 3497 | 67 | id: checkBoxActive | 54 | |
| 3498 | 68 | 55 | onCheckedChanged: { | |
| 3499 | 69 | onClicked: { | 56 | // if stack has NetworkDetailsBrief, pop it |
| 3500 | 70 | accessPoint.activate(); | 57 | if (pageStack.depth === 3) { |
| 3501 | 58 | pageStack.pop(); | ||
| 3502 | 71 | } | 59 | } |
| 3503 | 72 | } | 60 | } |
| 3505 | 73 | progression: checked | 61 | |
| 3506 | 62 | progressionVisible: checked | ||
| 3507 | 74 | onClicked: { | 63 | onClicked: { |
| 3508 | 75 | if (checked) { | 64 | if (checked) { |
| 3509 | 76 | pageStack.push(Qt.resolvedUrl("NetworkDetailsBrief.qml"), | 65 | pageStack.push(Qt.resolvedUrl("NetworkDetailsBrief.qml"), |
| 3510 | 77 | 66 | ||
| 3511 | === modified file 'plugins/wifi/DivMenuItem.qml' | |||
| 3512 | --- plugins/wifi/DivMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3513 | +++ plugins/wifi/DivMenuItem.qml 2015-11-27 13:34:19 +0000 | |||
| 3514 | @@ -1,5 +1,5 @@ | |||
| 3515 | 1 | /* | 1 | /* |
| 3517 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2015 Canonical Ltd. |
| 3518 | 3 | * | 3 | * |
| 3519 | 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 |
| 3520 | 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
| 3521 | @@ -18,8 +18,8 @@ | |||
| 3522 | 18 | */ | 18 | */ |
| 3523 | 19 | 19 | ||
| 3524 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3526 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components 1.3 |
| 3527 | 22 | 22 | ||
| 3529 | 23 | ListItem.Empty { | 23 | ListItemLayout { |
| 3530 | 24 | height: units.gu(3) | 24 | height: units.gu(3) |
| 3531 | 25 | } | 25 | } |
| 3532 | 26 | 26 | ||
| 3533 | === modified file 'plugins/wifi/FramedMenuItem.qml' | |||
| 3534 | --- plugins/wifi/FramedMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3535 | +++ plugins/wifi/FramedMenuItem.qml 2015-11-27 13:34:19 +0000 | |||
| 3536 | @@ -1,5 +1,5 @@ | |||
| 3537 | 1 | /* | 1 | /* |
| 3539 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2015 Canonical Ltd. |
| 3540 | 3 | * | 3 | * |
| 3541 | 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 |
| 3542 | 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
| 3543 | @@ -19,7 +19,11 @@ | |||
| 3544 | 19 | */ | 19 | */ |
| 3545 | 20 | 20 | ||
| 3546 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3547 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3548 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 3549 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3550 | 24 | 24 | ||
| 3552 | 25 | ListItem.Standard {} | 25 | SettingsListItems.IconProgression { |
| 3553 | 26 | // FIXME: use padding + padding + icon width | ||
| 3554 | 27 | divider.anchors.leftMargin: units.gu(6) | ||
| 3555 | 28 | layout.subtitle.color: UbuntuColors.green | ||
| 3556 | 29 | } | ||
| 3557 | 26 | 30 | ||
| 3558 | === modified file 'plugins/wifi/MenuItemFactory.qml' | |||
| 3559 | --- plugins/wifi/MenuItemFactory.qml 2015-08-10 13:31:45 +0000 | |||
| 3560 | +++ plugins/wifi/MenuItemFactory.qml 2015-11-27 13:34:19 +0000 | |||
| 3561 | @@ -1,5 +1,5 @@ | |||
| 3562 | 1 | /* | 1 | /* |
| 3564 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2015 Canonical Ltd. |
| 3565 | 3 | * | 3 | * |
| 3566 | 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 |
| 3567 | 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
| 3568 | @@ -15,7 +15,7 @@ | |||
| 3569 | 15 | * | 15 | * |
| 3570 | 16 | * Authors: | 16 | * Authors: |
| 3571 | 17 | * Nick Dedekind <nick.dedekind@canonical.com> | 17 | * Nick Dedekind <nick.dedekind@canonical.com> |
| 3573 | 18 | */ | 18 | */ |
| 3574 | 19 | 19 | ||
| 3575 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3576 | 21 | import QMenuModel 0.1 as QMenuModel | 21 | import QMenuModel 0.1 as QMenuModel |
| 3577 | @@ -65,7 +65,7 @@ | |||
| 3578 | 65 | property int menuIndex: -1 | 65 | property int menuIndex: -1 |
| 3579 | 66 | 66 | ||
| 3580 | 67 | text: menu && menu.label ? menu.label : "" | 67 | text: menu && menu.label ? menu.label : "" |
| 3582 | 68 | icon: menu ? menu.icon : "" | 68 | iconName: menu ? menu.icon : "" |
| 3583 | 69 | checkable: menu ? (menu.isCheck || menu.isRadio) : false | 69 | checkable: menu ? (menu.isCheck || menu.isRadio) : false |
| 3584 | 70 | checked: checkable ? menu.isToggled : false | 70 | checked: checkable ? menu.isToggled : false |
| 3585 | 71 | enabled: menu ? menu.sensitive : false | 71 | enabled: menu ? menu.sensitive : false |
| 3586 | @@ -106,7 +106,7 @@ | |||
| 3587 | 106 | property int menuIndex: -1 | 106 | property int menuIndex: -1 |
| 3588 | 107 | property var extendedData: menu && menu.ext || undefined | 107 | property var extendedData: menu && menu.ext || undefined |
| 3589 | 108 | text: menu && menu.label ? menu.label : "" | 108 | text: menu && menu.label ? menu.label : "" |
| 3591 | 109 | busy: getExtendedProperty(extendedData, "xCanonicalBusyAction", false) | 109 | busy: getExtendedProperty(extendedData, "xCanonicalBusyAction", false) || true |
| 3592 | 110 | 110 | ||
| 3593 | 111 | onMenuModelChanged: { | 111 | onMenuModelChanged: { |
| 3594 | 112 | loadAttributes(); | 112 | loadAttributes(); |
| 3595 | @@ -150,7 +150,7 @@ | |||
| 3596 | 150 | loadAttributes(); | 150 | loadAttributes(); |
| 3597 | 151 | } | 151 | } |
| 3598 | 152 | 152 | ||
| 3600 | 153 | USC.ServerPropertySynchroniser { | 153 | resources: USC.ServerPropertySynchroniser { |
| 3601 | 154 | userTarget: apItem | 154 | userTarget: apItem |
| 3602 | 155 | userProperty: "active" | 155 | userProperty: "active" |
| 3603 | 156 | userTrigger: "onActivate" | 156 | userTrigger: "onActivate" |
| 3604 | 157 | 157 | ||
| 3605 | === modified file 'plugins/wifi/NetworkDetails.qml' | |||
| 3606 | --- plugins/wifi/NetworkDetails.qml 2015-08-10 13:31:45 +0000 | |||
| 3607 | +++ plugins/wifi/NetworkDetails.qml 2015-11-27 13:34:19 +0000 | |||
| 3608 | @@ -21,8 +21,8 @@ | |||
| 3609 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3610 | 22 | import QtQuick.Layouts 1.1 | 22 | import QtQuick.Layouts 1.1 |
| 3611 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 3612 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3613 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 3614 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3615 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3616 | 27 | 27 | ||
| 3617 | 28 | ItemPage { | 28 | ItemPage { |
| 3618 | @@ -53,29 +53,24 @@ | |||
| 3619 | 53 | anchors.left: parent.left | 53 | anchors.left: parent.left |
| 3620 | 54 | anchors.right: parent.right | 54 | anchors.right: parent.right |
| 3621 | 55 | 55 | ||
| 3623 | 56 | ListItem.Standard { | 56 | SettingsListItems.SingleValue { |
| 3624 | 57 | text: i18n.tr("Name") | 57 | text: i18n.tr("Name") |
| 3628 | 58 | control: Label { | 58 | value: networkName |
| 3626 | 59 | text: networkName | ||
| 3627 | 60 | } | ||
| 3629 | 61 | } | 59 | } |
| 3630 | 62 | 60 | ||
| 3632 | 63 | ListItem.Standard { | 61 | SettingsListItems.SingleValue { |
| 3633 | 64 | id: lastLabel | 62 | id: lastLabel |
| 3634 | 65 | text: i18n.tr("Last connected") | 63 | text: i18n.tr("Last connected") |
| 3641 | 66 | control: Label { | 64 | value: networkDetails.lastUsed.length !== 0 ? |
| 3642 | 67 | id: lastField | 65 | networkDetails.lastUsed : i18n.tr("Never") |
| 3637 | 68 | |||
| 3638 | 69 | text: networkDetails.lastUsed.length !== 0 ? | ||
| 3639 | 70 | networkDetails.lastUsed : i18n.tr("Never") | ||
| 3640 | 71 | } | ||
| 3643 | 72 | } | 66 | } |
| 3644 | 73 | 67 | ||
| 3646 | 74 | ListItem.Standard { | 68 | SettingsListItems.Standard { |
| 3647 | 75 | id: passwordLabel | 69 | id: passwordLabel |
| 3648 | 76 | text: i18n.tr("Password") | 70 | text: i18n.tr("Password") |
| 3649 | 77 | visible: networkDetails.password.length !== 0 | 71 | visible: networkDetails.password.length !== 0 |
| 3651 | 78 | control: TextInput { | 72 | |
| 3652 | 73 | TextInput { | ||
| 3653 | 79 | id: passwordField | 74 | id: passwordField |
| 3654 | 80 | readOnly: true | 75 | readOnly: true |
| 3655 | 81 | text: networkDetails.password | 76 | text: networkDetails.password |
| 3656 | @@ -84,28 +79,30 @@ | |||
| 3657 | 84 | } | 79 | } |
| 3658 | 85 | } | 80 | } |
| 3659 | 86 | 81 | ||
| 3661 | 87 | ListItem.Standard { | 82 | SettingsListItems.Standard { |
| 3662 | 88 | id: passwordVisible | 83 | id: passwordVisible |
| 3663 | 89 | text: i18n.tr("Show password") | 84 | text: i18n.tr("Show password") |
| 3664 | 90 | visible: networkDetails.password.length !== 0 | 85 | visible: networkDetails.password.length !== 0 |
| 3666 | 91 | control: Switch { | 86 | |
| 3667 | 87 | Switch { | ||
| 3668 | 92 | id: passwordVisibleSwitch | 88 | id: passwordVisibleSwitch |
| 3669 | 93 | } | 89 | } |
| 3670 | 94 | } | 90 | } |
| 3671 | 95 | 91 | ||
| 3673 | 96 | ListItem.Divider {} | 92 | SettingsListItems.SingleControl { |
| 3674 | 97 | 93 | ||
| 3686 | 98 | Button { | 94 | Button { |
| 3687 | 99 | objectName: "forgetNetwork" | 95 | objectName: "forgetNetwork" |
| 3688 | 100 | text : i18n.tr("Forget this network") | 96 | text : i18n.tr("Forget this network") |
| 3689 | 101 | anchors { | 97 | anchors { |
| 3690 | 102 | left: parent.left | 98 | left: parent.left |
| 3691 | 103 | right: parent.right | 99 | right: parent.right |
| 3692 | 104 | margins: units.gu(2) | 100 | margins: units.gu(2) |
| 3693 | 105 | } | 101 | } |
| 3694 | 106 | onClicked : { | 102 | onClicked : { |
| 3695 | 107 | DbusHelper.forgetConnection(dbusPath); | 103 | DbusHelper.forgetConnection(dbusPath); |
| 3696 | 108 | pageStack.pop(); | 104 | pageStack.pop(); |
| 3697 | 105 | } | ||
| 3698 | 109 | } | 106 | } |
| 3699 | 110 | } | 107 | } |
| 3700 | 111 | } | 108 | } |
| 3701 | 112 | 109 | ||
| 3702 | === modified file 'plugins/wifi/NetworkDetailsBrief.qml' | |||
| 3703 | --- plugins/wifi/NetworkDetailsBrief.qml 2015-08-10 13:31:45 +0000 | |||
| 3704 | +++ plugins/wifi/NetworkDetailsBrief.qml 2015-11-27 13:34:19 +0000 | |||
| 3705 | @@ -21,8 +21,8 @@ | |||
| 3706 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3707 | 22 | import QtQuick.Layouts 1.1 | 22 | import QtQuick.Layouts 1.1 |
| 3708 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 3709 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3710 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 3711 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3712 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3713 | 27 | 27 | ||
| 3714 | 28 | ItemPage { | 28 | ItemPage { |
| 3715 | @@ -48,27 +48,28 @@ | |||
| 3716 | 48 | anchors.left: parent.left | 48 | anchors.left: parent.left |
| 3717 | 49 | anchors.right: parent.right | 49 | anchors.right: parent.right |
| 3718 | 50 | 50 | ||
| 3732 | 51 | ListItem.Divider {} | 51 | SettingsListItems.SingleControl { |
| 3733 | 52 | 52 | Button { | |
| 3734 | 53 | Button { | 53 | text : i18n.tr("Forget this network") |
| 3735 | 54 | text : i18n.tr("Forget this network") | 54 | anchors { |
| 3736 | 55 | anchors { | 55 | left: parent.left |
| 3737 | 56 | left: parent.left | 56 | right: parent.right |
| 3738 | 57 | right: parent.right | 57 | margins: units.gu(2) |
| 3739 | 58 | margins: units.gu(2) | 58 | } |
| 3740 | 59 | } | 59 | onClicked: { |
| 3741 | 60 | onClicked: { | 60 | if (DbusHelper.forgetActiveDevice()) { |
| 3742 | 61 | if (DbusHelper.forgetActiveDevice()) { | 61 | accessPoint.checked = false; |
| 3743 | 62 | accessPoint.checked = false; | 62 | accessPoint.checkedChanged(false) |
| 3744 | 63 | accessPoint.checkedChanged(false) | 63 | } |
| 3745 | 64 | } | 64 | } |
| 3746 | 65 | } | 65 | } |
| 3747 | 66 | } | 66 | } |
| 3748 | 67 | 67 | ||
| 3750 | 68 | ListItem.Standard { | 68 | SettingsListItems.Standard { |
| 3751 | 69 | text: i18n.tr("IP address") | 69 | text: i18n.tr("IP address") |
| 3752 | 70 | id: addressItem | 70 | id: addressItem |
| 3754 | 71 | control: TextField { | 71 | |
| 3755 | 72 | TextField { | ||
| 3756 | 72 | text: DbusHelper.wifiIp4Address | 73 | text: DbusHelper.wifiIp4Address |
| 3757 | 73 | readOnly: true | 74 | readOnly: true |
| 3758 | 74 | horizontalAlignment: TextInput.AlignRight | 75 | horizontalAlignment: TextInput.AlignRight |
| 3759 | 75 | 76 | ||
| 3760 | === modified file 'plugins/wifi/PageComponent.qml' | |||
| 3761 | --- plugins/wifi/PageComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 3762 | +++ plugins/wifi/PageComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 3763 | @@ -16,8 +16,8 @@ | |||
| 3764 | 16 | 16 | ||
| 3765 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
| 3766 | 18 | import SystemSettings 1.0 | 18 | import SystemSettings 1.0 |
| 3767 | 19 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3768 | 19 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 3769 | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3770 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
| 3771 | 22 | import Ubuntu.SystemSettings.Wifi 1.0 | 22 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3772 | 23 | import QMenuModel 0.1 | 23 | import QMenuModel 0.1 |
| 3773 | @@ -81,7 +81,6 @@ | |||
| 3774 | 81 | right: parent.right | 81 | right: parent.right |
| 3775 | 82 | } | 82 | } |
| 3776 | 83 | height: loader.height | 83 | height: loader.height |
| 3777 | 84 | visible: height > 0 | ||
| 3778 | 85 | 84 | ||
| 3779 | 86 | Loader { | 85 | Loader { |
| 3780 | 87 | id: loader | 86 | id: loader |
| 3781 | @@ -124,16 +123,7 @@ | |||
| 3782 | 124 | } | 123 | } |
| 3783 | 125 | } | 124 | } |
| 3784 | 126 | 125 | ||
| 3795 | 127 | ListItem.Divider {} | 126 | SettingsListItems.Standard { |
| 3786 | 128 | |||
| 3787 | 129 | ListItem.SingleValue { | ||
| 3788 | 130 | objectName: "previousNetwork" | ||
| 3789 | 131 | text: i18n.tr("Previous networks") | ||
| 3790 | 132 | progression: true | ||
| 3791 | 133 | onClicked: pageStack.push(Qt.resolvedUrl("PreviousNetworks.qml")) | ||
| 3792 | 134 | } | ||
| 3793 | 135 | |||
| 3794 | 136 | ListItem.SingleValue { | ||
| 3796 | 137 | objectName: "connectToHiddenNetwork" | 127 | objectName: "connectToHiddenNetwork" |
| 3797 | 138 | text: i18n.tr("Connect to hidden network…") | 128 | text: i18n.tr("Connect to hidden network…") |
| 3798 | 139 | visible : wifibase.wifiEnabled | 129 | visible : wifibase.wifiEnabled |
| 3799 | @@ -143,6 +133,12 @@ | |||
| 3800 | 143 | } | 133 | } |
| 3801 | 144 | } | 134 | } |
| 3802 | 145 | 135 | ||
| 3803 | 136 | SettingsListItems.StandardProgression { | ||
| 3804 | 137 | objectName: "previousNetwork" | ||
| 3805 | 138 | text: i18n.tr("Previous networks") | ||
| 3806 | 139 | onClicked: pageStack.push(Qt.resolvedUrl("PreviousNetworks.qml")) | ||
| 3807 | 140 | } | ||
| 3808 | 141 | |||
| 3809 | 146 | Loader { | 142 | Loader { |
| 3810 | 147 | id: otherNetworLoader | 143 | id: otherNetworLoader |
| 3811 | 148 | asynchronous: false | 144 | asynchronous: false |
| 3812 | 149 | 145 | ||
| 3813 | === modified file 'plugins/wifi/PreviousNetworks.qml' | |||
| 3814 | --- plugins/wifi/PreviousNetworks.qml 2015-08-10 13:31:45 +0000 | |||
| 3815 | +++ plugins/wifi/PreviousNetworks.qml 2015-11-27 13:34:19 +0000 | |||
| 3816 | @@ -16,8 +16,8 @@ | |||
| 3817 | 16 | 16 | ||
| 3818 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
| 3819 | 18 | import SystemSettings 1.0 | 18 | import SystemSettings 1.0 |
| 3820 | 19 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3821 | 19 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 3822 | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3823 | 21 | import Ubuntu.SystemSettings.Wifi 1.0 | 21 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3824 | 22 | import QMenuModel 0.1 | 22 | import QMenuModel 0.1 |
| 3825 | 23 | 23 | ||
| 3826 | @@ -54,9 +54,8 @@ | |||
| 3827 | 54 | duration: UbuntuAnimation.SnapDuration | 54 | duration: UbuntuAnimation.SnapDuration |
| 3828 | 55 | } | 55 | } |
| 3829 | 56 | } | 56 | } |
| 3831 | 57 | delegate: ListItem.Standard { | 57 | delegate: SettingsListItems.StandardProgression { |
| 3832 | 58 | text: name | 58 | text: name |
| 3833 | 59 | progression: true | ||
| 3834 | 60 | onClicked: { | 59 | onClicked: { |
| 3835 | 61 | pageStack.push(Qt.resolvedUrl("NetworkDetails.qml"), | 60 | pageStack.push(Qt.resolvedUrl("NetworkDetails.qml"), |
| 3836 | 62 | {networkName : name, password : password, lastUsed : lastUsed, | 61 | {networkName : name, password : password, lastUsed : lastUsed, |
| 3837 | 63 | 62 | ||
| 3838 | === modified file 'plugins/wifi/SectionMenuItem.qml' | |||
| 3839 | --- plugins/wifi/SectionMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3840 | +++ plugins/wifi/SectionMenuItem.qml 2015-11-27 13:34:19 +0000 | |||
| 3841 | @@ -18,37 +18,22 @@ | |||
| 3842 | 18 | */ | 18 | */ |
| 3843 | 19 | 19 | ||
| 3844 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3845 | 21 | import SystemSettings 1.0 | ||
| 3846 | 21 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 3860 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 23 | |
| 3861 | 23 | 24 | SettingsItemTitle { | |
| 3862 | 24 | BaseMenuItem { | 25 | property alias busy: indicator.running |
| 3863 | 25 | id: menuItem | 26 | |
| 3864 | 26 | property alias text: header.text | 27 | ActivityIndicator { |
| 3865 | 27 | property bool busy: false | 28 | id: indicator |
| 3853 | 28 | |||
| 3854 | 29 | implicitHeight: text !== "" ? header.height : 0 | ||
| 3855 | 30 | |||
| 3856 | 31 | ListItem.Header { | ||
| 3857 | 32 | id: header | ||
| 3858 | 33 | |||
| 3859 | 34 | height: units.gu(4) | ||
| 3866 | 35 | anchors { | 29 | anchors { |
| 3868 | 36 | left: parent.left | 30 | top: parent.top |
| 3869 | 31 | topMargin: units.gu(3) | ||
| 3870 | 37 | right: parent.right | 32 | right: parent.right |
| 3886 | 38 | top: parent.top | 33 | rightMargin: units.gu(2) |
| 3887 | 39 | } | 34 | } |
| 3888 | 40 | visible: text != "" | 35 | height: parent.height - (anchors.topMargin * 1.25) |
| 3889 | 41 | 36 | width: height | |
| 3890 | 42 | ActivityIndicator { | 37 | visible: running |
| 3876 | 43 | id: indicator | ||
| 3877 | 44 | running: busy | ||
| 3878 | 45 | anchors { | ||
| 3879 | 46 | margins: units.gu(0.5) | ||
| 3880 | 47 | right: parent.right | ||
| 3881 | 48 | } | ||
| 3882 | 49 | height: parent.height - (anchors.margins * 2) | ||
| 3883 | 50 | width: height | ||
| 3884 | 51 | anchors.verticalCenter: parent.verticalCenter | ||
| 3885 | 52 | } | ||
| 3891 | 53 | } | 38 | } |
| 3892 | 54 | } | 39 | } |
| 3893 | 55 | 40 | ||
| 3894 | === modified file 'plugins/wifi/StandardMenuItem.qml' | |||
| 3895 | --- plugins/wifi/StandardMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3896 | +++ plugins/wifi/StandardMenuItem.qml 2015-11-27 13:34:19 +0000 | |||
| 3897 | @@ -28,34 +28,12 @@ | |||
| 3898 | 28 | 28 | ||
| 3899 | 29 | signal activate() | 29 | signal activate() |
| 3900 | 30 | 30 | ||
| 3907 | 31 | onCheckedChanged: { | 31 | layout.subtitle.text: checked ? i18n.tr("Connected") : "" |
| 3902 | 32 | // Can't rely on binding. Checked is assigned on click. | ||
| 3903 | 33 | if (checkable) { | ||
| 3904 | 34 | checkbox.checked = checked; | ||
| 3905 | 35 | } | ||
| 3906 | 36 | } | ||
| 3908 | 37 | 32 | ||
| 3909 | 33 | progressionVisible: checked | ||
| 3910 | 38 | onClicked: { | 34 | onClicked: { |
| 3932 | 39 | if (checkable) { | 35 | if (!checked) { |
| 3933 | 40 | checkbox.clicked(); | 36 | menuItem.activate(); |
| 3934 | 41 | } else { | 37 | } |
| 3914 | 42 | menuItem.activate(); | ||
| 3915 | 43 | } | ||
| 3916 | 44 | } | ||
| 3917 | 45 | |||
| 3918 | 46 | control: CheckBox { | ||
| 3919 | 47 | id: checkbox | ||
| 3920 | 48 | |||
| 3921 | 49 | Component.onCompleted: { | ||
| 3922 | 50 | checked = menuItem.checked; | ||
| 3923 | 51 | } | ||
| 3924 | 52 | |||
| 3925 | 53 | // FIXME : should use Checkbox.toggled signal | ||
| 3926 | 54 | // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled | ||
| 3927 | 55 | onClicked: { | ||
| 3928 | 56 | menuItem.activate(); | ||
| 3929 | 57 | } | ||
| 3930 | 58 | |||
| 3931 | 59 | visible: checkable | ||
| 3935 | 60 | } | 38 | } |
| 3936 | 61 | } | 39 | } |
| 3937 | 62 | 40 | ||
| 3938 | === modified file 'plugins/wifi/SwitchMenuItem.qml' | |||
| 3939 | --- plugins/wifi/SwitchMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3940 | +++ plugins/wifi/SwitchMenuItem.qml 2015-11-27 13:34:19 +0000 | |||
| 3941 | @@ -33,7 +33,7 @@ | |||
| 3942 | 33 | switcher.checked = checked; | 33 | switcher.checked = checked; |
| 3943 | 34 | } | 34 | } |
| 3944 | 35 | 35 | ||
| 3946 | 36 | control: Switch { | 36 | Switch { |
| 3947 | 37 | id: switcher | 37 | id: switcher |
| 3948 | 38 | 38 | ||
| 3949 | 39 | Component.onCompleted: { | 39 | Component.onCompleted: { |
| 3950 | 40 | 40 | ||
| 3951 | === modified file 'src/CMakeLists.txt' | |||
| 3952 | --- src/CMakeLists.txt 2014-10-31 14:53:32 +0000 | |||
| 3953 | +++ src/CMakeLists.txt 2015-11-27 13:34:19 +0000 | |||
| 3954 | @@ -20,7 +20,7 @@ | |||
| 3955 | 20 | ) | 20 | ) |
| 3956 | 21 | 21 | ||
| 3957 | 22 | set(QML_SOURCES | 22 | set(QML_SOURCES |
| 3959 | 23 | qml/CategoryGrid.qml | 23 | qml/CategorySection.qml |
| 3960 | 24 | qml/EntryComponent.qml | 24 | qml/EntryComponent.qml |
| 3961 | 25 | qml/MainWindow.qml | 25 | qml/MainWindow.qml |
| 3962 | 26 | qml/UncategorizedItemsView.qml | 26 | qml/UncategorizedItemsView.qml |
| 3963 | 27 | 27 | ||
| 3964 | === modified file 'src/SystemSettings/qmldir' | |||
| 3965 | --- src/SystemSettings/qmldir 2014-10-31 08:45:10 +0000 | |||
| 3966 | +++ src/SystemSettings/qmldir 2015-11-27 13:34:19 +0000 | |||
| 3967 | @@ -1,3 +1,4 @@ | |||
| 3968 | 1 | module SystemSettings | 1 | module SystemSettings |
| 3969 | 2 | |||
| 3970 | 2 | ItemPage 1.0 ItemPage.qml | 3 | ItemPage 1.0 ItemPage.qml |
| 3971 | 3 | SettingsItemTitle 1.0 SettingsItemTitle.qml | 4 | SettingsItemTitle 1.0 SettingsItemTitle.qml |
| 3972 | 4 | 5 | ||
| 3973 | === renamed file 'src/qml/CategoryGrid.qml' => 'src/qml/CategorySection.qml' | |||
| 3974 | --- src/qml/CategoryGrid.qml 2015-08-10 13:31:45 +0000 | |||
| 3975 | +++ src/qml/CategorySection.qml 2015-11-27 13:34:19 +0000 | |||
| 3976 | @@ -1,6 +1,8 @@ | |||
| 3977 | 1 | import QtQuick 2.4 | 1 | import QtQuick 2.4 |
| 3978 | 2 | import SystemSettings 1.0 | ||
| 3979 | 3 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3980 | 2 | import Ubuntu.Components 1.3 | 4 | import Ubuntu.Components 1.3 |
| 3982 | 3 | import Ubuntu.Components.ListItems 1.3 as ListItem | 5 | |
| 3983 | 4 | 6 | ||
| 3984 | 5 | Column { | 7 | Column { |
| 3985 | 6 | anchors { | 8 | anchors { |
| 3986 | @@ -14,32 +16,17 @@ | |||
| 3987 | 14 | 16 | ||
| 3988 | 15 | objectName: "categoryGrid-" + category | 17 | objectName: "categoryGrid-" + category |
| 3989 | 16 | 18 | ||
| 3991 | 17 | ListItem.Standard { | 19 | SettingsItemTitle { |
| 3992 | 18 | id: header | 20 | id: header |
| 3993 | 19 | |||
| 3994 | 20 | highlightWhenPressed: false | ||
| 3995 | 21 | showDivider: false | ||
| 3996 | 22 | text: categoryName | 21 | text: categoryName |
| 3997 | 23 | visible: repeater.count > 0 | 22 | visible: repeater.count > 0 |
| 3998 | 24 | } | 23 | } |
| 3999 | 25 | 24 | ||
| 4017 | 26 | Grid { | 25 | Column { |
| 4018 | 27 | property int itemWidth: units.gu(12) | 26 | id: col |
| 4019 | 28 | 27 | anchors { | |
| 4020 | 29 | // The amount of whitespace, including column spacing | 28 | left: parent.left |
| 4021 | 30 | property int space: parent.width - columns * itemWidth | 29 | right: parent.right |
| 4005 | 31 | |||
| 4006 | 32 | // The column spacing is 1/n of the left/right margins | ||
| 4007 | 33 | property int n: 4 | ||
| 4008 | 34 | |||
| 4009 | 35 | columnSpacing: space / ((2 * n) + (columns - 1)) | ||
| 4010 | 36 | rowSpacing: units.gu(3) | ||
| 4011 | 37 | width: (columns * itemWidth) + columnSpacing * (columns - 1) | ||
| 4012 | 38 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 4013 | 39 | columns: { | ||
| 4014 | 40 | var items = Math.floor(parent.width / itemWidth) | ||
| 4015 | 41 | var count = repeater.count | ||
| 4016 | 42 | return count < items ? count : items | ||
| 4022 | 43 | } | 30 | } |
| 4023 | 44 | 31 | ||
| 4024 | 45 | Repeater { | 32 | Repeater { |
| 4025 | @@ -49,7 +36,10 @@ | |||
| 4026 | 49 | 36 | ||
| 4027 | 50 | delegate: Loader { | 37 | delegate: Loader { |
| 4028 | 51 | id: loader | 38 | id: loader |
| 4030 | 52 | width: parent.itemWidth | 39 | anchors { |
| 4031 | 40 | left: col.left | ||
| 4032 | 41 | right: col.right | ||
| 4033 | 42 | } | ||
| 4034 | 53 | sourceComponent: model.item.entryComponent | 43 | sourceComponent: model.item.entryComponent |
| 4035 | 54 | active: model.item.visible | 44 | active: model.item.visible |
| 4036 | 55 | Connections { | 45 | Connections { |
| 4037 | @@ -66,5 +56,4 @@ | |||
| 4038 | 66 | } | 56 | } |
| 4039 | 67 | } | 57 | } |
| 4040 | 68 | } | 58 | } |
| 4041 | 69 | ListItem.ThinDivider { visible: header.visible } | ||
| 4042 | 70 | } | 59 | } |
| 4043 | 71 | 60 | ||
| 4044 | === modified file 'src/qml/EntryComponent.qml' | |||
| 4045 | --- src/qml/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 4046 | +++ src/qml/EntryComponent.qml 2015-11-27 13:34:19 +0000 | |||
| 4047 | @@ -1,7 +1,7 @@ | |||
| 4048 | 1 | /* | 1 | /* |
| 4049 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4050 | 3 | * | 3 | * |
| 4052 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2015 Canonical Ltd. |
| 4053 | 5 | * | 5 | * |
| 4054 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 4055 | 7 | * | 7 | * |
| 4056 | @@ -19,58 +19,14 @@ | |||
| 4057 | 19 | */ | 19 | */ |
| 4058 | 20 | 20 | ||
| 4059 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 4060 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 4061 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 4062 | 23 | import Ubuntu.Settings.Components 0.1 | ||
| 4063 | 24 | 24 | ||
| 4065 | 25 | Item { | 25 | SettingsListItems.IconProgression { |
| 4066 | 26 | id: root | 26 | id: root |
| 4067 | 27 | 27 | ||
| 4068 | 28 | signal clicked | ||
| 4069 | 29 | |||
| 4070 | 30 | height: button.height | ||
| 4071 | 31 | |||
| 4072 | 32 | objectName: "entryComponent-" + model.item.baseName | 28 | objectName: "entryComponent-" + model.item.baseName |
| 4073 | 33 | 29 | ||
| 4116 | 34 | AbstractButton { | 30 | text: i18n.dtr(model.item.translations, model.displayName) |
| 4117 | 35 | id: button | 31 | iconSource: model.icon |
| 4076 | 36 | anchors.left: parent.left | ||
| 4077 | 37 | anchors.right: parent.right | ||
| 4078 | 38 | onClicked: root.clicked() | ||
| 4079 | 39 | |||
| 4080 | 40 | height: col.height | ||
| 4081 | 41 | |||
| 4082 | 42 | Column { | ||
| 4083 | 43 | id: col | ||
| 4084 | 44 | anchors.left: parent.left | ||
| 4085 | 45 | anchors.right: parent.right | ||
| 4086 | 46 | |||
| 4087 | 47 | Icon { | ||
| 4088 | 48 | id: icon | ||
| 4089 | 49 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 4090 | 50 | width: height | ||
| 4091 | 51 | height: units.gu(4) | ||
| 4092 | 52 | source: model.icon | ||
| 4093 | 53 | } | ||
| 4094 | 54 | |||
| 4095 | 55 | Label { | ||
| 4096 | 56 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 4097 | 57 | text: i18n.dtr(model.item.translations, model.displayName) | ||
| 4098 | 58 | width: col.width | ||
| 4099 | 59 | horizontalAlignment: Text.AlignHCenter | ||
| 4100 | 60 | fontSize: "small" | ||
| 4101 | 61 | wrapMode: Text.WrapAtWordBoundaryOrAnywhere | ||
| 4102 | 62 | } | ||
| 4103 | 63 | } | ||
| 4104 | 64 | } | ||
| 4105 | 65 | |||
| 4106 | 66 | UbuntuShape { | ||
| 4107 | 67 | z: -1 | ||
| 4108 | 68 | visible: button.pressed | ||
| 4109 | 69 | anchors{ | ||
| 4110 | 70 | fill: root | ||
| 4111 | 71 | margins: -units.gu(0.25) | ||
| 4112 | 72 | } | ||
| 4113 | 73 | backgroundColor: UbuntuColors.darkGrey | ||
| 4114 | 74 | opacity: 0.15 | ||
| 4115 | 75 | } | ||
| 4118 | 76 | } | 32 | } |
| 4119 | 77 | 33 | ||
| 4120 | === modified file 'src/qml/MainWindow.qml' | |||
| 4121 | --- src/qml/MainWindow.qml 2015-08-10 13:31:45 +0000 | |||
| 4122 | +++ src/qml/MainWindow.qml 2015-11-27 13:34:19 +0000 | |||
| 4123 | @@ -19,8 +19,8 @@ | |||
| 4124 | 19 | */ | 19 | */ |
| 4125 | 20 | 20 | ||
| 4126 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 4127 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 4128 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 4129 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 4130 | 24 | import SystemSettings 1.0 | 24 | import SystemSettings 1.0 |
| 4131 | 25 | 25 | ||
| 4132 | 26 | MainView { | 26 | MainView { |
| 4133 | @@ -112,6 +112,16 @@ | |||
| 4134 | 112 | visible: false | 112 | visible: false |
| 4135 | 113 | flickable: mainFlickable | 113 | flickable: mainFlickable |
| 4136 | 114 | 114 | ||
| 4137 | 115 | head.actions: [ | ||
| 4138 | 116 | Action { | ||
| 4139 | 117 | iconName: "find" | ||
| 4140 | 118 | onTriggered: { | ||
| 4141 | 119 | pluginManager.filter = ""; | ||
| 4142 | 120 | search.visible = !search.visible; | ||
| 4143 | 121 | } | ||
| 4144 | 122 | } | ||
| 4145 | 123 | ] | ||
| 4146 | 124 | |||
| 4147 | 115 | Flickable { | 125 | Flickable { |
| 4148 | 116 | id: mainFlickable | 126 | id: mainFlickable |
| 4149 | 117 | anchors.fill: parent | 127 | anchors.fill: parent |
| 4150 | @@ -125,9 +135,11 @@ | |||
| 4151 | 125 | anchors.left: parent.left | 135 | anchors.left: parent.left |
| 4152 | 126 | anchors.right: parent.right | 136 | anchors.right: parent.right |
| 4153 | 127 | 137 | ||
| 4155 | 128 | ListItem.SingleControl { | 138 | SettingsListItems.SingleControl { |
| 4156 | 129 | id: search | 139 | id: search |
| 4158 | 130 | control: TextField { | 140 | visible: false |
| 4159 | 141 | TextField { | ||
| 4160 | 142 | id: searchField | ||
| 4161 | 131 | width: parent.width - units.gu(4) | 143 | width: parent.width - units.gu(4) |
| 4162 | 132 | placeholderText: i18n.tr("Search") | 144 | placeholderText: i18n.tr("Search") |
| 4163 | 133 | objectName: "searchTextField" | 145 | objectName: "searchTextField" |
| 4164 | @@ -135,23 +147,24 @@ | |||
| 4165 | 135 | onDisplayTextChanged: | 147 | onDisplayTextChanged: |
| 4166 | 136 | pluginManager.filter = displayText | 148 | pluginManager.filter = displayText |
| 4167 | 137 | } | 149 | } |
| 4168 | 150 | onVisibleChanged: if (visible) searchField.forceActiveFocus() | ||
| 4169 | 138 | } | 151 | } |
| 4170 | 139 | 152 | ||
| 4171 | 140 | UncategorizedItemsView { | 153 | UncategorizedItemsView { |
| 4172 | 141 | model: pluginManager.itemModel("uncategorized-top") | 154 | model: pluginManager.itemModel("uncategorized-top") |
| 4173 | 142 | } | 155 | } |
| 4174 | 143 | 156 | ||
| 4176 | 144 | CategoryGrid { | 157 | CategorySection { |
| 4177 | 145 | category: "network" | 158 | category: "network" |
| 4178 | 146 | categoryName: i18n.tr("Network") | 159 | categoryName: i18n.tr("Network") |
| 4179 | 147 | } | 160 | } |
| 4180 | 148 | 161 | ||
| 4182 | 149 | CategoryGrid { | 162 | CategorySection { |
| 4183 | 150 | category: "personal" | 163 | category: "personal" |
| 4184 | 151 | categoryName: i18n.tr("Personal") | 164 | categoryName: i18n.tr("Personal") |
| 4185 | 152 | } | 165 | } |
| 4186 | 153 | 166 | ||
| 4188 | 154 | CategoryGrid { | 167 | CategorySection { |
| 4189 | 155 | category: "system" | 168 | category: "system" |
| 4190 | 156 | categoryName: i18n.tr("System") | 169 | categoryName: i18n.tr("System") |
| 4191 | 157 | } | 170 | } |
| 4192 | 158 | 171 | ||
| 4193 | === modified file 'src/ui.qrc' | |||
| 4194 | --- src/ui.qrc 2014-01-31 15:07:01 +0000 | |||
| 4195 | +++ src/ui.qrc 2015-11-27 13:34:19 +0000 | |||
| 4196 | @@ -1,6 +1,6 @@ | |||
| 4197 | 1 | <!DOCTYPE RCC><RCC version="1.0"> | 1 | <!DOCTYPE RCC><RCC version="1.0"> |
| 4198 | 2 | <qresource> | 2 | <qresource> |
| 4200 | 3 | <file>qml/CategoryGrid.qml</file> | 3 | <file>qml/CategorySection.qml</file> |
| 4201 | 4 | <file>qml/EntryComponent.qml</file> | 4 | <file>qml/EntryComponent.qml</file> |
| 4202 | 5 | <file>qml/MainWindow.qml</file> | 5 | <file>qml/MainWindow.qml</file> |
| 4203 | 6 | <file>qml/UncategorizedItemsView.qml</file> | 6 | <file>qml/UncategorizedItemsView.qml</file> |
| 4204 | 7 | 7 | ||
| 4205 | === modified file 'tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py' | |||
| 4206 | --- tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py 2015-08-17 15:39:14 +0000 | |||
| 4207 | +++ tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py 2015-11-27 13:34:19 +0000 | |||
| 4208 | @@ -17,6 +17,8 @@ | |||
| 4209 | 17 | BUS_NAME = 'com.canonical.indicator.network' | 17 | BUS_NAME = 'com.canonical.indicator.network' |
| 4210 | 18 | MAIN_IFACE = 'org.gtk.Actions' | 18 | MAIN_IFACE = 'org.gtk.Actions' |
| 4211 | 19 | MAIN_OBJ = '/com/canonical/indicator/network' | 19 | MAIN_OBJ = '/com/canonical/indicator/network' |
| 4212 | 20 | MENU_IFACE = 'org.gtk.Menus' | ||
| 4213 | 21 | PHONE_WIFI_OBJ = '/com/canonical/indicator/network/phone_wifi_settings' | ||
| 4214 | 20 | SYSTEM_BUS = False | 22 | SYSTEM_BUS = False |
| 4215 | 21 | 23 | ||
| 4216 | 22 | NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException( | 24 | NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException( |
| 4217 | @@ -41,8 +43,12 @@ | |||
| 4218 | 41 | return list(self.actions) | 43 | return list(self.actions) |
| 4219 | 42 | 44 | ||
| 4220 | 43 | 45 | ||
| 4223 | 44 | def set_state(self, action_name, parameters, platform_data): | 46 | def start(self, groups): |
| 4224 | 45 | eval(NOT_IMPLEMENTED) | 47 | return dbusmock.get_object(MAIN_OBJ).menus |
| 4225 | 48 | |||
| 4226 | 49 | |||
| 4227 | 50 | def end(self, groups): | ||
| 4228 | 51 | pass | ||
| 4229 | 46 | 52 | ||
| 4230 | 47 | 53 | ||
| 4231 | 48 | @dbus.service.method(dbusmock.MOCK_IFACE, | 54 | @dbus.service.method(dbusmock.MOCK_IFACE, |
| 4232 | @@ -62,12 +68,87 @@ | |||
| 4233 | 62 | mock.describe = describe | 68 | mock.describe = describe |
| 4234 | 63 | mock.describe_all = describe_all | 69 | mock.describe_all = describe_all |
| 4235 | 64 | mock.list_actions = list_actions | 70 | mock.list_actions = list_actions |
| 4236 | 65 | mock.set_state = set_state | ||
| 4237 | 66 | 71 | ||
| 4238 | 67 | mock.actions = parameters.get('actions', { | 72 | mock.actions = parameters.get('actions', { |
| 4239 | 68 | 'wifi.enable': (True, '', [True]), | 73 | 'wifi.enable': (True, '', [True]), |
| 4240 | 74 | 'accesspoint.0': (True, '', [True]), | ||
| 4241 | 75 | 'accesspoint.0::strength': (True, '', [44]), | ||
| 4242 | 76 | 'accesspoint.1': (True, '', [False]), | ||
| 4243 | 77 | 'accesspoint.1::strength': (True, '', [100]), | ||
| 4244 | 78 | 'accesspoint.2': (True, '', [False]), | ||
| 4245 | 79 | 'accesspoint.2::strength': (True, '', [74]), | ||
| 4246 | 80 | 'accesspoint.3': (False, '', [False]), | ||
| 4247 | 69 | }) | 81 | }) |
| 4248 | 70 | 82 | ||
| 4249 | 83 | mock.menus = parameters.get('menus', dbus.Array([ | ||
| 4250 | 84 | ( | ||
| 4251 | 85 | dbus.UInt32(0), dbus.UInt32(0), | ||
| 4252 | 86 | [ | ||
| 4253 | 87 | { | ||
| 4254 | 88 | 'action': 'indicator.wifi.enable', | ||
| 4255 | 89 | 'x-canonical-type': 'com.canonical.indicator.switch', | ||
| 4256 | 90 | 'label': 'Wi-Fi' | ||
| 4257 | 91 | }, | ||
| 4258 | 92 | { | ||
| 4259 | 93 | 'x-canonical-type': 'com.canonical.indicator.section', | ||
| 4260 | 94 | 'label': 'Available Wi-Fi networks' | ||
| 4261 | 95 | }, | ||
| 4262 | 96 | { | ||
| 4263 | 97 | ':section': dbus.Struct( | ||
| 4264 | 98 | (dbus.UInt32(0), dbus.UInt32(1)), signature='(uu)' | ||
| 4265 | 99 | ) | ||
| 4266 | 100 | } | ||
| 4267 | 101 | ] | ||
| 4268 | 102 | ), | ||
| 4269 | 103 | ( | ||
| 4270 | 104 | dbus.UInt32(0), dbus.UInt32(1), | ||
| 4271 | 105 | [ | ||
| 4272 | 106 | { | ||
| 4273 | 107 | 'x-canonical-wifi-ap-is-secure': True, | ||
| 4274 | 108 | 'x-canonical-wifi-ap-is-enterprise': False, | ||
| 4275 | 109 | 'label': 'Secure', | ||
| 4276 | 110 | 'x-canonical-type': | ||
| 4277 | 111 | 'unity.widgets.systemsettings.tablet.accesspoint', | ||
| 4278 | 112 | 'x-canonical-wifi-ap-strength-action': | ||
| 4279 | 113 | 'indicator.accesspoint.0::strength', | ||
| 4280 | 114 | 'action': 'indicator.accesspoint.0', | ||
| 4281 | 115 | 'x-canonical-wifi-ap-is-adhoc': False | ||
| 4282 | 116 | }, | ||
| 4283 | 117 | { | ||
| 4284 | 118 | 'x-canonical-wifi-ap-is-secure': False, | ||
| 4285 | 119 | 'x-canonical-wifi-ap-is-enterprise': False, | ||
| 4286 | 120 | 'label': 'Insecure', | ||
| 4287 | 121 | 'x-canonical-type': | ||
| 4288 | 122 | 'unity.widgets.systemsettings.tablet.accesspoint', | ||
| 4289 | 123 | 'x-canonical-wifi-ap-strength-action': | ||
| 4290 | 124 | 'indicator.accesspoint.1::strength', | ||
| 4291 | 125 | 'action': 'indicator.accesspoint.1', | ||
| 4292 | 126 | 'x-canonical-wifi-ap-is-adhoc': False | ||
| 4293 | 127 | }, | ||
| 4294 | 128 | { | ||
| 4295 | 129 | 'x-canonical-wifi-ap-is-secure': True, | ||
| 4296 | 130 | 'x-canonical-wifi-ap-is-enterprise': True, | ||
| 4297 | 131 | 'label': 'Enterprise', | ||
| 4298 | 132 | 'x-canonical-type': | ||
| 4299 | 133 | 'unity.widgets.systemsettings.tablet.accesspoint', | ||
| 4300 | 134 | 'x-canonical-wifi-ap-strength-action': | ||
| 4301 | 135 | 'indicator.accesspoint.2::strength', | ||
| 4302 | 136 | 'action': 'indicator.accesspoint.2', | ||
| 4303 | 137 | 'x-canonical-wifi-ap-is-adhoc': False | ||
| 4304 | 138 | }, | ||
| 4305 | 139 | { | ||
| 4306 | 140 | 'x-canonical-wifi-ap-is-secure': False, | ||
| 4307 | 141 | 'x-canonical-wifi-ap-is-enterprise': False, | ||
| 4308 | 142 | 'label': 'Unknown', | ||
| 4309 | 143 | 'x-canonical-type': | ||
| 4310 | 144 | 'unknown-type', | ||
| 4311 | 145 | 'action': 'indicator.accesspoint.3', | ||
| 4312 | 146 | 'x-canonical-wifi-ap-is-adhoc': False | ||
| 4313 | 147 | } | ||
| 4314 | 148 | ] | ||
| 4315 | 149 | ) | ||
| 4316 | 150 | ], signature='a(uuaa{sv})')) | ||
| 4317 | 151 | |||
| 4318 | 71 | mock.AddMethods( | 152 | mock.AddMethods( |
| 4319 | 72 | MAIN_IFACE, | 153 | MAIN_IFACE, |
| 4320 | 73 | [ | 154 | [ |
| 4321 | @@ -85,9 +166,23 @@ | |||
| 4322 | 85 | ( | 166 | ( |
| 4323 | 86 | 'List', '', 'as', | 167 | 'List', '', 'as', |
| 4324 | 87 | 'ret = self.list_actions(self)' | 168 | 'ret = self.list_actions(self)' |
| 4325 | 88 | ), | ||
| 4326 | 89 | ( | ||
| 4327 | 90 | 'SetState', 'sva{sv}', '', | ||
| 4328 | 91 | 'self.set_state(self, args[0], args[1], args[2])' | ||
| 4329 | 92 | ) | 169 | ) |
| 4330 | 93 | ]) | 170 | ]) |
| 4331 | 171 | |||
| 4332 | 172 | mock.AddObject( | ||
| 4333 | 173 | PHONE_WIFI_OBJ, | ||
| 4334 | 174 | MENU_IFACE, {}, [ | ||
| 4335 | 175 | ( | ||
| 4336 | 176 | 'Start', 'au', 'a(uuaa{sv})', | ||
| 4337 | 177 | 'ret = self.start(self, args[0])' | ||
| 4338 | 178 | ), | ||
| 4339 | 179 | ( | ||
| 4340 | 180 | 'End', 'au', '', | ||
| 4341 | 181 | 'ret = self.end(self, args[0])' | ||
| 4342 | 182 | ) | ||
| 4343 | 183 | ] | ||
| 4344 | 184 | ) | ||
| 4345 | 185 | |||
| 4346 | 186 | phone_wifi_obj = dbusmock.get_object(PHONE_WIFI_OBJ) | ||
| 4347 | 187 | phone_wifi_obj.start = start | ||
| 4348 | 188 | phone_wifi_obj.end = end | ||
FAILED: Continuous integration, rev:1576
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://