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
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml 2016-03-14 22:25:47 +0000
+++ EventRepetition.qml 2016-03-23 11:47:59 +0000
@@ -151,6 +151,7 @@
151151
152 ListItem.Header{152 ListItem.Header{
153 text: i18n.tr("Repeat")153 text: i18n.tr("Repeat")
154 __foregroundColor: Theme.palette.normal.baseText
154 }155 }
155156
156 OptionSelector{157 OptionSelector{
@@ -170,6 +171,7 @@
170171
171 ListItem.Header{172 ListItem.Header{
172 text: i18n.tr("Repeats On:")173 text: i18n.tr("Repeats On:")
174 __foregroundColor: Theme.palette.normal.baseText
173 visible: recurrenceOption.selectedIndex == 5175 visible: recurrenceOption.selectedIndex == 5
174 }176 }
175177
@@ -215,6 +217,7 @@
215217
216 ListItem.Header {218 ListItem.Header {
217 text: i18n.tr("Recurring event ends")219 text: i18n.tr("Recurring event ends")
220 __foregroundColor: Theme.palette.normal.baseText
218 visible: recurrenceOption.selectedIndex != 0221 visible: recurrenceOption.selectedIndex != 0
219 }222 }
220223
@@ -238,6 +241,7 @@
238 // and it is shown as the header of the option selector to choose241 // and it is shown as the header of the option selector to choose
239 // its repetition242 // its repetition
240 text:i18n.tr("Repeats")243 text:i18n.tr("Repeats")
244 __foregroundColor: Theme.palette.normal.baseText
241 visible: recurrenceOption.selectedIndex != 0245 visible: recurrenceOption.selectedIndex != 0
242 && limitOptions.selectedIndex == 1246 && limitOptions.selectedIndex == 1
243 }247 }
@@ -263,6 +267,7 @@
263267
264 ListItem.Header{268 ListItem.Header{
265 text:i18n.tr("Date")269 text:i18n.tr("Date")
270 __foregroundColor: Theme.palette.normal.baseText
266 visible: recurrenceOption.selectedIndex != 0 && limitOptions.selectedIndex == 2271 visible: recurrenceOption.selectedIndex != 0 && limitOptions.selectedIndex == 2
267 }272 }
268273
269274
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2016-03-22 20:07:04 +0000
+++ NewEvent.qml 2016-03-23 11:47:59 +0000
@@ -466,6 +466,7 @@
466 }466 }
467467
468 text: i18n.tr("All day event")468 text: i18n.tr("All day event")
469 __foregroundColor: Theme.palette.normal.baseText
469 showDivider: false470 showDivider: false
470 control: CheckBox {471 control: CheckBox {
471 objectName: "allDayEventCheckbox"472 objectName: "allDayEventCheckbox"
@@ -482,6 +483,7 @@
482483
483 ListItems.Header{484 ListItems.Header{
484 text: i18n.tr("Event Details")485 text: i18n.tr("Event Details")
486 __foregroundColor: Theme.palette.normal.baseText
485 }487 }
486488
487 TextField {489 TextField {
@@ -547,6 +549,7 @@
547549
548 ListItems.Header {550 ListItems.Header {
549 text: i18n.tr("Calendar")551 text: i18n.tr("Calendar")
552 __foregroundColor: Theme.palette.normal.baseText
550 }553 }
551554
552 OptionSelector{555 OptionSelector{
@@ -587,6 +590,7 @@
587590
588 ListItems.Header {591 ListItems.Header {
589 text: i18n.tr("Guests")592 text: i18n.tr("Guests")
593 __foregroundColor: Theme.palette.normal.baseText
590 }594 }
591595
592 Button{596 Button{
@@ -671,19 +675,19 @@
671675
672 }676 }
673677
674 ListItems.Subtitled{678 ListItem {
675 id:thisHappens679 id:thisHappens
676 objectName :"thisHappens"680 objectName :"thisHappens"
677681
678 anchors {
679 left: parent.left
680 }
681
682 showDivider: false
683 progression: true
684 visible: (event != undefined) && ((event.itemType === Type.Event) || (event.itemType === Type.Todo))682 visible: (event != undefined) && ((event.itemType === Type.Event) || (event.itemType === Type.Todo))
685 text: i18n.tr("Repeats")683
686 subText: visible ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""684 ListItemLayout {
685 id: thisHappensLayout
686 title.text: i18n.tr("Repeats")
687 summary.text: (event != undefined) && (event.itemType === Type.Event) ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
688 ProgressionSlot {}
689 }
690
687 onClicked: {691 onClicked: {
688 var stack = pageStack692 var stack = pageStack
689 if (!stack)693 if (!stack)
@@ -693,33 +697,30 @@
693 }697 }
694 }698 }
695699
696 ListItems.ThinDivider {700 ListItem {
697 visible: (event != undefined) && (event.itemType === Type.Event)701 id: eventReminder
698 }702 objectName: "eventReminder"
699
700 ListItems.Subtitled{
701 id:eventReminder
702 objectName : "eventReminder"
703703
704 property int reminderValue: -1704 property int reminderValue: -1
705705
706 onReminderValueChanged: updateReminderLabel()706 onReminderValueChanged: updateReminderLabel()
707707
708 anchors.left:parent.left708 ListItemLayout {
709 showDivider: false709 id: eventReminderLayout
710 progression: true710 title.text: i18n.tr("Reminder")
711 text: i18n.tr("Reminder")711 ProgressionSlot {}
712 }
712713
713 function updateReminderLabel() {714 function updateReminderLabel() {
714 if (eventReminder.reminderValue !== -1) {715 if (eventReminder.reminderValue !== -1) {
715 for (var i=0; i<reminderModel.count; i++) {716 for (var i=0; i<reminderModel.count; i++) {
716 if (reminderModel.get(i).value === eventReminder.reminderValue) {717 if (reminderModel.get(i).value === eventReminder.reminderValue) {
717 eventReminder.subText = reminderModel.get(i).label718 eventReminderLayout.summary.text = reminderModel.get(i).label
718 return719 return
719 }720 }
720 }721 }
721 } else {722 } else {
722 eventReminder.subText = reminderModel.get(0).label723 eventReminderLayout.summary.text = reminderModel.get(0).label
723 return724 return
724 }725 }
725 }726 }
@@ -743,8 +744,6 @@
743 })744 })
744 }745 }
745 }746 }
746
747 ListItems.ThinDivider {}
748 }747 }
749 }748 }
750749
751750
=== modified file 'NewEventTimePicker.qml'
--- NewEventTimePicker.qml 2016-01-25 17:52:33 +0000
+++ NewEventTimePicker.qml 2016-03-23 11:47:59 +0000
@@ -31,6 +31,7 @@
3131
32 ListItem.Header {32 ListItem.Header {
33 id: listHeader33 id: listHeader
34 __foregroundColor: Theme.palette.normal.baseText
34 }35 }
3536
36 Item {37 Item {

Subscribers

People subscribed via source and target branches

to status/vote changes: