Import Upstream version 1.0.11.1

README.md

@@ -0,0 +1,33 @@
+# ukui-touch-settings-plugin
+    ukui-touch-settings-plugin 是 ukui-control 的一个触摸相关设备的插件集合
+    其中包括了三个插件：
+        touchscreen-settings
+        touchpen-settings
+        touchpad-settings
+
+## build depend
+    qtbase5-dev
+    libgsettings-qt-dev,
+    libukcc-dev,
+    libxi-dev,
+    libqt5x11extras5-dev,
+    qttools5-dev-tools
+
+## make
+    mkdir build
+    cd build
+    qmake ..
+    make
+    sudo make install
+
+## CommonInterface
+
+由 libukcc 提供的基类，继承这个基类并实现其规定的接口，再将编译出的 *.so 文件安装到对应位置即可显示在控制面板中
+
+## touchscreen-settings
+
+touchscreen-settings 是负责展示触摸屏手势的控制面板插件，可以展示不同的手势对应的快捷操作
+
+## touchpen-settings
+
+touchpen-settings 是负责展示手写笔信息的控制面板插件，未来增加了手写笔配置也会加在这个插件上

stylus-settings/img/pen-symbolic.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 14.6356C1 14.8397 1.16033 15 1.36439 15L3.05919 14.925C3.55823 14.9029 4.03095 14.6949 4.38434 14.3418L11.0856 7.64672C11.4764 7.25625 11.4766 6.62283 11.0859 6.23218L9.76749 4.91377C9.37697 4.52325 8.7438 4.52325 8.35328 4.91377L1.6589 11.6081C1.30539 11.9617 1.0971 12.4348 1.07506 12.9342L1 14.6356ZM14.2929 4.44006C14.6834 4.04953 14.6834 3.41637 14.2929 3.02584L12.9742 1.70711C12.5836 1.31658 11.9505 1.31658 11.5599 1.70711L10.5473 2.71975C10.1568 3.11028 10.1568 3.74344 10.5473 4.13397L11.866 5.45271C12.2566 5.84323 12.8897 5.84323 13.2802 5.45271L14.2929 4.44006Z" fill="#262626" fill-opacity="0.75"/>
+</svg>

stylus-settings/resource.qrc

@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/img">
+        <file>img/open_inuse.png</file>
+        <file>img/setting-illus-pen_small.png</file>
+        <file>img/setting-illus-pen.png</file>
+        <file>img/pen-symbolic.svg</file>
+    </qresource>
+    <qresource prefix="/tr">
+        <file>translations/zh_CN.ts</file>
+        <file>translations/zh_CN.qm</file>
+    </qresource>
+</RCC>

stylus-settings/stylus-settings.cpp

@@ -0,0 +1,57 @@
+#include "stylus-settings.h"
+#include "stylussettingpage.h"
+
+#include <QTranslator>
+#include <QApplication>
+
+namespace StylusSettings {
+
+StylusSettings::StylusSettings()
+{
+    QTranslator* translator = new QTranslator(this);
+    translator->load(":/tr/translations/"+ QLocale::system().name() +".qm");
+    QApplication::installTranslator(translator);
+}
+
+StylusSettings::~StylusSettings()
+{
+
+}
+
+QString StylusSettings::plugini18nName()
+{
+    return QString(tr("Stylus"));
+}
+int StylusSettings::pluginTypes()
+{
+    return FunType::DEVICES;
+}
+QWidget* StylusSettings::pluginUi()
+{
+    if (m_pluginwidget == nullptr)
+        m_pluginwidget = new StylusSettingPage();
+    return m_pluginwidget;
+}
+bool StylusSettings::isEnable() const
+{
+    return true;
+}
+const QString StylusSettings::name() const
+{
+    return QString(tr("Stylus"));
+}
+bool StylusSettings::isShowOnHomePage() const
+{
+    return true;
+}
+QIcon StylusSettings::icon() const
+{
+    QPixmap pixmap(":/img/img/pen-symbolic.svg");
+    return QIcon::fromTheme("pen-symbolic.svg", QIcon(pixmap));
+}
+QString StylusSettings::translationPath() const
+{
+    return "/usr/share/stylus-settings/translations/%1.ts";
+}
+
+} // namespace

