From e4faf0b5fc3da7b47825f79cc9dc1ec5e0283905 Mon Sep 17 00:00:00 2001 From: rekols Date: Tue, 13 Mar 2018 10:45:15 +0800 Subject: [PATCH] feat: add keybord_layout.json Change-Id: Ib86d98537771de2d68b4e0af8a771284dcc7b64e --- plugins/keyboard-layout/CMakeLists.txt | 1 + .../{keyboard-layout.json => keyboard.json} | 0 plugins/keyboard-layout/keyboardplugin.h | 2 +- plugins/keyboard-layout/keybord_layout.json | 10 ++++++++++ 4 files changed, 12 insertions(+), 1 deletion(-) rename plugins/keyboard-layout/{keyboard-layout.json => keyboard.json} (100%) create mode 100644 plugins/keyboard-layout/keybord_layout.json diff --git a/plugins/keyboard-layout/CMakeLists.txt b/plugins/keyboard-layout/CMakeLists.txt index da4b6b7d6..1ac8fea35 100644 --- a/plugins/keyboard-layout/CMakeLists.txt +++ b/plugins/keyboard-layout/CMakeLists.txt @@ -33,3 +33,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE ) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins) +install(FILES ./keybord_layout.json DESTINATION /etc/dde-dock/indicator) diff --git a/plugins/keyboard-layout/keyboard-layout.json b/plugins/keyboard-layout/keyboard.json similarity index 100% rename from plugins/keyboard-layout/keyboard-layout.json rename to plugins/keyboard-layout/keyboard.json diff --git a/plugins/keyboard-layout/keyboardplugin.h b/plugins/keyboard-layout/keyboardplugin.h index a7c684917..cd3a82fc1 100644 --- a/plugins/keyboard-layout/keyboardplugin.h +++ b/plugins/keyboard-layout/keyboardplugin.h @@ -27,7 +27,7 @@ class KeyboardPlugin : public QObject , PluginsItemInterface { Q_OBJECT Q_INTERFACES(PluginsItemInterface) - Q_PLUGIN_METADATA(IID "com.deepin.dock.PluginsItemInterface" FILE "keyboard-layout.json") + Q_PLUGIN_METADATA(IID "com.deepin.dock.PluginsItemInterface" FILE "keyboard.json") public: KeyboardPlugin(QObject *parent = nullptr); diff --git a/plugins/keyboard-layout/keybord_layout.json b/plugins/keyboard-layout/keybord_layout.json new file mode 100644 index 000000000..1624507fa --- /dev/null +++ b/plugins/keyboard-layout/keybord_layout.json @@ -0,0 +1,10 @@ +{ + "data": { + "text": { + "dbus_service": "com.deepin.dde.Keyboard", + "dbus_path": "/com/deepin/dde/Keyboard", + "dbus_interface": "com.deepin.dde.Keyboard", + "dbus_properties": "layout" + } + } +}