[rkward-cvs] rkward/rkward rkglobals.cpp,1.8,1.9 rkglobals.h,1.7,1.8 rkward.cpp,1.104,1.105

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27157/rkward

Modified Files:
	rkglobals.cpp rkglobals.h rkward.cpp 
Log Message:
Adding new RControlWindow. Not completely/correctly implemented, yet

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** rkward.cpp	12 Oct 2005 14:37:07 -0000	1.104
--- rkward.cpp	13 Oct 2005 21:01:57 -0000	1.105
***************
*** 73,76 ****
--- 73,77 ----
  #include "windows/rkcommandeditorwindow.h"
  #include "windows/rkhtmlwindow.h"
+ #include "windows/rcontrolwindow.h"
  #include "khelpdlg.h"
  #include "rkconsole.h"
***************
*** 156,165 ****
  	readOptions();
  	object_browser = new RObjectBrowser ();
  	
  	QString dummy = i18n("Before you start bashing at it: please note that this is merely a technology preview release. You might actually be able to use it for some very simple tasks, but chances are it's of hardly any practical value so far. It does not do much good. It might do some very bad things (don't let it touch valuable data!). It's lacking in many respects. If you would like to help improve it, or simply get in contact, visit:\nhttp://rkward.sourceforge.net\nAll comments are welcome.");
  	KMessageBox::information (this, dummy, i18n("Before you complain..."), "state_of_rkward");
  	
- 	startR ();
- 
  	// create handle for menu bar and register standard menus
  	menu_list = new RKMenuList (menuBar ());
--- 157,166 ----
  	readOptions();
  	object_browser = new RObjectBrowser ();
+ 
+ 	startR ();
  	
  	QString dummy = i18n("Before you start bashing at it: please note that this is merely a technology preview release. You might actually be able to use it for some very simple tasks, but chances are it's of hardly any practical value so far. It does not do much good. It might do some very bad things (don't let it touch valuable data!). It's lacking in many respects. If you would like to help improve it, or simply get in contact, visit:\nhttp://rkward.sourceforge.net\nAll comments are welcome.");
  	KMessageBox::information (this, dummy, i18n("Before you complain..."), "state_of_rkward");
  	
  	// create handle for menu bar and register standard menus
  	menu_list = new RKMenuList (menuBar ());
***************
*** 188,201 ****
  	RKGlobals::rInterface ()->watch->setName("Command log");
  	RKGlobals::rInterface ()->watch->setIcon(SmallIcon("text_block"));
! 	addToolWindow(RKGlobals::rInterface ()->watch,KDockWidget::DockBottom, getMainDockWidget(), 10);
  
! 	console = new RKConsole(0);
! 	console->setIcon(SmallIcon("konsole"));
! 	console->setName("r_console");
! 	addToolWindow(console,KDockWidget::DockBottom, getMainDockWidget(), 10);
  	
! 	RKGlobals::helpdlg = new KHelpDlg(0);
! 	RKGlobals::helpDialog ()->setIcon(SmallIcon("help"));
! 	addToolWindow(RKGlobals::helpDialog (), KDockWidget::DockBottom, getMainDockWidget(), 10);
  
  	if (initial_url) {
--- 189,208 ----
  	RKGlobals::rInterface ()->watch->setName("Command log");
  	RKGlobals::rInterface ()->watch->setIcon(SmallIcon("text_block"));
! 	addToolWindow(RKGlobals::rInterface ()->watch,KDockWidget::DockBottom, getMainDockWidget (), 10);
  
! 	RControlWindowPart *rcpart = new RControlWindowPart ();
! 	RKGlobals::rcontrol = static_cast<RControlWindow *> (rcpart->widget ());
! 	RKGlobals::rcontrol->setCaption (i18n ("Command Stack"));
! 	RKGlobals::rcontrol->setName ("rcontrol");
! 	addToolWindow (RKGlobals::rcontrol, KDockWidget::DockBottom, getMainDockWidget (), 10);
! 
! 	console = new RKConsole (0);
! 	console->setIcon (SmallIcon ("konsole"));
! 	console->setName ("r_console");
! 	addToolWindow (console, KDockWidget::DockBottom, getMainDockWidget (), 10);
  	
! 	RKGlobals::helpdlg = new KHelpDlg (0);
! 	RKGlobals::helpDialog ()->setIcon (SmallIcon ("help"));
! 	addToolWindow (RKGlobals::helpDialog (), KDockWidget::DockBottom, getMainDockWidget (), 10);
  
  	if (initial_url) {

Index: rkglobals.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkglobals.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rkglobals.h	17 Sep 2005 19:23:52 -0000	1.7
--- rkglobals.h	13 Oct 2005 21:01:57 -0000	1.8
***************
*** 25,28 ****
--- 25,29 ----
  class RKComponentMap;
  class KHelpDlg;
+ class RControlWindow;
  
  // deletes the given char*, if it is not a special value. Does not set to 0.
***************
*** 55,58 ****
--- 56,61 ----
  /// static pointer to the RKHelpDlg
  	static KHelpDlg *helpDialog () { return helpdlg; };
+ /// static pointer to the RControlWindow
+ 	static RControlWindow *controlWindow () { return rcontrol; };
  
  /// an empty char
***************
*** 76,79 ****
--- 79,83 ----
  	static RKComponentMap *cmap;
  	static KHelpDlg *helpdlg;
+ 	static RControlWindow *rcontrol;
  };
  

Index: rkglobals.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkglobals.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rkglobals.cpp	17 Sep 2005 19:23:52 -0000	1.8
--- rkglobals.cpp	13 Oct 2005 21:01:57 -0000	1.9
***************
*** 24,27 ****
--- 24,28 ----
  RKComponentMap *RKGlobals::cmap;
  KHelpDlg *RKGlobals::helpdlg;
+ RControlWindow *RKGlobals::rcontrol;
  
  /* statics