Merge lp:~larryprice/libertine/deb-filepicker into lp:libertine

[Larry Price]

Use the QML FileDialog to pick debian packages for installation.

Use the QML FileDialog to pick debian packages for installation.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:410
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/490/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/887
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/731
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/731
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/731
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/731
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/897
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/888
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/888
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/888
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/888/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/888
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/888/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/490/rebuild

review: Approve (continuous-integration)

[lp:~larryprice/libertine/deb-filepicker]

411. By Larry Price on 2017-03-31

merge

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:411
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/501/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/905
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/743
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/743
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/743
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/743
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/916
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/905
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/905/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/905
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/905/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/905
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/905/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/905
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/905/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/501/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

When I click "Choose Debian package to install", the filepicker does not show and this is what is in the systemd log:

Apr 05 14:50:46 Yoga2 libertine-manager-app[25271]: QQmlComponent: Component is not ready
Apr 05 14:50:46 Yoga2 libertine-manager-app[25271]: file:///usr/share/libertine/qml/common/ContainerEditView.qml:157: TypeError: Cannot call method 'open' of null

review: Needs Fixing

[Larry Price (larryprice)]

I see the same results. AddBindMountDialog has the same problem in Unity8. For some reason, the createObject() fails and doesn't give any specifics. Unfortunately, I'm not even able to get libertine-manager-app to run in Unity 7 right now (from the archive). Big Trouble in Little China. It's trying to use mir automatically, which is wrong. Might be recent U-A-L changes?

Unmerged revisions

411. By Larry Price on 2017-03-31

merge

410. By Larry Price on 2017-03-23

Seems to be mostly working

=== modified file 'qml/common/ContainerEditView.qml'
--- qml/common/ContainerEditView.qml	2017-02-28 20:54:07 +0000
+++ qml/common/ContainerEditView.qml	2017-03-31 20:18:19 +0000
@@ -138,8 +138,7 @@
                 width: parent.width
                 onClicked: {
                     PopupUtils.close(addAppsDialog)
-                    var packages = containerConfigList.getDebianPackageFiles()
-                    pageStack.addPageToNextColumn(homeView, Qt.resolvedUrl("DebianPackagePicker.qml"), {packageList: packages})
+                    openDebianPackagePicker()
                 }
             }
             Button {
@@ -153,6 +152,11 @@
         }
     }
 
+    function openDebianPackagePicker() {
+        var fileDialog = Qt.createComponent("DebianPackagePicker.qml").createObject(homeView)
+        fileDialog.open()
+    }
+
     property var searchResultsView: null
     function openSearchDialog(container) {
         var dialog = PopupUtils.open(Qt.resolvedUrl("SearchPackagesDialog.qml"), null, {currentContainer: container})

=== modified file 'qml/common/DebianPackagePicker.qml'
--- qml/common/DebianPackagePicker.qml	2017-03-02 19:42:45 +0000
+++ qml/common/DebianPackagePicker.qml	2017-03-31 20:18:19 +0000
@@ -3,7 +3,7 @@
  * @brief Libertine container Debian package picker view
  */
 /*
- * Copyright 2016 Canonical Ltd
+ * Copyright 2016-2017 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -18,80 +18,20 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-
-Page {
-    id: debianPackagePicker
-    header: PageHeader {
-        id: pageHeader
-        title: i18n.tr("Available Debian Packages to Install")
-    }
-
-    property var packageList: null
-
-    ListModel {
-        id: packageListModel
-    }
-
-    UbuntuListView {
-        id: listView
-        anchors {
-            topMargin: pageHeader.height
-            fill: parent
-        }
-        model: packageListModel
-        visible: packageList.length > 0  ? true : false
-
-        function install(fileName) {
-            pageStack.removePages(debianPackagePicker)
-            pageStack.currentPage.installPackage(containerConfigList.getDownloadsLocation() + "/" + fileName)
-        }
-
-        delegate: ListItem {
-            id: packageItem
-            Label {
-                text: model.file_name
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: parent.left
-                    leftMargin: units.gu(2)
-                }
-            }
-
-            onClicked: {
-                listView.install(model.file_name)
-            }
-
-            trailingActions: ListItemActions {
-                actions: [
-                    Action {
-                        iconName: "select"
-                        description: i18n.tr("Install Package")
-                        onTriggered: {
-                            listView.install(model.file_name)
-                        }
-                    }
-                ]
-            }
-        }
-    }
-
-    Label {
-        id: emptyLabel
-        anchors.centerIn: parent
-        visible: packageList.length == 0  ? true : false
-        wrapMode: Text.Wrap
-        width: parent.width
-        horizontalAlignment: Text.AlignHCenter
-        text: i18n.tr("No Debian packages available")
-    }
-
-    Component.onCompleted: {
-        for (var i = 0; i < packageList.length; ++i)
-        {
-            packageListModel.append({"file_name":  packageList[i]})
-        }
-    }
-
+import QtQuick.Dialogs 1.0
+
+FileDialog {
+    id: debianPicker
+    title: "Choose debian package to install"
+    nameFilters: ["debian packages (*.deb)"]
+    selectMultiple: true
+    onAccepted: {
+        if (debianPicker.fileUrls.length > 0) {
+            var packages = ""
+            for (var i = 0; i < fileUrls.length; ++i) {
+                packages += fileUrls[i].toString().replace("file:///", "/") + " "
+            }
+            homeView.installPackage(packages)
+        }
+    }
 }