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

[tfry at users.sourceforge.net]

Revision: 1509
          http://svn.sourceforge.net/rkward/?rev=1509&view=rev
Author:   tfry
Date:     2007-02-28 11:06:33 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
make RObjectBrowser an RKMDIWindow

Modified Paths:
--------------
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/robjectbrowser.cpp
    trunk/rkward/rkward/robjectbrowser.h

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2007-02-28 17:25:42 UTC (rev 1508)
+++ trunk/rkward/rkward/rkward.cpp	2007-02-28 19:06:33 UTC (rev 1509)
@@ -180,7 +180,8 @@
 	RK_TRACE (APP);
 
 	readOptions();
-	object_browser = new RObjectBrowser ();
+	//It's necessary to give a different name to all tool windows, or they won't be properly displayed
+	object_browser = new RObjectBrowser (0, true, "workspace");
 
 	RKGlobals::rcontrol = new RControlWindow (0, true, "rcontrol");		// the control window needs to be initialized before startR () is called.
 	RKGlobals::rcontrol->hide ();		// this line is important! RControlWindow must do some initializations on first show, and be hidden until then.
@@ -198,11 +199,10 @@
 	
 	initPlugins ();
 
-	//It's necessary to give a different name to all tool windows, or they won't be properly displayed
-	object_browser->setName("workspace"); 
 	object_browser->setIcon(SmallIcon("view_tree"));
-	addToolWindow(object_browser,KDockWidget::DockLeft, getMainDockWidget(), 30 , i18n ("Existing objects in your workspace.") , i18n ("Workspace"));
-	
+	object_browser->setToolWrapper (addToolWindow(object_browser,KDockWidget::DockLeft, getMainDockWidget(), 30, i18n ("Existing objects in your workspace."), i18n ("Workspace")));
+	RKWorkplace::mainWorkplace ()->registerToolWindow (object_browser);
+
 	RKGlobals::rcontrol->setCaption (i18n ("Pending Jobs"));
 	RKGlobals::rcontrol->setToolWrapper (addToolWindow (RKGlobals::rcontrol, KDockWidget::DockBottom, getMainDockWidget (), 10));
 	RKWorkplace::mainWorkplace ()->registerToolWindow (RKGlobals::rcontrol);

Modified: trunk/rkward/rkward/robjectbrowser.cpp
===================================================================
--- trunk/rkward/rkward/robjectbrowser.cpp	2007-02-28 17:25:42 UTC (rev 1508)
+++ trunk/rkward/rkward/robjectbrowser.cpp	2007-02-28 19:06:33 UTC (rev 1509)
@@ -2,7 +2,7 @@
                           robjectbrowser  -  description
                              -------------------
     begin                : Thu Aug 19 2004
-    copyright            : (C) 2004 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2006, 2007 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -37,14 +37,17 @@
 #include "core/rkmodificationtracker.h"
 #include "rbackend/rinterface.h"
 #include "misc/rkobjectlistview.h"
+#include "misc/rkdummypart.h"
 #include "windows/rkworkplace.h"
 #include "dataeditor/rkeditor.h"
 #include "robjectviewer.h"
 
 #include "debug.h"
 
-RObjectBrowser::RObjectBrowser () : QWidget () {
+RObjectBrowser::RObjectBrowser (QWidget *parent, bool tool_window, char *name) : RKMDIWindow (parent, WorkspaceBrowserWindow, tool_window, name) {
 	RK_TRACE (APP);
+	part = new RKDummyPart (0, this);
+	initializeActivationSignals ();
 
 	QVBoxLayout *vbox = new QVBoxLayout (this);
 

Modified: trunk/rkward/rkward/robjectbrowser.h
===================================================================
--- trunk/rkward/rkward/robjectbrowser.h	2007-02-28 17:25:42 UTC (rev 1508)
+++ trunk/rkward/rkward/robjectbrowser.h	2007-02-28 19:06:33 UTC (rev 1509)
@@ -2,7 +2,7 @@
                           robjectbrowser  -  description
                              -------------------
     begin                : Thu Aug 19 2004
-    copyright            : (C) 2004 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2006, 2007 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -17,7 +17,7 @@
 #ifndef ROBJECTBROWSER_H
 #define ROBJECTBROWSER_H
 
-#include <qwidget.h>
+#include "windows/rkmdiwindow.h"
 
 class RKObjectListView;
 class RKObjectListViewSettings;
@@ -31,21 +31,20 @@
 class RObject;
 class RKCommandEditorWindow;
 
-
 /**
 This widget provides a browsable list of all objects in the R workspace
 
 @author Thomas Friedrichsmeier
 */
-class RObjectBrowser : public QWidget {
+class RObjectBrowser : public RKMDIWindow {
 Q_OBJECT
 public:
-    RObjectBrowser ();
+	RObjectBrowser (QWidget *parent, bool tool_window, char *name=0);
+	~RObjectBrowser ();
 
-    ~RObjectBrowser ();
-	
 	enum PopupItems { Help=1, Edit=2, View=3, Rename=4, Copy=5, CopyToGlobalEnv=6, Delete=7 };
-	
+
+	KParts::Part *getPart () { return part; };
 public slots:
 	void updateButtonClicked ();
 	void contextMenuCallback (RKListViewItem *item, bool *suppress);
@@ -65,7 +64,8 @@
 	void initialize ();
 
 	QPushButton *update_button;
-	RKObjectListView *list_view;	
+	RKObjectListView *list_view;
+	KParts::Part *part;
 };
 
 /** This class provides a widget to switch quickly between the most important RKObjectListViewSettings */


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