packages/kiran-menu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!21 sync LTS-Next to LTS-SP3

Browse Source 
Merge pull request !21 from tangjie02/openEuler-20.03-LTS-SP3
This commit is contained in:
openeuler-ci-bot 2021-12-22 01:59:48 +00:00 committed by Gitee
commit d7d49cb798
3 changed files with 76 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch Normal file
View File

@ -0,0 +1,30 @@
From a9a2a59927d204f83efa9666272a88fbc6e91b92 Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Tue, 21 Dec 2021 20:01:41 +0800
Subject: [PATCH] feature(menu): Hide the search file tool on start menu.
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
src/menu/menu-applet-window.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/menu/menu-applet-window.cpp b/src/menu/menu-applet-window.cpp
index 89e0887..a89fc1b 100644
--- a/src/menu/menu-applet-window.cpp
+++ b/src/menu/menu-applet-window.cpp
@@ -629,10 +629,10 @@ void MenuAppletWindow::add_sidebar_buttons()
"mate-panel --run-dialog");
side_box->add(*launcher_btn);
- launcher_btn = create_launcher_button("/kiran-menu/sidebar/search-files",
+ /*launcher_btn = create_launcher_button("/kiran-menu/sidebar/search-files",
_("Search Files"),
"mate-search-tool");
- side_box->add(*launcher_btn);
+ side_box->add(*launcher_btn);*/
launcher_btn = create_launcher_button("/kiran-menu/sidebar/home-dir",
_("Home Directory"),
--
2.27.0

31
0002-feature-tray-Add-fcitx-to-bottom-panel.patch Normal file
View File

@ -0,0 +1,31 @@
From 9f8ff27ee3f8aa000fa005ccb6268ff1425a2033 Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Tue, 21 Dec 2021 21:40:58 +0800
Subject: [PATCH 2/2] feature(tray): Add fcitx to bottom panel.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 添加Fcitx到底部面板
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
data/com.kylinsec.kiran.tray.gschema.xml.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/com.kylinsec.kiran.tray.gschema.xml.in b/data/com.kylinsec.kiran.tray.gschema.xml.in
index 04c5163..d31bbfe 100644
--- a/data/com.kylinsec.kiran.tray.gschema.xml.in
+++ b/data/com.kylinsec.kiran.tray.gschema.xml.in
@@ -2,7 +2,7 @@
<schemalist>
<schema id="com.kylinsec.kiran.tray" path="/com/kylinsec/kiran/tray/">
<key name="panel-icon-ids" type="as">
- <default>['~01-keyboard', '~02-volume', '~04-network', '~05-battery', 'kiran-flameshot']</default>
+ <default>['~01-keyboard', '~02-volume', '~04-network', '~05-battery', 'kiran-flameshot', 'Fcitx']</default>
<summary>The notify icon which show in the panel</summary>
<description>The notify icon show which in the panel.</description>
</key>
--
2.27.0

20
kiran-menu.spec
View File

@ -1,11 +1,14 @@
Name: kiran-menu
Version: 2.2.5
Release: 8%{?dist}
Release: 10%{?dist}
Summary: Applets for mate panel from Kiran Desktop
License: Mulan PSL v2
Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch
Patch0002: 0002-feature-tray-Add-fcitx-to-bottom-panel.patch
BuildRequires: cmake > 3.0
BuildRequires: gcc-c++
@ -27,7 +30,6 @@ BuildRequires: kiran-panel-libs
BuildRequires: kiran-panel-devel
Requires: libwnck3
Requires: mate-screensaver
Requires: kiran-system-daemon
Requires: kiran-session-manager
Requires: glib2
@ -35,14 +37,16 @@ Requires: gtk-update-icon-cache
Requires: mate-control-center
Requires: caja
Requires: yelp
Requires: mate-system-monitor
%description
Redesigned start menu for Mate Desktop
%package -n kiran-applets
Summary: mate panel applets for Kiran Desktop
Obsoletes: kiran-menu >= 2.0
Requires: mate-screensaver
Requires: mate-system-monitor
Requires: mate-session-manager
Obsoletes: kiran-menu
%description -n kiran-applets
Redesigned panel applets for Mate Desktop
@ -81,6 +85,12 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
%changelog
* Wed Dec 22 2021 tangjie02 <tangjie02@kylinsec.com.cn> 2.2.5-10.ky3
- KYOS-F: Add Fcitx to bottom panel.
* Tue Dec 21 2021 tangjie02 <tangjie02@kylinsec.com.cn> 2.2.5-9.ky3
- KYOS-F: Hide the search file tool on start menu.
* Fri Dec 03 2021 tangjie02 <tangjie02@kylinsec.com.cn> 2.2.5-8.ky3
- KYOS-F: Modify the dependency mate-session-manager to kiran-session-manager.
@ -123,7 +133,7 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
* Tue Jul 20 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.3-5.ky3
- KYOS-B: Check whether system can shutdown when show power buttons.(#39572 #40713)
* Thu Jul 16 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 2.2.3-4.ky3.kb1
* Fri Jul 16 2021 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 2.2.3-4.ky3.kb1
- KYOS-B: add the About menu translator.(#39692)
* Wed Jul 14 2021 tangjie02 <tangjie02@kylinos.com.cn> 2.2.3-4.ky3