Browse Source

Fixed handling of alternative terminal application in MiniCli.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8b269b0658)
pull/182/head
Michele Calgaro 2 years ago
parent
commit
a5ebc87c94
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 10
      kdesktop/kdesktop.kcfg
  2. 4
      kdesktop/minicli.cpp

10
kdesktop/kdesktop.kcfg

@ -69,6 +69,11 @@
<!-- krootwm.cc:496 -->
<!-- config->writeEntry( "SortDirectoriesFirst", b ); -->
</entry>
<entry key="TerminalApplication" type="Path">
<default>konsole</default>
<label>Terminal application</label>
<whatsthis>Defines which terminal application is used.</whatsthis>
</entry>
</group>
<group name="Mouse Buttons">
<entry key="WheelSwitchesWorkspace" type="Bool">
@ -83,11 +88,6 @@
<!-- desktop.cc:397 -->
<!-- (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
</entry>
<entry key="TerminalApplication" type="Path">
<default>konsole</default>
<label>Terminal application</label>
<whatsthis>Defines which terminal application is used.</whatsthis>
</entry>
<entry key="Left" type="String">
<default></default>
<label>Left Mouse Button Action</label>

4
kdesktop/minicli.cpp

@ -385,10 +385,10 @@ void Minicli::keyPressEvent( TQKeyEvent* e )
TQDialog::keyPressEvent( e );
}
TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
TQString Minicli::terminalCommand(const TQString& cmd, const TQString& args)
{
TQString terminal = KDesktopSettings::terminalApplication().stripWhiteSpace();
if (terminal.endsWith("konsole"))
if (terminal.startsWith("konsole"))
terminal += " --noclose";
if( args.isEmpty() )

Loading…
Cancel
Save