[rkward-cvs] rkward/rkward/windows rkcommandeditorwindow.cpp,1.10,1.11 rkcommandeditorwindow.h,1.6,1.7 rkhelpwindow.cpp,1.1,1.2 rkhelpwindow.h,1.1,1.2

[Pierre]

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

Modified Files:
	rkcommandeditorwindow.cpp rkcommandeditorwindow.h 
	rkhelpwindow.cpp rkhelpwindow.h 
Log Message:
Mainly adding the help window.

Index: rkhelpwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhelpwindow.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkhelpwindow.cpp	25 Feb 2005 14:42:28 -0000	1.1
--- rkhelpwindow.cpp	25 Feb 2005 15:46:00 -0000	1.2
***************
*** 18,21 ****
--- 18,22 ----
  
  #include <qfile.h>
+ #include <qlayout.h>
  
  #include "rkhelpwindow.h"
***************
*** 33,36 ****
--- 34,40 ----
  	khtmlpart->view()->setName("Help"); 
  	khtmlpart->view()->setCaption(i18n("Help")); 
+ 	
+ 	pLayout = new QHBoxLayout( this, 0, -1, "layout");
+ 	pLayout->addWidget(khtmlpart->view());
  }
  
***************
*** 49,52 ****
--- 53,58 ----
  	if (QFile::exists( url.path() )) {
  		khtmlpart->openURL(url);
+ 		setTabCaption(url.fileName());
+ 		setCaption(url.prettyURL());
  		return(true);
  	}

Index: rkcommandeditorwindow.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rkcommandeditorwindow.cpp	4 Nov 2004 17:51:18 -0000	1.10
--- rkcommandeditorwindow.cpp	25 Feb 2005 15:46:00 -0000	1.11
***************
*** 30,37 ****
--- 30,39 ----
  
  
+ 
  #include <qlayout.h>
  #include <qpopupmenu.h>
  #include <qapplication.h>
  #include <qtabwidget.h>
+ #include <qfile.h>
  
  #include <klocale.h>
***************
*** 52,55 ****
--- 54,59 ----
  #include "../debug.h"
  
+ #define GET_HELP_URL 1
+ 
  
  RKCommandEditorWindow::RKCommandEditorWindow (QWidget *parent) : KMdiChildView (parent) {
***************
*** 250,251 ****
--- 254,284 ----
  	}
  }
+ 
+ 
+ void RKCommandEditorWindow::showHelp()
+ {
+ 	chain=0;
+ 	QString s="help(\"";
+ 	s.append(m_view->currentWord());
+ 	s.append("\", htmlhelp=TRUE)[1]");
+ 	
+ 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_HELP_URL, chain);
+ 
+ 		
+ }
+ 
+ void RKCommandEditorWindow::rCommandDone (RCommand *command) {
+ 	RK_TRACE (COMMANDEDITOR);
+ 	
+ 	KURL url;
+ 	
+ 	if (command->getFlags () == GET_HELP_URL) {
+ 		url.setPath(command->getStringVector ()[0]);
+ 		if (QFile::exists( url.path() )) {
+ 			RKGlobals::rkApp()->openHTML(url);
+ 			return;
+ 		}
+ 	} else {
+ 		RK_ASSERT (false);
+ 	}
+ }

Index: rkhelpwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkhelpwindow.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkhelpwindow.h	25 Feb 2005 14:42:28 -0000	1.1
--- rkhelpwindow.h	25 Feb 2005 15:46:00 -0000	1.2
***************
*** 30,33 ****
--- 30,34 ----
  private:
      KHTMLPart * khtmlpart;
+     QBoxLayout* pLayout;
  };
  

Index: rkcommandeditorwindow.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/windows/rkcommandeditorwindow.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rkcommandeditorwindow.h	3 Nov 2004 14:53:41 -0000	1.6
--- rkcommandeditorwindow.h	25 Feb 2005 15:46:00 -0000	1.7
***************
*** 31,34 ****
--- 31,36 ----
  #include <kmdichildview.h>
  
+ #include "../rbackend/rcommandreceiver.h"
+ 
  #include <kurl.h>
  
***************
*** 37,40 ****
--- 39,43 ----
  class KToggleAction;
  class RKwardApp; 
+ class RCommandChain;
  
  /**
***************
*** 43,47 ****
  @author Pierre Ecochard
  */
! class RKCommandEditorWindow : public KMdiChildView {
  Q_OBJECT
  public:
--- 46,50 ----
  @author Pierre Ecochard
  */
! class RKCommandEditorWindow : public KMdiChildView, public RCommandReceiver {
  Q_OBJECT
  public:
***************
*** 63,67 ****
      void redo();
      void insertText(QString text);
! 
  private:
  	Kate::Document *m_doc;
--- 66,71 ----
      void redo();
      void insertText(QString text);
!     void showHelp();
!     void rCommandDone (RCommand *command);
  private:
  	Kate::Document *m_doc;
***************
*** 79,82 ****
--- 83,87 ----
  private:
      void updateTabCaption(const KURL &url);
+     RCommandChain *chain;
  };