[rkward-cvs] rkward/rkward/windows rkhtmlwindow.cpp,1.2,1.3

[Thomas Friedrichsmeier]

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

Modified Files:
	rkhtmlwindow.cpp 
Log Message:
New setting to limit number of lines in console. Fix crash related to limited command history

Index: rkhtmlwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhtmlwindow.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rkhtmlwindow.cpp	17 Oct 2005 18:53:35 -0000	1.2
--- rkhtmlwindow.cpp	18 Oct 2005 11:48:24 -0000	1.3
***************
*** 37,48 ****
  
  RKHTMLWindow::RKHTMLWindow (QWidget *parent) : KMdiChildView (parent) {
  	scroll_position=0;
  	
! 	khtmlpart = new KHTMLPart (this,0,0,0,KHTMLPart::BrowserViewGUI);
  	khtmlpart->setSelectable (true);
  	
  	khtmlpart->widget ()->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
  	QHBoxLayout *pLayout = new QHBoxLayout (this, 0, -1, "layout");
! 	pLayout->addWidget (khtmlpart->widget());
  
  	// We have to connect this in order to allow browsing.
--- 37,49 ----
  
  RKHTMLWindow::RKHTMLWindow (QWidget *parent) : KMdiChildView (parent) {
+ 	RK_TRACE (APP);
  	scroll_position=0;
  	
! 	khtmlpart = new KHTMLPart (this, 0, 0, 0, KHTMLPart::BrowserViewGUI);
  	khtmlpart->setSelectable (true);
  	
  	khtmlpart->widget ()->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
  	QHBoxLayout *pLayout = new QHBoxLayout (this, 0, -1, "layout");
! 	pLayout->addWidget (khtmlpart->widget ());
  
  	// We have to connect this in order to allow browsing.
***************
*** 53,59 ****
--- 54,62 ----
  
  RKHTMLWindow::~RKHTMLWindow () {
+ 	RK_TRACE (APP);
  }
  
  bool RKHTMLWindow::openURL (const KURL &url) {
+ 	RK_TRACE (APP);
  	bool ok = QFile (url.path ()).exists ();
  
***************
*** 67,78 ****
--- 70,84 ----
  
  void RKHTMLWindow::updateCaption (const KURL &url) {
+ 	RK_TRACE (APP);
  	setMDICaption (url.filename ());
  }
  
  void RKHTMLWindow::slotOpenURLRequest(const KURL &url, const KParts::URLArgs & ) {
+ 	RK_TRACE (APP);
  	openURL (url);
  }
  
  void RKHTMLWindow::refresh () {
+ 	RK_TRACE (APP);
  	scroll_position = khtmlpart->view ()->contentsY ();
  	openURL (khtmlpart->url ());
***************
*** 80,83 ****
--- 86,90 ----
  
  void RKHTMLWindow::loadDone () {
+ 	RK_TRACE (APP);
  	khtmlpart->view()->setContentsPos (0, scroll_position);
  }
***************
*** 109,112 ****
--- 116,122 ----
  
  	RKGlobals::rkApp ()->m_manager->addPart (khtmlpart);
+ 
+ 	KAction *action = khtmlpart->action ("saveDocument");
+ 	if (action) action->setText (i18n ("Save Output as HTML"));
  }