stylus-settings/stylus-settings.h

@@ -0,0 +1,37 @@
+#ifndef STYLUSSETTINGS_H
+#define STYLUSSETTINGS_H
+
+#include <ukcc/interface/interface.h>
+
+#include <QObject>
+#include <QString>
+#include <QWidget>
+#include <QIcon>
+
+namespace StylusSettings {
+class StylusSettings : public QObject, CommonInterface
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.ukcc.CommonInterface")
+    Q_INTERFACES(CommonInterface)
+public:
+
+    StylusSettings();
+    ~StylusSettings();
+
+    QString plugini18nName()        Q_DECL_OVERRIDE;
+    int pluginTypes()               Q_DECL_OVERRIDE;
+    QWidget* pluginUi()             Q_DECL_OVERRIDE;
+    bool isEnable() const           Q_DECL_OVERRIDE;
+    const QString name() const      Q_DECL_OVERRIDE;
+    bool isShowOnHomePage() const   Q_DECL_OVERRIDE;
+    QIcon icon() const              Q_DECL_OVERRIDE;
+    QString translationPath() const Q_DECL_OVERRIDE;
+
+
+private:
+    QWidget* m_pluginwidget = nullptr;
+};
+
+} // namespace
+#endif // STYLUSSETTINGS_H

stylus-settings/stylus-settings.pro

@@ -0,0 +1,57 @@
+QT += core gui widgets dbus# multimedia multimediawidgets
+
+TEMPLATE = lib
+DEFINES += STYLUSSETTINGS_LIBRARY
+CONFIG += plugin
+
+CONFIG += c++11 \
+          link_pkgconfig
+
+PKGCONFIG += gsettings-qt
+
+TARGET = $$qtLibraryTarget(stylussetting)
+target.path = $$[QT_INSTALL_LIBS]/ukui-control-center
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+#QMAKE_LN_SHLIB = :
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+LIBS += \
+    -lukcc
+
+isEmpty(PREFIX) {
+    PREFIX = /usr
+}
+
+INSTALLS += target \
+            tr
+
+HEADERS += \
+    stylus-settings.h \
+    stylussettingpage.h
+
+SOURCES += \
+    stylus-settings.cpp \
+    stylussettingpage.cpp
+
+FORMS += \
+    stylussettingpage.ui
+
+RESOURCES += \
+    resource.qrc
+
+TRANSLATIONS += translations/zh_CN.ts
+tr.path = /usr/share/stylus-settings/
+tr.files += TRANSLATIONS
+
+DISTFILES += \
+    translations/zh_CN.ts

stylus-settings/stylussettingpage.cpp

@@ -0,0 +1,43 @@
+#include "stylussettingpage.h"
+#include "ui_stylussettingpage.h"
+
+#include <QTranslator>
+#include <QPushButton>
+#include <QLabel>
+
+namespace StylusSettings {
+
+StylusSettingPage::StylusSettingPage(QWidget* parent) : QWidget(parent),
+                                                  ui(new Ui::StylusSettingPage)
+{
+    // load translator
+    QTranslator* translator = new QTranslator(this);
+    translator->load(":/tr/translations/" + QLocale::system().name() + ".qm");
+    QApplication::installTranslator(translator);
+
+    this->setAttribute(Qt::WA_StyledBackground, true);
+    this->setAttribute(Qt::WA_DeleteOnClose);
+
+    ui->setupUi(this);
+    initUi();
+}
+
+StylusSettingPage::~StylusSettingPage()
+{
+    delete ui;
+}
+
+void StylusSettingPage::initUi()
+{
+    // init widget in ui file
+    ui->titleLabel->setStyleSheet("QLabel{font-size: 14px; color: palette(windowText);}");
+    ui->penImgLabel->setPixmap(QPixmap(":/img/img/setting-illus-pen_small.png"));
+    ui->noteLabel->setEnabled(false);
+
+    // init other widget
+    m_sl_erase_btn = new QLabel(this);
+    m_sl_erase_btn->setPixmap(QPixmap(":/img/img/open_inuse.png"));
+    ui->slEraseLayout->addWidget(m_sl_erase_btn);
+}
+
+} // namespace

