Merge lp:~mzanetti/reminders-app/fix-missing-checkbox into lp:reminders-app

[Michael Zanetti]

Fix the missing icon for unchecked checkboxes in EditNoteView

[Riccardo Padovani (rpadovani)]

Please remove the unused file.

review: Needs Fixing

[lp:~mzanetti/reminders-app/fix-missing-checkbox]

486. By Michael Zanetti on 2015-09-10

properly replace the icon with the one in the theme

[Riccardo Padovani (rpadovani)]

lgtm now, thanks!

review: Approve

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

PASSED: Continuous integration, rev:486
http://91.189.93.70:8080/job/reminders-app-ci/780/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/202

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml	2015-08-11 17:25:29 +0000
+++ src/app/qml/components/RemindersDelegate.qml	2015-09-10 21:17:28 +0000
@@ -45,7 +45,7 @@
     triggerActionOnMouseRelease: true
     rightSideActions: [
         Action {
-            iconSource: root.note.reminderDone ? "image://theme/select" : "../images/unchecked.svg"
+            iconSource: root.note.reminderDone ? "image://theme/select" : "image://theme/select-none"
             text: root.note.reminderDone ? i18n.tr("Mark as undone") : i18n.tr("Mark as done")
             onTriggered: {
                 note.reminderDone = !root.note.reminderDone;

=== removed file 'src/app/qml/images/unchecked.svg'
--- src/app/qml/images/unchecked.svg	2013-12-14 22:38:57 +0000
+++ src/app/qml/images/unchecked.svg	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="90"
-   height="90"
-   id="svg3140">
-  <defs
-     id="defs12" />
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     width="90"
-     height="90"
-     x="0"
-     y="-1.4648437e-05"
-     id="rect4198"
-     style="color:#000000;fill:none" />
-  <path
-     d="m 6,24 v 42 c 0,18 3,18 30,18 h 18 c 27,0 30,0 30,-18 V 24 C 84,6 81,6 54,6 H 36 C 9,6 6,6 6,24 z M 36,12 h 18 c 24,0 24,0 24,12 v 42 c 0,12 0,12 -24,12 H 36 C 12,78 12,78 12,66 V 24 C 12,12 12,12 36,12 z"
-     id="path3759"
-     style="fill:#808080" />
-  <rect
-     width="90"
-     height="90"
-     x="0"
-     y="1.7382999e-05"
-     id="rect3045"
-     style="color:#000000;fill:none" />
-</svg>

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-09-10 21:17:27 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-09-10 21:17:28 +0000
@@ -622,7 +622,7 @@
                 width: height
                 onClicked: {
                     var pos = noteTextArea.cursorPosition
-                    noteTextArea.insert(pos, "<img src=\"../images/unchecked.svg\" height=" + units.gu(2) + ">")
+                    noteTextArea.insert(pos, "<img src=\"image://theme/select-none\" height=" + units.gu(2) + ">")
                     noteTextArea.cursorPosition = pos + 1;
                 }
             }

=== modified file 'src/libqtevernote/utils/enmldocument.cpp'
--- src/libqtevernote/utils/enmldocument.cpp	2015-06-14 23:34:29 +0000
+++ src/libqtevernote/utils/enmldocument.cpp	2015-09-10 21:17:28 +0000
@@ -236,7 +236,7 @@
 
                 if (type == TypeRichText) {
                     writer.writeStartElement("img");
-                    writer.writeAttribute("src", checked ? "image://theme/select" : "../images/unchecked.svg");
+                    writer.writeAttribute("src", checked ? "image://theme/select" : "image://theme/select-none");
                     writer.writeAttribute("height", QString::number(gu(2)));
                 } else if (type == TypeHtml){
                     writer.writeStartElement("input");
@@ -391,7 +391,7 @@
                     writer.writeStartElement("en-media");
                     writer.writeAttribute("hash", hash);
                     writer.writeAttribute("type", type);
-                } else if (imageUrl.authority() == "theme" || imageUrl.path() == "../images/unchecked.svg") {
+                } else if (imageUrl.authority() == "theme") {
                     writer.writeStartElement("en-todo");
                     writer.writeAttribute("checked", imageUrl.path() == "/select" ? "true" : "false");
                 } else {