1
=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
2
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-09-29 12:28:10 +0000
3
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2016-09-08 16:49:32 +0000
4
@@ -20,25 +20,42 @@
5
20
20
6
21
import QtQuick 2.4
21
import QtQuick 2.4
7
22
import Ubuntu.Components 1.3
22
import Ubuntu.Components 1.3
8
23
import Ubuntu.Components.ListItems 1.3 as ListItem
9
24
import "../.."
23
import "../.."
10
25
24
11
26
Page {
25
Page {
12
27
    id: root
26
    id: root
13
28
14
29
    title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title :
15
30
                                                              indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName
16
31
                                                                                                                        : ""
17
32
    property variant indicatorProperties
27
    property variant indicatorProperties
18
33
28
19
29
    header: PageHeader {
20
30
        title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title :
21
31
                                                                  indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName
22
32
                                                                                                                            : identifier
23
33
    }
24
34
25
34
    anchors.fill: parent
35
    anchors.fill: parent
26
35
36
28
36
    ListItem.Standard {
37
    ListItem {
29
38
        color: theme.palette.highlighted.background
30
37
        id: visualCheckItem
39
        id: visualCheckItem
35
38
        text: "Enable Visual Representation"
40
36
39
        control: Switch {
41
        anchors {
37
40
            id: visualCheck
42
            top: header.bottom
38
41
            checked: true
43
            left: parent.left
39
44
            right: parent.right
40
45
        }
41
46
42
47
        height: selectorLayout.height
43
48
        onClicked: visualCheck.checked = !visualCheck.checked
44
49
45
50
        ListItemLayout {
46
51
            id: selectorLayout
47
52
            title.text: "Enable Visual Representation"
48
53
49
54
            Switch {
50
55
                id: visualCheck
51
56
                checked: true
52
57
                SlotsLayout.position: SlotsLayout.Trailing
53
58
            }
54
42
        }
59
        }
55
43
    }
60
    }
56
44
61
57
@@ -48,11 +65,6 @@
58
48
        clip:true
65
        clip:true
59
49
        asynchronous: true
66
        asynchronous: true
60
50
67
61
51
        Rectangle {
62
52
            anchors.fill: pageLoader
63
53
            color: "#221e1c" // FIXME not in palette yet
64
54
        }
65
55
66
56
        anchors {
68
        anchors {
67
57
            top: visualCheckItem.bottom
69
            top: visualCheckItem.bottom
68
58
            left: parent.left
70
            left: parent.left
69
@@ -92,13 +104,5 @@
70
92
            margins: units.gu(1)
104
            margins: units.gu(1)
71
93
        }
105
        }
72
94
        height: childrenRect.height
106
        height: childrenRect.height
73
95
74
96
        Button {
75
97
            anchors {
76
98
                left: parent.left
77
99
            }
78
100
            text: "Back"
79
101
            onClicked: root.pageStack.reset()
80
102
        }
81
103
    }
107
    }
