From 2f675317af6574f5e0639ec9cfbefe57ad08e3ab Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Fri, 4 Mar 2022 10:57:49 +0800 Subject: [PATCH] modify show taskview not translation --- ...modify-show-taskview-not-translation.patch | 53 +++++++++++++++++++ ukui-panel.spec | 9 +++- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 0001-modify-show-taskview-not-translation.patch diff --git a/0001-modify-show-taskview-not-translation.patch b/0001-modify-show-taskview-not-translation.patch new file mode 100644 index 0000000..fd13f58 --- /dev/null +++ b/0001-modify-show-taskview-not-translation.patch @@ -0,0 +1,53 @@ +From f99aba2d59c3a095be8e0555026198482c6e09c0 Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Fri, 4 Mar 2022 11:09:50 +0800 +Subject: [PATCH] modify-show-taskview-not-translation + +--- + panel/resources/ukui-panel_zh_CN.ts | 2 +- + plugin-startbar/taskview_button.cpp | 2 +- + plugin-startbar/taskview_button.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/panel/resources/ukui-panel_zh_CN.ts b/panel/resources/ukui-panel_zh_CN.ts +index 12c1c15..c285273 100644 +--- a/panel/resources/ukui-panel_zh_CN.ts ++++ b/panel/resources/ukui-panel_zh_CN.ts +@@ -730,7 +730,7 @@ + + + Show Taskview +- ++ 显示任务视图按钮 + + + +diff --git a/plugin-startbar/taskview_button.cpp b/plugin-startbar/taskview_button.cpp +index 2924509..9da8a7e 100644 +--- a/plugin-startbar/taskview_button.cpp ++++ b/plugin-startbar/taskview_button.cpp +@@ -7,7 +7,7 @@ TaskViewButton::TaskViewButton(IUKUIPanelPlugin *plugin,QWidget *parent): + this->setParent(parent); + setFocusPolicy(Qt::NoFocus); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); +- this->setToolTip(tr("Show Taskview")); ++ QTimer::singleShot(5000,[this] {this->setToolTip(tr("Show Taskview")); }); + this->setStyle(new CustomStyle()); + this->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg"))); + this->setIconSize(QSize(mPlugin->panel()->iconSize(),mPlugin->panel()->iconSize())); +diff --git a/plugin-startbar/taskview_button.h b/plugin-startbar/taskview_button.h +index df6c617..400bc21 100644 +--- a/plugin-startbar/taskview_button.h ++++ b/plugin-startbar/taskview_button.h +@@ -3,7 +3,7 @@ + + #include + #include +- ++#include + #include "../panel/customstyle.h" + #include "../panel/iukuipanelplugin.h" + class TaskViewButton :public QToolButton +-- +2.33.0 + diff --git a/ukui-panel.spec b/ukui-panel.spec index b6b85c2..85307b0 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -2,13 +2,14 @@ Name: ukui-panel Version: 3.0.6 -Release: 2 +Release: 3 Summary: ukui desktop panel License: LGPL-2.1+ GPL-2+ LGPL-3 URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -patch0: fix-panel-translation.patch +Patch0: fix-panel-translation.patch +Patch1: 0001-modify-show-taskview-not-translation.patch BuildRequires: cmake BuildRequires: alsa-lib-devel @@ -58,6 +59,7 @@ Provides: ukui-indicators %prep %setup -q %patch0 -p1 +%patch1 -p1 %build mkdir build && cd build @@ -80,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog +* Fri Mar 4 2022 pei-jiankang - 3.0.6-3 +- modify show-taskview not translation + * Fri Feb 25 2022 douyan - 3.0.6-2 - fix panel translation issue