[Sciviews-commits] r187 - in komodo/SciViews-K: . components content content/js content/js/tools locale/fr-FR pylib templates/R udl
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Sep 13 10:15:48 CEST 2009
Author: phgrosjean
Date: 2009-09-13 10:15:45 +0200 (Sun, 13 Sep 2009)
New Revision: 187
Modified:
komodo/SciViews-K/chrome.manifest
komodo/SciViews-K/components/koR_UDL_Language.py
komodo/SciViews-K/components/svIRinterpreter.idl
komodo/SciViews-K/content/RBrowserOverlay.xul
komodo/SciViews-K/content/js/commands.js
komodo/SciViews-K/content/js/pref-R.js
komodo/SciViews-K/content/js/r-help.js
komodo/SciViews-K/content/js/robjects.js
komodo/SciViews-K/content/js/tools/io.js
komodo/SciViews-K/content/overlayMain.xul
komodo/SciViews-K/content/pkgManager.xul
komodo/SciViews-K/content/pref-Main.xul
komodo/SciViews-K/content/pref-R.xul
komodo/SciViews-K/content/prefOverlay.xul
komodo/SciViews-K/content/rconsole.xul
komodo/SciViews-K/locale/fr-FR/main.properties
komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd
komodo/SciViews-K/pylib/cile_r.py
komodo/SciViews-K/pylib/lang_r.py
komodo/SciViews-K/templates/R/R S3 object.R
komodo/SciViews-K/udl/R-mainlex.udl
komodo/SciViews-K/udl/Rlex.udl
Log:
Some more housekeeping + French translation
Modified: komodo/SciViews-K/chrome.manifest
===================================================================
--- komodo/SciViews-K/chrome.manifest 2009-09-12 21:48:02 UTC (rev 186)
+++ komodo/SciViews-K/chrome.manifest 2009-09-13 08:15:45 UTC (rev 187)
@@ -1,12 +1,11 @@
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/RBrowserOverlay.xul
+overlay chrome://komodo/content/pref/pref.xul chrome://sciviewsk/content/prefOverlay.xul
# The following items is not finished yet, and is thus commented out
#overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/rconsole.xul
-overlay chrome://komodo/content/pref/pref.xul chrome://sciviewsk/content/prefOverlay.xul
-
locale sciviewsk en-GB jar:sciviewsk.jar!/locale/en-GB/
locale sciviewsk fr-FR jar:sciviewsk.jar!/locale/fr-FR/
Modified: komodo/SciViews-K/components/koR_UDL_Language.py
===================================================================
--- komodo/SciViews-K/components/koR_UDL_Language.py 2009-09-12 21:48:02 UTC (rev 186)
+++ komodo/SciViews-K/components/koR_UDL_Language.py 2009-09-13 08:15:45 UTC (rev 187)
@@ -13,9 +13,6 @@
#
# The Original Code is SciViews-K by Philippe Grosjean et al.
#
-# Portions created by ActiveState Software Inc are Copyright (C) 2000-2008
-# ActiveState Software Inc. All Rights Reserved.
-#
# Contributor(s):
# Philippe Grosjean
# Kamil Barton
@@ -35,7 +32,7 @@
#
# ***** END LICENSE BLOCK *****
-# Komodo R language service.
+# Komodo R language service
import logging
from koUDLLanguageBase import KoUDLLanguage
Modified: komodo/SciViews-K/components/svIRinterpreter.idl
===================================================================
--- komodo/SciViews-K/components/svIRinterpreter.idl 2009-09-12 21:48:02 UTC (rev 186)
+++ komodo/SciViews-K/components/svIRinterpreter.idl 2009-09-13 08:15:45 UTC (rev 187)
@@ -13,9 +13,6 @@
*
* The Original Code is SciViews-K by Philippe Grosjean et al.
*
- * Portions created by ActiveState Software Inc are Copyright (C) 2000-2008
- * ActiveState Software Inc. All Rights Reserved.
- *
* Contributor(s):
* Philippe Grosjean
* ActiveState Software Inc (code inspired from)
Modified: komodo/SciViews-K/content/RBrowserOverlay.xul
===================================================================
--- komodo/SciViews-K/content/RBrowserOverlay.xul 2009-09-12 21:48:02 UTC (rev 186)
+++ komodo/SciViews-K/content/RBrowserOverlay.xul 2009-09-13 08:15:45 UTC (rev 187)
@@ -12,16 +12,13 @@
License for the specific language governing rights and limitations
under the License.
- The Original Code is SciViews-K by Philippe Grosjean & Romain Francois.
+ The Original Code is SciViews-K by Philippe Grosjean et al.
- Portions created by ActiveState Software Inc are Copyright (C) 2000-2008
- ActiveState Software Inc. All Rights Reserved.
-
Contributor(s):
Philippe Grosjean
Romain Francois
Kamil Barton
- ActiveState Software Inc
+ 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
@@ -36,7 +33,9 @@
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" [
+
+<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
+ "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" [
<!ENTITY % sciviewskDTD SYSTEM "chrome://sciviewsk/locale/sciviewsk.dtd">
%sciviewskDTD;
]>
@@ -46,335 +45,225 @@
<?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="sciviewsRBrowserOverlay"
- 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">
+<overlay id="sciviewsRBrowserOverlay" 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">
-<popupset id="extensionPopupSet">
- <menupopup id="rObjectsContext"
- onpopupshowing="rObjectsTree.contextOnShow();">
- <menuitem class="primary_menu_item"
- id="menu_robjects_cmd_insertname"
- command="robjects_cmd_insertname"
- acceltext="Ins" />
- <menuitem
- id="menu_robjects_cmd_insertfullname"
- command="robjects_cmd_insertfullname"
- acceltext="Ctrl+Ins" />
- <menuitem id="menu_robjects_cmd_removeobj"
- command="robjects_cmd_removeobj"
- key="key_cmd_delete"
- class="menuitem-iconic list-item-remove-icon"
- acceltext="Del" />
- <menuitem id="menu_robjects_cmd_attach" command="robjects_cmd_attach" />
- <menuitem id="menu_robjects_cmd_detach" command="robjects_cmd_detach" />
- <menuseparator keep="false" intoplevel="true" />
- <menuitem id="menu_robjects_cmd_print" command="robjects_cmd_print" />
- <menuitem id="menu_robjects_cmd_plot" command="robjects_cmd_plot" />
- <menuitem id="menu_robjects_cmd_summary" command="robjects_cmd_summary" />
- <menuitem id="menu_robjects_cmd_str" command="robjects_cmd_str" />
- <menuitem id="menu_robjects_cmd_args" command="robjects_cmd_args" />
- <menuitem id="menu_robjects_cmd_names" command="robjects_cmd_names" />
- <menuseparator keep="false" intoplevel="true" />
- <menuitem id="menu_robjects_cmd_help" command="robjects_cmd_help" />
- </menupopup>
-</popupset>
+ <popupset id="extensionPopupSet">
+ <menupopup id="rObjectsContext"
+ onpopupshowing="rObjectsTree.contextOnShow();">
+ <menuitem class="primary_menu_item" id="menu_robjects_cmd_insertname"
+ command="robjects_cmd_insertname" acceltext="Ins"/>
+ <menuitem id="menu_robjects_cmd_insertfullname"
+ command="robjects_cmd_insertfullname" acceltext="Ctrl+Ins"/>
+ <menuitem id="menu_robjects_cmd_removeobj"
+ command="robjects_cmd_removeobj" acceltext="Del"
+ key="key_cmd_delete" class="menuitem-iconic list-item-remove-icon"/>
+ <menuitem id="menu_robjects_cmd_attach" command="robjects_cmd_attach"/>
+ <menuitem id="menu_robjects_cmd_detach" command="robjects_cmd_detach"/>
+ <menuseparator keep="false" intoplevel="true"/>
+ <menuitem id="menu_robjects_cmd_print" command="robjects_cmd_print"/>
+ <menuitem id="menu_robjects_cmd_plot" command="robjects_cmd_plot"/>
+ <menuitem id="menu_robjects_cmd_summary" command="robjects_cmd_summary"/>
+ <menuitem id="menu_robjects_cmd_str" command="robjects_cmd_str"/>
+ <menuitem id="menu_robjects_cmd_args" command="robjects_cmd_args"/>
+ <menuitem id="menu_robjects_cmd_names" command="robjects_cmd_names"/>
+ <menuseparator keep="false" intoplevel="true"/>
+ <menuitem id="menu_robjects_cmd_help" command="robjects_cmd_help"/>
+ </menupopup>
+ </popupset>
-<broadcasterset id="broadcasterset_global">
- <broadcaster
- id="cmd_robjects_viewSearchPath"
- tooltiptext="&sciviews.robjects.tab;: &sciviews.robjects.showHide;"
- label="&sciviews.robjects.showHide;"
- splitter="bottom_splitter"
- box="robjects_searchpath_panel"
- oncommand="rObjectsTree.toggleViewSearchPath(event);"
- checked="true"
- state="open"
- />
-</broadcasterset>
+ <broadcasterset id="broadcasterset_global">
+ <broadcaster id="cmd_robjects_viewSearchPath"
+ tooltiptext="&sciviews.robjects.tab;: &sciviews.robjects.showHide;"
+ label="&sciviews.robjects.showHide;" splitter="bottom_splitter"
+ box="robjects_searchpath_panel"
+ oncommand="rObjectsTree.toggleViewSearchPath(event);"
+ checked="true" state="open"/>
+ </broadcasterset>
-<commandset id="allcommands">
- <commandset id="r-objects-commands">
- <command id="robjects_cmd_insertname"
- label="&sciviews.robjects.insName;"
- accesskey="I"
- oncommand="rObjectsTree.insertName(false);" />
- <command id="robjects_cmd_insertfullname"
- label="&sciviews.robjects.insFullName;"
- accesskey="F"
- oncommand="rObjectsTree.insertName(true);" />
- <command id="robjects_cmd_removeobj"
- label="&sciviews.robjects.rmObj;"
- accesskey="R"
- oncommand="rObjectsTree.removeSelected(event.shiftKey);" />
- <command id="robjects_cmd_attach"
- label="&sciviews.robjects.loadPkg;"
- accesskey="L"
- disabled="true"
- oncommand="rObjectsTree.do('library');" />
- <command id="robjects_cmd_summary"
- label="&sciviews.robjects.summary;"
- accesskey="S"
- oncommand="rObjectsTree.do('summary');" />
- <command id="robjects_cmd_print"
- label="&sciviews.robjects.print;"
- accesskey="P"
- oncommand="rObjectsTree.do('print');" />
- <command id="robjects_cmd_plot"
- label="&sciviews.robjects.plot;"
- accesskey="O"
- oncommand="rObjectsTree.do('plot');" />
- <command id="robjects_cmd_str"
- label="&sciviews.robjects.str;"
- accesskey="T"
- oncommand="rObjectsTree.do('str');" />
- <command id="robjects_cmd_names"
- label="&sciviews.robjects.names;"
- accesskey="N"
- oncommand="rObjectsTree.do('names');" />
- <command id="robjects_cmd_help"
- label="&sciviews.robjects.help;"
- accesskey="H"
- oncommand="rObjectsTree.do('help');" />
- </commandset>
-</commandset>
+ <commandset id="allcommands">
+ <commandset id="r-objects-commands">
+ <command id="robjects_cmd_insertname" label="&sciviews.robjects.insName;"
+ oncommand="rObjectsTree.insertName(false);" accesskey="I"/>
+ <command id="robjects_cmd_insertfullname" label="&sciviews.robjects.insFullName;"
+ oncommand="rObjectsTree.insertName(true);" accesskey="F"/>
+ <command id="robjects_cmd_removeobj" label="&sciviews.robjects.rmObj;"
+ oncommand="rObjectsTree.removeSelected(event.shiftKey);" accesskey="R"/>
+ <command id="robjects_cmd_attach" label="&sciviews.robjects.loadPkg;"
+ oncommand="rObjectsTree.do('library');" accesskey="L" disabled="true"/>
+ <command id="robjects_cmd_summary" label="&sciviews.robjects.summary;"
+ oncommand="rObjectsTree.do('summary');" accesskey="S"/>
+ <command id="robjects_cmd_print" label="&sciviews.robjects.print;"
+ oncommand="rObjectsTree.do('print');" accesskey="P"/>
+ <command id="robjects_cmd_plot" label="&sciviews.robjects.plot;"
+ oncommand="rObjectsTree.do('plot');" accesskey="O"/>
+ <command id="robjects_cmd_str" label="&sciviews.robjects.str;"
+ oncommand="rObjectsTree.do('str');" accesskey="T"/>
+ <command id="robjects_cmd_names" label="&sciviews.robjects.names;"
+ oncommand="rObjectsTree.do('names');" accesskey="N"/>
+ <command id="robjects_cmd_help" label="&sciviews.robjects.help;"
+ oncommand="rObjectsTree.do('help');" accesskey="H"/>
+ </commandset>
+ </commandset>
-<menupopup id="tabPicker_popup">
- <menuitem id="show_robjects_tab"
- insertafter="show_runoutput_tab,show_codebrowser_tab"
- oncommand="uilayout_ensureTabShown('sciviews_robjects_tab', true)"
- label="&sciviews.robjects.tab;"
- />
-</menupopup>
+ <menupopup id="tabPicker_popup">
+ <menuitem id="show_robjects_tab"
+ insertafter="show_runoutput_tab,show_codebrowser_tab"
+ oncommand="uilayout_ensureTabShown('sciviews_robjects_tab', true)"
+ label="&sciviews.robjects.tab;"/>
+ </menupopup>
-<menupopup id="menu_view_tabs_popup">
- <menuitem id="show_robjects_tab2"
- insertafter="show_codebrowser_tab2"
- class="menuitem-iconic-wide"
- oncommand="uilayout_ensureTabShown('sciviews_robjects_tab', true)"
- label="&sciviews.robjects.tab;"
- />
-</menupopup>
+ <menupopup id="menu_view_tabs_popup">
+ <menuitem id="show_robjects_tab2"
+ insertafter="show_codebrowser_tab2" class="menuitem-iconic-wide"
+ oncommand="uilayout_ensureTabShown('sciviews_robjects_tab', true)"
+ label="&sciviews.robjects.tab;"/>
+ </menupopup>
<tabbox id="leftTabBox">
<tabs id="project_toolbox_tabs">
- <tab id="sciviews_robjects_tab"
- label="&sciviews.robjects.tab;"
- insertafter="project_tab,codebrowser_tab"
- tooltiptext="&sciviews.robjects.tip;"
- onclick="rObjectsTree.getPackageList(false);"
- />
+ <tab id="sciviews_robjects_tab" label="&sciviews.robjects.tab;"
+ insertafter="project_tab,codebrowser_tab"
+ tooltiptext="&sciviews.robjects.tip;"
+ onclick="rObjectsTree.getPackageList(false);"/>
</tabs>
<tabpanels id="project_toolbox_tabpanels">
- <tabpanel flex="1"
- id="sciviews_robjects_tabpanel"
- insertafter="projectviewbox,codebrowserviewbox">
- <vbox flex="1" id="sciviews_robjects_vbox">
- <hbox align="center"
- id="sciviews_robjects_hbox"
- >
- <toolbarbutton
- id="sciviews_robjects_refresh_button"
- tooltiptext="&sciviews.robjects.refresh.tip;"
- buttonstyle="pictures"
- label="&sciviews.robjects.refresh;"
- class="refresh-icon"
- oncommand="rObjectsTree.getPackageList(true);"
- />
- <toolbarbutton
- id="sciviews_robjects_searchpath_button"
- observes="cmd_robjects_viewSearchPath"
- buttonstyle="pictures"
- class="searchPath-icon"
- checked="true"
- persist="state checked"
- />
- <toolbarbutton
- id="r_objects_pkg_menu"
- buttonstyle="pictures"
- class="robjects-pkg-icon"
- type="menu"
- orient="horizontal">
- <menupopup>
- <menuitem id="r_objects_pkg_load"
- label="Load packages..."
- accesskey="l"
- class="menuitem-iconic r-pkg-load-icon"
- oncommand="sv.r.pkg.load();" />
- <menuitem id="r_objects_pkg_load"
- label="Attach workspace..."
- accesskey="a"
- class="menuitem-iconic r-data-attach"
- oncommand="sv.r.loadWorkspace(null, true);" />
- <menuitem id="r_objects_pkg_install"
- label="Install..."
- accesskey="i"
- class="menuitem-iconic r-pkg-install-icon"
- oncommand="sv.r.pkg.install();" />
- <menuitem id="r_objects_pkg_installLocal"
- label="Install from local files..."
- accesskey="c"
- class="menuitem-iconic r-pkg-install-local-icon"
- oncommand="sv.r.pkg.installLocal();" />
- <menuitem id="r_objects_pkg_update"
- label="Update"
- accesskey="u"
- class="menuitem-iconic r-pkg-update-icon"
- oncommand="sv.r.pkg.update();" />
- <menuitem id="r_objects_pkg_remove"
- label="Remove..."
- accesskey="r"
- class="menuitem-iconic r-pkg-remove-icon"
- oncommand="sv.r.pkg.remove();" />
- </menupopup>
- </toolbarbutton>
-
- <toolbarseparator style="min-width:10px;" flex="1"/>
- <toolbarbutton id="sciviews_robjects_filter"
- tooltiptext="&sciviews.robjects.filter.tip;"
- buttonstyle="pictures"
- type="menu"
- orient="horizontal"
- class="rightarrow-button-a r-objects-filter">
- <menupopup id="sciviews_robjects_filterPopup">
- <menuitem id="sciviews_robjects_context_filterByName"
- label="&sciviews.robjects.filterByName;"
- checked="true"
- accesskey="n"
- type="checkbox"
- oncommand="rObjectsTree.setFilterBy(this, 'name')" />
- <menuitem id="sciviews_robjects_context_filterByClass"
- label="&sciviews.robjects.filterByClass;"
- accesskey="c"
- type="checkbox"
- oncommand="rObjectsTree.setFilterBy(this, 'class')" />
- <menuitem id="sciviews_robjects_context_filterByGroup"
- label="&sciviews.robjects.filterByGroup;"
- accesskey="g"
- type="checkbox"
- oncommand="rObjectsTree.setFilterBy(this, 'group')" />
- <menuseparator />
- <menuitem id="sciviews_robjects_context_clrFilter"
- label="&sciviews.robjects.clrFilter;"
- accesskey="l"
- oncommand="document.getElementById('sciviews_robjects_filterbox').value = ''; rObjectsTree.applyFilter();" />
- </menupopup>
-</toolbarbutton>
- <textbox
- id="sciviews_robjects_filterbox"
- flex="1"
- type="timed"
- timeout="500"
- tooltiptext="&sciviews.robjects.filter.tip;"
- oninput="rObjectsTree.applyFilter();"
- emptytext="&sciviews.robjects.filterEmptyText;"
- />
- </hbox>
- <vbox id="robjects_searchpath_panel"
- persist="height collapsed"
- flex="1"
- >
- <listbox flex="1" id="sciviews_robjects_searchpath_listbox"
- ondragdrop="nsDragAndDrop.drop(event, rObjectsTree.packageListObserver);"
- ondragover="nsDragAndDrop.dragOver(event, rObjectsTree.packageListObserver);"
- ondraggesture="nsDragAndDrop.startDrag(event, rObjectsTree.packageListObserver);"
- onkeypress="rObjectsTree.packageListKeyEvent(event);"
- oncommand="rObjectsTree.packageSelectedEvent(event);"
- />
- </vbox>
- <splitter
- id="sciviews_robjects_splitter"
- collapse="before"
- resizeafter="closest"
- resizebefore="closest"
- persist="state"
- observes="cmd_robjects_viewSearchPath"
- >
- <grippy />
- </splitter>
- <vbox flex="5">
- <tree flex="1" id="sciviews_robjects_objects_tree"
+ <tabpanel flex="1" id="sciviews_robjects_tabpanel"
+ insertafter="projectviewbox,codebrowserviewbox">
+ <vbox flex="1" id="sciviews_robjects_vbox">
+ <hbox align="center" id="sciviews_robjects_hbox">
+ <toolbarbutton id="sciviews_robjects_refresh_button"
+ tooltiptext="&sciviews.robjects.refresh.tip;"
+ buttonstyle="pictures"
+ label="&sciviews.robjects.refresh;" class="refresh-icon"
+ oncommand="rObjectsTree.getPackageList(true);"/>
+ <toolbarbutton id="sciviews_robjects_searchpath_button"
+ observes="cmd_robjects_viewSearchPath"
+ buttonstyle="pictures" class="searchPath-icon"
+ checked="true" persist="state checked"/>
+ <toolbarbutton id="r_objects_pkg_menu"
+ buttonstyle="pictures" class="robjects-pkg-icon"
+ type="menu" orient="horizontal">
+ <menupopup>
+ <menuitem id="r_objects_pkg_load" label="Load packages..."
+ accesskey="l" class="menuitem-iconic r-pkg-load-icon"
+ oncommand="sv.r.pkg.load();"/>
+ <menuitem id="r_objects_pkg_load" label="Attach workspace..."
+ accesskey="a" class="menuitem-iconic r-data-attach"
+ oncommand="sv.r.loadWorkspace(null, true);"/>
+ <menuitem id="r_objects_pkg_install" label="Install..."
+ accesskey="i" class="menuitem-iconic r-pkg-install-icon"
+ oncommand="sv.r.pkg.install();"/>
+ <menuitem id="r_objects_pkg_installLocal" label="Install from local files..."
+ accesskey="c" class="menuitem-iconic r-pkg-install-local-icon"
+ oncommand="sv.r.pkg.installLocal();"/>
+ <menuitem id="r_objects_pkg_update" label="Update"
+ accesskey="u" class="menuitem-iconic r-pkg-update-icon"
+ oncommand="sv.r.pkg.update();"/>
+ <menuitem id="r_objects_pkg_remove" label="Remove..."
+ accesskey="r" class="menuitem-iconic r-pkg-remove-icon"
+ oncommand="sv.r.pkg.remove();"/>
+ </menupopup>
+ </toolbarbutton>
+ <toolbarseparator style="min-width:10px;" flex="1"/>
+ <toolbarbutton id="sciviews_robjects_filter"
+ tooltiptext="&sciviews.robjects.filter.tip;"
+ buttonstyle="pictures" type="menu" orient="horizontal"
+ class="rightarrow-button-a r-objects-filter">
+ <menupopup id="sciviews_robjects_filterPopup">
+ <menuitem id="sciviews_robjects_context_filterByName"
+ label="&sciviews.robjects.filterByName;"
+ checked="true" accesskey="n" type="checkbox"
+ oncommand="rObjectsTree.setFilterBy(this, 'name')"/>
+ <menuitem id="sciviews_robjects_context_filterByClass"
+ label="&sciviews.robjects.filterByClass;"
+ accesskey="c" type="checkbox"
+ oncommand="rObjectsTree.setFilterBy(this, 'class')"/>
+ <menuitem id="sciviews_robjects_context_filterByGroup"
+ label="&sciviews.robjects.filterByGroup;"
+ accesskey="g" type="checkbox"
+ oncommand="rObjectsTree.setFilterBy(this, 'group')"/>
+ <menuseparator/>
+ <menuitem id="sciviews_robjects_context_clrFilter"
+ label="&sciviews.robjects.clrFilter;" accesskey="l"
+ oncommand="document.getElementById('sciviews_robjects_filterbox').value = ''; rObjectsTree.applyFilter();"/>
+ </menupopup>
+ </toolbarbutton>
+ <textbox id="sciviews_robjects_filterbox" flex="1" type="timed"
+ timeout="500" tooltiptext="&sciviews.robjects.filter.tip;"
+ oninput="rObjectsTree.applyFilter();"
+ emptytext="&sciviews.robjects.filterEmptyText;"/>
+ </hbox>
+ <vbox id="robjects_searchpath_panel"
+ persist="height collapsed" flex="1">
+ <listbox flex="1" id="sciviews_robjects_searchpath_listbox"
+ ondragdrop="nsDragAndDrop.drop(event, rObjectsTree.packageListObserver);"
+ ondragover="nsDragAndDrop.dragOver(event, rObjectsTree.packageListObserver);"
+ ondraggesture="nsDragAndDrop.startDrag(event, rObjectsTree.packageListObserver);"
+ onkeypress="rObjectsTree.packageListKeyEvent(event);"
+ oncommand="rObjectsTree.packageSelectedEvent(event);"/>
+ </vbox>
+ <splitter id="sciviews_robjects_splitter" collapse="before"
+ resizeafter="closest" resizebefore="closest" persist="state"
+ observes="cmd_robjects_viewSearchPath">
+ <grippy/>
+ </splitter>
+ <vbox flex="5">
+ <tree flex="1" id="sciviews_robjects_objects_tree"
persist="sortDirection sortResource"
sortDirection="ascending" sortResource="r-name"
- enableColumnDrag="true"
- onselect="rObjectsTree.onEvent(event);"
- onkeypress="rObjectsTree.onEvent(event);"
- >
- <treecols>
- <treecol
- id="r-name"
- label="&sciviews.robjects.Name;"
- primary="true"
- sortActive="true"
- persist="width ordinal hidden"
- onclick="rObjectsTree.sort(this);"
- ordinal="1"
- flex="4"/>
- <splitter class="tree-splitter" ordinal="2" />
- <treecol
- id="r-dims"
- label="&sciviews.robjects.Dims;"
- persist="width ordinal hidden"
- onclick="rObjectsTree.sort(this);" flex="1" ordinal="3" />
- <splitter class="tree-splitter" ordinal="4" />
- <treecol
- id="r-group"
- label="&sciviews.robjects.Group;" flex="2" hidden="true"
- persist="width ordinal hidden"
- onclick="rObjectsTree.sort(this);" ordinal="5"
- />
- <splitter class="tree-splitter" ordinal="6" />
- <treecol
- id="r-class"
- label="&sciviews.robjects.Class;" flex="2" hidden="true"
- persist="width ordinal hidden"
- onclick="rObjectsTree.sort(this);" ordinal="7"
- />
- <splitter class="tree-splitter" ordinal="8" />
- <treecol id="r-fullName"
- label="&sciviews.robjects.FullName;"
- persist="width ordinal hidden"
- flex="1"
- ordinal="9"/>
- </treecols>
- <treechildren id="sciviews_robjects_objects_tree_main"
- ondraggesture="nsDragAndDrop.startDrag(event, rObjectsTree.listObserver);"
- ondragdrop="nsDragAndDrop.drop(event, rObjectsTree.listObserver);"
- ondragover="nsDragAndDrop.dragOver(event, rObjectsTree.listObserver);"
- onclick="rObjectsTree.onEvent(event);"
- ondblclick="rObjectsTree.onEvent(event);"
- context="rObjectsContext"
- >
- </treechildren>
- </tree>
+ enableColumnDrag="true"
+ onselect="rObjectsTree.onEvent(event);"
+ onkeypress="rObjectsTree.onEvent(event);">
+ <treecols>
+ <treecol id="r-name" label="&sciviews.robjects.Name;"
+ primary="true" sortActive="true"
+ persist="width ordinal hidden"
+ onclick="rObjectsTree.sort(this);" ordinal="1" flex="4"/>
+ <splitter class="tree-splitter" ordinal="2"/>
+ <treecol id="r-dims" label="&sciviews.robjects.Dims;"
+ persist="width ordinal hidden"
+ onclick="rObjectsTree.sort(this);" flex="1" ordinal="3"/>
+ <splitter class="tree-splitter" ordinal="4"/>
+ <treecol id="r-group" label="&sciviews.robjects.Group;"
+ flex="2" hidden="true" persist="width ordinal hidden"
+ onclick="rObjectsTree.sort(this);" ordinal="5"/>
+ <splitter class="tree-splitter" ordinal="6"/>
+ <treecol id="r-class" label="&sciviews.robjects.Class;"
+ flex="2" hidden="true" persist="width ordinal hidden"
+ onclick="rObjectsTree.sort(this);" ordinal="7"/>
+ <splitter class="tree-splitter" ordinal="8"/>
+ <treecol id="r-fullName" label="&sciviews.robjects.FullName;"
+ persist="width ordinal hidden" flex="1" ordinal="9"/>
+ </treecols>
+ <treechildren id="sciviews_robjects_objects_tree_main"
+ ondraggesture="nsDragAndDrop.startDrag(event, rObjectsTree.listObserver);"
+ ondragdrop="nsDragAndDrop.drop(event, rObjectsTree.listObserver);"
+ ondragover="nsDragAndDrop.dragOver(event, rObjectsTree.listObserver);"
+ onclick="rObjectsTree.onEvent(event);"
+ ondblclick="rObjectsTree.onEvent(event);"
+ context="rObjectsContext">
+ </treechildren>
+ </tree>
+ </vbox>
+ <vbox>
+ <hbox align="center">
+ <toolbarbutton id="sciviews_robjects_foldAll_button"
+ label="Fold All" buttonstyle="pictures"
+ class="robjects-fold-all-icon"
+ oncommand="rObjectsTree.foldAll(true);"
+ tooltiptext="&sciviews.robjects.foldAll;"/>
+ <toolbarbutton id="sciviews_robjects_ExpandAll_button"
+ label="Expand All" buttonstyle="pictures"
+ class="robjects-expand-all-icon"
+ oncommand="rObjectsTree.foldAll(false);"
+ tooltiptext="&sciviews.robjects.unfoldAll;"/>
+ <!--<toolbarbutton id="sciviews_robjects_tmpInitialize_button"
+ label="Init!" oncommand="rObjectsTreeInit();"/>-->
+ </hbox>
+ </vbox>
</vbox>
- <vbox>
- <hbox align="center">
- <toolbarbutton
- id="sciviews_robjects_foldAll_button"
- label="Fold All"
- buttonstyle="pictures"
- class="robjects-fold-all-icon"
- oncommand="rObjectsTree.foldAll(true);"
- tooltiptext="&sciviews.robjects.foldAll;"
- />
- <toolbarbutton
- id="sciviews_robjects_ExpandAll_button"
- label="Expand All"
- buttonstyle="pictures"
- class="robjects-expand-all-icon"
- oncommand="rObjectsTree.foldAll(false);"
- tooltiptext="&sciviews.robjects.unfoldAll;"
- />
- <!--<toolbarbutton
- id="sciviews_robjects_tmpInitialize_button"
- label="Init!"
- oncommand="rObjectsTreeInit();"
- />-->
- </hbox>
- </vbox>
- </vbox>
</tabpanel>
</tabpanels>
</tabbox>
Modified: komodo/SciViews-K/content/js/commands.js
===================================================================
--- komodo/SciViews-K/content/js/commands.js 2009-09-12 21:48:02 UTC (rev 186)
+++ komodo/SciViews-K/content/js/commands.js 2009-09-13 08:15:45 UTC (rev 187)
@@ -17,439 +17,434 @@
sv.command = {};
}
+// sv.command object constructor
+(function () {
-// sv.command object constructor:
-(function() {
-
-// private methods:
-function _RControl_supported () {
- var currentView = ko.views.manager.currentView;
- if (!currentView || !currentView.document)
- return false;
-
- return(_isRRunning() && currentView.document.language == "R");
-}
-
-function _keepCheckingR (stopMe) {
- clearInterval(sv.r.testInterval);
- if (!stopMe) {
- sv.r.testInterval = window.setInterval(sv.r.test, 10000);
+ // private methods
+ function _RControl_supported () {
+ var currentView = ko.views.manager.currentView;
+ if (!currentView || !currentView.document)
+ return false;
+ return(_isRRunning() && currentView.document.language == "R");
}
- setTimeout(window.updateCommands, 1000, 'r_app_started_closed');
-}
-
-function _isRRunning () {
- //sv.log.debug("is R Running? " + sv.r.running);
- return sv.r.running;
-}
-
-function _RControlSelection_supported () {
- var currentView = ko.views.manager.currentView;
- if (!currentView || !currentView.scimoz)
- return false;
-
- return _RControl_supported()
- && ((currentView.scimoz.selectionEnd -
- currentView.scimoz.selectionStart) != 0);
-}
-
-// Selects the checkbox on selected element, while deselecting others
-this.getRApp = function (event) {
- var el = event.originalTarget;
- var siblings = el.parentNode.childNodes;
- for (var i = 0; i < siblings.length; i++) {
- try {
- siblings[i].setAttribute("checked", siblings[i] == el);
- } catch(e) {}
+
+ function _keepCheckingR (stopMe) {
+ clearInterval(sv.r.testInterval);
+ if (!stopMe) {
+ sv.r.testInterval = window.setInterval(sv.r.test, 10000);
+ }
+ setTimeout(window.updateCommands, 1000, 'r_app_started_closed');
}
- // this will preserve the selection:
- el.parentNode.setAttribute('selected', el.id);
- // set the preference string:
- sv.prefs.setString("sciviews.preferredRApp", el.id, true);
-
- document.getElementById("cmd_sv_start_R").setAttribute("label",
- sv.translate("Start R") + " (" + el.getAttribute('label') + ")");
-}
-
-// Selects checkbox on the 'preferred R application' menu on its first display
-// and hides unsupported commands
-// It is triggered on popupshowing event, onload would be better,
-// but it is for compatibility with komodo 4 which doesn't support onload()
-this.setMenuRApp = function (el) {
- var selected = el.getAttribute('selected');
- var siblings = el.childNodes;
-
- var isLinux = navigator.platform.toLowerCase().indexOf("linux") > -1;
-
- // This will tell whether an app is present on the *nix system
- if (isLinux) {
- function whereis(app) {
- var runSvc = Components.classes["@activestate.com/koRunService;1"]
- .getService(Components.interfaces.koIRunService);
- var err = {}, out = {};
- var res = runSvc.RunAndCaptureOutput("whereis -b " + app,
- null, null, null, out, err);
- var path = out.value.substr(app.length + 2);
- if (!path) return false;
- return out.value.substr(app.length + 2).split(" ");
- }
+
+ function _isRRunning () {
+ //sv.log.debug("is R Running? " + sv.r.running);
+ return sv.r.running;
}
-
- var validPlatforms, showItem;
- var platform = navigator.platform;
- for (var i = 0; i < siblings.length; i++) {
- try {
- validPlatforms = siblings[i].getAttribute("platform").
- split(/\s*[,\s]\s*/);
- showItem = false;
- for (var j in validPlatforms) {
- if (platform.indexOf(validPlatforms[j]) == 0) {
- // on linux, try to determine which terminals are
- // not available and remove these items from menu
- if (!isLinux || whereis(siblings[i].getAttribute("app"))) {
- showItem = true;
- break;
- }
- }
- }
-
- if (!showItem) {
- siblings[i].style.display = "none";
- } else {
- siblings[i].setAttribute("checked", siblings[i].id == selected);
- }
- } catch(e) {}
+
+ function _RControlSelection_supported () {
+ var currentView = ko.views.manager.currentView;
+ if (!currentView || !currentView.scimoz)
+ return false;
+
+ return _RControl_supported()
+ && ((currentView.scimoz.selectionEnd -
+ currentView.scimoz.selectionStart) != 0);
}
-
- // set the preference string:
- sv.prefs.setString("sciviews.preferredRApp", selected, false);
-
- document.getElementById("cmd_sv_start_R").setAttribute("label",
- sv.translate("Start R") + " (" + document.getElementById(selected).
- getAttribute('label') + ")"
- );
-
- // We do not need to run it anymore:
- el.removeAttribute("onpopupshowing");
-}
-
-this.openPkgManager = function () {
- window.openDialog(
- "chrome://sciviewsk/content/pkgManager.xul",
- "RPackageManager",
- "chrome=yes,dependent,centerscreen,resizable=yes,scrollbars=yes,status=no",
- sv);
-}
-
-// This will observe status message notification. This is to get informed about
-// application being terminated. A more straightforward way would be to use
-// runService.RunAndNotify but this wouldn't allow to start app in a console
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/sciviews -r 187
More information about the Sciviews-commits
mailing list