[rkward-cvs] rkward/rkward rkward.cpp,1.103,1.104

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.cpp 
Log Message:
Rework HTML windows: Remove RKHelpWindow, RKHTMLWindowPart, replace with RKHTMLWindow, and two derived classes. Most code is copied unchanged, but the twisted logic previously used in RKHTMLWindowPart is cleaned.

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** rkward.cpp	5 Oct 2005 16:56:06 -0000	1.103
--- rkward.cpp	12 Oct 2005 14:37:07 -0000	1.104
***************
*** 72,76 ****
  #include "agents/rkloadagent.h"
  #include "windows/rkcommandeditorwindow.h"
! #include "windows/rkhtmlwindowpart.h"
  #include "khelpdlg.h"
  #include "rkconsole.h"
--- 72,76 ----
  #include "agents/rkloadagent.h"
  #include "windows/rkcommandeditorwindow.h"
! #include "windows/rkhtmlwindow.h"
  #include "khelpdlg.h"
  #include "rkconsole.h"
***************
*** 660,664 ****
  void RKwardApp::newOutput () {
  	RK_TRACE (APP);
! 	RKHTMLWindowPart::refreshOutput (RKSettingsModuleOutput::autoShow (), RKSettingsModuleOutput::autoRaise ());
  }
  
--- 660,664 ----
  void RKwardApp::newOutput () {
  	RK_TRACE (APP);
! 	RKOutputWindow::refreshOutput (RKSettingsModuleOutput::autoShow (), RKSettingsModuleOutput::autoRaise ());
  }
  
***************
*** 737,741 ****
  void RKwardApp::openHTML(const KURL &url) {
  	RK_TRACE (APP);
! 	RKHTMLWindowPart::openHTML (url, false);
  }
  
--- 737,742 ----
  void RKwardApp::openHTML(const KURL &url) {
  	RK_TRACE (APP);
! 	RKHelpWindow *hw = new RKHelpWindow (this);
! 	hw->openURL (url);
  }
  
***************
*** 747,751 ****
  void RKwardApp::slotOutputShow () {
  	RK_TRACE (APP);
! 	RKHTMLWindowPart::refreshOutput (true, true);
  }
  
--- 748,752 ----
  void RKwardApp::slotOutputShow () {
  	RK_TRACE (APP);
! 	RKOutputWindow::refreshOutput (true, true);
  }