From 0a110bd9420cab58b0fc717ddd2dfa48fbd95ee3 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Fri, 21 Jul 2023 10:03:00 +0800
Subject: [PATCH] Fix-the-failure-of-shortcut-key-to-open-terminal

(cherry picked from commit 71fda3e60a59127bc047aa148c997168e0dbe17e)
---
 ...ure-of-shortcut-key-to-open-terminal.patch | 29 +++++++++++++++++++
 ukui-settings-daemon.spec                     | 10 ++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 Fix-the-failure-of-shortcut-key-to-open-terminal.patch

diff --git a/Fix-the-failure-of-shortcut-key-to-open-terminal.patch b/Fix-the-failure-of-shortcut-key-to-open-terminal.patch
new file mode 100644
index 0000000..9383643
--- /dev/null
+++ b/Fix-the-failure-of-shortcut-key-to-open-terminal.patch
@@ -0,0 +1,29 @@
+From 02b63ef64da86153c93e96b59ab55c95b0167ffd Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Sun, 25 Jun 2023 15:57:27 +0900
+Subject: [PATCH] Fix the failure of shortcut key to open terminal
+
+---
+ plugins/media-keys/mediakey-manager.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/plugins/media-keys/mediakey-manager.cpp b/plugins/media-keys/mediakey-manager.cpp
+index 99f66b6..deca341 100644
+--- a/plugins/media-keys/mediakey-manager.cpp
++++ b/plugins/media-keys/mediakey-manager.cpp
+@@ -2165,11 +2165,7 @@ void MediaKeysManager::doOnScreenKeyboardAction()
+ 
+ void MediaKeysManager::doOpenTerminalAction()
+ {
+-    if(UsdBaseClass::isTablet()) {
+-        executeCommand("mate-terminal","");
+-    } else {
+-        executeCommand("x-terminal-emulator","");
+-    }
++    executeCommand("mate-terminal","");
+ }
+ 
+ void MediaKeysManager::doScreenshotAction(const QString pramater)
+-- 
+2.33.0
+
diff --git a/ukui-settings-daemon.spec b/ukui-settings-daemon.spec
index 55435ca..871b67c 100644
--- a/ukui-settings-daemon.spec
+++ b/ukui-settings-daemon.spec
@@ -1,11 +1,12 @@
 Name:           ukui-settings-daemon
 Version:        3.1.2
-Release:        3
+Release:        4
 Summary:        daemon handling the UKUI session settings
 License:        GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later 
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 Patch1:         0001-modify-compile-error-of-ukui-settings-daemon.patch
+Patch2:         Fix-the-failure-of-shortcut-key-to-open-terminal.patch
 
 BuildRequires: pkgconf-pkg-config 
 BuildRequires: intltool 
@@ -86,6 +87,7 @@ Summary:	daemon handling the UKUI session settings (common files)
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{qmake_qt5}
@@ -131,6 +133,12 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
 
 
 %changelog
+* Sun Jun 25 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: add Fix-the-failure-of-shortcut-key-to-open-terminal.patch
+
 * Wed Jan 18 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
 - add build debuginfo and debugsource