Merge lp:~verzegnassi-stefano/quick-memo/fix-1411614 into lp:quick-memo/trunk

[Stefano Verzegnassi]

Fix bug #1411614: Input lost after deleting memo

Fix bug #1411614: Input lost after deleting memo

=== modified file 'app/components/EditMemoPage.qml'
--- app/components/EditMemoPage.qml	2014-11-03 00:21:23 +0000
+++ app/components/EditMemoPage.qml	2015-01-17 19:46:33 +0000
@@ -122,7 +122,8 @@
 
         onTriggered: {
             if (!canSave) { // Change timer inteval if can't save?
-                PopupUtils.open(deleteDialog, memoPage, {emptyMemo: true})
+                deleteDialog.emptyMemo = true;
+                deleteDialog.show();
             } else {
                 console.log("autoSaveTimer triggered... updating the note!")
                 saveNote()
@@ -204,7 +205,7 @@
         id: deleteMemo
         text: i18n.tr("Delete memo")
         iconName: "delete"
-        onTriggered: PopupUtils.open(deleteDialog)
+        onTriggered: deleteDialog.show()
         visible: editMemo
     }
     Action {
@@ -220,7 +221,8 @@
         iconName: "back"
         onTriggered: {
             if (!canSave) {
-                PopupUtils.open(deleteDialog, memoPage, {emptyMemo: true})
+                deleteDialog.emptyMemo = true;
+                deleteDialog.show();
             } else {
                 // Check if a saveNote request was made. If so, stop the timer and save before exiting the page.
                 if (autoSaveTimer.running) {
@@ -256,33 +258,30 @@
     }
 
     //  *** DIALOGS ***
-    Component {
+    Dialog {
         id: deleteDialog
-        Dialog {
-            id: deleteDialogue
-
-            property bool emptyMemo: false
-
-            title: emptyMemo ? i18n.tr("Empty memo") : i18n.tr("Delete memo")
-            text: emptyMemo ? i18n.tr("This memo has no content.") : i18n.tr("Are you sure?")
-
-            Button {
-                text: i18n.tr("Cancel")
-                gradient: UbuntuColors.greyGradient
-                onClicked: PopupUtils.close(deleteDialogue)
-                visible: !emptyMemo
-            }
-            Button {
-                text: i18n.tr("Delete")
-                color: UbuntuColors.orange
-                onClicked: {
-                    PopupUtils.close(deleteDialogue)
-                    pageStack.pop();
-                    pageStack.push(mainPage)
-                    notes.deleteNote(index)
-
-                    root.showNotification(i18n.tr("Memo deleted!"))
-                }
+
+        property bool emptyMemo: false
+
+        title: emptyMemo ? i18n.tr("Empty memo") : i18n.tr("Delete memo")
+        text: emptyMemo ? i18n.tr("This memo has no content.") : i18n.tr("Are you sure?")
+
+        Button {
+            text: i18n.tr("Cancel")
+            gradient: UbuntuColors.greyGradient
+            onClicked: deleteDialog.hide()
+            visible: !emptyMemo
+        }
+        Button {
+            text: i18n.tr("Delete")
+            color: UbuntuColors.orange
+            onClicked: {
+                deleteDialog.hide()
+                pageStack.pop();
+                pageStack.push(mainPage)
+                notes.deleteNote(index)
+
+                root.showNotification(i18n.tr("Memo deleted!"))
             }
         }
     }

=== modified file 'po/quick-memo.pot'
--- po/quick-memo.pot	2014-11-06 05:09:59 +0000
+++ po/quick-memo.pot	2015-01-17 19:46:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-06 06:08+0100\n"
+"POT-Creation-Date: 2015-01-17 20:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -54,11 +54,11 @@
 msgid "A big thanks to:"
 msgstr ""
 
-#: ../app/components/AboutPage.qml:153
+#: ../app/components/AboutPage.qml:158
 msgid "Copyright"
 msgstr ""
 
-#: ../app/components/AboutPage.qml:185
+#: ../app/components/AboutPage.qml:190
 msgid "Close"
 msgstr ""
 
@@ -72,7 +72,7 @@
 
 #: ../app/components/ColorDialog.qml:151
 #: ../app/components/EditMemoPage.qml:270
-#: ../app/components/EditMemoPage.qml:299 ../app/components/MainPage.qml:283
+#: ../app/components/EditMemoPage.qml:298 ../app/components/MainPage.qml:283
 #: ../app/components/MultiSelectionHandler.qml:33
 msgid "Cancel"
 msgstr ""
@@ -91,7 +91,7 @@
 
 #. TRANSLATORS: This is a custom text for the "enter" key of
 #. the on-screen keyboard (max 4 char, so it's not elided)
-#: ../app/components/EditMemoPage.qml:83 ../app/components/ListManager.qml:229
+#: ../app/components/EditMemoPage.qml:83 ../app/components/ListManager.qml:287
 msgid "Next"
 msgstr ""
 
@@ -104,15 +104,15 @@
 msgid "Last update: %1"
 msgstr ""
 
-#: ../app/components/EditMemoPage.qml:190
+#: ../app/components/EditMemoPage.qml:191
 msgid "Memo saved!"
 msgstr ""
 
-#: ../app/components/EditMemoPage.qml:196
+#: ../app/components/EditMemoPage.qml:197
 msgid "Save"
 msgstr ""
 
-#: ../app/components/EditMemoPage.qml:205
+#: ../app/components/EditMemoPage.qml:206
 #: ../app/components/EditMemoPage.qml:266 ../app/components/MainPage.qml:240
 #: ../app/components/MainPage.qml:279
 msgid "Delete memo"
@@ -120,17 +120,17 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/components/EditMemoPage.qml:212 ../app/components/MainPage.qml:233
+#: ../app/components/EditMemoPage.qml:213 ../app/components/MainPage.qml:233
 msgid "Change memo color"
 msgstr ""
 
-#: ../app/components/EditMemoPage.qml:238 ../app/components/MainPage.qml:268
+#: ../app/components/EditMemoPage.qml:240 ../app/components/MainPage.qml:268
 msgid "Memo updated!"
 msgid_plural "Memos updated!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/components/EditMemoPage.qml:253
+#: ../app/components/EditMemoPage.qml:255
 msgid "Memo aborted!"
 msgstr ""
 
@@ -156,15 +156,15 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../app/components/EditMemoPage.qml:294
+msgid "Discard changes?"
+msgstr ""
+
 #: ../app/components/EditMemoPage.qml:295
-msgid "Discard changes?"
-msgstr ""
-
-#: ../app/components/EditMemoPage.qml:296
 msgid "Your memo will be PERMANENTLY lost."
 msgstr ""
 
-#: ../app/components/EditMemoPage.qml:304
+#: ../app/components/EditMemoPage.qml:303
 msgid "Go back!"
 msgstr ""
 
@@ -177,11 +177,11 @@
 msgstr ""
 
 #. TRANSLATORS: Text of a button used for add an item in the To-do list.
-#: ../app/components/ListManager.qml:96
+#: ../app/components/ListManager.qml:98
 msgid "Add item"
 msgstr ""
 
-#: ../app/components/ListManager.qml:229
+#: ../app/components/ListManager.qml:287
 msgid "Add"
 msgstr ""