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

[tfry at users.sourceforge.net]

Revision: 2563
          http://rkward.svn.sourceforge.net/rkward/?rev=2563&view=rev
Author:   tfry
Date:     2009-07-02 08:21:38 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
Do not check, whether the output window file is HTML.

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

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2009-07-01 10:27:51 UTC (rev 2562)
+++ trunk/rkward/ChangeLog	2009-07-02 08:21:38 UTC (rev 2563)
@@ -1,3 +1,4 @@
+TODO: clean up the tests-dir in makedist.sh
 TODO: add notice on differing licences/copyrights in subdirs
 - New command line option "--evaluate <Rcode>" mostly for the purpose of automated testing
 - Remove support for R 2.6.x and earlier		TODO: clean up more (RData?), adjust debian control

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2009-07-01 10:27:51 UTC (rev 2562)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2009-07-02 08:21:38 UTC (rev 2563)
@@ -257,14 +257,14 @@
 			RK_ASSERT (false);
 			return false;
 		}
+	} else {
+		// this also means, that we bail out on almost all non-local files.
+		if (!KMimeType::findByUrl (url)->is ("text/html")) {
+			RKWorkplace::mainWorkplace ()->openAnyUrl (url);
+			return true;
+		}
 	}
 
-	// this also means, that we bail out on almost all non-local files.
-	if (!KMimeType::findByUrl (url)->is ("text/html")) {
-		RKWorkplace::mainWorkplace ()->openAnyUrl (url);
-		return true;
-	}
-
 	QFileInfo out_file (url.path ());
 	bool ok = out_file.exists();
 	if (ok)  {
@@ -382,9 +382,6 @@
 
 		setXMLFile ("rkoutputwindow.rc");
 		run_selection->setVisible (false);
-
-		if (parentClient ()) khtmlpart->removeChildClient (this);
-		khtmlpart->insertChildClient (this);
 	} else {
 		RK_ASSERT (new_mode == HTMLHelpWindow);
 
@@ -398,11 +395,11 @@
 
 		setXMLFile ("rkhelpwindow.rc");
 		run_selection->setVisible (true);
-
-		if (parentClient ()) khtmlpart->removeChildClient (this);
-		khtmlpart->insertChildClient (this);
 	}
 
+	if (parentClient ()) khtmlpart->removeChildClient (this);
+	khtmlpart->insertChildClient (this);
+
 	updateCaption (current_url);
 	window_mode = new_mode;
 }


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