Merge lp:~ken-vandine/ubuntu-system-settings/slotsLayout into lp:ubuntu-system-settings
- slotsLayout
- Merge into trunk
Proposed by
Ken VanDine
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 1586 |
| Merged at revision: | 1678 |
| Proposed branch: | lp:~ken-vandine/ubuntu-system-settings/slotsLayout |
| Merge into: | lp:ubuntu-system-settings |
| Prerequisite: | lp:~phablet-team/ubuntu-system-settings/settings-listitems |
| Diff against target: |
4642 lines (+1262/-994) 70 files modified
plugins/about/EntryComponent.qml (+15/-7) plugins/about/PageComponent.qml (+40/-43) plugins/about/settings-about.svg (+136/-35) plugins/battery/PageComponent.qml (+28/-16) plugins/bluetooth/DevicePage.qml (+26/-50) plugins/bluetooth/PageComponent.qml (+34/-61) plugins/cellular/Components/MultiSim.qml (+9/-13) plugins/cellular/Components/Sim.qml (+6/-2) plugins/cellular/Components/SingleSim.qml (+20/-25) plugins/cellular/PageCarrierAndApn.qml (+7/-7) plugins/cellular/PageCarriersAndApns.qml (+36/-53) plugins/cellular/PageChooseApn.qml (+17/-50) plugins/cellular/PageComponent.qml (+1/-2) plugins/flight-mode/EntryComponent.qml (+26/-16) plugins/flight-mode/flight-mode.settings (+1/-1) plugins/hotspot/HotspotSetup.qml (+19/-44) plugins/hotspot/PageComponent.qml (+8/-5) plugins/language/settings-language.svg (+112/-75) plugins/mouse/PrimaryButtonSelector.qml (+1/-2) plugins/orientation-lock/EntryComponent.qml (+29/-20) plugins/orientation-lock/orientation-lock.settings (+1/-1) plugins/phone/CallForwarding.qml (+1/-2) plugins/reset/EntryComponent.qml (+15/-7) plugins/reset/PageComponent.qml (+55/-20) plugins/security-privacy/AppAccess.qml (+11/-10) plugins/security-privacy/AppAccessControl.qml (+7/-6) plugins/security-privacy/Location.qml (+9/-9) plugins/security-privacy/LockSecurity.qml (+6/-5) plugins/security-privacy/PageComponent.qml (+28/-23) plugins/security-privacy/PhoneLocking.qml (+12/-13) plugins/security-privacy/SimPin.qml (+15/-14) plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+3/-3) plugins/security-privacy/diagnostics/PageComponent.qml (+10/-11) plugins/sound/PageComponent.qml (+58/-50) plugins/system-update/EntryComponent.qml (+18/-9) plugins/time-date/ChooseTimeZone.qml (+4/-3) plugins/time-date/PageComponent.qml (+8/-8) plugins/time-date/Scroller.qml (+6/-7) plugins/time-date/TimePicker.qml (+1/-2) 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 (+4/-4) plugins/wifi/NetworkDetails.qml (+26/-29) plugins/wifi/NetworkDetailsBrief.qml (+18/-17) plugins/wifi/OtherNetwork.qml (+11/-11) plugins/wifi/PageComponent.qml (+9/-13) plugins/wifi/PreviousNetworks.qml (+3/-4) plugins/wifi/SectionMenuItem.qml (+15/-30) plugins/wifi/StandardMenuItem.qml (+6/-28) plugins/wifi/SwitchMenuItem.qml (+2/-2) src/CMakeLists.txt (+1/-0) src/SystemSettings/ListItems/Icon.qml (+1/-1) src/SystemSettings/ListItems/IconProgression.qml (+1/-1) src/SystemSettings/ListItems/SingleControl.qml (+1/-1) src/SystemSettings/ListItems/SingleValue.qml (+1/-1) src/SystemSettings/ListItems/SingleValueProgression.qml (+1/-1) src/SystemSettings/ListItems/Standard.qml (+1/-1) src/SystemSettings/ListItems/StandardProgression.qml (+1/-1) src/SystemSettings/SettingsItemTitle.qml (+1/-1) src/SystemSettings/qmldir (+1/-0) src/qml/CategoryGrid.qml (+90/-0) src/qml/CategorySection.qml (+33/-24) src/qml/MainWindow.qml (+18/-4) src/ui.qrc (+1/-0) tests/autopilot/ubuntu_system_settings/__init__.py (+9/-2) tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+3/-1) tests/autopilot/ubuntu_system_settings/tests/test_search.py (+2/-1) tests/autopilot/ubuntu_system_settings/tests/test_security.py (+3/-3) |
| To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-system-settings/slotsLayout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Needs Fixing | |
| Jonas G. Drange (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Ported to use Slots layout and updated visuals
Description of the change
Ported to use Slots layout and updated visuals
To post a comment you must log in.
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
- 1564. By Ken VanDine
-
Better alignment of the searching text
- 1565. By Ken VanDine
-
fixed horizonal alignment of buttons
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1564
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1565
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1566. By Ken VanDine
-
Fixed test
- 1567. By Ken VanDine
-
Fixed some layout issues
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1567
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1568. By Ken VanDine
-
SettingsItemTitle no longer has showDivider property
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1568
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1569. By Ken VanDine
-
Fixed imports for brightness plugin
- 1570. By Ken VanDine
-
Make the hotspot switch enabled property follow the item enabled property
- 1571. By Ken VanDine
-
Reintroduce the grid mainview leaving the search in the header
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1571
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1572. By Ken VanDine
-
Put the checkboxes on the leading edge to match the visuals
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1572
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1573. By Ken VanDine
-
Fixed _select_network
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1573
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1574. By Ken VanDine
-
Import old ListItem as ListItems
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1574
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1575. By Ken VanDine
-
Reverted slotslayout port of the keyboard panel
- 1576. By Ken VanDine
-
Reverted slotslayout port of the phone panel
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1576
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1577. By Ken VanDine
-
Dropped showDivider
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1577
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1578. By Ken VanDine
-
Ported the search tests to work with the search action in the header
- 1579. By Ken VanDine
-
Skip test_remove_apn until we can get the CPO for ListItem trigger actions
Revision history for this message
| Jonas G. Drange (jonas-drange) wrote : | # |
There's one crash, some wrong copy right dates and other minor issues. Other than that, it looks great!
review:
Needs Fixing
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1578
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1580. By Ken VanDine
-
Merged in fixes for bug 1596529 from mardy
- 1581. By Ken VanDine
-
Merged mardy's fixes
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1579
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1582. By Ken VanDine
-
Use the SettingsListIte
ms.Icon for app permissions - 1583. By Ken VanDine
-
bring back the multivalue
- 1584. By Ken VanDine
-
Added spacing
- 1585. By Ken VanDine
-
Removed testing code
Revision history for this message
| Ken VanDine (ken-vandine) wrote : | # |
> There's one crash, some wrong copy right dates and other minor issues. Other
> than that, it looks great!
What's the crash? I think I corrected all the other issues.
- 1586. By Ken VanDine
-
Last Updated doesn't need progression
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1581
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1586
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1587. By Ken VanDine
-
Updated copyright
Revision history for this message
| system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:1587
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
review:
Needs Fixing
(continuous-integration)
- 1588. By Ken VanDine
-
merged trunk
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 2016-03-22 17:19:41 +0000 | |||
| 3 | +++ plugins/about/EntryComponent.qml 2016-07-22 14:36:34 +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-2016 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 | @@ -20,14 +20,22 @@ | |||
| 14 | 20 | 20 | ||
| 15 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 16 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 17 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 18 | 24 | 23 | ||
| 20 | 25 | ListItem.Standard { | 24 | ListItem { |
| 21 | 26 | id: root | 25 | id: root |
| 22 | 27 | 26 | ||
| 23 | 28 | objectName: "entryComponent-about" | 27 | objectName: "entryComponent-about" |
| 28 | 29 | iconSource: Qt.resolvedUrl(model.icon) | 28 | height: layout.height |
| 29 | 30 | iconFrame: false | 29 | |
| 30 | 31 | text: i18n.tr(model.displayName) | 30 | ListItemLayout { |
| 31 | 32 | progression: true | 31 | id: layout |
| 32 | 32 | title.text: i18n.tr(model.displayName) | ||
| 33 | 33 | Icon { | ||
| 34 | 34 | SlotsLayout.position: SlotsLayout.Leading; | ||
| 35 | 35 | SlotsLayout.padding { top: 0; bottom: 0 } | ||
| 36 | 36 | source: Qt.resolvedUrl(model.icon) | ||
| 37 | 37 | height: units.gu(5) | ||
| 38 | 38 | } | ||
| 39 | 39 | ProgressionSlot {} | ||
| 40 | 40 | } | ||
| 41 | 33 | } | 41 | } |
| 42 | 34 | 42 | ||
| 43 | === modified file 'plugins/about/PageComponent.qml' | |||
| 44 | --- plugins/about/PageComponent.qml 2016-02-05 22:05:19 +0000 | |||
| 45 | +++ plugins/about/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 46 | @@ -1,7 +1,7 @@ | |||
| 47 | 1 | /* | 1 | /* |
| 48 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 49 | 3 | * | 3 | * |
| 51 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 52 | 5 | * | 5 | * |
| 53 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 54 | 7 | * | 7 | * |
| 55 | @@ -21,8 +21,9 @@ | |||
| 56 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 57 | 22 | import QtSystemInfo 5.0 | 22 | import QtSystemInfo 5.0 |
| 58 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 59 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 60 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 62 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 26 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 63 | 26 | import Ubuntu.SystemSettings.StorageAbout 1.0 | 27 | import Ubuntu.SystemSettings.StorageAbout 1.0 |
| 64 | 27 | import Ubuntu.SystemSettings.Update 1.0 | 28 | import Ubuntu.SystemSettings.Update 1.0 |
| 65 | 28 | import Ubuntu.SystemSettings.Bluetooth 1.0 | 29 | import Ubuntu.SystemSettings.Bluetooth 1.0 |
| 66 | @@ -70,31 +71,30 @@ | |||
| 67 | 70 | anchors.left: parent.left | 71 | anchors.left: parent.left |
| 68 | 71 | anchors.right: parent.right | 72 | anchors.right: parent.right |
| 69 | 72 | 73 | ||
| 92 | 73 | ListItem.Empty { | 74 | Column { |
| 93 | 74 | height: ubuntuLabel.height + deviceLabel.height + units.gu(6) | 75 | anchors.left: parent.left |
| 94 | 75 | 76 | anchors.right: parent.right | |
| 95 | 76 | Column { | 77 | Label { |
| 96 | 77 | anchors.left: parent.left | 78 | id: ubuntuLabel |
| 97 | 78 | anchors.right: parent.right | 79 | anchors { |
| 98 | 79 | anchors.centerIn: parent | 80 | left: parent.left |
| 99 | 80 | spacing: units.gu(2) | 81 | right: parent.right |
| 100 | 81 | Label { | 82 | } |
| 101 | 82 | id: ubuntuLabel | 83 | height: contentHeight + units.gu(2) |
| 102 | 83 | anchors.horizontalCenter: parent.horizontalCenter | 84 | horizontalAlignment: Text.AlignHCenter |
| 103 | 84 | text: "" | 85 | verticalAlignment: Text.AlignVCenter |
| 104 | 85 | fontSize: "x-large" | 86 | text: "" |
| 105 | 86 | } | 87 | fontSize: "x-large" |
| 106 | 87 | Label { | 88 | } |
| 107 | 88 | id: deviceLabel | 89 | Label { |
| 108 | 89 | objectName: "deviceLabel" | 90 | id: deviceLabel |
| 109 | 90 | anchors.horizontalCenter: parent.horizontalCenter | 91 | objectName: "deviceLabel" |
| 110 | 91 | text: deviceInfos.manufacturer() ? deviceInfos.manufacturer() + " " + deviceInfos.model() : backendInfos.vendorString | 92 | anchors.horizontalCenter: parent.horizontalCenter |
| 111 | 92 | } | 93 | text: deviceInfos.manufacturer() ? deviceInfos.manufacturer() + " " + deviceInfos.model() : backendInfos.vendorString |
| 112 | 93 | } | 94 | } |
| 91 | 94 | highlightWhenPressed: false | ||
| 113 | 95 | } | 95 | } |
| 114 | 96 | 96 | ||
| 116 | 97 | ListItem.SingleValue { | 97 | SettingsListItems.SingleValue { |
| 117 | 98 | id: serialItem | 98 | id: serialItem |
| 118 | 99 | objectName: "serialItem" | 99 | objectName: "serialItem" |
| 119 | 100 | text: i18n.tr("Serial") | 100 | text: i18n.tr("Serial") |
| 120 | @@ -102,7 +102,7 @@ | |||
| 121 | 102 | visible: backendInfos.serialNumber | 102 | visible: backendInfos.serialNumber |
| 122 | 103 | } | 103 | } |
| 123 | 104 | 104 | ||
| 125 | 105 | ListItem.SingleValue { | 105 | SettingsListItems.SingleValue { |
| 126 | 106 | objectName: "imeiItem" | 106 | objectName: "imeiItem" |
| 127 | 107 | property string imeiNumber | 107 | property string imeiNumber |
| 128 | 108 | imeiNumber: deviceInfos.imei(0) | 108 | imeiNumber: deviceInfos.imei(0) |
| 129 | @@ -112,7 +112,8 @@ | |||
| 130 | 112 | visible: modemsSorted.length == 1 | 112 | visible: modemsSorted.length == 1 |
| 131 | 113 | } | 113 | } |
| 132 | 114 | 114 | ||
| 134 | 115 | ListItem.MultiValue { | 115 | /* We still need a new ListItem for MultiValue */ |
| 135 | 116 | ListItems.MultiValue { | ||
| 136 | 116 | text: "IMEI" | 117 | text: "IMEI" |
| 137 | 117 | objectName: "imeiItems" | 118 | objectName: "imeiItems" |
| 138 | 118 | values: { | 119 | values: { |
| 139 | @@ -126,7 +127,7 @@ | |||
| 140 | 126 | visible: modemsSorted.length > 1 | 127 | visible: modemsSorted.length > 1 |
| 141 | 127 | } | 128 | } |
| 142 | 128 | 129 | ||
| 144 | 129 | ListItem.SingleValue { | 130 | SettingsListItems.SingleValue { |
| 145 | 130 | property string address: wlinfo.macAddress(NetworkInfo.WlanMode, 0) | 131 | property string address: wlinfo.macAddress(NetworkInfo.WlanMode, 0) |
| 146 | 131 | text: i18n.tr("Wi-Fi address") | 132 | text: i18n.tr("Wi-Fi address") |
| 147 | 132 | value: address ? address.toUpperCase() : "" | 133 | value: address ? address.toUpperCase() : "" |
| 148 | @@ -134,7 +135,7 @@ | |||
| 149 | 134 | showDivider: bthwaddr.visible | 135 | showDivider: bthwaddr.visible |
| 150 | 135 | } | 136 | } |
| 151 | 136 | 137 | ||
| 153 | 137 | ListItem.SingleValue { | 138 | SettingsListItems.SingleValue { |
| 154 | 138 | id: bthwaddr | 139 | id: bthwaddr |
| 155 | 139 | text: i18n.tr("Bluetooth address") | 140 | text: i18n.tr("Bluetooth address") |
| 156 | 140 | value: bluetooth.adapterAddress | 141 | value: bluetooth.adapterAddress |
| 157 | @@ -142,15 +143,14 @@ | |||
| 158 | 142 | showDivider: false | 143 | showDivider: false |
| 159 | 143 | } | 144 | } |
| 160 | 144 | 145 | ||
| 162 | 145 | ListItem.Divider {} | 146 | ListItems.Divider {} |
| 163 | 146 | 147 | ||
| 165 | 147 | ListItem.SingleValue { | 148 | SettingsListItems.SingleValueProgression { |
| 166 | 148 | id: storageItem | 149 | id: storageItem |
| 167 | 149 | objectName: "storageItem" | 150 | objectName: "storageItem" |
| 168 | 150 | text: i18n.tr("Storage") | 151 | text: i18n.tr("Storage") |
| 169 | 151 | /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */ | 152 | /* TRANSLATORS: that's the free disk space, indicated in the most appropriate storage unit */ |
| 170 | 152 | value: i18n.tr("%1 free").arg(Utilities.formatSize(backendInfos.getFreeSpace("/home"))) | 153 | value: i18n.tr("%1 free").arg(Utilities.formatSize(backendInfos.getFreeSpace("/home"))) |
| 171 | 153 | progression: true | ||
| 172 | 154 | onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml")) | 154 | onClicked: pageStack.push(Qt.resolvedUrl("Storage.qml")) |
| 173 | 155 | } | 155 | } |
| 174 | 156 | 156 | ||
| 175 | @@ -159,7 +159,7 @@ | |||
| 176 | 159 | text: i18n.tr("Software:") | 159 | text: i18n.tr("Software:") |
| 177 | 160 | } | 160 | } |
| 178 | 161 | 161 | ||
| 180 | 162 | ListItem.SingleValue { | 162 | SettingsListItems.SingleValueProgression { |
| 181 | 163 | property string versionIdentifier: { | 163 | property string versionIdentifier: { |
| 182 | 164 | var num = UpdateManager.currentBuildNumber; | 164 | var num = UpdateManager.currentBuildNumber; |
| 183 | 165 | var ota = UpdateManager.detailedVersionDetails['tag']; | 165 | var ota = UpdateManager.detailedVersionDetails['tag']; |
| 184 | @@ -171,21 +171,21 @@ | |||
| 185 | 171 | value: "Ubuntu %1%2" | 171 | value: "Ubuntu %1%2" |
| 186 | 172 | .arg(deviceInfos.version(DeviceInfo.Os)) | 172 | .arg(deviceInfos.version(DeviceInfo.Os)) |
| 187 | 173 | .arg(versionIdentifier ? " (%1)".arg(versionIdentifier) : "") | 173 | .arg(versionIdentifier ? " (%1)".arg(versionIdentifier) : "") |
| 188 | 174 | progression: true | ||
| 189 | 175 | onClicked: pageStack.push(Qt.resolvedUrl("Version.qml"), { | 174 | onClicked: pageStack.push(Qt.resolvedUrl("Version.qml"), { |
| 190 | 176 | version: versionIdentifier | 175 | version: versionIdentifier |
| 191 | 177 | }) | 176 | }) |
| 192 | 178 | } | 177 | } |
| 193 | 179 | 178 | ||
| 195 | 180 | ListItem.SingleValue { | 179 | SettingsListItems.SingleValue { |
| 196 | 181 | objectName: "lastUpdatedItem" | 180 | objectName: "lastUpdatedItem" |
| 197 | 182 | text: i18n.tr("Last updated") | 181 | text: i18n.tr("Last updated") |
| 198 | 183 | value: UpdateManager.lastUpdateDate && !isNaN(UpdateManager.lastUpdateDate) ? | 182 | value: UpdateManager.lastUpdateDate && !isNaN(UpdateManager.lastUpdateDate) ? |
| 199 | 184 | Qt.formatDate(UpdateManager.lastUpdateDate) : i18n.tr("Never") | 183 | Qt.formatDate(UpdateManager.lastUpdateDate) : i18n.tr("Never") |
| 200 | 185 | } | 184 | } |
| 201 | 186 | 185 | ||
| 204 | 187 | ListItem.SingleControl { | 186 | SettingsListItems.SingleControl { |
| 205 | 188 | control: Button { | 187 | |
| 206 | 188 | Button { | ||
| 207 | 189 | objectName: "updateButton" | 189 | objectName: "updateButton" |
| 208 | 190 | text: i18n.tr("Check for updates") | 190 | text: i18n.tr("Check for updates") |
| 209 | 191 | width: parent.width - units.gu(4) | 191 | width: parent.width - units.gu(4) |
| 210 | @@ -210,26 +210,23 @@ | |||
| 211 | 210 | text: i18n.tr("Legal:") | 210 | text: i18n.tr("Legal:") |
| 212 | 211 | } | 211 | } |
| 213 | 212 | 212 | ||
| 215 | 213 | ListItem.Standard { | 213 | SettingsListItems.StandardProgression { |
| 216 | 214 | objectName: "licenseItem" | 214 | objectName: "licenseItem" |
| 217 | 215 | text: i18n.tr("Software licenses") | 215 | text: i18n.tr("Software licenses") |
| 218 | 216 | progression: true | ||
| 219 | 217 | onClicked: pageStack.push(Qt.resolvedUrl("Software.qml")) | 216 | onClicked: pageStack.push(Qt.resolvedUrl("Software.qml")) |
| 220 | 218 | } | 217 | } |
| 221 | 219 | 218 | ||
| 223 | 220 | ListItem.Standard { | 219 | SettingsListItems.StandardProgression { |
| 224 | 221 | property var regulatoryInfo: | 220 | property var regulatoryInfo: |
| 225 | 222 | pluginManager.getByName("regulatory-information") | 221 | pluginManager.getByName("regulatory-information") |
| 226 | 223 | text: i18n.tr("Regulatory info") | 222 | text: i18n.tr("Regulatory info") |
| 227 | 224 | progression: true | ||
| 228 | 225 | visible: regulatoryInfo | 223 | visible: regulatoryInfo |
| 229 | 226 | onClicked: pageStack.push(regulatoryInfo.pageComponent) | 224 | onClicked: pageStack.push(regulatoryInfo.pageComponent) |
| 230 | 227 | } | 225 | } |
| 231 | 228 | 226 | ||
| 233 | 229 | ListItem.SingleValue { | 227 | SettingsListItems.SingleValueProgression { |
| 234 | 230 | objectName: "devmodeItem" | 228 | objectName: "devmodeItem" |
| 235 | 231 | text: i18n.tr("Developer mode") | 229 | text: i18n.tr("Developer mode") |
| 236 | 232 | progression: true | ||
| 237 | 233 | onClicked: pageStack.push(Qt.resolvedUrl("DevMode.qml")) | 230 | onClicked: pageStack.push(Qt.resolvedUrl("DevMode.qml")) |
| 238 | 234 | } | 231 | } |
| 239 | 235 | } | 232 | } |
| 240 | 236 | 233 | ||
| 241 | === modified file 'plugins/about/settings-about.svg' | |||
| 242 | --- plugins/about/settings-about.svg 2013-06-18 19:17:18 +0000 | |||
| 243 | +++ plugins/about/settings-about.svg 2016-07-22 14:36:34 +0000 | |||
| 244 | @@ -9,14 +9,15 @@ | |||
| 245 | 9 | xmlns="http://www.w3.org/2000/svg" | 9 | xmlns="http://www.w3.org/2000/svg" |
| 246 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 247 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 251 | 12 | width="90" | 12 | width="96" |
| 252 | 13 | height="90" | 13 | height="96" |
| 253 | 14 | id="svg3180" | 14 | id="svg4874" |
| 254 | 15 | version="1.1" | 15 | version="1.1" |
| 257 | 16 | inkscape:version="0.48+devel r12322" | 16 | inkscape:version="0.91+devel r" |
| 258 | 17 | sodipodi:docname="setting-about.svg"> | 17 | viewBox="0 0 96 96.000001" |
| 259 | 18 | sodipodi:docname="info.svg"> | ||
| 260 | 18 | <defs | 19 | <defs |
| 262 | 19 | id="defs3182" /> | 20 | id="defs4876" /> |
| 263 | 20 | <sodipodi:namedview | 21 | <sodipodi:namedview |
| 264 | 21 | id="base" | 22 | id="base" |
| 265 | 22 | pagecolor="#ffffff" | 23 | pagecolor="#ffffff" |
| 266 | @@ -24,18 +25,94 @@ | |||
| 267 | 24 | borderopacity="1.0" | 25 | borderopacity="1.0" |
| 268 | 25 | inkscape:pageopacity="0.0" | 26 | inkscape:pageopacity="0.0" |
| 269 | 26 | inkscape:pageshadow="2" | 27 | inkscape:pageshadow="2" |
| 273 | 27 | inkscape:zoom="7.9580786" | 28 | inkscape:zoom="8.7812488" |
| 274 | 28 | inkscape:cx="25.634328" | 29 | inkscape:cx="5.3352279" |
| 275 | 29 | inkscape:cy="36.849347" | 30 | inkscape:cy="44.122411" |
| 276 | 30 | inkscape:document-units="px" | 31 | inkscape:document-units="px" |
| 279 | 31 | inkscape:current-layer="layer1" | 32 | inkscape:current-layer="g4780" |
| 280 | 32 | showgrid="false" | 33 | showgrid="true" |
| 281 | 34 | showborder="true" | ||
| 282 | 33 | fit-margin-top="0" | 35 | fit-margin-top="0" |
| 283 | 34 | fit-margin-left="0" | 36 | fit-margin-left="0" |
| 284 | 35 | fit-margin-right="0" | 37 | fit-margin-right="0" |
| 286 | 36 | fit-margin-bottom="0" /> | 38 | fit-margin-bottom="0" |
| 287 | 39 | inkscape:snap-bbox="true" | ||
| 288 | 40 | inkscape:bbox-paths="true" | ||
| 289 | 41 | inkscape:bbox-nodes="true" | ||
| 290 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
| 291 | 43 | inkscape:snap-bbox-midpoints="true" | ||
| 292 | 44 | inkscape:object-paths="true" | ||
| 293 | 45 | inkscape:snap-intersection-paths="true" | ||
| 294 | 46 | inkscape:object-nodes="true" | ||
| 295 | 47 | inkscape:snap-smooth-nodes="true" | ||
| 296 | 48 | inkscape:snap-midpoints="true" | ||
| 297 | 49 | inkscape:snap-object-midpoints="true" | ||
| 298 | 50 | inkscape:snap-center="true" | ||
| 299 | 51 | showguides="true" | ||
| 300 | 52 | inkscape:guide-bbox="true"> | ||
| 301 | 53 | <inkscape:grid | ||
| 302 | 54 | type="xygrid" | ||
| 303 | 55 | id="grid5451" | ||
| 304 | 56 | empspacing="8" /> | ||
| 305 | 57 | <sodipodi:guide | ||
| 306 | 58 | orientation="1,0" | ||
| 307 | 59 | position="8,-8.0000001" | ||
| 308 | 60 | id="guide4063" /> | ||
| 309 | 61 | <sodipodi:guide | ||
| 310 | 62 | orientation="1,0" | ||
| 311 | 63 | position="4,-8.0000001" | ||
| 312 | 64 | id="guide4065" /> | ||
| 313 | 65 | <sodipodi:guide | ||
| 314 | 66 | orientation="0,1" | ||
| 315 | 67 | position="-8,88.000001" | ||
| 316 | 68 | id="guide4067" /> | ||
| 317 | 69 | <sodipodi:guide | ||
| 318 | 70 | orientation="0,1" | ||
| 319 | 71 | position="-8,92.000001" | ||
| 320 | 72 | id="guide4069" /> | ||
| 321 | 73 | <sodipodi:guide | ||
| 322 | 74 | orientation="0,1" | ||
| 323 | 75 | position="104,4" | ||
| 324 | 76 | id="guide4071" /> | ||
| 325 | 77 | <sodipodi:guide | ||
| 326 | 78 | orientation="0,1" | ||
| 327 | 79 | position="-5,8.0000001" | ||
| 328 | 80 | id="guide4073" /> | ||
| 329 | 81 | <sodipodi:guide | ||
| 330 | 82 | orientation="1,0" | ||
| 331 | 83 | position="92,-8.0000001" | ||
| 332 | 84 | id="guide4075" /> | ||
| 333 | 85 | <sodipodi:guide | ||
| 334 | 86 | orientation="1,0" | ||
| 335 | 87 | position="88,-8.0000001" | ||
| 336 | 88 | id="guide4077" /> | ||
| 337 | 89 | <sodipodi:guide | ||
| 338 | 90 | orientation="0,1" | ||
| 339 | 91 | position="-8,84.000001" | ||
| 340 | 92 | id="guide4074" /> | ||
| 341 | 93 | <sodipodi:guide | ||
| 342 | 94 | orientation="1,0" | ||
| 343 | 95 | position="12,-8.0000001" | ||
| 344 | 96 | id="guide4076" /> | ||
| 345 | 97 | <sodipodi:guide | ||
| 346 | 98 | orientation="0,1" | ||
| 347 | 99 | position="-5,12" | ||
| 348 | 100 | id="guide4078" /> | ||
| 349 | 101 | <sodipodi:guide | ||
| 350 | 102 | orientation="1,0" | ||
| 351 | 103 | position="84,-9.0000001" | ||
| 352 | 104 | id="guide4080" /> | ||
| 353 | 105 | <sodipodi:guide | ||
| 354 | 106 | position="48,-8.0000001" | ||
| 355 | 107 | orientation="1,0" | ||
| 356 | 108 | id="guide4170" /> | ||
| 357 | 109 | <sodipodi:guide | ||
| 358 | 110 | position="-8,48" | ||
| 359 | 111 | orientation="0,1" | ||
| 360 | 112 | id="guide4172" /> | ||
| 361 | 113 | </sodipodi:namedview> | ||
| 362 | 37 | <metadata | 114 | <metadata |
| 364 | 38 | id="metadata3185"> | 115 | id="metadata4879"> |
| 365 | 39 | <rdf:RDF> | 116 | <rdf:RDF> |
| 366 | 40 | <cc:Work | 117 | <cc:Work |
| 367 | 41 | rdf:about=""> | 118 | rdf:about=""> |
| 368 | @@ -50,29 +127,53 @@ | |||
| 369 | 50 | inkscape:label="Layer 1" | 127 | inkscape:label="Layer 1" |
| 370 | 51 | inkscape:groupmode="layer" | 128 | inkscape:groupmode="layer" |
| 371 | 52 | id="layer1" | 129 | id="layer1" |
| 373 | 53 | transform="translate(456.42857,-738.79075)"> | 130 | transform="translate(67.857146,-78.50504)"> |
| 374 | 54 | <g | 131 | <g |
| 396 | 55 | transform="translate(-2219.4286,118.57139)" | 132 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
| 397 | 56 | id="g3270"> | 133 | id="g4845" |
| 398 | 57 | <rect | 134 | style="display:inline"> |
| 399 | 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 |
| 400 | 59 | id="rect3272" | 136 | inkscape:export-ydpi="90" |
| 401 | 60 | width="90" | 137 | inkscape:export-xdpi="90" |
| 402 | 61 | height="90" | 138 | inkscape:export-filename="next01.png" |
| 403 | 62 | x="1763" | 139 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" |
| 404 | 63 | y="620.21936" /> | 140 | id="g4778" |
| 405 | 64 | <rect | 141 | inkscape:label="Layer 1"> |
| 406 | 65 | style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | 142 | <g |
| 407 | 66 | id="rect3274" | 143 | transform="matrix(-1,0,0,1,575.99999,611)" |
| 408 | 67 | width="90" | 144 | id="g4780" |
| 409 | 68 | height="90" | 145 | style="display:inline"> |
| 410 | 69 | x="1763" | 146 | <rect |
| 411 | 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" |
| 412 | 71 | <path | 148 | id="rect4782" |
| 413 | 72 | inkscape:connector-curvature="0" | 149 | width="96.037987" |
| 414 | 73 | style="fill:#808080;fill-opacity:1" | 150 | height="96" |
| 415 | 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" |
| 416 | 75 | id="path3" /> | 152 | y="345.36221" |
| 417 | 153 | transform="scale(-1,1)" /> | ||
| 418 | 154 | <path | ||
| 419 | 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" | ||
| 420 | 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" | ||
| 421 | 157 | id="path4116" | ||
| 422 | 158 | inkscape:connector-curvature="0" /> | ||
| 423 | 159 | <rect | ||
| 424 | 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" | ||
| 425 | 161 | id="rect4173" | ||
| 426 | 162 | width="5.9999971" | ||
| 427 | 163 | height="32.012661" | ||
| 428 | 164 | x="-396.36221" | ||
| 429 | 165 | y="-397.98663" | ||
| 430 | 166 | transform="matrix(0,-1,-1,0,0,0)" /> | ||
| 431 | 167 | <ellipse | ||
| 432 | 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" | ||
| 433 | 169 | id="path4175" | ||
| 434 | 170 | cx="-393.36221" | ||
| 435 | 171 | cy="-408.99097" | ||
| 436 | 172 | transform="matrix(0,-1,-1,0,0,0)" | ||
| 437 | 173 | rx="5.0000143" | ||
| 438 | 174 | ry="5.0019927" /> | ||
| 439 | 175 | </g> | ||
| 440 | 176 | </g> | ||
| 441 | 76 | </g> | 177 | </g> |
| 442 | 77 | </g> | 178 | </g> |
| 443 | 78 | </svg> | 179 | </svg> |
| 444 | 79 | 180 | ||
| 445 | === modified file 'plugins/battery/PageComponent.qml' | |||
| 446 | --- plugins/battery/PageComponent.qml 2016-05-16 15:03:57 +0000 | |||
| 447 | +++ plugins/battery/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 448 | @@ -1,7 +1,7 @@ | |||
| 449 | 1 | /* | 1 | /* |
| 450 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 451 | 3 | * | 3 | * |
| 453 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 454 | 5 | * | 5 | * |
| 455 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> |
| 456 | 7 | * | 7 | * |
| 457 | @@ -23,8 +23,8 @@ | |||
| 458 | 23 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 459 | 24 | import QtSystemInfo 5.0 | 24 | import QtSystemInfo 5.0 |
| 460 | 25 | import SystemSettings 1.0 | 25 | import SystemSettings 1.0 |
| 461 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 462 | 26 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 463 | 27 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 464 | 28 | import Ubuntu.SystemSettings.Battery 1.0 | 28 | import Ubuntu.SystemSettings.Battery 1.0 |
| 465 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 466 | 30 | import Ubuntu.Settings.Components 0.1 as USC | 30 | import Ubuntu.Settings.Components 0.1 as USC |
| 467 | @@ -99,7 +99,7 @@ | |||
| 468 | 99 | anchors.left: parent.left | 99 | anchors.left: parent.left |
| 469 | 100 | anchors.right: parent.right | 100 | anchors.right: parent.right |
| 470 | 101 | 101 | ||
| 472 | 102 | ListItem.SingleValue { | 102 | SettingsListItems.SingleValue { |
| 473 | 103 | id: chargingLevel | 103 | id: chargingLevel |
| 474 | 104 | text: i18n.tr("Charge level") | 104 | text: i18n.tr("Charge level") |
| 475 | 105 | value: { | 105 | value: { |
| 476 | @@ -262,7 +262,7 @@ | |||
| 477 | 262 | } | 262 | } |
| 478 | 263 | } | 263 | } |
| 479 | 264 | 264 | ||
| 481 | 265 | ListItem.SingleValue { | 265 | SettingsListItems.SingleValue { |
| 482 | 266 | id: chargingEntry | 266 | id: chargingEntry |
| 483 | 267 | text: { | 267 | text: { |
| 484 | 268 | if (indicatorPower.deviceState === "charging") | 268 | if (indicatorPower.deviceState === "charging") |
| 485 | @@ -271,6 +271,8 @@ | |||
| 486 | 271 | return i18n.tr("Last full charge") | 271 | return i18n.tr("Last full charge") |
| 487 | 272 | else if (indicatorPower.deviceState === "fully-charged") | 272 | else if (indicatorPower.deviceState === "fully-charged") |
| 488 | 273 | return i18n.tr("Fully charged") | 273 | return i18n.tr("Fully charged") |
| 489 | 274 | else | ||
| 490 | 275 | return "" | ||
| 491 | 274 | } | 276 | } |
| 492 | 275 | 277 | ||
| 493 | 276 | value: { | 278 | value: { |
| 494 | @@ -290,14 +292,13 @@ | |||
| 495 | 290 | text: i18n.tr("Ways to reduce battery use:") | 292 | text: i18n.tr("Ways to reduce battery use:") |
| 496 | 291 | } | 293 | } |
| 497 | 292 | 294 | ||
| 499 | 293 | ListItem.Standard { | 295 | SettingsListItems.StandardProgression { |
| 500 | 294 | text: i18n.tr("Display brightness") | 296 | text: i18n.tr("Display brightness") |
| 501 | 295 | progression: true | ||
| 502 | 296 | onClicked: pageStack.push( | 297 | onClicked: pageStack.push( |
| 503 | 297 | pluginManager.getByName("brightness").pageComponent) | 298 | pluginManager.getByName("brightness").pageComponent) |
| 504 | 298 | } | 299 | } |
| 505 | 299 | 300 | ||
| 507 | 300 | ListItem.SingleValue { | 301 | SettingsListItems.SingleValueProgression { |
| 508 | 301 | property bool lockOnSuspend: | 302 | property bool lockOnSuspend: |
| 509 | 302 | securityPrivacy.securityType !== | 303 | securityPrivacy.securityType !== |
| 510 | 303 | UbuntuSecurityPrivacyPanel.Swipe | 304 | UbuntuSecurityPrivacyPanel.Swipe |
| 511 | @@ -307,10 +308,10 @@ | |||
| 512 | 307 | var timeout = powerSettings.activityTimeout | 308 | var timeout = powerSettings.activityTimeout |
| 513 | 308 | return timeout == 0 ? | 309 | return timeout == 0 ? |
| 514 | 309 | i18n.tr("Never") : | 310 | i18n.tr("Never") : |
| 519 | 310 | (timeout < 60) ? | 311 | (timeout < 60) ? |
| 520 | 311 | // TRANSLATORS: %1 is the number of seconds | 312 | // TRANSLATORS: %1 is the number of seconds |
| 521 | 312 | i18n.tr("After %1 second", | 313 | i18n.tr("After %1 second", |
| 522 | 313 | "After %1 seconds", | 314 | "After %1 seconds", |
| 523 | 314 | timeout).arg(timeout) : | 315 | timeout).arg(timeout) : |
| 524 | 315 | // TRANSLATORS: %1 is the number of minutes | 316 | // TRANSLATORS: %1 is the number of minutes |
| 525 | 316 | i18n.tr("After %1 minute", | 317 | i18n.tr("After %1 minute", |
| 526 | @@ -327,7 +328,14 @@ | |||
| 527 | 327 | i18n.tr("Never") | 328 | i18n.tr("Never") |
| 528 | 328 | } | 329 | } |
| 529 | 329 | } | 330 | } |
| 531 | 330 | progression: true | 331 | |
| 532 | 332 | Icon { | ||
| 533 | 333 | width: units.gu(2.5) | ||
| 534 | 334 | height: width | ||
| 535 | 335 | name: "network-secure" | ||
| 536 | 336 | SlotsLayout.position: SlotsLayout.First | ||
| 537 | 337 | } | ||
| 538 | 338 | |||
| 539 | 331 | onClicked: pageStack.push( | 339 | onClicked: pageStack.push( |
| 540 | 332 | Qt.resolvedUrl("SleepValues.qml"), | 340 | Qt.resolvedUrl("SleepValues.qml"), |
| 541 | 333 | { title: text, lockOnSuspend: lockOnSuspend }) | 341 | { title: text, lockOnSuspend: lockOnSuspend }) |
| 542 | @@ -342,10 +350,12 @@ | |||
| 543 | 342 | Component.onCompleted: start() | 350 | Component.onCompleted: start() |
| 544 | 343 | } | 351 | } |
| 545 | 344 | 352 | ||
| 547 | 345 | ListItem.Standard { | 353 | SettingsListItems.Icon { |
| 548 | 346 | // TRANSLATORS: “Wi-Fi used for hotspot” is hidden. | 354 | // TRANSLATORS: “Wi-Fi used for hotspot” is hidden. |
| 549 | 347 | text: showAllUI ? i18n.tr("Wi-Fi used for hotspot") : i18n.tr("Wi-Fi") | 355 | text: showAllUI ? i18n.tr("Wi-Fi used for hotspot") : i18n.tr("Wi-Fi") |
| 551 | 348 | control: Loader { | 356 | iconName: "wifi-high" |
| 552 | 357 | |||
| 553 | 358 | Loader { | ||
| 554 | 349 | active: networkActionGroup.enabled.state != null | 359 | active: networkActionGroup.enabled.state != null |
| 555 | 350 | sourceComponent: Switch { | 360 | sourceComponent: Switch { |
| 556 | 351 | id: wifiSwitch | 361 | id: wifiSwitch |
| 557 | @@ -376,10 +386,12 @@ | |||
| 558 | 376 | Component.onCompleted: start() | 386 | Component.onCompleted: start() |
| 559 | 377 | } | 387 | } |
| 560 | 378 | 388 | ||
| 562 | 379 | ListItem.Standard { | 389 | SettingsListItems.Icon { |
| 563 | 380 | id: btListItem | 390 | id: btListItem |
| 564 | 381 | text: i18n.tr("Bluetooth") | 391 | text: i18n.tr("Bluetooth") |
| 566 | 382 | control: Loader { | 392 | iconName: "bluetooth-active" |
| 567 | 393 | |||
| 568 | 394 | Loader { | ||
| 569 | 383 | active: bluetoothActionGroup.enabled.state != null | 395 | active: bluetoothActionGroup.enabled.state != null |
| 570 | 384 | sourceComponent: Switch { | 396 | sourceComponent: Switch { |
| 571 | 385 | id: btSwitch | 397 | id: btSwitch |
| 572 | 386 | 398 | ||
| 573 | === modified file 'plugins/bluetooth/DevicePage.qml' | |||
| 574 | --- plugins/bluetooth/DevicePage.qml 2016-03-09 16:06:14 +0000 | |||
| 575 | +++ plugins/bluetooth/DevicePage.qml 2016-07-22 14:36:34 +0000 | |||
| 576 | @@ -1,7 +1,7 @@ | |||
| 577 | 1 | /* | 1 | /* |
| 578 | 2 | * This file is part of ubuntu-system-settings | 2 | * This file is part of ubuntu-system-settings |
| 579 | 3 | * | 3 | * |
| 581 | 4 | * Copyright (C) 2013-2015 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 582 | 5 | * | 5 | * |
| 583 | 6 | * Contact: Charles Kerr <charles.kerr@canonical.com> | 6 | * Contact: Charles Kerr <charles.kerr@canonical.com> |
| 584 | 7 | * | 7 | * |
| 585 | @@ -21,9 +21,9 @@ | |||
| 586 | 21 | import QMenuModel 0.1 | 21 | import QMenuModel 0.1 |
| 587 | 22 | import QtQuick 2.0 | 22 | import QtQuick 2.0 |
| 588 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 589 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 590 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 591 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 592 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 593 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 |
| 594 | 28 | 28 | ||
| 595 | 29 | Page { | 29 | Page { |
| 596 | @@ -97,64 +97,36 @@ | |||
| 597 | 97 | right: parent.right | 97 | right: parent.right |
| 598 | 98 | } | 98 | } |
| 599 | 99 | 99 | ||
| 601 | 100 | ListItem.SingleValue { | 100 | SettingsListItems.SingleValue { |
| 602 | 101 | text: i18n.tr("Name") | 101 | text: i18n.tr("Name") |
| 603 | 102 | value: backend.selectedDevice && | 102 | value: backend.selectedDevice && |
| 604 | 103 | backend.selectedDevice.name.length > 0 ? | 103 | backend.selectedDevice.name.length > 0 ? |
| 605 | 104 | backend.selectedDevice.name : | 104 | backend.selectedDevice.name : |
| 606 | 105 | i18n.tr("None") | 105 | i18n.tr("None") |
| 607 | 106 | } | 106 | } |
| 644 | 107 | ListItem.Standard { | 107 | SettingsListItems.SingleValue { |
| 645 | 108 | Rectangle { | 108 | text: i18n.tr("Type") |
| 646 | 109 | color: "transparent" | 109 | value: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER) |
| 647 | 110 | anchors.fill: parent | 110 | Image { |
| 648 | 111 | anchors.topMargin: units.gu(1) | 111 | height: units.gu(4) |
| 649 | 112 | anchors.leftMargin: units.gu(2) | 112 | width: units.gu(4) |
| 650 | 113 | anchors.rightMargin: units.gu(2) | 113 | source: backend.selectedDevice ? backend.selectedDevice.iconName : "" |
| 651 | 114 | 114 | visible: source | |
| 652 | 115 | Label { | 115 | SlotsLayout.position: SlotsLayout.Trailing-1 |
| 617 | 116 | anchors { | ||
| 618 | 117 | top: parent.top | ||
| 619 | 118 | left: parent.left | ||
| 620 | 119 | topMargin: units.gu(1) | ||
| 621 | 120 | } | ||
| 622 | 121 | height: units.gu(3) | ||
| 623 | 122 | text: i18n.tr("Type") | ||
| 624 | 123 | } | ||
| 625 | 124 | Image { | ||
| 626 | 125 | anchors { | ||
| 627 | 126 | right: deviceType.left | ||
| 628 | 127 | rightMargin: units.gu(1) | ||
| 629 | 128 | } | ||
| 630 | 129 | height: units.gu(4) | ||
| 631 | 130 | width: units.gu(4) | ||
| 632 | 131 | source: backend.selectedDevice ? backend.selectedDevice.iconName : "" | ||
| 633 | 132 | } | ||
| 634 | 133 | Label { | ||
| 635 | 134 | id: deviceType | ||
| 636 | 135 | anchors { | ||
| 637 | 136 | top: parent.top | ||
| 638 | 137 | right: parent.right | ||
| 639 | 138 | topMargin: units.gu(1) | ||
| 640 | 139 | } | ||
| 641 | 140 | height: units.gu(3) | ||
| 642 | 141 | text: getTypeString(backend.selectedDevice ? backend.selectedDevice.type : Device.OTHER) | ||
| 643 | 142 | } | ||
| 653 | 143 | } | 116 | } |
| 654 | 144 | } | 117 | } |
| 656 | 145 | ListItem.SingleValue { | 118 | SettingsListItems.SingleValue { |
| 657 | 146 | text: i18n.tr("Status") | 119 | text: i18n.tr("Status") |
| 658 | 147 | value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected) | 120 | value: getStatusString(backend.selectedDevice ? backend.selectedDevice.connection : Device.Disconnected) |
| 659 | 148 | } | 121 | } |
| 661 | 149 | ListItem.SingleValue { | 122 | SettingsListItems.SingleValue { |
| 662 | 150 | text: i18n.tr("Signal Strength") | 123 | text: i18n.tr("Signal Strength") |
| 663 | 151 | value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None) | 124 | value: getSignalString(backend.selectedDevice ? backend.selectedDevice.strength : Device.None) |
| 664 | 152 | } | 125 | } |
| 666 | 153 | ListItem.Standard { | 126 | SettingsListItems.Standard { |
| 667 | 154 | id: trustedCheck | 127 | id: trustedCheck |
| 668 | 155 | text: i18n.tr("Connect automatically when detected:") | 128 | text: i18n.tr("Connect automatically when detected:") |
| 671 | 156 | visible: backend.selectedDevice.paired | 129 | CheckBox { |
| 670 | 157 | control: CheckBox { | ||
| 672 | 158 | property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false | 130 | property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false |
| 673 | 159 | onServerCheckedChanged: checked = serverChecked | 131 | onServerCheckedChanged: checked = serverChecked |
| 674 | 160 | Component.onCompleted: checked = serverChecked | 132 | Component.onCompleted: checked = serverChecked |
| 675 | @@ -165,10 +137,12 @@ | |||
| 676 | 165 | } | 137 | } |
| 677 | 166 | } | 138 | } |
| 678 | 167 | } | 139 | } |
| 681 | 168 | ListItem.SingleControl { | 140 | |
| 682 | 169 | control: Button { | 141 | SettingsListItems.SingleControl { |
| 683 | 142 | Button { | ||
| 684 | 143 | anchors.centerIn: parent | ||
| 685 | 144 | width: parent.width - units.gu(8) | ||
| 686 | 170 | text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect") | 145 | text: backend.selectedDevice && (backend.selectedDevice.connection == Device.Connected || backend.selectedDevice.connection == Device.Connecting) ? i18n.tr("Disconnect") : i18n.tr("Connect") |
| 687 | 171 | width: parent.width - units.gu(8) | ||
| 688 | 172 | onClicked: { | 146 | onClicked: { |
| 689 | 173 | if (backend.selectedDevice | 147 | if (backend.selectedDevice |
| 690 | 174 | && (backend.selectedDevice.connection == Device.Connected | 148 | && (backend.selectedDevice.connection == Device.Connected |
| 691 | @@ -185,10 +159,12 @@ | |||
| 692 | 185 | enabled: backend.selectedDevice && backend.powered ? true : false | 159 | enabled: backend.selectedDevice && backend.powered ? true : false |
| 693 | 186 | } | 160 | } |
| 694 | 187 | } | 161 | } |
| 697 | 188 | ListItem.SingleControl { | 162 | |
| 698 | 189 | control: Button { | 163 | SettingsListItems.SingleControl { |
| 699 | 164 | Button { | ||
| 700 | 165 | anchors.centerIn: parent | ||
| 701 | 166 | width: parent.width - units.gu(8) | ||
| 702 | 190 | text: i18n.tr("Forget this device") | 167 | text: i18n.tr("Forget this device") |
| 703 | 191 | width: parent.width - units.gu(8) | ||
| 704 | 192 | onClicked: { | 168 | onClicked: { |
| 705 | 193 | backend.removeDevice(); | 169 | backend.removeDevice(); |
| 706 | 194 | backend.resetSelectedDevice(); | 170 | backend.resetSelectedDevice(); |
| 707 | 195 | 171 | ||
| 708 | === modified file 'plugins/bluetooth/PageComponent.qml' | |||
| 709 | --- plugins/bluetooth/PageComponent.qml 2016-03-10 07:28:42 +0000 | |||
| 710 | +++ plugins/bluetooth/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 711 | @@ -1,7 +1,7 @@ | |||
| 712 | 1 | /* | 1 | /* |
| 713 | 2 | * This file is part of ubuntu-system-settings | 2 | * This file is part of ubuntu-system-settings |
| 714 | 3 | * | 3 | * |
| 716 | 4 | * Copyright (C) 2013-2015 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 717 | 5 | * | 5 | * |
| 718 | 6 | * Contact: Charles Kerr <charles.kerr@canonical.com> | 6 | * Contact: Charles Kerr <charles.kerr@canonical.com> |
| 719 | 7 | * | 7 | * |
| 720 | @@ -21,9 +21,9 @@ | |||
| 721 | 21 | import QMenuModel 0.1 | 21 | import QMenuModel 0.1 |
| 722 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 723 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 724 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 725 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 726 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 727 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 728 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 | 27 | import Ubuntu.SystemSettings.Bluetooth 1.0 |
| 729 | 28 | import Ubuntu.Settings.Components 0.1 as USC | 28 | import Ubuntu.Settings.Components 0.1 as USC |
| 730 | 29 | 29 | ||
| 731 | @@ -229,9 +229,9 @@ | |||
| 732 | 229 | Component.onCompleted: start() | 229 | Component.onCompleted: start() |
| 733 | 230 | } | 230 | } |
| 734 | 231 | 231 | ||
| 736 | 232 | ListItem.Standard { | 232 | SettingsListItems.Standard { |
| 737 | 233 | text: i18n.tr("Bluetooth") | 233 | text: i18n.tr("Bluetooth") |
| 739 | 234 | control: Switch { | 234 | Switch { |
| 740 | 235 | id: btSwitch | 235 | id: btSwitch |
| 741 | 236 | property bool serverChecked: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false | 236 | property bool serverChecked: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false |
| 742 | 237 | USC.ServerPropertySynchroniser { | 237 | USC.ServerPropertySynchroniser { |
| 743 | @@ -246,54 +246,28 @@ | |||
| 744 | 246 | } | 246 | } |
| 745 | 247 | 247 | ||
| 746 | 248 | // Discoverability | 248 | // Discoverability |
| 748 | 249 | ListItem.Standard { | 249 | SettingsListItems.SingleValue { |
| 749 | 250 | text: backend.discoverable ? i18n.tr("Discoverable") : i18n.tr("Not discoverable") | ||
| 750 | 251 | value: backend.discoverable ? backend.adapterName() : "" | ||
| 751 | 250 | enabled: bluetoothActionGroup.enabled | 252 | enabled: bluetoothActionGroup.enabled |
| 752 | 251 | showDivider: false | 253 | showDivider: false |
| 753 | 252 | 254 | ||
| 794 | 253 | Rectangle { | 255 | Label { |
| 795 | 254 | color: "transparent" | 256 | anchors { |
| 796 | 255 | anchors.fill: parent | 257 | verticalCenter: parent.verticalCenter |
| 797 | 256 | anchors.topMargin: units.gu(1) | 258 | right: parent.right |
| 798 | 257 | anchors.leftMargin: units.gu(2) | 259 | rightMargin: units.gu(2) |
| 799 | 258 | anchors.rightMargin: units.gu(2) | 260 | } |
| 800 | 259 | 261 | color: "darkgrey" | |
| 801 | 260 | Label { | 262 | visible: backend.powered && !backend.discoverable |
| 802 | 261 | anchors { | 263 | text: i18n.tr("Searching…") |
| 803 | 262 | top: parent.top | 264 | fontSize: "x-small" |
| 804 | 263 | left: parent.left | 265 | SlotsLayout.position: SlotsLayout.Trailing |
| 805 | 264 | topMargin: units.gu(1) | 266 | SlotsLayout.overrideVerticalPositioning: true |
| 766 | 265 | } | ||
| 767 | 266 | height: units.gu(3) | ||
| 768 | 267 | text: backend.discoverable ? i18n.tr("Discoverable") : i18n.tr("Not discoverable") | ||
| 769 | 268 | } | ||
| 770 | 269 | |||
| 771 | 270 | Label { | ||
| 772 | 271 | anchors { | ||
| 773 | 272 | top: parent.top | ||
| 774 | 273 | right: parent.right | ||
| 775 | 274 | topMargin: units.gu(1) | ||
| 776 | 275 | } | ||
| 777 | 276 | height: units.gu(3) | ||
| 778 | 277 | text: backend.discoverable ? backend.adapterName : "" | ||
| 779 | 278 | color: "darkgrey" | ||
| 780 | 279 | visible: backend.discoverable | ||
| 781 | 280 | enabled: false | ||
| 782 | 281 | } | ||
| 783 | 282 | |||
| 784 | 283 | Label { | ||
| 785 | 284 | anchors { | ||
| 786 | 285 | top: parent.top | ||
| 787 | 286 | right: parent.right | ||
| 788 | 287 | topMargin: units.gu(1) | ||
| 789 | 288 | } | ||
| 790 | 289 | color: "darkgrey" | ||
| 791 | 290 | visible: backend.powered && !backend.discoverable | ||
| 792 | 291 | text: i18n.tr("Searching…") | ||
| 793 | 292 | } | ||
| 806 | 293 | } | 267 | } |
| 807 | 294 | } | 268 | } |
| 808 | 295 | 269 | ||
| 810 | 296 | ListItem.Standard { | 270 | SettingsItemTitle { |
| 811 | 297 | id: connectedHeader | 271 | id: connectedHeader |
| 812 | 298 | text: i18n.tr("Connected devices:") | 272 | text: i18n.tr("Connected devices:") |
| 813 | 299 | 273 | ||
| 814 | @@ -313,11 +287,13 @@ | |||
| 815 | 313 | Repeater { | 287 | Repeater { |
| 816 | 314 | id: connectedRepeater | 288 | id: connectedRepeater |
| 817 | 315 | model: backend.connectedDevices | 289 | model: backend.connectedDevices |
| 819 | 316 | delegate: ListItem.Standard { | 290 | delegate: SettingsListItems.IconProgression { |
| 820 | 317 | iconSource: iconPath | 291 | iconSource: iconPath |
| 821 | 318 | iconFrame: false | ||
| 822 | 319 | text: getDisplayName(type, displayName) | 292 | text: getDisplayName(type, displayName) |
| 824 | 320 | control: ActivityIndicator { | 293 | layout.subtitle.text: connection == Device.Connecting ? i18n.tr("Connecting…") : i18n.tr("Connected") |
| 825 | 294 | layout.subtitle.color: UbuntuColors.green | ||
| 826 | 295 | |||
| 827 | 296 | ActivityIndicator { | ||
| 828 | 321 | visible: connection == Device.Connecting | 297 | visible: connection == Device.Connecting |
| 829 | 322 | running: visible | 298 | running: visible |
| 830 | 323 | } | 299 | } |
| 831 | @@ -325,7 +301,6 @@ | |||
| 832 | 325 | backend.setSelectedDevice(addressName); | 301 | backend.setSelectedDevice(addressName); |
| 833 | 326 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); | 302 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); |
| 834 | 327 | } | 303 | } |
| 835 | 328 | progression: true | ||
| 836 | 329 | } | 304 | } |
| 837 | 330 | } | 305 | } |
| 838 | 331 | } | 306 | } |
| 839 | @@ -334,15 +309,18 @@ | |||
| 840 | 334 | id: disconnectedHeader | 309 | id: disconnectedHeader |
| 841 | 335 | text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:") | 310 | text: connectedList.visible ? i18n.tr("Connect another device:") : i18n.tr("Connect a device:") |
| 842 | 336 | enabled: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false | 311 | enabled: bluetoothActionGroup.enabled.state != undefined ? bluetoothActionGroup.enabled.state : false |
| 844 | 337 | control: Label { | 312 | Label { |
| 845 | 338 | anchors { | 313 | anchors { |
| 847 | 339 | top: parent.top | 314 | verticalCenter: parent.verticalCenter |
| 848 | 340 | right: parent.right | 315 | right: parent.right |
| 850 | 341 | topMargin: units.gu(1) | 316 | rightMargin: units.gu(2) |
| 851 | 342 | } | 317 | } |
| 852 | 343 | color: "darkgrey" | 318 | color: "darkgrey" |
| 853 | 344 | visible: backend.powered && backend.discovering | 319 | visible: backend.powered && backend.discovering |
| 854 | 345 | text: i18n.tr("Searching…") | 320 | text: i18n.tr("Searching…") |
| 855 | 321 | fontSize: "x-small" | ||
| 856 | 322 | SlotsLayout.position: SlotsLayout.Trailing | ||
| 857 | 323 | SlotsLayout.overrideVerticalPositioning: true | ||
| 858 | 346 | } | 324 | } |
| 859 | 347 | } | 325 | } |
| 860 | 348 | 326 | ||
| 861 | @@ -358,23 +336,20 @@ | |||
| 862 | 358 | Repeater { | 336 | Repeater { |
| 863 | 359 | id: disconnectedRepeater | 337 | id: disconnectedRepeater |
| 864 | 360 | model: backend.disconnectedDevices | 338 | model: backend.disconnectedDevices |
| 866 | 361 | delegate: ListItem.Standard { | 339 | delegate: SettingsListItems.IconProgression { |
| 867 | 362 | iconSource: iconPath | 340 | iconSource: iconPath |
| 868 | 363 | iconFrame: false | ||
| 869 | 364 | text: getDisplayName(type, displayName) | 341 | text: getDisplayName(type, displayName) |
| 870 | 365 | onClicked: { | 342 | onClicked: { |
| 871 | 366 | backend.setSelectedDevice(addressName); | 343 | backend.setSelectedDevice(addressName); |
| 872 | 367 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); | 344 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); |
| 873 | 368 | } | 345 | } |
| 874 | 369 | progression: true | ||
| 875 | 370 | } | 346 | } |
| 876 | 371 | } | 347 | } |
| 877 | 372 | } | 348 | } |
| 879 | 373 | ListItem.Standard { | 349 | SettingsListItems.Standard { |
| 880 | 374 | id: disconnectedNone | 350 | id: disconnectedNone |
| 881 | 375 | text: i18n.tr("None detected") | 351 | text: i18n.tr("None detected") |
| 882 | 376 | visible: !disconnectedList.visible && disconnectedHeader.visible | 352 | visible: !disconnectedList.visible && disconnectedHeader.visible |
| 883 | 377 | enabled: false | ||
| 884 | 378 | } | 353 | } |
| 885 | 379 | 354 | ||
| 886 | 380 | SettingsItemTitle { | 355 | SettingsItemTitle { |
| 887 | @@ -395,15 +370,13 @@ | |||
| 888 | 395 | Repeater { | 370 | Repeater { |
| 889 | 396 | id: autoconnectRepeater | 371 | id: autoconnectRepeater |
| 890 | 397 | model: backend.autoconnectDevices | 372 | model: backend.autoconnectDevices |
| 892 | 398 | delegate: ListItem.Standard { | 373 | delegate: SettingsListItems.IconProgression { |
| 893 | 399 | iconSource: iconPath | 374 | iconSource: iconPath |
| 894 | 400 | iconFrame: false | ||
| 895 | 401 | text: getDisplayName(type, displayName) | 375 | text: getDisplayName(type, displayName) |
| 896 | 402 | onClicked: { | 376 | onClicked: { |
| 897 | 403 | backend.setSelectedDevice(addressName); | 377 | backend.setSelectedDevice(addressName); |
| 898 | 404 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); | 378 | pageStack.push(Qt.resolvedUrl("DevicePage.qml"), {backend: backend, root: root}); |
| 899 | 405 | } | 379 | } |
| 900 | 406 | progression: true | ||
| 901 | 407 | } | 380 | } |
| 902 | 408 | } | 381 | } |
| 903 | 409 | } | 382 | } |
| 904 | 410 | 383 | ||
| 905 | === modified file 'plugins/cellular/Components/MultiSim.qml' | |||
| 906 | --- plugins/cellular/Components/MultiSim.qml 2016-03-16 13:44:42 +0000 | |||
| 907 | +++ plugins/cellular/Components/MultiSim.qml 2016-07-22 14:36:34 +0000 | |||
| 908 | @@ -1,5 +1,5 @@ | |||
| 909 | 1 | /* | 1 | /* |
| 911 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2016 Canonical Ltd |
| 912 | 3 | * | 3 | * |
| 913 | 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 |
| 914 | 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 |
| 915 | @@ -20,9 +20,10 @@ | |||
| 916 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 917 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 918 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 919 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 920 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 921 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 922 | 25 | import Ubuntu.SystemSettings.Cellular 1.0 | 25 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 923 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItems | ||
| 924 | 26 | 27 | ||
| 925 | 27 | /* This is a temporary solution to the issue of Hotspots failing on mako. If | 28 | /* This is a temporary solution to the issue of Hotspots failing on mako. If |
| 926 | 28 | the device is mako, we hide the hotspot entry. Will be removed once lp:1434591 | 29 | the device is mako, we hide the hotspot entry. Will be removed once lp:1434591 |
| 927 | @@ -54,20 +55,17 @@ | |||
| 928 | 54 | anchors { left: parent.left; right: parent.right } | 55 | anchors { left: parent.left; right: parent.right } |
| 929 | 55 | } | 56 | } |
| 930 | 56 | 57 | ||
| 932 | 57 | ListItem.Standard { | 58 | SettingsListItems.StandardProgression { |
| 933 | 58 | id: dataUsage | 59 | id: dataUsage |
| 934 | 59 | text: i18n.tr("Data usage statistics") | 60 | text: i18n.tr("Data usage statistics") |
| 935 | 60 | progression: true | ||
| 936 | 61 | visible: showAllUI | 61 | visible: showAllUI |
| 937 | 62 | } | 62 | } |
| 938 | 63 | 63 | ||
| 942 | 64 | ListItem.Divider {} | 64 | SettingsListItems.SingleValueProgression { |
| 940 | 65 | |||
| 941 | 66 | ListItem.SingleValue { | ||
| 943 | 67 | text: i18n.tr("Carriers") | 65 | text: i18n.tr("Carriers") |
| 944 | 68 | id: chooseCarrier | 66 | id: chooseCarrier |
| 945 | 69 | objectName: "carrierApnEntry" | 67 | objectName: "carrierApnEntry" |
| 947 | 70 | progression: enabled | 68 | progressionVisible: enabled |
| 948 | 71 | showDivider: false | 69 | showDivider: false |
| 949 | 72 | onClicked: { | 70 | onClicked: { |
| 950 | 73 | pageStack.push(Qt.resolvedUrl("../PageCarriersAndApns.qml"), { | 71 | pageStack.push(Qt.resolvedUrl("../PageCarriersAndApns.qml"), { |
| 951 | @@ -76,26 +74,24 @@ | |||
| 952 | 76 | } | 74 | } |
| 953 | 77 | } | 75 | } |
| 954 | 78 | 76 | ||
| 955 | 79 | ListItem.Divider {} | ||
| 956 | 80 | |||
| 957 | 81 | SimEditor { | 77 | SimEditor { |
| 958 | 82 | anchors { left: parent.left; right: parent.right } | 78 | anchors { left: parent.left; right: parent.right } |
| 959 | 83 | } | 79 | } |
| 960 | 84 | 80 | ||
| 962 | 85 | ListItem.Divider {} | 81 | ListItems.Divider {} |
| 963 | 86 | 82 | ||
| 964 | 87 | DefaultSim { | 83 | DefaultSim { |
| 965 | 88 | anchors { left: parent.left; right: parent.right } | 84 | anchors { left: parent.left; right: parent.right } |
| 966 | 89 | } | 85 | } |
| 967 | 90 | 86 | ||
| 969 | 91 | ListItem.Divider {} | 87 | ListItems.Divider {} |
| 970 | 92 | 88 | ||
| 971 | 93 | SettingsItemTitle { text: i18n.tr("Connection type:") } | 89 | SettingsItemTitle { text: i18n.tr("Connection type:") } |
| 972 | 94 | 90 | ||
| 973 | 95 | Repeater { | 91 | Repeater { |
| 974 | 96 | model: sims | 92 | model: sims |
| 975 | 97 | 93 | ||
| 977 | 98 | ListItem.ItemSelector { | 94 | ListItems.ItemSelector { |
| 978 | 99 | id: radio | 95 | id: radio |
| 979 | 100 | property var sim: modelData | 96 | property var sim: modelData |
| 980 | 101 | 97 | ||
| 981 | 102 | 98 | ||
| 982 | === modified file 'plugins/cellular/Components/Sim.qml' | |||
| 983 | --- plugins/cellular/Components/Sim.qml 2015-08-10 13:31:45 +0000 | |||
| 984 | +++ plugins/cellular/Components/Sim.qml 2016-07-22 14:36:34 +0000 | |||
| 985 | @@ -1,5 +1,5 @@ | |||
| 986 | 1 | /* | 1 | /* |
| 988 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2016 Canonical Ltd |
| 989 | 3 | * | 3 | * |
| 990 | 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 |
| 991 | 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 |
| 992 | @@ -37,6 +37,10 @@ | |||
| 993 | 37 | return name + (number ? " (" + number + ")" : ""); | 37 | return name + (number ? " (" + number + ")" : ""); |
| 994 | 38 | } | 38 | } |
| 995 | 39 | 39 | ||
| 996 | 40 | function getTechString () { | ||
| 997 | 41 | return techToString(radioSettings.technologyPreference); | ||
| 998 | 42 | } | ||
| 999 | 43 | |||
| 1000 | 40 | function techToString (tech) { | 44 | function techToString (tech) { |
| 1001 | 41 | var strings = { | 45 | var strings = { |
| 1002 | 42 | 'gsm': i18n.tr("2G only (saves battery)"), | 46 | 'gsm': i18n.tr("2G only (saves battery)"), |
| 1003 | @@ -44,7 +48,7 @@ | |||
| 1004 | 44 | 'lte': i18n.tr("2G/3G/4G (faster)") | 48 | 'lte': i18n.tr("2G/3G/4G (faster)") |
| 1005 | 45 | }; | 49 | }; |
| 1006 | 46 | strings['umts_enable'] = strings['umts']; | 50 | strings['umts_enable'] = strings['umts']; |
| 1008 | 47 | return strings[tech]; | 51 | return strings[tech] || ""; |
| 1009 | 48 | } | 52 | } |
| 1010 | 49 | 53 | ||
| 1011 | 50 | // adds umts_enable to an copy of model | 54 | // adds umts_enable to an copy of model |
| 1012 | 51 | 55 | ||
| 1013 | === modified file 'plugins/cellular/Components/SingleSim.qml' | |||
| 1014 | --- plugins/cellular/Components/SingleSim.qml 2016-06-22 16:40:40 +0000 | |||
| 1015 | +++ plugins/cellular/Components/SingleSim.qml 2016-07-22 14:36:34 +0000 | |||
| 1016 | @@ -1,5 +1,5 @@ | |||
| 1017 | 1 | /* | 1 | /* |
| 1019 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2016 Canonical Ltd |
| 1020 | 3 | * | 3 | * |
| 1021 | 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 |
| 1022 | 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 |
| 1023 | @@ -20,8 +20,8 @@ | |||
| 1024 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1025 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1026 | 22 | import Ubuntu.Connectivity 1.0 | 22 | import Ubuntu.Connectivity 1.0 |
| 1027 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1028 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 1029 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1030 | 25 | 25 | ||
| 1031 | 26 | Column { | 26 | Column { |
| 1032 | 27 | 27 | ||
| 1033 | @@ -64,10 +64,10 @@ | |||
| 1034 | 64 | sort.property: "Index" | 64 | sort.property: "Index" |
| 1035 | 65 | sort.order: Qt.AscendingOrder | 65 | sort.order: Qt.AscendingOrder |
| 1036 | 66 | } | 66 | } |
| 1041 | 67 | 67 | SettingsListItems.Standard { | |
| 1042 | 68 | ListItem.Standard { | 68 | id: selector |
| 1043 | 69 | text: i18n.tr("Cellular data") | 69 | text: i18n.tr("Cellular data:") |
| 1044 | 70 | control: Switch { | 70 | Switch { |
| 1045 | 71 | id: dataSwitch | 71 | id: dataSwitch |
| 1046 | 72 | objectName: "data" | 72 | objectName: "data" |
| 1047 | 73 | checked: Connectivity.mobileDataEnabled | 73 | checked: Connectivity.mobileDataEnabled |
| 1048 | @@ -86,9 +86,11 @@ | |||
| 1049 | 86 | } | 86 | } |
| 1050 | 87 | } | 87 | } |
| 1051 | 88 | } | 88 | } |
| 1053 | 89 | ListItem.Standard { | 89 | |
| 1054 | 90 | SettingsListItems.Standard { | ||
| 1055 | 91 | id: dataRoamingItem | ||
| 1056 | 90 | text: i18n.tr("Data roaming") | 92 | text: i18n.tr("Data roaming") |
| 1058 | 91 | control: Switch { | 93 | Switch { |
| 1059 | 92 | id: roaming | 94 | id: roaming |
| 1060 | 93 | objectName: "roaming" | 95 | objectName: "roaming" |
| 1061 | 94 | enabled: singlesim.currentSim !== null && dataSwitch.checked | 96 | enabled: singlesim.currentSim !== null && dataSwitch.checked |
| 1062 | @@ -99,31 +101,24 @@ | |||
| 1063 | 99 | } | 101 | } |
| 1064 | 100 | } | 102 | } |
| 1065 | 101 | 103 | ||
| 1067 | 102 | ListItem.Standard { | 104 | SettingsListItems.StandardProgression{ |
| 1068 | 103 | text: i18n.tr("Data usage statistics") | 105 | text: i18n.tr("Data usage statistics") |
| 1069 | 104 | progression: true | ||
| 1070 | 105 | visible: showAllUI | 106 | visible: showAllUI |
| 1071 | 106 | } | 107 | } |
| 1072 | 107 | 108 | ||
| 1087 | 108 | ListItem.Divider { | 109 | SettingsListItems.SingleValueProgression { |
| 1088 | 109 | visible: radio.visible | 110 | text: i18n.tr("Carrier & APN"); |
| 1075 | 110 | } | ||
| 1076 | 111 | |||
| 1077 | 112 | RadioSingleSim { | ||
| 1078 | 113 | id: radio | ||
| 1079 | 114 | anchors { left: parent.left; right: parent.right } | ||
| 1080 | 115 | visible: radio.enabled | ||
| 1081 | 116 | } | ||
| 1082 | 117 | |||
| 1083 | 118 | ListItem.Divider {} | ||
| 1084 | 119 | |||
| 1085 | 120 | ListItem.SingleValue { | ||
| 1086 | 121 | text: i18n.tr("Carrier"); | ||
| 1089 | 122 | id: chooseCarrier | 111 | id: chooseCarrier |
| 1090 | 123 | objectName: "carrierApnEntry" | 112 | objectName: "carrierApnEntry" |
| 1092 | 124 | progression: enabled | 113 | value: sim.netReg.name || "" |
| 1093 | 125 | onClicked: pageStack.push(Qt.resolvedUrl("../PageCarrierAndApn.qml"), { | 114 | onClicked: pageStack.push(Qt.resolvedUrl("../PageCarrierAndApn.qml"), { |
| 1094 | 126 | sim: sim | 115 | sim: sim |
| 1095 | 127 | }) | 116 | }) |
| 1096 | 128 | } | 117 | } |
| 1097 | 118 | |||
| 1098 | 119 | RadioSingleSim { | ||
| 1099 | 120 | id: radio | ||
| 1100 | 121 | anchors { left: parent.left; right: parent.right } | ||
| 1101 | 122 | visible: radio.enabled | ||
| 1102 | 123 | } | ||
| 1103 | 129 | } | 124 | } |
| 1104 | 130 | 125 | ||
| 1105 | === modified file 'plugins/cellular/PageCarrierAndApn.qml' | |||
| 1106 | --- plugins/cellular/PageCarrierAndApn.qml 2015-08-10 13:31:45 +0000 | |||
| 1107 | +++ plugins/cellular/PageCarrierAndApn.qml 2016-07-22 14:36:34 +0000 | |||
| 1108 | @@ -1,5 +1,5 @@ | |||
| 1109 | 1 | /* | 1 | /* |
| 1111 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2016 Canonical Ltd |
| 1112 | 3 | * | 3 | * |
| 1113 | 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 |
| 1114 | 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 |
| 1115 | @@ -19,12 +19,12 @@ | |||
| 1116 | 19 | */ | 19 | */ |
| 1117 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1118 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1119 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1120 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1121 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1122 | 24 | 24 | ||
| 1123 | 25 | ItemPage { | 25 | ItemPage { |
| 1124 | 26 | id: root | 26 | id: root |
| 1126 | 27 | title: i18n.tr("Carrier") | 27 | title: i18n.tr("Carrier & APN") |
| 1127 | 28 | objectName: "carrierApnPage" | 28 | objectName: "carrierApnPage" |
| 1128 | 29 | flickable: null | 29 | flickable: null |
| 1129 | 30 | 30 | ||
| 1130 | @@ -40,23 +40,23 @@ | |||
| 1131 | 40 | anchors.left: parent.left | 40 | anchors.left: parent.left |
| 1132 | 41 | anchors.right: parent.right | 41 | anchors.right: parent.right |
| 1133 | 42 | 42 | ||
| 1135 | 43 | ListItem.SingleValue { | 43 | SettingsListItems.SingleValueProgression { |
| 1136 | 44 | text: i18n.tr("Carrier") | 44 | text: i18n.tr("Carrier") |
| 1137 | 45 | objectName: "carrier" | 45 | objectName: "carrier" |
| 1138 | 46 | value: sim.netReg.name ? sim.netReg.name : i18n.tr("None") | 46 | value: sim.netReg.name ? sim.netReg.name : i18n.tr("None") |
| 1139 | 47 | enabled: (sim.netReg.status !== "") && | 47 | enabled: (sim.netReg.status !== "") && |
| 1140 | 48 | (sim.netReg.mode !== "auto-only") | 48 | (sim.netReg.mode !== "auto-only") |
| 1142 | 49 | progression: enabled | 49 | progressionVisible: enabled |
| 1143 | 50 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { | 50 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { |
| 1144 | 51 | sim: sim, | 51 | sim: sim, |
| 1145 | 52 | title: i18n.tr("Carrier") | 52 | title: i18n.tr("Carrier") |
| 1146 | 53 | }) | 53 | }) |
| 1147 | 54 | } | 54 | } |
| 1148 | 55 | 55 | ||
| 1150 | 56 | ListItem.Standard { | 56 | SettingsListItems.SingleValueProgression { |
| 1151 | 57 | text: i18n.tr("APN") | 57 | text: i18n.tr("APN") |
| 1152 | 58 | objectName: "apn" | 58 | objectName: "apn" |
| 1154 | 59 | progression: enabled | 59 | progressionVisible: enabled |
| 1155 | 60 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { | 60 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { |
| 1156 | 61 | sim: sim | 61 | sim: sim |
| 1157 | 62 | }) | 62 | }) |
| 1158 | 63 | 63 | ||
| 1159 | === modified file 'plugins/cellular/PageCarriersAndApns.qml' | |||
| 1160 | --- plugins/cellular/PageCarriersAndApns.qml 2015-08-10 13:31:45 +0000 | |||
| 1161 | +++ plugins/cellular/PageCarriersAndApns.qml 2016-07-22 14:36:34 +0000 | |||
| 1162 | @@ -1,5 +1,5 @@ | |||
| 1163 | 1 | /* | 1 | /* |
| 1165 | 2 | * Copyright (C) 2014 Canonical Ltd | 2 | * Copyright (C) 2014-2016 Canonical Ltd |
| 1166 | 3 | * | 3 | * |
| 1167 | 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 |
| 1168 | 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 |
| 1169 | @@ -19,12 +19,12 @@ | |||
| 1170 | 19 | */ | 19 | */ |
| 1171 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 1172 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1173 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1174 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1175 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1176 | 24 | 24 | ||
| 1177 | 25 | ItemPage { | 25 | ItemPage { |
| 1178 | 26 | id: root | 26 | id: root |
| 1180 | 27 | title: i18n.tr("Carriers") | 27 | title: i18n.tr("Carriers & APNs") |
| 1181 | 28 | objectName: "carrierApnPage" | 28 | objectName: "carrierApnPage" |
| 1182 | 29 | flickable: null | 29 | flickable: null |
| 1183 | 30 | 30 | ||
| 1184 | @@ -40,56 +40,39 @@ | |||
| 1185 | 40 | anchors.left: parent.left | 40 | anchors.left: parent.left |
| 1186 | 41 | anchors.right: parent.right | 41 | anchors.right: parent.right |
| 1187 | 42 | 42 | ||
| 1238 | 43 | SettingsItemTitle { | 43 | Repeater { |
| 1239 | 44 | text: sims[0].title | 44 | model: sims |
| 1240 | 45 | } | 45 | |
| 1241 | 46 | 46 | Column { | |
| 1242 | 47 | ListItem.SingleValue { | 47 | anchors.left: parent.left |
| 1243 | 48 | text: i18n.tr("Carrier") | 48 | anchors.right: parent.right |
| 1244 | 49 | objectName: sims[0].path + "_carriers" | 49 | |
| 1245 | 50 | value: sims[0].netReg.name ? sims[0].netReg.name : | 50 | SettingsItemTitle { |
| 1246 | 51 | i18n.tr("None") | 51 | text: sims[index].title |
| 1247 | 52 | enabled: (sims[0].netReg.status !== "") && | 52 | } |
| 1248 | 53 | (sims[0].netReg.mode !== "auto-only") | 53 | |
| 1249 | 54 | progression: enabled | 54 | SettingsListItems.SingleValueProgression { |
| 1250 | 55 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { | 55 | text: i18n.tr("Carrier") |
| 1251 | 56 | sim: sims[0], | 56 | objectName: sims[index].path + "_carriers" |
| 1252 | 57 | title: sims[0].title | 57 | value: sims[index].netReg.name ? sims[index].netReg.name : |
| 1253 | 58 | }) | 58 | i18n.tr("None") |
| 1254 | 59 | } | 59 | enabled: (sims[index].netReg.status !== "") && |
| 1255 | 60 | 60 | (sims[index].netReg.mode !== "auto-only") | |
| 1256 | 61 | ListItem.Standard { | 61 | progressionVisible: enabled |
| 1257 | 62 | text: i18n.tr("APN") | 62 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { |
| 1258 | 63 | progression: enabled | 63 | sim: sims[index], |
| 1259 | 64 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { | 64 | title: sims[index].title |
| 1260 | 65 | sim: sims[0] | 65 | }) |
| 1261 | 66 | }) | 66 | } |
| 1262 | 67 | } | 67 | |
| 1263 | 68 | 68 | SettingsListItems.StandardProgression { | |
| 1264 | 69 | SettingsItemTitle { | 69 | text: i18n.tr("APN") |
| 1265 | 70 | text: sims[1].title | 70 | progressionVisible: enabled |
| 1266 | 71 | } | 71 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { |
| 1267 | 72 | 72 | sim: sims[index] | |
| 1268 | 73 | ListItem.SingleValue { | 73 | }) |
| 1269 | 74 | text: i18n.tr("Carrier") | 74 | } |
| 1270 | 75 | objectName: sims[1].path + "_carriers" | 75 | } |
| 1221 | 76 | value: sims[1].netReg.name ? sims[1].netReg.name : | ||
| 1222 | 77 | i18n.tr("None") | ||
| 1223 | 78 | enabled: (sims[1].netReg.status !== "") && | ||
| 1224 | 79 | (sims[1].netReg.mode !== "auto-only") | ||
| 1225 | 80 | progression: enabled | ||
| 1226 | 81 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), { | ||
| 1227 | 82 | sim: sims[1], | ||
| 1228 | 83 | title: sims[1].title | ||
| 1229 | 84 | }) | ||
| 1230 | 85 | } | ||
| 1231 | 86 | |||
| 1232 | 87 | ListItem.Standard { | ||
| 1233 | 88 | text: i18n.tr("APN") | ||
| 1234 | 89 | progression: enabled | ||
| 1235 | 90 | onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), { | ||
| 1236 | 91 | sim: sims[1] | ||
| 1237 | 92 | }) | ||
| 1271 | 93 | } | 76 | } |
| 1272 | 94 | } | 77 | } |
| 1273 | 95 | } | 78 | } |
| 1274 | 96 | 79 | ||
| 1275 | === modified file 'plugins/cellular/PageChooseApn.qml' | |||
| 1276 | --- plugins/cellular/PageChooseApn.qml 2016-05-17 23:28:16 +0000 | |||
| 1277 | +++ plugins/cellular/PageChooseApn.qml 2016-07-22 14:36:34 +0000 | |||
| 1278 | @@ -1,7 +1,7 @@ | |||
| 1279 | 1 | /* | 1 | /* |
| 1280 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1281 | 3 | * | 3 | * |
| 1283 | 4 | * Copyright (C) 2014 Canonical Ltd. | 4 | * Copyright (C) 2014-2016 Canonical Ltd. |
| 1284 | 5 | * | 5 | * |
| 1285 | 6 | * Contact: Pat McGowan <pat.mcgowan@canonical.com>, | 6 | * Contact: Pat McGowan <pat.mcgowan@canonical.com>, |
| 1286 | 7 | * Jonas G. Drange <jonas.drange@canonical.com> | 7 | * Jonas G. Drange <jonas.drange@canonical.com> |
| 1287 | @@ -25,9 +25,9 @@ | |||
| 1288 | 25 | 25 | ||
| 1289 | 26 | import QtQuick 2.4 | 26 | import QtQuick 2.4 |
| 1290 | 27 | import SystemSettings 1.0 | 27 | import SystemSettings 1.0 |
| 1291 | 28 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1292 | 28 | import Ubuntu.Components 1.3 | 29 | import Ubuntu.Components 1.3 |
| 1293 | 29 | import Ubuntu.Components.Popups 1.3 | 30 | import Ubuntu.Components.Popups 1.3 |
| 1294 | 30 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1295 | 31 | import MeeGo.QOfono 0.2 | 31 | import MeeGo.QOfono 0.2 |
| 1296 | 32 | import Ubuntu.SystemSettings.Cellular 1.0 | 32 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 1297 | 33 | import "apn_manager.js" as Manager | 33 | import "apn_manager.js" as Manager |
| 1298 | @@ -289,16 +289,22 @@ | |||
| 1299 | 289 | Component { | 289 | Component { |
| 1300 | 290 | id: apnDelegate | 290 | id: apnDelegate |
| 1301 | 291 | 291 | ||
| 1303 | 292 | ListItem.Standard { | 292 | SettingsListItems.StandardProgression { |
| 1304 | 293 | id: apnListItem | 293 | id: apnListItem |
| 1306 | 294 | property alias text: apnItemName.text | 294 | text: qml.name |
| 1307 | 295 | layout.subtitle.text: qml.typeString | ||
| 1308 | 295 | objectName: "edit_" + qml.name | 296 | objectName: "edit_" + qml.name |
| 1315 | 296 | height: units.gu(6) | 297 | |
| 1316 | 297 | removable: true | 298 | leadingActions: ListItemActions { |
| 1317 | 298 | confirmRemoval: true | 299 | actions: [ |
| 1318 | 299 | progression: true | 300 | Action { |
| 1319 | 300 | 301 | iconName: "delete" | |
| 1320 | 301 | onItemRemoved: Manager.removeContext(path); | 302 | name: i18n.tr("Delete") |
| 1321 | 303 | onTriggered: Manager.removeContext(path) | ||
| 1322 | 304 | } | ||
| 1323 | 305 | ] | ||
| 1324 | 306 | } | ||
| 1325 | 307 | |||
| 1326 | 302 | onClicked: { | 308 | onClicked: { |
| 1327 | 303 | editor = pageStack.push(pageApnEditor, { | 309 | editor = pageStack.push(pageApnEditor, { |
| 1328 | 304 | contextQML: qml, | 310 | contextQML: qml, |
| 1329 | @@ -308,7 +314,7 @@ | |||
| 1330 | 308 | }); | 314 | }); |
| 1331 | 309 | } | 315 | } |
| 1332 | 310 | 316 | ||
| 1334 | 311 | control: CheckBox { | 317 | CheckBox { |
| 1335 | 312 | id: check | 318 | id: check |
| 1336 | 313 | objectName: qml.name + "_preferred" | 319 | objectName: qml.name + "_preferred" |
| 1337 | 314 | property bool serverChecked: qml && qml.preferred | 320 | property bool serverChecked: qml && qml.preferred |
| 1338 | @@ -316,45 +322,6 @@ | |||
| 1339 | 316 | Component.onCompleted: checked = serverChecked | 322 | Component.onCompleted: checked = serverChecked |
| 1340 | 317 | onTriggered: Manager.setPreferred.call(this, qml, checked) | 323 | onTriggered: Manager.setPreferred.call(this, qml, checked) |
| 1341 | 318 | } | 324 | } |
| 1342 | 319 | |||
| 1343 | 320 | Item { | ||
| 1344 | 321 | anchors { | ||
| 1345 | 322 | top: parent.top | ||
| 1346 | 323 | bottom: parent.bottom | ||
| 1347 | 324 | left: parent.left | ||
| 1348 | 325 | leftMargin: units.gu(2) | ||
| 1349 | 326 | right: parent.right | ||
| 1350 | 327 | } | ||
| 1351 | 328 | |||
| 1352 | 329 | Label { | ||
| 1353 | 330 | id: apnItemName | ||
| 1354 | 331 | anchors { | ||
| 1355 | 332 | topMargin: units.gu(1) | ||
| 1356 | 333 | top: parent.top | ||
| 1357 | 334 | left: parent.left | ||
| 1358 | 335 | right: parent.right | ||
| 1359 | 336 | } | ||
| 1360 | 337 | |||
| 1361 | 338 | text: qml.name | ||
| 1362 | 339 | elide: Text.ElideRight | ||
| 1363 | 340 | opacity: apnListItem.enabled ? 1.0 : 0.5 | ||
| 1364 | 341 | } | ||
| 1365 | 342 | |||
| 1366 | 343 | Label { | ||
| 1367 | 344 | id: apnItemType | ||
| 1368 | 345 | anchors { | ||
| 1369 | 346 | left: parent.left | ||
| 1370 | 347 | right: parent.right | ||
| 1371 | 348 | top: apnItemName.bottom | ||
| 1372 | 349 | } | ||
| 1373 | 350 | |||
| 1374 | 351 | text: qml.typeString | ||
| 1375 | 352 | color: Theme.palette.normal.backgroundText | ||
| 1376 | 353 | fontSize: "small" | ||
| 1377 | 354 | wrapMode: Text.Wrap | ||
| 1378 | 355 | maximumLineCount: 5 | ||
| 1379 | 356 | } | ||
| 1380 | 357 | } | ||
| 1381 | 358 | } | 325 | } |
| 1382 | 359 | } | 326 | } |
| 1383 | 360 | 327 | ||
| 1384 | 361 | 328 | ||
| 1385 | === modified file 'plugins/cellular/PageComponent.qml' | |||
| 1386 | --- plugins/cellular/PageComponent.qml 2015-08-13 13:13:57 +0000 | |||
| 1387 | +++ plugins/cellular/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 1388 | @@ -1,7 +1,7 @@ | |||
| 1389 | 1 | /* | 1 | /* |
| 1390 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1391 | 3 | * | 3 | * |
| 1393 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 1394 | 5 | * | 5 | * |
| 1395 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 1396 | 7 | * | 7 | * |
| 1397 | @@ -22,7 +22,6 @@ | |||
| 1398 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 1399 | 23 | import Ubuntu.SystemSettings.Cellular 1.0 | 23 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 1400 | 24 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 1401 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1402 | 26 | import MeeGo.QOfono 0.2 | 25 | import MeeGo.QOfono 0.2 |
| 1403 | 27 | import QMenuModel 0.1 | 26 | import QMenuModel 0.1 |
| 1404 | 28 | import "Components" as LocalComponents | 27 | import "Components" as LocalComponents |
| 1405 | 29 | 28 | ||
| 1406 | === modified file 'plugins/flight-mode/EntryComponent.qml' | |||
| 1407 | --- plugins/flight-mode/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 1408 | +++ plugins/flight-mode/EntryComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 1409 | @@ -1,7 +1,7 @@ | |||
| 1410 | 1 | /* | 1 | /* |
| 1411 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1412 | 3 | * | 3 | * |
| 1414 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 1415 | 5 | * | 5 | * |
| 1416 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 1417 | 7 | * | 7 | * |
| 1418 | @@ -20,25 +20,35 @@ | |||
| 1419 | 20 | 20 | ||
| 1420 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1421 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 1422 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1423 | 24 | import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode | 23 | import Ubuntu.SystemSettings.FlightMode 1.0 as FlightMode |
| 1424 | 25 | import Ubuntu.Settings.Components 0.1 as USC | 24 | import Ubuntu.Settings.Components 0.1 as USC |
| 1425 | 26 | 25 | ||
| 1427 | 27 | ListItem.Standard { | 26 | ListItem { |
| 1428 | 28 | id: root | 27 | id: root |
| 1442 | 29 | iconSource: model.icon | 28 | height: layout.height |
| 1443 | 30 | iconFrame: false | 29 | |
| 1444 | 31 | text: i18n.tr(model.displayName) | 30 | ListItemLayout { |
| 1445 | 32 | control: Switch { | 31 | id: layout |
| 1446 | 33 | id: switchItem | 32 | title.text: i18n.tr(model.displayName) |
| 1447 | 34 | 33 | ||
| 1448 | 35 | USC.ServerPropertySynchroniser { | 34 | Switch { |
| 1449 | 36 | userTarget: switchItem | 35 | id: switchItem |
| 1450 | 37 | userProperty: "checked" | 36 | |
| 1451 | 38 | serverTarget: helper | 37 | SlotsLayout.position: SlotsLayout.Trailing |
| 1452 | 39 | serverProperty: "inFlightMode" | 38 | USC.ServerPropertySynchroniser { |
| 1453 | 40 | 39 | userTarget: switchItem | |
| 1454 | 41 | onSyncTriggered: helper.setFlightMode(value) | 40 | userProperty: "checked" |
| 1455 | 41 | serverTarget: helper | ||
| 1456 | 42 | serverProperty: "inFlightMode" | ||
| 1457 | 43 | |||
| 1458 | 44 | onSyncTriggered: helper.setFlightMode(value) | ||
| 1459 | 45 | } | ||
| 1460 | 46 | } | ||
| 1461 | 47 | Icon { | ||
| 1462 | 48 | SlotsLayout.position: SlotsLayout.Leading; | ||
| 1463 | 49 | SlotsLayout.padding { top: 0; bottom: 0 } | ||
| 1464 | 50 | source: model.icon | ||
| 1465 | 51 | height: units.gu(5) | ||
| 1466 | 42 | } | 52 | } |
| 1467 | 43 | } | 53 | } |
| 1468 | 44 | 54 | ||
| 1469 | 45 | 55 | ||
| 1470 | === modified file 'plugins/flight-mode/flight-mode.settings' | |||
| 1471 | --- plugins/flight-mode/flight-mode.settings 2014-09-24 17:10:03 +0000 | |||
| 1472 | +++ plugins/flight-mode/flight-mode.settings 2016-07-22 14:36:34 +0000 | |||
| 1473 | @@ -3,7 +3,7 @@ | |||
| 1474 | 3 | "icon": "airplane-mode", | 3 | "icon": "airplane-mode", |
| 1475 | 4 | "translations": "ubuntu-system-settings", | 4 | "translations": "ubuntu-system-settings", |
| 1476 | 5 | "category": "uncategorized-top", | 5 | "category": "uncategorized-top", |
| 1478 | 6 | "priority": 1, | 6 | "priority": 0, |
| 1479 | 7 | "keywords": [ | 7 | "keywords": [ |
| 1480 | 8 | "flight", | 8 | "flight", |
| 1481 | 9 | "plane", | 9 | "plane", |
| 1482 | 10 | 10 | ||
| 1483 | === modified file 'plugins/hotspot/HotspotSetup.qml' | |||
| 1484 | --- plugins/hotspot/HotspotSetup.qml 2016-03-11 15:07:14 +0000 | |||
| 1485 | +++ plugins/hotspot/HotspotSetup.qml 2016-07-22 14:36:34 +0000 | |||
| 1486 | @@ -1,7 +1,7 @@ | |||
| 1487 | 1 | /* | 1 | /* |
| 1488 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1489 | 3 | * | 3 | * |
| 1491 | 4 | * Copyright (C) 2014 Canonical Ltd. | 4 | * Copyright (C) 2014-2016 Canonical Ltd. |
| 1492 | 5 | * | 5 | * |
| 1493 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 1494 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 1495 | @@ -19,8 +19,9 @@ | |||
| 1496 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
| 1497 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
| 1498 | 21 | import SystemSettings 1.0 | 21 | import SystemSettings 1.0 |
| 1499 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1500 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 1502 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 1503 | 24 | import Ubuntu.Components.Popups 1.3 | 25 | import Ubuntu.Components.Popups 1.3 |
| 1504 | 25 | import Ubuntu.Connectivity 1.0 | 26 | import Ubuntu.Connectivity 1.0 |
| 1505 | 26 | import Ubuntu.SystemSettings.Cellular 1.0 | 27 | import Ubuntu.SystemSettings.Cellular 1.0 |
| 1506 | @@ -187,35 +188,23 @@ | |||
| 1507 | 187 | width: parent.width | 188 | width: parent.width |
| 1508 | 188 | } | 189 | } |
| 1509 | 189 | 190 | ||
| 1511 | 190 | ListItem.Empty { | 191 | SettingsListItems.Standard { |
| 1512 | 191 | id: passwordRequired | 192 | id: passwordRequired |
| 1514 | 192 | onClicked: passwordRequiredToggle.trigger() | 193 | text: i18n.tr("Require a password (recommended):") |
| 1515 | 194 | showDivider: false | ||
| 1516 | 195 | layout.padding.leading: 0 | ||
| 1517 | 196 | SlotsLayout.padding.leading: 0 | ||
| 1518 | 193 | 197 | ||
| 1519 | 194 | CheckBox { | 198 | CheckBox { |
| 1520 | 195 | id: passwordRequiredToggle | 199 | id: passwordRequiredToggle |
| 1521 | 196 | objectName: "passwordRequiredToggle" | 200 | objectName: "passwordRequiredToggle" |
| 1522 | 197 | checked: Connectivity.hotspotAuth === "wpa-psk" | 201 | checked: Connectivity.hotspotAuth === "wpa-psk" |
| 1527 | 198 | anchors { | 202 | SlotsLayout.position: SlotsLayout.First |
| 1528 | 199 | left: parent.left | 203 | SlotsLayout.padding.leading: 0 |
| 1525 | 200 | verticalCenter: parent.verticalCenter | ||
| 1526 | 201 | } | ||
| 1529 | 202 | // FIXME: Workaround for lp:1415023 | 204 | // FIXME: Workaround for lp:1415023 |
| 1530 | 203 | activeFocusOnPress: false | 205 | activeFocusOnPress: false |
| 1531 | 204 | } | 206 | } |
| 1546 | 205 | 207 | onClicked: passwordRequiredToggle.trigger() | |
| 1533 | 206 | Label { | ||
| 1534 | 207 | id: passwordRequiredLabel | ||
| 1535 | 208 | anchors { | ||
| 1536 | 209 | left: passwordRequiredToggle.right | ||
| 1537 | 210 | leftMargin: units.gu(1) | ||
| 1538 | 211 | right: parent.right | ||
| 1539 | 212 | verticalCenter: parent.verticalCenter | ||
| 1540 | 213 | } | ||
| 1541 | 214 | |||
| 1542 | 215 | // FIXME: Workaround for label not wrapping (lp:1442851) | ||
| 1543 | 216 | wrapMode: Text.Wrap | ||
| 1544 | 217 | text: i18n.tr("Require a password (recommended):") | ||
| 1545 | 218 | } | ||
| 1547 | 219 | } | 208 | } |
| 1548 | 220 | 209 | ||
| 1549 | 221 | TextField { | 210 | TextField { |
| 1550 | @@ -229,39 +218,25 @@ | |||
| 1551 | 229 | width: parent.width | 218 | width: parent.width |
| 1552 | 230 | } | 219 | } |
| 1553 | 231 | 220 | ||
| 1555 | 232 | ListItem.Empty { | 221 | SettingsListItems.Standard { |
| 1556 | 233 | id: passwordVisible | 222 | id: passwordVisible |
| 1557 | 234 | enabled: passwordRequiredToggle.checked | 223 | enabled: passwordRequiredToggle.checked |
| 1559 | 235 | onClicked: passwordVisibleToggle.trigger() | 224 | text: i18n.tr("Show password") |
| 1560 | 225 | layout.padding.leading: 0 | ||
| 1561 | 226 | SlotsLayout.padding.leading: 0 | ||
| 1562 | 236 | 227 | ||
| 1563 | 237 | CheckBox { | 228 | CheckBox { |
| 1564 | 238 | id: passwordVisibleToggle | 229 | id: passwordVisibleToggle |
| 1565 | 239 | enabled: parent.enabled | 230 | enabled: parent.enabled |
| 1571 | 240 | anchors { | 231 | SlotsLayout.position: SlotsLayout.First |
| 1572 | 241 | left: parent.left | 232 | SlotsLayout.padding.leading: 0 |
| 1568 | 242 | verticalCenter: parent.verticalCenter | ||
| 1569 | 243 | } | ||
| 1570 | 244 | |||
| 1573 | 245 | // FIXME: Workaround for lp:1415023 | 233 | // FIXME: Workaround for lp:1415023 |
| 1574 | 246 | activeFocusOnPress: false | 234 | activeFocusOnPress: false |
| 1575 | 247 | } | 235 | } |
| 1590 | 248 | 236 | onClicked: passwordVisibleToggle.trigger() | |
| 1577 | 249 | Label { | ||
| 1578 | 250 | id: passwordVisibleLabel | ||
| 1579 | 251 | |||
| 1580 | 252 | /* FIXME: use enabled when lp:1491802 is fixed, or use | ||
| 1581 | 253 | CheckBox.text once lp:1323238 is fixed. */ | ||
| 1582 | 254 | opacity: passwordRequiredToggle.checked ? 1 : 0.5 | ||
| 1583 | 255 | anchors { | ||
| 1584 | 256 | left: passwordVisibleToggle.right | ||
| 1585 | 257 | leftMargin: units.gu(1) | ||
| 1586 | 258 | verticalCenter: parent.verticalCenter | ||
| 1587 | 259 | } | ||
| 1588 | 260 | text: i18n.tr("Show password") | ||
| 1589 | 261 | } | ||
| 1591 | 262 | } | 237 | } |
| 1592 | 263 | 238 | ||
| 1594 | 264 | ListItem.Caption { | 239 | ListItems.Caption { |
| 1595 | 265 | id: enableWifiCaption | 240 | id: enableWifiCaption |
| 1596 | 266 | anchors { | 241 | anchors { |
| 1597 | 267 | left: parent.left | 242 | left: parent.left |
| 1598 | 268 | 243 | ||
| 1599 | === modified file 'plugins/hotspot/PageComponent.qml' | |||
| 1600 | --- plugins/hotspot/PageComponent.qml 2015-09-18 14:18:11 +0000 | |||
| 1601 | +++ plugins/hotspot/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 1602 | @@ -1,7 +1,7 @@ | |||
| 1603 | 1 | /* | 1 | /* |
| 1604 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1605 | 3 | * | 3 | * |
| 1607 | 4 | * Copyright (C) 2014-2015 Canonical Ltd. | 4 | * Copyright (C) 2014-2016 Canonical Ltd. |
| 1608 | 5 | * | 5 | * |
| 1609 | 6 | * Contact: Jonas G. Drange <jonas.drange@canonical.com> | 6 | * Contact: Jonas G. Drange <jonas.drange@canonical.com> |
| 1610 | 7 | * | 7 | * |
| 1611 | @@ -20,8 +20,9 @@ | |||
| 1612 | 20 | 20 | ||
| 1613 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 1614 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 1615 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 1616 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems | ||
| 1617 | 23 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 1618 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 1619 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 1620 | 26 | import Ubuntu.Connectivity 1.0 | 27 | import Ubuntu.Connectivity 1.0 |
| 1621 | 27 | 28 | ||
| 1622 | @@ -77,12 +78,14 @@ | |||
| 1623 | 77 | } | 78 | } |
| 1624 | 78 | spacing: units.gu(1) | 79 | spacing: units.gu(1) |
| 1625 | 79 | 80 | ||
| 1627 | 80 | ListItem.Standard { | 81 | SettingsListItems.Standard { |
| 1628 | 81 | id: hotspotItem | 82 | id: hotspotItem |
| 1629 | 83 | objectName: "hotspotItem" | ||
| 1630 | 82 | text: i18n.tr("Hotspot") | 84 | text: i18n.tr("Hotspot") |
| 1631 | 83 | enabled: Connectivity.hotspotStored | 85 | enabled: Connectivity.hotspotStored |
| 1632 | 84 | onClicked: hotspotSwitch.trigger() | 86 | onClicked: hotspotSwitch.trigger() |
| 1634 | 85 | control: Switch { | 87 | |
| 1635 | 88 | Switch { | ||
| 1636 | 86 | id: hotspotSwitch | 89 | id: hotspotSwitch |
| 1637 | 87 | objectName: "hotspotSwitch" | 90 | objectName: "hotspotSwitch" |
| 1638 | 88 | enabled: parent.enabled | 91 | enabled: parent.enabled |
| 1639 | @@ -101,7 +104,7 @@ | |||
| 1640 | 101 | } | 104 | } |
| 1641 | 102 | } | 105 | } |
| 1642 | 103 | 106 | ||
| 1644 | 104 | ListItem.Caption { | 107 | ListItems.Caption { |
| 1645 | 105 | anchors { | 108 | anchors { |
| 1646 | 106 | left: parent.left | 109 | left: parent.left |
| 1647 | 107 | right: parent.right | 110 | right: parent.right |
| 1648 | 108 | 111 | ||
| 1649 | === modified file 'plugins/language/settings-language.svg' | |||
| 1650 | --- plugins/language/settings-language.svg 2013-06-28 14:53:07 +0000 | |||
| 1651 | +++ plugins/language/settings-language.svg 2016-07-22 14:36:34 +0000 | |||
| 1652 | @@ -9,14 +9,15 @@ | |||
| 1653 | 9 | xmlns="http://www.w3.org/2000/svg" | 9 | xmlns="http://www.w3.org/2000/svg" |
| 1654 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 1655 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 1659 | 12 | width="90" | 12 | width="96" |
| 1660 | 13 | height="90" | 13 | height="96" |
| 1661 | 14 | id="svg4230" | 14 | id="svg4874" |
| 1662 | 15 | version="1.1" | 15 | version="1.1" |
| 1665 | 16 | inkscape:version="0.48+devel r12277" | 16 | inkscape:version="0.91+devel r" |
| 1666 | 17 | sodipodi:docname="setting-language-text.svg"> | 17 | viewBox="0 0 96 96.000001" |
| 1667 | 18 | sodipodi:docname="language-chooser.svg"> | ||
| 1668 | 18 | <defs | 19 | <defs |
| 1670 | 19 | id="defs4232" /> | 20 | id="defs4876" /> |
| 1671 | 20 | <sodipodi:namedview | 21 | <sodipodi:namedview |
| 1672 | 21 | id="base" | 22 | id="base" |
| 1673 | 22 | pagecolor="#ffffff" | 23 | pagecolor="#ffffff" |
| 1674 | @@ -24,18 +25,91 @@ | |||
| 1675 | 24 | borderopacity="1.0" | 25 | borderopacity="1.0" |
| 1676 | 25 | inkscape:pageopacity="0.0" | 26 | inkscape:pageopacity="0.0" |
| 1677 | 26 | inkscape:pageshadow="2" | 27 | inkscape:pageshadow="2" |
| 1681 | 27 | inkscape:zoom="5.0931703" | 28 | inkscape:zoom="3.5967995" |
| 1682 | 28 | inkscape:cx="21.204866" | 29 | inkscape:cx="-41.870567" |
| 1683 | 29 | inkscape:cy="6.4792647" | 30 | inkscape:cy="69.839831" |
| 1684 | 30 | inkscape:document-units="px" | 31 | inkscape:document-units="px" |
| 1687 | 31 | inkscape:current-layer="layer1-57" | 32 | inkscape:current-layer="g4780" |
| 1688 | 32 | showgrid="false" | 33 | showgrid="true" |
| 1689 | 34 | showborder="true" | ||
| 1690 | 33 | fit-margin-top="0" | 35 | fit-margin-top="0" |
| 1691 | 34 | fit-margin-left="0" | 36 | fit-margin-left="0" |
| 1692 | 35 | fit-margin-right="0" | 37 | fit-margin-right="0" |
| 1694 | 36 | fit-margin-bottom="0" /> | 38 | fit-margin-bottom="0" |
| 1695 | 39 | inkscape:snap-bbox="true" | ||
| 1696 | 40 | inkscape:bbox-paths="true" | ||
| 1697 | 41 | inkscape:bbox-nodes="true" | ||
| 1698 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
| 1699 | 43 | inkscape:snap-bbox-midpoints="true" | ||
| 1700 | 44 | inkscape:object-paths="true" | ||
| 1701 | 45 | inkscape:snap-intersection-paths="true" | ||
| 1702 | 46 | inkscape:object-nodes="true" | ||
| 1703 | 47 | inkscape:snap-smooth-nodes="true" | ||
| 1704 | 48 | inkscape:snap-midpoints="true" | ||
| 1705 | 49 | inkscape:snap-object-midpoints="true" | ||
| 1706 | 50 | inkscape:snap-center="true" | ||
| 1707 | 51 | showguides="true" | ||
| 1708 | 52 | inkscape:guide-bbox="true" | ||
| 1709 | 53 | inkscape:snap-global="true"> | ||
| 1710 | 54 | <inkscape:grid | ||
| 1711 | 55 | type="xygrid" | ||
| 1712 | 56 | id="grid5451" | ||
| 1713 | 57 | empspacing="8" /> | ||
| 1714 | 58 | <sodipodi:guide | ||
| 1715 | 59 | orientation="1,0" | ||
| 1716 | 60 | position="8,-8.0000001" | ||
| 1717 | 61 | id="guide4063" /> | ||
| 1718 | 62 | <sodipodi:guide | ||
| 1719 | 63 | orientation="1,0" | ||
| 1720 | 64 | position="4,-8.0000001" | ||
| 1721 | 65 | id="guide4065" /> | ||
| 1722 | 66 | <sodipodi:guide | ||
| 1723 | 67 | orientation="0,1" | ||
| 1724 | 68 | position="-8,88.000001" | ||
| 1725 | 69 | id="guide4067" /> | ||
| 1726 | 70 | <sodipodi:guide | ||
| 1727 | 71 | orientation="0,1" | ||
| 1728 | 72 | position="-8,92.000001" | ||
| 1729 | 73 | id="guide4069" /> | ||
| 1730 | 74 | <sodipodi:guide | ||
| 1731 | 75 | orientation="0,1" | ||
| 1732 | 76 | position="104,4" | ||
| 1733 | 77 | id="guide4071" /> | ||
| 1734 | 78 | <sodipodi:guide | ||
| 1735 | 79 | orientation="0,1" | ||
| 1736 | 80 | position="-5,8.0000001" | ||
| 1737 | 81 | id="guide4073" /> | ||
| 1738 | 82 | <sodipodi:guide | ||
| 1739 | 83 | orientation="1,0" | ||
| 1740 | 84 | position="88,-8.0000001" | ||
| 1741 | 85 | id="guide4077" /> | ||
| 1742 | 86 | <sodipodi:guide | ||
| 1743 | 87 | orientation="0,1" | ||
| 1744 | 88 | position="-8,84.000001" | ||
| 1745 | 89 | id="guide4074" /> | ||
| 1746 | 90 | <sodipodi:guide | ||
| 1747 | 91 | orientation="1,0" | ||
| 1748 | 92 | position="12,-8.0000001" | ||
| 1749 | 93 | id="guide4076" /> | ||
| 1750 | 94 | <sodipodi:guide | ||
| 1751 | 95 | orientation="1,0" | ||
| 1752 | 96 | position="84,-8.0000001" | ||
| 1753 | 97 | id="guide4080" /> | ||
| 1754 | 98 | <sodipodi:guide | ||
| 1755 | 99 | position="48,-8.0000001" | ||
| 1756 | 100 | orientation="1,0" | ||
| 1757 | 101 | id="guide4170" /> | ||
| 1758 | 102 | <sodipodi:guide | ||
| 1759 | 103 | position="-8,48" | ||
| 1760 | 104 | orientation="0,1" | ||
| 1761 | 105 | id="guide4172" /> | ||
| 1762 | 106 | <sodipodi:guide | ||
| 1763 | 107 | position="92,-8.0000001" | ||
| 1764 | 108 | orientation="1,0" | ||
| 1765 | 109 | id="guide4760" /> | ||
| 1766 | 110 | </sodipodi:namedview> | ||
| 1767 | 37 | <metadata | 111 | <metadata |
| 1769 | 38 | id="metadata4235"> | 112 | id="metadata4879"> |
| 1770 | 39 | <rdf:RDF> | 113 | <rdf:RDF> |
| 1771 | 40 | <cc:Work | 114 | <cc:Work |
| 1772 | 41 | rdf:about=""> | 115 | rdf:about=""> |
| 1773 | @@ -50,72 +124,35 @@ | |||
| 1774 | 50 | inkscape:label="Layer 1" | 124 | inkscape:label="Layer 1" |
| 1775 | 51 | inkscape:groupmode="layer" | 125 | inkscape:groupmode="layer" |
| 1776 | 52 | id="layer1" | 126 | id="layer1" |
| 1778 | 53 | transform="translate(-0.7143,-261.64789)"> | 127 | transform="translate(67.857146,-78.50504)"> |
| 1779 | 54 | <g | 128 | <g |
| 1783 | 55 | transform="translate(0.7143,-700.42863)" | 129 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
| 1784 | 56 | id="g4081" | 130 | id="g4845" |
| 1785 | 57 | inkscape:label="Layer 1"> | 131 | style="display:inline"> |
| 1786 | 58 | <g | 132 | <g |
| 1789 | 59 | transform="translate(0,-1.1427923)" | 133 | inkscape:export-ydpi="90" |
| 1790 | 60 | id="layer1-57" | 134 | inkscape:export-xdpi="90" |
| 1791 | 135 | inkscape:export-filename="next01.png" | ||
| 1792 | 136 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" | ||
| 1793 | 137 | id="g4778" | ||
| 1794 | 61 | inkscape:label="Layer 1"> | 138 | inkscape:label="Layer 1"> |
| 1795 | 62 | <g | 139 | <g |
| 1852 | 63 | id="g4136" | 140 | transform="matrix(-1,0,0,1,575.99999,611)" |
| 1853 | 64 | transform="matrix(1.875,0,0,1.875,-990,-829.95977)"> | 141 | id="g4780" |
| 1854 | 65 | <rect | 142 | style="display:inline"> |
| 1855 | 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 |
| 1856 | 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" |
| 1857 | 68 | width="48" | 145 | id="rect4782" |
| 1858 | 69 | height="48" | 146 | width="96.037987" |
| 1859 | 70 | x="528" | 147 | height="96" |
| 1860 | 71 | y="544" | 148 | x="-438.00244" |
| 1861 | 72 | transform="translate(0,412.36217)" /> | 149 | y="345.36221" |
| 1862 | 73 | </g> | 150 | transform="scale(-1,1)" /> |
| 1863 | 74 | <g | 151 | <path |
| 1864 | 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" |
| 1865 | 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 " |
| 1866 | 77 | <rect | 154 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" |
| 1867 | 78 | y="915.2193" | 155 | id="rect3011" /> |
| 1812 | 79 | x="528" | ||
| 1813 | 80 | height="90" | ||
| 1814 | 81 | width="90" | ||
| 1815 | 82 | id="rect3474" | ||
| 1816 | 83 | style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> | ||
| 1817 | 84 | <path | ||
| 1818 | 85 | style="fill:#808080;fill-opacity:1;display:inline" | ||
| 1819 | 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 " | ||
| 1820 | 87 | transform="translate(528,915.2193)" | ||
| 1821 | 88 | id="path3962" /> | ||
| 1822 | 89 | <path | ||
| 1823 | 90 | sodipodi:type="arc" | ||
| 1824 | 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" | ||
| 1825 | 92 | id="path3965" | ||
| 1826 | 93 | sodipodi:cx="1731" | ||
| 1827 | 94 | sodipodi:cy="1545" | ||
| 1828 | 95 | sodipodi:rx="3" | ||
| 1829 | 96 | sodipodi:ry="3" | ||
| 1830 | 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" | ||
| 1831 | 98 | transform="matrix(1.3333333,0,0,1.3333333,-1708.9999,-1072.7807)" /> | ||
| 1832 | 99 | <path | ||
| 1833 | 100 | transform="matrix(1.3333333,0,0,1.3333333,-1720.9999,-1072.7807)" | ||
| 1834 | 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" | ||
| 1835 | 102 | sodipodi:ry="3" | ||
| 1836 | 103 | sodipodi:rx="3" | ||
| 1837 | 104 | sodipodi:cy="1545" | ||
| 1838 | 105 | sodipodi:cx="1731" | ||
| 1839 | 106 | id="path3976" | ||
| 1840 | 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" | ||
| 1841 | 108 | sodipodi:type="arc" /> | ||
| 1842 | 109 | <path | ||
| 1843 | 110 | sodipodi:type="arc" | ||
| 1844 | 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" | ||
| 1845 | 112 | id="path3978" | ||
| 1846 | 113 | sodipodi:cx="1731" | ||
| 1847 | 114 | sodipodi:cy="1545" | ||
| 1848 | 115 | sodipodi:rx="3" | ||
| 1849 | 116 | sodipodi:ry="3" | ||
| 1850 | 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" | ||
| 1851 | 118 | transform="matrix(1.3333333,0,0,1.3333333,-1732.9999,-1072.7807)" /> | ||
| 1868 | 119 | </g> | 156 | </g> |
| 1869 | 120 | </g> | 157 | </g> |
| 1870 | 121 | </g> | 158 | </g> |
| 1871 | 122 | 159 | ||
| 1872 | === modified file 'plugins/mouse/PrimaryButtonSelector.qml' | |||
| 1873 | --- plugins/mouse/PrimaryButtonSelector.qml 2016-01-25 17:59:57 +0000 | |||
| 1874 | +++ plugins/mouse/PrimaryButtonSelector.qml 2016-07-22 14:36:34 +0000 | |||
| 1875 | @@ -1,7 +1,7 @@ | |||
| 1876 | 1 | /* | 1 | /* |
| 1877 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1878 | 3 | * | 3 | * |
| 1880 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 1881 | 5 | * | 5 | * |
| 1882 | 6 | * Contact: Ken VanDine <ken.vandine@canonical.com> | 6 | * Contact: Ken VanDine <ken.vandine@canonical.com> |
| 1883 | 7 | * | 7 | * |
| 1884 | @@ -40,7 +40,6 @@ | |||
| 1885 | 40 | 40 | ||
| 1886 | 41 | SettingsItemTitle { | 41 | SettingsItemTitle { |
| 1887 | 42 | text: i18n.tr("Primary button:") | 42 | text: i18n.tr("Primary button:") |
| 1888 | 43 | showDivider: false | ||
| 1889 | 44 | } | 43 | } |
| 1890 | 45 | 44 | ||
| 1891 | 46 | ListItem.Empty { | 45 | ListItem.Empty { |
| 1892 | 47 | 46 | ||
| 1893 | === modified file 'plugins/orientation-lock/EntryComponent.qml' | |||
| 1894 | --- plugins/orientation-lock/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 1895 | +++ plugins/orientation-lock/EntryComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 1896 | @@ -1,7 +1,7 @@ | |||
| 1897 | 1 | /* | 1 | /* |
| 1898 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1899 | 3 | * | 3 | * |
| 1901 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 1902 | 5 | * | 5 | * |
| 1903 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 1904 | 7 | * | 7 | * |
| 1905 | @@ -22,26 +22,35 @@ | |||
| 1906 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 1907 | 23 | import QtQuick.Window 2.1 | 23 | import QtQuick.Window 2.1 |
| 1908 | 24 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 1913 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | |
| 1914 | 26 | 26 | ||
| 1915 | 27 | 27 | ListItem { | |
| 1912 | 28 | ListItem.Standard { | ||
| 1916 | 29 | id: root | 28 | id: root |
| 1932 | 30 | iconSource: model.icon | 29 | height: layout.height |
| 1933 | 31 | iconFrame: false | 30 | |
| 1934 | 32 | text: i18n.tr(model.displayName) | 31 | ListItemLayout { |
| 1935 | 33 | control: Switch { | 32 | id: layout |
| 1936 | 34 | id: control | 33 | title.text: i18n.tr(model.displayName) |
| 1937 | 35 | objectName: "orientationLockSwitch" | 34 | Switch { |
| 1938 | 36 | 35 | id: control | |
| 1939 | 37 | property bool serverChecked: systemSettings.rotationLock | 36 | objectName: "orientationLockSwitch" |
| 1940 | 38 | onServerCheckedChanged: checked = serverChecked | 37 | |
| 1941 | 39 | Component.onCompleted: checked = serverChecked | 38 | SlotsLayout.position: SlotsLayout.Trailing |
| 1942 | 40 | onTriggered: systemSettings.rotationLock = checked | 39 | property bool serverChecked: systemSettings.rotationLock |
| 1943 | 41 | 40 | onServerCheckedChanged: checked = serverChecked | |
| 1944 | 42 | GSettings { | 41 | Component.onCompleted: checked = serverChecked |
| 1945 | 43 | id: systemSettings | 42 | onTriggered: systemSettings.rotationLock = checked |
| 1946 | 44 | schema.id: "com.ubuntu.touch.system" | 43 | |
| 1947 | 44 | GSettings { | ||
| 1948 | 45 | id: systemSettings | ||
| 1949 | 46 | schema.id: "com.ubuntu.touch.system" | ||
| 1950 | 47 | } | ||
| 1951 | 48 | } | ||
| 1952 | 49 | Icon { | ||
| 1953 | 50 | SlotsLayout.position: SlotsLayout.Leading; | ||
| 1954 | 51 | SlotsLayout.padding { top: 0; bottom: 0 } | ||
| 1955 | 52 | source: model.icon | ||
| 1956 | 53 | height: units.gu(5) | ||
| 1957 | 45 | } | 54 | } |
| 1958 | 46 | } | 55 | } |
| 1959 | 47 | } | 56 | } |
| 1960 | 48 | 57 | ||
| 1961 | === modified file 'plugins/orientation-lock/orientation-lock.settings' | |||
| 1962 | --- plugins/orientation-lock/orientation-lock.settings 2014-11-03 22:01:37 +0000 | |||
| 1963 | +++ plugins/orientation-lock/orientation-lock.settings 2016-07-22 14:36:34 +0000 | |||
| 1964 | @@ -3,7 +3,7 @@ | |||
| 1965 | 3 | "name": "Rotation Lock", | 3 | "name": "Rotation Lock", |
| 1966 | 4 | "translations": "ubuntu-system-settings", | 4 | "translations": "ubuntu-system-settings", |
| 1967 | 5 | "category": "uncategorized-top", | 5 | "category": "uncategorized-top", |
| 1969 | 6 | "priority": 0, | 6 | "priority": 1, |
| 1970 | 7 | "form-factors": [ | 7 | "form-factors": [ |
| 1971 | 8 | "phone", | 8 | "phone", |
| 1972 | 9 | "tablet" | 9 | "tablet" |
| 1973 | 10 | 10 | ||
| 1974 | === modified file 'plugins/phone/CallForwarding.qml' | |||
| 1975 | --- plugins/phone/CallForwarding.qml 2016-05-17 23:28:16 +0000 | |||
| 1976 | +++ plugins/phone/CallForwarding.qml 2016-07-22 14:36:34 +0000 | |||
| 1977 | @@ -1,7 +1,7 @@ | |||
| 1978 | 1 | /* | 1 | /* |
| 1979 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 1980 | 3 | * | 3 | * |
| 1982 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 1983 | 5 | * | 5 | * |
| 1984 | 6 | * Contact: | 6 | * Contact: |
| 1985 | 7 | * Sebastien Bacher <sebastien.bacher@canonical.com> | 7 | * Sebastien Bacher <sebastien.bacher@canonical.com> |
| 1986 | @@ -164,7 +164,6 @@ | |||
| 1987 | 164 | SettingsItemTitle { | 164 | SettingsItemTitle { |
| 1988 | 165 | id: fwdSomeTitle | 165 | id: fwdSomeTitle |
| 1989 | 166 | text: i18n.tr("Forward incoming calls when:") | 166 | text: i18n.tr("Forward incoming calls when:") |
| 1990 | 167 | showDivider: false | ||
| 1991 | 168 | } | 167 | } |
| 1992 | 169 | 168 | ||
| 1993 | 170 | CallForwardItem { | 169 | CallForwardItem { |
| 1994 | 171 | 170 | ||
| 1995 | === modified file 'plugins/reset/EntryComponent.qml' | |||
| 1996 | --- plugins/reset/EntryComponent.qml 2016-03-22 17:19:41 +0000 | |||
| 1997 | +++ plugins/reset/EntryComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 1998 | @@ -1,7 +1,7 @@ | |||
| 1999 | 1 | /* | 1 | /* |
| 2000 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2001 | 3 | * | 3 | * |
| 2003 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2004 | 5 | * | 5 | * |
| 2005 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 2006 | 7 | * | 7 | * |
| 2007 | @@ -20,13 +20,21 @@ | |||
| 2008 | 20 | 20 | ||
| 2009 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2010 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 2011 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2012 | 24 | 23 | ||
| 2014 | 25 | ListItem.Standard { | 24 | ListItem { |
| 2015 | 26 | id: root | 25 | id: root |
| 2016 | 27 | objectName: "entryComponent-reset" | 26 | objectName: "entryComponent-reset" |
| 2021 | 28 | iconSource: model.icon | 27 | height: layout.height |
| 2022 | 29 | iconFrame: false | 28 | |
| 2023 | 30 | text: i18n.tr(model.displayName) | 29 | ListItemLayout { |
| 2024 | 31 | progression: true | 30 | id: layout |
| 2025 | 31 | title.text: i18n.tr(model.displayName) | ||
| 2026 | 32 | Icon { | ||
| 2027 | 33 | SlotsLayout.position: SlotsLayout.Leading; | ||
| 2028 | 34 | SlotsLayout.padding { top: 0; bottom: 0 } | ||
| 2029 | 35 | source: model.icon | ||
| 2030 | 36 | height: units.gu(5) | ||
| 2031 | 37 | } | ||
| 2032 | 38 | ProgressionSlot {} | ||
| 2033 | 39 | } | ||
| 2034 | 32 | } | 40 | } |
| 2035 | 33 | 41 | ||
| 2036 | === modified file 'plugins/reset/PageComponent.qml' | |||
| 2037 | --- plugins/reset/PageComponent.qml 2016-02-04 15:28:51 +0000 | |||
| 2038 | +++ plugins/reset/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 2039 | @@ -1,7 +1,7 @@ | |||
| 2040 | 1 | /* | 1 | /* |
| 2041 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2042 | 3 | * | 3 | * |
| 2044 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2045 | 5 | * | 5 | * |
| 2046 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 2047 | 7 | * | 7 | * |
| 2048 | @@ -21,8 +21,8 @@ | |||
| 2049 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2050 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 2051 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 2052 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2053 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 2054 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2055 | 26 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 2056 | 27 | import Ubuntu.SystemSettings.Reset 1.0 | 27 | import Ubuntu.SystemSettings.Reset 1.0 |
| 2057 | 28 | 28 | ||
| 2058 | @@ -66,46 +66,81 @@ | |||
| 2059 | 66 | anchors.left: parent.left | 66 | anchors.left: parent.left |
| 2060 | 67 | anchors.right: parent.right | 67 | anchors.right: parent.right |
| 2061 | 68 | 68 | ||
| 2064 | 69 | ListItem.SingleControl { | 69 | Label { |
| 2065 | 70 | control: Button { | 70 | anchors { |
| 2066 | 71 | left: parent.left | ||
| 2067 | 72 | right: parent.right | ||
| 2068 | 73 | margins: units.gu(2) | ||
| 2069 | 74 | } | ||
| 2070 | 75 | text: i18n.tr("Reset Launcher") | ||
| 2071 | 76 | color: UbuntuColors.orange | ||
| 2072 | 77 | height: units.gu(6) | ||
| 2073 | 78 | verticalAlignment: Text.AlignVCenter | ||
| 2074 | 79 | } | ||
| 2075 | 80 | |||
| 2076 | 81 | SettingsListItems.Standard { | ||
| 2077 | 82 | |||
| 2078 | 83 | Button { | ||
| 2079 | 71 | id: resetLauncherHomeButton | 84 | id: resetLauncherHomeButton |
| 2080 | 72 | objectName: "resetLauncher" | 85 | objectName: "resetLauncher" |
| 2081 | 73 | text: i18n.tr("Reset Launcher") | 86 | text: i18n.tr("Reset Launcher") |
| 2082 | 74 | width: parent.width - units.gu(4) | ||
| 2083 | 75 | onClicked: { | 87 | onClicked: { |
| 2084 | 76 | buttonActions.source = "ResetLauncherHome.qml"; | 88 | buttonActions.source = "ResetLauncherHome.qml"; |
| 2085 | 77 | root.popup = PopupUtils.open(buttonActions.item); | 89 | root.popup = PopupUtils.open(buttonActions.item); |
| 2086 | 78 | } | 90 | } |
| 2087 | 79 | } | 91 | } |
| 2094 | 80 | showDivider: false | 92 | } |
| 2095 | 81 | } | 93 | |
| 2096 | 82 | 94 | Label { | |
| 2097 | 83 | ListItem.SingleControl { | 95 | anchors { |
| 2098 | 84 | visible: false // enabled when backend is ready/useful | 96 | left: parent.left |
| 2099 | 85 | control: Button { | 97 | right: parent.right |
| 2100 | 98 | margins: units.gu(2) | ||
| 2101 | 99 | } | ||
| 2102 | 100 | visible: showAllUI | ||
| 2103 | 101 | text: i18n.tr("Reset all system settings…") | ||
| 2104 | 102 | color: UbuntuColors.orange | ||
| 2105 | 103 | height: units.gu(6) | ||
| 2106 | 104 | verticalAlignment: Text.AlignVCenter | ||
| 2107 | 105 | } | ||
| 2108 | 106 | |||
| 2109 | 107 | SettingsListItems.Standard { | ||
| 2110 | 108 | visible: showAllUI | ||
| 2111 | 109 | |||
| 2112 | 110 | Button { | ||
| 2113 | 86 | id: resetAllSettingsButton | 111 | id: resetAllSettingsButton |
| 2114 | 87 | text: i18n.tr("Reset all system settings…") | 112 | text: i18n.tr("Reset all system settings…") |
| 2115 | 88 | width: parent.width - units.gu(4) | ||
| 2116 | 89 | onClicked: { | 113 | onClicked: { |
| 2117 | 90 | buttonActions.source = "ResetAllSettings.qml"; | 114 | buttonActions.source = "ResetAllSettings.qml"; |
| 2118 | 91 | root.popup = PopupUtils.open(buttonActions.item); | 115 | root.popup = PopupUtils.open(buttonActions.item); |
| 2119 | 92 | } | 116 | } |
| 2120 | 93 | } | 117 | } |
| 2126 | 94 | showDivider: false | 118 | } |
| 2127 | 95 | } | 119 | |
| 2128 | 96 | 120 | Label { | |
| 2129 | 97 | ListItem.SingleControl { | 121 | anchors { |
| 2130 | 98 | control: Button { | 122 | left: parent.left |
| 2131 | 123 | right: parent.right | ||
| 2132 | 124 | margins: units.gu(2) | ||
| 2133 | 125 | } | ||
| 2134 | 126 | text: i18n.tr("Erase & Reset All") | ||
| 2135 | 127 | color: UbuntuColors.orange | ||
| 2136 | 128 | height: units.gu(6) | ||
| 2137 | 129 | verticalAlignment: Text.AlignVCenter | ||
| 2138 | 130 | } | ||
| 2139 | 131 | |||
| 2140 | 132 | SettingsListItems.Standard { | ||
| 2141 | 133 | |||
| 2142 | 134 | Button { | ||
| 2143 | 99 | id: eraseEverythingButton | 135 | id: eraseEverythingButton |
| 2144 | 100 | objectName: "factoryReset" | 136 | objectName: "factoryReset" |
| 2147 | 101 | text: i18n.tr("Erase & Reset Everything…") | 137 | |
| 2148 | 102 | width: parent.width - units.gu(4) | 138 | text: i18n.tr("Erase & Reset All") |
| 2149 | 103 | onClicked: { | 139 | onClicked: { |
| 2150 | 104 | buttonActions.source = "EraseEverything.qml"; | 140 | buttonActions.source = "EraseEverything.qml"; |
| 2151 | 105 | root.popup = PopupUtils.open(buttonActions.item); | 141 | root.popup = PopupUtils.open(buttonActions.item); |
| 2152 | 106 | } | 142 | } |
| 2153 | 107 | } | 143 | } |
| 2154 | 108 | showDivider: false | ||
| 2155 | 109 | } | 144 | } |
| 2156 | 110 | } | 145 | } |
| 2157 | 111 | } | 146 | } |
| 2158 | 112 | 147 | ||
| 2159 | === modified file 'plugins/security-privacy/AppAccess.qml' | |||
| 2160 | --- plugins/security-privacy/AppAccess.qml 2016-02-26 19:07:21 +0000 | |||
| 2161 | +++ plugins/security-privacy/AppAccess.qml 2016-07-22 14:36:34 +0000 | |||
| 2162 | @@ -1,5 +1,5 @@ | |||
| 2163 | 1 | /* | 1 | /* |
| 2165 | 2 | * Copyright (C) 2013 Canonical Ltd | 2 | * Copyright (C) 2013-2016 Canonical Ltd |
| 2166 | 3 | * | 3 | * |
| 2167 | 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 |
| 2168 | 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 |
| 2169 | @@ -18,10 +18,11 @@ | |||
| 2170 | 18 | */ | 18 | */ |
| 2171 | 19 | 19 | ||
| 2172 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 2173 | 21 | import SystemSettings 1.0 | ||
| 2174 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2175 | 21 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2177 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2178 | 23 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 25 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 2179 | 24 | import SystemSettings 1.0 | ||
| 2180 | 25 | 26 | ||
| 2181 | 26 | ItemPage { | 27 | ItemPage { |
| 2182 | 27 | id: root | 28 | id: root |
| 2183 | @@ -57,7 +58,7 @@ | |||
| 2184 | 57 | anchors.left: parent.left | 58 | anchors.left: parent.left |
| 2185 | 58 | anchors.right: parent.right | 59 | anchors.right: parent.right |
| 2186 | 59 | 60 | ||
| 2188 | 60 | ListItem.Caption { | 61 | ListItems.Caption { |
| 2189 | 61 | text: i18n.tr("Apps that you have granted access to:") | 62 | text: i18n.tr("Apps that you have granted access to:") |
| 2190 | 62 | } | 63 | } |
| 2191 | 63 | 64 | ||
| 2192 | @@ -91,10 +92,10 @@ | |||
| 2193 | 91 | Repeater { | 92 | Repeater { |
| 2194 | 92 | model: appsModel | 93 | model: appsModel |
| 2195 | 93 | 94 | ||
| 2197 | 94 | ListItem.SingleValue { | 95 | SettingsListItems.SingleValueProgression { |
| 2198 | 95 | text: i18n.tr(model.name) | 96 | text: i18n.tr(model.name) |
| 2199 | 96 | enabled: trustStoreModel.count > 0 | 97 | enabled: trustStoreModel.count > 0 |
| 2201 | 97 | progression: enabled ? true : false | 98 | progressionVisible: enabled ? true : false |
| 2202 | 98 | value: trustStoreModel.count > 0 ? | 99 | value: trustStoreModel.count > 0 ? |
| 2203 | 99 | i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) : | 100 | i18n.tr("%1/%2").arg(trustStoreModel.grantedCount).arg(trustStoreModel.count) : |
| 2204 | 100 | i18n.tr("0") | 101 | i18n.tr("0") |
| 2205 | @@ -104,19 +105,19 @@ | |||
| 2206 | 104 | "model": trustStoreModel, | 105 | "model": trustStoreModel, |
| 2207 | 105 | }) | 106 | }) |
| 2208 | 106 | 107 | ||
| 2210 | 107 | TrustStoreModel { | 108 | resources: TrustStoreModel { |
| 2211 | 108 | id: trustStoreModel | 109 | id: trustStoreModel |
| 2212 | 109 | serviceName: model.trustStoreService | 110 | serviceName: model.trustStoreService |
| 2213 | 110 | } | 111 | } |
| 2214 | 111 | } | 112 | } |
| 2215 | 112 | } | 113 | } |
| 2216 | 113 | 114 | ||
| 2218 | 114 | ListItem.Caption { | 115 | ListItems.Caption { |
| 2219 | 115 | text: i18n.tr("Apps may also request access to online accounts.") | 116 | text: i18n.tr("Apps may also request access to online accounts.") |
| 2220 | 116 | } | 117 | } |
| 2221 | 117 | 118 | ||
| 2224 | 118 | ListItem.SingleControl { | 119 | SettingsListItems.SingleControl { |
| 2225 | 119 | control: Button { | 120 | Button { |
| 2226 | 120 | text: i18n.tr("Online Accounts…") | 121 | text: i18n.tr("Online Accounts…") |
| 2227 | 121 | width: parent.width - units.gu(4) | 122 | width: parent.width - units.gu(4) |
| 2228 | 122 | onClicked: { | 123 | onClicked: { |
| 2229 | 123 | 124 | ||
| 2230 | === modified file 'plugins/security-privacy/AppAccessControl.qml' | |||
| 2231 | --- plugins/security-privacy/AppAccessControl.qml 2015-08-10 13:31:45 +0000 | |||
| 2232 | +++ plugins/security-privacy/AppAccessControl.qml 2016-07-22 14:36:34 +0000 | |||
| 2233 | @@ -1,5 +1,5 @@ | |||
| 2234 | 1 | /* | 1 | /* |
| 2236 | 2 | * Copyright (C) 2013 Canonical Ltd | 2 | * Copyright (C) 2013-2016 Canonical Ltd |
| 2237 | 3 | * | 3 | * |
| 2238 | 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 |
| 2239 | 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 |
| 2240 | @@ -18,9 +18,10 @@ | |||
| 2241 | 18 | */ | 18 | */ |
| 2242 | 19 | 19 | ||
| 2243 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 2244 | 21 | import SystemSettings 1.0 | ||
| 2245 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2246 | 21 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2249 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 24 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2248 | 23 | import SystemSettings 1.0 | ||
| 2250 | 24 | 25 | ||
| 2251 | 25 | ItemPage { | 26 | ItemPage { |
| 2252 | 26 | id: root | 27 | id: root |
| 2253 | @@ -43,17 +44,17 @@ | |||
| 2254 | 43 | anchors.left: parent.left | 44 | anchors.left: parent.left |
| 2255 | 44 | anchors.right: parent.right | 45 | anchors.right: parent.right |
| 2256 | 45 | 46 | ||
| 2258 | 46 | ListItem.Caption { | 47 | ListItems.Caption { |
| 2259 | 47 | id: captionLabel | 48 | id: captionLabel |
| 2260 | 48 | } | 49 | } |
| 2261 | 49 | 50 | ||
| 2262 | 50 | Repeater { | 51 | Repeater { |
| 2263 | 51 | id: repeater | 52 | id: repeater |
| 2264 | 52 | 53 | ||
| 2266 | 53 | ListItem.Standard { | 54 | SettingsListItems.Icon { |
| 2267 | 54 | text: model.applicationName | 55 | text: model.applicationName |
| 2268 | 55 | iconSource: model.iconName | 56 | iconSource: model.iconName |
| 2270 | 56 | control: Switch { | 57 | Switch { |
| 2271 | 57 | id: welcomeStatsSwitch | 58 | id: welcomeStatsSwitch |
| 2272 | 58 | checked: model.granted | 59 | checked: model.granted |
| 2273 | 59 | onClicked: root.model.setEnabled(index, !model.granted) | 60 | onClicked: root.model.setEnabled(index, !model.granted) |
| 2274 | 60 | 61 | ||
| 2275 | === modified file 'plugins/security-privacy/Location.qml' | |||
| 2276 | --- plugins/security-privacy/Location.qml 2016-02-12 21:15:56 +0000 | |||
| 2277 | +++ plugins/security-privacy/Location.qml 2016-07-22 14:36:34 +0000 | |||
| 2278 | @@ -1,5 +1,5 @@ | |||
| 2279 | 1 | /* | 1 | /* |
| 2281 | 2 | * Copyright (C) 2013 Canonical Ltd | 2 | * Copyright (C) 2013-2016 Canonical Ltd |
| 2282 | 3 | * | 3 | * |
| 2283 | 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 |
| 2284 | 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 |
| 2285 | @@ -22,11 +22,12 @@ | |||
| 2286 | 22 | import QMenuModel 0.1 | 22 | import QMenuModel 0.1 |
| 2287 | 23 | import Qt.labs.folderlistmodel 2.1 | 23 | import Qt.labs.folderlistmodel 2.1 |
| 2288 | 24 | import QtQuick 2.4 | 24 | import QtQuick 2.4 |
| 2289 | 25 | import SystemSettings 1.0 | ||
| 2290 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2291 | 25 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 2292 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2293 | 27 | import Ubuntu.Connectivity 1.0 | 28 | import Ubuntu.Connectivity 1.0 |
| 2294 | 29 | import Ubuntu.Components.ListItems 1.3 as ListItems | ||
| 2295 | 28 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 30 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 2296 | 29 | import SystemSettings 1.0 | ||
| 2297 | 30 | 31 | ||
| 2298 | 31 | ItemPage { | 32 | ItemPage { |
| 2299 | 32 | id: locationPage | 33 | id: locationPage |
| 2300 | @@ -95,7 +96,7 @@ | |||
| 2301 | 95 | text: i18n.tr("Let the device detect your location:") | 96 | text: i18n.tr("Let the device detect your location:") |
| 2302 | 96 | } | 97 | } |
| 2303 | 97 | 98 | ||
| 2305 | 98 | ListItem.ItemSelector { | 99 | ListItems.ItemSelector { |
| 2306 | 99 | id: detection | 100 | id: detection |
| 2307 | 100 | 101 | ||
| 2308 | 101 | /* Helper that toggles location detection and HERE based on | 102 | /* Helper that toggles location detection and HERE based on |
| 2309 | @@ -202,7 +203,7 @@ | |||
| 2310 | 202 | } | 203 | } |
| 2311 | 203 | } | 204 | } |
| 2312 | 204 | 205 | ||
| 2314 | 205 | ListItem.Caption { | 206 | ListItems.Caption { |
| 2315 | 206 | /* TODO: replace by real info from the location service */ | 207 | /* TODO: replace by real info from the location service */ |
| 2316 | 207 | property int locationInfo: 0 | 208 | property int locationInfo: 0 |
| 2317 | 208 | 209 | ||
| 2318 | @@ -238,10 +239,10 @@ | |||
| 2319 | 238 | 239 | ||
| 2320 | 239 | Repeater { | 240 | Repeater { |
| 2321 | 240 | model: trustStoreModel | 241 | model: trustStoreModel |
| 2323 | 241 | ListItem.Standard { | 242 | SettingsListItems.Icon { |
| 2324 | 242 | text: model.applicationName | 243 | text: model.applicationName |
| 2325 | 243 | iconSource: model.iconName | 244 | iconSource: model.iconName |
| 2327 | 244 | control: Switch { | 245 | Switch { |
| 2328 | 245 | checked: model.granted | 246 | checked: model.granted |
| 2329 | 246 | onClicked: trustStoreModel.setEnabled(index, !model.granted) | 247 | onClicked: trustStoreModel.setEnabled(index, !model.granted) |
| 2330 | 247 | } | 248 | } |
| 2331 | @@ -249,12 +250,11 @@ | |||
| 2332 | 249 | } | 250 | } |
| 2333 | 250 | } | 251 | } |
| 2334 | 251 | 252 | ||
| 2336 | 252 | ListItem.Standard { | 253 | SettingsListItems.Standard { |
| 2337 | 253 | text: i18n.tr("None requested") | 254 | text: i18n.tr("None requested") |
| 2338 | 254 | visible: trustStoreModel.count === 0 | 255 | visible: trustStoreModel.count === 0 |
| 2339 | 255 | enabled: false | 256 | enabled: false |
| 2340 | 256 | } | 257 | } |
| 2341 | 257 | } | 258 | } |
| 2342 | 258 | |||
| 2343 | 259 | } | 259 | } |
| 2344 | 260 | } | 260 | } |
| 2345 | 261 | 261 | ||
| 2346 | === modified file 'plugins/security-privacy/LockSecurity.qml' | |||
| 2347 | --- plugins/security-privacy/LockSecurity.qml 2016-06-15 12:15:08 +0000 | |||
| 2348 | +++ plugins/security-privacy/LockSecurity.qml 2016-07-22 14:36:34 +0000 | |||
| 2349 | @@ -22,12 +22,13 @@ | |||
| 2350 | 22 | import GSettings 1.0 | 22 | import GSettings 1.0 |
| 2351 | 23 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 2352 | 24 | import QtQuick.Layouts 1.1 | 24 | import QtQuick.Layouts 1.1 |
| 2353 | 25 | import SystemSettings 1.0 | ||
| 2354 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2355 | 25 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 2357 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | 28 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2358 | 27 | import Ubuntu.Components.Popups 1.3 | 29 | import Ubuntu.Components.Popups 1.3 |
| 2359 | 28 | import Ubuntu.Settings.Fingerprint 0.1 | 30 | import Ubuntu.Settings.Fingerprint 0.1 |
| 2360 | 29 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 31 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 2361 | 30 | import SystemSettings 1.0 | ||
| 2362 | 31 | 32 | ||
| 2363 | 32 | ItemPage { | 33 | ItemPage { |
| 2364 | 33 | id: page | 34 | id: page |
| 2365 | @@ -460,7 +461,7 @@ | |||
| 2366 | 460 | text: i18n.tr("Unlock the device using:") | 461 | text: i18n.tr("Unlock the device using:") |
| 2367 | 461 | } | 462 | } |
| 2368 | 462 | 463 | ||
| 2370 | 463 | ListItem.ItemSelector { | 464 | ListItems.ItemSelector { |
| 2371 | 464 | property string swipe: i18n.tr("Swipe (no security)") | 465 | property string swipe: i18n.tr("Swipe (no security)") |
| 2372 | 465 | property string passcode: i18n.tr("4-digit passcode") | 466 | property string passcode: i18n.tr("4-digit passcode") |
| 2373 | 466 | property string passphrase: i18n.tr("Passphrase") | 467 | property string passphrase: i18n.tr("Passphrase") |
| 2374 | @@ -548,7 +549,7 @@ | |||
| 2375 | 548 | } | 549 | } |
| 2376 | 549 | } | 550 | } |
| 2377 | 550 | 551 | ||
| 2379 | 551 | ListItem.SingleControl { | 552 | SettingsListItems.SingleControl { |
| 2380 | 552 | 553 | ||
| 2381 | 553 | id: changeControl | 554 | id: changeControl |
| 2382 | 554 | visible: securityPrivacy.securityType === | 555 | visible: securityPrivacy.securityType === |
| 2383 | @@ -556,7 +557,7 @@ | |||
| 2384 | 556 | securityPrivacy.securityType === | 557 | securityPrivacy.securityType === |
| 2385 | 557 | UbuntuSecurityPrivacyPanel.Passphrase | 558 | UbuntuSecurityPrivacyPanel.Passphrase |
| 2386 | 558 | 559 | ||
| 2388 | 559 | control: Button { | 560 | Button { |
| 2389 | 560 | property string changePasscode: i18n.tr("Change passcode…") | 561 | property string changePasscode: i18n.tr("Change passcode…") |
| 2390 | 561 | property string changePassphrase: i18n.tr("Change passphrase…") | 562 | property string changePassphrase: i18n.tr("Change passphrase…") |
| 2391 | 562 | 563 | ||
| 2392 | 563 | 564 | ||
| 2393 | === modified file 'plugins/security-privacy/PageComponent.qml' | |||
| 2394 | --- plugins/security-privacy/PageComponent.qml 2016-06-15 12:12:40 +0000 | |||
| 2395 | +++ plugins/security-privacy/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 2396 | @@ -1,7 +1,7 @@ | |||
| 2397 | 1 | /* | 1 | /* |
| 2398 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2399 | 3 | * | 3 | * |
| 2401 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2402 | 5 | * | 5 | * |
| 2403 | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> |
| 2404 | 7 | * | 7 | * |
| 2405 | @@ -22,8 +22,9 @@ | |||
| 2406 | 22 | import GSettings 1.0 | 22 | import GSettings 1.0 |
| 2407 | 23 | import QMenuModel 0.1 | 23 | import QMenuModel 0.1 |
| 2408 | 24 | import QtQuick 2.4 | 24 | import QtQuick 2.4 |
| 2409 | 25 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2410 | 25 | import Ubuntu.Components 1.3 | 26 | import Ubuntu.Components 1.3 |
| 2412 | 26 | import Ubuntu.Components.ListItems 1.3 as ListItem | 27 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2413 | 27 | import SystemSettings 1.0 | 28 | import SystemSettings 1.0 |
| 2414 | 28 | import Ubuntu.Settings.Fingerprint 0.1 | 29 | import Ubuntu.Settings.Fingerprint 0.1 |
| 2415 | 29 | import Ubuntu.SystemSettings.Battery 1.0 | 30 | import Ubuntu.SystemSettings.Battery 1.0 |
| 2416 | @@ -148,15 +149,15 @@ | |||
| 2417 | 148 | anchors.left: parent.left | 149 | anchors.left: parent.left |
| 2418 | 149 | anchors.right: parent.right | 150 | anchors.right: parent.right |
| 2419 | 150 | 151 | ||
| 2421 | 151 | ListItem.Header { | 152 | SettingsItemTitle { |
| 2422 | 152 | id: securityTitle | 153 | id: securityTitle |
| 2423 | 153 | text: i18n.tr("Security") | 154 | text: i18n.tr("Security") |
| 2424 | 154 | } | 155 | } |
| 2426 | 155 | ListItem.SingleValue { | 156 | |
| 2427 | 157 | SettingsListItems.SingleValueProgression { | ||
| 2428 | 156 | id: fingerprintControl | 158 | id: fingerprintControl |
| 2429 | 157 | objectName: "fingerprintControl" | 159 | objectName: "fingerprintControl" |
| 2430 | 158 | text: i18n.tr("Fingerprint ID") | 160 | text: i18n.tr("Fingerprint ID") |
| 2431 | 159 | progression: true | ||
| 2432 | 160 | onClicked: pageStack.push(fingeprintPage, { | 161 | onClicked: pageStack.push(fingeprintPage, { |
| 2433 | 161 | passcodeSet: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe | 162 | passcodeSet: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe |
| 2434 | 162 | }) | 163 | }) |
| 2435 | @@ -173,17 +174,17 @@ | |||
| 2436 | 173 | } | 174 | } |
| 2437 | 174 | } | 175 | } |
| 2438 | 175 | 176 | ||
| 2440 | 176 | ListItem.SingleValue { | 177 | SettingsListItems.SingleValueProgression { |
| 2441 | 177 | id: lockingControl | 178 | id: lockingControl |
| 2442 | 178 | objectName: "lockingControl" | 179 | objectName: "lockingControl" |
| 2443 | 179 | text: i18n.tr("Locking and unlocking") | 180 | text: i18n.tr("Locking and unlocking") |
| 2444 | 180 | progression: true | ||
| 2445 | 181 | onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"), { | 181 | onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"), { |
| 2446 | 182 | usePowerd: usePowerd, | 182 | usePowerd: usePowerd, |
| 2447 | 183 | powerSettings: powerSettings | 183 | powerSettings: powerSettings |
| 2448 | 184 | }) | 184 | }) |
| 2449 | 185 | } | 185 | } |
| 2451 | 186 | ListItem.SingleValue { | 186 | |
| 2452 | 187 | SettingsListItems.SingleValueProgression { | ||
| 2453 | 187 | id: simControl | 188 | id: simControl |
| 2454 | 188 | objectName: "simControl" | 189 | objectName: "simControl" |
| 2455 | 189 | text: i18n.tr("SIM PIN") | 190 | text: i18n.tr("SIM PIN") |
| 2456 | @@ -196,28 +197,31 @@ | |||
| 2457 | 196 | return i18n.tr("Off"); | 197 | return i18n.tr("Off"); |
| 2458 | 197 | } | 198 | } |
| 2459 | 198 | visible: simsPresent > 0 | 199 | visible: simsPresent > 0 |
| 2460 | 199 | progression: true | ||
| 2461 | 200 | onClicked: pageStack.push(Qt.resolvedUrl("SimPin.qml"), { sims: sims }) | 200 | onClicked: pageStack.push(Qt.resolvedUrl("SimPin.qml"), { sims: sims }) |
| 2462 | 201 | } | 201 | } |
| 2464 | 202 | ListItem.Standard { | 202 | |
| 2465 | 203 | SettingsListItems.Standard { | ||
| 2466 | 203 | text: i18n.tr("Encryption") | 204 | text: i18n.tr("Encryption") |
| 2468 | 204 | control: Switch { | 205 | Switch { |
| 2469 | 205 | id: encryptionSwitch | 206 | id: encryptionSwitch |
| 2470 | 206 | checked: false | 207 | checked: false |
| 2471 | 207 | } | 208 | } |
| 2472 | 208 | visible: showAllUI | 209 | visible: showAllUI |
| 2473 | 209 | } | 210 | } |
| 2475 | 210 | ListItem.Caption { | 211 | |
| 2476 | 212 | ListItems.Caption { | ||
| 2477 | 211 | text: i18n.tr( | 213 | text: i18n.tr( |
| 2478 | 212 | "Encryption protects against access to phone data when the phone is connected to a PC or other device.") | 214 | "Encryption protects against access to phone data when the phone is connected to a PC or other device.") |
| 2479 | 213 | visible: showAllUI | 215 | visible: showAllUI |
| 2480 | 214 | } | 216 | } |
| 2482 | 215 | ListItem.Header { | 217 | |
| 2483 | 218 | SettingsItemTitle { | ||
| 2484 | 216 | text: i18n.tr("Privacy") | 219 | text: i18n.tr("Privacy") |
| 2485 | 217 | } | 220 | } |
| 2487 | 218 | ListItem.Standard { | 221 | |
| 2488 | 222 | SettingsListItems.Standard { | ||
| 2489 | 219 | text: i18n.tr("Stats on welcome screen") | 223 | text: i18n.tr("Stats on welcome screen") |
| 2491 | 220 | control: Switch { | 224 | Switch { |
| 2492 | 221 | property bool serverChecked: securityPrivacy.statsWelcomeScreen | 225 | property bool serverChecked: securityPrivacy.statsWelcomeScreen |
| 2493 | 222 | onServerCheckedChanged: checked = serverChecked | 226 | onServerCheckedChanged: checked = serverChecked |
| 2494 | 223 | Component.onCompleted: checked = serverChecked | 227 | Component.onCompleted: checked = serverChecked |
| 2495 | @@ -225,9 +229,9 @@ | |||
| 2496 | 225 | } | 229 | } |
| 2497 | 226 | } | 230 | } |
| 2498 | 227 | 231 | ||
| 2500 | 228 | ListItem.Standard { | 232 | SettingsListItems.Standard { |
| 2501 | 229 | text: i18n.tr("Messages on welcome screen") | 233 | text: i18n.tr("Messages on welcome screen") |
| 2503 | 230 | control: Switch { | 234 | Switch { |
| 2504 | 231 | property bool serverChecked: securityPrivacy.messagesWelcomeScreen | 235 | property bool serverChecked: securityPrivacy.messagesWelcomeScreen |
| 2505 | 232 | onServerCheckedChanged: checked = serverChecked | 236 | onServerCheckedChanged: checked = serverChecked |
| 2506 | 233 | Component.onCompleted: checked = serverChecked | 237 | Component.onCompleted: checked = serverChecked |
| 2507 | @@ -246,12 +250,12 @@ | |||
| 2508 | 246 | 250 | ||
| 2509 | 247 | Component.onCompleted: start() | 251 | Component.onCompleted: start() |
| 2510 | 248 | } | 252 | } |
| 2512 | 249 | ListItem.SingleValue { | 253 | |
| 2513 | 254 | SettingsListItems.SingleValueProgression { | ||
| 2514 | 250 | id: locationItem | 255 | id: locationItem |
| 2515 | 251 | objectName: "locationItem" | 256 | objectName: "locationItem" |
| 2516 | 252 | text: i18n.tr("Location") | 257 | text: i18n.tr("Location") |
| 2517 | 253 | value: "" | 258 | value: "" |
| 2518 | 254 | progression: true | ||
| 2519 | 255 | onClicked: pageStack.push(Qt.resolvedUrl("Location.qml")) | 259 | onClicked: pageStack.push(Qt.resolvedUrl("Location.qml")) |
| 2520 | 256 | visible: true | 260 | visible: true |
| 2521 | 257 | enabled: true | 261 | enabled: true |
| 2522 | @@ -261,19 +265,20 @@ | |||
| 2523 | 261 | i18n.tr("On") : i18n.tr("Off") | 265 | i18n.tr("On") : i18n.tr("Off") |
| 2524 | 262 | } | 266 | } |
| 2525 | 263 | } | 267 | } |
| 2526 | 268 | |||
| 2527 | 264 | Binding { | 269 | Binding { |
| 2528 | 265 | target: locationItem | 270 | target: locationItem |
| 2529 | 266 | property: "locationEnabled" | 271 | property: "locationEnabled" |
| 2530 | 267 | value: locationActionGroup.enabled.state | 272 | value: locationActionGroup.enabled.state |
| 2531 | 268 | } | 273 | } |
| 2533 | 269 | ListItem.SingleValue { | 274 | |
| 2534 | 275 | SettingsListItems.SingleValueProgression { | ||
| 2535 | 270 | text: i18n.tr("App permissions") | 276 | text: i18n.tr("App permissions") |
| 2536 | 271 | progression: true | ||
| 2537 | 272 | onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager}) | 277 | onClicked: pageStack.push(Qt.resolvedUrl("AppAccess.qml"), {pluginManager: pluginManager}) |
| 2538 | 273 | } | 278 | } |
| 2540 | 274 | ListItem.SingleValue { | 279 | |
| 2541 | 280 | SettingsListItems.SingleValueProgression { | ||
| 2542 | 275 | text: i18n.tr("Diagnostics") | 281 | text: i18n.tr("Diagnostics") |
| 2543 | 276 | progression: true | ||
| 2544 | 277 | value: diagnosticsWidget.reportCrashes ? | 282 | value: diagnosticsWidget.reportCrashes ? |
| 2545 | 278 | /* TRANSLATORS: This string is shown when crash | 283 | /* TRANSLATORS: This string is shown when crash |
| 2546 | 279 | reports are to be sent by the system. */ | 284 | reports are to be sent by the system. */ |
| 2547 | 280 | 285 | ||
| 2548 | === modified file 'plugins/security-privacy/PhoneLocking.qml' | |||
| 2549 | --- plugins/security-privacy/PhoneLocking.qml 2016-06-15 11:02:05 +0000 | |||
| 2550 | +++ plugins/security-privacy/PhoneLocking.qml 2016-07-22 14:36:34 +0000 | |||
| 2551 | @@ -1,7 +1,7 @@ | |||
| 2552 | 1 | /* | 1 | /* |
| 2553 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2554 | 3 | * | 3 | * |
| 2556 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2557 | 5 | * | 5 | * |
| 2558 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 2559 | 7 | * | 7 | * |
| 2560 | @@ -21,8 +21,9 @@ | |||
| 2561 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2562 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 2563 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 2564 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2565 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 2567 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 26 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2568 | 26 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 27 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 2569 | 27 | 28 | ||
| 2570 | 28 | ItemPage { | 29 | ItemPage { |
| 2571 | @@ -52,7 +53,7 @@ | |||
| 2572 | 52 | anchors.left: parent.left | 53 | anchors.left: parent.left |
| 2573 | 53 | anchors.right: parent.right | 54 | anchors.right: parent.right |
| 2574 | 54 | 55 | ||
| 2576 | 55 | ListItem.SingleValue { | 56 | SettingsListItems.SingleValueProgression { |
| 2577 | 56 | property string swipe: i18n.ctr("Unlock with swipe", "None") | 57 | property string swipe: i18n.ctr("Unlock with swipe", "None") |
| 2578 | 57 | property string passcode: i18n.tr("Passcode") | 58 | property string passcode: i18n.tr("Passcode") |
| 2579 | 58 | property string passphrase: i18n.tr("Passphrase") | 59 | property string passphrase: i18n.tr("Passphrase") |
| 2580 | @@ -74,11 +75,10 @@ | |||
| 2581 | 74 | return fingerprint | 75 | return fingerprint |
| 2582 | 75 | } | 76 | } |
| 2583 | 76 | } | 77 | } |
| 2584 | 77 | progression: true | ||
| 2585 | 78 | onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml")) | 78 | onClicked: pageStack.push(Qt.resolvedUrl("LockSecurity.qml")) |
| 2586 | 79 | } | 79 | } |
| 2587 | 80 | 80 | ||
| 2589 | 81 | ListItem.SingleValue { | 81 | SettingsListItems.SingleValueProgression { |
| 2590 | 82 | objectName: "lockTimeout" | 82 | objectName: "lockTimeout" |
| 2591 | 83 | property bool lockOnSuspend: securityPrivacy.securityType !== | 83 | property bool lockOnSuspend: securityPrivacy.securityType !== |
| 2592 | 84 | UbuntuSecurityPrivacyPanel.Swipe | 84 | UbuntuSecurityPrivacyPanel.Swipe |
| 2593 | @@ -109,15 +109,14 @@ | |||
| 2594 | 109 | i18n.tr("Never") | 109 | i18n.tr("Never") |
| 2595 | 110 | } | 110 | } |
| 2596 | 111 | } | 111 | } |
| 2597 | 112 | progression: true | ||
| 2598 | 113 | onClicked: | 112 | onClicked: |
| 2599 | 114 | pageStack.push( | 113 | pageStack.push( |
| 2600 | 115 | Qt.resolvedUrl("../battery/SleepValues.qml"), | 114 | Qt.resolvedUrl("../battery/SleepValues.qml"), |
| 2601 | 116 | { title: text, lockOnSuspend: lockOnSuspend } ) | 115 | { title: text, lockOnSuspend: lockOnSuspend } ) |
| 2602 | 117 | } | 116 | } |
| 2603 | 118 | 117 | ||
| 2606 | 119 | ListItem.Standard { | 118 | SettingsListItems.Standard { |
| 2607 | 120 | control: CheckBox { | 119 | CheckBox { |
| 2608 | 121 | checked: true | 120 | checked: true |
| 2609 | 122 | } | 121 | } |
| 2610 | 123 | text: i18n.tr("Sleep locks immediately") | 122 | text: i18n.tr("Sleep locks immediately") |
| 2611 | @@ -128,9 +127,9 @@ | |||
| 2612 | 128 | text: i18n.tr("When locked, allow:") | 127 | text: i18n.tr("When locked, allow:") |
| 2613 | 129 | } | 128 | } |
| 2614 | 130 | 129 | ||
| 2616 | 131 | ListItem.Standard { | 130 | SettingsListItems.Standard { |
| 2617 | 132 | text: i18n.tr("Launcher") | 131 | text: i18n.tr("Launcher") |
| 2619 | 133 | control: CheckBox { | 132 | CheckBox { |
| 2620 | 134 | id: launcherCheck | 133 | id: launcherCheck |
| 2621 | 135 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe | 134 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe |
| 2622 | 136 | 135 | ||
| 2623 | @@ -141,9 +140,9 @@ | |||
| 2624 | 141 | } | 140 | } |
| 2625 | 142 | } | 141 | } |
| 2626 | 143 | 142 | ||
| 2628 | 144 | ListItem.Standard { | 143 | SettingsListItems.Standard { |
| 2629 | 145 | text: i18n.tr("Notifications and quick settings") | 144 | text: i18n.tr("Notifications and quick settings") |
| 2631 | 146 | control: CheckBox { | 145 | CheckBox { |
| 2632 | 147 | id: indicatorsCheck | 146 | id: indicatorsCheck |
| 2633 | 148 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe | 147 | enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe |
| 2634 | 149 | 148 | ||
| 2635 | @@ -154,7 +153,7 @@ | |||
| 2636 | 154 | } | 153 | } |
| 2637 | 155 | } | 154 | } |
| 2638 | 156 | 155 | ||
| 2640 | 157 | ListItem.Caption { | 156 | ListItems.Caption { |
| 2641 | 158 | text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ? | 157 | text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ? |
| 2642 | 159 | i18n.tr("Turn on lock security to restrict access when the device is locked.") : | 158 | i18n.tr("Turn on lock security to restrict access when the device is locked.") : |
| 2643 | 160 | i18n.tr("Other apps and functions will prompt you to unlock.") | 159 | i18n.tr("Other apps and functions will prompt you to unlock.") |
| 2644 | 161 | 160 | ||
| 2645 | === modified file 'plugins/security-privacy/SimPin.qml' | |||
| 2646 | --- plugins/security-privacy/SimPin.qml 2016-05-17 23:28:16 +0000 | |||
| 2647 | +++ plugins/security-privacy/SimPin.qml 2016-07-22 14:36:34 +0000 | |||
| 2648 | @@ -1,5 +1,5 @@ | |||
| 2649 | 1 | /* | 1 | /* |
| 2651 | 2 | * Copyright (C) 2014 Canonical Ltd. | 2 | * Copyright (C) 2014-2016 Canonical Ltd. |
| 2652 | 3 | * | 3 | * |
| 2653 | 4 | * This program is free software: you can redistribute it and/or modify it | 4 | * This program is free software: you can redistribute it and/or modify it |
| 2654 | 5 | * under the terms of the GNU General Public License version 3, as published | 5 | * under the terms of the GNU General Public License version 3, as published |
| 2655 | @@ -19,14 +19,15 @@ | |||
| 2656 | 19 | */ | 19 | */ |
| 2657 | 20 | 20 | ||
| 2658 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2659 | 22 | import MeeGo.QOfono 0.2 | ||
| 2660 | 22 | import QtQuick 2.4 | 23 | import QtQuick 2.4 |
| 2661 | 23 | import QtQuick.Layouts 1.1 | 24 | import QtQuick.Layouts 1.1 |
| 2662 | 25 | import SystemSettings 1.0 | ||
| 2663 | 26 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2664 | 24 | import Ubuntu.Components 1.3 | 27 | import Ubuntu.Components 1.3 |
| 2666 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | 28 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2667 | 26 | import Ubuntu.Components.Popups 1.3 | 29 | import Ubuntu.Components.Popups 1.3 |
| 2668 | 27 | import SystemSettings 1.0 | ||
| 2669 | 28 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 | 30 | import Ubuntu.SystemSettings.SecurityPrivacy 1.0 |
| 2670 | 29 | import MeeGo.QOfono 0.2 | ||
| 2671 | 30 | import "sims.js" as Sims | 31 | import "sims.js" as Sims |
| 2672 | 31 | 32 | ||
| 2673 | 32 | 33 | ||
| 2674 | @@ -386,14 +387,14 @@ | |||
| 2675 | 386 | } | 387 | } |
| 2676 | 387 | } | 388 | } |
| 2677 | 388 | 389 | ||
| 2679 | 389 | ListItem.Standard { | 390 | SettingsListItems.Standard { |
| 2680 | 390 | text: sims[index].title | 391 | text: sims[index].title |
| 2681 | 391 | visible: sims.length > 1 | 392 | visible: sims.length > 1 |
| 2682 | 392 | } | 393 | } |
| 2683 | 393 | 394 | ||
| 2685 | 394 | ListItem.Standard { | 395 | SettingsListItems.Standard { |
| 2686 | 395 | text: i18n.tr("SIM PIN") | 396 | text: i18n.tr("SIM PIN") |
| 2688 | 396 | control: Switch { | 397 | Switch { |
| 2689 | 397 | id: simPinSwitch | 398 | id: simPinSwitch |
| 2690 | 398 | objectName: "simPinSwitch" | 399 | objectName: "simPinSwitch" |
| 2691 | 399 | checked: sims[index].simMng.lockedPins.length > 0 | 400 | checked: sims[index].simMng.lockedPins.length > 0 |
| 2692 | @@ -404,11 +405,11 @@ | |||
| 2693 | 404 | } | 405 | } |
| 2694 | 405 | } | 406 | } |
| 2695 | 406 | 407 | ||
| 2697 | 407 | ListItem.Standard { | 408 | SettingsListItems.Standard { |
| 2698 | 408 | id: changeControl | 409 | id: changeControl |
| 2699 | 409 | visible: sim.state === "unlocked" | 410 | visible: sim.state === "unlocked" |
| 2700 | 410 | text: i18n.tr("Unlocked") | 411 | text: i18n.tr("Unlocked") |
| 2702 | 411 | control: Button { | 412 | Button { |
| 2703 | 412 | enabled: parent.visible | 413 | enabled: parent.visible |
| 2704 | 413 | text: i18n.tr("Change PIN…") | 414 | text: i18n.tr("Change PIN…") |
| 2705 | 414 | onClicked: { | 415 | onClicked: { |
| 2706 | @@ -418,11 +419,11 @@ | |||
| 2707 | 418 | } | 419 | } |
| 2708 | 419 | } | 420 | } |
| 2709 | 420 | 421 | ||
| 2711 | 421 | ListItem.Standard { | 422 | SettingsListItems.Standard { |
| 2712 | 422 | id: lockControl | 423 | id: lockControl |
| 2713 | 423 | visible: sim.state === "locked" | 424 | visible: sim.state === "locked" |
| 2714 | 424 | text: i18n.tr("Locked") | 425 | text: i18n.tr("Locked") |
| 2716 | 425 | control: Button { | 426 | Button { |
| 2717 | 426 | objectName: "unlock" | 427 | objectName: "unlock" |
| 2718 | 427 | enabled: sims[index].simMng.pinRequired !== 'none' | 428 | enabled: sims[index].simMng.pinRequired !== 'none' |
| 2719 | 428 | text: i18n.tr("Unlock…") | 429 | text: i18n.tr("Unlock…") |
| 2720 | @@ -431,18 +432,18 @@ | |||
| 2721 | 431 | } | 432 | } |
| 2722 | 432 | } | 433 | } |
| 2723 | 433 | 434 | ||
| 2725 | 434 | ListItem.Divider { | 435 | ListItems.Divider { |
| 2726 | 435 | visible: index < (sims.length - 1) | 436 | visible: index < (sims.length - 1) |
| 2727 | 436 | } | 437 | } |
| 2728 | 437 | 438 | ||
| 2729 | 438 | } | 439 | } |
| 2730 | 439 | } | 440 | } |
| 2731 | 440 | 441 | ||
| 2733 | 441 | ListItem.Caption { | 442 | ListItems.Caption { |
| 2734 | 442 | text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the device or swapping the SIM.") | 443 | text: i18n.tr("When a SIM PIN is set, it must be entered to access cellular services after restarting the device or swapping the SIM.") |
| 2735 | 443 | } | 444 | } |
| 2736 | 444 | 445 | ||
| 2738 | 445 | ListItem.Caption { | 446 | ListItems.Caption { |
| 2739 | 446 | text: i18n.tr("Entering an incorrect PIN repeatedly may lock the SIM permanently.") | 447 | text: i18n.tr("Entering an incorrect PIN repeatedly may lock the SIM permanently.") |
| 2740 | 447 | } | 448 | } |
| 2741 | 448 | } | 449 | } |
| 2742 | 449 | 450 | ||
| 2743 | === modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml' | |||
| 2744 | --- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2015-08-10 13:31:45 +0000 | |||
| 2745 | +++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2016-07-22 14:36:34 +0000 | |||
| 2746 | @@ -1,7 +1,7 @@ | |||
| 2747 | 1 | /* | 1 | /* |
| 2748 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2749 | 3 | * | 3 | * |
| 2751 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2752 | 5 | * | 5 | * |
| 2753 | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> |
| 2754 | 7 | * | 7 | * |
| 2755 | @@ -20,9 +20,9 @@ | |||
| 2756 | 20 | 20 | ||
| 2757 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2758 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 2760 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | 23 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2761 | 24 | 24 | ||
| 2763 | 25 | ListItem.Base { | 25 | ListItems.Base { |
| 2764 | 26 | property string textEntry: ""; | 26 | property string textEntry: ""; |
| 2765 | 27 | property alias checked: checkBox.checked; | 27 | property alias checked: checkBox.checked; |
| 2766 | 28 | onClicked: checked = !checked; | 28 | onClicked: checked = !checked; |
| 2767 | 29 | 29 | ||
| 2768 | === modified file 'plugins/security-privacy/diagnostics/PageComponent.qml' | |||
| 2769 | --- plugins/security-privacy/diagnostics/PageComponent.qml 2015-10-16 13:42:50 +0000 | |||
| 2770 | +++ plugins/security-privacy/diagnostics/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 2771 | @@ -1,7 +1,7 @@ | |||
| 2772 | 1 | /* | 1 | /* |
| 2773 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2774 | 3 | * | 3 | * |
| 2776 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2777 | 5 | * | 5 | * |
| 2778 | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> | 6 | * Contact: Evan Dandrea <evan.dandrea@canonical.com> |
| 2779 | 7 | * | 7 | * |
| 2780 | @@ -20,8 +20,9 @@ | |||
| 2781 | 20 | 20 | ||
| 2782 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 2783 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 2784 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2785 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 2787 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 2788 | 25 | import Ubuntu.SystemSettings.Diagnostics 1.0 | 26 | import Ubuntu.SystemSettings.Diagnostics 1.0 |
| 2789 | 26 | 27 | ||
| 2790 | 27 | ItemPage { | 28 | ItemPage { |
| 2791 | @@ -54,15 +55,14 @@ | |||
| 2792 | 54 | anchors.left: parent.left | 55 | anchors.left: parent.left |
| 2793 | 55 | anchors.right: parent.right | 56 | anchors.right: parent.right |
| 2794 | 56 | 57 | ||
| 2796 | 57 | ListItem.SingleValue { | 58 | SettingsListItems.SingleValueProgression { |
| 2797 | 58 | text: i18n.tr("Privacy policy") | 59 | text: i18n.tr("Privacy policy") |
| 2798 | 59 | progression: true | ||
| 2799 | 60 | onClicked: { | 60 | onClicked: { |
| 2800 | 61 | Qt.openUrlExternally("http://www.ubuntu.com/aboutus/privacypolicy?crashdb") | 61 | Qt.openUrlExternally("http://www.ubuntu.com/aboutus/privacypolicy?crashdb") |
| 2801 | 62 | } | 62 | } |
| 2802 | 63 | } | 63 | } |
| 2803 | 64 | 64 | ||
| 2805 | 65 | ListItem.Standard { | 65 | SettingsListItems.Standard { |
| 2806 | 66 | text: i18n.tr("Report to Canonical:") | 66 | text: i18n.tr("Report to Canonical:") |
| 2807 | 67 | } | 67 | } |
| 2808 | 68 | 68 | ||
| 2809 | @@ -80,20 +80,19 @@ | |||
| 2810 | 80 | textEntry: i18n.tr("App crashes and errors") | 80 | textEntry: i18n.tr("App crashes and errors") |
| 2811 | 81 | } | 81 | } |
| 2812 | 82 | 82 | ||
| 2814 | 83 | ListItem.SingleValue { | 83 | SettingsListItems.SingleValueProgression { |
| 2815 | 84 | id: previousReports | 84 | id: previousReports |
| 2816 | 85 | property string ident: diagnosticsWidget.systemIdentifier() | 85 | property string ident: diagnosticsWidget.systemIdentifier() |
| 2817 | 86 | text: i18n.tr("Previous error reports") | 86 | text: i18n.tr("Previous error reports") |
| 2819 | 87 | progression: previousReports.ident != "" | 87 | enabled: previousReports.ident != "" |
| 2820 | 88 | progressionVisible: enabled | ||
| 2821 | 88 | onClicked: { | 89 | onClicked: { |
| 2822 | 89 | var base = "https://errors.ubuntu.com/user/" | 90 | var base = "https://errors.ubuntu.com/user/" |
| 2826 | 90 | if (previousReports.progression) { | 91 | Qt.openUrlExternally(base + ident) |
| 2824 | 91 | Qt.openUrlExternally(base + ident) | ||
| 2825 | 92 | } | ||
| 2827 | 93 | } | 92 | } |
| 2828 | 94 | } | 93 | } |
| 2829 | 95 | 94 | ||
| 2831 | 96 | ListItem.Caption { | 95 | ListItems.Caption { |
| 2832 | 97 | text: i18n.tr("Includes info about what an app was doing when it failed.") | 96 | text: i18n.tr("Includes info about what an app was doing when it failed.") |
| 2833 | 98 | } | 97 | } |
| 2834 | 99 | } | 98 | } |
| 2835 | 100 | 99 | ||
| 2836 | === modified file 'plugins/sound/PageComponent.qml' | |||
| 2837 | --- plugins/sound/PageComponent.qml 2016-05-03 13:46:55 +0000 | |||
| 2838 | +++ plugins/sound/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 2839 | @@ -1,7 +1,7 @@ | |||
| 2840 | 1 | /* | 1 | /* |
| 2841 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 2842 | 3 | * | 3 | * |
| 2844 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 2845 | 5 | * | 5 | * |
| 2846 | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> | 6 | * Contact: Sebastien Bacher <sebastien.bacher@canonical.com> |
| 2847 | 7 | * | 7 | * |
| 2848 | @@ -21,9 +21,8 @@ | |||
| 2849 | 21 | import GSettings 1.0 | 21 | import GSettings 1.0 |
| 2850 | 22 | import QtQuick 2.4 | 22 | import QtQuick 2.4 |
| 2851 | 23 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 2852 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 2853 | 25 | import Ubuntu.Connectivity 1.0 | ||
| 2854 | 26 | import SystemSettings 1.0 | 24 | import SystemSettings 1.0 |
| 2855 | 25 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 2856 | 27 | import Ubuntu.SystemSettings.Sound 1.0 | 26 | import Ubuntu.SystemSettings.Sound 1.0 |
| 2857 | 28 | import Ubuntu.Settings.Menus 0.1 as Menus | 27 | import Ubuntu.Settings.Menus 0.1 as Menus |
| 2858 | 29 | import Ubuntu.Settings.Components 0.1 as USC | 28 | import Ubuntu.Settings.Components 0.1 as USC |
| 2859 | @@ -67,8 +66,10 @@ | |||
| 2860 | 67 | anchors.left: parent.left | 66 | anchors.left: parent.left |
| 2861 | 68 | anchors.right: parent.right | 67 | anchors.right: parent.right |
| 2862 | 69 | 68 | ||
| 2865 | 70 | ListItem.Standard { | 69 | SettingsListItems.Standard { |
| 2866 | 71 | control: Switch { | 70 | text: i18n.tr("Silent Mode") |
| 2867 | 71 | |||
| 2868 | 72 | Switch { | ||
| 2869 | 72 | id: silentModeSwitch | 73 | id: silentModeSwitch |
| 2870 | 73 | objectName: "silentMode" | 74 | objectName: "silentMode" |
| 2871 | 74 | property bool serverChecked: soundActionGroup.silentMode.state | 75 | property bool serverChecked: soundActionGroup.silentMode.state |
| 2872 | @@ -82,20 +83,6 @@ | |||
| 2873 | 82 | onSyncTriggered: soundActionGroup.silentMode.activate() | 83 | onSyncTriggered: soundActionGroup.silentMode.activate() |
| 2874 | 83 | } | 84 | } |
| 2875 | 84 | } | 85 | } |
| 2876 | 85 | text: i18n.tr("Silent Mode") | ||
| 2877 | 86 | } | ||
| 2878 | 87 | |||
| 2879 | 88 | QDBusActionGroup { | ||
| 2880 | 89 | id: soundActionGroup | ||
| 2881 | 90 | busType: DBus.SessionBus | ||
| 2882 | 91 | busName: "com.canonical.indicator.sound" | ||
| 2883 | 92 | objectPath: "/com/canonical/indicator/sound" | ||
| 2884 | 93 | |||
| 2885 | 94 | property variant volume: action("volume") | ||
| 2886 | 95 | property variant silentMode: action("silent-mode") | ||
| 2887 | 96 | property variant highVolume: action("high-volume") | ||
| 2888 | 97 | |||
| 2889 | 98 | Component.onCompleted: start() | ||
| 2890 | 99 | } | 86 | } |
| 2891 | 100 | 87 | ||
| 2892 | 101 | Column { | 88 | Column { |
| 2893 | @@ -107,6 +94,19 @@ | |||
| 2894 | 107 | text: i18n.tr("Ringer:") | 94 | text: i18n.tr("Ringer:") |
| 2895 | 108 | } | 95 | } |
| 2896 | 109 | 96 | ||
| 2897 | 97 | QDBusActionGroup { | ||
| 2898 | 98 | id: soundActionGroup | ||
| 2899 | 99 | busType: DBus.SessionBus | ||
| 2900 | 100 | busName: "com.canonical.indicator.sound" | ||
| 2901 | 101 | objectPath: "/com/canonical/indicator/sound" | ||
| 2902 | 102 | |||
| 2903 | 103 | property variant volume: action("volume") | ||
| 2904 | 104 | property variant silentMode: action("silent-mode") | ||
| 2905 | 105 | property variant highVolume: action("high-volume") | ||
| 2906 | 106 | |||
| 2907 | 107 | Component.onCompleted: start() | ||
| 2908 | 108 | } | ||
| 2909 | 109 | |||
| 2910 | 110 | Menus.SliderMenu { | 110 | Menus.SliderMenu { |
| 2911 | 111 | id: volumeSlider | 111 | id: volumeSlider |
| 2912 | 112 | objectName: "sliderMenu" | 112 | objectName: "sliderMenu" |
| 2913 | @@ -129,33 +129,34 @@ | |||
| 2914 | 129 | } | 129 | } |
| 2915 | 130 | } | 130 | } |
| 2916 | 131 | 131 | ||
| 2918 | 132 | ListItem.Standard { | 132 | SettingsListItems.Standard { |
| 2919 | 133 | id: highVolumeWarning | 133 | id: highVolumeWarning |
| 2920 | 134 | visible: soundActionGroup.highVolume.state == true | 134 | visible: soundActionGroup.highVolume.state == true |
| 2921 | 135 | text: i18n.tr("High volume can damage your hearing.") | 135 | text: i18n.tr("High volume can damage your hearing.") |
| 2922 | 136 | } | 136 | } |
| 2924 | 137 | 137 | ||
| 2925 | 138 | SettingsItemTitle { | 138 | SettingsItemTitle { |
| 2926 | 139 | text: i18n.tr("Phone calls:") | 139 | text: i18n.tr("Phone calls:") |
| 2927 | 140 | } | 140 | } |
| 2928 | 141 | 141 | ||
| 2930 | 142 | ListItem.SingleValue { | 142 | SettingsListItems.SingleValueProgression { |
| 2931 | 143 | text: i18n.tr("Ringtone") | 143 | text: i18n.tr("Ringtone") |
| 2935 | 144 | value: Utilities.buildDisplayName( | 144 | value: Utilities.buildDisplayName(backendInfo.incomingCallSound) |
| 2936 | 145 | backendInfo.incomingCallSound) | 145 | |
| 2934 | 146 | progression: true | ||
| 2937 | 147 | onClicked: pageStack.push( | 146 | onClicked: pageStack.push( |
| 2944 | 148 | Qt.resolvedUrl("SoundsList.qml"), | 147 | Qt.resolvedUrl("SoundsList.qml"), { |
| 2945 | 149 | { title: i18n.tr("Ringtone"), | 148 | title: i18n.tr("Ringtone"), |
| 2946 | 150 | showStopButton: true, | 149 | showStopButton: true, |
| 2947 | 151 | soundType: 0, | 150 | soundType: 0, |
| 2948 | 152 | soundsDir: | 151 | soundsDir: "/usr/share/sounds/ubuntu/ringtones/" |
| 2949 | 153 | "/usr/share/sounds/ubuntu/ringtones/" }) | 152 | } |
| 2950 | 153 | ) | ||
| 2951 | 154 | } | 154 | } |
| 2952 | 155 | 155 | ||
| 2955 | 156 | ListItem.Standard { | 156 | SettingsListItems.Standard { |
| 2956 | 157 | control: CheckBox { | 157 | CheckBox { |
| 2957 | 158 | objectName: "callVibrate" | 158 | objectName: "callVibrate" |
| 2958 | 159 | SlotsLayout.position: SlotsLayout.First | ||
| 2959 | 159 | property bool serverChecked: backendInfo.incomingCallVibrate | 160 | property bool serverChecked: backendInfo.incomingCallVibrate |
| 2960 | 160 | onServerCheckedChanged: checked = serverChecked | 161 | onServerCheckedChanged: checked = serverChecked |
| 2961 | 161 | Component.onCompleted: checked = serverChecked | 162 | Component.onCompleted: checked = serverChecked |
| 2962 | @@ -164,9 +165,10 @@ | |||
| 2963 | 164 | text: i18n.tr("Vibrate on ring") | 165 | text: i18n.tr("Vibrate on ring") |
| 2964 | 165 | } | 166 | } |
| 2965 | 166 | 167 | ||
| 2968 | 167 | ListItem.Standard { | 168 | SettingsListItems.Standard { |
| 2969 | 168 | control: CheckBox { | 169 | CheckBox { |
| 2970 | 169 | objectName: "callVibrateSilentMode" | 170 | objectName: "callVibrateSilentMode" |
| 2971 | 171 | SlotsLayout.position: SlotsLayout.First | ||
| 2972 | 170 | property bool serverChecked: backendInfo.incomingCallVibrateSilentMode | 172 | property bool serverChecked: backendInfo.incomingCallVibrateSilentMode |
| 2973 | 171 | onServerCheckedChanged: checked = serverChecked | 173 | onServerCheckedChanged: checked = serverChecked |
| 2974 | 172 | Component.onCompleted: checked = serverChecked | 174 | Component.onCompleted: checked = serverChecked |
| 2975 | @@ -175,8 +177,8 @@ | |||
| 2976 | 175 | text: i18n.tr("Vibrate in Silent Mode") | 177 | text: i18n.tr("Vibrate in Silent Mode") |
| 2977 | 176 | } | 178 | } |
| 2978 | 177 | 179 | ||
| 2981 | 178 | ListItem.Standard { | 180 | SettingsListItems.Standard { |
| 2982 | 179 | control: Switch { | 181 | Switch { |
| 2983 | 180 | objectName: "dialpadSounds" | 182 | objectName: "dialpadSounds" |
| 2984 | 181 | property bool serverChecked: backendInfo.dialpadSoundsEnabled | 183 | property bool serverChecked: backendInfo.dialpadSoundsEnabled |
| 2985 | 182 | onServerCheckedChanged: checked = serverChecked | 184 | onServerCheckedChanged: checked = serverChecked |
| 2986 | @@ -195,11 +197,10 @@ | |||
| 2987 | 195 | text: i18n.tr("Messages:") | 197 | text: i18n.tr("Messages:") |
| 2988 | 196 | } | 198 | } |
| 2989 | 197 | 199 | ||
| 2991 | 198 | ListItem.SingleValue { | 200 | SettingsListItems.SingleValueProgression { |
| 2992 | 199 | text: i18n.tr("Message received") | 201 | text: i18n.tr("Message received") |
| 2993 | 200 | value:Utilities.buildDisplayName( | 202 | value:Utilities.buildDisplayName( |
| 2994 | 201 | backendInfo.incomingMessageSound) | 203 | backendInfo.incomingMessageSound) |
| 2995 | 202 | progression: true | ||
| 2996 | 203 | onClicked: pageStack.push( | 204 | onClicked: pageStack.push( |
| 2997 | 204 | Qt.resolvedUrl("SoundsList.qml"), | 205 | Qt.resolvedUrl("SoundsList.qml"), |
| 2998 | 205 | { title: i18n.tr("Message received"), | 206 | { title: i18n.tr("Message received"), |
| 2999 | @@ -208,9 +209,10 @@ | |||
| 3000 | 208 | "/usr/share/sounds/ubuntu/notifications/" }) | 209 | "/usr/share/sounds/ubuntu/notifications/" }) |
| 3001 | 209 | } | 210 | } |
| 3002 | 210 | 211 | ||
| 3005 | 211 | ListItem.Standard { | 212 | SettingsListItems.Standard { |
| 3006 | 212 | control: CheckBox { | 213 | CheckBox { |
| 3007 | 213 | objectName: "messageVibrate" | 214 | objectName: "messageVibrate" |
| 3008 | 215 | SlotsLayout.position: SlotsLayout.First | ||
| 3009 | 214 | property bool serverChecked: backendInfo.incomingMessageVibrate | 216 | property bool serverChecked: backendInfo.incomingMessageVibrate |
| 3010 | 215 | onServerCheckedChanged: checked = serverChecked | 217 | onServerCheckedChanged: checked = serverChecked |
| 3011 | 216 | Component.onCompleted: checked = serverChecked | 218 | Component.onCompleted: checked = serverChecked |
| 3012 | @@ -219,9 +221,10 @@ | |||
| 3013 | 219 | text: i18n.tr("Vibrate with message sound") | 221 | text: i18n.tr("Vibrate with message sound") |
| 3014 | 220 | } | 222 | } |
| 3015 | 221 | 223 | ||
| 3018 | 222 | ListItem.Standard { | 224 | SettingsListItems.Standard { |
| 3019 | 223 | control: CheckBox { | 225 | CheckBox { |
| 3020 | 224 | objectName: "messageVibrateSilentMode" | 226 | objectName: "messageVibrateSilentMode" |
| 3021 | 227 | SlotsLayout.position: SlotsLayout.First | ||
| 3022 | 225 | property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode | 228 | property bool serverChecked: backendInfo.incomingMessageVibrateSilentMode |
| 3023 | 226 | onServerCheckedChanged: checked = serverChecked | 229 | onServerCheckedChanged: checked = serverChecked |
| 3024 | 227 | Component.onCompleted: checked = serverChecked | 230 | Component.onCompleted: checked = serverChecked |
| 3025 | @@ -235,10 +238,10 @@ | |||
| 3026 | 235 | text: i18n.tr("Other sounds:") | 238 | text: i18n.tr("Other sounds:") |
| 3027 | 236 | } | 239 | } |
| 3028 | 237 | 240 | ||
| 3030 | 238 | ListItem.Standard { | 241 | SettingsListItems.Standard { |
| 3031 | 239 | text: i18n.tr("Keyboard sound") | 242 | text: i18n.tr("Keyboard sound") |
| 3032 | 240 | 243 | ||
| 3034 | 241 | control: Switch { | 244 | Switch { |
| 3035 | 242 | objectName: "keyboardSoundSwitch" | 245 | objectName: "keyboardSoundSwitch" |
| 3036 | 243 | property bool serverChecked: keyboardSettings.keyPressFeedback | 246 | property bool serverChecked: keyboardSettings.keyPressFeedback |
| 3037 | 244 | onServerCheckedChanged: checked = serverChecked | 247 | onServerCheckedChanged: checked = serverChecked |
| 3038 | @@ -247,20 +250,25 @@ | |||
| 3039 | 247 | } | 250 | } |
| 3040 | 248 | } | 251 | } |
| 3041 | 249 | 252 | ||
| 3043 | 250 | ListItem.Standard { | 253 | SettingsListItems.Standard { |
| 3044 | 251 | id: lockSound | 254 | id: lockSound |
| 3046 | 252 | control: Switch { | 255 | |
| 3047 | 256 | Switch { | ||
| 3048 | 253 | checked: false | 257 | checked: false |
| 3049 | 254 | } | 258 | } |
| 3050 | 255 | text: i18n.tr("Lock sound") | 259 | text: i18n.tr("Lock sound") |
| 3051 | 256 | visible: showAllUI | 260 | visible: showAllUI |
| 3052 | 257 | } | 261 | } |
| 3053 | 258 | 262 | ||
| 3055 | 259 | ListItem.Divider {} | 263 | /* Add some artificial spacing here, once we update the QtQuick.Layouts plugin |
| 3056 | 264 | * to 1.3 we can replace this with Layout.bottomMargin(units.gu(2)) | ||
| 3057 | 265 | */ | ||
| 3058 | 266 | Item { height: 1; width: 1 } | ||
| 3059 | 260 | 267 | ||
| 3061 | 261 | ListItem.Standard { | 268 | SettingsListItems.Standard { |
| 3062 | 262 | text: i18n.tr("Other vibrations") | 269 | text: i18n.tr("Other vibrations") |
| 3064 | 263 | control: Switch { | 270 | |
| 3065 | 271 | Switch { | ||
| 3066 | 264 | objectName: "otherVibrateSwitch" | 272 | objectName: "otherVibrateSwitch" |
| 3067 | 265 | property bool serverChecked: backendInfo.otherVibrate | 273 | property bool serverChecked: backendInfo.otherVibrate |
| 3068 | 266 | onServerCheckedChanged: checked = serverChecked | 274 | onServerCheckedChanged: checked = serverChecked |
| 3069 | 267 | 275 | ||
| 3070 | === modified file 'plugins/system-update/EntryComponent.qml' | |||
| 3071 | --- plugins/system-update/EntryComponent.qml 2015-08-10 13:31:45 +0000 | |||
| 3072 | +++ plugins/system-update/EntryComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 3073 | @@ -1,7 +1,7 @@ | |||
| 3074 | 1 | /* | 1 | /* |
| 3075 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 3076 | 3 | * | 3 | * |
| 3078 | 4 | * Copyright (C) 2014 Canonical Ltd. | 4 | * Copyright (C) 2014-2016 Canonical Ltd. |
| 3079 | 5 | * | 5 | * |
| 3080 | 6 | * Contact: Diego Sarmentero <diego.sarmentero@canonical.com> | 6 | * Contact: Diego Sarmentero <diego.sarmentero@canonical.com> |
| 3081 | 7 | * | 7 | * |
| 3082 | @@ -20,19 +20,28 @@ | |||
| 3083 | 20 | 20 | ||
| 3084 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3085 | 22 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 3086 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3087 | 24 | import Ubuntu.SystemSettings.Update 1.0 | 23 | import Ubuntu.SystemSettings.Update 1.0 |
| 3088 | 25 | 24 | ||
| 3090 | 26 | ListItem.SingleValue { | 25 | ListItem { |
| 3091 | 27 | id: root | 26 | id: root |
| 3092 | 28 | text: i18n.tr(model.displayName) | ||
| 3093 | 29 | objectName: "entryComponent-updates" | 27 | objectName: "entryComponent-updates" |
| 3094 | 30 | iconSource: Qt.resolvedUrl(model.icon) | ||
| 3095 | 31 | iconFrame: false | ||
| 3096 | 32 | progression: true | ||
| 3097 | 33 | value: updatesAvailable > 0 ? updatesAvailable : "" | ||
| 3098 | 34 | |||
| 3099 | 35 | property int updatesAvailable: 0 | 28 | property int updatesAvailable: 0 |
| 3100 | 29 | height: layout.height | ||
| 3101 | 30 | |||
| 3102 | 31 | ListItemLayout { | ||
| 3103 | 32 | id: layout | ||
| 3104 | 33 | title.text: i18n.tr(model.displayName) | ||
| 3105 | 34 | Icon { | ||
| 3106 | 35 | SlotsLayout.position: SlotsLayout.Leading; | ||
| 3107 | 36 | SlotsLayout.padding { top: 0; bottom: 0 } | ||
| 3108 | 37 | source: model.icon | ||
| 3109 | 38 | height: units.gu(5) | ||
| 3110 | 39 | } | ||
| 3111 | 40 | Label { | ||
| 3112 | 41 | text: updatesAvailable > 0 ? updatesAvailable : "" | ||
| 3113 | 42 | } | ||
| 3114 | 43 | ProgressionSlot {} | ||
| 3115 | 44 | } | ||
| 3116 | 36 | 45 | ||
| 3117 | 37 | function _updatesRefresh() { | 46 | function _updatesRefresh() { |
| 3118 | 38 | var _updatesAvailable = 0; | 47 | var _updatesAvailable = 0; |
| 3119 | 39 | 48 | ||
| 3120 | === modified file 'plugins/time-date/ChooseTimeZone.qml' | |||
| 3121 | --- plugins/time-date/ChooseTimeZone.qml 2016-04-05 19:07:33 +0000 | |||
| 3122 | +++ plugins/time-date/ChooseTimeZone.qml 2016-07-22 14:36:34 +0000 | |||
| 3123 | @@ -1,7 +1,7 @@ | |||
| 3124 | 1 | /* | 1 | /* |
| 3125 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 3126 | 3 | * | 3 | * |
| 3128 | 4 | * Copyright (C) 2013-2014 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 3129 | 5 | * | 5 | * |
| 3130 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 3131 | 7 | * | 7 | * |
| 3132 | @@ -20,6 +20,7 @@ | |||
| 3133 | 20 | 20 | ||
| 3134 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3135 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 3136 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3137 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 3138 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem |
| 3139 | 25 | import Ubuntu.SystemSettings.TimeDate 1.1 | 26 | import Ubuntu.SystemSettings.TimeDate 1.1 |
| 3140 | @@ -52,7 +53,7 @@ | |||
| 3141 | 52 | visible: showAllUI | 53 | visible: showAllUI |
| 3142 | 53 | } | 54 | } |
| 3143 | 54 | 55 | ||
| 3145 | 55 | ListItem.Standard { | 56 | SettingsListItems.Standard { |
| 3146 | 56 | anchors.top: setTimeZoneSelector.bottom | 57 | anchors.top: setTimeZoneSelector.bottom |
| 3147 | 57 | text: timeDatePanel.timeZoneName | 58 | text: timeDatePanel.timeZoneName |
| 3148 | 58 | enabled: false | 59 | enabled: false |
| 3149 | @@ -96,7 +97,7 @@ | |||
| 3150 | 96 | 97 | ||
| 3151 | 97 | model: timeDatePanel.timeZoneModel | 98 | model: timeDatePanel.timeZoneModel |
| 3152 | 98 | visible: setTimeZoneSelector.selectedIndex == 1 && count > 0 | 99 | visible: setTimeZoneSelector.selectedIndex == 1 && count > 0 |
| 3154 | 99 | delegate: ListItem.Standard { | 100 | delegate: SettingsListItems.Standard { |
| 3155 | 100 | text: displayName | 101 | text: displayName |
| 3156 | 101 | // If a timezone is manually selected, record which one so that | 102 | // If a timezone is manually selected, record which one so that |
| 3157 | 102 | // we highlight that one only. Usually all cities in that timezone | 103 | // we highlight that one only. Usually all cities in that timezone |
| 3158 | 103 | 104 | ||
| 3159 | === modified file 'plugins/time-date/PageComponent.qml' | |||
| 3160 | --- plugins/time-date/PageComponent.qml 2016-04-05 19:07:33 +0000 | |||
| 3161 | +++ plugins/time-date/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 3162 | @@ -1,7 +1,7 @@ | |||
| 3163 | 1 | /* | 1 | /* |
| 3164 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 3165 | 3 | * | 3 | * |
| 3167 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 3168 | 5 | * | 5 | * |
| 3169 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 3170 | 7 | * | 7 | * |
| 3171 | @@ -20,8 +20,9 @@ | |||
| 3172 | 20 | 20 | ||
| 3173 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3174 | 22 | import SystemSettings 1.0 | 22 | import SystemSettings 1.0 |
| 3175 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3176 | 23 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 3178 | 24 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 3179 | 25 | import Ubuntu.Components.Popups 1.3 | 26 | import Ubuntu.Components.Popups 1.3 |
| 3180 | 26 | import Ubuntu.SystemSettings.TimeDate 1.1 | 27 | import Ubuntu.SystemSettings.TimeDate 1.1 |
| 3181 | 27 | 28 | ||
| 3182 | @@ -62,12 +63,11 @@ | |||
| 3183 | 62 | 63 | ||
| 3184 | 63 | SettingsItemTitle { text: i18n.tr ("Time zone:") } | 64 | SettingsItemTitle { text: i18n.tr ("Time zone:") } |
| 3185 | 64 | 65 | ||
| 3187 | 65 | ListItem.SingleValue { | 66 | SettingsListItems.SingleValueProgression { |
| 3188 | 66 | objectName: "timeZone" | 67 | objectName: "timeZone" |
| 3189 | 67 | id: timeZone | 68 | id: timeZone |
| 3190 | 68 | text: timeDatePanel.timeZoneName | 69 | text: timeDatePanel.timeZoneName |
| 3191 | 69 | value: getUTCOffset() | 70 | value: getUTCOffset() |
| 3192 | 70 | progression: true | ||
| 3193 | 71 | onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"), { | 71 | onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"), { |
| 3194 | 72 | timeDatePanel: timeDatePanel | 72 | timeDatePanel: timeDatePanel |
| 3195 | 73 | }) | 73 | }) |
| 3196 | @@ -77,7 +77,7 @@ | |||
| 3197 | 77 | text: i18n.tr ("Set the time and date:") | 77 | text: i18n.tr ("Set the time and date:") |
| 3198 | 78 | } | 78 | } |
| 3199 | 79 | 79 | ||
| 3201 | 80 | ListItem.ItemSelector { | 80 | ListItems.ItemSelector { |
| 3202 | 81 | id: setTimeAutomatically | 81 | id: setTimeAutomatically |
| 3203 | 82 | objectName: "timeItemSelector" | 82 | objectName: "timeItemSelector" |
| 3204 | 83 | model: [ i18n.tr("Automatically") , i18n.tr("Manually")] | 83 | model: [ i18n.tr("Automatically") , i18n.tr("Manually")] |
| 3205 | @@ -108,11 +108,11 @@ | |||
| 3206 | 108 | TimePicker {} | 108 | TimePicker {} |
| 3207 | 109 | } | 109 | } |
| 3208 | 110 | 110 | ||
| 3210 | 111 | ListItem.Standard { | 111 | SettingsListItems.StandardProgression { |
| 3211 | 112 | id: currentTime | 112 | id: currentTime |
| 3212 | 113 | objectName: "currentTime" | 113 | objectName: "currentTime" |
| 3215 | 114 | progression: setTimeAutomatically.selectedIndex === 1 // Manually | 114 | progressionVisible: setTimeAutomatically.selectedIndex === 1 // Manually |
| 3216 | 115 | enabled: progression | 115 | enabled: progressionVisible |
| 3217 | 116 | onClicked: { | 116 | onClicked: { |
| 3218 | 117 | Qt.inputMethod.hide() | 117 | Qt.inputMethod.hide() |
| 3219 | 118 | var popupObj = PopupUtils.open(timePicker); | 118 | var popupObj = PopupUtils.open(timePicker); |
| 3220 | 119 | 119 | ||
| 3221 | === modified file 'plugins/time-date/Scroller.qml' | |||
| 3222 | --- plugins/time-date/Scroller.qml 2015-08-10 13:31:45 +0000 | |||
| 3223 | +++ plugins/time-date/Scroller.qml 2016-07-22 14:36:34 +0000 | |||
| 3224 | @@ -1,7 +1,8 @@ | |||
| 3225 | 1 | /* | 1 | /* |
| 3226 | 2 | * Copyright (C) 2013 Michael Zanetti <michael_zanetti@gmx.net> | 2 | * Copyright (C) 2013 Michael Zanetti <michael_zanetti@gmx.net> |
| 3229 | 3 | * (C) 2013 Canonical Ltd | 3 | * (C) 2013-2016 Canonical Ltd |
| 3230 | 4 | * Canonical modifications by Iain Lane <iain.lane@canonical.com> | 4 | * Canonical modifications by Iain Lane <iain.lane@canonical.com>, |
| 3231 | 5 | * Jonas G. Drange <jonas.drange@canonical.com> | ||
| 3232 | 5 | * | 6 | * |
| 3233 | 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 |
| 3234 | 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 |
| 3235 | @@ -17,6 +18,7 @@ | |||
| 3236 | 17 | */ | 18 | */ |
| 3237 | 18 | 19 | ||
| 3238 | 19 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3239 | 21 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3240 | 20 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 3241 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems | 23 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 3242 | 22 | 24 | ||
| 3243 | @@ -106,13 +108,10 @@ | |||
| 3244 | 106 | preferredHighlightEnd: 0.5 | 108 | preferredHighlightEnd: 0.5 |
| 3245 | 107 | clip: true | 109 | clip: true |
| 3246 | 108 | 110 | ||
| 3248 | 109 | delegate: ListItems.Standard { | 111 | delegate: SettingsListItems.Standard { |
| 3249 | 110 | width: parent.width | 112 | width: parent.width |
| 3250 | 111 | highlightWhenPressed: false | 113 | highlightWhenPressed: false |
| 3255 | 112 | Label { | 114 | text: modelData |
| 3252 | 113 | anchors.centerIn: parent | ||
| 3253 | 114 | text: modelData | ||
| 3254 | 115 | } | ||
| 3256 | 116 | showDivider: false | 115 | showDivider: false |
| 3257 | 117 | onClicked: listView.currentIndex = index | 116 | onClicked: listView.currentIndex = index |
| 3258 | 118 | } | 117 | } |
| 3259 | 119 | 118 | ||
| 3260 | === modified file 'plugins/time-date/TimePicker.qml' | |||
| 3261 | --- plugins/time-date/TimePicker.qml 2015-08-10 13:31:45 +0000 | |||
| 3262 | +++ plugins/time-date/TimePicker.qml 2016-07-22 14:36:34 +0000 | |||
| 3263 | @@ -1,6 +1,6 @@ | |||
| 3264 | 1 | /* | 1 | /* |
| 3265 | 2 | * Copyright (C) 2013 Michael Zanetti <michael_zanetti@gmx.net> | 2 | * Copyright (C) 2013 Michael Zanetti <michael_zanetti@gmx.net> |
| 3267 | 3 | * 2013 Canonical Ltd | 3 | * 2013-2016 Canonical Ltd |
| 3268 | 4 | * Canonical modifications by Iain Lane <iain.lane@canonical.com> | 4 | * Canonical modifications by Iain Lane <iain.lane@canonical.com> |
| 3269 | 5 | * | 5 | * |
| 3270 | 6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 3271 | @@ -18,7 +18,6 @@ | |||
| 3272 | 18 | 18 | ||
| 3273 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
| 3274 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 3275 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3276 | 22 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
| 3277 | 23 | 22 | ||
| 3278 | 24 | Dialog { | 23 | Dialog { |
| 3279 | 25 | 24 | ||
| 3280 | === modified file 'plugins/time-date/settings-time-date.svg' | |||
| 3281 | --- plugins/time-date/settings-time-date.svg 2013-06-28 15:20:36 +0000 | |||
| 3282 | +++ plugins/time-date/settings-time-date.svg 2016-07-22 14:36:34 +0000 | |||
| 3283 | @@ -9,14 +9,15 @@ | |||
| 3284 | 9 | xmlns="http://www.w3.org/2000/svg" | 9 | xmlns="http://www.w3.org/2000/svg" |
| 3285 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 3286 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 3290 | 12 | width="90" | 12 | width="96" |
| 3291 | 13 | height="90" | 13 | height="96" |
| 3292 | 14 | id="svg3180" | 14 | id="svg4874" |
| 3293 | 15 | version="1.1" | 15 | version="1.1" |
| 3296 | 16 | inkscape:version="0.48+devel r12322" | 16 | inkscape:version="0.91+devel r" |
| 3297 | 17 | sodipodi:docname="setting-time-date.svg"> | 17 | viewBox="0 0 96 96.000001" |
| 3298 | 18 | sodipodi:docname="calendar.svg"> | ||
| 3299 | 18 | <defs | 19 | <defs |
| 3301 | 19 | id="defs3182" /> | 20 | id="defs4876" /> |
| 3302 | 20 | <sodipodi:namedview | 21 | <sodipodi:namedview |
| 3303 | 21 | id="base" | 22 | id="base" |
| 3304 | 22 | pagecolor="#ffffff" | 23 | pagecolor="#ffffff" |
| 3305 | @@ -24,18 +25,95 @@ | |||
| 3306 | 24 | borderopacity="1.0" | 25 | borderopacity="1.0" |
| 3307 | 25 | inkscape:pageopacity="0.0" | 26 | inkscape:pageopacity="0.0" |
| 3308 | 26 | inkscape:pageshadow="2" | 27 | inkscape:pageshadow="2" |
| 3312 | 27 | inkscape:zoom="5.0931703" | 28 | inkscape:zoom="7.0249991" |
| 3313 | 28 | inkscape:cx="45.796623" | 29 | inkscape:cx="-11.409258" |
| 3314 | 29 | inkscape:cy="25.966145" | 30 | inkscape:cy="72.576504" |
| 3315 | 30 | inkscape:document-units="px" | 31 | inkscape:document-units="px" |
| 3318 | 31 | inkscape:current-layer="g3855" | 32 | inkscape:current-layer="g4780" |
| 3319 | 32 | showgrid="false" | 33 | showgrid="true" |
| 3320 | 34 | showborder="true" | ||
| 3321 | 33 | fit-margin-top="0" | 35 | fit-margin-top="0" |
| 3322 | 34 | fit-margin-left="0" | 36 | fit-margin-left="0" |
| 3323 | 35 | fit-margin-right="0" | 37 | fit-margin-right="0" |
| 3325 | 36 | fit-margin-bottom="0" /> | 38 | fit-margin-bottom="0" |
| 3326 | 39 | inkscape:snap-bbox="true" | ||
| 3327 | 40 | inkscape:bbox-paths="true" | ||
| 3328 | 41 | inkscape:bbox-nodes="true" | ||
| 3329 | 42 | inkscape:snap-bbox-edge-midpoints="true" | ||
| 3330 | 43 | inkscape:snap-bbox-midpoints="true" | ||
| 3331 | 44 | inkscape:object-paths="true" | ||
| 3332 | 45 | inkscape:snap-intersection-paths="true" | ||
| 3333 | 46 | inkscape:object-nodes="true" | ||
| 3334 | 47 | inkscape:snap-smooth-nodes="true" | ||
| 3335 | 48 | inkscape:snap-midpoints="true" | ||
| 3336 | 49 | inkscape:snap-object-midpoints="true" | ||
| 3337 | 50 | inkscape:snap-center="true" | ||
| 3338 | 51 | showguides="true" | ||
| 3339 | 52 | inkscape:guide-bbox="true" | ||
| 3340 | 53 | inkscape:snap-global="true"> | ||
| 3341 | 54 | <inkscape:grid | ||
| 3342 | 55 | type="xygrid" | ||
| 3343 | 56 | id="grid5451" | ||
| 3344 | 57 | empspacing="8" /> | ||
| 3345 | 58 | <sodipodi:guide | ||
| 3346 | 59 | orientation="1,0" | ||
| 3347 | 60 | position="8,-8.0000001" | ||
| 3348 | 61 | id="guide4063" /> | ||
| 3349 | 62 | <sodipodi:guide | ||
| 3350 | 63 | orientation="1,0" | ||
| 3351 | 64 | position="4,-8.0000001" | ||
| 3352 | 65 | id="guide4065" /> | ||
| 3353 | 66 | <sodipodi:guide | ||
| 3354 | 67 | orientation="0,1" | ||
| 3355 | 68 | position="-8,88.000001" | ||
| 3356 | 69 | id="guide4067" /> | ||
| 3357 | 70 | <sodipodi:guide | ||
| 3358 | 71 | orientation="0,1" | ||
| 3359 | 72 | position="-8,92.000001" | ||
| 3360 | 73 | id="guide4069" /> | ||
| 3361 | 74 | <sodipodi:guide | ||
| 3362 | 75 | orientation="0,1" | ||
| 3363 | 76 | position="104,4" | ||
| 3364 | 77 | id="guide4071" /> | ||
| 3365 | 78 | <sodipodi:guide | ||
| 3366 | 79 | orientation="0,1" | ||
| 3367 | 80 | position="-5,8.0000001" | ||
| 3368 | 81 | id="guide4073" /> | ||
| 3369 | 82 | <sodipodi:guide | ||
| 3370 | 83 | orientation="1,0" | ||
| 3371 | 84 | position="92,-8.0000001" | ||
| 3372 | 85 | id="guide4075" /> | ||
| 3373 | 86 | <sodipodi:guide | ||
| 3374 | 87 | orientation="1,0" | ||
| 3375 | 88 | position="88,-8.0000001" | ||
| 3376 | 89 | id="guide4077" /> | ||
| 3377 | 90 | <sodipodi:guide | ||
| 3378 | 91 | orientation="0,1" | ||
| 3379 | 92 | position="-8,84.000001" | ||
| 3380 | 93 | id="guide4074" /> | ||
| 3381 | 94 | <sodipodi:guide | ||
| 3382 | 95 | orientation="1,0" | ||
| 3383 | 96 | position="12,-8.0000001" | ||
| 3384 | 97 | id="guide4076" /> | ||
| 3385 | 98 | <sodipodi:guide | ||
| 3386 | 99 | orientation="0,1" | ||
| 3387 | 100 | position="-5,12" | ||
| 3388 | 101 | id="guide4078" /> | ||
| 3389 | 102 | <sodipodi:guide | ||
| 3390 | 103 | orientation="1,0" | ||
| 3391 | 104 | position="84,-9.0000001" | ||
| 3392 | 105 | id="guide4080" /> | ||
| 3393 | 106 | <sodipodi:guide | ||
| 3394 | 107 | position="48,-8.0000001" | ||
| 3395 | 108 | orientation="1,0" | ||
| 3396 | 109 | id="guide4170" /> | ||
| 3397 | 110 | <sodipodi:guide | ||
| 3398 | 111 | position="-8,48" | ||
| 3399 | 112 | orientation="0,1" | ||
| 3400 | 113 | id="guide4172" /> | ||
| 3401 | 114 | </sodipodi:namedview> | ||
| 3402 | 37 | <metadata | 115 | <metadata |
| 3404 | 38 | id="metadata3185"> | 116 | id="metadata4879"> |
| 3405 | 39 | <rdf:RDF> | 117 | <rdf:RDF> |
| 3406 | 40 | <cc:Work | 118 | <cc:Work |
| 3407 | 41 | rdf:about=""> | 119 | rdf:about=""> |
| 3408 | @@ -50,49 +128,55 @@ | |||
| 3409 | 50 | inkscape:label="Layer 1" | 128 | inkscape:label="Layer 1" |
| 3410 | 51 | inkscape:groupmode="layer" | 129 | inkscape:groupmode="layer" |
| 3411 | 52 | id="layer1" | 130 | id="layer1" |
| 3413 | 53 | transform="translate(456.42857,-738.79075)"> | 131 | transform="translate(67.857146,-78.50504)"> |
| 3414 | 54 | <g | 132 | <g |
| 3456 | 55 | transform="translate(-2258.4286,438.42854)" | 133 | transform="matrix(0,-1,-1,0,373.50506,516.50504)" |
| 3457 | 56 | id="g3855"> | 134 | id="g4845" |
| 3458 | 57 | <rect | 135 | style="display:inline"> |
| 3459 | 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 |
| 3460 | 59 | id="rect3508" | 137 | inkscape:export-ydpi="90" |
| 3461 | 60 | width="90" | 138 | inkscape:export-xdpi="90" |
| 3462 | 61 | height="90" | 139 | inkscape:export-filename="next01.png" |
| 3463 | 62 | x="1802" | 140 | transform="matrix(-0.9996045,0,0,1,575.94296,-611.00001)" |
| 3464 | 63 | y="300.36221" /> | 141 | id="g4778" |
| 3465 | 64 | <path | 142 | inkscape:label="Layer 1"> |
| 3466 | 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 |
| 3467 | 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)" |
| 3468 | 67 | transform="translate(1802,300.36221)" | 145 | id="g4780" |
| 3469 | 68 | id="path3510" /> | 146 | style="display:inline"> |
| 3470 | 69 | <path | 147 | <rect |
| 3471 | 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" |
| 3472 | 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" |
| 3473 | 72 | transform="translate(1802,300.36221)" | 150 | width="96.037987" |
| 3474 | 73 | id="path3512" /> | 151 | height="96" |
| 3475 | 74 | <path | 152 | x="-438.00244" |
| 3476 | 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" |
| 3477 | 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)" /> |
| 3478 | 77 | id="path3516" | 155 | <g |
| 3479 | 78 | inkscape:connector-curvature="0" /> | 156 | transform="matrix(0,-0.99980223,-1.0001978,0,0,0)" |
| 3480 | 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" |
| 3481 | 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"> |
| 3482 | 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 |
| 3483 | 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" |
| 3484 | 83 | inkscape:connector-curvature="0" /> | 161 | style="" |
| 3485 | 84 | <path | 162 | id="path4162" /> |
| 3486 | 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 |
| 3487 | 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" |
| 3488 | 87 | transform="translate(1802,300.36221)" | 165 | style="" |
| 3489 | 88 | id="path3520" /> | 166 | id="path4164" /> |
| 3490 | 89 | <rect | 167 | </g> |
| 3491 | 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 |
| 3492 | 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" |
| 3493 | 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 " |
| 3494 | 93 | height="6" | 171 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" |
| 3495 | 94 | x="1857" | 172 | id="path4410" /> |
| 3496 | 95 | y="360.36221" /> | 173 | <path |
| 3497 | 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" | ||
| 3498 | 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 " | ||
| 3499 | 176 | transform="matrix(0,-1,-1.0003957,0,438.00245,441.36222)" | ||
| 3500 | 177 | id="path4430" /> | ||
| 3501 | 178 | </g> | ||
| 3502 | 179 | </g> | ||
| 3503 | 96 | </g> | 180 | </g> |
| 3504 | 97 | </g> | 181 | </g> |
| 3505 | 98 | </svg> | 182 | </svg> |
| 3506 | 99 | 183 | ||
| 3507 | === modified file 'plugins/wifi/AccessPoint.qml' | |||
| 3508 | --- plugins/wifi/AccessPoint.qml 2015-08-10 13:31:45 +0000 | |||
| 3509 | +++ plugins/wifi/AccessPoint.qml 2016-07-22 14:36:34 +0000 | |||
| 3510 | @@ -1,5 +1,5 @@ | |||
| 3511 | 1 | /* | 1 | /* |
| 3513 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3514 | 3 | * | 3 | * |
| 3515 | 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 |
| 3516 | 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 |
| 3517 | @@ -28,19 +28,6 @@ | |||
| 3518 | 28 | property bool secure: false | 28 | property bool secure: false |
| 3519 | 29 | property bool adHoc: false | 29 | property bool adHoc: false |
| 3520 | 30 | property int signalStrength: 0 | 30 | property int signalStrength: 0 |
| 3521 | 31 | |||
| 3522 | 32 | signal activate() | ||
| 3523 | 33 | |||
| 3524 | 34 | onCheckedChanged: { | ||
| 3525 | 35 | // Can't rely on binding. Checked is assigned on click. | ||
| 3526 | 36 | checkBoxActive.checked = checked; | ||
| 3527 | 37 | |||
| 3528 | 38 | // if stack has NetworkDetailsBrief, pop it | ||
| 3529 | 39 | if (pageStack.depth === 3) { | ||
| 3530 | 40 | pageStack.pop(); | ||
| 3531 | 41 | } | ||
| 3532 | 42 | } | ||
| 3533 | 43 | |||
| 3534 | 44 | iconName: { | 31 | iconName: { |
| 3535 | 45 | var imageName = "nm-signal-100" | 32 | var imageName = "nm-signal-100" |
| 3536 | 46 | 33 | ||
| 3537 | @@ -61,16 +48,18 @@ | |||
| 3538 | 61 | } | 48 | } |
| 3539 | 62 | return imageName; | 49 | return imageName; |
| 3540 | 63 | } | 50 | } |
| 3548 | 64 | 51 | layout.subtitle.text: checked ? i18n.tr("Connected") : "" | |
| 3549 | 65 | iconFrame: false | 52 | |
| 3550 | 66 | control: CheckBox { | 53 | signal activate() |
| 3551 | 67 | id: checkBoxActive | 54 | |
| 3552 | 68 | 55 | onCheckedChanged: { | |
| 3553 | 69 | onClicked: { | 56 | // if stack has NetworkDetailsBrief, pop it |
| 3554 | 70 | accessPoint.activate(); | 57 | if (pageStack.depth === 3) { |
| 3555 | 58 | pageStack.pop(); | ||
| 3556 | 71 | } | 59 | } |
| 3557 | 72 | } | 60 | } |
| 3559 | 73 | progression: checked | 61 | |
| 3560 | 62 | progressionVisible: checked | ||
| 3561 | 74 | onClicked: { | 63 | onClicked: { |
| 3562 | 75 | if (checked) { | 64 | if (checked) { |
| 3563 | 76 | pageStack.push(Qt.resolvedUrl("NetworkDetailsBrief.qml"), | 65 | pageStack.push(Qt.resolvedUrl("NetworkDetailsBrief.qml"), |
| 3564 | 77 | 66 | ||
| 3565 | === modified file 'plugins/wifi/DivMenuItem.qml' | |||
| 3566 | --- plugins/wifi/DivMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3567 | +++ plugins/wifi/DivMenuItem.qml 2016-07-22 14:36:34 +0000 | |||
| 3568 | @@ -1,5 +1,5 @@ | |||
| 3569 | 1 | /* | 1 | /* |
| 3571 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3572 | 3 | * | 3 | * |
| 3573 | 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 |
| 3574 | 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 |
| 3575 | @@ -18,8 +18,8 @@ | |||
| 3576 | 18 | */ | 18 | */ |
| 3577 | 19 | 19 | ||
| 3578 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3580 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components 1.3 |
| 3581 | 22 | 22 | ||
| 3583 | 23 | ListItem.Empty { | 23 | ListItemLayout { |
| 3584 | 24 | height: units.gu(3) | 24 | height: units.gu(3) |
| 3585 | 25 | } | 25 | } |
| 3586 | 26 | 26 | ||
| 3587 | === modified file 'plugins/wifi/FramedMenuItem.qml' | |||
| 3588 | --- plugins/wifi/FramedMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 3589 | +++ plugins/wifi/FramedMenuItem.qml 2016-07-22 14:36:34 +0000 | |||
| 3590 | @@ -1,5 +1,5 @@ | |||
| 3591 | 1 | /* | 1 | /* |
| 3593 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3594 | 3 | * | 3 | * |
| 3595 | 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 |
| 3596 | 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 |
| 3597 | @@ -19,7 +19,11 @@ | |||
| 3598 | 19 | */ | 19 | */ |
| 3599 | 20 | 20 | ||
| 3600 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3601 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3602 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 3603 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3604 | 24 | 24 | ||
| 3606 | 25 | ListItem.Standard {} | 25 | SettingsListItems.IconProgression { |
| 3607 | 26 | // FIXME: use padding + padding + icon width | ||
| 3608 | 27 | divider.anchors.leftMargin: units.gu(6) | ||
| 3609 | 28 | layout.subtitle.color: UbuntuColors.green | ||
| 3610 | 29 | } | ||
| 3611 | 26 | 30 | ||
| 3612 | === modified file 'plugins/wifi/MenuItemFactory.qml' | |||
| 3613 | --- plugins/wifi/MenuItemFactory.qml 2015-08-10 13:31:45 +0000 | |||
| 3614 | +++ plugins/wifi/MenuItemFactory.qml 2016-07-22 14:36:34 +0000 | |||
| 3615 | @@ -1,5 +1,5 @@ | |||
| 3616 | 1 | /* | 1 | /* |
| 3618 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3619 | 3 | * | 3 | * |
| 3620 | 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 |
| 3621 | 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 |
| 3622 | @@ -15,7 +15,7 @@ | |||
| 3623 | 15 | * | 15 | * |
| 3624 | 16 | * Authors: | 16 | * Authors: |
| 3625 | 17 | * Nick Dedekind <nick.dedekind@canonical.com> | 17 | * Nick Dedekind <nick.dedekind@canonical.com> |
| 3627 | 18 | */ | 18 | */ |
| 3628 | 19 | 19 | ||
| 3629 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 3630 | 21 | import QMenuModel 0.1 as QMenuModel | 21 | import QMenuModel 0.1 as QMenuModel |
| 3631 | @@ -65,7 +65,7 @@ | |||
| 3632 | 65 | property int menuIndex: -1 | 65 | property int menuIndex: -1 |
| 3633 | 66 | 66 | ||
| 3634 | 67 | text: menu && menu.label ? menu.label : "" | 67 | text: menu && menu.label ? menu.label : "" |
| 3636 | 68 | icon: menu ? menu.icon : "" | 68 | iconName: menu ? menu.icon : "" |
| 3637 | 69 | checkable: menu ? (menu.isCheck || menu.isRadio) : false | 69 | checkable: menu ? (menu.isCheck || menu.isRadio) : false |
| 3638 | 70 | checked: checkable ? menu.isToggled : false | 70 | checked: checkable ? menu.isToggled : false |
| 3639 | 71 | enabled: menu ? menu.sensitive : false | 71 | enabled: menu ? menu.sensitive : false |
| 3640 | @@ -150,7 +150,7 @@ | |||
| 3641 | 150 | loadAttributes(); | 150 | loadAttributes(); |
| 3642 | 151 | } | 151 | } |
| 3643 | 152 | 152 | ||
| 3645 | 153 | USC.ServerPropertySynchroniser { | 153 | resources: USC.ServerPropertySynchroniser { |
| 3646 | 154 | userTarget: apItem | 154 | userTarget: apItem |
| 3647 | 155 | userProperty: "active" | 155 | userProperty: "active" |
| 3648 | 156 | userTrigger: "onActivate" | 156 | userTrigger: "onActivate" |
| 3649 | 157 | 157 | ||
| 3650 | === modified file 'plugins/wifi/NetworkDetails.qml' | |||
| 3651 | --- plugins/wifi/NetworkDetails.qml 2015-08-10 13:31:45 +0000 | |||
| 3652 | +++ plugins/wifi/NetworkDetails.qml 2016-07-22 14:36:34 +0000 | |||
| 3653 | @@ -1,7 +1,7 @@ | |||
| 3654 | 1 | /* | 1 | /* |
| 3655 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 3656 | 3 | * | 3 | * |
| 3658 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 3659 | 5 | * | 5 | * |
| 3660 | 6 | * Contact: Iain Lane <iain.lane@canonical.com> | 6 | * Contact: Iain Lane <iain.lane@canonical.com> |
| 3661 | 7 | * | 7 | * |
| 3662 | @@ -21,8 +21,8 @@ | |||
| 3663 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3664 | 22 | import QtQuick.Layouts 1.1 | 22 | import QtQuick.Layouts 1.1 |
| 3665 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 3666 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3667 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 3668 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3669 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3670 | 27 | 27 | ||
| 3671 | 28 | ItemPage { | 28 | ItemPage { |
| 3672 | @@ -53,29 +53,24 @@ | |||
| 3673 | 53 | anchors.left: parent.left | 53 | anchors.left: parent.left |
| 3674 | 54 | anchors.right: parent.right | 54 | anchors.right: parent.right |
| 3675 | 55 | 55 | ||
| 3677 | 56 | ListItem.Standard { | 56 | SettingsListItems.SingleValue { |
| 3678 | 57 | text: i18n.tr("Name") | 57 | text: i18n.tr("Name") |
| 3682 | 58 | control: Label { | 58 | value: networkName |
| 3680 | 59 | text: networkName | ||
| 3681 | 60 | } | ||
| 3683 | 61 | } | 59 | } |
| 3684 | 62 | 60 | ||
| 3686 | 63 | ListItem.Standard { | 61 | SettingsListItems.SingleValue { |
| 3687 | 64 | id: lastLabel | 62 | id: lastLabel |
| 3688 | 65 | text: i18n.tr("Last connected") | 63 | text: i18n.tr("Last connected") |
| 3695 | 66 | control: Label { | 64 | value: networkDetails.lastUsed.length !== 0 ? |
| 3696 | 67 | id: lastField | 65 | networkDetails.lastUsed : i18n.tr("Never") |
| 3691 | 68 | |||
| 3692 | 69 | text: networkDetails.lastUsed.length !== 0 ? | ||
| 3693 | 70 | networkDetails.lastUsed : i18n.tr("Never") | ||
| 3694 | 71 | } | ||
| 3697 | 72 | } | 66 | } |
| 3698 | 73 | 67 | ||
| 3700 | 74 | ListItem.Standard { | 68 | SettingsListItems.Standard { |
| 3701 | 75 | id: passwordLabel | 69 | id: passwordLabel |
| 3702 | 76 | text: i18n.tr("Password") | 70 | text: i18n.tr("Password") |
| 3703 | 77 | visible: networkDetails.password.length !== 0 | 71 | visible: networkDetails.password.length !== 0 |
| 3705 | 78 | control: TextInput { | 72 | |
| 3706 | 73 | TextInput { | ||
| 3707 | 79 | id: passwordField | 74 | id: passwordField |
| 3708 | 80 | readOnly: true | 75 | readOnly: true |
| 3709 | 81 | text: networkDetails.password | 76 | text: networkDetails.password |
| 3710 | @@ -84,28 +79,30 @@ | |||
| 3711 | 84 | } | 79 | } |
| 3712 | 85 | } | 80 | } |
| 3713 | 86 | 81 | ||
| 3715 | 87 | ListItem.Standard { | 82 | SettingsListItems.Standard { |
| 3716 | 88 | id: passwordVisible | 83 | id: passwordVisible |
| 3717 | 89 | text: i18n.tr("Show password") | 84 | text: i18n.tr("Show password") |
| 3718 | 90 | visible: networkDetails.password.length !== 0 | 85 | visible: networkDetails.password.length !== 0 |
| 3720 | 91 | control: Switch { | 86 | |
| 3721 | 87 | Switch { | ||
| 3722 | 92 | id: passwordVisibleSwitch | 88 | id: passwordVisibleSwitch |
| 3723 | 93 | } | 89 | } |
| 3724 | 94 | } | 90 | } |
| 3725 | 95 | 91 | ||
| 3727 | 96 | ListItem.Divider {} | 92 | SettingsListItems.SingleControl { |
| 3728 | 97 | 93 | ||
| 3740 | 98 | Button { | 94 | Button { |
| 3741 | 99 | objectName: "forgetNetwork" | 95 | objectName: "forgetNetwork" |
| 3742 | 100 | text : i18n.tr("Forget this network") | 96 | text : i18n.tr("Forget this network") |
| 3743 | 101 | anchors { | 97 | anchors { |
| 3744 | 102 | left: parent.left | 98 | left: parent.left |
| 3745 | 103 | right: parent.right | 99 | right: parent.right |
| 3746 | 104 | margins: units.gu(2) | 100 | margins: units.gu(2) |
| 3747 | 105 | } | 101 | } |
| 3748 | 106 | onClicked : { | 102 | onClicked : { |
| 3749 | 107 | DbusHelper.forgetConnection(dbusPath); | 103 | DbusHelper.forgetConnection(dbusPath); |
| 3750 | 108 | pageStack.pop(); | 104 | pageStack.pop(); |
| 3751 | 105 | } | ||
| 3752 | 109 | } | 106 | } |
| 3753 | 110 | } | 107 | } |
| 3754 | 111 | } | 108 | } |
| 3755 | 112 | 109 | ||
| 3756 | === modified file 'plugins/wifi/NetworkDetailsBrief.qml' | |||
| 3757 | --- plugins/wifi/NetworkDetailsBrief.qml 2015-08-10 13:31:45 +0000 | |||
| 3758 | +++ plugins/wifi/NetworkDetailsBrief.qml 2016-07-22 14:36:34 +0000 | |||
| 3759 | @@ -1,7 +1,7 @@ | |||
| 3760 | 1 | /* | 1 | /* |
| 3761 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 3762 | 3 | * | 3 | * |
| 3764 | 4 | * Copyright (C) 2014 Canonical Ltd. | 4 | * Copyright (C) 2014-2016 Canonical Ltd. |
| 3765 | 5 | * | 5 | * |
| 3766 | 6 | * Contact: Jonas G. Drange <jonas.drange@canonical.com> | 6 | * Contact: Jonas G. Drange <jonas.drange@canonical.com> |
| 3767 | 7 | * | 7 | * |
| 3768 | @@ -21,8 +21,8 @@ | |||
| 3769 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 3770 | 22 | import QtQuick.Layouts 1.1 | 22 | import QtQuick.Layouts 1.1 |
| 3771 | 23 | import SystemSettings 1.0 | 23 | import SystemSettings 1.0 |
| 3772 | 24 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3773 | 24 | import Ubuntu.Components 1.3 | 25 | import Ubuntu.Components 1.3 |
| 3774 | 25 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3775 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 | 26 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3776 | 27 | 27 | ||
| 3777 | 28 | ItemPage { | 28 | ItemPage { |
| 3778 | @@ -48,27 +48,28 @@ | |||
| 3779 | 48 | anchors.left: parent.left | 48 | anchors.left: parent.left |
| 3780 | 49 | anchors.right: parent.right | 49 | anchors.right: parent.right |
| 3781 | 50 | 50 | ||
| 3795 | 51 | ListItem.Divider {} | 51 | SettingsListItems.SingleControl { |
| 3796 | 52 | 52 | Button { | |
| 3797 | 53 | Button { | 53 | text : i18n.tr("Forget this network") |
| 3798 | 54 | text : i18n.tr("Forget this network") | 54 | anchors { |
| 3799 | 55 | anchors { | 55 | left: parent.left |
| 3800 | 56 | left: parent.left | 56 | right: parent.right |
| 3801 | 57 | right: parent.right | 57 | margins: units.gu(2) |
| 3802 | 58 | margins: units.gu(2) | 58 | } |
| 3803 | 59 | } | 59 | onClicked: { |
| 3804 | 60 | onClicked: { | 60 | if (DbusHelper.forgetActiveDevice()) { |
| 3805 | 61 | if (DbusHelper.forgetActiveDevice()) { | 61 | accessPoint.checked = false; |
| 3806 | 62 | accessPoint.checked = false; | 62 | accessPoint.checkedChanged(false) |
| 3807 | 63 | accessPoint.checkedChanged(false) | 63 | } |
| 3808 | 64 | } | 64 | } |
| 3809 | 65 | } | 65 | } |
| 3810 | 66 | } | 66 | } |
| 3811 | 67 | 67 | ||
| 3813 | 68 | ListItem.Standard { | 68 | SettingsListItems.Standard { |
| 3814 | 69 | text: i18n.tr("IP address") | 69 | text: i18n.tr("IP address") |
| 3815 | 70 | id: addressItem | 70 | id: addressItem |
| 3817 | 71 | control: TextField { | 71 | |
| 3818 | 72 | TextField { | ||
| 3819 | 72 | text: DbusHelper.wifiIp4Address | 73 | text: DbusHelper.wifiIp4Address |
| 3820 | 73 | readOnly: true | 74 | readOnly: true |
| 3821 | 74 | horizontalAlignment: TextInput.AlignRight | 75 | horizontalAlignment: TextInput.AlignRight |
| 3822 | 75 | 76 | ||
| 3823 | === modified file 'plugins/wifi/OtherNetwork.qml' | |||
| 3824 | --- plugins/wifi/OtherNetwork.qml 2016-03-11 15:07:14 +0000 | |||
| 3825 | +++ plugins/wifi/OtherNetwork.qml 2016-07-22 14:36:34 +0000 | |||
| 3826 | @@ -1,5 +1,5 @@ | |||
| 3827 | 1 | /* | 1 | /* |
| 3829 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3830 | 3 | * | 3 | * |
| 3831 | 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 |
| 3832 | 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 |
| 3833 | @@ -18,7 +18,7 @@ | |||
| 3834 | 18 | import QtQuick.Layouts 1.1 | 18 | import QtQuick.Layouts 1.1 |
| 3835 | 19 | import SystemSettings 1.0 | 19 | import SystemSettings 1.0 |
| 3836 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 3838 | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItems |
| 3839 | 22 | import Ubuntu.Components.Popups 1.3 | 22 | import Ubuntu.Components.Popups 1.3 |
| 3840 | 23 | import Ubuntu.SystemSettings.Wifi 1.0 | 23 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3841 | 24 | import QMenuModel 0.1 | 24 | import QMenuModel 0.1 |
| 3842 | @@ -313,7 +313,7 @@ | |||
| 3843 | 313 | elide: Text.ElideRight | 313 | elide: Text.ElideRight |
| 3844 | 314 | } | 314 | } |
| 3845 | 315 | 315 | ||
| 3847 | 316 | ListItem.ItemSelector { | 316 | ListItems.ItemSelector { |
| 3848 | 317 | id: securityList | 317 | id: securityList |
| 3849 | 318 | objectName: "securityList" | 318 | objectName: "securityList" |
| 3850 | 319 | model: [i18n.tr("None"), // index: 0 | 319 | model: [i18n.tr("None"), // index: 0 |
| 3851 | @@ -346,7 +346,7 @@ | |||
| 3852 | 346 | securityList.selectedIndex === 4 | 346 | securityList.selectedIndex === 4 |
| 3853 | 347 | } | 347 | } |
| 3854 | 348 | 348 | ||
| 3856 | 349 | ListItem.ItemSelector { | 349 | ListItems.ItemSelector { |
| 3857 | 350 | id: authList | 350 | id: authList |
| 3858 | 351 | objectName: "authList" | 351 | objectName: "authList" |
| 3859 | 352 | model: ["TLS", // index: 0 | 352 | model: ["TLS", // index: 0 |
| 3860 | @@ -374,7 +374,7 @@ | |||
| 3861 | 374 | authList.selectedIndex === 4) | 374 | authList.selectedIndex === 4) |
| 3862 | 375 | } | 375 | } |
| 3863 | 376 | 376 | ||
| 3865 | 377 | ListItem.ItemSelector { | 377 | ListItems.ItemSelector { |
| 3866 | 378 | id: p2authList | 378 | id: p2authList |
| 3867 | 379 | objectName: "p2authList" | 379 | objectName: "p2authList" |
| 3868 | 380 | width: parent.width | 380 | width: parent.width |
| 3869 | @@ -407,7 +407,7 @@ | |||
| 3870 | 407 | authList.selectedIndex === 4) | 407 | authList.selectedIndex === 4) |
| 3871 | 408 | } | 408 | } |
| 3872 | 409 | 409 | ||
| 3874 | 410 | ListItem.ItemSelector { | 410 | ListItems.ItemSelector { |
| 3875 | 411 | id: cacertSelector | 411 | id: cacertSelector |
| 3876 | 412 | anchors { | 412 | anchors { |
| 3877 | 413 | left: parent.left | 413 | left: parent.left |
| 3878 | @@ -521,7 +521,7 @@ | |||
| 3879 | 521 | 521 | ||
| 3880 | 522 | } | 522 | } |
| 3881 | 523 | 523 | ||
| 3883 | 524 | ListItem.ItemSelector { | 524 | ListItems.ItemSelector { |
| 3884 | 525 | id: usercertSelector | 525 | id: usercertSelector |
| 3885 | 526 | anchors { | 526 | anchors { |
| 3886 | 527 | left: parent.left | 527 | left: parent.left |
| 3887 | @@ -586,7 +586,7 @@ | |||
| 3888 | 586 | } | 586 | } |
| 3889 | 587 | } | 587 | } |
| 3890 | 588 | 588 | ||
| 3892 | 589 | ListItem.ItemSelector { | 589 | ListItems.ItemSelector { |
| 3893 | 590 | id: privateKeySelector | 590 | id: privateKeySelector |
| 3894 | 591 | anchors { | 591 | anchors { |
| 3895 | 592 | left: parent.left | 592 | left: parent.left |
| 3896 | @@ -639,7 +639,7 @@ | |||
| 3897 | 639 | OptionSelectorDelegate { text: pacFileName; } | 639 | OptionSelectorDelegate { text: pacFileName; } |
| 3898 | 640 | } | 640 | } |
| 3899 | 641 | 641 | ||
| 3901 | 642 | ListItem.ItemSelector { | 642 | ListItems.ItemSelector { |
| 3902 | 643 | id: pacFileSelector | 643 | id: pacFileSelector |
| 3903 | 644 | anchors { | 644 | anchors { |
| 3904 | 645 | left: parent.left | 645 | left: parent.left |
| 3905 | @@ -681,7 +681,7 @@ | |||
| 3906 | 681 | (authList.selectedIndex === 3) | 681 | (authList.selectedIndex === 3) |
| 3907 | 682 | } | 682 | } |
| 3908 | 683 | 683 | ||
| 3910 | 684 | ListItem.ItemSelector { | 684 | ListItems.ItemSelector { |
| 3911 | 685 | id: pacProvisioningList | 685 | id: pacProvisioningList |
| 3912 | 686 | objectName: "pacProvisioningList" | 686 | objectName: "pacProvisioningList" |
| 3913 | 687 | model: [i18n.tr("Disabled"), // index: 0 | 687 | model: [i18n.tr("Disabled"), // index: 0 |
| 3914 | @@ -708,7 +708,7 @@ | |||
| 3915 | 708 | (authList.selectedIndex === 4) | 708 | (authList.selectedIndex === 4) |
| 3916 | 709 | } | 709 | } |
| 3917 | 710 | 710 | ||
| 3919 | 711 | ListItem.ItemSelector { | 711 | ListItems.ItemSelector { |
| 3920 | 712 | id: peapVersionList | 712 | id: peapVersionList |
| 3921 | 713 | objectName: "peapVersionList" | 713 | objectName: "peapVersionList" |
| 3922 | 714 | model: [i18n.tr("Version 0"), // index: 0 | 714 | model: [i18n.tr("Version 0"), // index: 0 |
| 3923 | 715 | 715 | ||
| 3924 | === modified file 'plugins/wifi/PageComponent.qml' | |||
| 3925 | --- plugins/wifi/PageComponent.qml 2016-04-13 18:49:49 +0000 | |||
| 3926 | +++ plugins/wifi/PageComponent.qml 2016-07-22 14:36:34 +0000 | |||
| 3927 | @@ -1,5 +1,5 @@ | |||
| 3928 | 1 | /* | 1 | /* |
| 3930 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3931 | 3 | * | 3 | * |
| 3932 | 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 |
| 3933 | 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 |
| 3934 | @@ -16,8 +16,8 @@ | |||
| 3935 | 16 | 16 | ||
| 3936 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
| 3937 | 18 | import SystemSettings 1.0 | 18 | import SystemSettings 1.0 |
| 3938 | 19 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3939 | 19 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 3940 | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 3941 | 21 | import Ubuntu.Components.Popups 1.3 | 21 | import Ubuntu.Components.Popups 1.3 |
| 3942 | 22 | import Ubuntu.SystemSettings.Wifi 1.0 | 22 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 3943 | 23 | import QMenuModel 0.1 | 23 | import QMenuModel 0.1 |
| 3944 | @@ -81,7 +81,6 @@ | |||
| 3945 | 81 | right: parent.right | 81 | right: parent.right |
| 3946 | 82 | } | 82 | } |
| 3947 | 83 | height: loader.height | 83 | height: loader.height |
| 3948 | 84 | visible: height > 0 | ||
| 3949 | 85 | 84 | ||
| 3950 | 86 | Loader { | 85 | Loader { |
| 3951 | 87 | id: loader | 86 | id: loader |
| 3952 | @@ -124,16 +123,7 @@ | |||
| 3953 | 124 | } | 123 | } |
| 3954 | 125 | } | 124 | } |
| 3955 | 126 | 125 | ||
| 3966 | 127 | ListItem.Divider {} | 126 | SettingsListItems.Standard { |
| 3957 | 128 | |||
| 3958 | 129 | ListItem.SingleValue { | ||
| 3959 | 130 | objectName: "previousNetwork" | ||
| 3960 | 131 | text: i18n.tr("Previous networks") | ||
| 3961 | 132 | progression: true | ||
| 3962 | 133 | onClicked: pageStack.push(Qt.resolvedUrl("PreviousNetworks.qml")) | ||
| 3963 | 134 | } | ||
| 3964 | 135 | |||
| 3965 | 136 | ListItem.SingleValue { | ||
| 3967 | 137 | objectName: "connectToHiddenNetwork" | 127 | objectName: "connectToHiddenNetwork" |
| 3968 | 138 | text: i18n.tr("Connect to hidden network…") | 128 | text: i18n.tr("Connect to hidden network…") |
| 3969 | 139 | visible : wifibase.wifiEnabled | 129 | visible : wifibase.wifiEnabled |
| 3970 | @@ -143,6 +133,12 @@ | |||
| 3971 | 143 | } | 133 | } |
| 3972 | 144 | } | 134 | } |
| 3973 | 145 | 135 | ||
| 3974 | 136 | SettingsListItems.StandardProgression { | ||
| 3975 | 137 | objectName: "previousNetwork" | ||
| 3976 | 138 | text: i18n.tr("Previous networks") | ||
| 3977 | 139 | onClicked: pageStack.push(Qt.resolvedUrl("PreviousNetworks.qml")) | ||
| 3978 | 140 | } | ||
| 3979 | 141 | |||
| 3980 | 146 | Loader { | 142 | Loader { |
| 3981 | 147 | id: otherNetworLoader | 143 | id: otherNetworLoader |
| 3982 | 148 | asynchronous: false | 144 | asynchronous: false |
| 3983 | 149 | 145 | ||
| 3984 | === modified file 'plugins/wifi/PreviousNetworks.qml' | |||
| 3985 | --- plugins/wifi/PreviousNetworks.qml 2015-08-10 13:31:45 +0000 | |||
| 3986 | +++ plugins/wifi/PreviousNetworks.qml 2016-07-22 14:36:34 +0000 | |||
| 3987 | @@ -1,5 +1,5 @@ | |||
| 3988 | 1 | /* | 1 | /* |
| 3990 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 3991 | 3 | * | 3 | * |
| 3992 | 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 |
| 3993 | 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 |
| 3994 | @@ -16,8 +16,8 @@ | |||
| 3995 | 16 | 16 | ||
| 3996 | 17 | import QtQuick 2.4 | 17 | import QtQuick 2.4 |
| 3997 | 18 | import SystemSettings 1.0 | 18 | import SystemSettings 1.0 |
| 3998 | 19 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 3999 | 19 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
| 4000 | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 4001 | 21 | import Ubuntu.SystemSettings.Wifi 1.0 | 21 | import Ubuntu.SystemSettings.Wifi 1.0 |
| 4002 | 22 | import QMenuModel 0.1 | 22 | import QMenuModel 0.1 |
| 4003 | 23 | 23 | ||
| 4004 | @@ -54,9 +54,8 @@ | |||
| 4005 | 54 | duration: UbuntuAnimation.SnapDuration | 54 | duration: UbuntuAnimation.SnapDuration |
| 4006 | 55 | } | 55 | } |
| 4007 | 56 | } | 56 | } |
| 4009 | 57 | delegate: ListItem.Standard { | 57 | delegate: SettingsListItems.StandardProgression { |
| 4010 | 58 | text: name | 58 | text: name |
| 4011 | 59 | progression: true | ||
| 4012 | 60 | onClicked: { | 59 | onClicked: { |
| 4013 | 61 | pageStack.push(Qt.resolvedUrl("NetworkDetails.qml"), | 60 | pageStack.push(Qt.resolvedUrl("NetworkDetails.qml"), |
| 4014 | 62 | {networkName : name, password : password, lastUsed : lastUsed, | 61 | {networkName : name, password : password, lastUsed : lastUsed, |
| 4015 | 63 | 62 | ||
| 4016 | === modified file 'plugins/wifi/SectionMenuItem.qml' | |||
| 4017 | --- plugins/wifi/SectionMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 4018 | +++ plugins/wifi/SectionMenuItem.qml 2016-07-22 14:36:34 +0000 | |||
| 4019 | @@ -1,5 +1,5 @@ | |||
| 4020 | 1 | /* | 1 | /* |
| 4022 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 4023 | 3 | * | 3 | * |
| 4024 | 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 |
| 4025 | 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 |
| 4026 | @@ -18,37 +18,22 @@ | |||
| 4027 | 18 | */ | 18 | */ |
| 4028 | 19 | 19 | ||
| 4029 | 20 | import QtQuick 2.4 | 20 | import QtQuick 2.4 |
| 4030 | 21 | import SystemSettings 1.0 | ||
| 4031 | 21 | import Ubuntu.Components 1.3 | 22 | import Ubuntu.Components 1.3 |
| 4045 | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem | 23 | |
| 4046 | 23 | 24 | SettingsItemTitle { | |
| 4047 | 24 | BaseMenuItem { | 25 | property alias busy: indicator.running |
| 4048 | 25 | id: menuItem | 26 | |
| 4049 | 26 | property alias text: header.text | 27 | ActivityIndicator { |
| 4050 | 27 | property bool busy: false | 28 | id: indicator |
| 4038 | 28 | |||
| 4039 | 29 | implicitHeight: text !== "" ? header.height : 0 | ||
| 4040 | 30 | |||
| 4041 | 31 | ListItem.Header { | ||
| 4042 | 32 | id: header | ||
| 4043 | 33 | |||
| 4044 | 34 | height: units.gu(4) | ||
| 4051 | 35 | anchors { | 29 | anchors { |
| 4053 | 36 | left: parent.left | 30 | top: parent.top |
| 4054 | 31 | topMargin: units.gu(3) | ||
| 4055 | 37 | right: parent.right | 32 | right: parent.right |
| 4071 | 38 | top: parent.top | 33 | rightMargin: units.gu(2) |
| 4072 | 39 | } | 34 | } |
| 4073 | 40 | visible: text != "" | 35 | height: parent.height - (anchors.topMargin * 1.25) |
| 4074 | 41 | 36 | width: height | |
| 4075 | 42 | ActivityIndicator { | 37 | visible: running |
| 4061 | 43 | id: indicator | ||
| 4062 | 44 | running: busy | ||
| 4063 | 45 | anchors { | ||
| 4064 | 46 | margins: units.gu(0.5) | ||
| 4065 | 47 | right: parent.right | ||
| 4066 | 48 | } | ||
| 4067 | 49 | height: parent.height - (anchors.margins * 2) | ||
| 4068 | 50 | width: height | ||
| 4069 | 51 | anchors.verticalCenter: parent.verticalCenter | ||
| 4070 | 52 | } | ||
| 4076 | 53 | } | 38 | } |
| 4077 | 54 | } | 39 | } |
| 4078 | 55 | 40 | ||
| 4079 | === modified file 'plugins/wifi/StandardMenuItem.qml' | |||
| 4080 | --- plugins/wifi/StandardMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 4081 | +++ plugins/wifi/StandardMenuItem.qml 2016-07-22 14:36:34 +0000 | |||
| 4082 | @@ -1,5 +1,5 @@ | |||
| 4083 | 1 | /* | 1 | /* |
| 4085 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 4086 | 3 | * | 3 | * |
| 4087 | 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 |
| 4088 | 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 |
| 4089 | @@ -28,34 +28,12 @@ | |||
| 4090 | 28 | 28 | ||
| 4091 | 29 | signal activate() | 29 | signal activate() |
| 4092 | 30 | 30 | ||
| 4099 | 31 | onCheckedChanged: { | 31 | layout.subtitle.text: checked ? i18n.tr("Connected") : "" |
| 4094 | 32 | // Can't rely on binding. Checked is assigned on click. | ||
| 4095 | 33 | if (checkable) { | ||
| 4096 | 34 | checkbox.checked = checked; | ||
| 4097 | 35 | } | ||
| 4098 | 36 | } | ||
| 4100 | 37 | 32 | ||
| 4101 | 33 | progressionVisible: checked | ||
| 4102 | 38 | onClicked: { | 34 | onClicked: { |
| 4124 | 39 | if (checkable) { | 35 | if (!checked) { |
| 4125 | 40 | checkbox.clicked(); | 36 | menuItem.activate(); |
| 4126 | 41 | } else { | 37 | } |
| 4106 | 42 | menuItem.activate(); | ||
| 4107 | 43 | } | ||
| 4108 | 44 | } | ||
| 4109 | 45 | |||
| 4110 | 46 | control: CheckBox { | ||
| 4111 | 47 | id: checkbox | ||
| 4112 | 48 | |||
| 4113 | 49 | Component.onCompleted: { | ||
| 4114 | 50 | checked = menuItem.checked; | ||
| 4115 | 51 | } | ||
| 4116 | 52 | |||
| 4117 | 53 | // FIXME : should use Checkbox.toggled signal | ||
| 4118 | 54 | // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled | ||
| 4119 | 55 | onClicked: { | ||
| 4120 | 56 | menuItem.activate(); | ||
| 4121 | 57 | } | ||
| 4122 | 58 | |||
| 4123 | 59 | visible: checkable | ||
| 4127 | 60 | } | 38 | } |
| 4128 | 61 | } | 39 | } |
| 4129 | 62 | 40 | ||
| 4130 | === modified file 'plugins/wifi/SwitchMenuItem.qml' | |||
| 4131 | --- plugins/wifi/SwitchMenuItem.qml 2015-08-10 13:31:45 +0000 | |||
| 4132 | +++ plugins/wifi/SwitchMenuItem.qml 2016-07-22 14:36:34 +0000 | |||
| 4133 | @@ -1,5 +1,5 @@ | |||
| 4134 | 1 | /* | 1 | /* |
| 4136 | 2 | * Copyright 2013 Canonical Ltd. | 2 | * Copyright 2013-2016 Canonical Ltd. |
| 4137 | 3 | * | 3 | * |
| 4138 | 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 |
| 4139 | 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 |
| 4140 | @@ -33,7 +33,7 @@ | |||
| 4141 | 33 | switcher.checked = checked; | 33 | switcher.checked = checked; |
| 4142 | 34 | } | 34 | } |
| 4143 | 35 | 35 | ||
| 4145 | 36 | control: Switch { | 36 | Switch { |
| 4146 | 37 | id: switcher | 37 | id: switcher |
| 4147 | 38 | 38 | ||
| 4148 | 39 | Component.onCompleted: { | 39 | Component.onCompleted: { |
| 4149 | 40 | 40 | ||
| 4150 | === modified file 'src/CMakeLists.txt' | |||
| 4151 | --- src/CMakeLists.txt 2016-02-10 15:52:50 +0000 | |||
| 4152 | +++ src/CMakeLists.txt 2016-07-22 14:36:34 +0000 | |||
| 4153 | @@ -21,6 +21,7 @@ | |||
| 4154 | 21 | 21 | ||
| 4155 | 22 | set(QML_SOURCES | 22 | set(QML_SOURCES |
| 4156 | 23 | qml/CategoryGrid.qml | 23 | qml/CategoryGrid.qml |
| 4157 | 24 | qml/CategorySection.qml | ||
| 4158 | 24 | qml/EntryComponent.qml | 25 | qml/EntryComponent.qml |
| 4159 | 25 | qml/MainWindow.qml | 26 | qml/MainWindow.qml |
| 4160 | 26 | qml/UncategorizedItemsView.qml | 27 | qml/UncategorizedItemsView.qml |
| 4161 | 27 | 28 | ||
| 4162 | === modified file 'src/SystemSettings/ListItems/Icon.qml' | |||
| 4163 | --- src/SystemSettings/ListItems/Icon.qml 2016-07-22 14:36:33 +0000 | |||
| 4164 | +++ src/SystemSettings/ListItems/Icon.qml 2016-07-22 14:36:34 +0000 | |||
| 4165 | @@ -1,7 +1,7 @@ | |||
| 4166 | 1 | /* | 1 | /* |
| 4167 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4168 | 3 | * | 3 | * |
| 4170 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4171 | 5 | * | 5 | * |
| 4172 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4173 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4174 | 8 | 8 | ||
| 4175 | === modified file 'src/SystemSettings/ListItems/IconProgression.qml' | |||
| 4176 | --- src/SystemSettings/ListItems/IconProgression.qml 2016-07-22 14:36:33 +0000 | |||
| 4177 | +++ src/SystemSettings/ListItems/IconProgression.qml 2016-07-22 14:36:34 +0000 | |||
| 4178 | @@ -1,7 +1,7 @@ | |||
| 4179 | 1 | /* | 1 | /* |
| 4180 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4181 | 3 | * | 3 | * |
| 4183 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4184 | 5 | * | 5 | * |
| 4185 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4186 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4187 | 8 | 8 | ||
| 4188 | === modified file 'src/SystemSettings/ListItems/SingleControl.qml' | |||
| 4189 | --- src/SystemSettings/ListItems/SingleControl.qml 2016-07-22 14:36:33 +0000 | |||
| 4190 | +++ src/SystemSettings/ListItems/SingleControl.qml 2016-07-22 14:36:34 +0000 | |||
| 4191 | @@ -1,7 +1,7 @@ | |||
| 4192 | 1 | /* | 1 | /* |
| 4193 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4194 | 3 | * | 3 | * |
| 4196 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4197 | 5 | * | 5 | * |
| 4198 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4199 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4200 | 8 | 8 | ||
| 4201 | === modified file 'src/SystemSettings/ListItems/SingleValue.qml' | |||
| 4202 | --- src/SystemSettings/ListItems/SingleValue.qml 2016-07-22 14:36:33 +0000 | |||
| 4203 | +++ src/SystemSettings/ListItems/SingleValue.qml 2016-07-22 14:36:34 +0000 | |||
| 4204 | @@ -1,7 +1,7 @@ | |||
| 4205 | 1 | /* | 1 | /* |
| 4206 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4207 | 3 | * | 3 | * |
| 4209 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4210 | 5 | * | 5 | * |
| 4211 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4212 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4213 | 8 | 8 | ||
| 4214 | === modified file 'src/SystemSettings/ListItems/SingleValueProgression.qml' | |||
| 4215 | --- src/SystemSettings/ListItems/SingleValueProgression.qml 2016-07-22 14:36:33 +0000 | |||
| 4216 | +++ src/SystemSettings/ListItems/SingleValueProgression.qml 2016-07-22 14:36:34 +0000 | |||
| 4217 | @@ -1,7 +1,7 @@ | |||
| 4218 | 1 | /* | 1 | /* |
| 4219 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4220 | 3 | * | 3 | * |
| 4222 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4223 | 5 | * | 5 | * |
| 4224 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4225 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4226 | 8 | 8 | ||
| 4227 | === modified file 'src/SystemSettings/ListItems/Standard.qml' | |||
| 4228 | --- src/SystemSettings/ListItems/Standard.qml 2016-07-22 14:36:33 +0000 | |||
| 4229 | +++ src/SystemSettings/ListItems/Standard.qml 2016-07-22 14:36:34 +0000 | |||
| 4230 | @@ -1,7 +1,7 @@ | |||
| 4231 | 1 | /* | 1 | /* |
| 4232 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4233 | 3 | * | 3 | * |
| 4235 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4236 | 5 | * | 5 | * |
| 4237 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4238 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4239 | 8 | 8 | ||
| 4240 | === modified file 'src/SystemSettings/ListItems/StandardProgression.qml' | |||
| 4241 | --- src/SystemSettings/ListItems/StandardProgression.qml 2016-07-22 14:36:33 +0000 | |||
| 4242 | +++ src/SystemSettings/ListItems/StandardProgression.qml 2016-07-22 14:36:34 +0000 | |||
| 4243 | @@ -1,7 +1,7 @@ | |||
| 4244 | 1 | /* | 1 | /* |
| 4245 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4246 | 3 | * | 3 | * |
| 4248 | 4 | * Copyright (C) 2015 Canonical Ltd. | 4 | * Copyright (C) 2015-2016 Canonical Ltd. |
| 4249 | 5 | * | 5 | * |
| 4250 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4251 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4252 | 8 | 8 | ||
| 4253 | === modified file 'src/SystemSettings/SettingsItemTitle.qml' | |||
| 4254 | --- src/SystemSettings/SettingsItemTitle.qml 2016-07-22 14:36:33 +0000 | |||
| 4255 | +++ src/SystemSettings/SettingsItemTitle.qml 2016-07-22 14:36:34 +0000 | |||
| 4256 | @@ -1,7 +1,7 @@ | |||
| 4257 | 1 | /* | 1 | /* |
| 4258 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4259 | 3 | * | 3 | * |
| 4261 | 4 | * Copyright (C) 2013 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 4262 | 5 | * | 5 | * |
| 4263 | 6 | * This program is free software: you can redistribute it and/or modify it | 6 | * This program is free software: you can redistribute it and/or modify it |
| 4264 | 7 | * under the terms of the GNU General Public License version 3, as published | 7 | * under the terms of the GNU General Public License version 3, as published |
| 4265 | 8 | 8 | ||
| 4266 | === modified file 'src/SystemSettings/qmldir' | |||
| 4267 | --- src/SystemSettings/qmldir 2014-10-31 08:45:10 +0000 | |||
| 4268 | +++ src/SystemSettings/qmldir 2016-07-22 14:36:34 +0000 | |||
| 4269 | @@ -1,3 +1,4 @@ | |||
| 4270 | 1 | module SystemSettings | 1 | module SystemSettings |
| 4271 | 2 | |||
| 4272 | 2 | ItemPage 1.0 ItemPage.qml | 3 | ItemPage 1.0 ItemPage.qml |
| 4273 | 3 | SettingsItemTitle 1.0 SettingsItemTitle.qml | 4 | SettingsItemTitle 1.0 SettingsItemTitle.qml |
| 4274 | 4 | 5 | ||
| 4275 | === added file 'src/qml/CategoryGrid.qml' | |||
| 4276 | --- src/qml/CategoryGrid.qml 1970-01-01 00:00:00 +0000 | |||
| 4277 | +++ src/qml/CategoryGrid.qml 2016-07-22 14:36:34 +0000 | |||
| 4278 | @@ -0,0 +1,90 @@ | |||
| 4279 | 1 | /* | ||
| 4280 | 2 | * This file is part of system-settings | ||
| 4281 | 3 | * | ||
| 4282 | 4 | * Copyright (C) 2013-2016 Canonical Ltd. | ||
| 4283 | 5 | * | ||
| 4284 | 6 | * Contact: Ken VanDine <ken.vandine@canonical.com> | ||
| 4285 | 7 | * | ||
| 4286 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
| 4287 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
| 4288 | 10 | * by the Free Software Foundation. | ||
| 4289 | 11 | * | ||
| 4290 | 12 | * This program is distributed in the hope that it will be useful, but | ||
| 4291 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 4292 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 4293 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
| 4294 | 16 | * | ||
| 4295 | 17 | * You should have received a copy of the GNU General Public License along | ||
| 4296 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 4297 | 19 | */ | ||
| 4298 | 20 | |||
| 4299 | 21 | import QtQuick 2.4 | ||
| 4300 | 22 | import Ubuntu.Components 1.3 | ||
| 4301 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 4302 | 24 | |||
| 4303 | 25 | Column { | ||
| 4304 | 26 | anchors { | ||
| 4305 | 27 | left: parent.left | ||
| 4306 | 28 | right: parent.right | ||
| 4307 | 29 | } | ||
| 4308 | 30 | spacing: units.gu(1) | ||
| 4309 | 31 | |||
| 4310 | 32 | property string category | ||
| 4311 | 33 | property string categoryName | ||
| 4312 | 34 | |||
| 4313 | 35 | objectName: "categoryGrid-" + category | ||
| 4314 | 36 | |||
| 4315 | 37 | ListItem.Standard { | ||
| 4316 | 38 | id: header | ||
| 4317 | 39 | |||
| 4318 | 40 | highlightWhenPressed: false | ||
| 4319 | 41 | showDivider: false | ||
| 4320 | 42 | text: categoryName | ||
| 4321 | 43 | visible: repeater.count > 0 | ||
| 4322 | 44 | } | ||
| 4323 | 45 | |||
| 4324 | 46 | Grid { | ||
| 4325 | 47 | property int itemWidth: units.gu(12) | ||
| 4326 | 48 | |||
| 4327 | 49 | // The amount of whitespace, including column spacing | ||
| 4328 | 50 | property int space: parent.width - columns * itemWidth | ||
| 4329 | 51 | |||
| 4330 | 52 | // The column spacing is 1/n of the left/right margins | ||
| 4331 | 53 | property int n: 4 | ||
| 4332 | 54 | |||
| 4333 | 55 | columnSpacing: space / ((2 * n) + (columns - 1)) | ||
| 4334 | 56 | rowSpacing: units.gu(3) | ||
| 4335 | 57 | width: (columns * itemWidth) + columnSpacing * (columns - 1) | ||
| 4336 | 58 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 4337 | 59 | columns: { | ||
| 4338 | 60 | var items = Math.floor(parent.width / itemWidth) | ||
| 4339 | 61 | var count = repeater.count | ||
| 4340 | 62 | return count < items ? count : items | ||
| 4341 | 63 | } | ||
| 4342 | 64 | |||
| 4343 | 65 | Repeater { | ||
| 4344 | 66 | id: repeater | ||
| 4345 | 67 | |||
| 4346 | 68 | model: pluginManager.itemModel(category) | ||
| 4347 | 69 | |||
| 4348 | 70 | delegate: Loader { | ||
| 4349 | 71 | id: loader | ||
| 4350 | 72 | width: parent.itemWidth | ||
| 4351 | 73 | sourceComponent: model.item.entryComponent | ||
| 4352 | 74 | active: model.item.visible | ||
| 4353 | 75 | Connections { | ||
| 4354 | 76 | ignoreUnknownSignals: true | ||
| 4355 | 77 | target: loader.item | ||
| 4356 | 78 | onClicked: { | ||
| 4357 | 79 | var pageComponent = model.item.pageComponent | ||
| 4358 | 80 | if (pageComponent) { | ||
| 4359 | 81 | pageStack.push(model.item.pageComponent, | ||
| 4360 | 82 | { plugin: model.item, pluginManager: pluginManager }) | ||
| 4361 | 83 | } | ||
| 4362 | 84 | } | ||
| 4363 | 85 | } | ||
| 4364 | 86 | } | ||
| 4365 | 87 | } | ||
| 4366 | 88 | } | ||
| 4367 | 89 | ListItem.ThinDivider { visible: header.visible } | ||
| 4368 | 90 | } | ||
| 4369 | 0 | 91 | ||
| 4370 | === renamed file 'src/qml/CategoryGrid.qml' => 'src/qml/CategorySection.qml' | |||
| 4371 | --- src/qml/CategoryGrid.qml 2016-05-06 13:13:55 +0000 | |||
| 4372 | +++ src/qml/CategorySection.qml 2016-07-22 14:36:34 +0000 | |||
| 4373 | @@ -1,6 +1,28 @@ | |||
| 4374 | 1 | /* | ||
| 4375 | 2 | * This file is part of system-settings | ||
| 4376 | 3 | * | ||
| 4377 | 4 | * Copyright (C) 2015-2016 Canonical Ltd. | ||
| 4378 | 5 | * | ||
| 4379 | 6 | * Contact: Ken VanDine <ken.vandine@canonical.com> | ||
| 4380 | 7 | * | ||
| 4381 | 8 | * This program is free software: you can redistribute it and/or modify it | ||
| 4382 | 9 | * under the terms of the GNU General Public License version 3, as published | ||
| 4383 | 10 | * by the Free Software Foundation. | ||
| 4384 | 11 | * | ||
| 4385 | 12 | * This program is distributed in the hope that it will be useful, but | ||
| 4386 | 13 | * WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| 4387 | 14 | * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| 4388 | 15 | * PURPOSE. See the GNU General Public License for more details. | ||
| 4389 | 16 | * | ||
| 4390 | 17 | * You should have received a copy of the GNU General Public License along | ||
| 4391 | 18 | * with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 4392 | 19 | */ | ||
| 4393 | 20 | |||
| 4394 | 1 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 4395 | 22 | import SystemSettings 1.0 | ||
| 4396 | 23 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 4397 | 2 | import Ubuntu.Components 1.3 | 24 | import Ubuntu.Components 1.3 |
| 4399 | 3 | import Ubuntu.Components.ListItems 1.3 as ListItem | 25 | |
| 4400 | 4 | 26 | ||
| 4401 | 5 | Column { | 27 | Column { |
| 4402 | 6 | anchors { | 28 | anchors { |
| 4403 | @@ -14,32 +36,17 @@ | |||
| 4404 | 14 | 36 | ||
| 4405 | 15 | objectName: "categoryGrid-" + category | 37 | objectName: "categoryGrid-" + category |
| 4406 | 16 | 38 | ||
| 4408 | 17 | ListItem.Standard { | 39 | SettingsItemTitle { |
| 4409 | 18 | id: header | 40 | id: header |
| 4410 | 19 | |||
| 4411 | 20 | highlightWhenPressed: false | ||
| 4412 | 21 | showDivider: false | ||
| 4413 | 22 | text: categoryName | 41 | text: categoryName |
| 4414 | 23 | visible: repeater.count > 0 | 42 | visible: repeater.count > 0 |
| 4415 | 24 | } | 43 | } |
| 4416 | 25 | 44 | ||
| 4434 | 26 | Grid { | 45 | Column { |
| 4435 | 27 | property int itemWidth: units.gu(12) | 46 | id: col |
| 4436 | 28 | 47 | anchors { | |
| 4437 | 29 | // The amount of whitespace, including column spacing | 48 | left: parent.left |
| 4438 | 30 | property int space: parent.width - columns * itemWidth | 49 | right: parent.right |
| 4422 | 31 | |||
| 4423 | 32 | // The column spacing is 1/n of the left/right margins | ||
| 4424 | 33 | property int n: 4 | ||
| 4425 | 34 | |||
| 4426 | 35 | columnSpacing: space / ((2 * n) + (columns - 1)) | ||
| 4427 | 36 | rowSpacing: units.gu(3) | ||
| 4428 | 37 | width: (columns * itemWidth) + columnSpacing * (columns - 1) | ||
| 4429 | 38 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 4430 | 39 | columns: { | ||
| 4431 | 40 | var items = Math.floor(parent.width / itemWidth) | ||
| 4432 | 41 | var count = repeater.count | ||
| 4433 | 42 | return count < items ? count : items | ||
| 4439 | 43 | } | 50 | } |
| 4440 | 44 | 51 | ||
| 4441 | 45 | Repeater { | 52 | Repeater { |
| 4442 | @@ -49,7 +56,10 @@ | |||
| 4443 | 49 | 56 | ||
| 4444 | 50 | delegate: Loader { | 57 | delegate: Loader { |
| 4445 | 51 | id: loader | 58 | id: loader |
| 4447 | 52 | width: parent.itemWidth | 59 | anchors { |
| 4448 | 60 | left: col.left | ||
| 4449 | 61 | right: col.right | ||
| 4450 | 62 | } | ||
| 4451 | 53 | sourceComponent: model.item.entryComponent | 63 | sourceComponent: model.item.entryComponent |
| 4452 | 54 | active: model.item.visible | 64 | active: model.item.visible |
| 4453 | 55 | Connections { | 65 | Connections { |
| 4454 | @@ -66,5 +76,4 @@ | |||
| 4455 | 66 | } | 76 | } |
| 4456 | 67 | } | 77 | } |
| 4457 | 68 | } | 78 | } |
| 4458 | 69 | ListItem.ThinDivider { visible: header.visible } | ||
| 4459 | 70 | } | 79 | } |
| 4460 | 71 | 80 | ||
| 4461 | === modified file 'src/qml/MainWindow.qml' | |||
| 4462 | --- src/qml/MainWindow.qml 2016-04-28 15:31:39 +0000 | |||
| 4463 | +++ src/qml/MainWindow.qml 2016-07-22 14:36:34 +0000 | |||
| 4464 | @@ -1,7 +1,7 @@ | |||
| 4465 | 1 | /* | 1 | /* |
| 4466 | 2 | * This file is part of system-settings | 2 | * This file is part of system-settings |
| 4467 | 3 | * | 3 | * |
| 4469 | 4 | * Copyright (C) 2013, 2014, 2015 Canonical Ltd. | 4 | * Copyright (C) 2013-2016 Canonical Ltd. |
| 4470 | 5 | * | 5 | * |
| 4471 | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> | 6 | * Contact: Alberto Mardegan <alberto.mardegan@canonical.com> |
| 4472 | 7 | * | 7 | * |
| 4473 | @@ -19,8 +19,8 @@ | |||
| 4474 | 19 | */ | 19 | */ |
| 4475 | 20 | 20 | ||
| 4476 | 21 | import QtQuick 2.4 | 21 | import QtQuick 2.4 |
| 4477 | 22 | import SystemSettings.ListItems 1.0 as SettingsListItems | ||
| 4478 | 22 | import Ubuntu.Components 1.3 | 23 | import Ubuntu.Components 1.3 |
| 4479 | 23 | import Ubuntu.Components.ListItems 1.3 as ListItem | ||
| 4480 | 24 | import SystemSettings 1.0 | 24 | import SystemSettings 1.0 |
| 4481 | 25 | 25 | ||
| 4482 | 26 | MainView { | 26 | MainView { |
| 4483 | @@ -117,6 +117,17 @@ | |||
| 4484 | 117 | visible: false | 117 | visible: false |
| 4485 | 118 | flickable: mainFlickable | 118 | flickable: mainFlickable |
| 4486 | 119 | 119 | ||
| 4487 | 120 | head.actions: [ | ||
| 4488 | 121 | Action { | ||
| 4489 | 122 | objectName: "searchAction" | ||
| 4490 | 123 | iconName: "find" | ||
| 4491 | 124 | onTriggered: { | ||
| 4492 | 125 | pluginManager.filter = ""; | ||
| 4493 | 126 | search.visible = !search.visible; | ||
| 4494 | 127 | } | ||
| 4495 | 128 | } | ||
| 4496 | 129 | ] | ||
| 4497 | 130 | |||
| 4498 | 120 | Flickable { | 131 | Flickable { |
| 4499 | 121 | id: mainFlickable | 132 | id: mainFlickable |
| 4500 | 122 | anchors.fill: parent | 133 | anchors.fill: parent |
| 4501 | @@ -130,9 +141,11 @@ | |||
| 4502 | 130 | anchors.left: parent.left | 141 | anchors.left: parent.left |
| 4503 | 131 | anchors.right: parent.right | 142 | anchors.right: parent.right |
| 4504 | 132 | 143 | ||
| 4506 | 133 | ListItem.SingleControl { | 144 | SettingsListItems.SingleControl { |
| 4507 | 134 | id: search | 145 | id: search |
| 4509 | 135 | control: TextField { | 146 | visible: false |
| 4510 | 147 | TextField { | ||
| 4511 | 148 | id: searchField | ||
| 4512 | 136 | width: parent.width - units.gu(4) | 149 | width: parent.width - units.gu(4) |
| 4513 | 137 | placeholderText: i18n.tr("Search") | 150 | placeholderText: i18n.tr("Search") |
| 4514 | 138 | objectName: "searchTextField" | 151 | objectName: "searchTextField" |
| 4515 | @@ -140,6 +153,7 @@ | |||
| 4516 | 140 | onDisplayTextChanged: | 153 | onDisplayTextChanged: |
| 4517 | 141 | pluginManager.filter = displayText | 154 | pluginManager.filter = displayText |
| 4518 | 142 | } | 155 | } |
| 4519 | 156 | onVisibleChanged: if (visible) searchField.forceActiveFocus() | ||
| 4520 | 143 | } | 157 | } |
| 4521 | 144 | 158 | ||
| 4522 | 145 | UncategorizedItemsView { | 159 | UncategorizedItemsView { |
| 4523 | 146 | 160 | ||
| 4524 | === modified file 'src/ui.qrc' | |||
| 4525 | --- src/ui.qrc 2014-01-31 15:07:01 +0000 | |||
| 4526 | +++ src/ui.qrc 2016-07-22 14:36:34 +0000 | |||
| 4527 | @@ -1,6 +1,7 @@ | |||
| 4528 | 1 | <!DOCTYPE RCC><RCC version="1.0"> | 1 | <!DOCTYPE RCC><RCC version="1.0"> |
| 4529 | 2 | <qresource> | 2 | <qresource> |
| 4530 | 3 | <file>qml/CategoryGrid.qml</file> | 3 | <file>qml/CategoryGrid.qml</file> |
| 4531 | 4 | <file>qml/CategorySection.qml</file> | ||
| 4532 | 4 | <file>qml/EntryComponent.qml</file> | 5 | <file>qml/EntryComponent.qml</file> |
| 4533 | 5 | <file>qml/MainWindow.qml</file> | 6 | <file>qml/MainWindow.qml</file> |
| 4534 | 6 | <file>qml/UncategorizedItemsView.qml</file> | 7 | <file>qml/UncategorizedItemsView.qml</file> |
| 4535 | 7 | 8 | ||
| 4536 | === modified file 'tests/autopilot/ubuntu_system_settings/__init__.py' | |||
| 4537 | --- tests/autopilot/ubuntu_system_settings/__init__.py 2016-06-14 11:44:19 +0000 | |||
| 4538 | +++ tests/autopilot/ubuntu_system_settings/__init__.py 2016-07-22 14:36:34 +0000 | |||
| 4539 | @@ -1,7 +1,7 @@ | |||
| 4540 | 1 | 1 | ||
| 4541 | 2 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | 2 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- |
| 4542 | 3 | # | 3 | # |
| 4544 | 4 | # Copyright (C) 2014, 2015 Canonical Ltd. | 4 | # Copyright (C) 2014-2016 Canonical Ltd. |
| 4545 | 5 | # | 5 | # |
| 4546 | 6 | # This program is free software; you can redistribute it and/or modify | 6 | # This program is free software; you can redistribute it and/or modify |
| 4547 | 7 | # it under the terms of the GNU Lesser General Public License as published by | 7 | # it under the terms of the GNU Lesser General Public License as published by |
| 4548 | @@ -155,6 +155,13 @@ | |||
| 4549 | 155 | self.scroll_to(obj) | 155 | self.scroll_to(obj) |
| 4550 | 156 | self.pointing_device.click_object(obj) | 156 | self.pointing_device.click_object(obj) |
| 4551 | 157 | 157 | ||
| 4552 | 158 | def click_header_action(self, action): | ||
| 4553 | 159 | """Click the action 'action' on the header""" | ||
| 4554 | 160 | main_view = self.get_root_instance().select_single( | ||
| 4555 | 161 | objectName='systemSettingsMainView') | ||
| 4556 | 162 | header = main_view.select_single('AppHeader') | ||
| 4557 | 163 | header.click_action_button(action) | ||
| 4558 | 164 | |||
| 4559 | 158 | @property | 165 | @property |
| 4560 | 159 | def system_settings_page(self): | 166 | def system_settings_page(self): |
| 4561 | 160 | return self.select_single(objectName='systemSettingsPage') | 167 | return self.select_single(objectName='systemSettingsPage') |
| 4562 | @@ -1821,7 +1828,7 @@ | |||
| 4563 | 1821 | 1828 | ||
| 4564 | 1822 | @autopilot.logging.log_action(logger.debug) | 1829 | @autopilot.logging.log_action(logger.debug) |
| 4565 | 1823 | def _select_network(self, name): | 1830 | def _select_network(self, name): |
| 4567 | 1824 | net = self.select_single('Standard', text=name) | 1831 | net = self.select_single('StandardProgression', text=name) |
| 4568 | 1825 | self.pointing_device.click_object(net) | 1832 | self.pointing_device.click_object(net) |
| 4569 | 1826 | 1833 | ||
| 4570 | 1827 | 1834 | ||
| 4571 | 1828 | 1835 | ||
| 4572 | === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py' | |||
| 4573 | --- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py 2016-06-14 11:44:19 +0000 | |||
| 4574 | +++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py 2016-07-22 14:36:34 +0000 | |||
| 4575 | @@ -1,5 +1,5 @@ | |||
| 4576 | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- |
| 4578 | 2 | # Copyright 2014 Canonical | 2 | # Copyright 2014-2016 Canonical |
| 4579 | 3 | # | 3 | # |
| 4580 | 4 | # This program is free software: you can redistribute it and/or modify it | 4 | # This program is free software: you can redistribute it and/or modify it |
| 4581 | 5 | # under the terms of the GNU General Public License version 3, as published | 5 | # under the terms of the GNU General Public License version 3, as published |
| 4582 | @@ -11,6 +11,7 @@ | |||
| 4583 | 11 | from autopilot.introspection.dbus import StateNotFoundError | 11 | from autopilot.introspection.dbus import StateNotFoundError |
| 4584 | 12 | from autopilot.matchers import Eventually | 12 | from autopilot.matchers import Eventually |
| 4585 | 13 | from testtools.matchers import Equals, raises, StartsWith | 13 | from testtools.matchers import Equals, raises, StartsWith |
| 4586 | 14 | from unittest import skip | ||
| 4587 | 14 | 15 | ||
| 4588 | 15 | from ubuntu_system_settings.tests import ( | 16 | from ubuntu_system_settings.tests import ( |
| 4589 | 16 | CellularBaseTestCase, RDO_IFACE, | 17 | CellularBaseTestCase, RDO_IFACE, |
| 4590 | @@ -292,6 +293,7 @@ | |||
| 4591 | 292 | 293 | ||
| 4592 | 293 | class ApnTestCase(CellularBaseTestCase): | 294 | class ApnTestCase(CellularBaseTestCase): |
| 4593 | 294 | 295 | ||
| 4594 | 296 | @skip('Skip until we can get the CPO for ListItem trigger actions') | ||
| 4595 | 295 | def test_remove_apn(self): | 297 | def test_remove_apn(self): |
| 4596 | 296 | self.add_connection_context(self.modem_0, Type='mms', Name='Failed') | 298 | self.add_connection_context(self.modem_0, Type='mms', Name='Failed') |
| 4597 | 297 | contexts = self.modem_0.connMan.GetContexts() | 299 | contexts = self.modem_0.connMan.GetContexts() |
| 4598 | 298 | 300 | ||
| 4599 | === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_search.py' | |||
| 4600 | --- tests/autopilot/ubuntu_system_settings/tests/test_search.py 2015-07-20 17:25:20 +0000 | |||
| 4601 | +++ tests/autopilot/ubuntu_system_settings/tests/test_search.py 2016-07-22 14:36:34 +0000 | |||
| 4602 | @@ -1,5 +1,5 @@ | |||
| 4603 | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- |
| 4605 | 2 | # Copyright 2013 Canonical | 2 | # Copyright 2013-2016 Canonical |
| 4606 | 3 | # | 3 | # |
| 4607 | 4 | # This program is free software: you can redistribute it and/or modify it | 4 | # This program is free software: you can redistribute it and/or modify it |
| 4608 | 5 | # under the terms of the GNU General Public License version 3, as published | 5 | # under the terms of the GNU General Public License version 3, as published |
| 4609 | @@ -31,6 +31,7 @@ | |||
| 4610 | 31 | 'EntryComponent') | 31 | 'EntryComponent') |
| 4611 | 32 | 32 | ||
| 4612 | 33 | def _type_into_search_box(self, text): | 33 | def _type_into_search_box(self, text): |
| 4613 | 34 | self.main_view.click_header_action('searchAction') | ||
| 4614 | 34 | search_box = self.main_view.select_single( | 35 | search_box = self.main_view.select_single( |
| 4615 | 35 | objectName='searchTextField' | 36 | objectName='searchTextField' |
| 4616 | 36 | ) | 37 | ) |
| 4617 | 37 | 38 | ||
| 4618 | === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py' | |||
| 4619 | --- tests/autopilot/ubuntu_system_settings/tests/test_security.py 2015-09-21 13:36:13 +0000 | |||
| 4620 | +++ tests/autopilot/ubuntu_system_settings/tests/test_security.py 2016-07-22 14:36:34 +0000 | |||
| 4621 | @@ -1,5 +1,5 @@ | |||
| 4622 | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | 1 | # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- |
| 4624 | 2 | # Copyright 2014 Canonical | 2 | # Copyright 2014-2016 Canonical |
| 4625 | 3 | # | 3 | # |
| 4626 | 4 | # This program is free software: you can redistribute it and/or modify it | 4 | # This program is free software: you can redistribute it and/or modify it |
| 4627 | 5 | # under the terms of the GNU General Public License version 3, as published | 5 | # under the terms of the GNU General Public License version 3, as published |
| 4628 | @@ -199,12 +199,12 @@ | |||
| 4629 | 199 | elif actTimeout is 60: | 199 | elif actTimeout is 60: |
| 4630 | 200 | self.assertEquals( | 200 | self.assertEquals( |
| 4631 | 201 | activityTimeout, | 201 | activityTimeout, |
| 4633 | 202 | ('{:d} minute').format(int(actTimeout/60)) | 202 | ('After {:d} minute').format(int(actTimeout/60)) |
| 4634 | 203 | ) | 203 | ) |
| 4635 | 204 | else: | 204 | else: |
| 4636 | 205 | self.assertEquals( | 205 | self.assertEquals( |
| 4637 | 206 | activityTimeout, | 206 | activityTimeout, |
| 4639 | 207 | ('{:d} minutes').format(int(actTimeout/60)) | 207 | ('After {:d} minutes').format(int(actTimeout/60)) |
| 4640 | 208 | ) | 208 | ) |
| 4641 | 209 | 209 | ||
| 4642 | 210 | def test_idle_never_timeout(self): | 210 | def test_idle_never_timeout(self): |
FAILED: Continuous integration, rev:1563
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/