[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:47 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=e30a2d6
The following commit has been merged in the master branch:
commit e30a2d6bcfe87a5f6d4ed95c7de530bb893ff9f5
Author: Aleix Pol <aleixpol at kde.org>
Date: Wed Jun 8 18:38:48 2016 +0200
Move some of the options into the ContextDrawer
---
app/qml/DevicePage.qml | 35 +++++++++++++++++++++--------------
app/qml/main.qml | 4 ++++
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/app/qml/DevicePage.qml b/app/qml/DevicePage.qml
index 1b3d8e1..61bc262 100644
--- a/app/qml/DevicePage.qml
+++ b/app/qml/DevicePage.qml
@@ -30,7 +30,10 @@ Kirigami.Page
property QtObject currentDevice
title: currentDevice.name
+ actions.contextualActions: deviceLoader.item.actions
+
Loader {
+ id: deviceLoader
anchors.fill: parent
Layout.fillHeight: true
Layout.fillWidth: true
@@ -39,19 +42,24 @@ Kirigami.Page
Component {
id: trustedDevice
ColumnLayout {
+ property list<QtObject> actions: [
+ Kirigami.Action {
+ onTriggered: deviceView.currentDevice.unpair()
+ text: i18n("UnPair")
+ },
+ Kirigami.Action {
+ text: i18n("Send Ping")
+ onTriggered: {
+ deviceView.currentDevice.pluginCall("ping", "sendPing");
+ }
+ }
+ ]
+
id: trustedView
Layout.fillHeight: true
Layout.fillWidth: true
Kirigami.BasicListItem {
- label: i18n("Un-Pair")
- onClicked: deviceView.currentDevice.unpair()
- }
- Kirigami.BasicListItem {
- label: i18n("Send Ping")
- onClicked: deviceView.currentDevice.pluginCall("ping", "sendPing");
- }
- Kirigami.BasicListItem {
label: i18n("Open Multimedia Remote Control")
onClicked: pageStack.push(
"qrc:/qml/mpris.qml",
@@ -78,13 +86,12 @@ Kirigami.Page
}
Component {
id: untrustedDevice
- ColumnLayout {
- id: untrustedView
- Layout.fillHeight: true
- Layout.fillWidth: true
+ Item {
+ readonly property var actions: []
+ Button {
+ anchors.centerIn: parent
- Kirigami.BasicListItem {
- label: i18n("Pair")
+ text: i18n("Pair")
onClicked: deviceView.currentDevice.requestPair()
}
}
diff --git a/app/qml/main.qml b/app/qml/main.qml
index 8df64e0..010c05b 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -67,5 +67,9 @@ Kirigami.ApplicationWindow
}
}
+ contextDrawer: Kirigami.ContextDrawer {
+ id: contextDrawer
+ }
+
pageStack.initialPage: FindDevicesPage {}
}
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list