[rkward-cvs] rkward/rkward rkward.cpp,1.122,1.123 rkward.h,1.54,1.55 rkwardui.rc,1.29,1.30

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.cpp rkward.h rkwardui.rc 
Log Message:
Add option to show help search window to Help menu

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** rkward.cpp	29 Mar 2006 14:17:33 -0000	1.122
--- rkward.cpp	29 Mar 2006 14:36:28 -0000	1.123
***************
*** 193,197 ****
  	RKGlobals::helpdlg = new KHelpDlg (0);
  	RKGlobals::helpDialog ()->setIcon (SmallIcon ("help"));
! 	addToolWindow (RKGlobals::helpDialog (), KDockWidget::DockBottom, getMainDockWidget (), 10);
  
  	if (initial_url) {
--- 193,197 ----
  	RKGlobals::helpdlg = new KHelpDlg (0);
  	RKGlobals::helpDialog ()->setIcon (SmallIcon ("help"));
! 	search_help_view = addToolWindow (RKGlobals::helpDialog (), KDockWidget::DockBottom, getMainDockWidget (), 10);
  
  	if (initial_url) {
***************
*** 298,301 ****
--- 298,302 ----
  	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");
+ 	KAction *show_help_search = new KAction (i18n ("Search R Help"), 0, 0, this, SLOT (showHelpSearch ()), actionCollection (), "show_help_search");
  
  	new_data_frame->setStatusText (i18n ("Creates new empty dataset and opens it for editing"));
***************
*** 492,495 ****
--- 493,502 ----
  }
  
+ void RKwardApp::showHelpSearch () {
+ 	RK_TRACE (APP);
+ 
+ 	search_help_view->show ();
+ }
+ 
  void RKwardApp::slotNewDataFrame () {
  	RK_TRACE (APP);

Index: rkward.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** rkward.h	29 Mar 2006 14:17:33 -0000	1.54
--- rkward.h	29 Mar 2006 14:36:28 -0000	1.55
***************
*** 138,141 ****
--- 138,143 ----
  
  public slots:
+ 	/** Raise the help search window */
+ 	void showHelpSearch ();
  	/** Invokes R help (help.start ()) */
  	void invokeRHelp ();
***************
*** 228,231 ****
--- 230,234 ----
  
  	KMdiToolViewAccessor *watch_view;
+ 	KMdiToolViewAccessor *search_help_view;
  	
  	friend class RKSettingsModule;

Index: rkwardui.rc
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwardui.rc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** rkwardui.rc	29 Mar 2006 14:17:33 -0000	1.29
--- rkwardui.rc	29 Mar 2006 14:36:28 -0000	1.30
***************
*** 45,48 ****
--- 45,49 ----
  	<Menu name="help"><text>&Help</text>
  		<Action name="invoke_r_help"/>
+ 		<Action name="show_help_search"/>
  	</Menu>