[rkward-cvs] SF.net SVN: rkward-code:[4609] trunk/rkward

[tfry at users.sf.net]

Revision: 4609
          http://sourceforge.net/p/rkward/code/4609
Author:   tfry
Date:     2013-03-18 19:01:10 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Set default initial dir to be .rkward directory on Windows

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/settings/rksettingsmodulegeneral.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2013-03-18 17:52:34 UTC (rev 4608)
+++ trunk/rkward/ChangeLog	2013-03-18 19:01:10 UTC (rev 4609)
@@ -1,3 +1,4 @@
+--- Version 0.6.1 - Apr-02-2013
 - Add plugin for subsetting data.frames by rows or columns
 - On the Windows platform, add an new (experimental) binary startup wrapper (rkward.exe)
 - Revert to building R packages form source on Mac OS X by default (controllable via compile-time option)

Modified: trunk/rkward/rkward/settings/rksettingsmodulegeneral.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmodulegeneral.cpp	2013-03-18 17:52:34 UTC (rev 4608)
+++ trunk/rkward/rkward/settings/rksettingsmodulegeneral.cpp	2013-03-18 19:01:10 UTC (rev 4609)
@@ -242,7 +242,13 @@
 	cg = config->group ("General");
 	startup_action = (StartupDialog::Result) cg.readEntry ("startup action", (int) StartupDialog::NoSavedSetting);
 	show_help_on_startup = cg.readEntry ("show help on startup", true);
-	initial_dir = (InitialDirectory) cg.readEntry ("initial dir mode", (int) CurrentDirectory);
+	initial_dir = (InitialDirectory) cg.readEntry ("initial dir mode",
+#ifndef Q_WS_WIN
+		(int) CurrentDirectory
+#else
+		(int) RKWardDirectory
+#endif
+	);
 	initial_dir_specification = cg.readEntry ("initial dir spec", QString ());
 
 	cg = config->group ("Workplace");