Ubuntu Calendar App

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

  1. WeekView-Devider
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: Mihir Soni
Approved revision: 493
Merged at revision: 494
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-Devider
Merge into: lp:ubuntu-calendar-app
Diff against target: 77 lines (+23/-5)
3 files modified
TimeLineBackground.qml (+4/-2)
TimeLineBase.qml (+2/-1)
TimeLineBaseComponent.qml (+17/-2)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-Devider
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+236986@code.launchpad.net

Commit message

Resolves Bug #1248127

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

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
Revision history for this message
Mihir Soni (mihirsoni) wrote :

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

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

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

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> 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 updated
491. By Kunal Parmar

Review comment

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

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

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
492. By Kunal Parmar

Re-triggerig jenkins

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
493. By Kunal Parmar

merge from trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

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

Thanks for the MR kunal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
3232
33 Label {33 Label {
34 id: timeLabel34 id: timeLabel
35 width: (parent.width / 7) - units.gu(1)
36 wrapMode: Text.WordWrap
3537
36 text: {38 text: {
37 var locale = Qt.locale()39 var locale = Qt.locale()
38 return new Date(0, 0, 0, index).toLocaleTimeString40 return new Date(0, 0, 0, index).toLocaleTimeString
39 (locale, locale.timeFormat(Locale.NarrowFormat))41 (locale, locale.timeFormat(Locale.NarrowFormat))
40 }42 }
4143
42 anchors {44 anchors {
43 left: parent.left45 left: parent.left
44 leftMargin: units.gu(2)46 leftMargin: units.gu(0.5)
45 verticalCenter: parent.verticalCenter47 verticalCenter: parent.verticalCenter
46 }48 }
4749
4850
=== 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 @@
109109
110 function destroyAllChildren() {110 function destroyAllChildren() {
111 for( var i = children.length - 1; i >= 0; --i ) {111 for( var i = children.length - 1; i >= 0; --i ) {
112 if( children[i].objectName === "mouseArea" ) {112 if( children[i].objectName === "mouseArea" ||
113 children[i].objectName === "weekdevider") {
113 continue;114 continue;
114 }115 }
115 children[i].visible = false;116 children[i].visible = false;
116117
=== 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 @@
126 anchors {126 anchors {
127 fill: parent127 fill: parent
128 leftMargin: type == ViewType.ViewTypeWeek ? units.gu(0)128 leftMargin: type == ViewType.ViewTypeWeek ? units.gu(0)
129 : units.gu(10)129 : units.gu(6)
130130
131 rightMargin: type == ViewType.ViewTypeWeek ? units.gu(0)131 rightMargin: type == ViewType.ViewTypeWeek ? units.gu(0)
132 : units.gu(4)132 : units.gu(3)
133 }133 }
134134
135 Repeater {135 Repeater {
@@ -150,6 +150,21 @@
150 delegate: comp150 delegate: comp
151 day: startDay.addDays(index)151 day: startDay.addDays(index)
152152
153 Loader{
154 objectName: "weekdevider"
155 height: parent.height
156 width: units.gu(0.15)
157 sourceComponent: type == ViewType.ViewTypeWeek ? weekDeviderComponent : undefined
158 }
159
160 Component {
161 id: weekDeviderComponent
162 Rectangle{
163 anchors.fill: parent
164 color: "#e5e2e2"
165 }
166 }
167
153 Connections{168 Connections{
154 target: mainModel169 target: mainModel
155 onStartPeriodChanged:{170 onStartPeriodChanged:{

Subscribers

People subscribed via source and target branches

to status/vote changes: