Merge lp:~rpadovani/reminders-app/1316950 into lp:reminders-app

[Riccardo Padovani]

Use Ubuntu Font as default for noteview

This fix uses a undocumented function to set the default font family.

The 'official' way to do this is to use http://qt-project.org/doc/qt-5/qwebsettings.html, but requires some work.

What do you think, is good anyway?

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

PASSED: Continuous integration, rev:128
http://91.189.93.70:8080/job/reminders-app-ci/312/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2517
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2517/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/52
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/313
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/7

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/312/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

I'll review in more detail tomorrow, but a couple of things to bear in mind, which I hadn't thought about:

- From the web, you can set different types of font:
  - Helvetica
  - Times New Roman
  - Courier New
  - Georgia
  - Trebuchet
  - Verdana

We should not probably override those with the Ubuntu font (although we could). Another option would be to explicitly set the font to 'Ubuntu' for the notes that are created from Reminders.

[David Planella (dpm)]

So from what Olivier tells me, setting the standard font won't override those, it will only use the standard font set if there isn't one explicitly set, which is exactly what we want.

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/reminders-app-autolanding/116/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2562
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2562/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/98/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-autolanding/116
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/7/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml	2014-05-07 07:55:08 +0000
+++ src/app/qml/ui/NoteView.qml	2014-05-08 15:25:18 +0000
@@ -72,6 +72,7 @@
                 loadHtml(html, "file:///")
             }
 
+            experimental.preferences.standardFontFamily: 'Ubuntu'
             experimental.preferences.navigatorQtObjectEnabled: true
             experimental.preferredMinimumContentsWidth: root.width
             experimental.userScripts: [Qt.resolvedUrl("reminders-scripts.js")]