Merge lp:~sergiusens/ciborium/1372774 into lp:ciborium

[Sergio Schvezov]

Adding a pre remove and post remove dialog

The dialog here is based out of the Format one.

[lp:~sergiusens/ciborium/1372774]

60. By Sergio Schvezov on 2014-09-24

Updating translations to fetch qml files as well

61. By Sergio Schvezov on 2014-09-24

Updated translation template

62. By Sergio Schvezov on 2014-09-24

Disabling the button after "safely removing"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/ciborium-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ciborium-ci/2/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/ciborium-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ciborium-ci/3/rebuild

review: Approve (continuous-integration)

[lp:~sergiusens/ciborium/1372774]

63. By Sergio Schvezov on 2014-09-24

Updating translation pot

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/ciborium-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ciborium-ci/5/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM, works fine.

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'po/ciborium.pot'
--- po/ciborium.pot	2014-09-17 18:03:37 +0000
+++ po/ciborium.pot	2014-09-24 20:40:29 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ciborium\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 15:03-0300\n"
+"POT-Creation-Date: 2014-09-24 17:38-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -76,6 +76,56 @@
 msgid "Only %d%% is available on the external storage device"
 msgstr ""
 
+#: share/ciborium/qml/main.qml:33
+msgid "SD Card Management"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:17
+msgid "Safe to remove"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:18
+msgid "You can now safely remove the device"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:21
+msgid "Ok"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:36
+msgid "Confirm remove"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:37
+msgid "Files on the device can't be accessed after removing"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:40
+#: share/ciborium/qml/components/FormatDialog.qml:21
+msgid "Cancel"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:44
+msgid "Continue"
+msgstr ""
+
+#: share/ciborium/qml/components/SafeRemoval.qml:59
+msgid "Safely Remove"
+msgstr ""
+
+#: share/ciborium/qml/components/FormatDialog.qml:17
+#: share/ciborium/qml/components/FormatDialog.qml:37
+msgid "Format"
+msgstr ""
+
+#: share/ciborium/qml/components/FormatDialog.qml:18
+msgid "This action will wipe the content from the device"
+msgstr ""
+
+#: share/ciborium/qml/components/FormatDialog.qml:25
+msgid "Continue with format"
+msgstr ""
+
 #: share/applications/ciborium.desktop.tr.h:1
 msgid "External Drives"
 msgstr ""

=== added file 'share/ciborium/qml/components/SafeRemoval.qml'
--- share/ciborium/qml/components/SafeRemoval.qml	1970-01-01 00:00:00 +0000
+++ share/ciborium/qml/components/SafeRemoval.qml	2014-09-24 20:40:29 +0000
@@ -0,0 +1,64 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+Item {
+    property int driveIndex
+
+    height: childrenRect.height
+    width: childrenRect.width
+
+    Component {
+        id: dialogRemoved
+
+        Dialog {
+            id: dialogueRemoved
+
+            title: i18n.tr("Safe to remove")
+            text: i18n.tr("You can now safely remove the device")
+
+            Button {
+                text: i18n.tr("Ok")
+                color: UbuntuColors.orange
+                onClicked: {
+                    PopupUtils.close(dialogueRemoved)
+                }
+            }
+        }
+    }
+
+    Component {
+        id: dialogConfirmRemove
+
+        Dialog {
+            id: dialogueConfirmRemove
+
+            title: i18n.tr("Confirm remove")
+            text: i18n.tr("Files on the device can't be accessed after removing")
+
+            Button {
+                text: i18n.tr("Cancel")
+                onClicked: PopupUtils.close(dialogueConfirmRemove)
+            }
+            Button {
+                text: i18n.tr("Continue")
+                color: UbuntuColors.orange
+                onClicked: {
+                    driveCtrl.driveUnmount(index)
+                    PopupUtils.close(dialogueConfirmRemove)
+                    saferemoval.enabled= false
+                    PopupUtils.open(dialogRemoved)
+                }
+            }
+        }
+    }
+
+    Button {
+        anchors.centerIn: parent
+        id: saferemoval
+        text: i18n.tr("Safely Remove")
+        onClicked: {
+            PopupUtils.open(dialogConfirmRemove)
+        }
+    }
+}

=== modified file 'share/ciborium/qml/main.qml'
--- share/ciborium/qml/main.qml	2014-08-26 22:19:48 +0000
+++ share/ciborium/qml/main.qml	2014-09-24 20:40:29 +0000
@@ -83,9 +83,8 @@
                             FormatDialog {
                                 driveIndex: index
                             }
-                            Button {
-                                text: i18n.tr("Safely Remove")
-                                onClicked: driveCtrl.driveUnmount(index)
+                            SafeRemoval {
+                                driveIndex: index
                             }
                         }
                     }

=== modified file 'update_translations.sh'
--- update_translations.sh	2014-09-03 20:19:03 +0000
+++ update_translations.sh	2014-09-24 20:40:29 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 sources=$(find . -name '*.go' | xargs)
+qml=$(find . -name '*.qml' | xargs)
 domain='ciborium'
 pot_file=po/$domain.pot
 desktop=share/applications/$domain.desktop
@@ -16,7 +17,7 @@
  --keyword=Gettext --keyword=tr --keyword=tr:1,2 --keyword=N_ \
  --package-name=$domain \
  --copyright-holder='Canonical Ltd.' \
- $sources $desktop.tr.h
+ $sources $qml $desktop.tr.h
 
 echo Removing $desktop.tr.h $desktop.tr
 rm $desktop.tr.h $desktop.tr