stylus-settings/stylussettingpage.h

@@ -0,0 +1,29 @@
+#ifndef STYLUSSETTINGPAGE_H
+#define STYLUSSETTINGPAGE_H
+
+#include <QWidget>
+
+namespace Ui {
+class StylusSettingPage;
+}
+
+class QLabel;
+
+namespace StylusSettings {
+class StylusSettingPage : public QWidget
+{
+public:
+    StylusSettingPage(QWidget* parent = nullptr);
+    ~StylusSettingPage();
+
+private:
+    Ui::StylusSettingPage* ui;
+
+    // Button Two Simulate Erase
+    QLabel* m_sl_erase_btn;
+private:
+    void initUi();
+};
+
+} // namespace
+#endif // STYLUSSETTINGPAGE_H

stylus-settings/stylussettingpage.ui

@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StylusSettingPage</class>
+ <widget class="QWidget" name="StylusSettingPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>784</width>
+    <height>435</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Stylus</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="spacing">
+    <number>2</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>48</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="leftMargin">
+      <number>16</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="titleLabel">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="sizeIncrement">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Stylus Settings</string>
+       </property>
+       <property name="indent">
+        <number>-1</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame_2">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="penImgLabel">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>40</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>698</width>
+            <height>40</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QLabel" name="noteLabel">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>52</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Please further configure the side button function of the stylus through other software</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="margin">
+         <number>0</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::Box</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QFrame" name="rightFrame">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>64</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>64</height>
+         </size>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <layout class="QHBoxLayout" name="slEraseLayout">
+           <property name="spacing">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="slEraseLabel">
+             <property name="text">
+              <string>Use the side button 2 of the stylus to simulate Erase</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_10">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

stylus-settings/translations/zh_CN.ts

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>PenSettingPage</name>
+    <message>
+        <source>TouchPen Settings</source>
+        <translation type="vanished">手写笔设置</translation>
+    </message>
+    <message>
+        <source>Please further configure the side button function of the stylus through other software</source>
+        <translation type="vanished">请通过其他软件进一步配置手写笔侧边按钮功能</translation>
+    </message>
+    <message>
+        <source>Use the side button 2 of the stylus to simulate Erase</source>
+        <translation type="vanished">使用手写笔的侧边按钮2模拟擦除</translation>
+    </message>
+</context>
+<context>
+    <name>StylusSettingPage</name>
+    <message>
+        <source>TouchPen Settings</source>
+        <translation type="obsolete">手写笔设置</translation>
+    </message>
+    <message>
+        <location filename="../stylussettingpage.ui" line="67"/>
+        <source>Stylus Settings</source>
+        <translation>手写笔设置</translation>
+    </message>
+    <message>
+        <location filename="../stylussettingpage.ui" line="162"/>
+        <source>Please further configure the side button function of the stylus through other software</source>
+        <translation>请通过其他软件进一步配置手写笔侧边按钮功能</translation>
+    </message>
+    <message>
+        <location filename="../stylussettingpage.ui" line="234"/>
+        <source>Use the side button 2 of the stylus to simulate Erase</source>
+        <translation>使用手写笔的侧边按钮2模拟擦除</translation>
+    </message>
+</context>
+<context>
+    <name>StylusSettings::StylusSettings</name>
+    <message>
+        <source>TouchPen</source>
+        <translation type="obsolete">手写笔</translation>
+    </message>
+    <message>
+        <location filename="../stylus-settings.cpp" line="23"/>
+        <location filename="../stylus-settings.cpp" line="41"/>
+        <source>Stylus</source>
+        <translation>手写笔</translation>
+    </message>
+</context>
+<context>
+    <name>TouchPenSettings::PenSettingPage</name>
+    <message>
+        <source>Please further configure the side button function of the stylus through other software</source>
+        <translation type="vanished">请通过其他软件进一步配置手写笔侧边按钮功能</translation>
+    </message>
+    <message>
+        <source>Use the side button 2 of the stylus to simulate Erase</source>
+        <translation type="vanished">使用手写笔的侧边按钮2模拟擦除</translation>
+    </message>
+</context>
+<context>
+    <name>TouchPenSettings::TouchpenSettings</name>
+    <message>
+        <source>TouchPen</source>
+        <translation type="vanished">手写笔</translation>
+    </message>
+</context>
+</TS>

