Merge branch 'develop' into dev/mimetreeinterface

1 files changed, 28 insertions, 19 deletions

diff --git a/components/package/contents/ui/Outbox.qml b/components/package/contents/ui/Outbox.qml
index 4baa0eae..01501410 100644
--- a/components/package/contents/ui/Outbox.qml
+++ b/components/package/contents/ui/Outbox.qml
@@ -1,19 +1,20 @@
 /*
- * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.3
@@ -38,13 +39,15 @@ ToolButton {
     Rectangle {
         id: dialog
 
+        property int modelCount: 5 //FIXME replace with actual model
+
         anchors {
             top: parent.bottom
             horizontalCenter: parent.horizontalCenter
         }
 
-        height: Kirigami.Units.gridUnit * 15
-        width: Kirigami.Units.gridUnit * 12
+       height: modelCount * Kirigami.Units.gridUnit * 3 + 10//scrollView.height  height: Kirigami.Units.gridUnit * 15
+       width: Kirigami.Units.gridUnit * 12
 
         color: Kirigami.Theme.backgroundColor
         border.width: 1
@@ -55,16 +58,22 @@ ToolButton {
 
         //BEGIN Dialog Content
         ScrollView {
+            id: scrollView
+
             anchors {
                 fill: parent
-                margins: 1
+                margins: 5
             }
+
             ListView {
                 id: listView
 
-                model: 3
+                model: 5
 
                 delegate: Kirigami.AbstractListItem {
+
+                    height: Kirigami.Units.gridUnit * 3
+
                     Kirigami.Label {
                         anchors.centerIn: parent
                         text: "Subjext subxetson"