git.iko.soy/unity8
on xenial help sign in
More stuff addressed
3c508c3Andrea Cimitan
qml/Dash/DashContent.qml+1−1
compare with xenial
unifiedsplit
@@ -138,9 +138,9 @@ Item {
138
138
139 readonly property bool moving: item ? item.moving : false
139 readonly property bool moving: item ? item.moving : false
140 readonly property bool navigationShown: item ? item.navigationShown : false
140 readonly property bool navigationShown: item ? item.navigationShown : false
141+ readonly property bool settingsShown: item ? item.settingsShown : false
141 readonly property var categoryView: item ? item.categoryView : null
142 readonly property var categoryView: item ? item.categoryView : null
142 readonly property var theScope: scope
143 readonly property var theScope: scope
143− readonly property bool settingsShown: item ? item.settingsShown : false
144
144
145 // these are needed for autopilot tests
145 // these are needed for autopilot tests
146 readonly property string scopeId: scope.id
146 readonly property string scopeId: scope.id
qml/Dash/GenericScopeView.qml+4−4
@@ -469,10 +469,10 @@ FocusScope {
469 property int initialIndex: -1
469 property int initialIndex: -1
470 property var model: null
470 property var model: null
471
471
472− readonly property bool processing: status === Loader.Ready && item.hasOwnProperty("processing") ? item.processing : false
472+ readonly property bool processing: item && item.processing || false
473− readonly property int count: status === Loader.Ready && item.hasOwnProperty("count") ? item.count : 0
473+ readonly property int count: item && item.count || 0
474− readonly property int currentIndex: status === Loader.Ready && item.hasOwnProperty("currentIndex") ? item.currentIndex : false
474+ readonly property int currentIndex: item && item.currentIndex || -1
475− readonly property var currentItem: status === Loader.Ready && item.hasOwnProperty("currentItem") ? item.currentItem : false
475+ readonly property var currentItem: item && item.currentItem || null
476
476
477 property string subPage: ""
477 property string subPage: ""
478 readonly property bool previewShown: open && subPage == "preview"
478 readonly property bool previewShown: open && subPage == "preview"
qml/Dash/PageHeader.qml−1
@@ -47,7 +47,6 @@ Item {
47 property var scopeStyle: null
47 property var scopeStyle: null
48
48
49 signal backClicked()
49 signal backClicked()
50−
51 signal settingsClicked()
50 signal settingsClicked()
52
51
53 onScopeStyleChanged: refreshLogo()
52 onScopeStyleChanged: refreshLogo()
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+2−1
@@ -40,7 +40,8 @@ ScopeSetting {
40 }
40 }
41 text: widgetData.displayName
41 text: widgetData.displayName
42 elide: Text.ElideMiddle
42 elide: Text.ElideMiddle
43+ maximumLineCount: 1
43− color: scopeStyle ? scopeStyle.foreground : "grey"
44+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
44 }
45 }
45
46
46 CheckBox {
47 CheckBox {
qml/Dash/ScopeSettings/ScopeSettingNumber.qml+2−54
@@ -15,59 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18−import Ubuntu.Components 1.1
19−import Ubuntu.Components.ListItems 1.0 as ListItem
20
18
21−ScopeSetting {
19+ScopeSettingString {
22− id: root
20+ mode: "number"
23− height: listItem.height
24−
25− ListItem.Empty {
26− id: listItem
27− onClicked: {
28− control.forceActiveFocus();
29− control.selectAll();
30− }
31−
32− Label {
33− anchors {
34− left: parent.left
35− leftMargin: __margins
36− right: control.left
37− rightMargin: units.gu(1)
38− verticalCenter: parent.verticalCenter
39− }
40− text: widgetData.displayName
41− elide: Text.ElideMiddle
42− color: scopeStyle ? scopeStyle.foreground : "grey"
43− }
44−
45− TextField {
46− id: control
47− objectName: "control"
48− anchors {
49− right: parent.right
50− rightMargin: __margins
51− verticalCenter: parent.verticalCenter
52− }
53− text: widgetData.value
54− width: units.gu(8)
55− validator: DoubleValidator {}
56− hasClearButton: false
57−
58− function updateText() {
59− if (acceptableInput) {
60− text = displayText;
61− root.updated(text);
62− }
63− }
64−
65− onAccepted: updateText()
66− onActiveFocusChanged: {
67− if (!activeFocus) {
68− updateText();
69− }
70− }
71− }
72− }
73}
21}
qml/Dash/ScopeSettings/ScopeSettingString.qml+16−4
@@ -22,6 +22,8 @@ ScopeSetting {
22 id: root
22 id: root
23 height: listItem.height
23 height: listItem.height
24
24
25+ property string mode: "string"
26+
25 ListItem.Empty {
27 ListItem.Empty {
26 id: listItem
28 id: listItem
27 onClicked: {
29 onClicked: {
@@ -40,7 +42,8 @@ ScopeSetting {
40 }
42 }
41 text: widgetData.displayName
43 text: widgetData.displayName
42 elide: Text.ElideMiddle
44 elide: Text.ElideMiddle
45+ maximumLineCount: 1
43− color: scopeStyle ? scopeStyle.foreground : "grey"
46+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
44 }
47 }
45
48
46 TextField {
49 TextField {
@@ -51,12 +54,21 @@ ScopeSetting {
51 rightMargin: __margins
54 rightMargin: __margins
52 verticalCenter: parent.verticalCenter
55 verticalCenter: parent.verticalCenter
53 }
56 }
54− width: units.gu(12)
57+ width: root.mode == "number" ? units.gu(8) : units.gu(12)
55 text: widgetData.value
58 text: widgetData.value
59+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
60+ validator: root.mode == "number" ? doubleValidator : null
61+ hasClearButton: root.mode == "number" ? false : true
62+
63+ DoubleValidator {
64+ id: doubleValidator
65+ }
56
66
57 function updateText() {
67 function updateText() {
68+ if (acceptableInput) {
58− text = displayText;
69+ text = displayText;
59− root.updated(text);
70+ root.updated(text);
71+ }
60 }
72 }
61
73
62 onAccepted: updateText()
74 onAccepted: updateText()
qml/Dash/ScopeSettings/ScopeSettings.qmldeleted−34
@@ -1,34 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.2
18−import Ubuntu.Components 1.1
19−
20−ListView {
21− //! The ScopeStyle component.
22− property var scopeStyle: null
23−
24− orientation: ListView.Vertical
25−
26− delegate: ScopeSettingsWidgetFactory {
27− objectName: "scopeSettingItem" + index
28− width: root.width
29− widgetData: model
30− scopeStyle: root.scopeStyle
31−
32− onUpdated: model.value = value;
33− }
34−}
qml/Dash/ScopeSettingsPage.qml+10−2
@@ -34,13 +34,12 @@ Item {
34 width: parent.width
34 width: parent.width
35 title: scope ? scope.name : ""
35 title: scope ? scope.name : ""
36 showBackButton: true
36 showBackButton: true
37− searchEntryEnabled: false
38 scopeStyle: root.scopeStyle || undefined
37 scopeStyle: root.scopeStyle || undefined
39
38
40 onBackClicked: root.backClicked()
39 onBackClicked: root.backClicked()
41 }
40 }
42
41
43− ScopeSettings {
42+ ListView {
44 id: scopeSettings
43 id: scopeSettings
45 objectName: "scopeSettings"
44 objectName: "scopeSettings"
46 anchors {
45 anchors {
@@ -50,5 +49,14 @@ Item {
50 right: parent.right
49 right: parent.right
51 }
50 }
52 model: root.scope ? root.scope.settings : null
51 model: root.scope ? root.scope.settings : null
52+
53+ delegate: ScopeSettingsWidgetFactory {
54+ objectName: "scopeSettingItem" + index
55+ width: root.width
56+ widgetData: model
57+ scopeStyle: root.scopeStyle
58+
59+ onUpdated: model.value = value;
60+ }
53 }
61 }
54}
62}