From 4dae99718cca38c24d592492b0d6e55d64bee12c Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 12 Feb 2020 15:08:58 +0900
Subject: Added GUI option to show/hide "Open in Terminal" inside QuickBrowser
 menus. Minor fixup for other GUI options in "Configure Panel... -> Menus".

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 6949aae9ce625d009008872fe4297638f12fe1ce)
---
 kicker/kicker/ui/browser_mnu.cpp     | 7 ++-----
 kicker/libkicker/kickerSettings.kcfg | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'kicker')

diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index b4d1b11ed..9b629e165 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -152,7 +152,7 @@ void PanelBrowserMenu::initialize()
        TDEConfig *c = TDEGlobal::config();
        c->setGroup("menus");
        insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager()));
-	if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false)) 
+	if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
 	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal()));
     	insertSeparator();
     }
@@ -455,10 +455,7 @@ void PanelBrowserMenu::slotOpenTerminal()
 
     TDEProcess proc;
     proc << term;
-    if (term == "konsole")
-      proc << "--workdir" << path();
-    else
-      proc.setWorkingDirectory(path());
+    proc.setWorkingDirectory(path());
     proc.start(TDEProcess::DontCare);
 }
 
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 0abc51bf0..5ab6880aa 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -227,6 +227,11 @@
       <default>false</default>
    </entry>
 
+<entry name="ShowOpenInTerminal" type="Bool" >
+      <label>Show Open in Terminal entry in Quick Browser</label>
+      <default>true</default>
+   </entry>
+
 <entry name="MaxEntries2" type="UInt" >
       <label>Maximum number of entries</label>
       <default>30</default>
-- 
cgit v1.2.1