diff --git a/0001-Optimize-Chinese-search.patch b/0001-Optimize-Chinese-search.patch new file mode 100644 index 0000000..d9a32c0 --- /dev/null +++ b/0001-Optimize-Chinese-search.patch @@ -0,0 +1,1369 @@ +From d999be87fa344c08b807560a86418bf42642a1d7 Mon Sep 17 00:00:00 2001 +From: huayadong +Date: Tue, 7 Dec 2021 20:24:59 +0800 +Subject: [PATCH] Optimize Chinese search + +--- + debian/changelog | 6 - + debian/source/format | 2 +- + src/RightClickMenu/rightclickmenu.cpp | 40 +--- + translations/ukui-menu_bo.ts | 261 +++++++++++++++++++------- + translations/ukui-menu_tr.ts | 134 ++++++------- + translations/ukui-menu_zh_CN.ts | 134 ++++++------- + 6 files changed, 315 insertions(+), 262 deletions(-) + mode change 100755 => 100644 debian/changelog + mode change 100755 => 100644 debian/source/format + mode change 100755 => 100644 src/RightClickMenu/rightclickmenu.cpp + mode change 100755 => 100644 translations/ukui-menu_bo.ts + mode change 100755 => 100644 translations/ukui-menu_tr.ts + mode change 100755 => 100644 translations/ukui-menu_zh_CN.ts + +diff --git a/debian/changelog b/debian/changelog +old mode 100755 +new mode 100644 +index 7cbf270..c27fafc +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,9 +1,3 @@ +-ukui-menu (3.0.1-1+1026) focal; urgency=medium +- +- * Daily build. +- +- -- liuliang Mon, 27 May 2019 15:48:18 +0800 +- + ukui-menu (3.0.1-1) unstable; urgency=medium + + * New upstream bugfix release. +diff --git a/debian/source/format b/debian/source/format +old mode 100755 +new mode 100644 +index 89ae9db..163aaf8 +--- a/debian/source/format ++++ b/debian/source/format +@@ -1 +1 @@ +-3.0 (native) ++3.0 (quilt) +diff --git a/src/RightClickMenu/rightclickmenu.cpp b/src/RightClickMenu/rightclickmenu.cpp +old mode 100755 +new mode 100644 +index ab62848..657842b +--- a/src/RightClickMenu/rightclickmenu.cpp ++++ b/src/RightClickMenu/rightclickmenu.cpp +@@ -19,8 +19,6 @@ + #include "rightclickmenu.h" + #include "src/UtilityFunction/utility.h" + #include +-#include +-#include + + RightClickMenu::RightClickMenu(QWidget *parent): + QWidget(parent) +@@ -178,9 +176,7 @@ void RightClickMenu::addToDesktopActionTriggerSlot() + + void RightClickMenu::uninstallActionTriggerSlot() + { +- //QString cmd=QString("dpkg -S "+m_desktopfp); +- //on openEuler or fedora +- QString cmd=QString("rpm -qf "+m_desktopfp); ++ QString cmd=QString("dpkg -S "+m_desktopfp); + m_cmdProc->setReadChannel(QProcess::StandardOutput); + m_cmdProc->start("sh",QStringList()<<"-c"<waitForFinished(); +@@ -194,37 +190,9 @@ void RightClickMenu::onReadOutput() + QString packagestr=QString::fromLocal8Bit(m_cmdProc->readAllStandardOutput().data()); + QString packageName=packagestr.split(":").at(0); + // qDebug()<parent(),&event); ++ char command[100]; ++ sprintf(command,"kylin-installer -remove %s",packageName.toLocal8Bit().data()); ++ QProcess::startDetached(command); + } + + void RightClickMenu::attributeActionTriggerSlot() +diff --git a/translations/ukui-menu_bo.ts b/translations/ukui-menu_bo.ts +old mode 100755 +new mode 100644 +index 61d472c..7e9676c +--- a/translations/ukui-menu_bo.ts ++++ b/translations/ukui-menu_bo.ts +@@ -2,301 +2,416 @@ + + + +- FunctionClassifyButton ++ CommonUseWidget + +- +- Mobile ++ ++ Form ++ ++ ++ ++ ++ FullCommonUseWidget ++ ++ ++ Form ++ ++ ++ ++ ++ FullFunctionWidget ++ ++ ++ Form ++ ++ ++ ++ ++ ++ Android + + + +- ++ ++ + Internet + + + +- ++ ++ + Social + + + +- ++ ++ + Video + + + +- ++ ++ + Development + + + +- ++ ++ + Image + + + +- ++ ++ + Game + + + +- ++ ++ + Office + + + +- ++ ++ + Education + + + +- ++ ++ + System + + + +- ++ ++ + Others + + + + +- FunctionWidget ++ FullLetterWidget + +- +- Mobile ++ ++ Form + + ++ ++ ++ FullSearchResultWidget + +- ++ ++ Form ++ ++ ++ ++ ++ FunctionButtonWidget ++ ++ ++ Form ++ ++ ++ ++ ++ Android ++ ++ ++ ++ + Internet + + + +- ++ + Social + + + +- ++ + Video + + + +- ++ + Development + + + +- ++ + Image + + + +- ++ + Game + + + +- ++ + Office + + + +- ++ + Education + + + +- ++ + System + + + +- ++ + Others + + + + +- MainViewWidget ++ FunctionWidget + +- +- Search ++ ++ Form + + +- +- +- PushButton + +- +- Mobile ++ ++ ++ Android + + + +- ++ ++ + Internet + + + +- ++ ++ + Social + + + +- ++ ++ + Video + + + +- ++ ++ + Development + + + +- ++ ++ + Image + + + +- ++ ++ + Game + + + +- ++ ++ + Office + + + +- ++ ++ + Education + + + +- ++ ++ + System + + + +- ++ ++ + Others + + + + +- RightClickMenu ++ LetterButtonWidget + +- +- infomation ++ ++ Form + + ++ ++ ++ LetterWidget + +- +- Uninstall finished! ++ ++ Form + + ++ ++ ++ MainViewWidget ++ ++ ++ Form ++ ++ ++ ++ ++ Search ++ ++ ++ ++ ++ MainWindow + +- +- error ++ ++ MainWindow + + ++ ++ ++ RightClickMenu + +- ++ ++ + Pin to all + + + +- ++ ++ + Unpin from all + + + +- +- ++ ++ ++ + Pin to taskbar + + + +- +- ++ ++ ++ + Unpin from taskbar + + + +- ++ ++ + Add to desktop shortcuts + + + +- ++ ++ + Uninstall + + + +- +- Sleep ++ ++ Lock Screen + + + +- ++ ++ Switch User ++ ++ ++ ++ + Log Out + + + +- ++ + Restart + + + +- ++ + Power Off + + + +- ++ + Personalize this list + + + ++ ++ SearchResultWidget ++ ++ ++ Form ++ ++ ++ + + SideBarWidget + +- ++ ++ Form ++ ++ ++ ++ ++ + All + + + +- ++ ++ + Letter + + + +- ++ ++ + Function + + + +- ++ ++ + Computer + + + +- ++ ++ + Personal + + + +- ++ ++ + Settings + + + +- ++ ++ + Recycle Bin + + + +- ++ ++ + Power + + +diff --git a/translations/ukui-menu_tr.ts b/translations/ukui-menu_tr.ts +old mode 100755 +new mode 100644 +index 3fd8b62..5ae00ce +--- a/translations/ukui-menu_tr.ts ++++ b/translations/ukui-menu_tr.ts +@@ -4,57 +4,57 @@ + + FunctionClassifyButton + +- ++ + Mobile + Mobil + + +- ++ + Internet + İnternet + + +- ++ + Social + Sosyal + + +- ++ + Video + Video + + +- ++ + Development + Programlama + + +- ++ + Image + Grafik + + +- ++ + Game + Oyunlar + + +- ++ + Office + Ofis Uygulamaları + + +- ++ + Education + Eğitim + + +- ++ + System + Sistem + + +- ++ + Others + Diğer + +@@ -62,57 +62,57 @@ + + FunctionWidget + +- ++ + Mobile + Mobil + + +- ++ + Internet + İnternet + + +- ++ + Social + Sosyal + + +- ++ + Video + Video + + +- ++ + Development + Programlama + + +- ++ + Image + Grafik + + +- ++ + Game + Oyunlar + + +- ++ + Office + Ofis Uygulamaları + + +- ++ + Education + Eğitim + + +- ++ + System + Sistem + + +- ++ + Others + Diğer + +@@ -120,7 +120,7 @@ + + MainViewWidget + +- ++ + Search + Ara + +@@ -128,57 +128,57 @@ + + PushButton + +- ++ + Mobile + Mobil + + +- ++ + Internet + İnternet + + +- ++ + Social + Sosyal + + +- ++ + Video + Video + + +- ++ + Development + Programlama + + +- ++ + Image + Grafik + + +- ++ + Game + Oyunlar + + +- ++ + Office + Ofis Uygulamaları + + +- ++ + Education + Eğitim + + +- ++ + System + Sistem + + +- ++ + Others + Diğer + +@@ -186,86 +186,74 @@ + + RightClickMenu + +- +- infomation +- +- +- +- +- Uninstall finished! +- +- +- +- +- error +- +- +- +- ++ + Pin to all + Tümünü sabitle + + +- ++ + Unpin from all + Tüm sabitlemeleri kaldır + + +- +- ++ ++ + Pin to taskbar + Görev çubuğuna sabitle + + +- +- ++ ++ + Unpin from taskbar + Görev çubuğundan sabitlemeyi kaldır + + +- ++ + Add to desktop shortcuts + Masaüstü kısayollarına ekle + + +- ++ + Uninstall + Kaldır + + ++ + Hibernate +- Beklemeye Al ++ Beklemeye Al + + +- ++ + Sleep + Uyku Modu + + ++ + Lock Screen +- Ekranı Kilitle ++ Ekranı Kilitle + + ++ + Switch User +- Kullanıcı Değiştir ++ Kullanıcı Değiştir + + +- ++ + Log Out + Çıkış + + +- ++ + Restart + Yeniden Başlat + + +- ++ + Power Off + Kapat + + +- ++ + Personalize this list + Bu listeyi özelleştirin + +@@ -273,42 +261,42 @@ + + SideBarWidget + +- ++ + All + Tümü + + +- ++ + Letter + Alfabetik + + +- ++ + Function + Kategori + + +- ++ + Computer + Bilgisayar + + +- ++ + Personal + Kişisel + + +- ++ + Settings + Ayarlar + + +- ++ + Recycle Bin + Çöp + + +- ++ + Power + Kapat + +diff --git a/translations/ukui-menu_zh_CN.ts b/translations/ukui-menu_zh_CN.ts +old mode 100755 +new mode 100644 +index baa1a18..fc6a4d6 +--- a/translations/ukui-menu_zh_CN.ts ++++ b/translations/ukui-menu_zh_CN.ts +@@ -4,57 +4,57 @@ + + FunctionClassifyButton + +- ++ + Mobile + 移动 + + +- ++ + Internet + 网络 + + +- ++ + Social + 社交 + + +- ++ + Video + 影音 + + +- ++ + Development + 开发 + + +- ++ + Image + 图像 + + +- ++ + Game + 游戏 + + +- ++ + Office + 办公 + + +- ++ + Education + 教育 + + +- ++ + System + 系统 + + +- ++ + Others + 其它 + +@@ -62,57 +62,57 @@ + + FunctionWidget + +- ++ + Mobile + 移动 + + +- ++ + Internet + 网络 + + +- ++ + Social + 社交 + + +- ++ + Video + 影音 + + +- ++ + Development + 开发 + + +- ++ + Image + 图像 + + +- ++ + Game + 游戏 + + +- ++ + Office + 办公 + + +- ++ + Education + 教育 + + +- ++ + System + 系统 + + +- ++ + Others + 其它 + +@@ -120,7 +120,7 @@ + + MainViewWidget + +- ++ + Search + 搜索 + +@@ -128,57 +128,57 @@ + + PushButton + +- ++ + Mobile + 移动 + + +- ++ + Internet + 网络 + + +- ++ + Social + 社交 + + +- ++ + Video + 影音 + + +- ++ + Development + 开发 + + +- ++ + Image + 图像 + + +- ++ + Game + 游戏 + + +- ++ + Office + 办公 + + +- ++ + Education + 教育 + + +- ++ + System + 系统 + + +- ++ + Others + 其它 + +@@ -186,86 +186,74 @@ + + RightClickMenu + +- +- infomation +- 提示 +- +- +- +- Uninstall finished! +- 卸载成功! +- +- +- +- error +- 错误 +- +- +- ++ + Pin to all + 固定到“所有软件” + + +- ++ + Unpin from all + 从“所有软件”取消固定 + + +- +- ++ ++ + Pin to taskbar + 固定到任务栏 + + +- +- ++ ++ + Unpin from taskbar + 从任务栏取消固定 + + +- ++ + Add to desktop shortcuts + 添加到桌面快捷方式 + + +- ++ + Uninstall + 卸载 + + ++ + Hibernate +- 休眠 ++ 休眠 + + +- ++ + Sleep + 睡眠 + + ++ + Lock Screen +- 锁屏 ++ 锁屏 + + ++ + Switch User +- 切换用户 ++ 切换用户 + + +- ++ + Log Out + 注销 + + +- ++ + Restart + 重启 + + +- ++ + Power Off + 关机 + + +- ++ + Personalize this list + 设置开始菜单显示列表 + +@@ -273,42 +261,42 @@ + + SideBarWidget + +- ++ + All + 所有软件 + + +- ++ + Letter + 字母排序 + + +- ++ + Function + 功能分类 + + +- ++ + Computer + 计算机 + + +- ++ + Personal + 个人 + + +- ++ + Settings + 设置 + + +- ++ + Recycle Bin + 回收站 + + +- ++ + Power + 电源 + +-- +2.30.0 + diff --git a/ukui-menu.spec b/ukui-menu.spec index dba88fd..53e3f5d 100644 --- a/ukui-menu.spec +++ b/ukui-menu.spec @@ -2,7 +2,7 @@ Name: ukui-menu Version: 3.0.2 -Release: 2 +Release: 3 Summary: Advanced ukui menu License: GPL-3.0 URL: http://www.ukui.org @@ -29,6 +29,7 @@ Requires: libX11 Requires: accountsservice patch0: 0001-fix-uninstall-failed-issue.patch +patch1: 0001-Optimize-Chinese-search.patch #BuildArch: noarch @@ -41,6 +42,7 @@ patch0: 0001-fix-uninstall-failed-issue.patch %prep %setup -q %patch0 -p1 +%patch1 -p1 %build mkdir build && cd build @@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-menu/translations/ %changelog +* Tue Dec 07 2021 huayadong - 3.0.2-3 +- add patch: 0001-Optimize-Chinese-search.patch + * Mon Oct 26 2020 douyan - 3.0.2-2 - fix uninstalled failed issue