82
104
}
108
}
83
105
109
84
=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
85
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2016-06-14 10:32:17 +0000
86
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2016-09-08 16:49:32 +0000
87
@@ -21,8 +21,8 @@
88
21
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
89
22
22
90
23
Rectangle {
23
Rectangle {
91
24
    id: root
92
24
    color: theme.palette.normal.background
25
    color: theme.palette.normal.background
93
25
    id: root
94
26
26
95
27
    Component.onCompleted: {
27
    Component.onCompleted: {
96
28
        theme.name = "Ubuntu.Components.Themes.SuruDark"
28
        theme.name = "Ubuntu.Components.Themes.SuruDark"
97
29
29
98
=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
99
--- qml/Panel/Indicators/client/IndicatorsList.qml	2016-06-14 10:32:17 +0000
100
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2016-09-08 16:49:32 +0000
101
@@ -1,5 +1,5 @@
102
1
/*
1
/*
104
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013-2016 Canonical Ltd.
105
3
 *
3
 *
106
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
107
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
108
@@ -15,11 +15,11 @@
109
15
 *
15
 *
110
16
 * Authors:
16
 * Authors:
111
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
17
 *      Renato Araujo Oliveira Filho <renato@canonical.com>
112
18
 *      Marco Trevisan <marco.trevisan@canonical.com>
113
18
 */
19
 */
114
19
20
115
20
import QtQuick 2.4
21
import QtQuick 2.4
116
21
import Ubuntu.Components 1.3
22
import Ubuntu.Components 1.3
117
22
import Ubuntu.Components.ListItems 1.3 as ListItem
118
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
119
24
import "../.."
24
import "../.."
120
25
25
121
@@ -27,7 +27,9 @@
122
27
    id: page
27
    id: page
123
28
    anchors.fill: parent
28
    anchors.fill: parent
124
29
    property string profile: ""
29
    property string profile: ""
126
30
    title: "Plugin list"
30
    header: PageHeader {
127
31
        title: "Indicators List"
128
32
    }
129
31
33
130
32
    Indicators.IndicatorsModel {
34
    Indicators.IndicatorsModel {
131
33
        id: indicatorsModel
35
        id: indicatorsModel
132
@@ -41,32 +43,24 @@
133
41
        anchors.fill: parent
43
        anchors.fill: parent
134
42
        model: indicatorsModel
44
        model: indicatorsModel
135
43
45
144
44
        delegate: Rectangle {
46
        delegate: ListItem {
145
45
            color: "#221e1c"
47
            objectName: identifier
146
46
48
            height: menuItem.height + (divider.visible ? divider.height : 0)
147
47
            anchors.left: parent.left
49
148
48
            anchors.right: parent.right
50
            ListItemLayout {
141
49
            height: menuItem.height
142
50
143
51
            ListItem.Standard {
149
52
                id: menuItem
51
                id: menuItem
166
53
                anchors.left: parent.left
52
                title.text: identifier
167
54
                anchors.right: parent.right
53
            }
168
55
                objectName: identifier
54
169
56
55
            onClicked: {
170
57
                text: identifier
56
                var new_page = Qt.createComponent("IndicatorRepresentation.qml");
171
58
57
                if (new_page.status !== Component.Ready) {
172
59
                onClicked: {
58
                    if (new_page.status === Component.Error)
173
60
                    var new_page = Qt.createComponent("IndicatorRepresentation.qml");
59
                        console.error("Error: " + new_page.errorString());
174
61
                    if (new_page.status !== Component.Ready) {
60
175
62
                        if (new_page.status === Component.Error)
61
                    return;
160
63
                            console.error("Error: " + new_page.errorString());
161
64
162
65
                        return;
163
66
                    }
164
67
165
68
                    page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
176
69
                }
62
                }
177
63
                page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
178
70
            }
64
            }
179
71
        }
65
        }
180
72
    }
66
    }
181
73
67
182
=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
183
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2015-07-15 15:07:19 +0000
184
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2016-09-08 16:49:32 +0000
185
@@ -30,14 +30,10 @@
186
30
        model: root.menuModel
30
        model: root.menuModel
187
31
    }
31
    }
188
32
32
190
33
    Flickable {
33
    TextArea {
191
34
        anchors.fill: parent
34
        anchors.fill: parent
199
35
        contentHeight: all_data.height
35
        anchors.margins: units.gu(0.5)
200
36
        clip:true
36
        id: all_data
201
37
        Text {
37
        text: printer.text
195
38
            id: all_data
196
39
            color: "white"
197
40
            text: printer.text
198
41
        }
202
42
    }
38
    }
203
43
}
39
}
Status:	Merged
Approved by:	Michał Sawicz on 2016-09-09
Approved revision:	2453
Merged at revision:	2648
Proposed branch:	lp:~3v1n0/unity8/indicators-client-modernize
Merge into:	lp:unity8
Prerequisite:	lp:~3v1n0/unity8/fake-indicators-model
Diff against target:	203 lines (+53/-59) 4 files modified qml/Panel/Indicators/client/IndicatorRepresentation.qml (+27/-23) qml/Panel/Indicators/client/IndicatorsClient.qml (+1/-1) qml/Panel/Indicators/client/IndicatorsList.qml (+21/-27) qml/Panel/Indicators/client/IndicatorsTree.qml (+4/-8)
To merge this branch:	bzr merge lp:~3v1n0/unity8/indicators-client-modernize
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-09-09
Michał Sawicz			Abstain on 2016-09-09
Albert Astals Cid (community)		2016-06-15	Approve on 2016-08-08
Review via email: mp+297518@code.launchpad.net
1	=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
2	--- qml/Panel/Indicators/client/IndicatorRepresentation.qml 2015-09-29 12:28:10 +0000
3	+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml 2016-09-08 16:49:32 +0000
4	@@ -20,25 +20,42 @@
5	20		20
6	21	import QtQuick 2.4	21	import QtQuick 2.4
7	22	import Ubuntu.Components 1.3	22	import Ubuntu.Components 1.3
8	23	import Ubuntu.Components.ListItems 1.3 as ListItem
9	24	import "../.."	23	import "../.."
10	25		24
11	26	Page {	25	Page {
12	27	id: root	26	id: root
13	28
14	29	title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title :
15	30	indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName
16	31	: ""
17	32	property variant indicatorProperties	27	property variant indicatorProperties
18	33		28
19			29	header: PageHeader {
20			30	title: indicatorProperties && indicatorProperties.title ? indicatorProperties.title :
21			31	indicatorProperties && indicatorProperties.accessibleName ? indicatorProperties.accessibleName
22			32	: identifier
23			33	}
24			34
25	34	anchors.fill: parent	35	anchors.fill: parent
26	35		36
28	36	ListItem.Standard {	37	ListItem {
29			38	color: theme.palette.highlighted.background
30	37	id: visualCheckItem	39	id: visualCheckItem
35	38	text: "Enable Visual Representation"	40
36	39	control: Switch {	41	anchors {
37	40	id: visualCheck	42	top: header.bottom
38	41	checked: true	43	left: parent.left
39			44	right: parent.right
40			45	}
41			46
42			47	height: selectorLayout.height
43			48	onClicked: visualCheck.checked = !visualCheck.checked
44			49
45			50	ListItemLayout {
46			51	id: selectorLayout
47			52	title.text: "Enable Visual Representation"
48			53
49			54	Switch {
50			55	id: visualCheck
51			56	checked: true
52			57	SlotsLayout.position: SlotsLayout.Trailing
53			58	}
54	42	}	59	}
55	43	}	60	}
56	44		61
57	@@ -48,11 +65,6 @@
58	48	clip:true	65	clip:true
59	49	asynchronous: true	66	asynchronous: true
60	50		67
61	51	Rectangle {
62	52	anchors.fill: pageLoader
63	53	color: "#221e1c" // FIXME not in palette yet
64	54	}
65	55
66	56	anchors {	68	anchors {
67	57	top: visualCheckItem.bottom	69	top: visualCheckItem.bottom
68	58	left: parent.left	70	left: parent.left
69	@@ -92,13 +104,5 @@
70	92	margins: units.gu(1)	104	margins: units.gu(1)
71	93	}	105	}
72	94	height: childrenRect.height	106	height: childrenRect.height
73	95
74	96	Button {
75	97	anchors {
76	98	left: parent.left
77	99	}
78	100	text: "Back"
79	101	onClicked: root.pageStack.reset()
80	102	}
81	103	}	107	}
82	104	}	108	}
83	105		109
84	=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
85	--- qml/Panel/Indicators/client/IndicatorsClient.qml 2016-06-14 10:32:17 +0000
86	+++ qml/Panel/Indicators/client/IndicatorsClient.qml 2016-09-08 16:49:32 +0000
87	@@ -21,8 +21,8 @@
88	21	import Ubuntu.Components 1.3	21	import Ubuntu.Components 1.3
89	22		22
90	23	Rectangle {	23	Rectangle {
91			24	id: root
92	24	color: theme.palette.normal.background	25	color: theme.palette.normal.background
93	25	id: root
94	26		26
95	27	Component.onCompleted: {	27	Component.onCompleted: {
96	28	theme.name = "Ubuntu.Components.Themes.SuruDark"	28	theme.name = "Ubuntu.Components.Themes.SuruDark"
97	29		29
98	=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
99	--- qml/Panel/Indicators/client/IndicatorsList.qml 2016-06-14 10:32:17 +0000
100	+++ qml/Panel/Indicators/client/IndicatorsList.qml 2016-09-08 16:49:32 +0000
101	@@ -1,5 +1,5 @@
102	1	/*	1	/*
104	2	* Copyright 2013 Canonical Ltd.	2	* Copyright 2013-2016 Canonical Ltd.
105	3	*	3	*
106	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
107	5	* it under the terms of the GNU Lesser General Public License as published by	5	* it under the terms of the GNU Lesser General Public License as published by
108	@@ -15,11 +15,11 @@
109	15	*	15	*
110	16	* Authors:	16	* Authors:
111	17	* Renato Araujo Oliveira Filho <renato@canonical.com>	17	* Renato Araujo Oliveira Filho <renato@canonical.com>
112			18	* Marco Trevisan <marco.trevisan@canonical.com>
113	18	*/	19	*/
114	19		20
115	20	import QtQuick 2.4	21	import QtQuick 2.4
116	21	import Ubuntu.Components 1.3	22	import Ubuntu.Components 1.3
117	22	import Ubuntu.Components.ListItems 1.3 as ListItem
118	23	import Unity.Indicators 0.1 as Indicators	23	import Unity.Indicators 0.1 as Indicators
119	24	import "../.."	24	import "../.."
120	25		25
121	@@ -27,7 +27,9 @@
122	27	id: page	27	id: page
123	28	anchors.fill: parent	28	anchors.fill: parent
124	29	property string profile: ""	29	property string profile: ""
126	30	title: "Plugin list"	30	header: PageHeader {
127			31	title: "Indicators List"
128			32	}
129	31		33
130	32	Indicators.IndicatorsModel {	34	Indicators.IndicatorsModel {
131	33	id: indicatorsModel	35	id: indicatorsModel
132	@@ -41,32 +43,24 @@
133	41	anchors.fill: parent	43	anchors.fill: parent
134	42	model: indicatorsModel	44	model: indicatorsModel
135	43		45
144	44	delegate: Rectangle {	46	delegate: ListItem {
145	45	color: "#221e1c"	47	objectName: identifier
146	46		48	height: menuItem.height + (divider.visible ? divider.height : 0)
147	47	anchors.left: parent.left	49
148	48	anchors.right: parent.right	50	ListItemLayout {
141	49	height: menuItem.height
142	50
143	51	ListItem.Standard {
149	52	id: menuItem	51	id: menuItem
166	53	anchors.left: parent.left	52	title.text: identifier
167	54	anchors.right: parent.right	53	}
168	55	objectName: identifier	54
169	56		55	onClicked: {
170	57	text: identifier	56	var new_page = Qt.createComponent("IndicatorRepresentation.qml");
171	58		57	if (new_page.status !== Component.Ready) {
172	59	onClicked: {	58	if (new_page.status === Component.Error)
173	60	var new_page = Qt.createComponent("IndicatorRepresentation.qml");	59	console.error("Error: " + new_page.errorString());
174	61	if (new_page.status !== Component.Ready) {	60
175	62	if (new_page.status === Component.Error)	61	return;
160	63	console.error("Error: " + new_page.errorString());
161	64
162	65	return;
163	66	}
164	67
165	68	page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
176	69	}	62	}
177			63	page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
178	70	}	64	}
179	71	}	65	}
180	72	}	66	}
181	73		67
182	=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
183	--- qml/Panel/Indicators/client/IndicatorsTree.qml 2015-07-15 15:07:19 +0000
184	+++ qml/Panel/Indicators/client/IndicatorsTree.qml 2016-09-08 16:49:32 +0000
185	@@ -30,14 +30,10 @@
186	30	model: root.menuModel	30	model: root.menuModel
187	31	}	31	}
188	32		32
190	33	Flickable {	33	TextArea {
191	34	anchors.fill: parent	34	anchors.fill: parent
199	35	contentHeight: all_data.height	35	anchors.margins: units.gu(0.5)
200	36	clip:true	36	id: all_data
201	37	Text {	37	text: printer.text
195	38	id: all_data
196	39	color: "white"
197	40	text: printer.text
198	41	}
202	42	}	38	}
203	43	}	39	}