[Krusader-commits] SF.net SVN: krusader:[6067] trunk/krusader_kde4

[<ck...@us...>]

Revision: 6067
          http://krusader.svn.sourceforge.net/krusader/?rev=6067&view=rev
Author:   ckarai
Date:     2008-08-20 21:33:13 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
FIXED: [ 1988893 ] konsole is started in a wrong directory

Modified Paths:
--------------
    trunk/krusader_kde4/ChangeLog
    trunk/krusader_kde4/krusader/defaults.h
    trunk/krusader_kde4/krusader/krslots.cpp

Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog	2008-08-20 20:10:18 UTC (rev 6066)
+++ trunk/krusader_kde4/ChangeLog	2008-08-20 21:33:13 UTC (rev 6067)
@@ -7,6 +7,9 @@
      ARCH: QuickSearch is moved to KrView from Detailed/Brief views
      ARCH: Keyboard handling is moved to KrView from Detailed/Brief views
 
+    FIXED: [ 1988893 ] konsole is started in a wrong directory
+           please set "konsole --workdir %d" for the terminal (Konfigurator)
+           as Krusader won't fix your config automatically
     FIXED: KDE4 workaround: no colors for synchronizer
     FIXED: MediaButton doesn't notice unmounted pen drives+CD/DVD-s
     FIXED: "local network" bookmark didn't work

Modified: trunk/krusader_kde4/krusader/defaults.h
===================================================================
--- trunk/krusader_kde4/krusader/defaults.h	2008-08-20 20:10:18 UTC (rev 6066)
+++ trunk/krusader_kde4/krusader/defaults.h	2008-08-20 21:33:13 UTC (rev 6067)
@@ -126,7 +126,7 @@
 // Move To Trash //////
 #define _MoveToTrash   false 
 // Terminal ///////////
-#define _Terminal      "konsole --workdir ."
+#define _Terminal      "konsole --workdir %d"
 // Send CDs ///////////
 #define _SendCDs		true
 // Editor /////////////

Modified: trunk/krusader_kde4/krusader/krslots.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krslots.cpp	2008-08-20 20:10:18 UTC (rev 6066)
+++ trunk/krusader_kde4/krusader/krslots.cpp	2008-08-20 21:33:13 UTC (rev 6067)
@@ -478,7 +478,11 @@
   proc.setWorkingDirectory( dir );
   KConfigGroup group( krConfig, "General");
   QString term = group.readEntry("Terminal",_Terminal);
-  proc << KrServices::separateArgs( term );
+  QStringList sepdArgs = KrServices::separateArgs( term );
+  for( int i=0; i != sepdArgs.size(); i++ )
+    if( sepdArgs[ i ] == "%d" )
+      sepdArgs[ i ] = dir;
+  proc << sepdArgs;
   if( !args.isEmpty() )
   {
     proc << "-e" << args; // FIXME this depends on term!! But works in konsole, xterm and gnome-terminal


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.