[Sciviews-commits] r436 - in komodo: . SciViews-K SciViews-K/content SciViews-K/content/js SciViews-K/defaults

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2012-02-19 14:35:13 +0100 (Sun, 19 Feb 2012)
New Revision: 436

Modified:
   komodo/SciViews-K/content/RHelpWindow.xul
   komodo/SciViews-K/content/js/r-help.js
   komodo/SciViews-K/defaults/svStart.R
   komodo/SciViews-K/install.rdf
   komodo/TODO
Log:
Temporary disable RHelp window, cf. crashes Komodo on Windows and Linux

Modified: komodo/SciViews-K/content/RHelpWindow.xul
===================================================================
--- komodo/SciViews-K/content/RHelpWindow.xul	2012-02-19 09:33:43 UTC (rev 435)
+++ komodo/SciViews-K/content/RHelpWindow.xul	2012-02-19 13:35:13 UTC (rev 436)
@@ -50,7 +50,7 @@
 <window
     id="RHelpWindow" title="R Help"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    width="700" height="500" screenX="20" screenY="20"
+    width="700" height="500"
     persist="screenX screenY width height"
     style="min-height: 400px; min-width: 300px;">
 <script type="text/javascript">
@@ -248,7 +248,7 @@
 	sv.r.eval(selText);
 }
 
-// display formatted search results in a help window
+// Display formatted search results in a help window
 function rHelpSearch(topic) {
 	if (!topic)	return;
 

Modified: komodo/SciViews-K/content/js/r-help.js
===================================================================
--- komodo/SciViews-K/content/js/r-help.js	2012-02-19 09:33:43 UTC (rev 435)
+++ komodo/SciViews-K/content/js/r-help.js	2012-02-19 13:35:13 UTC (rev 436)
@@ -2,7 +2,7 @@
 // Define functions to pilot R from Komodo Edit 'sv.r' & 'sv.r.pkg'
 // based on original Komodo code
 // Copyright (c) 2000-2007, ActiveState Software Inc
-// Copyright (c) 2009-2010, Kamil Bartoñ
+// Copyright (c) 2009-2010, Kamil Barton
 // License: MPL 1.1/GPL 2.0/LGPL 2.1
 ////////////////////////////////////////////////////////////////////////////////
 // ko.help.language();	// Replacement for language specific help on selection

Modified: komodo/SciViews-K/defaults/svStart.R
===================================================================
--- komodo/SciViews-K/defaults/svStart.R	2012-02-19 09:33:43 UTC (rev 435)
+++ komodo/SciViews-K/defaults/svStart.R	2012-02-19 13:35:13 UTC (rev 436)
@@ -505,8 +505,11 @@
 				url <- sub("^/", "file:///", url)
 				koCmd(sprintf("sv.command.openHelp(\"%s\")", url))
 			}
-
-			options(editor = Komodo, browser = svBrowser, pager = svPager)
+			## The current SciViews-K help window in Komodo is buggy
+			## it let's Komodo crash on closing, and probably causes
+			## other problems => for now, just use the default browser!
+			#options(editor = Komodo, browser = svBrowser, pager = svPager)
+			options(editor = Komodo)
 		} else {
 			Komodo <- NULL
 			cat("R cannot find Komodo.", file = stderr())

Modified: komodo/SciViews-K/install.rdf
===================================================================
--- komodo/SciViews-K/install.rdf	2012-02-19 09:33:43 UTC (rev 435)
+++ komodo/SciViews-K/install.rdf	2012-02-19 13:35:13 UTC (rev 436)
@@ -4,7 +4,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:id>sciviewsk at sciviews.org</em:id>
         <em:name>SciViews-K</em:name>
-        <em:version>0.9.25</em:version>
+        <em:version>0.9.26</em:version>
         <em:description>Edit R (http://www.r-project.org) code with Komodo</em:description>
         <em:creator>Philippe Grosjean</em:creator>
         <em:contributor>Romain Francois</em:contributor>

Modified: komodo/TODO
===================================================================
--- komodo/TODO	2012-02-19 09:33:43 UTC (rev 435)
+++ komodo/TODO	2012-02-19 13:35:13 UTC (rev 436)
@@ -1,23 +1,10 @@
 = SciViews-K To Do
  
-* In version 0.9.16, there is still a problem with the selection of the
-R interpreter: in Windows, switching from RGui to console do not switch
-from Rgui.exe and Rterm.exe and vice-versa.
+* Solve crash on closing Komodo. Seems related with the help window.
 
 * Resolve conflicting shortcuts and define shortcuts that can be used on all
 platforms => difficult task!
 
-* svRQuiet should be a string, not a boolean. Shouldn't we switch to svRArgs
-which would contain more args than just --quiet?
-
-* Allow defining in which library to install R packages during configuration of
-R.
-
-* Start from the R server port configuration and make it a multi-session system.
-
-* There is a bug with the abbrev expansion that prevents correct detection of
-abbrev when the file is not saved or saved with a different extension than .R
-
 * svIO and svViews in relation to objects explorer
 
 * Add R language entry in Help menu
@@ -28,19 +15,15 @@
 
 * Tidy R code tool
 
-* Use JSON to transport objects between R and Komodo
-
 * Configuration of R when started from .RData files.
 
 * R reference cards
 
-* All the Tinn-R function that are still missing
-
 * Make Rd syntax highlighting; sweave later on
 
-* R Linter
+* R Linter does not work under Windows
 
-* Add SciViews-K Unit features to SciViews-K
+* Rework SciViews-K Unit to work with Komodo 6
 
 * Make the User's and Developer's manuals