1
=== modified file 'qml/common/ContainerEditView.qml'
2
--- qml/common/ContainerEditView.qml	2017-02-28 20:54:07 +0000
3
+++ qml/common/ContainerEditView.qml	2017-03-31 20:18:19 +0000
4
@@ -138,8 +138,7 @@
5
138
                width: parent.width
138
                width: parent.width
6
139
                onClicked: {
139
                onClicked: {
7
140
                    PopupUtils.close(addAppsDialog)
140
                    PopupUtils.close(addAppsDialog)
10
141
                    var packages = containerConfigList.getDebianPackageFiles()
141
                    openDebianPackagePicker()
9
142
                    pageStack.addPageToNextColumn(homeView, Qt.resolvedUrl("DebianPackagePicker.qml"), {packageList: packages})
11
143
                }
142
                }
12
144
            }
143
            }
13
145
            Button {
144
            Button {
14
@@ -153,6 +152,11 @@
15
153
        }
152
        }
16
154
    }
153
    }
17
155
154
18
155
    function openDebianPackagePicker() {
19
156
        var fileDialog = Qt.createComponent("DebianPackagePicker.qml").createObject(homeView)
20
157
        fileDialog.open()
21
158
    }
22
159
23
156
    property var searchResultsView: null
160
    property var searchResultsView: null
24
157
    function openSearchDialog(container) {
161
    function openSearchDialog(container) {
25
158
        var dialog = PopupUtils.open(Qt.resolvedUrl("SearchPackagesDialog.qml"), null, {currentContainer: container})
162
        var dialog = PopupUtils.open(Qt.resolvedUrl("SearchPackagesDialog.qml"), null, {currentContainer: container})
26
159
163
27
=== modified file 'qml/common/DebianPackagePicker.qml'
28
--- qml/common/DebianPackagePicker.qml	2017-03-02 19:42:45 +0000
29
+++ qml/common/DebianPackagePicker.qml	2017-03-31 20:18:19 +0000
30
@@ -3,7 +3,7 @@
31
3
 * @brief Libertine container Debian package picker view
3
 * @brief Libertine container Debian package picker view
32
4
 */
4
 */
33
5
/*
5
/*
35
6
 * Copyright 2016 Canonical Ltd
6
 * Copyright 2016-2017 Canonical Ltd
36
7
 *
7
 *
37
8
 * Libertine is free software: you can redistribute it and/or modify it under
8
 * Libertine is free software: you can redistribute it and/or modify it under
38
9
 * the terms of the GNU General Public License, version 3, as published by the
9
 * the terms of the GNU General Public License, version 3, as published by the
39
@@ -18,80 +18,20 @@
40
18
 */
18
 */
41
19
19
42
20
import QtQuick 2.4
20
import QtQuick 2.4
119
21
import Ubuntu.Components 1.3
21
import QtQuick.Dialogs 1.0
120
22
22
121
23
23
FileDialog {
122
24
Page {
24
    id: debianPicker
123
25
    id: debianPackagePicker
25
    title: "Choose debian package to install"
124
26
    header: PageHeader {
26
    nameFilters: ["debian packages (*.deb)"]
125
27
        id: pageHeader
27
    selectMultiple: true
126
28
        title: i18n.tr("Available Debian Packages to Install")
28
    onAccepted: {
127
29
    }
29
        if (debianPicker.fileUrls.length > 0) {
128
30
30
            var packages = ""
129
31
    property var packageList: null
31
            for (var i = 0; i < fileUrls.length; ++i) {
130
32
32
                packages += fileUrls[i].toString().replace("file:///", "/") + " "
131
33
    ListModel {
33
            }
132
34
        id: packageListModel
34
            homeView.installPackage(packages)
133
35
    }
35
        }
134
36
36
    }
59
37
    UbuntuListView {
60
38
        id: listView
61
39
        anchors {
62
40
            topMargin: pageHeader.height
63
41
            fill: parent
64
42
        }
65
43
        model: packageListModel
66
44
        visible: packageList.length > 0  ? true : false
67
45
68
46
        function install(fileName) {
69
47
            pageStack.removePages(debianPackagePicker)
70
48
            pageStack.currentPage.installPackage(containerConfigList.getDownloadsLocation() + "/" + fileName)
71
49
        }
72
50
73
51
        delegate: ListItem {
74
52
            id: packageItem
75
53
            Label {
76
54
                text: model.file_name
77
55
                anchors {
78
56
                    verticalCenter: parent.verticalCenter
79
57
                    left: parent.left
80
58
                    leftMargin: units.gu(2)
81
59
                }
82
60
            }
83
61
84
62
            onClicked: {
85
63
                listView.install(model.file_name)
86
64
            }
87
65
88
66
            trailingActions: ListItemActions {
89
67
                actions: [
90
68
                    Action {
91
69
                        iconName: "select"
92
70
                        description: i18n.tr("Install Package")
93
71
                        onTriggered: {
94
72
                            listView.install(model.file_name)
95
73
                        }
96
74
                    }
97
75
                ]
98
76
            }
99
77
        }
100
78
    }
101
79
102
80
    Label {
103
81
        id: emptyLabel
104
82
        anchors.centerIn: parent
105
83
        visible: packageList.length == 0  ? true : false
106
84
        wrapMode: Text.Wrap
107
85
        width: parent.width
108
86
        horizontalAlignment: Text.AlignHCenter
109
87
        text: i18n.tr("No Debian packages available")
110
88
    }
111
89
112
90
    Component.onCompleted: {
113
91
        for (var i = 0; i < packageList.length; ++i)
114
92
        {
115
93
            packageListModel.append({"file_name":  packageList[i]})
116
94
        }
117
95
    }
118
96
135
97
}
37
}
Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2017-03-23	Needs Fixing on 2017-04-05
Libertine CI Bot	continuous-integration		Approve on 2017-03-31
Review via email: mp+320829@code.launchpad.net