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

[Michael Zanetti]

Fix the missing icon for unchecked checkboxes in EditNoteView

[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

Unmerged revisions

=== modified file 'push-helper.apparmor'
--- push-helper.apparmor	2014-12-08 10:25:48 +0000
+++ push-helper.apparmor	2015-09-10 21:06:02 +0000
@@ -7,5 +7,5 @@
         "calendar",
         "webview"
     ],
-    "policy_version": 1.2
+    "policy_version": 1.3
 }
 
=== renamed file 'src/app/qml/components/Header.qml' => 'src/app/qml/components/NoteHeader.qml'
=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2015-09-08 18:10:48 +0000
+++ src/app/qml/reminders.qml	2015-09-10 21:06:02 +0000
@@ -27,6 +27,7 @@
 import Ubuntu.OnlineAccounts.Client 0.1
 import Ubuntu.PushNotifications 0.1
 import Ubuntu.Content 1.0
+import com.canonical.Oxide 1.5
 import "components"
 import "ui"
 
@@ -491,6 +492,21 @@
         }
     }
 
+    // FIXME: This is currently located here so it is always ready
+    // when we're constructing a WebView. Due to bug
+    // https://bugs.launchpad.net/oxide/+bug/1471779
+    // there's a race condition when creating both at the same time
+    WebContext {
+        id: webContext
+
+        userScripts: [
+            UserScript {
+                context: 'reminders://interaction'
+                url: Qt.resolvedUrl("ui/reminders-scripts.js");
+            }
+        ]
+    }
+
     Column {
         id: statusBar
         anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: units.gu(6)}
 
=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-09-10 21:06:02 +0000
@@ -131,7 +131,7 @@
                      width: parent.width
                      height: childrenRect.height
 
-                     Header {
+                     NoteHeader {
                         id: header
                         note: root.note
 
 
=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml	2015-09-08 18:10:48 +0000
+++ src/app/qml/ui/NoteView.qml	2015-09-10 21:06:02 +0000
@@ -50,17 +50,6 @@
         property bool dirty: false
     }
 
-    WebContext {
-        id: webContext
-
-        userScripts: [
-            UserScript {
-                context: 'reminders://interaction'
-                url: Qt.resolvedUrl("reminders-scripts.js");
-            }
-        ]
-    }
-
     Rectangle {
         id: locationBar
         y: noteTextArea.locationBarController.offset
@@ -70,7 +59,7 @@
         color: "white"
         z: 2
 
-        Header {
+        NoteHeader {
             id: headerContent
             note: root.note
             editingEnabled: false
 
=== 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:06:02 +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");