[rkward-cvs] rkward/rkward rkward.cpp,1.79,1.80 rkward.h,1.33,1.34

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.cpp rkward.h 
Log Message:
Also honor autoraise setting for output

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** rkward.cpp	20 Apr 2005 12:14:56 -0000	1.79
--- rkward.cpp	20 Apr 2005 12:34:56 -0000	1.80
***************
*** 831,835 ****
  void RKwardApp::newOutput () {
  	RK_TRACE (APP);
! 	refreshOutput (RKSettingsModuleOutput::autoShow ());
  }
  
--- 831,835 ----
  void RKwardApp::newOutput () {
  	RK_TRACE (APP);
! 	refreshOutput (RKSettingsModuleOutput::autoShow (), RKSettingsModuleOutput::autoRaise ());
  }
  
***************
*** 1144,1148 ****
   */
  void RKwardApp::slotOutputShow () {
! 	refreshOutput (true);
  }
  
--- 1144,1148 ----
   */
  void RKwardApp::slotOutputShow () {
! 	refreshOutput (true, true);
  }
  
***************
*** 1157,1178 ****
  		QFile out_file (RKSettingsModuleLogfiles::filesPath () + "/rk_out.html");
  		out_file.remove ();
! 		refreshOutput (false);
  	}
  }
  
! void RKwardApp::refreshOutput (bool show) {
  	KMdiChildView* outp = outputView();
  	if (outp){
! 		activateView(outp);
! 		// let's also refresh the output - can't do any harm
! 		if ( activeWindow()->inherits("RKHelpWindow"))
! 		((RKHelpWindow*) activeWindow())->refresh();
  	} else {
  		if (show) {
! 			RKHelpWindow *out = new RKHelpWindow(this,"output",true);
! 			KURL url(RKSettingsModuleLogfiles::filesPath() + "/rk_out.html");
  			out->openURL (url);	
! 			out->setIcon(SmallIcon("text_block"));
! 			addWindow( out );
  		}
  	}
--- 1157,1179 ----
  		QFile out_file (RKSettingsModuleLogfiles::filesPath () + "/rk_out.html");
  		out_file.remove ();
! 		refreshOutput (false, false);
  	}
  }
  
! void RKwardApp::refreshOutput (bool show, bool raise) {
  	KMdiChildView* outp = outputView();
  	if (outp){
! 		if (raise) {
! 			activateView (outp);
! 		}
! 		// do we need this if?
! 		if (outp->inherits ("RKHelpWindow")) static_cast<RKHelpWindow*> (outp)->refresh ();
  	} else {
  		if (show) {
! 			RKHelpWindow *out = new RKHelpWindow (this,"output",true);
! 			KURL url (RKSettingsModuleLogfiles::filesPath () + "/rk_out.html");
  			out->openURL (url);	
! 			out->setIcon (SmallIcon ("text_block"));
! 			addWindow (out);
  		}
  	}

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** rkward.h	20 Apr 2005 12:14:56 -0000	1.33
--- rkward.h	20 Apr 2005 12:34:56 -0000	1.34
***************
*** 310,315 ****
  
  /** refreshes the output.
! 	@param show if set to true, the output-window will be shown / raised. If set to false, the visibility will not be changed */
! 	void refreshOutput (bool show);
  signals:
      void childWindowCloseRequest(KMdiChildView * window);
--- 310,316 ----
  
  /** refreshes the output.
! 	@param show if set to true, the output-window will be shown / raised. If set to false, the visibility will not be changed
! 	@param raise like show. If set to true, the output-window - if already shown - will additionally be raised */
! 	void refreshOutput (bool show, bool raise);
  signals:
      void childWindowCloseRequest(KMdiChildView * window);