Merge lp:~renatofilho/ubuntu-calendar-app/fix-1311125 into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Integrated with SyncMonitor.

HOW TO TEST
===========

1 - Install new sync monitor packages from: https://code.launchpad.net/~renatofilho/sync-monitor/qml-bindings/+merge/217250
2 - Make sure that you have at least one goolge account registered on online accounts;
3 - Add a new event on google account using you browser;
4 - Click on Sync button on calendar app toolbar;
5 - Check if the new event appears on the app;

[lp:~renatofilho/ubuntu-calendar-app/fix-1311125]

255. By Renato Araujo Oliveira Filho on 2014-04-25

Added qtdeclarative5-ubuntu-syncmonitor0.1 into application dependency list.

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

FAILED: Continuous integration, rev:255
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/411/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2215/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/411
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/411
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/245

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

changes looks good, Can you tell me how to test it ?

[Renato Araujo Oliveira Filho (renatofilho)]

> changes looks good, Can you tell me how to test it ?
How to test added to MR description.

[Victor Thompson (vthompson)]

Renato,

Could you merge trunk into this branch so you get the fix for a bug that prevents the app from running correctly on the device [1]?

[1] https://bugs.launchpad.net/bugs/1312480

[lp:~renatofilho/ubuntu-calendar-app/fix-1311125]

256. By Renato Araujo Oliveira Filho on 2014-04-29

Merged mainline.

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

FAILED: Continuous integration, rev:256
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/422/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2288/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/422
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/422
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/256

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Adding qtdeclaratie5-ubuntu-syncmonitor0.1 seems to have broken the tests on jenkins.

The following packages have unmet dependencies:
 calendar-app : Depends: qtdeclarative5-ubuntu-syncmonitor0.1 but it is not installable
E: Unable to correct problems, you have held broken packages.

Do we need to binary copy that into the core apps ppa to get this passing?

review: Needs Fixing

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Also, when is the package planned to land in the image, because we can't land this branch until it does.

[Nicholas Skaggs (nskaggs)]

Alan is correct, jenkins can't find qtdeclarative5-ubuntu-syncmonitor0.1 atm. Seems your merge is creating the package, https://code.launchpad.net/~renatofilho/sync-monitor/qml-bindings/+merge/217250.

When it merges, will it exist in the general archive? I'm assuming yes. If so, once your merge lands, jenkins should be happy.

I don't think creating a copy in the ppa makes much sense, as it will still fail on devices until the package is seeded ;-)

[Kunal Parmar (pkunal-parmar)]

I am not able to build sync monitor, while installing dependency, I am getting broke package error.

[Kunal Parmar (pkunal-parmar)]

kunal@kunal-sammy:~/Dropbox/projects/qt/qml/ubuntu/calendar/review/sync_monitor/qml-bindings$ sudo apt-get install qtpim5-dev

The following packages have unmet dependencies:
 qtpim5-dev : Depends: libqt5organizer5 (= 5.0~git20140203~e0c5eebe-0ubuntu2) but 5.0~git20140203~e0c5eebe-0ubuntu3 is to be installed
              Depends: libqt5versit5 (= 5.0~git20140203~e0c5eebe-0ubuntu2) but 5.0~git20140203~e0c5eebe-0ubuntu3 is to be installed
              Depends: libqt5versitorganizer5 (= 5.0~git20140203~e0c5eebe-0ubuntu2) but 5.0~git20140203~e0c5eebe-0ubuntu3 is to be installed
E: Unable to correct problems, you have held broken packages.
kunal@kunal-sammy:~/Dropbox/projects/qt/qml/ubuntu/calendar/review/sync_monitor/qml-bindings$

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I understand this should have landed already, asked Renato to ping Bill for an update.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Renato tells me this was landed in utopic but not trusty, so can you test on the device as discussed in the meeting?

[Bill Filler (bfiller)]

this is landed in utopic, so lets get this branched released

[Renato Araujo Oliveira Filho (renatofilho)]

The new policy rule necessary to get this working on device get released: https://bugs.launchpad.net/bugs/1319544

[Kunal Parmar (pkunal-parmar)]

Tested on device, works great, Thanks.

Once package is ready we can merge the changes.

But we need to comment out following line as its causing layout related changes. Which is commented out in latest trunk.

16 + // Work-around until this branch lands:
17 + // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
18 + property bool windowActive: typeof window != 'undefined'
19 + onWindowActiveChanged: window.title = i18n.tr("Calendar")
20 +

review: Needs Fixing

[Alan Pope 🍺🐧🐱 🦄 (popey)]

@Renato, can you merge with trunk please?

[Renato Araujo Oliveira Filho (renatofilho)]

I do not have the necessary permissions to push it.

[David Planella (dpm)]

We've now realised that this merge was pushed manually, bypassing all Jenkins tests. This has caused a serious regression (*) that's currently blocking the landings of all calendar branches and that has costed some hours for several of us to track down.

We really appreciate the contribution, but in the future, please stick to the CI workflow and refrain from manual landings. Jenkins and tests can be painful at times, but are our last line of defence against this type of regressions. Thanks.

(*)
1. SDK regression that got uncaught: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326963
2. Missing dependency for qtdeclarative5-ubuntu-syncmonitor0.1 on trusty

=== modified file 'calendar.qml'
--- calendar.qml	2014-04-27 05:12:51 +0000
+++ calendar.qml	2014-04-29 13:03:09 +0000
@@ -1,12 +1,19 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
+import Ubuntu.SyncMonitor 0.1
+import QtQuick.Window 2.0
 
 import "dateExt.js" as DateExt
 
 MainView {
     id: mainView
 
+    // Work-around until this branch lands:
+    // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
+    property bool windowActive: typeof window != 'undefined'
+    onWindowActiveChanged: window.title = i18n.tr("Calendar")
+
     // Argument during startup
     Arguments {
         id: args;
@@ -60,6 +67,10 @@
     footerColor: "#478158"
     anchorToKeyboard: true
 
+    SyncMonitor {
+        id: syncMonitor
+    }
+
     PageStack {
         id: pageStack
 
@@ -214,6 +225,16 @@
                         }
                     }
                 }
+                ToolbarButton {
+                    objectName: "syncbutton"
+                    visible: syncMonitor.enabledServices ? syncMonitor.serviceIsEnabled("calendar") : false
+                    action: Action {
+                        text: enabled ? i18n.tr("Sync") : i18n.tr("Syncing")
+                        iconName: "reload"
+                        onTriggered: syncMonitor.sync(["calendar"])
+                        enabled: (syncMonitor.state !== "syncing")
+                    }
+                }
             }
 
             Keys.onTabPressed: {

=== modified file 'debian/control'
--- debian/control	2014-01-28 16:48:59 +0000
+++ debian/control	2014-04-29 13:03:09 +0000
@@ -24,6 +24,7 @@
          libqtorganizer1,
          qtdeclarative5-qtorganizer-plugin,
          qtorganizer5-eds,
+         qtdeclarative5-ubuntu-syncmonitor0.1,
 Description: Calendar application for Ubuntu devices
  The Calendar application for Ubuntu devices lets you organise your life your
  way by month, week or daily diary.