Merge lp:~osomon/notes-app/new_theming_fixed into lp:notes-app

[Olivier Tilloy]

Adapted to newer and simpler toolkit's theming infrastructure. The header is no longer yellow which is fine since a revamped visual design for that is underway.

The ItemStyle attached property has been removed and widgets now have a 'style' property equivalent to what ItemStyle.delegate was providing.

(original work by Florian, I merely fixed the failing tests)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/notes-app-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/740
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/740/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/663

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/114/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/notes-app-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/740
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/740/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/663

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/114/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Jenkins is busted, it posts the same results twice, but marks them failed the second time for no good reason.
Still, it appears that the tests all pass. Hurray!

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/40/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/774/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-autolanding/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-autolanding/7
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-autolanding/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-autolanding/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/776/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-17 15:04:55 +0000
+++ CMakeLists.txt	2013-07-05 07:12:26 +0000
@@ -21,7 +21,7 @@
     DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
-file(GLOB QML_JS_FILES *.qml *.qmltheme)
+file(GLOB QML_JS_FILES *.qml)
 
 install(FILES ${QML_JS_FILES}
     DESTINATION ${NOTES_APP_DIR}

=== modified file 'Components/CollapsedNoteDecorations.qml'
--- Components/CollapsedNoteDecorations.qml	2013-06-10 11:48:01 +0000
+++ Components/CollapsedNoteDecorations.qml	2013-07-05 07:12:26 +0000
@@ -34,12 +34,13 @@
 
     Label {
         id: noteDate
-        ItemStyle.class: "note-date"
         anchors {
             bottom: parent.bottom
             right: parent.right
             margins: units.gu(1)
         }
+        fontSize: "x-small"
+        color: "#c7af87"
     }
 
     Behavior on opacity {

=== modified file 'Components/ImageDelegate.qml'
--- Components/ImageDelegate.qml	2013-05-02 23:45:59 +0000
+++ Components/ImageDelegate.qml	2013-07-05 07:12:26 +0000
@@ -20,6 +20,8 @@
 Item {
     id: item
 
+    readonly property string type: "image"
+
     property string source
     signal clicked(bool atTop)
     signal activateClipboard()

=== modified file 'Components/TextDelegate.qml'
--- Components/TextDelegate.qml	2013-05-31 16:34:00 +0000
+++ Components/TextDelegate.qml	2013-07-05 07:12:26 +0000
@@ -16,15 +16,17 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Components.Themes.Ambiance 0.1
 
 TextArea {
     id: textArea
 
-    /* WORKAROUND for but in the SDK:
-       https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1168006
-       which makes the app crash when loading the theme */
-    ItemStyle.delegate: Item {}
+    readonly property string type: "text"
 
+    style: TextAreaStyle {
+        frameSpacing: 0
+        background: Item {}
+    }
     signal deletePrevious()
 
     autoSize: true

=== modified file 'NotesApp.qml'
--- NotesApp.qml	2013-05-31 16:34:00 +0000
+++ NotesApp.qml	2013-07-05 07:12:26 +0000
@@ -63,8 +63,6 @@
         }
     }
 
-    Component.onCompleted: Theme.loadTheme(Qt.resolvedUrl("notes-app.qmltheme"))
-
     Page {
         anchors.fill: parent
         title: i18n.tr("Notes")

=== removed file 'notes-app.qmltheme'
--- notes-app.qmltheme	2013-03-25 11:12:44 +0000
+++ notes-app.qmltheme	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-@import url(system:/Ambiance/qmltheme/default.qmltheme);
-
-@qml-mapping(.textarea, TextAreaStyle, );
-
-.textarea {
-    frameSpacing: 8
-}
-
-.note-date {
-    fontSize: "x-small";
-    color: "#c7af87";
-}
-
-.header {
-    backgroundColor: "#f9edc1";
-    backgroundSource: "";
-}

=== modified file 'tests/autopilot/notes_app/tests/test_create.py'
--- tests/autopilot/notes_app/tests/test_create.py	2013-05-15 16:46:44 +0000
+++ tests/autopilot/notes_app/tests/test_create.py	2013-07-05 07:12:26 +0000
@@ -148,4 +148,4 @@
         self.pointing_device.click()
 
         content = self.main_window.get_note_content(note)
-        self.assertThat(content.activeFocus, Equals(True))
+        self.assertThat(content.activeFocus, Eventually(Equals(True)))