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

[tfry at users.sourceforge.net]

Revision: 809
          http://svn.sourceforge.net/rkward/?rev=809&view=rev
Author:   tfry
Date:     2006-10-05 05:10:27 -0700 (Thu, 05 Oct 2006)

Log Message:
-----------
Make sure, output window gets shown, and update object list on startup

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rinterface.cpp
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/rkward.h
    trunk/rkward/rkward/windows/rkworkplace.cpp
    trunk/rkward/rkward/windows/rkworkplace.h

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2006-10-05 10:18:43 UTC (rev 808)
+++ trunk/rkward/ChangeLog	2006-10-05 12:10:27 UTC (rev 809)
@@ -1,3 +1,6 @@
+- allow some more configuration in object browser
+- include all package environments in object list
+- use more efficient data passing to synchronize object list
 - add (ugly) items for functions and lists to object browser
 - internal cleanups (partially to make porting to KDE4/Qt4 easier)
 - when saving/loading the workspace, save / restore all windows (not just data editors)

Modified: trunk/rkward/rkward/rbackend/rinterface.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rinterface.cpp	2006-10-05 10:18:43 UTC (rev 808)
+++ trunk/rkward/rkward/rbackend/rinterface.cpp	2006-10-05 12:10:27 UTC (rev 809)
@@ -29,6 +29,7 @@
 #include "../dialogs/rkreadlinedialog.h"
 #include "../agents/showedittextfileagent.h"
 #include "../windows/rcontrolwindow.h"
+#include "../windows/rkworkplace.h"
 
 #include "rkwindowcatcher.h"
 #ifndef DISABLE_RKWINDOWCATCHER
@@ -153,7 +154,7 @@
 		RKGlobals::controlWindow ()->removeCommand (command);
 		command->finished ();
 		if (command->type () & RCommand::DirectToOutput) {
-			RKwardApp::getApp ()->newOutput ();
+			RKWorkplace::mainWorkplace ()->newOutput ();
 		}
 		delete command;
 	} else if ((e->type () == RIDLE_EVENT)) {

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2006-10-05 10:18:43 UTC (rev 808)
+++ trunk/rkward/rkward/rkward.cpp	2006-10-05 12:10:27 UTC (rev 809)
@@ -262,7 +262,9 @@
 	new RObjectList ();
 
 	RKGlobals::rInterface ()->startThread ();
+
 	object_browser->initialize ();
+	RObjectList::getObjectList ()->updateFromR ();
 }
 
 void RKwardApp::slotConfigure () {
@@ -616,11 +618,6 @@
 	RKWorkplace::mainWorkplace ()->detachWindow (RKWorkplace::mainWorkplace ()->activeAttachedWindow ());
 }
 
-void RKwardApp::newOutput () {
-	RK_TRACE (APP);
-	RKOutputWindow::refreshOutput (RKSettingsModuleOutput::autoShow (), RKSettingsModuleOutput::autoRaise ());
-}
-
 void RKwardApp::setRStatus (bool busy) {
 	RK_TRACE (APP);
 	if (busy) {

Modified: trunk/rkward/rkward/rkward.h
===================================================================
--- trunk/rkward/rkward/rkward.h	2006-10-05 10:18:43 UTC (rev 808)
+++ trunk/rkward/rkward/rkward.h	2006-10-05 12:10:27 UTC (rev 809)
@@ -86,11 +86,6 @@
 /** initialize the backend */
 	void startR ();
 
-/** signal there was new output, show/raise/refresh the output window as appropriate.
-
-TODO: rename to something sensible, and check whether it is redundant. */
-	void newOutput ();
-
 /** open a workspace. Do not ask whether to save the old one. The old workspace is deleted! */
 	void fileOpenNoSave (const KURL &url);
 /** open a workspace. If the current workspace is not empty, ask wether to save first. */

Modified: trunk/rkward/rkward/windows/rkworkplace.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.cpp	2006-10-05 10:18:43 UTC (rev 808)
+++ trunk/rkward/rkward/windows/rkworkplace.cpp	2006-10-05 12:10:27 UTC (rev 809)
@@ -32,6 +32,7 @@
 #include "../dataeditor/rkeditor.h"
 #include "../dataeditor/rkeditordataframe.h"
 #include "../dataeditor/rkeditordataframepart.h"
+#include "../settings/rksettingsmoduleoutput.h"
 #include "../rbackend/rinterface.h"
 #include "../rbackend/rcommand.h"
 #include "../rkglobals.h"
@@ -129,6 +130,16 @@
 	}
 }
 
+void RKWorkplace::newOutput () {
+	RK_TRACE (APP);
+	RKOutputWindow::refreshOutput (RKSettingsModuleOutput::autoShow (), RKSettingsModuleOutput::autoRaise ());
+	if (RKSettingsModuleOutput::autoShow ()) {
+		if (windows.find (RKOutputWindow::getCurrentOutput ()) == windows.end ()) {
+			addWindow (RKOutputWindow::getCurrentOutput ());
+		}
+	}
+}
+
 bool RKWorkplace::canEditObject (RObject *object) {
 	RK_TRACE (APP);
 	

Modified: trunk/rkward/rkward/windows/rkworkplace.h
===================================================================
--- trunk/rkward/rkward/windows/rkworkplace.h	2006-10-05 10:18:43 UTC (rev 808)
+++ trunk/rkward/rkward/windows/rkworkplace.h	2006-10-05 12:10:27 UTC (rev 809)
@@ -75,6 +75,9 @@
 /** Opens a new output window. Currently only a single output window will ever be created. Subsequent calls to the function will not create additional windows right now (but will raise / refresh the output window
 @param url currently ignored! */
 	void openOutputWindow (const KURL &url=KURL ());
+/** signal there was new output, show/raise/refresh the output window as appropriate.
+TODO: this should be obsoleted somehow */
+	void newOutput ();
 
 /** @returns true if there is a known editor for this type of object, false otherwise */
 	bool canEditObject (RObject *object);


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