Merge lp:~michael-sheldon/content-hub/cancel-button into lp:content-hub

[Michael Sheldon]

Add a cancel button to the ContentTransferHint.

Adds a cancel button to the ContentTransferHint (allowing users to cancel an import operation from the originating app).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/content-hub-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/187/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

This looks good to me, however seems with the recent sdk changes the transfer hint looks a bit confusing. It displays the white box with activity spinner, it used to just be a black overlay with spinner. Perhaps we should put some text in there "Transfer in progress", or some variation of that.

[Ken VanDine (ken-vandine)]

Or maybe we should look at making it look more like it did before, without the white box.

[Bill Filler (bfiller)]

+1 on adding "Transfer in progress" to the dialog

review: Needs Fixing

[lp:~michael-sheldon/content-hub/cancel-button]

127. By Michael Sheldon on 2014-08-13

Add 'Transfer in progress' title to ContentTransferHint dialog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/content-hub-ci/188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/188/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/content-hub/cancel-button]

128. By Michael Sheldon on 2014-08-14

Fix translation infrastructure to extract strings from both QML and CPP code and update POT file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/content-hub-ci/189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/189/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * Adds cancel button to the ContentTransferHint (currently no spec for this component though)

If you changed UI labels, did you update the pot file?

 * Yes

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-01 20:07:16 +0000
+++ CMakeLists.txt	2014-08-14 11:49:51 +0000
@@ -83,6 +83,20 @@
 
 include_directories(include)
 
+file(GLOB_RECURSE I18N_QML_SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     import/Ubuntu/Content/**.qml)
+list(SORT I18N_QML_SRC_FILES)
+
+file(GLOB_RECURSE I18N_CPP_SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     src/com/ubuntu/content/detail/**.cpp)
+list(SORT I18N_CPP_SRC_FILES)
+
+# for dh_translations to extract the domain
+# (regarding syntax consistency, see http://pad.lv/1181187)
+set (GETTEXT_PACKAGE "content-hub")
+
 add_subdirectory(doc)
 add_subdirectory(po)
 add_subdirectory(src)

=== removed file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2014-05-01 17:03:40 +0000
+++ cmake/Translations.cmake	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
-
-macro(add_translations_directory NLS_PACKAGE)
-    add_custom_target (i18n ALL)
-    find_program (MSGFMT_EXECUTABLE msgfmt)
-    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
-    foreach (PO_INPUT ${PO_FILES})
-        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
-        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
-        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
-
-        install (FILES ${MO_OUTPUT} DESTINATION
-            ${CMAKE_INSTALL_LOCALEDIR}/${PO_INPUT_BASE}/LC_MESSAGES
-            RENAME ${NLS_PACKAGE}.mo)
-    endforeach (PO_INPUT ${PO_FILES})
-endmacro(add_translations_directory)
-
-
-macro(add_translations_catalog NLS_PACKAGE)
-    add_custom_target (pot COMMENT “Building translation catalog.”)
-    find_program (XGETTEXT_EXECUTABLE xgettext)
-
-
-    set(C_SOURCE "")
-
-    foreach(FILES_INPUT ${ARGN})
-        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.cpp)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-    endforeach()
-
-    add_custom_command (TARGET pot COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
-        )
-endmacro()

=== modified file 'import/Ubuntu/Content/ContentTransferHint.qml'
--- import/Ubuntu/Content/ContentTransferHint.qml	2014-04-02 12:18:01 +0000
+++ import/Ubuntu/Content/ContentTransferHint.qml	2014-08-14 11:49:51 +0000
@@ -49,10 +49,24 @@
         id: dialog
         Dialog {
             id: dialogue
+            title: i18n.tr("Transfer in progress")
+
             ActivityIndicator {
-                anchors.centerIn: parent
+                id: indicator
+                anchors.top: parent.top
+                anchors.topMargin: units.gu(6)
                 running: internal.isTransferRunning
             }
+
+            Button {
+                id: cancelTransfer
+                anchors.top: indicator.bottom
+                anchors.topMargin: units.gu(4)
+                text: i18n.tr("Cancel")
+                onClicked: {
+                    root.activeTransfer.state = ContentTransfer.Aborted
+                }
+            }
         }
     }
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-05-01 17:03:40 +0000
+++ po/CMakeLists.txt	2014-08-14 11:49:51 +0000
@@ -1,3 +1,36 @@
-include (Translations)
-add_translations_directory ("${GETTEXT_PACKAGE}")
-add_translations_catalog ("${GETTEXT_PACKAGE}" ../src/com/ubuntu/content/detail)
+project(contenthub-translations)
+
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${GETTEXT_PACKAGE})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+add_custom_target(${POT_FILE}
+                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+                          -D ${CMAKE_SOURCE_DIR}
+                          --from-code=UTF-8
+                          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=tr --keyword=tr:1,2
+                          --package-name=content-hub
+                          --copyright-holder='Canonical Ltd.'
+                          ${I18N_QML_SRC_FILES}
+                  COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+                          -D ${CMAKE_SOURCE_DIR}
+                          --from-code=UTF-8
+                          --c++ --qt --add-comments=TRANSLATORS
+                          --keyword=_
+                          -j
+                          --package-name=content-hub
+                          --copyright-holder='Canonical Ltd.'
+                          ${I18N_CPP_SRC_FILES})
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== modified file 'po/content-hub.pot'
--- po/content-hub.pot	2014-05-27 15:00:34 +0000
+++ po/content-hub.pot	2014-08-14 11:49:51 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Canonical Ltd.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: content-hub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-27 16:00+0100\n"
+"POT-Creation-Date: 2014-08-14 12:39+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"
@@ -17,18 +17,67 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/com/ubuntu/content/detail/service.cpp:212
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:48
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:49
+msgid "Choose from"
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:48
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:49
+msgid "Open with"
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:48
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:49
+msgid "Share to"
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:158
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:175
+msgid "Apps"
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:194
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:211
+msgid ""
+"Sorry, there aren't currently any apps installed that can provide this type "
+"of content."
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:194
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:211
+msgid ""
+"Sorry, there aren't currently any apps installed that can handle this type "
+"of content."
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:210
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:227
+msgid "Devices"
+msgstr ""
+
+#: import/Ubuntu/Content/ContentPeerPicker10.qml:247
+#: import/Ubuntu/Content/ContentPeerPicker11.qml:56
+#: import/Ubuntu/Content/ContentTransferHint.qml:65
+msgid "Cancel"
+msgstr ""
+
+#: import/Ubuntu/Content/ContentTransferHint.qml:52
+msgid "Transfer in progress"
+msgstr ""
+
+#: src/com/ubuntu/content/detail/service.cpp:216
 msgid "Download Complete"
 msgstr ""
 
-#: ../src/com/ubuntu/content/detail/service.cpp:227
+#: src/com/ubuntu/content/detail/service.cpp:234
 msgid "Open"
 msgstr ""
 
-#: ../src/com/ubuntu/content/detail/service.cpp:234
+#: src/com/ubuntu/content/detail/service.cpp:241
 msgid "Dismiss"
 msgstr ""
 
-#: ../src/com/ubuntu/content/detail/service.cpp:252
+#: src/com/ubuntu/content/detail/service.cpp:259
 msgid "Download Failed"
 msgstr ""