[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=cc3f16e

The following commit has been merged in the master branch:
commit cc3f16ef3446e3b745870a40bf2f1d73ef0b07f5
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Jun 5 19:26:51 2016 +0200

    Remove unneeded level of depth
---
 app/qml/main.qml | 102 +++++++++++++++++++++++++++----------------------------
 1 file changed, 50 insertions(+), 52 deletions(-)

diff --git a/app/qml/main.qml b/app/qml/main.qml
index e853411..c9050a6 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -78,7 +78,7 @@ ApplicationWindow
                     }
                 }
                 delegate: DeviceDelegate {
-                    width: parent.width
+                    width: ListView.view.width
                     onClicked: {
                         var data = {
                             item: deviceViewComponent,
@@ -93,65 +93,63 @@ ApplicationWindow
 
     Component {
         id: deviceViewComponent
-        ColumnLayout {
+        Loader {
             id: deviceView
             property QtObject currentDevice
-            Loader {
-                Layout.fillHeight: true
-                Layout.fillWidth: true
+            Layout.fillHeight: true
+            Layout.fillWidth: true
 
-                sourceComponent: currentDevice.isPaired ? trustedDevice : untrustedDevice
-                Component {
-                    id: trustedDevice
-                    ColumnLayout {
-                        id: trustedView
-                        Layout.fillHeight: true
-                        Layout.fillWidth: true
+            sourceComponent: currentDevice.isTrusted ? trustedDevice : untrustedDevice
+            Component {
+                id: trustedDevice
+                ColumnLayout {
+                    id: trustedView
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
 
-                        Button {
-                            text: i18n("Un-Pair")
-                            onClicked: deviceView.currentDevice.unpair()
-                        }
-                        Button {
-                            text: i18n("Send Ping")
-                            onClicked: deviceView.currentDevice.pluginCall("ping", "sendPing");
-                        }
-                        Button {
-                            text: i18n("Open Multimedia Remote Control")
-                            onClicked: stack.push( {
-                                item: "qrc:/qml/mpris.qml",
-                                properties: { mprisInterface: MprisDbusInterfaceFactory.create(deviceView.currentDevice.id()) }
-                            } );
-                        }
-                        Button {
-                            text: i18n("Mouse Pad")
-                            onClicked: stack.push( {
-                                item: "qrc:/qml/mousepad.qml",
-                                properties: { remoteControlInterface: RemoteControlDbusInterfaceFactory.create(deviceView.currentDevice.id()) }
-                            } );
-                        }
-                        Button {
-                            property var lockIface: LockDeviceDbusInterfaceFactory.create(deviceView.currentDevice.id())
-                            text: lockIface.isLocked ? i18n("Unlock") : i18n("Lock")
-                            onClicked: {
-                                lockIface.isLocked = !lockIface.isLocked;
-                            }
+                    Button {
+                        text: i18n("Un-Pair")
+                        onClicked: deviceView.currentDevice.unpair()
+                    }
+                    Button {
+                        text: i18n("Send Ping")
+                        onClicked: deviceView.currentDevice.pluginCall("ping", "sendPing");
+                    }
+                    Button {
+                        text: i18n("Open Multimedia Remote Control")
+                        onClicked: stack.push( {
+                            item: "qrc:/qml/mpris.qml",
+                            properties: { mprisInterface: MprisDbusInterfaceFactory.create(deviceView.currentDevice.id()) }
+                        } );
+                    }
+                    Button {
+                        text: i18n("Mouse Pad")
+                        onClicked: stack.push( {
+                            item: "qrc:/qml/mousepad.qml",
+                            properties: { remoteControlInterface: RemoteControlDbusInterfaceFactory.create(deviceView.currentDevice.id()) }
+                        } );
+                    }
+                    Button {
+                        property var lockIface: LockDeviceDbusInterfaceFactory.create(deviceView.currentDevice.id())
+                        text: lockIface.isLocked ? i18n("Unlock") : i18n("Lock")
+                        onClicked: {
+                            lockIface.isLocked = !lockIface.isLocked;
                         }
-
-                        Item { Layout.fillHeight: true }
                     }
+
+                    Item { Layout.fillHeight: true }
                 }
-                Component {
-                    id: untrustedDevice
-                    ColumnLayout {
-                        id: untrustedView
-                        Layout.fillHeight: true
-                        Layout.fillWidth: true
+            }
+            Component {
+                id: untrustedDevice
+                ColumnLayout {
+                    id: untrustedView
+                    Layout.fillHeight: true
+                    Layout.fillWidth: true
 
-                        Button {
-                            text: i18n("Pair")
-                            onClicked: deviceView.currentDevice.requestPair()
-                        }
+                    Button {
+                        text: i18n("Pair")
+                        onClicked: deviceView.currentDevice.requestPair()
                     }
                 }
             }

-- 
kdeconnect packaging