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

[Kunal Parmar]

Resolves Bug #1248127

Resolves Bug #1248127
Week view needs some vertical spearator between days

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

FAILED: Continuous integration, rev:490
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/890/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/669
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/669/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/448

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

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

It is not aligned properly on Nexus 4.

http://i.imgur.com/G6gOL5J.png

Also, can we make little transparent too ? it is looking too dark.

review: Needs Fixing

[Mihir Soni (mihirsoni)]

I meant, they are aligned properly with day header but we need to reduce the time text on first column.

[Kunal Parmar (pkunal-parmar)]

I did not checked on phone. I will check and resolve issue

[Kunal Parmar (pkunal-parmar)]

> Also, can we make little transparent too ? it is looking too dark.

Transparency does not seems to be a solution, I guess some lighter color will be more appropriate.

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

491. By Kunal Parmar on 2014-10-04

Review comment

[Kunal Parmar (pkunal-parmar)]

Changed code to make time appear properly and made divider little lighter

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

FAILED: Continuous integration, rev:491
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/893/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/687
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/687/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/451

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

review: Needs Fixing (continuous-integration)

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

492. By Kunal Parmar on 2014-10-09

Re-triggerig jenkins

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

FAILED: Continuous integration, rev:492
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/906/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/791
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/791/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/464

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

review: Needs Fixing (continuous-integration)

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

493. By Kunal Parmar on 2014-10-09

merge from trunk

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

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

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Awesome , it looks great !!
http://i.imgur.com/t6b4FML.png

Thanks for the MR kunal.

review: Approve

=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml	2014-09-19 12:45:45 +0000
+++ TimeLineBackground.qml	2014-10-09 09:57:50 +0000
@@ -32,16 +32,18 @@
 
             Label {
                 id: timeLabel
+                width: (parent.width / 7) - units.gu(1)
+                wrapMode: Text.WordWrap
 
                 text: {
-                    var locale = Qt.locale()
+                    var locale = Qt.locale()                    
                     return new Date(0, 0, 0, index).toLocaleTimeString
                             (locale, locale.timeFormat(Locale.NarrowFormat))
                 }
 
                 anchors {
                     left: parent.left
-                    leftMargin: units.gu(2)
+                    leftMargin: units.gu(0.5)
                     verticalCenter: parent.verticalCenter
                 }
 

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2014-09-28 05:25:31 +0000
+++ TimeLineBase.qml	2014-10-09 09:57:50 +0000
@@ -109,7 +109,8 @@
 
     function destroyAllChildren() {
         for( var i = children.length - 1; i >= 0; --i ) {
-            if( children[i].objectName === "mouseArea" ) {
+            if( children[i].objectName === "mouseArea" ||
+                    children[i].objectName === "weekdevider") {
                 continue;
             }
             children[i].visible = false;

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-09-25 19:53:50 +0000
+++ TimeLineBaseComponent.qml	2014-10-09 09:57:50 +0000
@@ -126,10 +126,10 @@
                 anchors {
                     fill: parent
                     leftMargin: type == ViewType.ViewTypeWeek ? units.gu(0)
-                                                              : units.gu(10)
+                                                              : units.gu(6)
 
                     rightMargin: type == ViewType.ViewTypeWeek ? units.gu(0)
-                                                              : units.gu(4)
+                                                              : units.gu(3)
                 }
 
                 Repeater {
@@ -150,6 +150,21 @@
                         delegate: comp
                         day: startDay.addDays(index)
 
+                        Loader{
+                            objectName: "weekdevider"
+                            height: parent.height
+                            width: units.gu(0.15)
+                            sourceComponent: type == ViewType.ViewTypeWeek ? weekDeviderComponent : undefined
+                        }
+
+                        Component {
+                            id: weekDeviderComponent
+                            Rectangle{
+                                anchors.fill: parent
+                                color: "#e5e2e2"
+                            }
+                        }
+
                         Connections{
                             target: mainModel
                             onStartPeriodChanged:{