Ubuntu Calendar App

Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946 into lp:ubuntu-calendar-app

  1. ubuntu-calendar-app-fix_1556946
  2. Merge into trunk
Proposed by Arthur Mello
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 799
Merged at revision: 798
Proposed branch: lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946
Merge into: lp:ubuntu-calendar-app
Diff against target: 173 lines (+29/-24)
3 files modified
EventRepetition.qml (+5/-0)
NewEvent.qml (+23/-24)
NewEventTimePicker.qml (+1/-0)
To merge this branch: bzr merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Needs Information
Review via email: mp+289838@code.launchpad.net

Commit message

Fix label colors on ListItems

Description of the change

Fix label colors on ListItems

To post a comment you must log in.
lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946 updated
795. By Arthur Mello

Fix typo

796. By Arthur Mello

Remove unnecessary divider

797. By Arthur Mello

Remove unnecessary divider

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Szymon is working on the new event page and has already fixed the issues in this MP. The only thing still left is for him to merge trunk (fix conflicts) and then approve. His MP can be found at https://code.launchpad.net/~majster-pl/ubuntu-calendar-app/new-event-page/+merge/288637.

Renato already did the code review and found it to be good.

Revision history for this message
Nekhelesh Ramananthan (nik90) :
review: Needs Information
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> Szymon is working on the new event page and has already fixed the issues in
> this MP. The only thing still left is for him to merge trunk (fix conflicts)
> and then approve. His MP can be found at https://code.launchpad.net/~majster-
> pl/ubuntu-calendar-app/new-event-page/+merge/288637.
>
> Renato already did the code review and found it to be good.

Nick we discusses about that during today's meeting and bill asked to hold Szymon's change to land after OTA10 due the size and the complexity of it.

We are landing this small fix for now.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:797
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/792/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/793/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/792/rebuild

review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

got this error:

file:///opt/click.ubuntu.com/com.ubuntu.calendar/0.5.797/NewEvent.qml:724: Error: Cannot assign to non-existent property "subText"

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Got this error:

file:///opt/click.ubuntu.com/com.ubuntu.calendar/0.5.797/NewEvent.qml:724: Error: Cannot assign to non-existent property "subText"

while trying to edit an event with no-reminder.

lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946 updated
798. By Arthur Mello

Merge with trunk

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:798
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/798/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/804/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/798/rebuild

review: Approve (continuous-integration)
lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1556946 updated
799. By Arthur Mello

Fix reminder text for events without a reminder

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:799
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/799/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/805/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/799/rebuild

review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

