Merge lp:~pkunal-parmar/ubuntu-calendar-app/TimeInputComponent into lp:ubuntu-calendar-app

[Kunal Parmar]

Moved Time input to separate component

Moved Time input to separate component

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:516
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/945/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1126
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/503

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/945/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks Good to me !
Thanks kunal.

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-10-20 15:24:00 +0000
+++ NewEvent.qml	2014-10-21 19:00:00 +0000
@@ -43,14 +43,12 @@
     property bool isEdit: false
 
     onStartDateChanged: {
-        startDateInput.text = startDate.toLocaleDateString();
-        startTimeInput.text = Qt.formatTime(startDate);
+        startDateTimeInput.dateTime = startDate;
         adjustEndDateToStartDate()
     }
 
     onEndDateChanged: {
-        endDateInput.text = endDate.toLocaleDateString();
-        endTimeInput.text = Qt.formatTime(endDate);
+        endDateTimeInput.dateTime = endDate;
     }
 
     head.actions: Action {
@@ -229,15 +227,6 @@
         return daysOfWeek;
     }
 
-    function openDatePicker (element, caller, callerProperty, mode) {
-        element.highlighted = true;
-        var picker = PickerPanel.openDatePicker(caller, callerProperty, mode);
-        if (!picker) return;
-        picker.closed.connect(function () {
-            element.highlighted = false;
-        });
-    }
-
     // Calucate default hour and minute for start and end time on event
     function roundDate(date) {
         var tempDate = new Date(date)
@@ -336,90 +325,29 @@
 
             width: parent.width
 
-            ListItem.Header {
-                text: i18n.tr("From")
-            }
-
-            Item {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-
-                height: startDateInput.height
-
-                NewEventEntryField{
-                    id: startDateInput
-                    objectName: "startDateInput"
-
-                    text: ""
-                    anchors.left: parent.left
-                    width: allDayEventCheckbox.checked ? parent.width : 4 * parent.width / 5
-
-                    MouseArea{
-                        anchors.fill: parent
-                        onClicked: openDatePicker(startDateInput, root, "startDate", "Years|Months|Days")
-                    }
-                }
-
-                NewEventEntryField{
-                    id: startTimeInput
-                    objectName: "startTimeInput"
-
-                    text: ""
-                    anchors.right: parent.right
-                    width: parent.width / 5
-                    visible: !allDayEventCheckbox.checked
-                    horizontalAlignment: Text.AlignRight
-
-                    MouseArea{
-                        anchors.fill: parent
-                        onClicked: openDatePicker(startTimeInput, root, "startDate", "Hours|Minutes")
-                    }
-                }
-            }
-
-            ListItem.Header {
-                text: i18n.tr("To")
-            }
-
-            Item {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(2)
-                }
-
-                height: endDateInput.height
-
-                NewEventEntryField{
-                    id: endDateInput
-                    objectName: "endDateInput"
-
-                    text: ""
-                    anchors.left: parent.left
-                    width: allDayEventCheckbox.checked ? parent.width : 4 * parent.width / 5
-
-                    MouseArea{
-                        anchors.fill: parent
-                        onClicked: openDatePicker(endDateInput, root, "endDate", "Years|Months|Days")
-                    }
-                }
-
-                NewEventEntryField{
-                    id: endTimeInput
-                    objectName: "endTimeInput"
-                    text: ""
-                    width: parent.width / 5
-                    visible: !allDayEventCheckbox.checked
-                    anchors.right: parent.right
-                    horizontalAlignment: Text.AlignRight
-
-                    MouseArea{
-                        anchors.fill: parent
-                        onClicked: openDatePicker(endTimeInput, root, "endDate", "Hours|Minutes")
-                    }
+            NewEventTimePicker{
+                id: startDateTimeInput
+                header: i18n.tr("From")
+                showTimePicker: !allDayEventCheckbox.checked
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                onDateTimeChanged: {
+                    startDate = dateTime;
+                }
+            }
+
+            NewEventTimePicker{
+                id: endDateTimeInput
+                header: i18n.tr("To")
+                showTimePicker: !allDayEventCheckbox.checked
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                onDateTimeChanged: {
+                    endDate = dateTime;
                 }
             }
 
@@ -676,10 +604,8 @@
             Qt.inputMethod.hide()
             titleEdit.focus = false
             locationEdit.focus = false
-            startDateInput.focus = false
-            startTimeInput.focus = false
-            endDateInput.focus = false
-            endTimeInput.focus = false
+            startDateTimeInput.clearFocus();
+            endDateTimeInput.clearFocus();
             messageEdit.focus = false
         }
 

=== added file 'NewEventTimePicker.qml'
--- NewEventTimePicker.qml	1970-01-01 00:00:00 +0000
+++ NewEventTimePicker.qml	2014-10-21 19:00:00 +0000
@@ -0,0 +1,75 @@
+import QtQuick 2.3
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.Themes.Ambiance 1.0
+import Ubuntu.Components.Pickers 1.0
+
+Column {
+    id: dateTimeInput
+    property alias header: listHeader.text
+
+    property date dateTime;
+    property bool showTimePicker;
+
+    function clearFocus() {
+        dateInput.focus = false;
+        timeInput.focus = false;
+    }
+
+    function openDatePicker (element, caller, callerProperty, mode) {
+        element.highlighted = true;
+        var picker = PickerPanel.openDatePicker(caller, callerProperty, mode);
+        if (!picker) return;
+        picker.closed.connect(function () {
+            element.highlighted = false;
+        });
+    }
+
+    onDateTimeChanged: {
+        dateInput.text = dateTime.toLocaleDateString();
+        timeInput.text = Qt.formatTime(dateTime);
+    }
+
+    ListItem.Header {
+        id: listHeader
+    }
+
+    Item {
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+        }
+
+        height: dateInput.height
+
+        NewEventEntryField{
+            id: dateInput
+            objectName: "dateInput"
+
+            text: ""
+            anchors.left: parent.left
+            width: !showTimePicker ? parent.width : 4 * parent.width / 5
+
+            MouseArea{
+                anchors.fill: parent
+                onClicked: openDatePicker(dateInput, dateTimeInput, "dateTime", "Years|Months|Days")
+            }
+        }
+
+        NewEventEntryField{
+            id: timeInput
+            objectName: "timeInput"
+
+            text: ""
+            anchors.right: parent.right
+            width: parent.width / 5
+            visible: showTimePicker
+            horizontalAlignment: Text.AlignRight
+
+            MouseArea{
+                anchors.fill: parent
+                onClicked: openDatePicker(timeInput, dateTimeInput, "dateTime", "Hours|Minutes")
+            }
+        }
+    }
+}