touchpad-settings/touchpadsettingsui.cpp

@@ -17,7 +17,7 @@ TouchpadUI::TouchpadUI(QWidget *parent)
     , m_iconThemeGSettings(nullptr)
 {
     mVlayout = new QVBoxLayout(this);
-    mVlayout->setContentsMargins(0, 0, 4, 40);
+    mVlayout->setContentsMargins(40, 16, 40, 0);
     initUI();
     initConnection();
     monitorIconThemeChange();
@@ -71,10 +71,11 @@ void TouchpadUI::initUI()
     mMouseDisableBtn = new TouchPadSetting::SwitchButton(this);
     //~ contents_path /Touchpad/Disable touchpad when using the mouse
     mMouseDisableLabel = new QLabel(tr("Disable touchpad when using the mouse"), this);
-    MouseDisableHLayout->addSpacing(7);
+    MouseDisableHLayout->addSpacing(16);
     MouseDisableHLayout->addWidget(mMouseDisableLabel);
     MouseDisableHLayout->addStretch();
     MouseDisableHLayout->addWidget(mMouseDisableBtn);
+    MouseDisableHLayout->addSpacing(16);
 
     mMouseDisableFrame->setLayout(MouseDisableHLayout);
 
@@ -96,11 +97,12 @@ void TouchpadUI::initUI()
     mPointerSpeedSlider->setMaximum(1000);
     mPointerSpeedSlider->setSingleStep(50);
     mPointerSpeedSlider->setPageStep(50);
-    pointerSpeedHLayout->addSpacing(7);
+    pointerSpeedHLayout->addSpacing(16);
     pointerSpeedHLayout->addWidget(mPointerSpeedLabel);
     pointerSpeedHLayout->addWidget(mPointerSpeedSlowLabel);
     pointerSpeedHLayout->addWidget(mPointerSpeedSlider);
     pointerSpeedHLayout->addWidget(mPointerSpeedFastLabel);
+    pointerSpeedHLayout->addSpacing(16);
 
     mPointerSpeedFrame->setLayout(pointerSpeedHLayout);
 
@@ -115,10 +117,11 @@ void TouchpadUI::initUI()
     mTypingDisableBtn = new TouchPadSetting::SwitchButton(this);
      //~ contents_path /Touchpad/Disable touchpad when typing
     mTypingDisableLabel = new QLabel(tr("Disable touchpad when typing"), this);
-    TypingDisableHLayout->addSpacing(7);
+    TypingDisableHLayout->addSpacing(16);
     TypingDisableHLayout->addWidget(mTypingDisableLabel);
     TypingDisableHLayout->addStretch();
     TypingDisableHLayout->addWidget(mTypingDisableBtn);
+    TypingDisableHLayout->addSpacing(16);
 
     mTypingDisableFrame->setLayout(TypingDisableHLayout);
 
@@ -133,10 +136,11 @@ void TouchpadUI::initUI()
     mClickBtn = new TouchPadSetting::SwitchButton(this);
     //~ contents_path /Touchpad/Touch and click on the touchpad
     mClickLabel = new QLabel(tr("Touch and click on the touchpad"), this);
-    ClickHLayout->addSpacing(7);
+    ClickHLayout->addSpacing(16);
     ClickHLayout->addWidget(mClickLabel);
     ClickHLayout->addStretch();
     ClickHLayout->addWidget(mClickBtn);
+    ClickHLayout->addSpacing(16);
 
     mClickFrame->setLayout(ClickHLayout);
 
@@ -155,6 +159,7 @@ void TouchpadUI::initUI()
     ScrollSlideHLayout->addWidget(mScrollSlideLabel);
     ScrollSlideHLayout->addStretch();
     ScrollSlideHLayout->addWidget(mScrollSlideBtn);
+    ScrollSlideHLayout->addSpacing(16);
 
     mScrollSlideFrame->setLayout(ScrollSlideHLayout);
 
@@ -172,9 +177,10 @@ void TouchpadUI::initUI()
     mScrollTypeComBox->addItem(tr("Two-finger scrolling in the middle area"), V_FINGER_KEY);
     mScrollTypeComBox->addItem(tr("Edge scrolling"), V_EDGE_KEY);
     mScrollTypeComBox->addItem(tr("Disable scrolling"), N_SCROLLING);
-    ScrollAreaHLayout->addSpacing(7);
+    ScrollAreaHLayout->addSpacing(16);
     ScrollAreaHLayout->addWidget(mScrollAreaLabel);
     ScrollAreaHLayout->addWidget(mScrollTypeComBox);
+    ScrollAreaHLayout->addSpacing(16);
 
     mScrollAreaFrame->setLayout(ScrollAreaHLayout);
 
@@ -183,7 +189,7 @@ void TouchpadUI::initUI()
 //    padGestureWidget->setMinimumSize(550, 504);
 //    padGestureWidget->setMaximumSize(16777215, 16777215);
     QVBoxLayout *vPadLayout = new QVBoxLayout(padGestureWidget);
-    vPadLayout->setContentsMargins(0, 0, 0, 0);
+    vPadLayout->setContentsMargins(0, 40, 0, 0);
     vPadLayout->setSpacing(16);
     // "手势" Label
     QLabel *gestureLabel = new QLabel(tr("gesture"), padGestureWidget);
@@ -327,12 +333,8 @@ void TouchpadUI::initUI()
     mVlayout->setSpacing(8);
     mVlayout->addWidget(touchpadFrame);
     mVlayout->setSpacing(16);
+    mVlayout->addWidget(padGestureWidget);
     mVlayout->addStretch();
-
-    //! \note three and four fingers gesture hide in ukui3.1 because can not hit patch in libinput
-    //! \author wangweinan@kylinos.cn
-//    mVlayout->addWidget(padGestureWidget);
-    padGestureWidget->hide();
 }
 
 void TouchpadUI::initConnection()

