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

[<jb...@us...>]

Revision: 2680
          http://krusader.svn.sourceforge.net/krusader/?rev=2680&view=rev
Author:   jbaehr
Date:     2008-01-27 16:06:41 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
K3Process -> KProcess: Panel

Modified Paths:
--------------
    trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp
    trunk/krusader_kde4/krusader/Panel/panelfunc.cpp

Modified: trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp	2008-01-27 21:44:41 UTC (rev 2679)
+++ trunk/krusader_kde4/krusader/Panel/krpopupmenu.cpp	2008-01-28 00:06:41 UTC (rev 2680)
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <k3process.h>
+#include <kprocess.h>
 #include <krun.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -339,23 +339,25 @@
          	}
          	break;
          case OPEN_TERM_ID :
-         	QString save = getcwd( 0, 0 );
-         	chdir( panel->func->files() ->vfs_getFile( item->name() ).path( KUrl::RemoveTrailingSlash ).local8Bit() );
-				K3Process proc;
+				//FIXME nearly identical code is in panelfunc.cpp
+				KProcess proc;
 				{
 				KConfigGroup saver( krConfig, "General");
          	QString term = saver.readEntry( "Terminal", _Terminal );
          	proc << KrServices::separateArgs( term );
-         	if ( !panel->func->getVFile(item)->vfile_isDir() ) proc << "-e" << item->name();
+         	proc.setWorkingDirectory(panel->func->files() ->vfs_getFile(item->name()).path());
+         	if ( !panel->func->getVFile(item)->vfile_isDir() )
+         	  proc << "-e" << item->name(); // FIXME this depends on term!!
+#if 0 // I _think_ that this is no more nessesary since the process is now allways detached
          	if ( term.contains( "konsole" ) ) {   /* KDE 3.2 bug (konsole is killed by pressing Ctrl+C) */
          	                                      /* Please remove the patch if the bug is corrected */
 					proc << "&";
             	proc.setUseShell( true );
          	}
-         	if ( !proc.start( K3Process::DontCare ) )
+#endif
+         	if ( !proc.startDetached() )
                KMessageBox::sorry( krApp, i18n( "Can't open \"%1\"", term) );
 				} // group-saver is blown out of scope here
-         	chdir( save.local8Bit() );
          	break;
 	}
    

Modified: trunk/krusader_kde4/krusader/Panel/panelfunc.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/panelfunc.cpp	2008-01-27 21:44:41 UTC (rev 2679)
+++ trunk/krusader_kde4/krusader/Panel/panelfunc.cpp	2008-01-28 00:06:41 UTC (rev 2680)
@@ -36,7 +36,7 @@
 #include <QList>
 // KDE Includes
 #include <klocale.h>
-#include <k3process.h>
+#include <kprocess.h>
 #include <kpropertiesdialog.h>
 #include <kmessagebox.h>
 #include <kcursor.h>
@@ -369,24 +369,21 @@
 }
 
 void ListPanelFunc::terminal() {
-	QString save = getcwd( 0, 0 );
-	chdir( panel->realPath().local8Bit() );
-
-	K3Process proc;
+	//FIXME nearly identical code is in krpopupmenu.cpp
+	KProcess proc;
 	KConfigGroup group( krConfig, "General" );
 	QString term = group.readEntry( "Terminal", _Terminal );
 	proc << KrServices::separateArgs( term );
-
+	proc.setWorkingDirectory(panel->realPath());
+#if 0 // I _think_ that this is no more nessesary since the process is now allways detached
 	if ( term.contains( "konsole" ) )    /* KDE 3.2 bug (konsole is killed by pressing Ctrl+C) */
 	{                                  /* Please remove the patch if the bug is corrected */
 		proc << "&";
 		proc.setUseShell( true );
 	}
-
-	if ( !proc.start( K3Process::DontCare ) )
+#endif
+	if ( !proc.startDetached() )
 		KMessageBox::sorry( krApp, i18n( "<qt>Can't open <b>%1</b></qt>", term) );
-
-	chdir( save.local8Bit() );
 }
 
 void ListPanelFunc::editFile() {


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