!37 修复kiran2.3-round1相关缺陷
From: @kylinsecos_admin Reviewed-by: @tangjie02 Signed-off-by: @tangjie02
This commit is contained in:
commit
ea66f50bbc
@ -0,0 +1,34 @@
|
|||||||
|
From 28c431b9323e2201498738fdffaa9a6d1fd562fd Mon Sep 17 00:00:00 2001
|
||||||
|
From: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||||
|
Date: Wed, 27 Jul 2022 19:38:42 +0800
|
||||||
|
Subject: [PATCH 1/2] fix(menu): Fix the problem that some apps are show
|
||||||
|
repeatly in start menu.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
- 修复app在开始菜单中重复显示问题
|
||||||
|
|
||||||
|
Closes #I5HT8G
|
||||||
|
|
||||||
|
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||||
|
---
|
||||||
|
lib/category.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/category.cpp b/lib/category.cpp
|
||||||
|
index 10cba91..7d7a9b6 100644
|
||||||
|
--- a/lib/category.cpp
|
||||||
|
+++ b/lib/category.cpp
|
||||||
|
@@ -18,7 +18,7 @@
|
||||||
|
|
||||||
|
namespace Kiran
|
||||||
|
{
|
||||||
|
-Category::Category(std::shared_ptr<CategoryNode> node) : repeat_(true),
|
||||||
|
+Category::Category(std::shared_ptr<CategoryNode> node) : repeat_(false),
|
||||||
|
node_(node)
|
||||||
|
{
|
||||||
|
if (node->get_type() != CategoryNodeType::CATEGORY_NODE_TYPE_CATEGORY)
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From 6ab073b0b84df6090368a320500b2c94438d6602 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||||
|
Date: Thu, 28 Jul 2022 11:10:22 +0800
|
||||||
|
Subject: [PATCH 2/2] fix(tray): Fix the problem that fcitx doesn't show in
|
||||||
|
tray area.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
- 修复fcitx没有在托盘区域中显示问题
|
||||||
|
|
||||||
|
Closes #I5HT13
|
||||||
|
|
||||||
|
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
|
||||||
|
---
|
||||||
|
src/tray/kiran-notify-icon.h | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/src/tray/kiran-notify-icon.h b/src/tray/kiran-notify-icon.h
|
||||||
|
index 02a5912..69b4f07 100644
|
||||||
|
--- a/src/tray/kiran-notify-icon.h
|
||||||
|
+++ b/src/tray/kiran-notify-icon.h
|
||||||
|
@@ -50,6 +50,7 @@ static const struct
|
||||||
|
{"Mate-volume-control-status-icon", "~02-volume", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
{"kiran-audio-status-icon", "~02-volume", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
{"ibus-ui-gtk", "~01-keyboard", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
+ {"Fcitx", "~01-keyboard", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
{"fcitx", "~01-keyboard", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
{"fcitx-qimpanel", "~01-keyboard", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
{"scim", "~01-keyboard", KIRAN_NOTIFY_ICON_CATEGORY_HARDWARE},
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,12 +1,14 @@
|
|||||||
Name: kiran-menu
|
Name: kiran-menu
|
||||||
Version: 2.3.0
|
Version: 2.3.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Applets for mate panel from Kiran Desktop
|
Summary: Applets for mate panel from Kiran Desktop
|
||||||
|
|
||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch1000: 0001-fix-menu-Fix-the-switch-user-error-by-xdmcp-logging.patch
|
Patch1000: 0001-fix-menu-Fix-the-switch-user-error-by-xdmcp-logging.patch
|
||||||
|
Patch1001: 0001-fix-menu-Fix-the-problem-that-some-apps-are-show-rep.patch
|
||||||
|
Patch1002: 0002-fix-tray-Fix-the-problem-that-fcitx-doesn-t-show-in-.patch
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: cmake > 3.0
|
BuildRequires: cmake > 3.0
|
||||||
@ -86,6 +88,10 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 28 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-4
|
||||||
|
- KYOS-B: Fix the problem that fcitx doesn't show in tray area.(#I5HT13)
|
||||||
|
- KYOS-B: Fix the problem that some apps are show repeatly in start menu.(#I5HT8G)
|
||||||
|
|
||||||
* Tue Jul 19 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-3
|
* Tue Jul 19 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-3
|
||||||
- KYOS-B: Fix the switch user error by xdmcp logging.(#57865)
|
- KYOS-B: Fix the switch user error by xdmcp logging.(#57865)
|
||||||
|
|
||||||
|
|||||||
4
kiran-menu.yaml
Normal file
4
kiran-menu.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: gitee
|
||||||
|
src_repo: https://gitee.com/openeuler/kiran-menu.git
|
||||||
|
tag_prefix: "v"
|
||||||
|
seperator: "."
|
||||||
Loading…
x
Reference in New Issue
Block a user