[rkward-cvs] SF.net SVN: rkward: [1507] trunk/rkward/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Wed Feb 28 17:09:07 UTC 2007
Revision: 1507
http://svn.sourceforge.net/rkward/?rev=1507&view=rev
Author: tfry
Date: 2007-02-28 09:09:07 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
Make RControlWindow an RKMDIWindow (and a few small things elsewhere)
Modified Paths:
--------------
trunk/rkward/rkward/rkward.cpp
trunk/rkward/rkward/windows/rcontrolwindow.cpp
trunk/rkward/rkward/windows/rcontrolwindow.h
trunk/rkward/rkward/windows/rkcommandlog.cpp
trunk/rkward/rkward/windows/rkcommandlog.h
trunk/rkward/rkward/windows/rkhelpsearchwindow.cpp
trunk/rkward/rkward/windows/rkhelpsearchwindow.h
Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/rkward.cpp 2007-02-28 17:09:07 UTC (rev 1507)
@@ -182,8 +182,8 @@
readOptions();
object_browser = new RObjectBrowser ();
- RControlWindowPart *rcpart = new RControlWindowPart (); // the control window needs to be initialized before startR () is called.
- RKGlobals::rcontrol = static_cast<RControlWindow *> (rcpart->widget ());
+ 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.
RKCommandLog *log = new RKCommandLog (0, true, "Command log");
log->setIcon (SmallIcon ("text_block"));
@@ -204,9 +204,8 @@
addToolWindow(object_browser,KDockWidget::DockLeft, getMainDockWidget(), 30 , i18n ("Existing objects in your workspace.") , i18n ("Workspace"));
RKGlobals::rcontrol->setCaption (i18n ("Pending Jobs"));
- RKGlobals::rcontrol->setName ("rcontrol");
- addToolWindow (RKGlobals::rcontrol, KDockWidget::DockBottom, getMainDockWidget (), 10);
- RKGlobals::rcontrol->hide (); // this line is important! RControlWindow must do some initializations on first show, and be hidden until then.
+ RKGlobals::rcontrol->setToolWrapper (addToolWindow (RKGlobals::rcontrol, KDockWidget::DockBottom, getMainDockWidget (), 10));
+ RKWorkplace::mainWorkplace ()->registerToolWindow (RKGlobals::rcontrol);
RKConsole *console = new RKConsole (0, true, "r_console");
console->setIcon (SmallIcon ("konsole"));
Modified: trunk/rkward/rkward/windows/rcontrolwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rcontrolwindow.cpp 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/windows/rcontrolwindow.cpp 2007-02-28 17:09:07 UTC (rev 1507)
@@ -2,7 +2,7 @@
rcontrolwindow - description
-------------------
begin : Wed Oct 12 2005
- copyright : (C) 2005 by Thomas Friedrichsmeier
+ copyright : (C) 2005, 2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
@@ -32,8 +32,10 @@
#include "../rkward.h"
#include "../debug.h"
-RControlWindow::RControlWindow (QWidget *parent) : KMdiChildView (parent) {
+RControlWindow::RControlWindow (QWidget *parent, bool tool_window, char *name) : RKMDIWindow (parent, PendingJobsWindow, tool_window, name) {
RK_TRACE (APP);
+ part = new RControlWindowPart (this);
+ initializeActivationSignals ();
QVBoxLayout *main_vbox = new QVBoxLayout (this, RKGlobals::marginHint ());
QHBoxLayout *button_hbox = new QHBoxLayout (main_vbox, RKGlobals::spacingHint ());
@@ -69,10 +71,14 @@
RK_TRACE (APP);
}
+KParts::Part *RControlWindow::getPart () {
+ return part;
+}
+
void RControlWindow::show () {
RK_TRACE (APP);
- KMdiChildView::show ();
+ RKMDIWindow::show ();
MUTEX_LOCK;
refreshCommands ();
MUTEX_UNLOCK;
@@ -293,9 +299,9 @@
//############# END RContolWindow #######################
//############# BEGIN RContolWindowPart ###################
-RControlWindowPart::RControlWindowPart () : KParts::Part () {
+RControlWindowPart::RControlWindowPart (RControlWindow *widget) : KParts::Part () {
RK_TRACE (APP);
- setWidget (new RControlWindow (0));
+ setWidget (widget);
}
RControlWindowPart::~RControlWindowPart () {
Modified: trunk/rkward/rkward/windows/rcontrolwindow.h
===================================================================
--- trunk/rkward/rkward/windows/rcontrolwindow.h 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/windows/rcontrolwindow.h 2007-02-28 17:09:07 UTC (rev 1507)
@@ -2,7 +2,7 @@
rcontrolwindow - description
-------------------
begin : Wed Oct 12 2005
- copyright : (C) 2005 by Thomas Friedrichsmeier
+ copyright : (C) 2005, 2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
@@ -19,17 +19,19 @@
#define RCONTROLWINDOW_H
#include <kparts/part.h>
-#include <kmdichildview.h>
#include <qmap.h>
#include <qlabel.h>
#include <qlistview.h>
+#include "rkmdiwindow.h"
+
class QPushButton;
class RCommand;
class RCommandChain;
class RChainOrCommand;
class RControlWindowListViewItem;
+class RControlWindowPart;
/**
\brief Interface to control R command execution
@@ -45,16 +47,14 @@
@author Thomas Friedrichsmeier
*/
-class RControlWindow : public KMdiChildView {
+class RControlWindow : public RKMDIWindow {
Q_OBJECT
-friend class RControlWindowPart;
-protected:
-/** constructor. Protected. Do not create an instance of this class directly. Rather, create a RControlWindowPart.
+public:
+/** constructor.
@param parent parent QWidget, usually RKGlobals::rkApp () or similar */
- explicit RControlWindow (QWidget *parent = 0);
+ RControlWindow (QWidget *parent, bool tool_window, char *name=0);
/** destructor */
~RControlWindow ();
-public:
/** Add new chain to the RControlWindow. Has no effect unless RControlWindow::isShown () */
void addChain (RCommandChain *chain);
/** Add new command to the RControlWindow. The command is added to the given parent chain. Has no effect unless RControlWindow::isShown () */
@@ -68,6 +68,8 @@
/** Set given command as running. Has no effect unless RControlWindow::isShown ()*/
void setCommandRunning (RCommand *command);
+ KParts::Part *getPart ();
+
/** reimplemented to refresh list of commands when showing. This is needed, as the RControlWindow is only kept up to date as long as it is shown. Hence, if it was hidden, and then gets shown, it will have to update the entire list. */
void show ();
public slots:
@@ -97,6 +99,8 @@
QMap <RCommand *, RControlWindowListViewItem *> command_map;
QMap <RCommandChain *, RControlWindowListViewItem *> chain_map;
+ RControlWindowPart *part;
+
bool paused;
};
@@ -109,9 +113,10 @@
*/
class RControlWindowPart : public KParts::Part {
Q_OBJECT
-public:
+friend class RControlWindow;
+protected:
/** constructor. */
- RControlWindowPart ();
+ RControlWindowPart (RControlWindow *widget);
/** destructor */
~RControlWindowPart ();
};
Modified: trunk/rkward/rkward/windows/rkcommandlog.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.cpp 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/windows/rkcommandlog.cpp 2007-02-28 17:09:07 UTC (rev 1507)
@@ -2,7 +2,7 @@
rkcommandlog - description
-------------------
begin : Sun Nov 3 2002
- copyright : (C) 2002, 2004, 2005 2006 by Thomas Friedrichsmeier
+ copyright : (C) 2002, 2004, 2005 2006,2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
Modified: trunk/rkward/rkward/windows/rkcommandlog.h
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.h 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/windows/rkcommandlog.h 2007-02-28 17:09:07 UTC (rev 1507)
@@ -2,7 +2,7 @@
rkcommandlog - description
-------------------
begin : Sun Nov 3 2002
- copyright : (C) 2002, 2004, 2005, 2006 by Thomas Friedrichsmeier
+ copyright : (C) 2002, 2004, 2005, 2006, 2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
Modified: trunk/rkward/rkward/windows/rkhelpsearchwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhelpsearchwindow.cpp 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/windows/rkhelpsearchwindow.cpp 2007-02-28 17:09:07 UTC (rev 1507)
@@ -1,8 +1,8 @@
/***************************************************************************
- khelpdlg - description
+ rkhelpsearchwindow - description
-------------------
begin : Fri Feb 25 2005
- copyright : (C) 2005, 2006 by Thomas Friedrichsmeier
+ copyright : (C) 2005, 2006, 2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
Modified: trunk/rkward/rkward/windows/rkhelpsearchwindow.h
===================================================================
--- trunk/rkward/rkward/windows/rkhelpsearchwindow.h 2007-02-28 16:38:53 UTC (rev 1506)
+++ trunk/rkward/rkward/windows/rkhelpsearchwindow.h 2007-02-28 17:09:07 UTC (rev 1507)
@@ -1,8 +1,8 @@
/***************************************************************************
- khelpdlg - description
+ rkhelpsearchwindow - description
-------------------
begin : Fri Feb 25 2005
- copyright : (C) 2005, 2006 by Thomas Friedrichsmeier
+ copyright : (C) 2005, 2006, 2007 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list