From ec15aefafce19d70f23ec54ba5e3c50fb96088e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E7=82=9C?= Date: Wed, 15 Jun 2022 16:03:23 +0800 Subject: [PATCH] Import Upstream version 1.0.11.1 --- README.md | 33 +++ stylus-settings/img/open_inuse.png | Bin 0 -> 633 bytes stylus-settings/img/pen-symbolic.svg | 3 + stylus-settings/img/setting-illus-pen.png | Bin 0 -> 6972 bytes .../img/setting-illus-pen_small.png | Bin 0 -> 10188 bytes stylus-settings/resource.qrc | 12 + stylus-settings/stylus-settings.cpp | 57 ++++ stylus-settings/stylus-settings.h | 37 +++ stylus-settings/stylus-settings.pro | 57 ++++ stylus-settings/stylussettingpage.cpp | 43 +++ stylus-settings/stylussettingpage.h | 29 ++ stylus-settings/stylussettingpage.ui | 277 ++++++++++++++++++ stylus-settings/translations/zh_CN.qm | Bin 0 -> 471 bytes stylus-settings/translations/zh_CN.ts | 72 +++++ touchpad-settings/touchpadsettingsui.cpp | 26 +- touchpad-settings/translations/zh_CN.ts | 52 ++-- touchscreen-settings/touchscreen-settings.cpp | 5 +- touchscreen-settings/translations/zh_CN.ts | 24 +- ukui-touch-settings-plugin.pro | 1 + 19 files changed, 674 insertions(+), 54 deletions(-) create mode 100644 README.md create mode 100644 stylus-settings/img/open_inuse.png create mode 100644 stylus-settings/img/pen-symbolic.svg create mode 100644 stylus-settings/img/setting-illus-pen.png create mode 100644 stylus-settings/img/setting-illus-pen_small.png create mode 100644 stylus-settings/resource.qrc create mode 100644 stylus-settings/stylus-settings.cpp create mode 100644 stylus-settings/stylus-settings.h create mode 100644 stylus-settings/stylus-settings.pro create mode 100644 stylus-settings/stylussettingpage.cpp create mode 100644 stylus-settings/stylussettingpage.h create mode 100644 stylus-settings/stylussettingpage.ui create mode 100644 stylus-settings/translations/zh_CN.qm create mode 100644 stylus-settings/translations/zh_CN.ts diff --git a/README.md b/README.md new file mode 100644 index 0000000..e20053d --- /dev/null +++ b/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 是负责展示手写笔信息的控制面板插件，未来增加了手写笔配置也会加在这个插件上 diff --git a/stylus-settings/img/open_inuse.png b/stylus-settings/img/open_inuse.png new file mode 100644 index 0000000000000000000000000000000000000000..3b8c9b03d5d6fabab6c8b445447669855f2d731a GIT binary patch literal 633 zcmV-<0*3vGP)6{3Y*v{k|Kpo)WZ-&u}EW~O%yCFYytrrixh&|Xkn8= z6bbRpn8qSS5N*T-#U@5X<&w>Tm^;st-FY$_*6b#Ci+h&?XWNty;%JsqkwaCpkzdY={ECA!v&EqPR|)(ps@={U@7w_ED@f>p7t4{ra{~t26OEPivLnzpV+ZxC zN&>583FQu*a%D}q#-UtmR`T+*nq`Hqmwshd>H_aWEA>S3p_O`s1{?SP_{{$UfL&%* TRnIo500000NkvXXu0mjfakd|L literal 0 HcmV?d00001 diff --git a/stylus-settings/img/pen-symbolic.svg b/stylus-settings/img/pen-symbolic.svg new file mode 100644 index 0000000..1a71878 --- /dev/null +++ b/stylus-settings/img/pen-symbolic.svg @@ -0,0 +1,3 @@ + + + diff --git a/stylus-settings/img/setting-illus-pen.png b/stylus-settings/img/setting-illus-pen.png new file mode 100644 index 0000000000000000000000000000000000000000..66e8f926a77a22b761b8aac3eabca3016aafc7e3 GIT binary patch literal 6972 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 W?M?ShhW-1KPG8&TL8Yc$#D4)*Njf|L literal 0 HcmV?d00001 diff --git a/stylus-settings/resource.qrc b/stylus-settings/resource.qrc new file mode 100644 index 0000000..784e3aa --- /dev/null +++ b/stylus-settings/resource.qrc @@ -0,0 +1,12 @@ + + + img/open_inuse.png + img/setting-illus-pen_small.png + img/setting-illus-pen.png + img/pen-symbolic.svg + + + translations/zh_CN.ts + translations/zh_CN.qm + + diff --git a/stylus-settings/stylus-settings.cpp b/stylus-settings/stylus-settings.cpp new file mode 100644 index 0000000..828c000 --- /dev/null +++ b/stylus-settings/stylus-settings.cpp @@ -0,0 +1,57 @@ +#include "stylus-settings.h" +#include "stylussettingpage.h" + +#include +#include + +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 diff --git a/stylus-settings/stylus-settings.h b/stylus-settings/stylus-settings.h new file mode 100644 index 0000000..4780471 --- /dev/null +++ b/stylus-settings/stylus-settings.h @@ -0,0 +1,37 @@ +#ifndef STYLUSSETTINGS_H +#define STYLUSSETTINGS_H + +#include + +#include +#include +#include +#include + +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 diff --git a/stylus-settings/stylus-settings.pro b/stylus-settings/stylus-settings.pro new file mode 100644 index 0000000..c598d68 --- /dev/null +++ b/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 diff --git a/stylus-settings/stylussettingpage.cpp b/stylus-settings/stylussettingpage.cpp new file mode 100644 index 0000000..eda9988 --- /dev/null +++ b/stylus-settings/stylussettingpage.cpp @@ -0,0 +1,43 @@ +#include "stylussettingpage.h" +#include "ui_stylussettingpage.h" + +#include +#include +#include + +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 diff --git a/stylus-settings/stylussettingpage.h b/stylus-settings/stylussettingpage.h new file mode 100644 index 0000000..399ff21 --- /dev/null +++ b/stylus-settings/stylussettingpage.h @@ -0,0 +1,29 @@ +#ifndef STYLUSSETTINGPAGE_H +#define STYLUSSETTINGPAGE_H + +#include + +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 diff --git a/stylus-settings/stylussettingpage.ui b/stylus-settings/stylussettingpage.ui new file mode 100644 index 0000000..073b367 --- /dev/null +++ b/stylus-settings/stylussettingpage.ui @@ -0,0 +1,277 @@ + + + StylusSettingPage + + + + 0 + 0 + 784 + 435 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Stylus + + + + 2 + + + 0 + + + 0 + + + 9 + + + 48 + + + + + 16 + + + 0 + + + + + + 0 + 32 + + + + + 0 + 0 + + + + Stylus Settings + + + -1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + + 0 + 40 + + + + + 698 + 40 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 0 + 52 + + + + Please further configure the side button function of the stylus through other software + + + Qt::AlignCenter + + + 0 + + + + + + + + + + + 0 + 0 + + + + QFrame::Box + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 64 + + + + + 16777215 + 64 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + + + 0 + + + + + Use the side button 2 of the stylus to simulate Erase + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + diff --git a/stylus-settings/translations/zh_CN.qm b/stylus-settings/translations/zh_CN.qm new file mode 100644 index 0000000000000000000000000000000000000000..3689fdeeef84fb4f6d9d69393b3fa781e1522b90 GIT binary patch literal 471 zcmcE7ks@*G{hX<16=n7(EZlq7iGhJZf%(gvQXu`5bq(`j1_s7B9>EW-Kt2OcJNITF zwJZ}TIF}j7((3*`L8||FV42^w{(Qf0{kQ!XvQsDe*5@U82hOY(@n7D*GnsSBx}fp$~umN#cKu&66ajHUEX;Dc=YLP;6eqLH;dTCLr0+6dvoSBlUkW^YylAi}uk(XSO z31sA_LF7s*b4rVW%%c3#^bCc3u=e8ow370~qEvRE(SpHX6~U<`C7F5Y0g36Uj38HX zL0r?luRag%3Vw)E1*qC$Jlf^_>q|8tMwGR{yu@IXrI>U-<=M0pxRIuzKwqKz!3f>) p`9Lq`mgXduq$;=;0mA{0#cU8u;TEt#+ziqohvL&>D=Sn!BLIu#nScNQ literal 0 HcmV?d00001 diff --git a/stylus-settings/translations/zh_CN.ts b/stylus-settings/translations/zh_CN.ts new file mode 100644 index 0000000..ec6e3c4 --- /dev/null +++ b/stylus-settings/translations/zh_CN.ts @@ -0,0 +1,72 @@ + + + + + PenSettingPage + + TouchPen Settings + 手写笔设置 + + + Please further configure the side button function of the stylus through other software + 请通过其他软件进一步配置手写笔侧边按钮功能 + + + Use the side button 2 of the stylus to simulate Erase + 使用手写笔的侧边按钮2模拟擦除 + + + + StylusSettingPage + + TouchPen Settings + 手写笔设置 + + + + Stylus Settings + 手写笔设置 + + + + Please further configure the side button function of the stylus through other software + 请通过其他软件进一步配置手写笔侧边按钮功能 + + + + Use the side button 2 of the stylus to simulate Erase + 使用手写笔的侧边按钮2模拟擦除 + + + + StylusSettings::StylusSettings + + TouchPen + 手写笔 + + + + + Stylus + 手写笔 + + + + TouchPenSettings::PenSettingPage + + Please further configure the side button function of the stylus through other software + 请通过其他软件进一步配置手写笔侧边按钮功能 + + + Use the side button 2 of the stylus to simulate Erase + 使用手写笔的侧边按钮2模拟擦除 + + + + TouchPenSettings::TouchpenSettings + + TouchPen + 手写笔 + + + diff --git a/touchpad-settings/touchpadsettingsui.cpp b/touchpad-settings/touchpadsettingsui.cpp index ff850f9..deeb620 100644 --- a/touchpad-settings/touchpadsettingsui.cpp +++ b/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() diff --git a/touchpad-settings/translations/zh_CN.ts b/touchpad-settings/translations/zh_CN.ts index baf68c7..676c259 100644 --- a/touchpad-settings/translations/zh_CN.ts +++ b/touchpad-settings/translations/zh_CN.ts @@ -13,139 +13,139 @@ TouchpadUI - + Touchpad 触控板 触控板 - + Disable touchpad when using the mouse 插入鼠标时禁用触控板 /Touchpad/Disable touchpad when using the mouse - + Pointer Speed 指针速度 /Touchpad/Pointer Speed - + Slow 慢 - + Fast 快 - + Disable touchpad when typing 打字时禁用触控板 /Touchpad/Disable touchpad when typing - + Touch and click on the touchpad 触控板轻触点击 /Touchpad/Touch and click on the touchpad - + Scroll bar slides with finger 滚动条跟随手指滑动 /Touchpad/Scroll bar slides with finger - + Scrolling area 滚动区域 /Touchpad/Scrolling area - + Two-finger scrolling in the middle area 中间区域滚动 - + Edge scrolling 边界滚动 - + Disable scrolling 禁止滚动 - + gesture 手势 - + more gesture 更多手势 - + three fingers click 三指轻点 - + show global search 呼出全局搜索 - + swipe three fingers down 三指向下滑动 - + swipe three fingers up 三指向上滑动 - + show desktop 显示桌面 - + open the multitasking view 打开多任务视图 - + swipe three fingers horizontally 三指左右滑动 - + switch windows 打开的窗口之间切换 - + four fingers click 四指点击 - + show sidebar 呼出侧边栏 - + swipe four fingers horizontally 四指左右滑动 - + switch desktop 桌面之间切换 diff --git a/touchscreen-settings/touchscreen-settings.cpp b/touchscreen-settings/touchscreen-settings.cpp index 9b7b7db..49efa77 100644 --- a/touchscreen-settings/touchscreen-settings.cpp +++ b/touchscreen-settings/touchscreen-settings.cpp @@ -17,10 +17,7 @@ TouchscreenSettings::TouchscreenSettings() : mFirstLoad(true) TouchscreenSettings::~TouchscreenSettings() { - if(pluginWidget) { - pluginWidget->deleteLater(); - pluginWidget = nullptr; - } + //! ukui-control-center is responsible for destroying pluginWidget } QString TouchscreenSettings::plugini18nName() diff --git a/touchscreen-settings/translations/zh_CN.ts b/touchscreen-settings/translations/zh_CN.ts index e624d1c..1140118 100644 --- a/touchscreen-settings/translations/zh_CN.ts +++ b/touchscreen-settings/translations/zh_CN.ts @@ -19,75 +19,75 @@ - + touchscreen gesture 触摸屏手势 触摸屏手势 /TouchScreen/touchscreen gesture - + more gesture 更多手势 更多手势 /TouchScreen/more gesture - + swipe up from the bottom edge 手指从屏幕底部边缘向上滑动 手指从屏幕底部边缘向上滑动 - + open the multitasking view 打开多任务视图 打开多任务视图 - + swipe down from the top edge 单指从屏幕顶端向下滑动 单指从屏幕顶端向下滑动 - + show desktop 显示桌面 显示桌面 - + swipe left from the right edge 单指从屏幕右侧向左滑入 单指从屏幕右侧向左滑入 - + show sidebar 呼出侧边栏 呼出侧边栏 - + swipe four fingers down anywhere 四指屏幕任意位置下滑 四指屏幕任意位置下滑 - + show global search 呼出全局搜索 呼出全局搜索 - + swipe four fingers horizontally 四指屏幕向左或向右滑动 四指屏幕向左或向右滑动 - + switch windows 在打开的窗口之间切换 在打开的窗口之间切换 diff --git a/ukui-touch-settings-plugin.pro b/ukui-touch-settings-plugin.pro index 4b0ffb3..286df8a 100644 --- a/ukui-touch-settings-plugin.pro +++ b/ukui-touch-settings-plugin.pro @@ -2,4 +2,5 @@ TEMPLATE = subdirs SUBDIRS += \ touchpad-settings \ + stylus-settings \ touchscreen-settings