1
=== modified file 'EventBubble.qml'
2
--- EventBubble.qml	2014-09-08 10:21:19 +0000
3
+++ EventBubble.qml	2014-09-19 07:44:22 +0000
4
@@ -15,7 +15,8 @@
5
15
 * You should have received a copy of the GNU General Public License
15
 * You should have received a copy of the GNU General Public License
6
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
7
17
 */
17
 */
9
18
import QtQuick 2.0
18
10
19
import QtQuick 2.3
11
19
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.1
12
20
21
13
21
Item{
22
Item{
14
@@ -40,8 +41,6 @@
15
40
    UbuntuShape{
41
    UbuntuShape{
16
41
        id: bg
42
        id: bg
17
42
        anchors.fill: parent
43
        anchors.fill: parent
18
43
        color: "white"
19
44
        gradientColor: "#F5F5F5"
20
45
    }
44
    }
21
46
45
22
47
    function resize() {
46
    function resize() {
23
@@ -126,10 +125,10 @@
24
126
                timeLabel.text = event.displayLabel;
125
                timeLabel.text = event.displayLabel;
25
127
        }
126
        }
26
128
127
31
129
       if(model) {
128
        if(model) {
32
130
           var collection = model.collection( event.collectionId );
129
            var collection = model.collection( event.collectionId );
33
131
           calendarIndicator.color = collection.color
130
            bg.color = collection.color
34
132
       }
131
        }
35
133
132
36
134
        layoutBubbleDetails();
133
        layoutBubbleDetails();
37
135
    }
134
    }
38
@@ -161,47 +160,41 @@
39
161
        width: parent.width
160
        width: parent.width
40
162
        height: detailsColumn.height
161
        height: detailsColumn.height
41
163
162
43
164
        Column{
163
        Column {
44
165
            id: detailsColumn
164
            id: detailsColumn
45
166
165
46
167
            anchors {
166
            anchors {
48
168
                top: parent.top; left: parent.left; right: parent.right; margins: units.gu(1)
167
                top: parent.top
49
168
                left: parent.left
50
169
                right: parent.right
51
170
                margins: units.gu(1)
52
169
            }
171
            }
53
170
172
55
171
            Row{
173
            Label {
56
174
                id: timeLabel
57
175
                objectName: "timeLabel"
58
176
                color: "White"
59
177
                fontSize:"small"
60
178
                font.bold: true
61
172
                width: parent.width
179
                width: parent.width
62
180
            }
63
173
181
80
174
                Label{
182
            Label {
65
175
                    id: timeLabel
66
176
                    objectName: "timeLabel"
67
177
                    fontSize:"small";
68
178
                    color:"gray"
69
179
                    width: parent.width - calendarIndicator.width
70
180
                }
71
181
                Rectangle{
72
182
                    id: calendarIndicator
73
183
                    width: units.gu(1)
74
184
                    radius: width/2
75
185
                    height: width
76
186
                    color: "#715772"
77
187
                }
78
188
            }
79
189
            Label{
81
190
                id: titleLabel
183
                id: titleLabel
82
191
                objectName: "titleLabel"
184
                objectName: "titleLabel"
83
185
                color: "White"
84
192
                fontSize: "small"
186
                fontSize: "small"
86
193
                color: "black"
187
                width: parent.width
87
194
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
188
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
88
195
                width: parent.width
89
196
            }
189
            }
90
197
190
92
198
            Label{
191
            Label {
93
199
                id: descriptionLabel
192
                id: descriptionLabel
97
200
                fontSize: "small"
193
                color: "White"
98
201
                color:"gray"
194
                fontSize: "x-small"
96
202
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
99
203
                width: parent.width
195
                width: parent.width
100
204
                visible: type == wideType
196
                visible: type == wideType
101
197
                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
102
205
            }
198
            }
103
206
        }
199
        }
104
207
    }
200
    }