touchpad-settings/translations/zh_CN.ts

@@ -13,139 +13,139 @@
 <context>
     <name>TouchpadUI</name>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="50"/>
+        <location filename="../touchpadsettingsui.cpp" line="57"/>
         <source>Touchpad</source>
         <translatorcomment>触控板</translatorcomment>
         <translation>触控板</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="66"/>
+        <location filename="../touchpadsettingsui.cpp" line="73"/>
         <source>Disable touchpad when using the mouse</source>
         <translation>插入鼠标时禁用触控板</translation>
         <extra-contents_path>/Touchpad/Disable touchpad when using the mouse</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="83"/>
+        <location filename="../touchpadsettingsui.cpp" line="91"/>
         <source>Pointer Speed</source>
         <translation>指针速度</translation>
         <extra-contents_path>/Touchpad/Pointer Speed</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="85"/>
+        <location filename="../touchpadsettingsui.cpp" line="93"/>
         <source>Slow</source>
         <translation>慢</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="86"/>
+        <location filename="../touchpadsettingsui.cpp" line="94"/>
         <source>Fast</source>
         <translation>快</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="110"/>
+        <location filename="../touchpadsettingsui.cpp" line="119"/>
         <source>Disable touchpad when typing</source>
         <translation>打字时禁用触控板</translation>
         <extra-contents_path>/Touchpad/Disable touchpad when typing</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="128"/>
