Merge lp:~fboucault/notes-app/new_theming into lp:notes-app

[Florian Boucault]

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.
The Ubuntu UI Toolkit merge request containing that change is: https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/simple_theming/+merge/171645
It will be merged in the morning so that the fixes for this app can be merged in the same day.

For testing, armhf packages of the toolkit are available at: http://people.canonical.com/~kaleo/sdk_simple_theming/

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/notes-app-ci/113/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/436/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/396

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

All works as advertised. Comment approving until the SDK is ready.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/38/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-autolanding/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/574
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/574/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/515

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notes-app-autolanding/39/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-autolanding/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-autolanding/6
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-autolanding/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-autolanding/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/583
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/583/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/522

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

It appears autopilot tests are failing because of focus issues, similar to those that Ugo spent quite some time fighting in the past. From a quick scan at the code, I have no idea what’s going on, need input from someone on the SDK team.

[Florian Boucault (fboucault)]

I don't think the issue is related to the toolkit really.

[Olivier Tilloy (osomon)]

Superseded by https://code.launchpad.net/~osomon/notes-app/new_theming_fixed/+merge/173139.

review: Disapprove

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-17 15:04:55 +0000
+++ CMakeLists.txt	2013-06-27 18:58:28 +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-06-27 18:58:28 +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/TextDelegate.qml'
--- Components/TextDelegate.qml	2013-05-31 16:34:00 +0000
+++ Components/TextDelegate.qml	2013-06-27 18:58:28 +0000
@@ -16,15 +16,15 @@
 
 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 {}
-
+    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-06-27 18:58:28 +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: "";
-}