diff --git a/0003-Modify-some-modules-translation-error.patch b/0003-Modify-some-modules-translation-error.patch new file mode 100644 index 0000000..5f81463 --- /dev/null +++ b/0003-Modify-some-modules-translation-error.patch @@ -0,0 +1,107 @@ +From 06eaadf512479c4f20ce5955129ea0757dc59b02 Mon Sep 17 00:00:00 2001 +From: root +Date: Sat, 18 Sep 2021 13:02:41 +0800 +Subject: [PATCH] Modify-some-modules-translation-error + +--- + panel/resources/ukui-panel_zh_CN.ts | 5 +++++ + plugin-nightmode/nightmode.cpp | 5 +++-- + plugin-showdesktop/showdesktop.cpp | 3 ++- + plugin-startmenu/startmenu.cpp | 2 ++ + plugin-taskview/taskview.cpp | 2 +- + 5 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/panel/resources/ukui-panel_zh_CN.ts b/panel/resources/ukui-panel_zh_CN.ts +index f234d96..e63297e 100755 +--- a/panel/resources/ukui-panel_zh_CN.ts ++++ b/panel/resources/ukui-panel_zh_CN.ts +@@ -778,6 +778,11 @@ icons here + Shutdown + 关闭计算机 + ++ ++ ++ UKui Menu ++ 开始菜单 ++ + + + User Action +diff --git a/plugin-nightmode/nightmode.cpp b/plugin-nightmode/nightmode.cpp +index 66e01ca..670a9df 100755 +--- a/plugin-nightmode/nightmode.cpp ++++ b/plugin-nightmode/nightmode.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include "nightmode.h" + #include "../panel/customstyle.h" + +@@ -240,13 +241,13 @@ void NightModeButton::setNightMode(const bool nightMode){ + serverCmd = "enable"; + QIcon icon=QIcon("/usr/share/ukui-panel/panel/img/nightmode-night.svg"); + this->setIcon(icon); +- this->setToolTip(tr("nightmode open")); ++ QTimer::singleShot(5000,[this] { this->setToolTip(tr("nightmode open")); }); + } + else{ + cmd = "stop"; + serverCmd = "disable"; + this->setIcon(QIcon("/usr/share/ukui-panel/panel/img/nightmode-light.svg")); +- this->setToolTip(tr("nightmode close")); ++ QTimer::singleShot(5000,[this] { this->setToolTip(tr("nightmode close")); }); + } + + process.startDetached("systemctl", QStringList() << "--user" << serverCmd << "redshift.service"); +diff --git a/plugin-showdesktop/showdesktop.cpp b/plugin-showdesktop/showdesktop.cpp +index 3bd5529..11688e0 100755 +--- a/plugin-showdesktop/showdesktop.cpp ++++ b/plugin-showdesktop/showdesktop.cpp +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include "showdesktop.h" +@@ -44,7 +45,7 @@ ShowDesktop::ShowDesktop(const IUKUIPanelPluginStartupInfo &startupInfo) : + IUKUIPanelPlugin(startupInfo) + { + state=NORMAL; +- this->setToolTip(tr("Show Desktop")); ++ QTimer::singleShot(5000,[this] {this->setToolTip(tr("Show Desktop"));}); + realign(); + + } +diff --git a/plugin-startmenu/startmenu.cpp b/plugin-startmenu/startmenu.cpp +index bf4bf97..7875424 100755 +--- a/plugin-startmenu/startmenu.cpp ++++ b/plugin-startmenu/startmenu.cpp +@@ -58,6 +58,8 @@ UKUIStartMenuButton::UKUIStartMenuButton( IUKUIPanelPlugin *plugin, QWidget* par + { + this->setIcon(QIcon("/usr/share/ukui-panel/panel/img/startmenu.svg")); + this->setStyle(new CustomStyle()); ++ setStyleSheet("QToolButton { margin-left: 4px; } "); ++ QTimer::singleShot(5000,[this] {this->setToolTip(tr("UKui Menu")); }); + // this->setWindowFlags(Qt::NoFocus); + //setAttribute(Qt::WA_X11DoNotAcceptFocus, true); + //setAttribute(Qt::WA_ShowWithoutActivating,true); +diff --git a/plugin-taskview/taskview.cpp b/plugin-taskview/taskview.cpp +index 7fb54b3..ec7eaaf 100755 +--- a/plugin-taskview/taskview.cpp ++++ b/plugin-taskview/taskview.cpp +@@ -45,7 +45,7 @@ TaskView::TaskView(const IUKUIPanelPluginStartupInfo &startupInfo) : + mButton =new TaskViewButton(); + mButton->setStyle(new CustomStyle()); + mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg"))); +- mButton->setToolTip(tr("Show Taskview")); ++ QTimer::singleShot(5000,[this] {mButton->setToolTip(tr("Show Taskview")); }); + + /* hide/show taskview + * Monitor gsettings to set TaskViewButton size +-- +2.30.0 + diff --git a/ukui-panel.spec b/ukui-panel.spec index 1c45ded..6ceeca5 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -2,11 +2,12 @@ Name: ukui-panel Version: 3.0.2 -Release: 4 +Release: 5 Summary: ukui desktop panel License: LGPL-2.1+ GPL-2+ LGPL-3 URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz +Source1: ukui-panel_zh_CN.qm BuildRequires: cmake BuildRequires: alsa-lib-devel @@ -43,6 +44,8 @@ BuildRequires: libpeony-dev Provides: ukui-indicators patch0: 0001-block-taskbar-right-click.patch +#patch1: 0002-Fixes-an-issue-with-a-year-jump-exception.patch +patch2: 0003-Modify-some-modules-translation-error.patch %description The ukui desktop panel is used on ukui desktop and has some plugins like @@ -52,7 +55,10 @@ patch0: 0001-block-taskbar-right-click.patch %prep %setup -q %patch0 -p1 +#%%patch1 -p1 +%patch2 -p1 +cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources %build mkdir build && cd build %{cmake3} .. @@ -74,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog +* Sat Sep 18 2021 peijiankang - 3.0.2-5 +- Modify some modules translation error + * Fri Dec 4 2020 lvhan - 3.0.2-4 - block taskbar right click diff --git a/ukui-panel_zh_CN.qm b/ukui-panel_zh_CN.qm new file mode 100644 index 0000000..c5b4560 Binary files /dev/null and b/ukui-panel_zh_CN.qm differ