+        <location filename="../touchpadsettingsui.cpp" line="138"/>
         <source>Touch and click on the touchpad</source>
         <translation>触控板轻触点击</translation>
         <extra-contents_path>/Touchpad/Touch and click on the touchpad</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="146"/>
+        <location filename="../touchpadsettingsui.cpp" line="157"/>
         <source>Scroll bar slides with finger</source>
         <translation>滚动条跟随手指滑动</translation>
         <extra-contents_path>/Touchpad/Scroll bar slides with finger</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="163"/>
+        <location filename="../touchpadsettingsui.cpp" line="175"/>
         <source>Scrolling area</source>
         <translation>滚动区域</translation>
         <extra-contents_path>/Touchpad/Scrolling area</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="165"/>
+        <location filename="../touchpadsettingsui.cpp" line="177"/>
         <source>Two-finger scrolling in the middle area</source>
         <translation>中间区域滚动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="166"/>
+        <location filename="../touchpadsettingsui.cpp" line="178"/>
         <source>Edge scrolling</source>
         <translation>边界滚动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="167"/>
+        <location filename="../touchpadsettingsui.cpp" line="179"/>
         <source>Disable scrolling</source>
         <translation>禁止滚动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="182"/>
+        <location filename="../touchpadsettingsui.cpp" line="195"/>
         <source>gesture</source>
         <translation>手势</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="188"/>
+        <location filename="../touchpadsettingsui.cpp" line="201"/>
         <source>more gesture</source>
         <translation>更多手势</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="208"/>
+        <location filename="../touchpadsettingsui.cpp" line="222"/>
         <source>three fingers click</source>
         <translation>三指轻点</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="209"/>
+        <location filename="../touchpadsettingsui.cpp" line="223"/>
         <source>show global search</source>
         <translation>呼出全局搜索</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="211"/>
+        <location filename="../touchpadsettingsui.cpp" line="225"/>
         <source>swipe three fingers down</source>
         <translation>三指向下滑动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="214"/>
+        <location filename="../touchpadsettingsui.cpp" line="228"/>
         <source>swipe three fingers up</source>
         <translation>三指向上滑动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="212"/>
+        <location filename="../touchpadsettingsui.cpp" line="226"/>
         <source>show desktop</source>
         <translation>显示桌面</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="215"/>
+        <location filename="../touchpadsettingsui.cpp" line="229"/>
         <source>open the multitasking view</source>
         <translation>打开多任务视图</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="217"/>
+        <location filename="../touchpadsettingsui.cpp" line="231"/>
         <source>swipe three fingers horizontally</source>
         <translation>三指左右滑动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="218"/>
+        <location filename="../touchpadsettingsui.cpp" line="232"/>
         <source>switch windows</source>
         <translation>打开的窗口之间切换</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="220"/>
+        <location filename="../touchpadsettingsui.cpp" line="234"/>
         <source>four fingers click</source>
         <translation>四指点击</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="221"/>
+        <location filename="../touchpadsettingsui.cpp" line="235"/>
         <source>show sidebar</source>
         <translation>呼出侧边栏</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="223"/>
+        <location filename="../touchpadsettingsui.cpp" line="237"/>
         <source>swipe four fingers horizontally</source>
         <translation>四指左右滑动</translation>
     </message>
     <message>
