ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #08346
[Merge] lp:~nik90/ubuntu-calendar-app/new-event-style into lp:ubuntu-calendar-app
Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-calendar-app/new-event-style into lp:ubuntu-calendar-app.
Commit message:
- Updated event bubble style to match new design
- Housekeeping stuff (updating version to 0.5 and framework to 15.04.3)
- Updated month view ubuntushape style
- Changed background to white
Requested reviews:
Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
Ubuntu Calendar Developers (ubuntu-calendar-dev)
For more details, see:
https://code.launchpad.net/~nik90/ubuntu-calendar-app/new-event-style/+merge/287324
- Updated event bubble style to match new design
- Housekeeping stuff (updating version to 0.5 and framework to 15.04.3)
- Updated month view ubuntushape style
- Changed background to white
--
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~nik90/ubuntu-calendar-app/new-event-style into lp:ubuntu-calendar-app.
=== modified file 'EventBubble.qml'
--- EventBubble.qml 2016-01-29 14:35:14 +0000
+++ EventBubble.qml 2016-02-26 15:44:31 +0000
@@ -37,9 +37,8 @@
property Flickable flickable;
- readonly property int minimumHeight: type == wideType
- ? detailsItems.timeLabelHeight + /*top-bottom margin*/ units.gu(2)
- : units.gu(2)
+ readonly property int minimumHeight: type == wideType ? detailsItems.timeLabelHeight + /*top-bottom margin*/ units.gu(2)
+ : units.gu(2)
z: depthInRow
@@ -48,7 +47,14 @@
Rectangle{
id: bg
anchors.fill: parent
- border.color: isLiveEditing ? "red" : "white"
+ border.color: lg.color
+ border.width: units.dp(1)
+ opacity: 0.5
+ Rectangle {
+ id: lg
+ anchors { left: parent.left; top: parent.top; bottom: parent.bottom }
+ width: units.dp(5)
+ }
}
function resize() {
@@ -77,13 +83,16 @@
if( event.endDateTime >= now) {
if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {
//if owner of account is not attending event the dim it
- bg.color = Qt.tint( collection.color, "#aaffffff" );
+ lg.color = collection.color
+ bg.color = Qt.tint(collection.color, "#DDFFFFFF")
} else {
- bg.color = collection.color
+ lg.color = collection.color
+ bg.color = Qt.tint(collection.color, "#77FFFFFF")
}
} else {
//if event is on past then add some white color to original color
- bg.color = Qt.tint( collection.color, "#aaffffff" );
+ lg.color = collection.color
+ bg.color = Qt.tint(collection.color, "#DDFFFFFF")
}
}
}
@@ -149,9 +158,7 @@
timeLabel.text = i18n.tr("%1 <b>%2</b>").arg(timeString).arg(event.displayLabel);
}
} else {
- timeLabel.text = event.displayLabel;
- timeLabel.horizontalAlignment = Text.AlignHCenter
- timeLabel.wrapMode = Text.WrapAtWordBoundaryOrAnywhere
+ titleLabel.text = event.displayLabel;
}
layoutBubbleDetails();
@@ -172,26 +179,26 @@
top: parent.top
left: parent.left
right: parent.right
- margins: units.gu(0.5)
- }
-
- Label {
- id: timeLabel
- objectName: "timeLabel"
- color: "White"
- fontSize:"small"
- font.bold: true
- width: parent.width
+ leftMargin: units.gu(2)
+ margins: units.gu(1)
}
Label {
id: titleLabel
objectName: "titleLabel"
- color: "White"
- fontSize: "small"
+ textSize: type === wideType ? Label.Medium : Label.Small
+ font.bold: true
width: parent.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
+
+ Label {
+ id: timeLabel
+ objectName: "timeLabel"
+ textSize: Label.Small
+ width: parent.width
+ visible: type == wideType
+ }
}
onHeightChanged: {
=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml 2016-02-03 08:06:25 +0000
+++ MonthComponentDateDelegate.qml 2016-02-26 15:44:31 +0000
@@ -96,7 +96,7 @@
Loader{
sourceComponent: showEvent ? eventIndicatorComp : undefined
onSourceComponentChanged: {
- width = Qt.binding( function() { return units.gu(0.8)})
+ width = Qt.binding( function() { return units.gu(1)})
height = Qt.binding( function() { return width })
anchors.horizontalCenter = Qt.binding( function() { return parent.horizontalCenter })
anchors.top = Qt.binding( function() { return parent.verticalCenter })
@@ -105,7 +105,7 @@
return (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height) / 2 + units.gu(1.5)
} else {
var w = (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height)/1.3
- return (w/2) + units.gu(0.1)
+ return (w/2) + units.gu(0.5)
}
});
}
@@ -115,27 +115,17 @@
id: eventIndicatorComp
Rectangle {
anchors.fill: parent
- radius: height/2
- color: "black"
+ radius: height/3
+ color: UbuntuColors.lightGrey
}
}
Component{
id: highLightComp
- UbuntuShape{
- color: {
- if( isToday && !isSelected ) {
- "#DD4814"
- } else {
- "gray"
- }
- }
-
- Rectangle{
- anchors.fill: parent
- anchors.margins: units.gu(0.5)
- color: isToday ? "#DD4814" : "darkgray"
- }
+ UbuntuShape {
+ aspect: UbuntuShape.Flat
+ backgroundColor: isToday && !isSelected ? UbuntuColors.orange : UbuntuColors.lightGrey
+ relativeRadius: 0.74
}
}
=== modified file 'calendar.qml'
--- calendar.qml 2016-02-03 14:55:42 +0000
+++ calendar.qml 2016-02-26 15:44:31 +0000
@@ -91,10 +91,7 @@
height: units.gu(80)
focus: true
Keys.forwardTo: [pageStack.currentPage]
-
- headerColor: "#E8E8E8"
- backgroundColor: "#f5f5f5"
- footerColor: "#ECECEC"
+ backgroundColor: "#FFFFFF"
anchorToKeyboard: true
Connections {
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in 2015-12-16 10:51:01 +0000
+++ click/manifest.json.in 2016-02-26 15:44:31 +0000
@@ -1,7 +1,7 @@
{
"architecture": "all",
"description": "A calendar for Ubuntu which syncs with online accounts",
- "framework": "ubuntu-sdk-14.10-qml",
+ "framework": "ubuntu-sdk-15.04.3-qml",
"hooks": {
"calendar": {
"account-application": "@PROJECT_NAME@_@APP_NAME@.application",
@@ -18,7 +18,7 @@
"maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@xxxxxxxxxxxxxxxxxxx>",
"name": "@PROJECT_NAME@",
"title": "Calendar",
- "version": "0.4.@BZR_REVNO@",
+ "version": "0.5.@BZR_REVNO@",
"x-source": {
"vcs-bzr": "@BZR_SOURCE@",
"vcs-bzr-revno": "@BZR_REVNO@"
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2016-02-17 14:56:56 +0000
+++ po/com.ubuntu.calendar.pot 2016-02-26 15:44:31 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 21:36+0800\n"
+"POT-Creation-Date: 2016-02-26 21:11+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -18,30 +18,39 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
-#: ../WeekView.qml:44 ../YearView.qml:36
+#: ../AgendaView.qml:52 ../DayView.qml:41 ../MonthView.qml:40
+#: ../WeekView.qml:45 ../YearView.qml:43
msgid "Today"
msgstr ""
-#: ../AgendaView.qml:92
+#: ../AgendaView.qml:62 ../calendar.qml:288 ../calendar.qml:509
+msgid "Agenda"
+msgstr ""
+
+#: ../AgendaView.qml:101
msgid "No upcoming events"
msgstr ""
-#: ../AgendaView.qml:95
+#: ../AgendaView.qml:104
msgid "You have no calendars enabled"
msgstr ""
-#: ../AgendaView.qml:105
+#: ../AgendaView.qml:114
msgid "Enable calendars"
msgstr ""
#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
#. while the second one (%2) refers to the end time
-#: ../AgendaView.qml:168 ../EventBubble.qml:133
+#: ../AgendaView.qml:177 ../EventBubble.qml:142
#, qt-format
msgid "%1 - %2"
msgstr ""
+#: ../AgendaView.qml:183
+#, qt-format
+msgid "%1 %2 %3 %4 %5"
+msgstr ""
+
#. TRANSLATORS: the first parameter refers to the number of all-day events
#. on a given day. "Ev." is short form for "Events".
#. Please keep the translation of "Ev." to 3 characters only, as the week view
@@ -59,21 +68,21 @@
msgstr[0] ""
msgstr[1] ""
-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:63
msgid "Calendars"
msgstr ""
-#: ../CalendarChoicePopup.qml:37
+#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
msgid "Back"
msgstr ""
#. TRANSLATORS: Please translate this string to 15 characters only.
#. Currently ,there is no way we can increase width of action menu currently.
-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
msgid "Sync"
msgstr ""
-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
msgid "Syncing"
msgstr ""
@@ -101,10 +110,16 @@
#. TRANSLATORS: this is a time formatting string,
#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
#. It's used in the header of the month and week views
-#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
+#: ../DayView.qml:64 ../DayView.qml:157 ../MonthView.qml:62
+#: ../MonthView.qml:149 ../WeekView.qml:68 ../WeekView.qml:180
msgid "MMMM yyyy"
msgstr ""
+#: ../DayView.qml:155 ../MonthView.qml:144 ../WeekView.qml:178
+#, qt-format
+msgid "%1 %2"
+msgstr ""
+
#: ../DeleteConfirmationDialog.qml:31
msgid "Delete Recurring Event"
msgstr ""
@@ -136,7 +151,7 @@
msgid "Delete"
msgstr ""
-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
msgid "Edit Event"
msgstr ""
@@ -154,46 +169,70 @@
msgid "Edit this"
msgstr ""
-#: ../EventActions.qml:50 ../NewEvent.qml:324
+#: ../EventActions.qml:52 ../NewEvent.qml:325
msgid "New Event"
msgstr ""
+#: ../EventActions.qml:75 ../Settings.qml:30
+msgid "Settings"
+msgstr ""
+
#. TRANSLATORS: the first argument (%1) refers to a time for an event,
#. while the second one (%2) refers to title of event
-#: ../EventBubble.qml:144 ../EventBubble.qml:149
+#: ../EventBubble.qml:153 ../EventBubble.qml:158
#, qt-format
msgid "%1 <b>%2</b>"
msgstr ""
-#: ../EventDetails.qml:43 ../NewEvent.qml:435
+#: ../EventDetails.qml:44 ../NewEvent.qml:436
msgid "Event Details"
msgstr ""
#. TRANSLATORS: the first parameter refers to the name of event calendar.
-#: ../EventDetails.qml:68
+#: ../EventDetails.qml:69
#, qt-format
msgid "%1 Calendar"
msgstr ""
-#: ../EventDetails.qml:129
+#: ../EventDetails.qml:143
+#, qt-format
+msgid "%1 %2 %3 - %4 %5 %6 (All Day)"
+msgstr ""
+
+#: ../EventDetails.qml:147
#, qt-format
msgid "%1 - %2 (All Day)"
msgstr ""
-#: ../EventDetails.qml:133
+#: ../EventDetails.qml:153
+#, qt-format
+msgid "%1 %2 %3 (All Day)"
+msgstr ""
+
+#: ../EventDetails.qml:156
#, qt-format
msgid "%1 (All Day)"
msgstr ""
-#: ../EventDetails.qml:203
+#: ../EventDetails.qml:162
+#, qt-format
+msgid "%1 %2 %3, %4 - %5 %6 %7, %8"
+msgstr ""
+
+#: ../EventDetails.qml:171
+#, qt-format
+msgid "%1 %2 %3, %4 - %5"
+msgstr ""
+
+#: ../EventDetails.qml:238
msgid "Edit"
msgstr ""
-#: ../EventDetails.qml:354 ../NewEvent.qml:537
+#: ../EventDetails.qml:389 ../NewEvent.qml:538
msgid "Guests"
msgstr ""
-#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634
+#: ../EventDetails.qml:432 ../EventReminder.qml:35 ../NewEvent.qml:635
msgid "Reminder"
msgstr ""
@@ -216,7 +255,7 @@
#. TRANSLATORS: this refers to how often a recurrent event repeats
#. and it is shown as the header of the option selector to choose
#. its repetition
-#: ../EventRepetition.qml:242 ../NewEvent.qml:618
+#: ../EventRepetition.qml:242 ../NewEvent.qml:619
msgid "Repeats"
msgstr ""
@@ -247,6 +286,11 @@
msgid "Weekly on %1"
msgstr ""
+#: ../HeaderDateComponent.qml:90
+#, qt-format
+msgid "%1 %2 %3"
+msgstr ""
+
#: ../LimitLabelModel.qml:25
msgid "Never"
msgstr ""
@@ -259,6 +303,10 @@
msgid "After Date"
msgstr ""
+#: ../MonthComponent.qml:262
+msgid "Wk"
+msgstr ""
+
#: ../NewEvent.qml:84
msgid "Save"
msgstr ""
@@ -267,43 +315,43 @@
msgid "End time can't be before start time"
msgstr ""
-#: ../NewEvent.qml:334
+#: ../NewEvent.qml:335
msgid "Error"
msgstr ""
-#: ../NewEvent.qml:336
+#: ../NewEvent.qml:337
msgid "OK"
msgstr ""
-#: ../NewEvent.qml:389
+#: ../NewEvent.qml:390
msgid "From"
msgstr ""
-#: ../NewEvent.qml:402
+#: ../NewEvent.qml:403
msgid "To"
msgstr ""
-#: ../NewEvent.qml:419
+#: ../NewEvent.qml:420
msgid "All day event"
msgstr ""
-#: ../NewEvent.qml:448
+#: ../NewEvent.qml:449
msgid "Event Name"
msgstr ""
-#: ../NewEvent.qml:466
+#: ../NewEvent.qml:467
msgid "Description"
msgstr ""
-#: ../NewEvent.qml:484
+#: ../NewEvent.qml:485
msgid "Location"
msgstr ""
-#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1
+#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
msgid "Calendar"
msgstr ""
-#: ../NewEvent.qml:541
+#: ../NewEvent.qml:542
msgid "Add Guest"
msgstr ""
@@ -390,52 +438,56 @@
msgid "2 weeks"
msgstr ""
+#: ../Settings.qml:60
+msgid "Show week numbers"
+msgstr ""
+
+#: ../Settings.qml:91
+msgid "Show lunar calendar"
+msgstr ""
+
#: ../TimeLineBase.qml:73
msgid "Untitled"
msgstr ""
#. TRANSLATORS: W refers to Week, followed by the actual week number (%1)
-#: ../TimeLineHeader.qml:54
+#: ../TimeLineHeader.qml:53
#, qt-format
msgid "W%1"
msgstr ""
-#: ../TimeLineHeader.qml:66
+#: ../TimeLineHeader.qml:65
msgid "All Day"
msgstr ""
-#: ../YearView.qml:54
+#: ../YearView.qml:61 ../YearView.qml:112
#, qt-format
msgid "Year %1"
msgstr ""
-#: ../calendar.qml:45
+#: ../calendar.qml:46
msgid ""
"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
"eventid. They will be managed by system. See the source for a full comment "
"about them"
msgstr ""
-#: ../calendar.qml:354
+#: ../calendar.qml:256 ../calendar.qml:425
msgid "Year"
msgstr ""
-#: ../calendar.qml:388
+#: ../calendar.qml:264 ../calendar.qml:446
msgid "Month"
msgstr ""
-#: ../calendar.qml:421
+#: ../calendar.qml:272 ../calendar.qml:467
msgid "Week"
msgstr ""
-#: ../calendar.qml:459
+#: ../calendar.qml:280 ../calendar.qml:488
msgid "Day"
msgstr ""
-#: ../calendar.qml:491
-msgid "Agenda"
-msgstr ""
-
#: com.ubuntu.calendar_calendar.desktop.in.in.h:2
msgid "A calendar for Ubuntu which syncs with online accounts."
msgstr ""
References
