[Sciviews-commits] r455 - in komodo/SciViews-K: . content content/js
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Mar 3 18:27:07 CET 2012
Author: phgrosjean
Date: 2012-03-03 18:27:07 +0100 (Sat, 03 Mar 2012)
New Revision: 455
Added:
komodo/SciViews-K/content/RConsole2Pane.xul
komodo/SciViews-K/content/overlayMain-ko6.xul
komodo/SciViews-K/content/placesOverlay.xul
Modified:
komodo/SciViews-K/chrome.manifest
komodo/SciViews-K/content/js/commands.js
komodo/SciViews-K/content/js/rconsole.js
komodo/SciViews-K/content/js/robjects.js
komodo/SciViews-K/content/overlayMain.xul
komodo/SciViews-K/content/rObjects2Pane.xul
komodo/SciViews-K/content/sessions.xul
Log:
Incorporation of SciViews-K-dev changes into SciViews-K: Ko7 changes + places + session (part VII)
Modified: komodo/SciViews-K/chrome.manifest
===================================================================
--- komodo/SciViews-K/chrome.manifest 2012-03-03 15:09:15 UTC (rev 454)
+++ komodo/SciViews-K/chrome.manifest 2012-03-03 17:27:07 UTC (rev 455)
@@ -1,10 +1,19 @@
content sciviewsk jar:sciviewsk.jar!/content/ xpcnativewrappers=yes
-overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/overlayMain.xul
-overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/RObjectsOverlay.xul
+
+overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/overlayMain.xul appversion>6.99
+overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/overlayMain-ko6.xul appversion<=6.99
+
overlay chrome://komodo/content/pref/pref.xul chrome://sciviewsk/content/prefOverlay.xul
-overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/RConsoleOverlay.xul
+overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/RObjectsOverlay.xul appversion<=6.99
+
+overlay chrome://places/content/places_panel.xul chrome://sciviewsk/content/placesOverlay.xul appversion>6.99
+
+overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/RConsoleOverlay.xul appversion<=6.99
+
locale sciviewsk en-GB jar:sciviewsk.jar!/locale/en-GB/
locale sciviewsk fr-FR jar:sciviewsk.jar!/locale/fr-FR/
skin sciviewsk classic/1.0 jar:sciviewsk.jar!/skin/
+
+#manifest components/component.manifest
Added: komodo/SciViews-K/content/RConsole2Pane.xul
===================================================================
--- komodo/SciViews-K/content/RConsole2Pane.xul (rev 0)
+++ komodo/SciViews-K/content/RConsole2Pane.xul 2012-03-03 17:27:07 UTC (rev 455)
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is SciViews-K by Philippe Grosjean et al.
+
+ Contributor(s):
+ Activestate staff (original code is Komodo's runOutput window)
+ Philippe Grosjean, SciViews
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
+ "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" [
+ <!ENTITY % debuggerDTD SYSTEM "chrome://komodo/locale/komodo.dtd">
+ %debuggerDTD;
+]>
+
+<?xml-stylesheet href="chrome://global/content/xul.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/komodo.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/global/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/toolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/bindings/scrolltabs.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/bindings/sidebar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/bindings/views.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/bindings/widgets.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/platform.css" type="text/css"?>
+
+<?xul-overlay href="chrome://komodo/content/bindings/scintilla-overlay.xul"?>
+
+<!--<overlay id="sciviewskRconsoleOverlay"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">-->
+
+
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script type="application/x-javascript">
+ <![CDATA[
+ var sv;
+ if (window.parent && window.parent.sv) sv = window.parent.sv;
+ ]]>
+ </script>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/array.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/strings.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/file.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/rconsole.js"/>
+
+<!-- <menupopup id="tabPicker_popup">
+ <menuitem id="show_rconsole_tab" label="R Output"
+ insertbefore="show_runoutput_tab"
+ observes="show_sciviews_rconsole_tab"
+ oncommand="ko.uilayout.ensureTabShown('sciviews_rconsole_tab', true);"/>
+ </menupopup>
+
+ <menupopup id="menu_view_tabs_popup">
+ <menuitem id="show_rconsole_tab2" class="menuitem-iconic-wide"
+ insertbefore="show_runoutput_tab2"
+ label="R Output" type="checkbox"
+ observes="show_sciviews_rconsole_tab"
+ oncommand="ko.uilayout.ensureTabShown('sciviews_rconsole_tab', true);"/>
+ </menupopup> -->
+
+<!-- <tabs id="output_tabs">
+ <tab id="sciviews_rconsole_tab" label="R Output"
+ insertbefore="runoutput_tab"/> -->
+ <!--tooltiptext="A R process running locally"/>
+ onclick="sv.rconsole.run();"/>-->
+<!-- </tabs>
+
+ <tabpanels id="output_tabpanels">
+ <tabpanel flex="1" id="rconsole_tabpanel"
+ insertbefore="runoutput-desc-tabpanel"> -->
+
+ <vbox flex="1" id="rconsoleViewBox_Wrapper">
+
+
+ <vbox flex="1" id="rconsole-desc-tabpane">
+ <hbox id="rconsole-desc-tabpanel-toolbar-hbox"
+ class="toolbar-background toolbar-hbox">
+ <vbox flex="1">
+ <spring flex="1"/>
+ <label id="rconsole-desc" style="height: 15px;"
+ flex="1" crop="center"/>
+ <spring flex="1"/>
+ </vbox>
+ <spacer flex="1"/>
+ <hbox id="rconsole-button-box" class="no-border solo-toolbaritem">
+ <toolbarbutton id="rconsole-list-button"
+ class="bulletlist-icon"
+ tooltiptext="Show R command history"
+ oncommand="sv.rconsole.toggleView();"
+ disabled="false"/>
+ <toolbarbutton id="rconsole-close-button"
+ class="find-stop-icon"
+ tooltiptext="Clear R Output"
+ oncommand="sv.cmdout.clear(true);"
+ disabled="false"/>
+ <!-- original action: oncommand="sv.rconsole.kill(-1);"-->
+ </hbox>
+ </hbox>
+ <vbox flex="1" id="rconsole-desc-tabpanel-vbox">
+ <hbox flex="1" id="rconsole-desc-tabpanel-hbox">
+ <deck id="rconsole-deck" selectedIndex="1" flex="1">
+ <view type="terminal"
+ id="rconsole-scintilla"
+ flex="1" style="cursor: text;"
+ onclick="sv.rconsole.scintillaOnClick(event);"/>
+ <view type="terminal"
+ id="rconsole-scintilla2"
+ flex="1" style="cursor: text;"/>
+ <tree id="rconsole-tree" flex="1" class="no-border">
+ <treecols>
+ </treecols>
+ <treechildren id="rconsole-tree-body" flex="1"/>
+ </tree>
+ </deck>
+ </hbox>
+
+ <!--<commandset id="rconsole-commandset"/>-->
+ <hbox id="scintillaOverlayXul"/> <!--<commandset id="rconsole-commandset"/>-->
+ </vbox>
+ </vbox>
+<!-- </tabpanel>
+ </tabpanels>
+</overlay> -->
+ </vbox>
+</page>
Modified: komodo/SciViews-K/content/js/commands.js
===================================================================
--- komodo/SciViews-K/content/js/commands.js 2012-03-03 15:09:15 UTC (rev 454)
+++ komodo/SciViews-K/content/js/commands.js 2012-03-03 17:27:07 UTC (rev 455)
@@ -12,8 +12,13 @@
// sv.command.openHelp(uri); // Open the R Help window at this web page
// sv.command.closeHelp(); // Close -help tab
// sv.command.svController(); // Controller for R related commands
-// sv.command.sourcePlacesSelection()); // Source a R file selected in 'places'
-///////////////////////////////////////////////////////////////////////////////
+//
+//// sv.command.places /////////////////////////////////////////////////////////
+// sv.command.places.sourceSelection(); // Source selected file(s) in R
+// sv.command.places.anyRFilesSelected(); // Any R file currently selected?
+// sv.command.places.loadSelection(); // Load selected .Rdata file(s)
+// sv.command.places.anyRDataFilesSelected(); // Any RData file selected?
+////////////////////////////////////////////////////////////////////////////////
if (typeof(sv) == 'undefined') sv = {};
if (typeof(sv.command) == 'undefined') sv.command = {};
@@ -591,16 +596,6 @@
kbMgr.loadConfiguration(kbMgr.currentConfiguration, true);
return(true);
}
-
- this.sourcePlacesSelection = function sv_sourcePlacesSelection () {
- var files = ko.places.manager.getSelectedItems()
- .filter(function(x)(x.name.search(/\.[Rr]$/) != -1))
- .map(function(x) x.file.path);
- if (!files.length) return;
- var cmd = files.map(function(x) "source('" +
- sv.tools.string.addslashes(x) +"')" ).join("\n");
- sv.r.eval(cmd);
- }
// TODO: code from SciViews-K-dev to be integrated!
//function _str(sString) sString.QueryInterface(Components.interfaces
@@ -617,50 +612,52 @@
// while(procList.hasMoreElements()) proc.push(_str(procList.getNext()));
// return proc;
//}
- //
- //this.places = {
- // sourceSelection: function sv_sourcePlacesSelection() {
- // if(!sv.r.running) return;
- // var files = ko.places.manager.getSelectedItems()
- // .filter(function(x) (x.file.isLocal && x.file.ext.toLowerCase() == ".r"))
- // .map(function(x) x.file.path);
- // if (!files.length) return;
- // var cmd = files.map(function(x) "source('" +
- // sv.string.addslashes(x) +"')" ).join("\n");
- // sv.rconn.eval(cmd, function(z) {
- // sv.rbrowser.smartRefresh(true);
- // }, false);
- // },
- //
- // get anyRFilesSelected()
- // sv.r.running &&
- // ko.places.manager.getSelectedItems().some(function(x)
- // x.file.isLocal &&
- // x.file.ext.toLowerCase() == ".r"),
- //
- // loadSelection: function sv_loadPlacesSelection() {
- // if(!sv.r.running) return;
- // var files = ko.places.manager.getSelectedItems()
- // .filter(function(x) (x.file.isLocal &&
- // // for '.RData', .ext is ''
- // (x.file.ext || x.file.leafName).toLowerCase() == ".rdata"))
- // .map(function(x) x.file.path);
- // if (!files.length) return;
- // var cmd = files.map(function(x) "load('" +
- // sv.string.addslashes(x) +"')" ).join("\n");
- // sv.rconn.eval(cmd, function(z) {
- // sv.rbrowser.smartRefresh(true);
- // }, false);
- // },
- //
- // get anyRDataFilesSelected()
- // sv.r.running &&
- // ko.places.manager.getSelectedItems().some(
- // function(x) x.file.isLocal &&
- // (x.file.ext || x.file.leafName).toLowerCase() == ".rdata")
- //
- //}
- //
+
+//// Implementation of places additions ////////////////////////////////////////
+ this.places = {
+ sourceSelection: function sv_sourcePlacesSelection () {
+ if (!sv.r.running) return;
+ var files = ko.places.manager.getSelectedItems()
+ .filter(function(x) (x.file.isLocal &&
+ x.file.ext.toLowerCase() == ".r"))
+ .map(function(x) x.file.path);
+ if (!files.length) return;
+ var cmd = files.map(function(x) "source('" +
+ sv.tools.strings.addslashes(x) +"')" ).join("\n");
+ sv.r.evalCallback(cmd, function (z) {
+ sv.r.objects.smartRefresh(true);
+ });
+ },
+
+ get anyRFilesSelected()
+ sv.r.running &&
+ ko.places.manager.getSelectedItems().some(function (x)
+ x.file.isLocal &&
+ x.file.ext.toLowerCase() == ".r"),
+
+ loadSelection: function sv_loadPlacesSelection () {
+ if (!sv.r.running) return;
+ var files = ko.places.manager.getSelectedItems()
+ .filter(function (x) (x.file.isLocal &&
+ // for '.RData', .ext is ''
+ (x.file.ext || x.file.leafName).toLowerCase() == ".rdata"))
+ .map(function(x) x.file.path);
+ if (!files.length) return;
+ var cmd = files.map(function(x) "load('" +
+ sv.tools.strings.addslashes(x) +"')" ).join("\n");
+ sv.r.evalCallback(cmd, function (z) {
+ sv.r.objects.smartRefresh(true);
+ });
+ },
+
+ get anyRDataFilesSelected()
+ sv.r.running &&
+ ko.places.manager.getSelectedItems().some(
+ function (x) x.file.isLocal &&
+ (x.file.ext || x.file.leafName).toLowerCase() == ".rdata")
+
+ }
+
////}
//// TODO: move this to sv.onLoad:
//this.onLoad = function(event) {
Modified: komodo/SciViews-K/content/js/rconsole.js
===================================================================
--- komodo/SciViews-K/content/js/rconsole.js 2012-03-03 15:09:15 UTC (rev 454)
+++ komodo/SciViews-K/content/js/rconsole.js 2012-03-03 17:27:07 UTC (rev 455)
@@ -24,6 +24,7 @@
// sv.rconsole.onFocus(event); // On focus event for the console
// sv.rconsole.rconsoleOnKeyPress(event); // On key press event for R console
// sv.rconsole.routputOnKeyPtress(event); // On key press event for R output
+// sv.rconsole.focus(); // Code to run when focus goes into it
////////////////////////////////////////////////////////////////////////////////
@@ -492,6 +493,8 @@
//}
} catch(e) { }
}
+
+ this.focus = function() { }
}).apply(sv.rconsole);
Modified: komodo/SciViews-K/content/js/robjects.js
===================================================================
--- komodo/SciViews-K/content/js/robjects.js 2012-03-03 15:09:15 UTC (rev 454)
+++ komodo/SciViews-K/content/js/robjects.js 2012-03-03 17:27:07 UTC (rev 455)
@@ -1556,6 +1556,7 @@
_this.selection.rangedSelect(startIndex, endIndex, augment)
}
+ this.focus = function() { }
//_setOnEvent("sciviews_robjects_searchpath_listbox", "ondragdrop",
// "nsDragAndDrop.drop(event, sv.robjects.packageListObserver);"
Added: komodo/SciViews-K/content/overlayMain-ko6.xul
===================================================================
--- komodo/SciViews-K/content/overlayMain-ko6.xul (rev 0)
+++ komodo/SciViews-K/content/overlayMain-ko6.xul 2012-03-03 17:27:07 UTC (rev 455)
@@ -0,0 +1,574 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is SciViews-K by Philippe Grosjean et al.
+
+ Contributor(s):
+ Philippe Grosjean
+ Romain Francois
+ Kamil Barton
+ ActiveState Software Inc (code inspired from)
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
+ "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" [
+ <!ENTITY % komodoDTD SYSTEM "chrome://komodo/locale/komodo.dtd">
+ %komodoDTD;
+ <!ENTITY % sciviewskDTD SYSTEM "chrome://sciviewsk/locale/sciviewsk.dtd">
+ %sciviewskDTD;
+]>
+
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/global/global.p.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/bindings/buttons.css" type="text/css"?>
+<?xml-stylesheet href="chrome://sciviewsk/skin/sciviewsk.css" type="text/css"?>
+
+<overlay id="sciviewskOverlay"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/array.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/strings.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/file.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/e4x2dom.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/sciviews.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/prefs.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/rjson.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/socket.js"/>
+ <!--<script type="application/x-javascript" src="chrome://sciviewsk/content/js/rconnection.js"/>-->
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/r.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/r-help.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/commands.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/misc.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/ask.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/interpolate.js"/>
+
+ <broadcasterset id="broadcasterset_global">
+ <broadcaster id="sv_r_is_running" disabled="false"/>
+ <broadcaster
+ id="cmd_viewrtoolbar" key="key_cmd_viewrtoolbar"
+ desc="&userInterfaceShowHideRToolbar.desc;"
+ autoCheck="false"
+ checked="true"
+ persist="checked"
+ oncommand="ko.commands.doCommandAsync('cmd_viewrtoolbar', event)"/>
+ <broadcaster id="cmd_svRStarted"
+ oncommand="ko.commands.doCommand(sv.r.running? 'cmd_svQuitR' : 'cmd_svStartR');"/>
+ </broadcasterset>
+
+ <commandset id="allcommands">
+ <commandset id="cmdset_rApp" commandupdater="true"
+ oncommandupdate="ko.commands.updateCommandset(this);"
+ events="r_app_started_closed">
+ <command id="cmd_svConfigureR" key="key_cmd_svConfigureR"
+ oncommand="ko.commands.doCommand('cmd_svConfigureR');"
+ desc="R: &ConfigureR;" label="&ConfigureR;" accesskey="&ConfigureR.key;"/>
+ <command id="cmd_svInstallRtoolbox" key="key_cmd_svInstallRtoolbox"
+ oncommand="ko.commands.doCommand('cmd_svInstallRtoolbox');"
+ desc="R: &InstallRtoolbox;" label="&InstallRtoolbox;" accesskey="&InstallRtoolbox.key;"/>
+ <command id="cmd_svUIlevel" key="key_cmd_svUIlevel"
+ oncommand="ko.commands.doCommand('cmd_svUIlevel');"
+ desc="R: &UIlevel;" label="&UIlevel;" accesskey="&UIlevel.key;"/>
+ <command id="cmd_svStartR" key="key_cmd_svStartR"
+ oncommand="ko.commands.doCommand('cmd_svStartR');"
+ desc="R: &StartR;" label="&StartR;" accesskey="&StartR.key;"/>
+ <command id="cmd_svQuitR" key="key_cmd_svQuitR"
+ oncommand="ko.commands.doCommand('cmd_svQuitR');"
+ desc="R: &QuitR;" label="&QuitR;" accesskey="&QuitR.key;"/>
+ <command id="cmd_svOpenHelp" key="key_cmd_svOpenHelp"
+ oncommand="ko.commands.doCommand('cmd_svOpenHelp');"
+ desc="R: &helpStart;" label="&helpStart;" accesskey="&helpStart.key;"/>
+ <command id="cmd_svBrowseWD" key="key_cmd_svBrowseWD"
+ oncommand="ko.commands.doCommand('cmd_svBrowseWD');"
+ desc="R: &svBrowseWD;" label="&svBrowseWD;" accesskey="&svBrowseWD.key;"/>
+ <command id="cmd_svSessionMgr" key="key_cmd_svSessionMgr"
+ oncommand="ko.commands.doCommand('cmd_svSessionMgr');"
+ desc="R: &svOpenSessMgr;" label="&svOpenSessMgr;" accesskey="&svOpenSessMgr.key;"/>
+ <command id="cmd_svOpenPkgManager" key="key_cmd_svOpenPkgManager"
+ oncommand="ko.commands.doCommand('cmd_svOpenPkgManager');" disabled="false"
+ desc="R: &pkgMgr;" label="&pkgMgr;" accesskey="&pkgMgr.key;"/>
+ </commandset>
+
+<!-- event names changed in Komodo 6: keeping the old one for compatibility
+(current_view_language_changed)-->
+ <commandset id="cmdset_r_control" commandupdater="true"
+ events="current_view_language_changed,language_changed,current_view_changed,r_app_started_closed"
+ oncommandupdate="ko.commands.updateCommandset(this);">
+ <command id="cmd_svRRunAll" key="key_cmd_svRRunAll"
+ oncommand="ko.commands.doCommand('cmd_svRRunAll')"
+ desc="R: &rSendFile;" label="&rSendFile;" accesskey="&rSendFile.key;"/>
+ <command id="cmd_svRSourceAll" key="key_cmd_svRSourceAll"
+ oncommand="ko.commands.doCommand('cmd_svRSourceAll')"
+ desc="R: &rSrcFile;" label="&rSrcFile;" accesskey="&rSrcFile.key;"/>
+ <command id="cmd_svRRunBlock" key="key_cmd_svRRunBlock"
+ oncommand="ko.commands.doCommand('cmd_svRRunBlock')"
+ desc="R: &rSendBlock;" label="&rSendBlock;" accesskey="&rSendBlock.key;"/>
+ <command id="cmd_svRRunFunction" key="key_cmd_svRRunFunction"
+ oncommand="ko.commands.doCommand('cmd_svRRunFunction')"
+ desc="R: &rSendFun;" label="&rSendFun;" accesskey="&rSendFun.key;"/>
+ <command id="cmd_svRRunLine" key="key_cmd_svRRunLine"
+ oncommand="ko.commands.doCommand('cmd_svRRunLine')"
+ desc="R: &rSendLine;" label="&rSendLine;" accesskey="&rSendLine.key;"/>
+ <command id="cmd_svRRunPara" key="key_cmd_svRRunPara"
+ oncommand="ko.commands.doCommand('cmd_svRRunPara')"
+ desc="R: &rSendPara;" label="&rSendPara;" accesskey="&rSendPara.key;"/>
+ <command id="cmd_svRSourceBlock" key="key_cmd_svRSourceBlock"
+ oncommand="ko.commands.doCommand('cmd_svRSourceBlock')"
+ desc="R: &rSrcBlock;" label="&rSrcBlock;" accesskey="&rSrcBlock.key;"/>
+ <command id="cmd_svRSourceFunction" key="key_cmd_svRSourceFunction"
+ oncommand="ko.commands.doCommand('cmd_svRSourceFunction')"
+ desc="R: &rSrcFun;" label="&rSrcFun;" accesskey="&rSrcFun.key;"/>
+ <command id="cmd_svRSourcePara" key="key_cmd_svRSourcePara"
+ oncommand="ko.commands.doCommand('cmd_svRSourcePara')"
+ desc="R: &rSrcPara;" label="&rSrcPara;" accesskey="&rSrcPara.key;"/>
+ <command id="cmd_svRRunLineOrSelection" key="key_cmd_svRRunLineOrSelection"
+ oncommand="ko.commands.doCommand('cmd_svRRunLineOrSelection')"
+ desc="R: &rSendLineOrSelection;" label="&rSendLineOrSelection;"
+ accesskey="&rSendLineOrSelection.key;"/>
+ <command id="cmd_svRSourceLineOrSelection" key="key_cmd_svRSourceLineOrSelection"
+ oncommand="ko.commands.doCommand('cmd_svRSourceLineOrSelection')"
+ desc="R: &rSrcLineOrSelection;" label="&rSrcLineOrSelection;"
+ accesskey="&rSrcLineOrSelection.key;"/>
+ <command id="cmd_svREscape" key="key_cmd_svREscape"
+ oncommand="ko.commands.doCommand('cmd_svREscape');"
+ desc="R: &rEscape;" label="&rEscape;" accesskey="&rEscape.key;"/>
+ <command id="cmd_svRRunLineEnter" key="key_cmd_svRRunLineEnter"
+ oncommand="ko.commands.doCommand('cmd_svRRunLineEnter');"
+ desc="R: &rRunLineEnter;" label="&rRunLineEnter;" accesskey="&rRunLineEnter.key;"/>
+ <command id="cmd_svRHelpContext" key="key_cmd_svRHelpContext"
+ oncommand="ko.commands.doCommand('cmd_svRHelpContext');"
+ desc="R: &rHelpContext;" label="&rHelpContext;" accesskey="&rHelpContext.key;"/>
+ <command id="cmd_svRHelpSearch" key="key_cmd_svRHelpSearch"
+ oncommand="ko.commands.doCommand('cmd_svRHelpSearch');"
+ desc="R: &rHelpSearch;" label="&rHelpSearch;" accesskey="&rHelpSearch.key;"/>
+ <command id="cmd_svRObjStructure" key="key_cmd_svRObjStructure"
+ oncommand="ko.commands.doCommand('cmd_svRObjStructure');"
+ desc="R: &rObjStructure;" label="&rObjStructure;" accesskey="&rObjStructure.key;"/>
+ <command id="cmd_svRObjRefreshDisplay" key="key_cmd_svRObjRefreshDisplay"
+ oncommand="ko.commands.doCommand('cmd_svRObjRefreshDisplay');"
+ desc="R: &rObjRefreshDisplay;" label="&rObjRefreshDisplay;" accesskey="&rObjRefreshDisplay.key;"/>
+ <command id="cmd_svRObjList" key="key_cmd_svRObjList"
+ oncommand="ko.commands.doCommand('cmd_svRObjList');"
+ desc="R: &rObjList;" label="&rObjList;" accesskey="&rObjList.key;"/>
+ <command id="cmd_svRObjRemove" key="key_cmd_svRObjRemove"
+ oncommand="ko.commands.doCommand('cmd_svRObjRemove');"
+ desc="R: &rObjRemove;" label="&rObjRemove;" accesskey="&rObjRemove.key;"/>
+ <command id="cmd_svRActiveDF" key="key_cmd_svRActiveDF"
+ oncommand="ko.commands.doCommand('cmd_svRActiveDF');"
+ desc="R: &rActiveDF;" label="&rActiveDF;" accesskey="&rActiveDF.key;"/>
+ <command id="cmd_svRLoadDF" key="key_cmd_svRLoadDF"
+ oncommand="ko.commands.doCommand('cmd_svRLoadDF');"
+ desc="R: &rLoadDF;" label="&rLoadDF;" accesskey="&rLoadDF.key;"/>
+ <command id="cmd_svRActiveLM" key="key_cmd_svRActiveLM"
+ oncommand="ko.commands.doCommand('cmd_svRActiveLM');"
+ desc="R: &rActiveLM;" label="&rActiveLM;" accesskey="&rActiveLM.key;"/>
+ <command id="cmd_svRListDemos" key="key_cmd_svRListDemos"
+ oncommand="ko.commands.doCommand('cmd_svRListDemos');"
+ desc="R: &rListDemos;" label="&rListDemos;" accesskey="&rListDemos.key;"/>
+ <command id="cmd_svRBrowseVignettes" key="key_cmd_svRBrowseVignettes"
+ oncommand="ko.commands.doCommand('cmd_svRBrowseVignettes');"
+ desc="R: &rBrowseVignettes;" label="&rBrowseVignettes;" accesskey="&rBrowseVignettes.key;"/>
+ <command id="cmd_svRSiteSearch" key="key_cmd_svRSiteSearch"
+ oncommand="ko.commands.doCommand('cmd_svRSiteSearch');"
+ desc="R: &rSiteSearch;" label="&rSiteSearch;" accesskey="&rSiteSearch.key;"/>
+ <command id="cmd_svRRunExample" key="key_cmd_svRRunExample"
+ oncommand="ko.commands.doCommand('cmd_svRRunExample');"
+ desc="R: &rRunExample;" label="&rRunExample;" accesskey="&rRunExample.key;"/>
+ <command id="cmd_svRClearSessionData" key="key_cmd_svRClearSessionData"
+ oncommand="ko.commands.doCommand('cmd_svRClearSessionData');"
+ desc="R: &rClearSessionData;" label="&rClearSessionData;" accesskey="&rClearSessionData.key;"/>
+ <command id="cmd_svRWorkspaceLoad" key="key_cmd_svRWorkspaceLoad"
+ oncommand="ko.commands.doCommand('cmd_svRWorkspaceLoad');"
+ desc="R: &rWorkspaceLoad;" label="&rWorkspaceLoad;" accesskey="&rWorkspaceLoad.key;"/>
+ <command id="cmd_svRWorkspaceSave" key="key_cmd_svRWorkspaceSave"
+ oncommand="ko.commands.doCommand('cmd_svRWorkspaceSave');"
+ desc="R: &rWorkspaceSave;" label="&rWorkspaceSave;" accesskey="&rWorkspaceSave.key;"/>
+ <command id="cmd_svRHistoryLoad" key="key_cmd_svRHistoryLoad"
+ oncommand="ko.commands.doCommand('cmd_svRHistoryLoad');"
+ desc="R: &rHistoryLoad;" label="&rHistoryLoad;" accesskey="&rHistoryLoad.key;"/>
+ <command id="cmd_svRHistorySave" key="key_cmd_svRHistorySave"
+ oncommand="ko.commands.doCommand('cmd_svRHistorySave');"
+ desc="R: &rHistorySave;" label="&rHistorySave;" accesskey="&rHistorySave.key;"/>
+ <command id="cmd_svRWDFile" key="key_cmd_svRWDFile"
+ oncommand="ko.commands.doCommand('cmd_svRWDFile');"
+ desc="R: &rWDFile;" label="&rWDFile;" accesskey="&rWDFile.key;"/>
+ <command id="cmd_svRWDSession" key="key_cmd_svRWDSession"
+ oncommand="ko.commands.doCommand('cmd_svRWDSession');"
+ desc="R: &rWDSession;" label="&rWDSession;" accesskey="&rWDSession.key;"/>
+ <command id="cmd_svRWDPrevious" key="key_cmd_svRWDPrevious"
+ oncommand="ko.commands.doCommand('cmd_svRWDPrevious');"
+ desc="R: &rWDPrevious;" label="&rWDPrevious;" accesskey="&rWDPrevious.key;"/>
+ <command id="cmd_svRNewGraph" key="key_cmd_svRNewGraph"
+ oncommand="ko.commands.doCommand('cmd_svRNewGraph');"
+ desc="R: &rNewGraph;" label="&rNewGraph;" accesskey="&rNewGraph.key;"/>
+ <command id="cmd_svRNextGraph" key="key_cmd_svRNextGraph"
+ oncommand="ko.commands.doCommand('cmd_svRNextGraph');"
+ desc="R: &rNextGraph;" label="&rNextGraph;" accesskey="&rNextGraph.key;"/>
+ <command id="cmd_svRCloseGraph" key="key_cmd_svRCloseGraph"
+ oncommand="ko.commands.doCommand('cmd_svRCloseGraph');"
+ desc="R: &rCloseGraph;" label="&rCloseGraph;" accesskey="&rCloseGraph.key;"/>
+ <command id="cmd_svRCloseAllGraphs" key="key_cmd_svRCloseAllGraphs"
+ oncommand="ko.commands.doCommand('cmd_svRCloseAllGraphs');"
+ desc="R: &rCloseAllGraphs;" label="&rCloseAllGraphs;" accesskey="&rCloseAllGraphs.key;"/>
+ <command id="cmd_svRSaveGraphPDF" key="key_cmd_svRSaveGraphPDF"
+ oncommand="ko.commands.doCommand('cmd_svRSaveGraphPDF');"
+ desc="R: &rSaveGraphPDF;" label="&rSaveGraphPDF;" accesskey="&rSaveGraphPDF.key;"/>
+ <command id="cmd_svRSaveGraphPNG" key="key_cmd_svRSaveGraphPNG"
+ oncommand="ko.commands.doCommand('cmd_svRSaveGraphPNG');"
+ desc="R: &rSaveGraphPNG;" label="&rSaveGraphPNG;" accesskey="&rSaveGraphPNG.key;"/>
+
+ <commandset id="cmdset_r_control" commandupdater="false" events="select"
+ oncommandupdate="ko.commands.updateCommandset(this);">
+ <command id="cmd_svRRunSelection" key="key_cmd_svRRunSelection"
+ oncommand="ko.commands.doCommand('cmd_svRRunSelection')"
+ desc="R: &rSendSel;" label="&rSendSel;" accesskey="&rSendSel.key;"/>
+ <command id="cmd_svRSourceSelection" key="key_cmd_svRSourceSelection"
+ oncommand="ko.commands.doCommand('cmd_svRSourceSelection')"
+ desc="R: &rSrcSel;" label="&rSrcSel;" accesskey="&rSrcSel.key;"/>
+ </commandset>
+ </commandset>
+ </commandset>
+
+ <!--<menupopup id="editorContextMenu">-->
+ <!-- <menuseparator id="editor-context-sep-sv"-->
+ <!-- insertafter="context-sep-paste"-->
+ <!-- />-->
+ <!-- <menuitem id="editor-context-sv-r-send-line-sel"-->
+ <!-- class="menuitem-iconic r-send-selection-icon"-->
+ <!-- observes="cmd_svRRunLineOrSelection"-->
+ <!-- oncommand="ko.commands.doCommand('cmd_svRRunLineOrSelection')"-->
+ <!-- insertafter="context-sep-paste"-->
+ <!-- />-->
+ <!--insertafter="context-sep-paste"-->
+ <!--</menupopup>-->
+
+ <menubar id="menubar_main">
+ <menu id="sciviews_menu" label="R" accesskey="R"
+ insertbefore="menu_window,help_menu">
+ <menupopup id="popup_sciviews_main">
+ <menuitem id="r_start_console_menu" observes="cmd_svStartR"
+ class="menuitem-iconic"/>
+ <menuitem id="r_quit_console_menu" observes="cmd_svQuitR"
+ class="menuitem-iconic"/>
+ <menuseparator/>
+ <menuitem id="r_loaddf" observes="cmd_svRLoadDF"
+ class="menuitem-iconic r-load-df-icon"/>
+ <menuitem id="r_activedf" observes="cmd_svRActiveDF"
+ class="menuitem-iconic r-active-df-icon"/>
+ <menuitem id="r_activelm" observes="cmd_svRActiveLM"
+ class="menuitem-iconic r-active-lm-icon"/>
+ <menuitem id="r_objexplorer" observes="cmd_svRObjRefreshDisplay"
+ class="menuitem-iconic"/>
+ <!--<menuitem id="r_objstructure" observes="cmd_svRObjStructure"
+ class="menuitem-iconic"/>
+ <menuitem id="r_objlist" observes="cmd_svRObjList"
+ class="menuitem-iconic"/>
+ <menuitem id="r_objremove" observes="cmd_svRObjRemove"
+ class="menuitem-iconic"/>-->
+ <!--not finished yet!
+ <menuitem id="r_start_pkg_manager" observes="cmd_svOpenPkgManager"
+ class="menuitem-iconic"/>--> <!-- r-pkg-manager"/>-->
+ <menuitem id="r_browse_wd" observes="cmd_svBrowseWD"
+ class="menuitem-iconic r"/> <!--- working-dir-icon"/>-->
+ <!--<menuitem id="r_file_wd" observes="cmd_svRWDFile"
+ class="menuitem-iconic"/>
+ <menuitem id="r_session_wd" observes="cmd_svRWDSession"
+ class="menuitem-iconic"/>
+ <menuitem id="r_previous_wd" observes="cmd_svRWDPrevious"
+ class="menuitem-iconic"/>-->
+ <menuitem id="r_session_mgr" observes="cmd_svSessionMgr"
+ class="menuitem-iconic"/> <!-- r-session-dir-icon"/>-->
+ <!--<menuitem id="r_clearsession" observes="cmd_svRClearSessionData"
+ class="menuitem-iconic"/>-->
+ <menuseparator/>
+ <menuitem id="r_send_line_sel_menu" observes="cmd_svRRunLineOrSelection"
+ class="menuitem-iconic r-run-selection-icon"/>
+ <menuitem id="r_send_line_enter_menu" observes="cmd_svRRunLineEnter"
+ class="menuitem-iconic"/> <!-- r-run-selection-enter-icon"/> -->
+ <menuitem id="r_send_para_menu" observes="cmd_svRRunPara"
+ class="menuitem-iconic"/> <!-- r-run-para-icon"/> -->
+ <!--<menuitem id="r_src_para_menu" observes="cmd_svRSourcePara"
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/sciviews -r 455
More information about the Sciviews-commits
mailing list