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

[tfry at users.sourceforge.net]

Revision: 4022
          http://rkward.svn.sourceforge.net/rkward/?rev=4022&view=rev
Author:   tfry
Date:     2011-11-08 12:46:55 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Don't ask to save workspace, when asking for workspace to load on startup.
Tweak some strings.
Use file filter when asking for workspace file to open.

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

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-11-07 19:26:20 UTC (rev 4021)
+++ trunk/rkward/ChangeLog	2011-11-08 12:46:55 UTC (rev 4022)
@@ -1,3 +1,5 @@
+- When asking for workspace file to open, use appropriate file filter
+- When configured to ask for workspace to open on startup, don't prompt to save, first
 - Fixed: potential crash when clicking "Select all updates" in the package installation dialog
 - Fixed: potential crash in object name completion under certain conditions
 - Simplified the "Sort Data" plugin, and added a help page

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2011-11-07 19:26:20 UTC (rev 4021)
+++ trunk/rkward/rkward/rkward.cpp	2011-11-08 12:46:55 UTC (rev 4022)
@@ -235,7 +235,7 @@
 			openWorkspace (result.open_url);
 		} else {
 			if (result.result == StartupDialog::ChoseFile) {
-				slotFileOpenWorkspace ();
+				fileOpenNoSave (KUrl());
 			} else if (result.result == StartupDialog::EmptyTable) {
 				RKWorkplace::mainWorkplace ()->editNewDataFrame (i18n ("my.data"));
 			}
@@ -705,9 +705,9 @@
 #ifdef Q_WS_WIN
 	// getOpenUrl(KUrl("kfiledialog:///<rfiles>"), ...) causes a hang on windows (KDElibs 4.2.3).
 #	warning Track this bug down and/or report it
-		lurl = KFileDialog::getOpenUrl (KUrl (), i18n("*|All files"), this, i18n("Open File..."));
+		lurl = KFileDialog::getOpenUrl (KUrl (), i18n("*.RData *.RDA|R Workspace Files (*.RData *.RDA)\n*|All files"), this, i18n("Select workspace to open..."));
 #else
-		lurl = KFileDialog::getOpenUrl (KUrl ("kfiledialog:///<rfiles>"), i18n("*|All files"), this, i18n("Open File..."));
+		lurl = KFileDialog::getOpenUrl (KUrl ("kfiledialog:///<rfiles>"), i18n("*.RData *.RDA|R Workspace Files (*.RData *.RDA)\n*|All files"), this, i18n("Select workspace to open..."));
 #endif
 	}
 	if (!lurl.isEmpty ()) {

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