Share RemoteKeyboard implementation
Summary: Extract RemoteKeyboard.qml into declarativeplugin to be able to use it from both plasmoid and app without code duplication Reviewers: #kde_connect, hkaelberer, apol Reviewed By: #kde_connect, apol Subscribers: kdeconnect, mtijink, apol, #kde_connect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D12670
This commit is contained in:
Nicolas Fella
parent
2f76d2143f
commit
952da637b0
5 changed files with 144 additions and 148 deletions
|
|
@ -8,6 +8,12 @@ set(kdeconnectdeclarativeplugin_SRC
|
|||
responsewaiter.cpp
|
||||
)
|
||||
|
||||
set(qml_SRC
|
||||
qml/RemoteKeyboard.qml
|
||||
qml/PluginChecker.qml
|
||||
qml/DBusProperty.qml
|
||||
)
|
||||
|
||||
set(kdeconnectdeclarativeplugin_MOC
|
||||
objectfactory.h
|
||||
)
|
||||
|
|
@ -20,4 +26,4 @@ target_link_libraries(kdeconnectdeclarativeplugin
|
|||
kdeconnectinterfaces
|
||||
)
|
||||
install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
|
||||
install(FILES qmldir qml/PluginChecker.qml qml/DBusProperty.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
|
||||
install(FILES qmldir ${qml_SRC} DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
|
||||
|
|
|
|||
130
declarativeplugin/qml/RemoteKeyboard.qml
Normal file
130
declarativeplugin/qml/RemoteKeyboard.qml
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
/**
|
||||
* Copyright 2017 Holger Kaelberer <holger.k@elberer.de>
|
||||
*
|
||||
* 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) version 3 or any later version
|
||||
* accepted by the membership of KDE e.V. (or its successor approved
|
||||
* by the membership of KDE e.V.), which shall act as a proxy
|
||||
* defined in Section 14 of version 3 of the license.
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
import QtQuick 2.1
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
import org.kde.kdeconnect 1.0
|
||||
import QtQuick.Controls 2.4
|
||||
|
||||
TextField {
|
||||
|
||||
id: root
|
||||
|
||||
property alias device: checker.device
|
||||
readonly property alias available: checker.available
|
||||
|
||||
readonly property PluginChecker pluginChecker: PluginChecker {
|
||||
id: checker
|
||||
pluginName: "remotekeyboard"
|
||||
}
|
||||
|
||||
property variant remoteKeyboard: null
|
||||
|
||||
readonly property bool remoteState: available ? remoteKeyboard.remoteState : false
|
||||
|
||||
Connections {
|
||||
target: remoteKeyboard
|
||||
onKeyPressReceived: {
|
||||
//console.log("XXX received keypress key=" + key + " special=" + specialKey + " shift=" + shift + " ctrl=" + ctrl + " text=" + text + " cursorPos=" + cursorPosition);
|
||||
// interpret some special keys:
|
||||
if (specialKey == 12 || specialKey == 14) // Return/Esc -> clear
|
||||
text = "";
|
||||
else if (specialKey == 4 // Left
|
||||
&& cursorPosition > 0)
|
||||
--cursorPosition;
|
||||
else if (specialKey == 6 // Right
|
||||
&& cursorPosition < text.length)
|
||||
++cursorPosition;
|
||||
else if (specialKey == 1) { // Backspace -> delete left
|
||||
var pos = cursorPosition;
|
||||
if (pos > 0) {
|
||||
text = text.substring(0, pos-1)
|
||||
+ text.substring(pos, text.length);
|
||||
cursorPosition = pos - 1;
|
||||
}
|
||||
} else if (specialKey == 13) { // Delete -> delete right
|
||||
var pos = cursorPosition;
|
||||
if (pos < text.length) {
|
||||
text = text.substring(0, pos)
|
||||
+ text.substring(pos+1, text.length);
|
||||
cursorPosition = pos; // seems to be set to text.length automatically!
|
||||
}
|
||||
} else if (specialKey == 10) // Home
|
||||
cursorPosition = 0;
|
||||
else if (specialKey == 11) // End
|
||||
cursorPosition = text.length;
|
||||
else {
|
||||
// echo visible keys
|
||||
var sanitized = "";
|
||||
for (var i = 0; i < key.length; i++) {
|
||||
if (key.charCodeAt(i) > 31)
|
||||
sanitized += key.charAt(i);
|
||||
}
|
||||
if (sanitized.length > 0 && !ctrl && !alt) {
|
||||
// insert sanitized at current pos:
|
||||
var pos = cursorPosition;
|
||||
text = text.substring(0, pos)
|
||||
+ sanitized
|
||||
+ text.substring(pos, text.length);
|
||||
cursorPosition = pos + 1; // seems to be set to text.length automatically!
|
||||
}
|
||||
}
|
||||
// console.log("XXX After received keypress key=" + key + " special=" + specialKey + " shift=" + shift + " ctrl=" + ctrl + " text=" + text + " cursorPos=" + cursorPosition);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function sendEvent(event) {
|
||||
if (remoteKeyboard) {
|
||||
var transEvent = JSON.parse(JSON.stringify(event)); // transform to anonymous object
|
||||
if (transEvent.modifiers & Qt.ControlModifier) {
|
||||
// special handling for ctrl+c/v/x/a, for which only 'key' gets
|
||||
// set, but no visible 'text', which is expected by the remoteKeyboard
|
||||
// wire-format:
|
||||
if (transEvent.key === Qt.Key_C)
|
||||
transEvent.text = 'c';
|
||||
if (transEvent.key === Qt.Key_V)
|
||||
transEvent.text = 'v';
|
||||
if (transEvent.key === Qt.Key_A)
|
||||
transEvent.text = 'a';
|
||||
if (transEvent.key === Qt.Key_X)
|
||||
transEvent.text = 'x';
|
||||
}
|
||||
remoteKeyboard.sendQKeyEvent(transEvent);
|
||||
}
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
if (available)
|
||||
sendEvent(event);
|
||||
event.accepted = true;
|
||||
}
|
||||
|
||||
onAvailableChanged: {
|
||||
if (available) {
|
||||
remoteKeyboard = RemoteKeyboardDbusInterfaceFactory.create(device.id());
|
||||
//remoteKeyboard.keyPressReceived.connect(keyPressReceived);
|
||||
remoteKeyboard.remoteStateChanged.connect(remoteStateChanged);
|
||||
} else {
|
||||
remoteKeyboard = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,3 +3,4 @@ plugin kdeconnectdeclarativeplugin
|
|||
|
||||
PluginChecker 1.0 PluginChecker.qml
|
||||
DBusProperty 1.0 DBusProperty.qml
|
||||
RemoteKeyboard 1.0 RemoteKeyboard.qml
|
||||
|
|
|
|||
|
|
@ -26,65 +26,13 @@ import org.kde.kdeconnect 1.0
|
|||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
import QtQuick.Dialogs 1.0
|
||||
import QtQuick.Controls 2.4
|
||||
|
||||
PlasmaComponents.ListItem
|
||||
{
|
||||
id: root
|
||||
readonly property QtObject device: DeviceDbusInterfaceFactory.create(model.deviceId)
|
||||
|
||||
RemoteKeyboard {
|
||||
id: remoteKeyboard
|
||||
device: root.device
|
||||
|
||||
onKeyPressReceived: {
|
||||
// console.log("XXX received keypress key=" + key + " special=" + specialKey + " shift=" + shift + " ctrl=" + ctrl + " text=" + remoteKeyboardInput.text + " cursorPos=" + remoteKeyboardInput.cursorPosition);
|
||||
// interpret some special keys:
|
||||
if (specialKey == 12 || specialKey == 14) // Return/Esc -> clear
|
||||
remoteKeyboardInput.text = "";
|
||||
else if (specialKey == 4 // Left
|
||||
&& remoteKeyboardInput.cursorPosition > 0)
|
||||
--remoteKeyboardInput.cursorPosition;
|
||||
else if (specialKey == 6 // Right
|
||||
&& remoteKeyboardInput.cursorPosition < remoteKeyboardInput.text.length)
|
||||
++remoteKeyboardInput.cursorPosition;
|
||||
else if (specialKey == 1) { // Backspace -> delete left
|
||||
var pos = remoteKeyboardInput.cursorPosition;
|
||||
if (pos > 0) {
|
||||
remoteKeyboardInput.text = remoteKeyboardInput.text.substring(0, pos-1)
|
||||
+ remoteKeyboardInput.text.substring(pos, remoteKeyboardInput.text.length);
|
||||
remoteKeyboardInput.cursorPosition = pos - 1;
|
||||
}
|
||||
} else if (specialKey == 13) { // Delete -> delete right
|
||||
var pos = remoteKeyboardInput.cursorPosition;
|
||||
if (pos < remoteKeyboardInput.text.length) {
|
||||
remoteKeyboardInput.text = remoteKeyboardInput.text.substring(0, pos)
|
||||
+ remoteKeyboardInput.text.substring(pos+1, remoteKeyboardInput.text.length);
|
||||
remoteKeyboardInput.cursorPosition = pos; // seems to be set to text.length automatically!
|
||||
}
|
||||
} else if (specialKey == 10) // Home
|
||||
remoteKeyboardInput.cursorPosition = 0;
|
||||
else if (specialKey == 11) // End
|
||||
remoteKeyboardInput.cursorPosition = remoteKeyboardInput.text.length;
|
||||
else {
|
||||
// echo visible keys
|
||||
var sanitized = "";
|
||||
for (var i = 0; i < key.length; i++) {
|
||||
if (key.charCodeAt(i) > 31)
|
||||
sanitized += key.charAt(i);
|
||||
}
|
||||
if (sanitized.length > 0 && !ctrl && !alt) {
|
||||
// insert sanitized at current pos:
|
||||
var pos = remoteKeyboardInput.cursorPosition;
|
||||
remoteKeyboardInput.text = remoteKeyboardInput.text.substring(0, pos)
|
||||
+ sanitized
|
||||
+ remoteKeyboardInput.text.substring(pos, remoteKeyboardInput.text.length);
|
||||
remoteKeyboardInput.cursorPosition = pos + 1; // seems to be set to text.length automatically!
|
||||
}
|
||||
}
|
||||
// console.log("XXX After received keypress key=" + key + " special=" + specialKey + " shift=" + shift + " ctrl=" + ctrl + " text=" + remoteKeyboardInput.text + " cursorPos=" + remoteKeyboardInput.cursorPosition);
|
||||
}
|
||||
}
|
||||
|
||||
Column {
|
||||
width: parent.width
|
||||
|
||||
|
|
@ -172,7 +120,7 @@ PlasmaComponents.ListItem
|
|||
visible: remoteKeyboard.remoteState
|
||||
width: parent.width
|
||||
|
||||
Row {
|
||||
RowLayout {
|
||||
width: parent.width
|
||||
spacing: 5
|
||||
|
||||
|
|
@ -181,26 +129,10 @@ PlasmaComponents.ListItem
|
|||
text: i18n("Remote Keyboard")
|
||||
}
|
||||
|
||||
PlasmaComponents.TextField {
|
||||
id: remoteKeyboardInput
|
||||
|
||||
height: parent.height
|
||||
width: parent.width - 5 - remoteKeyboardLabel.width
|
||||
verticalAlignment: TextInput.AlignVCenter
|
||||
style: TextFieldStyle {
|
||||
background: Rectangle {
|
||||
radius: 2
|
||||
border.color: "gray"
|
||||
border.width: 1
|
||||
color: "white"
|
||||
}
|
||||
}
|
||||
|
||||
Keys.onPressed: {
|
||||
if (remoteKeyboard.available)
|
||||
remoteKeyboard.sendEvent(event);
|
||||
event.accepted = true;
|
||||
}
|
||||
RemoteKeyboard {
|
||||
id: remoteKeyboard
|
||||
device: root.device
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
/**
|
||||
* Copyright 2017 Holger Kaelberer <holger.k@elberer.de>
|
||||
*
|
||||
* 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) version 3 or any later version
|
||||
* accepted by the membership of KDE e.V. (or its successor approved
|
||||
* by the membership of KDE e.V.), which shall act as a proxy
|
||||
* defined in Section 14 of version 3 of the license.
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
import QtQuick 2.1
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
import org.kde.kdeconnect 1.0
|
||||
|
||||
QtObject {
|
||||
|
||||
id: root
|
||||
|
||||
property alias device: checker.device
|
||||
readonly property alias available: checker.available
|
||||
|
||||
readonly property PluginChecker pluginChecker: PluginChecker {
|
||||
id: checker
|
||||
pluginName: "remotekeyboard"
|
||||
}
|
||||
|
||||
property variant remoteKeyboard: null
|
||||
|
||||
readonly property bool remoteState: available ? remoteKeyboard.remoteState : false
|
||||
|
||||
signal keyPressReceived(string key, int specialKey, bool shift, bool ctrl, bool alt)
|
||||
|
||||
function sendEvent(event) {
|
||||
if (remoteKeyboard) {
|
||||
var transEvent = JSON.parse(JSON.stringify(event)); // transform to anonymous object
|
||||
if (transEvent.modifiers & Qt.ControlModifier) {
|
||||
// special handling for ctrl+c/v/x/a, for which only 'key' gets
|
||||
// set, but no visible 'text', which is expected by the remoteKeyboard
|
||||
// wire-format:
|
||||
if (transEvent.key === Qt.Key_C)
|
||||
transEvent.text = 'c';
|
||||
if (transEvent.key === Qt.Key_V)
|
||||
transEvent.text = 'v';
|
||||
if (transEvent.key === Qt.Key_A)
|
||||
transEvent.text = 'a';
|
||||
if (transEvent.key === Qt.Key_X)
|
||||
transEvent.text = 'x';
|
||||
}
|
||||
remoteKeyboard.sendQKeyEvent(transEvent);
|
||||
}
|
||||
}
|
||||
|
||||
onAvailableChanged: {
|
||||
if (available) {
|
||||
remoteKeyboard = RemoteKeyboardDbusInterfaceFactory.create(device.id());
|
||||
remoteKeyboard.keyPressReceived.connect(keyPressReceived);
|
||||
remoteKeyboard.remoteStateChanged.connect(remoteStateChanged);
|
||||
} else {
|
||||
remoteKeyboard = null
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue