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

[Kunal Parmar]

Scroll to current day in case of week is current week or today is pressed

Scroll to current day in case of week is current week or today is pressed

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

FAILED: Continuous integration, rev:560
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1044/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/409
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/41

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:560
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1047/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/439
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/439/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/44

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

This fails seems to be caused by new design changes,

I tried to fix it

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

FAILED: Continuous integration, rev:561
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1048/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/451
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/451/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/45

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:562
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1049/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/452
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/452/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/46

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me !!
Thanks kunal.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/450/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/596
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/596/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/22

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:564
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1055/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/678
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/678/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/52

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:565
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1059/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/701/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/56

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:566
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1060/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/702
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/702/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/57

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:567
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1061/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/714/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/58/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:568
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1062/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/715
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/59

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:569
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1064/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/800
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/800/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/61

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

review: Needs Fixing (continuous-integration)

[Andrea Cerisara (acerisara)]

Kunal, could you try to merge my branch to see if the situation improves?

[lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-ScrollToToday]

570. By Kunal Parmar on 2015-01-22

merge from trunk

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

FAILED: Continuous integration, rev:570
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1070/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1053
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1053/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/67

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

review: Needs Fixing (continuous-integration)

[Andrea Cerisara (acerisara)]

Kunal, could you try again with my branch? It is not in trunk yet. (or, otherwise, try with x_pad set to 0.08).

[Kunal Parmar (pkunal-parmar)]

> Kunal, could you try again with my branch? It is not in trunk yet. (or,
> otherwise, try with x_pad set to 0.08).

ohh, I thought code was merged to my branch, will try agian. Thanks

[lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-ScrollToToday]

571. By Kunal Parmar on 2015-02-17

reducing xpad for swipe

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

PASSED: Continuous integration, rev:571
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1072/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1087
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1087/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/69

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

review: Approve (continuous-integration)

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-12-18 19:00:07 +0000
+++ TimeLineBaseComponent.qml	2015-02-17 05:43:06 +0000
@@ -52,6 +52,24 @@
         }
     }
 
+    function scrollTocurrentDate() {
+        if ( type != ViewType.ViewTypeWeek ){
+            return;
+        }
+
+        var today = DateExt.today();
+        var startOfWeek = today.weekStart(Qt.locale().firstDayOfWeek);
+        var weekDay = today.getDay();
+        if( startOfWeek.isSameDay(startDay) && weekDay > 2) {
+            timeLineView.contentX = (weekDay * timeLineView.delegateWidth);
+            if( timeLineView.contentX  > (timeLineView.contentWidth - timeLineView.width) ) {
+                timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
+            }
+        } else {
+            timeLineView.contentX = 0;
+        }
+    }
+
     Connections{
         target: keyboardEventProvider
         onScrollUp:{

=== modified file 'WeekView.qml'
--- WeekView.qml	2014-11-04 18:32:16 +0000
+++ WeekView.qml	2015-02-17 05:43:06 +0000
@@ -88,6 +88,7 @@
         }
 
         delegate: Loader {
+            id: timelineLoader
             width: parent.width
             height: parent.height
             asynchronous: !weekViewPath.isCurrentItem
@@ -108,18 +109,32 @@
                     Component.onCompleted: {
                         if(weekViewPage.isCurrentPage){
                             timeLineView.scrollToCurrentTime();
+                            timeLineView.scrollTocurrentDate();
                         }
                     }
 
+                    onIsActiveChanged: {
+                        timeLineView.scrollTocurrentDate();
+                    }
+
                     onDateSelected: {
                         weekViewPage.dateSelected(date);
                     }
 
                     Connections{
+                        target: calendarTodayAction
+                        onTriggered:{
+                            if( isActive )
+                                timeLineView.scrollTocurrentDate();
+                        }
+                    }
+
+                    Connections{
                         target: weekViewPage
                         onIsCurrentPageChanged:{
                             if(weekViewPage.isCurrentPage){
                                 timeLineView.scrollToCurrentTime();
+                                timeLineView.scrollTocurrentDate();
                             }
                         }
                     }

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2014-12-18 16:00:08 +0000
+++ tests/autopilot/calendar_app/__init__.py	2015-02-17 05:43:06 +0000
@@ -214,7 +214,7 @@
                 sleep(1)
             timeout += 1
 
-    def swipe_view(self, direction, view, x_pad=0.15):
+    def swipe_view(self, direction, view, x_pad=0.08):
         """Swipe the given view to left or right.
 
         Args:
@@ -400,6 +400,7 @@
         for event in event_bubbles:
             # Event-bubbles objects are recycled, only show visible ones.
             temp = "<b>"+event_name+"</b>"
+            print(temp + "-----" + event.get_name())
             if event.get_name() == temp:
                 if (visible and event.visible) or not visible:
                     matched_event = event