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

sync with master

Browse Source
This commit is contained in:
dou33 2021-10-22 16:42:47 +08:00
parent 57a821d835
commit 13a029ea10
4 changed files with 285 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
0002-Fixes-an-issue-with-a-year-jump-exception.patch Normal file
View File

@ -0,0 +1,165 @@
From 181212c498f1971e577ed053e3c6615a6ffda5ab Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Wed, 8 Sep 2021 18:10:23 +0800
Subject: [PATCH] Fixes an issue with a year jump exception
---
plugin-calendar/html/index-mon.js | 12 ++++++++++++
plugin-calendar/html/index-solar-cn-mon.js | 12 ++++++++++++
plugin-calendar/html/index-solar-cn.js | 12 ++++++++++++
plugin-calendar/html/index-solar-en-mon.js | 12 ++++++++++++
plugin-calendar/html/index-solar-en.js | 12 ++++++++++++
plugin-calendar/html/index.js | 15 +++++++++++++--
6 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/plugin-calendar/html/index-mon.js b/plugin-calendar/html/index-mon.js
index 5e3d493..2f023c8 100755
--- a/plugin-calendar/html/index-mon.js
+++ b/plugin-calendar/html/index-mon.js
@@ -1141,6 +1141,18 @@ function popup_div(event) {
div.className = 'visible_div';
document.getElementById('month_div').className = 'hidden_div';
calendar.style.display = "none";
+ year = parseInt(year_selector.value);
+ var li = document.getElementById('year_div');
+ year_selector.value = year + '年';
+ // selected_date_div.innerHTML = year_selector.value + month_selector.value;
+ for (var index = 0; index < 16; index++) {
+
+ // li.children[0].children[index].innerHTML = '<br />';
+ var currentYear = year + index;
+ //li.children[0].children[index].innerHTML= '<br />' + curretYear + '年';
+ li.children[0].children[index].innerHTML ='<span class="year_month_grid">'+ currentYear+ '年' + '</span>';
+ li.children[0].children[index].addEventListener('click', new_month_selected); // new year implies new month
+ }
} else {
div.className = 'hidden_div';
calendar.style.display = "";
diff --git a/plugin-calendar/html/index-solar-cn-mon.js b/plugin-calendar/html/index-solar-cn-mon.js
index c1ffc5d..41fd1e0 100755
--- a/plugin-calendar/html/index-solar-cn-mon.js
+++ b/plugin-calendar/html/index-solar-cn-mon.js
@@ -824,6 +824,18 @@ function popup_div(event) {
div.className = 'visible_div';
document.getElementById('month_div').className = 'hidden_div';
calendar.style.display = "none";
+ year = parseInt(year_selector.value);
+ var li = document.getElementById('year_div');
+ year_selector.value = year + '年';
+ // selected_date_div.innerHTML = year_selector.value + month_selector.value;
+ for (var index = 0; index < 16; index++) {
+
+ // li.children[0].children[index].innerHTML = '<br />';
+ var currentYear = year + index;
+ //li.children[0].children[index].innerHTML= '<br />' + curretYear + '年';
+ li.children[0].children[index].innerHTML ='<span class="year_month_grid">'+ currentYear+ '年' + '</span>';
+ li.children[0].children[index].addEventListener('click', new_month_selected); // new year implies new month
+ }
} else {
div.className = 'hidden_div';
calendar.style.display = "";
diff --git a/plugin-calendar/html/index-solar-cn.js b/plugin-calendar/html/index-solar-cn.js
index 8da433e..ff15715 100755
--- a/plugin-calendar/html/index-solar-cn.js
+++ b/plugin-calendar/html/index-solar-cn.js
@@ -820,6 +820,18 @@ function popup_div(event) {
div.className = 'visible_div';
document.getElementById('month_div').className = 'hidden_div';
calendar.style.display = "none";
+ year = parseInt(year_selector.value);
+ var li = document.getElementById('year_div');
+ year_selector.value = year + '年';
+ // selected_date_div.innerHTML = year_selector.value + month_selector.value;
+ for (var index = 0; index < 16; index++) {
+
+ // li.children[0].children[index].innerHTML = '<br />';
+ var currentYear = year + index;
+ //li.children[0].children[index].innerHTML= '<br />' + curretYear + '年';
+ li.children[0].children[index].innerHTML ='<span class="year_month_grid">'+ currentYear+ '年' + '</span>';
+ li.children[0].children[index].addEventListener('click', new_month_selected); // new year implies new month
+ }
} else {
div.className = 'hidden_div';
calendar.style.display = "";
diff --git a/plugin-calendar/html/index-solar-en-mon.js b/plugin-calendar/html/index-solar-en-mon.js
index 61f9882..0968ca0 100755
--- a/plugin-calendar/html/index-solar-en-mon.js
+++ b/plugin-calendar/html/index-solar-en-mon.js
@@ -819,6 +819,18 @@ function popup_div(event) {
div.className = 'visible_div';
document.getElementById('month_div').className = 'hidden_div';
calendar.style.display = "none";
+ year = parseInt(year_selector.value);
+ var li = document.getElementById('year_div');
+ year_selector.value = year + '年';
+ // selected_date_div.innerHTML = year_selector.value + month_selector.value;
+ for (var index = 0; index < 16; index++) {
+
+ // li.children[0].children[index].innerHTML = '<br />';
+ var currentYear = year + index;
+ //li.children[0].children[index].innerHTML= '<br />' + curretYear + '年';
+ li.children[0].children[index].innerHTML ='<span class="year_month_grid">'+ currentYear+ '年' + '</span>';
+ li.children[0].children[index].addEventListener('click', new_month_selected); // new year implies new month
+ }
} else {
div.className = 'hidden_div';
calendar.style.display = "";
diff --git a/plugin-calendar/html/index-solar-en.js b/plugin-calendar/html/index-solar-en.js
index 5cdee19..f599a51 100755
--- a/plugin-calendar/html/index-solar-en.js
+++ b/plugin-calendar/html/index-solar-en.js
@@ -818,6 +818,18 @@ function popup_div(event) {
div.className = 'visible_div';
document.getElementById('month_div').className = 'hidden_div';
calendar.style.display = "none";
+ year = parseInt(year_selector.value);
+ var li = document.getElementById('year_div');
+ year_selector.value = year + '年';
+ // selected_date_div.innerHTML = year_selector.value + month_selector.value;
+ for (var index = 0; index < 16; index++) {
+
+ // li.children[0].children[index].innerHTML = '<br />';
+ var currentYear = year + index;
+ //li.children[0].children[index].innerHTML= '<br />' + curretYear + '年';
+ li.children[0].children[index].innerHTML ='<span class="year_month_grid">'+ currentYear+ '年' + '</span>';
+ li.children[0].children[index].addEventListener('click', new_month_selected); // new year implies new month
+ }
} else {
div.className = 'hidden_div';
calendar.style.display = "";
diff --git a/plugin-calendar/html/index.js b/plugin-calendar/html/index.js
index 61dbd10..4f8dcd2 100755
--- a/plugin-calendar/html/index.js
+++ b/plugin-calendar/html/index.js
@@ -724,8 +724,7 @@ window.onload = function () {
if(document.getElementById('year_div').className ==='visible_div')
{
var li = document.getElementById('year_div');
- if(this.id === 'go_prev_month')
- {
+ if(this.id === 'go_prev_month') {
year = year -16;
year_selector.value = year + '年';
// selected_date_div.innerHTML = year_selector.value + month_selector.value;
@@ -1121,6 +1120,18 @@ function popup_div(event) {
div.className = 'visible_div';
document.getElementById('month_div').className = 'hidden_div';
calendar.style.display = "none";
+ year = parseInt(year_selector.value);
+ var li = document.getElementById('year_div');
+ year_selector.value = year + '年';
+ // selected_date_div.innerHTML = year_selector.value + month_selector.value;
+ for (var index = 0; index < 16; index++) {
+
+ // li.children[0].children[index].innerHTML = '<br />';
+ var currentYear = year + index;
+ //li.children[0].children[index].innerHTML= '<br />' + curretYear + '年';
+ li.children[0].children[index].innerHTML ='<span class="year_month_grid">'+ currentYear+ '年' + '</span>';
+ li.children[0].children[index].addEventListener('click', new_month_selected); // new year implies new month
+ }
} else {
div.className = 'hidden_div';
calendar.style.display = "";
--
2.27.0

107
0003-Modify-some-modules-translation-error.patch Normal file
View File

@ -0,0 +1,107 @@
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

14
ukui-panel.spec
View File

@ -2,11 +2,12 @@
Name: ukui-panel Name: ukui-panel
Version: 3.0.2 Version: 3.0.2
Release: 4 Release: 6
Summary: ukui desktop panel Summary: ukui desktop panel
License: LGPL-2.1+ GPL-2+ LGPL-3 License: LGPL-2.1+ GPL-2+ LGPL-3
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: ukui-panel_zh_CN.qm
BuildRequires: cmake BuildRequires: cmake
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -43,6 +44,8 @@ BuildRequires: libpeony-dev
Provides: ukui-indicators Provides: ukui-indicators
patch0: 0001-block-taskbar-right-click.patch 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 %description
The ukui desktop panel is used on ukui desktop and has some plugins like 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 %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch2 -p1
cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources
%build %build
mkdir build && cd build mkdir build && cd build
%{cmake3} .. %{cmake3} ..
@ -74,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/* %{_datadir}/*
%changelog %changelog
* Sat Sep 18 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.2-6
- Modify some modules translation error
* Wed Sep 08 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-5
- Fixes an issue with a year jump exception
* Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-4 * Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-4
- block taskbar right click - block taskbar right click

BIN
ukui-panel_zh_CN.qm Normal file
View File

Binary file not shown.