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

[tfry at users.sourceforge.net]

Revision: 3811
          http://rkward.svn.sourceforge.net/rkward/?rev=3811&view=rev
Author:   tfry
Date:     2011-09-21 13:51:03 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Fix basic back / forward navigation

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-09-21 08:47:36 UTC (rev 3810)
+++ trunk/rkward/ChangeLog	2011-09-21 13:51:03 UTC (rev 3811)
@@ -9,7 +9,7 @@
 - New option to run arbitrary (setup) commands in each session
 - Added new pseudo graphics device "rk.printer.device" to provide printing via the KDE printer dialog
 - Fixed: Printing was broken when kprinter is not available
-- Support the results list new help.search() in R 2.14.x, which includes vignettes and demos		# TODO: actually test this with R 2.14!
+- Support the results list new help.search() in R 2.14.x, which includes vignettes and demos
 - rk.edit.files() and rk.show.files() gain parameter "prompt", which can be used to suppress user prompt
 - Added function rk.demo(), which is similar to demo(), but opens the example script in a script editor window
 - Fixed: Some plugin dialogs would not become visible, or be shown in very small size, with some window managers
@@ -21,7 +21,7 @@
 - "frame" elements in plugins can now be made checkable
 - Disabling or hiding a plugin component makes it non-required, implicitly
 - Box plot gains option to dogde grouped boxes
-- Simplify internal handling of system() and system2() output					TODO: test on Windows!
+- Simplify internal handling of system() and system2() output
 - Simplify code produced by several plugins
 - Fixed: Occasional duplication of first letter of keyword, when using "Copy lines to output" from the console window
 

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2011-09-21 08:47:36 UTC (rev 3810)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2011-09-21 13:51:03 UTC (rev 3811)
@@ -292,6 +292,12 @@
 		return ok;
 	}
 
+	if (url_change_is_from_history || url.protocol ().toLower ().startsWith ("help")) {	// handle help pages, and any page that we have previously handled (from history)
+		khtmlpart->openUrl (url);
+		changeURL (url);
+		return true;
+	}
+
 	// special casing for R's dynamic help pages. These should be considered local, even though they are served through http
 	if (url.protocol ().toLower ().startsWith ("http")) {
 		QString host = url.host ();
@@ -300,10 +306,6 @@
 			connect (job, SIGNAL (mimetype(KIO::Job*, const QString&)), this, SLOT (mimeTypeDetermined(KIO::Job*, const QString&)));
 			return true;
 		}
-	} else if (url.protocol ().toLower ().startsWith ("help")) {
-		khtmlpart->openUrl (url);
-		changeURL (url);
-		return true;
 	}
 
 	RKWorkplace::mainWorkplace ()->openAnyUrl (url, QString (), KMimeType::findByUrl (url)->is ("text/html"));	// NOTE: text/html type urls, which we have not handled, above, are forced to be opened externally, to avoid recursion. E.g. help:// protocol urls.

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