[rkward-cvs] SF.net SVN: rkward:[3215] trunk/rkward/rkward/rbackend

[tfry at users.sourceforge.net]

Revision: 3215
          http://rkward.svn.sourceforge.net/rkward/?rev=3215&view=rev
Author:   tfry
Date:     2010-11-25 10:16:44 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
Propagate working directory to frontend

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rinterface.cpp
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R

Modified: trunk/rkward/rkward/rbackend/rinterface.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rinterface.cpp	2010-11-24 22:06:53 UTC (rev 3214)
+++ trunk/rkward/rkward/rbackend/rinterface.cpp	2010-11-25 10:16:44 UTC (rev 3215)
@@ -535,6 +535,8 @@
 		}
 #endif // DISABLE_RKWINDOWCATCHER
 	} else if (call == "wdChange") {
+		// in case of separate processes, apply new working directory in frontend, too.
+		QDir::setCurrent (calllist.value(1, QString ()));
 		RKWardMainWindow::getMain ()->updateCWD ();
 	} else if (call == "preLocaleChange") {
 		int res = KMessageBox::warningContinueCancel (0, i18n ("A command in the R backend is trying to change the character encoding. While RKWard offers support for this, and will try to adjust to the new locale, this operation may cause subtle bugs, if data windows are currently open. Also the feature is not well tested, yet, and it may be advisable to save your workspace before proceeding.\nIf you have any data editor opened, or in any doubt, it is recommended to close those first (this will probably be auto-detected in later versions of RKWard). In this case, please chose 'Cancel' now, then close the data windows, save, and retry."), i18n ("Locale change"));

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2010-11-24 22:06:53 UTC (rev 3214)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2010-11-25 10:16:44 UTC (rev 3215)
@@ -313,7 +313,7 @@
 
 "setwd" <- function () {
 	eval (body (base::setwd))
-	invisible (.rk.do.call ("wdChange", NULL));
+	invisible (.rk.do.call ("wdChange", base::getwd ()));
 }
 formals (setwd) <- formals (base::setwd)
 


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