[rkward-cvs] rkward/rkward/windows rkhtmlwindow.cpp,1.7,1.8 rkhtmlwindow.h,1.3,1.4

[Thomas Friedrichsmeier]

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

Modified Files:
	rkhtmlwindow.cpp rkhtmlwindow.h 
Log Message:
Fix output window refresh

Index: rkhtmlwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhtmlwindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rkhtmlwindow.cpp	15 Apr 2006 11:03:00 -0000	1.7
--- rkhtmlwindow.cpp	16 Apr 2006 13:45:15 -0000	1.8
***************
*** 101,104 ****
--- 101,105 ----
  		KRun *runner = new KRun (url);		// according to KRun-documentation, KRun will self-destruct when done.
  		runner->setRunExecutables (false);
+ 		return false;
  	}
  
***************
*** 117,121 ****
  	}
  
! 	return true;	
  }
  
--- 118,122 ----
  	}
  
! 	return true;
  }
  
***************
*** 183,187 ****
  	RK_TRACE (APP);
  
! 	QFile out_file (RKSettingsModuleGeneral::filesPath () + "/rk_out.html");
  	bool ok = out_file.exists();
  	if (ok)  {
--- 184,189 ----
  	RK_TRACE (APP);
  
! 	output_url = url;
! 	QFile out_file (url.path ());
  	bool ok = out_file.exists();
  	if (ok)  {
***************
*** 198,202 ****
  void RKOutputWindow::refresh () {
  	scroll_position = khtmlpart->view ()->contentsHeight ();
! 	openURL (khtmlpart->url ());
  }
  
--- 200,204 ----
  void RKOutputWindow::refresh () {
  	scroll_position = khtmlpart->view ()->contentsHeight ();
! 	openURL (output_url);
  }
  

Index: rkhtmlwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhtmlwindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rkhtmlwindow.h	19 Oct 2005 22:38:06 -0000	1.3
--- rkhtmlwindow.h	16 Apr 2006 13:45:15 -0000	1.4
***************
*** 116,119 ****
--- 116,121 ----
  
  	static RKOutputWindow* current_output;
+ /** In case the output is empty (i.e. output file does not exist), we need to store, where the output *would* be, if it existed, so we can properly refresh the output */
+ 	KURL output_url;
  };