[rkward-cvs] rkward/rkward rkward.cpp,1.121,1.122 rkward.h,1.53,1.54 rkwardui.rc,1.28,1.29

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.cpp rkward.h rkwardui.rc 
Log Message:
Add option R Help to the Help menu

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** rkward.cpp	13 Nov 2005 19:07:40 -0000	1.121
--- rkward.cpp	29 Mar 2006 14:17:33 -0000	1.122
***************
*** 296,302 ****
  	window_detach = new KAction (i18n ("Detach"), 0, 0, this, SLOT (slotDetachWindow ()), actionCollection (), "window_detach");
  	outputShow= new KAction (i18n ("Show &Output"), 0, 0, this, SLOT (slotOutputShow ()), actionCollection (), "output_show");
- 
  	configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT (slotConfigure ()), actionCollection (), "configure");
! 	
  	new_data_frame->setStatusText (i18n ("Creates new empty dataset and opens it for editing"));
  	fileOpenWorkspace->setStatusText(i18n("Opens an existing document"));
--- 296,302 ----
  	window_detach = new KAction (i18n ("Detach"), 0, 0, this, SLOT (slotDetachWindow ()), actionCollection (), "window_detach");
  	outputShow= new KAction (i18n ("Show &Output"), 0, 0, this, SLOT (slotOutputShow ()), actionCollection (), "output_show");
  	configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT (slotConfigure ()), actionCollection (), "configure");
! 	help_invoke_r_help = new KAction (i18n ("Help on R"), 0, 0, this, SLOT (invokeRHelp ()), actionCollection (), "invoke_r_help");
! 
  	new_data_frame->setStatusText (i18n ("Creates new empty dataset and opens it for editing"));
  	fileOpenWorkspace->setStatusText(i18n("Opens an existing document"));
***************
*** 306,309 ****
--- 306,310 ----
  	close_all_editors->setStatusText (i18n ("Closes all open data editors"));
  	fileQuit->setStatusText(i18n("Quits the application"));
+ 	help_invoke_r_help->setStatusText (i18n ("Shows the R help index"));
  
  	actionCollection ()->setHighlightingEnabled (true);
***************
*** 485,491 ****
  }
  
! /////////////////////////////////////////////////////////////////////
! // SLOT IMPLEMENTATION
! /////////////////////////////////////////////////////////////////////
  
  void RKwardApp::slotNewDataFrame () {
--- 486,494 ----
  }
  
! void RKwardApp::invokeRHelp () {
! 	RK_TRACE (APP);
! 
! 	RKGlobals::rInterface ()->issueCommand ("help.start ()", RCommand::App);
! }
  
  void RKwardApp::slotNewDataFrame () {

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** rkward.h	13 Nov 2005 19:07:40 -0000	1.53
--- rkward.h	29 Mar 2006 14:17:33 -0000	1.54
***************
*** 138,141 ****
--- 138,143 ----
  
  public slots:
+ 	/** Invokes R help (help.start ()) */
+ 	void invokeRHelp ();
  	/** raises the watch window */
  	void raiseWatch ();
***************
*** 220,223 ****
--- 222,227 ----
  	KAction* window_close_all;
  	KAction* window_detach;
+ 
+ 	KAction* help_invoke_r_help;
  	
  	KAction* configure;

Index: rkwardui.rc
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwardui.rc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** rkwardui.rc	23 Oct 2005 22:07:24 -0000	1.28
--- rkwardui.rc	29 Mar 2006 14:17:33 -0000	1.29
***************
*** 42,45 ****
--- 42,50 ----
  		<Action name="configure"/>
  	</Menu>
+ 
+ 	<Menu name="help"><text>&Help</text>
+ 		<Action name="invoke_r_help"/>
+ 	</Menu>
+ 
  </MenuBar>
  <ToolBar fullWidth="true" name="mainToolBar">