108 lines
4.2 KiB
Diff
108 lines
4.2 KiB
Diff
From 06eaadf512479c4f20ce5955129ea0757dc59b02 Mon Sep 17 00:00:00 2001
|
|
From: root <root@localhost.localdomain>
|
|
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</source>
|
|
<source>Shutdown</source>
|
|
<translation type="vanished">关闭计算机</translation>
|
|
</message>
|
|
+ <message>
|
|
+ <location filename="../../plugin-startmenu/startmenu.cpp" line="62"/>
|
|
+ <source>UKui Menu</source>
|
|
+ <translation>开始菜单</translation>
|
|
+ </message>
|
|
<message>
|
|
<location filename="../../plugin-startmenu/startmenu.cpp" line="104"/>
|
|
<source>User Action</source>
|
|
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 <QDebug>
|
|
#include <QMessageBox>
|
|
#include <QDir>
|
|
+#include <QTimer>
|
|
#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 <QtX11Extras/QX11Info>
|
|
#include <QStyleOption>
|
|
#include <QPainter>
|
|
+#include <QTimer>
|
|
#include <KWindowSystem/KWindowSystem>
|
|
#include <KWindowSystem/NETWM>
|
|
#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
|
|
|