summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-02-12 15:08:58 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-02-12 15:42:34 +0900
commit6949aae9ce625d009008872fe4297638f12fe1ce (patch)
treec7678067288201f4644267f8cdb1b805bfbf955a
parentb5f293f9437b4af567248d6cfc269fe8a0216391 (diff)
downloadtdebase-6949aae9ce625d009008872fe4297638f12fe1ce.tar.gz
tdebase-6949aae9ce625d009008872fe4297638f12fe1ce.zip
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>
-rw-r--r--kcontrol/kicker/menutab.ui23
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp7
-rw-r--r--kicker/libkicker/kickerSettings.kcfg5
-rw-r--r--konqueror/konqueror.kcfg4
4 files changed, 28 insertions, 11 deletions
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 2614a278a..fa3868004 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -425,7 +425,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="TQLayoutWidget" row="1" column="0">
+ <widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>Layout3</cstring>
</property>
@@ -480,7 +480,21 @@
<string>If this option is enabled, hidden files (i.e. files beginning with a dot) will be shown in the QuickBrowser menus.</string>
</property>
</widget>
- <spacer row="0" column="1" rowspan="2" colspan="1">
+ <widget class="TQCheckBox" row="1" column="0">
+ <property name="name">
+ <cstring>kcfg_ShowOpenInTerminal</cstring>
+ </property>
+ <property name="text">
+ <string>Sho&amp;w open in terminal fi&amp;les</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>If this option is enabled, an Open in Terminal entry will be shown in the QuickBrowser menus.</string>
+ </property>
+ </widget>
+ <spacer row="0" column="1" rowspan="3" colspan="1">
<property name="name">
<cstring>Spacer7</cstring>
</property>
@@ -523,10 +537,10 @@
<cstring>m_maxRecentDocumentsItemsLabel</cstring>
</property>
<property name="text">
- <string>Ma&amp;ximum number of entries:</string>
+ <string>&amp;Maximum number of entries:</string>
</property>
<property name="buddy" stdset="0">
- <cstring>kcfg_MaxEntries2</cstring>
+ <cstring>maxrecentdocs</cstring>
</property>
<property name="whatsThis" stdset="0">
<string>This sets the maximum number of recently accessed documents stored for fast retrieval.</string>
@@ -723,6 +737,7 @@
<tabstop>m_editKMenuButton</tabstop>
<tabstop>m_subMenus</tabstop>
<tabstop>kcfg_ShowHiddenFiles</tabstop>
+ <tabstop>kcfg_ShowOpenInTerminal</tabstop>
<tabstop>kcfg_MaxEntries2</tabstop>
<tabstop>kcfg_RecentVsOften</tabstop>
<tabstop>m_showFrequent</tabstop>
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>
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index 9dfc91983..ec4728e03 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -602,7 +602,7 @@ PATH_JAVA
<entry key="ConfirmDelete" type="Bool">
<default>true</default>
<label>Ask confirmation for deleting a file.</label>
- <whatsthis></whatsthis>
+ <whatsthis>This option tells Konqueror whether to ask for a confirmation when you simply delete the file.</whatsthis>
<!-- checked -->
</entry>
<entry key="ConfirmTrash" type="Bool">
@@ -618,7 +618,7 @@ PATH_JAVA
<entry key="TerminalApplication" type="String">
<default>konsole</default>
<label></label>
- <whatsthis>This option tells Konqueror whether to ask for a confirmation when you simply delete the file.</whatsthis>
+ <whatsthis>Terminal application to use.</whatsthis>
<!-- checked -->
</entry>
</group>