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

[tfry at users.sourceforge.net]

Revision: 766
          http://svn.sourceforge.net/rkward/?rev=766&view=rev
Author:   tfry
Date:     2006-09-27 06:05:23 -0700 (Wed, 27 Sep 2006)

Log Message:
-----------
Fixes when saving loading workspace

Modified Paths:
--------------
    trunk/rkward/rkward/agents/rksaveagent.cpp
    trunk/rkward/rkward/core/robjectlist.h
    trunk/rkward/rkward/dataeditor/rkeditor.cpp

Modified: trunk/rkward/rkward/agents/rksaveagent.cpp
===================================================================
--- trunk/rkward/rkward/agents/rksaveagent.cpp	2006-09-27 12:54:04 UTC (rev 765)
+++ trunk/rkward/rkward/agents/rksaveagent.cpp	2006-09-27 13:05:23 UTC (rev 766)
@@ -23,6 +23,7 @@
 #include <qapplication.h>
 
 #include "../rbackend/rinterface.h"
+#include "../core/robjectlist.h"
 #include "../rkglobals.h"
 #include "../rkward.h"
 #include "../windows/rkworkplace.h"
@@ -43,6 +44,7 @@
 	RKWorkplace::mainWorkplace ()->flushAllData ();
 	save_chain = RKGlobals::rInterface ()->startChain (0);
 	
+	RKWorkplace::mainWorkplace ()->saveWorkplace (save_chain);
 	RKGlobals::rInterface ()->issueCommand (new RCommand ("save.image (\"" + save_url.path () + "\")", RCommand::App, QString::null, this), save_chain);
 }
 
@@ -90,8 +92,8 @@
 			}
 		}
 	} else {
-#warning TODO This line is wrong!
-		RKwardApp::getApp ()->setCaption (save_url.filename ());
+		RKGlobals::rObjectList ()->setWorkspaceURL (save_url);
+		RKwardApp::getApp ()->setCaption (QString::null);	// trigger update of caption
 		done ();
 		return;
 	}

Modified: trunk/rkward/rkward/core/robjectlist.h
===================================================================
--- trunk/rkward/rkward/core/robjectlist.h	2006-09-27 12:54:04 UTC (rev 765)
+++ trunk/rkward/rkward/core/robjectlist.h	2006-09-27 13:05:23 UTC (rev 766)
@@ -77,6 +77,7 @@
 	void objectsChanged ();
 private:
 	friend class RKLoadAgent;
+	friend class RKSaveAgent;
 	void setWorkspaceURL (const KURL &url) { current_url = url; };
 	QTimer *update_timer;
 	

Modified: trunk/rkward/rkward/dataeditor/rkeditor.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/rkeditor.cpp	2006-09-27 12:54:04 UTC (rev 765)
+++ trunk/rkward/rkward/dataeditor/rkeditor.cpp	2006-09-27 13:05:23 UTC (rev 766)
@@ -19,8 +19,8 @@
 RKEditor::RKEditor (QWidget *parent) : RKMDIWindow (parent, RKMDIWindow::DataEditorWindow) {
 }
 
-
 RKEditor::~RKEditor () {
+	getObject ()->setObjectOpened (this, false);
 }
 
 #include "rkeditor.moc"


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