-        <location filename="../touchpadsettingsui.cpp" line="224"/>
+        <location filename="../touchpadsettingsui.cpp" line="238"/>
         <source>switch desktop</source>
         <translation>桌面之间切换</translation>
     </message>

touchscreen-settings/touchscreen-settings.cpp

@@ -17,10 +17,7 @@ TouchscreenSettings::TouchscreenSettings() : mFirstLoad(true)
 
 TouchscreenSettings::~TouchscreenSettings()
 {
-    if(pluginWidget) {
+    //! ukui-control-center is responsible for destroying pluginWidget
-        pluginWidget->deleteLater();
-        pluginWidget = nullptr;
-    }
 }
 
 QString TouchscreenSettings::plugini18nName()

touchscreen-settings/translations/zh_CN.ts

@@ -19,75 +19,75 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="55"/>
+        <location filename="../touchscreen.cpp" line="82"/>
         <source>touchscreen gesture</source>
         <translatorcomment>触摸屏手势</translatorcomment>
         <translation>触摸屏手势</translation>
         <extra-contents_path>/TouchScreen/touchscreen gesture</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="57"/>
+        <location filename="../touchscreen.cpp" line="84"/>
         <source>more gesture</source>
         <translatorcomment>更多手势</translatorcomment>
         <translation>更多手势</translation>
         <extra-contents_path>/TouchScreen/more gesture</extra-contents_path>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="64"/>
+        <location filename="../touchscreen.cpp" line="92"/>
         <source>swipe up from the bottom edge</source>
         <translatorcomment>手指从屏幕底部边缘向上滑动</translatorcomment>
         <translation>手指从屏幕底部边缘向上滑动</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="65"/>
+        <location filename="../touchscreen.cpp" line="93"/>
         <source>open the multitasking view</source>
         <translatorcomment>打开多任务视图</translatorcomment>
         <translation>打开多任务视图</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="68"/>
+        <location filename="../touchscreen.cpp" line="96"/>
         <source>swipe down from the top edge</source>
         <translatorcomment>单指从屏幕顶端向下滑动</translatorcomment>
         <translation>单指从屏幕顶端向下滑动</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="69"/>
+        <location filename="../touchscreen.cpp" line="97"/>
         <source>show desktop</source>
         <translatorcomment>显示桌面</translatorcomment>
         <translation>显示桌面</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="72"/>
+        <location filename="../touchscreen.cpp" line="100"/>
         <source>swipe left from the right edge</source>
         <translatorcomment>单指从屏幕右侧向左滑入</translatorcomment>
         <translation>单指从屏幕右侧向左滑入</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="73"/>
+        <location filename="../touchscreen.cpp" line="101"/>
         <source>show sidebar</source>
         <translatorcomment>呼出侧边栏</translatorcomment>
         <translation>呼出侧边栏</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="76"/>
+        <location filename="../touchscreen.cpp" line="104"/>
         <source>swipe four fingers down anywhere</source>
         <translatorcomment>四指屏幕任意位置下滑</translatorcomment>
         <translation>四指屏幕任意位置下滑</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="77"/>
+        <location filename="../touchscreen.cpp" line="105"/>
         <source>show global search</source>
         <translatorcomment>呼出全局搜索</translatorcomment>
         <translation>呼出全局搜索</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="80"/>
+        <location filename="../touchscreen.cpp" line="108"/>
         <source>swipe four fingers horizontally</source>
         <translatorcomment>四指屏幕向左或向右滑动</translatorcomment>
         <translation>四指屏幕向左或向右滑动</translation>
     </message>
     <message>
-        <location filename="../touchscreen.cpp" line="81"/>
+        <location filename="../touchscreen.cpp" line="109"/>
         <source>switch windows</source>
         <translatorcomment>在打开的窗口之间切换</translatorcomment>
         <translation>在打开的窗口之间切换</translation>

ukui-touch-settings-plugin.pro

@@ -2,4 +2,5 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
     touchpad-settings \
+    stylus-settings \
     touchscreen-settings