packages/marco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 remove patch

Browse Source 
From: @longcheng01 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
This commit is contained in:
openeuler-ci-bot 2022-08-12 02:21:05 +00:00 committed by Gitee
commit 60449fea04
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0003-add-kiran-flameshot-super-key-ce015032.patch
View File

@ -1,40 +0,0 @@
From ce01503237138704e94b9f51be135675f841c3fd Mon Sep 17 00:00:00 2001
From: longcheng <longcheng@kylinos.com.cn>
Date: Thu, 24 Mar 2022 18:59:42 +0800
Subject: [PATCH 3/5] add kiran-flameshot super key
---
src/org.mate.marco.gschema.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
index 5716af3..57c286a 100644
--- a/src/org.mate.marco.gschema.xml
+++ b/src/org.mate.marco.gschema.xml
@@ -618,7 +618,7 @@
<description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
</key>
<key name="run-command-screenshot" type="s">
- <default>'Print'</default>
+ <default>'&lt;Control&gt;&lt;Alt&gt;A'</default>
<summary>Take a screenshot</summary>
<description>The format looks like "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If you set the option to the special string "disabled", then there will be no keybinding for this action.</description>
</key>
@@ -701,12 +701,12 @@
<description>The /apps/marco/global_keybindings/run_command_N keys define keybindings that correspond to these commands. Pressing the keybinding for run_command_N will execute command_N.</description>
</key>
<key name="command-screenshot" type="s">
- <default>'mate-screenshot'</default>
+ <default>'kiran-flameshot gui'</default>
<summary>The screenshot command</summary>
<description>The /apps/marco/global_keybindings/run_command_screenshot key defines a keybinding which causes the command specified by this setting to be invoked.</description>
</key>
<key name="command-window-screenshot" type="s">
- <default>'mate-screenshot --window'</default>
+ <default>'kiranflameshot screen'</default>
<summary>The window screenshot command</summary>
<description>The /apps/marco/global_keybindings/run_command_window_screenshot key defines a keybinding which causes the command specified by this setting to be invoked.</description>
</key>
--
2.27.0

2
marco.spec
View File

@ -32,7 +32,6 @@ URL: http://mate-desktop.org
Patch0: 0000-change-workspace-titlebar-and-font-and-composite-49944cb7.patch
Patch1: 0001-fix-disabled-Alt-F1-to-popop-mate-menu-b638cc7c.patch
Patch2: 0002-feature-menu-pop-up-start-menu-when-press-super-key-bf212ac7.patch
Patch3: 0003-add-kiran-flameshot-super-key-ce015032.patch
BuildRequires: desktop-file-utils
BuildRequires: gtk3-devel
@ -154,7 +153,6 @@ desktop-file-install \
- KYOS-F: changed number of workspace to 2; set marco compositor to 0; changed title-bar font to 'Noto Sans CJK SC Regular'
- KYOS-F: fix: disabled Alt+F1 to popop mate menu Related #28275
- KYOS-F: pop up start menu when press super key, Related #28467
- KYOS-F: Change the mate-screenshot shortcut key to kiran-flameshot shortcut key, Related #29575
* Thu Mar 24 2022 caodongxia <caodongxia@huawei.com> - 1.22.3-3
- restore else branch release