!31 更新到2.3版本

From: @kylinsecos_admin 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-07-08 10:02:35 +00:00 committed by Gitee
commit aac1b62dd8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 8 additions and 125 deletions

View File

@ -1,35 +0,0 @@
From 80277a6d3742c478932bd23ac2ab58efdd2490d8 Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Thu, 3 Mar 2022 10:13:06 +0800
Subject: [PATCH] feature(menu): Hide the search file tool on start menu.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 隐藏开始菜单中的搜索文件按钮
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 2c96254..1266b2d 100644
--- a/src/menu/menu-applet-window.cpp
+++ b/src/menu/menu-applet-window.cpp
@@ -655,10 +655,10 @@ void MenuAppletWindow::add_sidebar_buttons()
"mate-panel --run-dialog");
side_box->add(*launcher_btn);
- launcher_btn = create_launcher_button("kiran-menu-search-files-symbolic",
+ /*launcher_btn = create_launcher_button("kiran-menu-search-files-symbolic",
_("Search Files"),
"mate-search-tool");
- side_box->add(*launcher_btn);
+ side_box->add(*launcher_btn);*/
launcher_btn = create_launcher_button("kiran-menu-home-dir-symbolic",
_("Home Directory"),
--
2.18.1

View File

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

Binary file not shown.

BIN
kiran-menu-2.3.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,16 +1,12 @@
Name: kiran-menu
Version: 2.2.6
Release: 7
Version: 2.3.0
Release: 1
Summary: Applets for mate panel from Kiran Desktop
License: Mulan PSL v2
Source0: %{name}-%{version}.tar.gz
Patch1000: 0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch
Patch1001: 0002-feature-tray-Add-fcitx-to-bottom-panel.patch
BuildRequires: cmake > 3.0
BuildRequires: gcc-c++
BuildRequires: gtkmm30-devel
@ -56,7 +52,7 @@ Redesigned panel applets for Mate Desktop
%autosetup -p1
%build
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_WITH_KIRANACCOUNTS:BOOL=ON -DKIRAN_DESKTOP:BOOL=TRUE
%cmake -DBUILD_SHARED_LIBS:BOOL=OFF
make %{?_smp_mflags}
@ -79,6 +75,8 @@ make install DESTDIR=%{buildroot}
%{_datadir}/kiran-applet/menu-menu.ui.xml
%{_datadir}/kiran-applet/tasklist-menu.ui.xml
%{_datadir}/kiran-applet/workspace-switcher-menu.ui.xml
%{_includedir}/kiran-applet/tray-i.h
%{_libdir}/pkgconfig/kiran-applet.pc
%post -n kiran-applets
glib-compile-schemas /usr/share/glib-2.0/schemas/
@ -86,6 +84,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
%changelog
* Fri Jul 08 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.3.0-1
- KYOS-F: Update to version 2.3 and adapt new control panel.
* Wed Mar 09 2022 tangjie02 <tangjie02@kylinsec.com.cn> - 2.2.6-7
- KYOS-F: Add fcitx to bottom panel.

View File

@ -1,52 +0,0 @@
<svg id="多任务预览icon" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
<metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""/>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?></metadata>
<defs>
<style>
.cls-1 {
fill: url(#linear-gradient);
}
.cls-2 {
fill: #9be2e6;
}
.cls-3 {
fill: #fff;
}
</style>
<linearGradient id="linear-gradient" x1="12" y1="24" x2="12" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#24a7a3"/>
<stop offset="1" stop-color="#63d5b1"/>
</linearGradient>
</defs>
<rect id="矩形_1" data-name="矩形 1" class="cls-1" width="24" height="24" rx="6" ry="6"/>
<rect id="矩形_2_拷贝_2" data-name="矩形 2 拷贝 2" class="cls-2" x="8" y="6" width="12" height="8"/>
<rect id="矩形_2_拷贝_3" data-name="矩形 2 拷贝 3" class="cls-3" x="4" y="10" width="12" height="8"/>
</svg>

Before

Width:  |  Height:  |  Size: 3.2 KiB