Reviewer	Review Type	Date Requested	Status
Mihir Soni		2014-09-18	Approve on 2014-09-19
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-09-19
Review via email: mp+235137@code.launchpad.net
1	=== modified file 'EventBubble.qml'
2	--- EventBubble.qml 2014-09-08 10:21:19 +0000
3	+++ EventBubble.qml 2014-09-19 07:44:22 +0000
4	@@ -15,7 +15,8 @@
5	15	* You should have received a copy of the GNU General Public License	15	* You should have received a copy of the GNU General Public License
6	16	* along with this program. If not, see <http://www.gnu.org/licenses/>.	16	* along with this program. If not, see <http://www.gnu.org/licenses/>.
7	17	*/	17	*/
9	18	import QtQuick 2.0	18
10			19	import QtQuick 2.3
11	19	import Ubuntu.Components 1.1	20	import Ubuntu.Components 1.1
12	20		21
13	21	Item{	22	Item{
14	@@ -40,8 +41,6 @@
15	40	UbuntuShape{	41	UbuntuShape{
16	41	id: bg	42	id: bg
17	42	anchors.fill: parent	43	anchors.fill: parent
18	43	color: "white"
19	44	gradientColor: "#F5F5F5"
20	45	}	44	}
21	46		45
22	47	function resize() {	46	function resize() {
23	@@ -126,10 +125,10 @@
24	126	timeLabel.text = event.displayLabel;	125	timeLabel.text = event.displayLabel;
25	127	}	126	}
26	128		127
31	129	if(model) {	128	if(model) {
32	130	var collection = model.collection( event.collectionId );	129	var collection = model.collection( event.collectionId );
33	131	calendarIndicator.color = collection.color	130	bg.color = collection.color
34	132	}	131	}
35	133		132
36	134	layoutBubbleDetails();	133	layoutBubbleDetails();
37	135	}	134	}
38	@@ -161,47 +160,41 @@
39	161	width: parent.width	160	width: parent.width
40	162	height: detailsColumn.height	161	height: detailsColumn.height
41	163		162
43	164	Column{	163	Column {
44	165	id: detailsColumn	164	id: detailsColumn
45	166		165
46	167	anchors {	166	anchors {
48	168	top: parent.top; left: parent.left; right: parent.right; margins: units.gu(1)	167	top: parent.top
49			168	left: parent.left
50			169	right: parent.right
51			170	margins: units.gu(1)
52	169	}	171	}
53	170		172
55	171	Row{	173	Label {
56			174	id: timeLabel
57			175	objectName: "timeLabel"
58			176	color: "White"
59			177	fontSize:"small"
60			178	font.bold: true
61	172	width: parent.width	179	width: parent.width
62			180	}
63	173		181
80	174	Label{	182	Label {
65	175	id: timeLabel
66	176	objectName: "timeLabel"
67	177	fontSize:"small";
68	178	color:"gray"
69	179	width: parent.width - calendarIndicator.width
70	180	}
71	181	Rectangle{
72	182	id: calendarIndicator
73	183	width: units.gu(1)
74	184	radius: width/2
75	185	height: width
76	186	color: "#715772"
77	187	}
78	188	}
79	189	Label{
81	190	id: titleLabel	183	id: titleLabel
82	191	objectName: "titleLabel"	184	objectName: "titleLabel"
83			185	color: "White"
84	192	fontSize: "small"	186	fontSize: "small"
86	193	color: "black"	187	width: parent.width
87	194	wrapMode: Text.WrapAtWordBoundaryOrAnywhere	188	wrapMode: Text.WrapAtWordBoundaryOrAnywhere
88	195	width: parent.width
89	196	}	189	}
90	197		190
92	198	Label{	191	Label {
93	199	id: descriptionLabel	192	id: descriptionLabel
97	200	fontSize: "small"	193	color: "White"
98	201	color:"gray"	194	fontSize: "x-small"
96	202	wrapMode: Text.WrapAtWordBoundaryOrAnywhere
99	203	width: parent.width	195	width: parent.width
100	204	visible: type == wideType	196	visible: type == wideType
101			197	wrapMode: Text.WrapAtWordBoundaryOrAnywhere
102	205	}	198	}
103	206	}	199	}
104	207	}	200	}