[rkward-cvs] SF.net SVN: rkward: [892] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 892
          http://svn.sourceforge.net/rkward/?rev=892&view=rev
Author:   tfry
Date:     2006-10-20 04:30:16 -0700 (Fri, 20 Oct 2006)

Log Message:
-----------
Clean up misleading information in help menu

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/main.cpp
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/rkward.h
    trunk/rkward/rkward/rkwardui.rc

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2006-10-20 10:35:19 UTC (rev 891)
+++ trunk/rkward/ChangeLog	2006-10-20 11:30:16 UTC (rev 892)
@@ -1,3 +1,4 @@
+- remove misleading "About KDE" dialog, and replace report Bug dialog with correct information
 - don't crash when closing a detached window
 - as you type completion of R symbol names in the script editor
 - function argument hinting in the console

Modified: trunk/rkward/rkward/main.cpp
===================================================================
--- trunk/rkward/rkward/main.cpp	2006-10-20 10:35:19 UTC (rev 891)
+++ trunk/rkward/rkward/main.cpp	2006-10-20 11:30:16 UTC (rev 892)
@@ -81,7 +81,7 @@
 };
 
 int main(int argc, char *argv[]) {
-	KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2004, 2005, 2006", 0, "http://rkward.sf.net", 0);
+	KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2004, 2005, 2006", 0, "http://rkward.sf.net", "rkward-devel at lists.sourceforge.net");
 	aboutData.addAuthor ("Thomas Friedrichsmeier", I18N_NOOP ("Project leader"), 0);
 	aboutData.addAuthor ("Pierre Ecochard",  I18N_NOOP ("Core coder since 0.2.9"), 0);
 	aboutData.addCredit ("Contributors in alphabetical order", 0, 0);

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2006-10-20 10:35:19 UTC (rev 891)
+++ trunk/rkward/rkward/rkward.cpp	2006-10-20 11:30:16 UTC (rev 892)
@@ -24,6 +24,7 @@
 #include <qtimer.h>
 
 // include files for KDE
+#include <kaboutapplication.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
@@ -110,6 +111,7 @@
 	///////////////////////////////////////////////////////////////////
 	// build the interface
 
+	setHelpMenuEnabled (false);
 	setXMLFile ("rkwardui.rc");
 	createShellGUI (true);
 
@@ -299,6 +301,11 @@
 	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");
 
+	KStdAction::helpContents (this, SLOT (appHelpActivated ()), actionCollection ());
+	KStdAction::aboutApp (this, SLOT (showAboutApplication ()), actionCollection ());
+	KStdAction::whatsThis (this, SLOT (whatsThis ()), actionCollection ());
+	KStdAction::reportBug (this, SLOT (reportRKWardBug ()), actionCollection ());
+
 	new_data_frame->setStatusText (i18n ("Creates new empty dataset and opens it for editing"));
 	fileOpenWorkspace->setStatusText(i18n("Opens an existing document"));
 	fileOpenRecentWorkspace->setStatusText(i18n("Opens a recently used file"));
@@ -492,6 +499,21 @@
 	RKGlobals::rInterface ()->issueCommand ("help.start ()", RCommand::App);
 }
 
+void RKwardApp::reportRKWardBug () {
+	RK_TRACE (APP);
+
+// TOOD: something pretty
+	KMessageBox::information (this, i18n ("Please submit your bug reports or wishes at http://sourceforge.net/tracker/?group_id=50231&atid=459007 or send email to rkward-devel at lists.sourceforge.net"));
+}
+
+void RKwardApp::showAboutApplication () {
+	RK_TRACE (APP);
+
+	KAboutApplication *about = new KAboutApplication ();
+	about->exec ();
+	delete about;
+}
+
 void RKwardApp::showHelpSearch () {
 	RK_TRACE (APP);
 

Modified: trunk/rkward/rkward/rkward.h
===================================================================
--- trunk/rkward/rkward/rkward.h	2006-10-20 10:35:19 UTC (rev 891)
+++ trunk/rkward/rkward/rkward.h	2006-10-20 11:30:16 UTC (rev 892)
@@ -128,6 +128,10 @@
 	void showHelpSearch ();
 	/** Invokes R help (help.start ()) */
 	void invokeRHelp ();
+	/** show instructions on reporting bugs in rkward */
+	void reportRKWardBug ();
+	/** not quite sure, why I have to reimplement this from KMainWindow */
+	void showAboutApplication ();
 	/** raises the watch window */
 	void raiseWatch ();
 	/** creates a new (empty) data.frame */

Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc	2006-10-20 10:35:19 UTC (rev 891)
+++ trunk/rkward/rkward/rkwardui.rc	2006-10-20 11:30:16 UTC (rev 892)
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.3.3">
+<kpartgui name="rkward" version="0.4.0">
 <MenuBar>
 	<Menu name="file"><text>&File</text>
 		<Menu name="new_data"><text>&New</text>
@@ -45,6 +45,7 @@
 	<Menu name="help"><text>&Help</text>
 		<Action name="invoke_r_help"/>
 		<Action name="show_help_search"/>
+		<Merge/>
 	</Menu>
 
 </MenuBar>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.