diff --git a/0001-block-taskbar-right-click.patch b/0001-block-taskbar-right-click.patch deleted file mode 100644 index a5a25e6..0000000 --- a/0001-block-taskbar-right-click.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6fac1af7e08ce92384035f29d19141e5c79aa141 Mon Sep 17 00:00:00 2001 -From: myshow <296570182@qq.com> -Date: Fri, 4 Dec 2020 17:52:24 +0800 -Subject: [PATCH] block-taskbar-right-click - ---- - plugin-taskbar/ukuitaskwidget.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugin-taskbar/ukuitaskwidget.cpp b/plugin-taskbar/ukuitaskwidget.cpp -index 2481fc4..b463f54 100644 ---- a/plugin-taskbar/ukuitaskwidget.cpp -+++ b/plugin-taskbar/ukuitaskwidget.cpp -@@ -358,6 +358,7 @@ void UKUITaskWidget::closeGroup() { - - void UKUITaskWidget::contextMenuEvent(QContextMenuEvent *event) - { -+ /* - QMenu * menu = new QMenu(tr("Widget")); - menu->setAttribute(Qt::WA_DeleteOnClose); - QAction *close = menu->addAction(QIcon::fromTheme("window-close-symbolic"), tr("close")); -@@ -377,6 +378,7 @@ void UKUITaskWidget::contextMenuEvent(QContextMenuEvent *event) - menu->setGeometry(plugin()->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint())); - plugin()->willShowWindow(menu); - menu->show(); -+ */ - } - /************************************************ - --- -2.29.2.windows.2 - diff --git a/0002-Fixes-an-issue-with-a-year-jump-exception.patch b/0002-Fixes-an-issue-with-a-year-jump-exception.patch deleted file mode 100644 index b9f2e8b..0000000 --- a/0002-Fixes-an-issue-with-a-year-jump-exception.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 181212c498f1971e577ed053e3c6615a6ffda5ab Mon Sep 17 00:00:00 2001 -From: tanyulong -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 = '
'; -+ var currentYear = year + index; -+ //li.children[0].children[index].innerHTML= '
' + curretYear + '年'; -+ li.children[0].children[index].innerHTML =''+ currentYear+ '年' + ''; -+ 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 = '
'; -+ var currentYear = year + index; -+ //li.children[0].children[index].innerHTML= '
' + curretYear + '年'; -+ li.children[0].children[index].innerHTML =''+ currentYear+ '年' + ''; -+ 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 = '
'; -+ var currentYear = year + index; -+ //li.children[0].children[index].innerHTML= '
' + curretYear + '年'; -+ li.children[0].children[index].innerHTML =''+ currentYear+ '年' + ''; -+ 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 = '
'; -+ var currentYear = year + index; -+ //li.children[0].children[index].innerHTML= '
' + curretYear + '年'; -+ li.children[0].children[index].innerHTML =''+ currentYear+ '年' + ''; -+ 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 = '
'; -+ var currentYear = year + index; -+ //li.children[0].children[index].innerHTML= '
' + curretYear + '年'; -+ li.children[0].children[index].innerHTML =''+ currentYear+ '年' + ''; -+ 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 = '
'; -+ var currentYear = year + index; -+ //li.children[0].children[index].innerHTML= '
' + curretYear + '年'; -+ li.children[0].children[index].innerHTML =''+ currentYear+ '年' + ''; -+ 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 - diff --git a/0003-Modify-some-modules-translation-error.patch b/0003-Modify-some-modules-translation-error.patch deleted file mode 100644 index 5f81463..0000000 --- a/0003-Modify-some-modules-translation-error.patch +++ /dev/null @@ -1,107 +0,0 @@ -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/0004-add-Storage-arrow-icon.patch b/0004-add-Storage-arrow-icon.patch deleted file mode 100644 index f6862d3..0000000 --- a/0004-add-Storage-arrow-icon.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 72e48c3df50c808ab1e5624d93a5dd048bd6df04 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Tue, 2 Nov 2021 17:46:47 +0800 -Subject: [PATCH] add Storage arrow icon - ---- - plugin-tray/storagearrow.cpp | 21 +++++++++++++++++++++ - plugin-tray/storagearrow.h | 15 +++++++++++++++ - 2 files changed, 36 insertions(+) - create mode 100644 plugin-tray/storagearrow.cpp - create mode 100644 plugin-tray/storagearrow.h - -diff --git a/plugin-tray/storagearrow.cpp b/plugin-tray/storagearrow.cpp -new file mode 100644 -index 0000000..32d65fe ---- /dev/null -+++ b/plugin-tray/storagearrow.cpp -@@ -0,0 +1,21 @@ -+#include "storagearrow.h" -+#include "../panel/customstyle.h" -+TrayButton::TrayButton(QWidget* parent): -+ QToolButton(parent) -+{ -+ setStyle(new CustomStyle()); -+ setIcon(QIcon("/usr/share/ukui-panel/panel/img/up.svg")); -+ setVisible(false); -+} -+ -+TrayButton::~TrayButton() { } -+ -+void TrayButton::enterEvent(QEvent *) { -+ repaint(); -+ return; -+} -+ -+void TrayButton::leaveEvent(QEvent *) { -+ repaint(); -+ return; -+} -diff --git a/plugin-tray/storagearrow.h b/plugin-tray/storagearrow.h -new file mode 100644 -index 0000000..9fbf92d ---- /dev/null -+++ b/plugin-tray/storagearrow.h -@@ -0,0 +1,15 @@ -+#ifndef STORAGEARROW_H -+#define STORAGEARROW_H -+ -+ -+//Qt -+#include -+class TrayButton : public QToolButton { -+ public : -+ TrayButton(QWidget* parent ); -+ ~TrayButton(); -+ protected : -+ void enterEvent(QEvent *); -+ void leaveEvent(QEvent *); -+}; -+#endif --- -2.30.0 - diff --git a/0005-Added-changelog-file-for-easy-viewing.patch b/0005-Added-changelog-file-for-easy-viewing.patch deleted file mode 100644 index d9d8221..0000000 --- a/0005-Added-changelog-file-for-easy-viewing.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 69c75cad494ac1cf7134995dab2f3638229ceff4 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Fri, 5 Nov 2021 09:40:50 +0800 -Subject: [PATCH] Added changelog file for easy viewing - ---- - doc/changlog.txt | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - create mode 100644 doc/changlog.txt - -diff --git a/doc/changlog.txt b/doc/changlog.txt -new file mode 100644 -index 0000000..9d8c824 ---- /dev/null -+++ b/doc/changlog.txt -@@ -0,0 +1,23 @@ -+ukui-panel (3.0.1-42) v101; urgency=medium -+ -+ * 更新任务栏高分屏适配代码 Link#28059 -+ 提供给输入法显示toolTips的相关接口 Link #20236 -+ 点击快速启动栏打开应用改为gio的方式加载 Link #24172 -+ 解决任务栏注释出现的段错误问题 Link #29586 -+ -+ -- hepuyao Thu, 24 Dec 2020 15:10:02 +0800 -+ -+ukui-panel (3.0.1-40~1224) v101; urgency=medium -+ -+ * 解决u盘图标不消失的问题 -+ -+ -- hepuyao Fri, 11 Dec 2020 13:49:52 +0800 -+ -+ukui-panel (3.0.1-39) v101; urgency=medium -+ -+ * 任务栏判断配置文件异常 -+ 解决翻译文件“睡眠”和“休眠”统一 #27572 -+ 任务栏托盘图标高亮逻辑优化 #22328 -+ 修改判断右键是否需要添加系统监视器的接口 -+ -+ -- hepuyao Thu, 10 Dec 2020 20:25:05 +0800 --- -2.30.0 - diff --git a/ukui-panel-3.0.2.tar.gz b/ukui-panel-3.0.2.tar.gz index ebafc98..deaf397 100644 Binary files a/ukui-panel-3.0.2.tar.gz and b/ukui-panel-3.0.2.tar.gz differ diff --git a/ukui-panel.spec b/ukui-panel.spec index def07ac..74e4598 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -2,7 +2,7 @@ Name: ukui-panel Version: 3.0.2 -Release: 10 +Release: 11 Summary: ukui desktop panel License: LGPL-2.1+ GPL-2+ LGPL-3 URL: http://www.ukui.org @@ -40,14 +40,10 @@ BuildRequires: poppler-qt5-devel BuildRequires: libpeony-dev BuildRequires: dconf-devel BuildRequires: libpeony-dev +BuildRequires: xcb-util-image-devel 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 -patch3: 0004-add-Storage-arrow-icon.patch -patch4: 0005-Added-changelog-file-for-easy-viewing.patch %description The ukui desktop panel is used on ukui desktop and has some plugins like @@ -56,11 +52,6 @@ patch4: 0005-Added-changelog-file-for-easy-viewing.patch %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources %build @@ -84,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog +* Wed Apr 06 2022 huayadong - 3.0.2-11 +- 优化预览窗口缩放机制和显示机制，为美观和显示比例考虑，减少最大窗口数从13减少为10个，解决单个小窗口缩放不协调的问题，解决窗口数过多时的图片缩放比例显示问题 + * Sat Apr 02 2022 tanyulong - 3.0.2-10 - add yaml file