[rkward-cvs] rkward/rkward rkward.cpp,1.56,1.57 rkward.h,1.25,1.26 rkwardui.rc,1.16,1.17

[Pierre]

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

Modified Files:
	rkward.cpp rkward.h rkwardui.rc 
Log Message:
Mainly adding the help window.

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** rkward.cpp	30 Nov 2004 10:56:40 -0000	1.56
--- rkward.cpp	25 Feb 2005 15:46:01 -0000	1.57
***************
*** 74,77 ****
--- 74,78 ----
  #include "agents/rkloadagent.h"
  #include "windows/rkcommandeditorwindow.h"
+ #include "windows/rkhelpwindow.h"
  
  #include "debug.h"
***************
*** 356,359 ****
--- 357,362 ----
  	file_load_libs = new KAction (i18n ("Configure Packages"), 0, 0, this, SLOT (slotFileLoadLibs ()), actionCollection (), "file_load_libs");	
  	configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT(slotConfigure ()), actionCollection(), "configure");
+ 	
+ 	helpFunction = new KAction (i18n ("&Function reference"), KShortcut ("Ctrl+I"), this, SLOT(slotFunctionReference ()), actionCollection(), "function_reference");
  
  	new_data_frame->setStatusText (i18n ("Creates new empty dataset and opens it for editing"));
***************
*** 990,994 ****
  void RKwardApp::slotChildWindowCloseRequest (KMdiChildView * window) {
  	//If it's an unsaved command editor window, there is a warning.
! 	if (window->inherits("RKCommandEditorWindow")) 	{
  		RKCommandEditorWindow * editor = (RKCommandEditorWindow*) window;
  		if (editor->isModified()) {
--- 993,997 ----
  void RKwardApp::slotChildWindowCloseRequest (KMdiChildView * window) {
  	//If it's an unsaved command editor window, there is a warning.
! 	if (window->inherits("RKCommandEditorWindow")) {
  		RKCommandEditorWindow * editor = (RKCommandEditorWindow*) window;
  		if (editor->isModified()) {
***************
*** 1004,1010 ****
  			delete window;	
  		}
! 		
! 
! 		
  	}
  }
--- 1007,1013 ----
  			delete window;	
  		}
! 	}
! 	else if (window->inherits("RKHelpWindow")){
! 		delete window;
  	}
  }
***************
*** 1099,1100 ****
--- 1102,1122 ----
  	}
  }
+ 
+ void RKwardApp::openHTML(KURL url)
+ {
+ 	RKHelpWindow *help = new RKHelpWindow;
+ 	help->openURL (url);	
+ 	help->setIcon(SmallIcon("help"));
+ 	addWindow( help );
+ }
+ 
+ 
+ 
+ void RKwardApp::slotFunctionReference()
+ {
+ 	if (! activeWindow()->inherits("RKCommandEditorWindow"))
+ 		return;
+ 	((RKCommandEditorWindow*) activeWindow())->showHelp();
+ 	
+ }
+ 

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** rkward.h	3 Nov 2004 14:53:42 -0000	1.25
--- rkward.h	25 Feb 2005 15:46:01 -0000	1.26
***************
*** 80,83 ****
--- 80,84 ----
  	void fileOpenNoSave (const KURL &url);
  	void fileOpenAskSave (const KURL &url);
+ 	void openHTML(KURL url);
  protected:
  	void openWorkspace (const KURL &url);
***************
*** 184,188 ****
  	void slotConfigure ();
  
! /** Init-procedures to be done after the exec-loop was started */
  	void doPostInit ();
  	
--- 185,189 ----
  	void slotConfigure ();
  
! 	/** Init-procedures to be done after the exec-loop was started */
  	void doPostInit ();
  	
***************
*** 195,206 ****
  	void slotCloseCommandEditor();
  	void slotOpenURL(const KURL &url);
!     void slotChildWindowCloseRequest (KMdiChildView * window);
!     void slotRunSelection();
!     void slotInterruptCommand();
!     void slotRunAll();
!     void slotEditUndo();
!     void slotEditRedo();
!     void slotViewActivated (KMdiChildView *window);
!     void slotOpenRecentCommandEditor(const KURL&);
    private:
      /** the configuration object of the application */
--- 196,208 ----
  	void slotCloseCommandEditor();
  	void slotOpenURL(const KURL &url);
! 	void slotChildWindowCloseRequest (KMdiChildView * window);
! 	void slotRunSelection();
! 	void slotInterruptCommand();
! 	void slotRunAll();
! 	void slotEditUndo();
! 	void slotEditRedo();
! 	void slotViewActivated (KMdiChildView *window);
! 	void slotOpenRecentCommandEditor(const KURL&);
! 	void slotFunctionReference();
    private:
      /** the configuration object of the application */
***************
*** 248,251 ****
--- 250,255 ----
  	KAction* interruptCommand;
  	KAction* configure;
+ 	
+ 	KAction* helpFunction;
  
  	friend class RKSettingsModule;

Index: rkwardui.rc
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwardui.rc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** rkwardui.rc	2 Dec 2004 19:13:12 -0000	1.16
--- rkwardui.rc	25 Feb 2005 15:46:01 -0000	1.17
***************
*** 19,22 ****
--- 19,24 ----
  		<Action name="file_save_asx"/>
  		<Separator/>
+ 		<Action name="file_load_libs"/>
+ 		<Separator/>
  		<Action name="file_printx"/>
  		<Separator/>
***************
*** 49,52 ****
--- 51,57 ----
  		<Action name="configure"></Action>
  	</Menu>
+ 	<Menu name="help"><text>&Help</text>
+ 		<Action name="function_reference"></Action>
+ 	</Menu>
   	<Merge/>
  </MenuBar>