works nice

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventRepetition.qml'
2--- EventRepetition.qml 2016-03-14 22:25:47 +0000
3+++ EventRepetition.qml 2016-03-23 11:47:59 +0000
4@@ -151,6 +151,7 @@
5
6 ListItem.Header{
7 text: i18n.tr("Repeat")
8+ __foregroundColor: Theme.palette.normal.baseText
9 }
10
11 OptionSelector{
12@@ -170,6 +171,7 @@
13
14 ListItem.Header{
15 text: i18n.tr("Repeats On:")
16+ __foregroundColor: Theme.palette.normal.baseText
17 visible: recurrenceOption.selectedIndex == 5
18 }
19
20@@ -215,6 +217,7 @@
21
22 ListItem.Header {
23 text: i18n.tr("Recurring event ends")
24+ __foregroundColor: Theme.palette.normal.baseText
25 visible: recurrenceOption.selectedIndex != 0
26 }
27
28@@ -238,6 +241,7 @@
29 // and it is shown as the header of the option selector to choose
30 // its repetition
31 text:i18n.tr("Repeats")
32+ __foregroundColor: Theme.palette.normal.baseText
33 visible: recurrenceOption.selectedIndex != 0
34 && limitOptions.selectedIndex == 1
35 }
36@@ -263,6 +267,7 @@
37
38 ListItem.Header{
39 text:i18n.tr("Date")
40+ __foregroundColor: Theme.palette.normal.baseText
41 visible: recurrenceOption.selectedIndex != 0 && limitOptions.selectedIndex == 2
42 }
43
44
45=== modified file 'NewEvent.qml'
46--- NewEvent.qml 2016-03-22 20:07:04 +0000
47+++ NewEvent.qml 2016-03-23 11:47:59 +0000
48@@ -466,6 +466,7 @@
49 }
50
51 text: i18n.tr("All day event")
52+ __foregroundColor: Theme.palette.normal.baseText
53 showDivider: false
54 control: CheckBox {
55 objectName: "allDayEventCheckbox"
56@@ -482,6 +483,7 @@
57
58 ListItems.Header{
59 text: i18n.tr("Event Details")
60+ __foregroundColor: Theme.palette.normal.baseText
61 }
62
63 TextField {
64@@ -547,6 +549,7 @@
65
66 ListItems.Header {
67 text: i18n.tr("Calendar")
68+ __foregroundColor: Theme.palette.normal.baseText
69 }
70
71 OptionSelector{
72@@ -587,6 +590,7 @@
73
74 ListItems.Header {
75 text: i18n.tr("Guests")
76+ __foregroundColor: Theme.palette.normal.baseText
77 }
78
79 Button{
80@@ -671,19 +675,19 @@
81
82 }
83
84- ListItems.Subtitled{
85+ ListItem {
86 id:thisHappens
87 objectName :"thisHappens"
88
89- anchors {
90- left: parent.left
91- }
92-
93- showDivider: false
94- progression: true
95 visible: (event != undefined) && ((event.itemType === Type.Event) || (event.itemType === Type.Todo))
96- text: i18n.tr("Repeats")
97- subText: visible ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
98+
99+ ListItemLayout {
100+ id: thisHappensLayout
101+ title.text: i18n.tr("Repeats")
102+ summary.text: (event != undefined) && (event.itemType === Type.Event) ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
103+ ProgressionSlot {}
104+ }
105+
106 onClicked: {
107 var stack = pageStack
108 if (!stack)
109@@ -693,33 +697,30 @@
110 }
111 }
112
113- ListItems.ThinDivider {
114- visible: (event != undefined) && (event.itemType === Type.Event)
115- }
116-
117- ListItems.Subtitled{
118- id:eventReminder
119- objectName : "eventReminder"
120+ ListItem {
121+ id: eventReminder
122+ objectName: "eventReminder"
123
124 property int reminderValue: -1
125
126 onReminderValueChanged: updateReminderLabel()
127
128- anchors.left:parent.left
129- showDivider: false
130- progression: true
131- text: i18n.tr("Reminder")
132+ ListItemLayout {
133+ id: eventReminderLayout
134+ title.text: i18n.tr("Reminder")
135+ ProgressionSlot {}
136+ }
137
138 function updateReminderLabel() {
139 if (eventReminder.reminderValue !== -1) {
140 for (var i=0; i<reminderModel.count; i++) {
141 if (reminderModel.get(i).value === eventReminder.reminderValue) {
142- eventReminder.subText = reminderModel.get(i).label
143+ eventReminderLayout.summary.text = reminderModel.get(i).label
144 return
145 }
146 }
147 } else {
148- eventReminder.subText = reminderModel.get(0).label
149+ eventReminderLayout.summary.text = reminderModel.get(0).label
150 return
151 }
152 }
153@@ -743,8 +744,6 @@
154 })
155 }
156 }
157-
158- ListItems.ThinDivider {}
159 }
160 }
161
162
163=== modified file 'NewEventTimePicker.qml'
164--- NewEventTimePicker.qml 2016-01-25 17:52:33 +0000
165+++ NewEventTimePicker.qml 2016-03-23 11:47:59 +0000
166@@ -31,6 +31,7 @@
167
168 ListItem.Header {
169 id: listHeader
170+ __foregroundColor: Theme.palette.normal.baseText
171 }
172
173 Item {

Subscribers

People subscribed via source and target branches

to status/vote changes: