ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

[Merge] lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 into lp:ubuntu-calendar-app

To: mp+276338@xxxxxxxxxxxxxxxxxx
From: Kunal Parmar <pkunal.parmar@xxxxxxxxx>
Date: Sat, 31 Oct 2015 20:58:27 -0000
In-reply-to: <20151031205807.3969.56364.launchpad@ackee.canonical.com>
Reply-to: mp+276338@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Kunal Parmar has proposed merging lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 into lp:ubuntu-calendar-app.

Commit message:
Resolves Bug #1508363
Migrating to UITK 1.3

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Calendar Developers (ubuntu-calendar-dev)
Related bugs:
  Bug #1508363 in Ubuntu Calendar App: "Coordinated migration to UITK 1.3"
  https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1508363

For more details, see:
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/Uitk1_3/+merge/276338

Resolves Bug #1508363
Migrating to UITK 1.3
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 into lp:ubuntu-calendar-app.

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2015-02-22 10:18:16 +0000
+++ AgendaView.qml	2015-10-31 20:57:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "dateExt.js" as DateExt
 

=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml	2015-06-16 09:18:21 +0000
+++ AllDayEventComponent.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 

=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2015-05-28 13:56:12 +0000
+++ CalendarChoicePopup.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtOrganizer 5.0

=== modified file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml	2015-05-28 13:58:30 +0000
+++ CalendarListButtonDelegate.qml	2015-10-31 20:57:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Standard {

=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml	2015-04-14 19:52:04 +0000
+++ ColorPickerDialog.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml	2014-09-20 10:45:35 +0000
+++ ContactChoicePopup.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Themes.Ambiance 1.0

=== modified file 'DayView.qml'
--- DayView.qml	2015-02-18 19:27:20 +0000
+++ DayView.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 

=== modified file 'Defines.js'
--- Defines.js	2014-10-22 14:03:01 +0000
+++ Defines.js	2015-10-31 20:57:20 +0000
@@ -44,7 +44,7 @@
 function getWeekLabels(){
     var object = Qt.createQmlObject('\
         import QtQuick 2.3;\
-        import Ubuntu.Components 1.1;\
+        import Ubuntu.Components 1.3;\
         QtObject {\
             property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
                                     Qt.locale().dayName(1,Locale.NarrowFormat),\

=== modified file 'DeleteConfirmationDialog.qml'
--- DeleteConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ DeleteConfirmationDialog.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'EditEventConfirmationDialog.qml'
--- EditEventConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ EditEventConfirmationDialog.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'EventActions.qml'
--- EventActions.qml	2015-04-13 19:40:48 +0000
+++ EventActions.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SyncMonitor 0.1
 
 Item {

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2015-01-22 19:34:59 +0000
+++ EventBubble.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 Item{

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2015-08-03 04:47:59 +0000
+++ EventDetails.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Popups 1.0

=== modified file 'EventReminder.qml'
--- EventReminder.qml	2015-07-12 03:39:07 +0000
+++ EventReminder.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page{

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2015-07-11 11:33:00 +0000
+++ EventRepetition.qml	2015-10-31 20:57:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0

=== modified file 'EventUtils.qml'
--- EventUtils.qml	2014-10-04 04:37:34 +0000
+++ EventUtils.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 import "Defines.js" as Defines
 import "Recurrence.js" as Recurrence

=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml	2015-05-14 13:03:02 +0000
+++ HeaderDateComponent.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2015-09-05 05:30:23 +0000
+++ MonthComponent.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 

=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2015-09-05 05:30:23 +0000
+++ MonthComponentDateDelegate.qml	2015-10-31 20:57:20 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item{
     id: dateRootItem

=== modified file 'MonthView.qml'
--- MonthView.qml	2015-09-05 05:33:38 +0000
+++ MonthView.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-08-04 02:18:52 +0000
+++ NewEvent.qml	2015-10-31 20:57:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0

=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml	2015-02-17 05:53:42 +0000
+++ NewEventEntryField.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Label {
     id: root

=== modified file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml	2015-03-28 11:31:47 +0000
+++ OnlineAccountsHelper.qml	2015-10-31 20:57:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
 

=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml	2014-10-17 05:42:34 +0000
+++ RecurrenceLabelDefines.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 QtObject {
     property var recurrenceLabel:[i18n.tr("Once"),

=== modified file 'Scroller.qml'
--- Scroller.qml	2014-09-20 10:45:35 +0000
+++ Scroller.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 
 Item {

=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml	2014-11-29 05:15:13 +0000
+++ TimeLineBackground.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Column {
     width: parent.width

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2015-08-20 12:27:59 +0000
+++ TimeLineBase.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 import "dateExt.js" as DateExt

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-09-05 05:30:23 +0000
+++ TimeLineBaseComponent.qml	2015-10-31 20:57:20 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeader.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 
 import "ViewType.js" as ViewType

=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeaderComponent.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 

=== modified file 'TimeLineTimeScale.qml'
--- TimeLineTimeScale.qml	2014-12-11 20:29:27 +0000
+++ TimeLineTimeScale.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Flickable{
     id: timeFlickble

=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2014-11-29 09:40:53 +0000
+++ ViewHeader.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item{
     id: header

=== modified file 'WeekView.qml'
--- WeekView.qml	2015-09-05 05:30:23 +0000
+++ WeekView.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 

=== modified file 'YearView.qml'
--- YearView.qml	2015-02-18 19:27:20 +0000
+++ YearView.qml	2015-10-31 20:57:20 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 import "dateExt.js" as DateExt
 Page {

=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml	2014-11-29 09:40:53 +0000
+++ YearViewDelegate.qml	2015-10-31 20:57:20 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 GridView{
     id: yearView

=== modified file 'calendar.qml'
--- calendar.qml	2015-10-11 02:22:23 +0000
+++ calendar.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 import Qt.labs.settings 1.0

=== modified file 'calendarTests.qml'
--- calendarTests.qml	2014-09-20 10:45:35 +0000
+++ calendarTests.qml	2015-10-31 20:57:20 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MainView {
     width: units.gu(20)

=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot	2015-08-04 02:18:52 +0000
+++ po/com.ubuntu.calendar.pot	2015-10-31 20:57:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-04 10:18+0800\n"
+"POT-Creation-Date: 2015-11-01 04:20+0900\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,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:37
-#: ../WeekView.qml:42 ../YearView.qml:36
+#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
+#: ../WeekView.qml:44 ../YearView.qml:36
 msgid "Today"
 msgstr ""
 
@@ -101,7 +101,7 @@
 #. 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:58 ../WeekView.qml:61
+#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
 msgid "MMMM yyyy"
 msgstr ""
 
@@ -390,17 +390,17 @@
 msgid "2 weeks"
 msgstr ""
 
-#: ../TimeLineBase.qml:80
+#: ../TimeLineBase.qml:73
 msgid "Untitled"
 msgstr ""
 
 #. TRANSLATORS: W refers to Week, followed by the actual week number (%1)
-#: ../TimeLineHeader.qml:52
+#: ../TimeLineHeader.qml:54
 #, qt-format
 msgid "W%1"
 msgstr ""
 
-#: ../TimeLineHeader.qml:64
+#: ../TimeLineHeader.qml:66
 msgid "All Day"
 msgstr ""
 
@@ -409,30 +409,30 @@
 msgid "Year %1"
 msgstr ""
 
-#: ../calendar.qml:44
+#: ../calendar.qml:45
 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:347
+#: ../calendar.qml:354
 msgid "Year"
 msgstr ""
 
-#: ../calendar.qml:381
+#: ../calendar.qml:388
 msgid "Month"
 msgstr ""
 
-#: ../calendar.qml:409
+#: ../calendar.qml:421
 msgid "Week"
 msgstr ""
 
-#: ../calendar.qml:442
+#: ../calendar.qml:459
 msgid "Day"
 msgstr ""
 
-#: ../calendar.qml:474
+#: ../calendar.qml:491
 msgid "Agenda"
 msgstr ""