packages/ukui-panel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!33 modify show taskview not translation

Browse Source 
From: @pei-jiankang 
Reviewed-by: @tanyulong2021 
Signed-off-by: @tanyulong2021
This commit is contained in:
openeuler-ci-bot 2022-03-04 04:08:36 +00:00 committed by Gitee
commit 07cbb507ee
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
0001-modify-show-taskview-not-translation.patch Normal file
View File

@ -0,0 +1,53 @@
From f99aba2d59c3a095be8e0555026198482c6e09c0 Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
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 @@
<message>
<location filename="../../plugin-startbar/taskview_button.cpp" line="10"/>
<source>Show Taskview</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">显示任务视图按钮</translation>
</message>
</context>
<context>
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 <QToolButton>
#include <QMouseEvent>
-
+#include <QTimer>
#include "../panel/customstyle.h"
#include "../panel/iukuipanelplugin.h"
class TaskViewButton :public QToolButton
--
2.33.0

9
ukui-panel.spec
View File

@ -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 <peijiankang@kylinos.cn> - 3.0.6-3
- modify show-taskview not translation
* Fri Feb 25 2022 douyan <douyan@kylinos.cn> - 3.0.6-2
- fix panel translation issue