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

[Pierre]

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

Modified Files:
	rkcommandeditorwindow.h rkhelpwindow.cpp rkhelpwindow.h 
Log Message:
Small things mainly.

Index: rkhelpwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhelpwindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rkhelpwindow.cpp	25 Feb 2005 22:28:26 -0000	1.3
--- rkhelpwindow.cpp	17 Mar 2005 07:37:42 -0000	1.4
***************
*** 37,40 ****
--- 37,44 ----
  	pLayout = new QHBoxLayout( this, 0, -1, "layout");
  	pLayout->addWidget(khtmlpart->view());
+ 	
+ 	// We have to connect this in order to allow browsing.
+ 	connect( khtmlpart->browserExtension(), SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), this, SLOT( slotOpenURLRequest(const KURL &, const KParts::URLArgs & ) ) );
+ 	
  }
  
***************
*** 61,62 ****
--- 65,78 ----
  	}
  }
+ 
+ 
+ /*!
+     \fn RKHelpWindow::slotOpenURLRequest(const KURL &, const KParts::URLArgs & )
+     Called when the user clicks on a link
+  */
+ void RKHelpWindow::slotOpenURLRequest(const KURL &url, const KParts::URLArgs & )
+ {
+ 	khtmlpart->openURL(url);
+ 	setTabCaption(url.fileName());
+ 	setCaption(url.prettyURL());
+ }

Index: rkhelpwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhelpwindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rkhelpwindow.h	25 Feb 2005 22:28:26 -0000	1.3
--- rkhelpwindow.h	17 Mar 2005 07:37:42 -0000	1.4
***************
*** 18,21 ****
--- 18,24 ----
  #define RKHELPWINDOW_H
  
+ #include <kurl.h>
+ #include <kparts/browserextension.h>
+ 
  #include <kmdichildview.h>
  
***************
*** 23,26 ****
--- 26,33 ----
  
  /**
+ \brief Show html help.
+ 
+ This class wraps a khtml part.
+ 
  @author Pierre Ecochard
  */
***************
*** 33,36 ****
--- 40,45 ----
      ~RKHelpWindow();
      bool openURL(KURL url);
+ public slots:
+     void slotOpenURLRequest(const KURL &url, const KParts::URLArgs & );
  private:
      KHTMLPart * khtmlpart;

Index: rkcommandeditorwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rkcommandeditorwindow.h	25 Feb 2005 15:46:00 -0000	1.7
--- rkcommandeditorwindow.h	17 Mar 2005 07:37:42 -0000	1.8
***************
*** 42,46 ****
  
  /**
! This class provides an editor window for R-commands. It is an MDI child that is added to the main window.
  
  @author Pierre Ecochard
--- 42,47 ----
  
  /**
! \brief This class provides an editor window for R-commands.
! This class is an MDI child that is added to the main window.
  
  @author Pierre Ecochard
***************
*** 66,74 ****
      void redo();
      void insertText(QString text);
      void showHelp();
      void rCommandDone (RCommand *command);
  private:
  	Kate::Document *m_doc;
! 	   
  	void setRHighlighting (Kate::Document *doc);
  	KLibrary *m_library;
--- 67,76 ----
      void redo();
      void insertText(QString text);
+     /** Show help about the current word. */
      void showHelp();
      void rCommandDone (RCommand *command);
  private:
  	Kate::Document *m_doc;
! 	
  	void setRHighlighting (Kate::Document *doc);
  	KLibrary *m_library;