[Sciviews-commits] r188 - in komodo/SciViews-K: . content content/js content/js/tools
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Sep 13 18:20:56 CEST 2009
Author: phgrosjean
Date: 2009-09-13 18:20:54 +0200 (Sun, 13 Sep 2009)
New Revision: 188
Added:
komodo/SciViews-K/content/RConsoleOverlay.xul
komodo/SciViews-K/content/RObjectsOverlay.xul
komodo/SciViews-K/content/js/rconsole.js
komodo/SciViews-K/content/js/tools/file.js
komodo/SciViews-K/content/pkgManagerOverlay.xul
Removed:
komodo/SciViews-K/content/RBrowserOverlay.xul
komodo/SciViews-K/content/js/console.js
komodo/SciViews-K/content/js/tools/io.js
komodo/SciViews-K/content/pkgManager.xul
komodo/SciViews-K/content/rconsole.xul
Modified:
komodo/SciViews-K/chrome.manifest
komodo/SciViews-K/content/js/commands.js
komodo/SciViews-K/content/js/prefs.js
komodo/SciViews-K/content/js/r.js
komodo/SciViews-K/content/js/robjects.js
komodo/SciViews-K/content/js/sciviews.js
komodo/SciViews-K/content/js/socket.js
komodo/SciViews-K/content/js/tools/array.js
komodo/SciViews-K/content/js/tools/strings.js
komodo/SciViews-K/content/overlayMain.xul
komodo/SciViews-K/content/pref-Main.xul
komodo/SciViews-K/content/pref-R.xul
komodo/SciViews-K/content/prefOverlay.xul
komodo/SciViews-K/sciviewsk-0.8.1-ko.xpi
Log:
Cleanup done, a couple of files are renamed (object browser, R console, ...)
Modified: komodo/SciViews-K/chrome.manifest
===================================================================
--- komodo/SciViews-K/chrome.manifest 2009-09-13 08:15:45 UTC (rev 187)
+++ komodo/SciViews-K/chrome.manifest 2009-09-13 16:20:54 UTC (rev 188)
@@ -1,10 +1,10 @@
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/komodo.xul chrome://sciviewsk/content/RObjectsOverlay.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/komodo.xul chrome://sciviewsk/content/RConsoleOverlay.xul
locale sciviewsk en-GB jar:sciviewsk.jar!/locale/en-GB/
locale sciviewsk fr-FR jar:sciviewsk.jar!/locale/fr-FR/
Deleted: komodo/SciViews-K/content/RBrowserOverlay.xul
===================================================================
--- komodo/SciViews-K/content/RBrowserOverlay.xul 2009-09-13 08:15:45 UTC (rev 187)
+++ komodo/SciViews-K/content/RBrowserOverlay.xul 2009-09-13 16:20:54 UTC (rev 188)
@@ -1,270 +0,0 @@
-<?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 % 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="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" 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>
-
- <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="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);"/>
- </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"
- 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>
- </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>
-</overlay>
Added: komodo/SciViews-K/content/RConsoleOverlay.xul
===================================================================
--- komodo/SciViews-K/content/RConsoleOverlay.xul (rev 0)
+++ komodo/SciViews-K/content/RConsoleOverlay.xul 2009-09-13 16:20:54 UTC (rev 188)
@@ -0,0 +1,162 @@
+<?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):
+ Romain Francois
+
+ 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 % 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"?>
+<?xml-stylesheet href="chrome://sciviewsk/skin/sciviewsk_console.css" type="text/css"?>
+
+<overlay id="sciviewskRconsoleOverlay"
+ 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/sciviews.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/prefs.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/strings.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/e4x2dom.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/tools/array.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/socket.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/r.js"/>
+ <script type="application/x-javascript" src="chrome://sciviewsk/content/js/rconsole.js"/>
+
+ <menupopup id="tabPicker_popup">
+ <menuitem id="show_rconsole_tab" label="&sciviews.console.tab;"
+ oncommand="uilayout_ensureTabShown('sciviews_rconsole_tab', true)"/>
+ </menupopup>
+
+ <menupopup id="menu_view_tabs_popup">
+ <menuitem id="show_rconsole_tab2" class="menuitem-iconic-wide"
+ label="&sciviews.console.tab;"
+ oncommand="uilayout_ensureTabShown('sciviews_rconsole_tab', true)"/>
+ </menupopup>
+
+ <tabbox id="output_area">
+ <tabs id="output_tabs">
+ <tab id="sciviews_rconsole_tab" label="&sciviews.console.tab;"
+ tooltiptext="&sciviews.console.tip;" onclick="sv.r.console.init();"/>
+ </tabs>
+ <tabpanels id="output_tabpanels">
+
+ <tabpanel flex="1" id="sciviews_rconsole_tabpanel">
+ <vbox id="sciviews_rconsole_console_vbox" flex="1" style="margin-left:10px;">
+ <richlistbox id="sciviews_rconsole_console_results" flex="1"/>
+ <splitter id="sciviews_rconsole_console_splitter">
+ <grippy/>
+ </splitter>
+ <hbox>
+ <!-- TODO: replace this with a scintilla editor, would we get syntax highlighting for free? -->
+ <!-- TODO: needs a bit of styling -->
+ <!-- here is the input area where R code is typed and sent to the console -->
+ <textbox id="sciviews_rconsole_console_input" cols="20"
+ onkeypress="sv.r.console.handleConsoleKeyPress(event)"
+ onkeyup="sv.r.console.handleConsoleKeyUp(event)"
+ flex="1" multiline="true" rows="2"/>
+ </hbox>
+ </vbox>
+ <splitter>
+ <grippy/>
+ </splitter>
+
+ <tabbox flex="1">
+ <tabs>
+ <tab label="completion" id="sciviews_rconsole_console_tab_completion"/>
+ <tab label="history" id="sciviews_rconsole_console_tab_history"/>
+ </tabs>
+ <tabpanels flex="1">
+
+ <!-- completion tab -->
+ <!-- TODO: use this as a tooltip -->
+ <tabpanel>
+ <vbox flex="1">
+ <hbox>
+ <label value="&sciviews.rconsole.completion.settings.label;"
+ tooltiptext="&sciviews.rconsole.completion.settings.tip;"/>
+ <checkbox label="&sciviews.rconsole.completion.cb.arguments;"
+ id="sciviews_rconsole_completion_cb_arguments"
+ tooltiptext="&sciviews.rconsole.completion.cb.arguments.tip;"
+ onclick="sv.r.console.updateCompletionChoiceSetting(event, 'arguments' )"/>
+ <checkbox label="&sciviews.rconsole.completion.cb.functions;"
+ id="sciviews_rconsole_completion_cb_functions"
+ tooltiptext="&sciviews.rconsole.completion.cb.functions.tip;"
+ onclick="sv.r.console.updateCompletionChoiceSetting(event, 'functions' )"/>
+ <checkbox label="&sciviews.rconsole.completion.cb.packages;"
+ id="sciviews_rconsole_completion_cb_packages"
+ tooltiptext="&sciviews.rconsole.completion.cb.packages.tip;"
+ onclick="sv.r.console.updateCompletionChoiceSetting(event, 'packages' )"/>
+ <checkbox label="&sciviews.rconsole.completion.cb.history;"
+ id="sciviews_rconsole_completion_cb_history"
+ tooltiptext="&sciviews.rconsole.completion.cb.history.tip;"
+ onclick="sv.r.console.updateCompletionChoiceSetting(event, 'history' )"/>
+ </hbox>
+ <tree flex="1">
+ <treecols>
+ <treecol primary="true" label="completion" flex="1"/>
+ <treecol label="position" flex="1"/>
+ <treecol label="description" flex="6"/>
+ </treecols>
+ <treechildren id="sciviews_rconsole_completion_tree_main"/>
+ </tree>
+ </vbox>
+ </tabpanel>
+
+ <!-- history tab -->
+ <tabpanel>
+ <vbox flex="1">
+ <hbox>
+ <label>history</label>
+ <textbox id="sciviews_rconsole_history_filter"
+ style="min-width:40px; margin-right:0px; max-width:100px;"
+ type="timed" timeout="500" flex="1"
+ oninput="sv.r.console.refreshHistory();"
+ multiline="false" rows="1"
+ tooltiptext="&sciviews.console.history.filter.tip;"/>
+ </hbox>
+ <richlistbox id="sciviews_rconsole_console_history_richlistbox"
+ flex="1"/>
+ </vbox>
+ </tabpanel>
+ </tabpanels>
+ </tabbox>
+ </tabpanel>
+ </tabpanels>
+ </tabbox>
+</overlay>
Added: komodo/SciViews-K/content/RObjectsOverlay.xul
===================================================================
--- komodo/SciViews-K/content/RObjectsOverlay.xul (rev 0)
+++ komodo/SciViews-K/content/RObjectsOverlay.xul 2009-09-13 16:20:54 UTC (rev 188)
@@ -0,0 +1,270 @@
+<?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 % 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="sciviewsRObjectsOverlay" 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="sv.r.objects.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="sv.r.objects.toggleViewSearchPath(event);"
+ checked="true" state="open"/>
+ </broadcasterset>
+
+ <commandset id="allcommands">
+ <commandset id="r-objects-commands">
+ <command id="robjects_cmd_insertname" label="&sciviews.robjects.insName;"
+ oncommand="sv.r.objects.insertName(false);" accesskey="I"/>
+ <command id="robjects_cmd_insertfullname" label="&sciviews.robjects.insFullName;"
+ oncommand="sv.r.objects.insertName(true);" accesskey="F"/>
+ <command id="robjects_cmd_removeobj" label="&sciviews.robjects.rmObj;"
+ oncommand="sv.r.objects.removeSelected(event.shiftKey);" accesskey="R"/>
+ <command id="robjects_cmd_attach" label="&sciviews.robjects.loadPkg;"
+ oncommand="sv.r.objects.do('library');" accesskey="L" disabled="true"/>
+ <command id="robjects_cmd_summary" label="&sciviews.robjects.summary;"
+ oncommand="sv.r.objects.do('summary');" accesskey="S"/>
+ <command id="robjects_cmd_print" label="&sciviews.robjects.print;"
+ oncommand="sv.r.objects.do('print');" accesskey="P"/>
+ <command id="robjects_cmd_plot" label="&sciviews.robjects.plot;"
+ oncommand="sv.r.objects.do('plot');" accesskey="O"/>
+ <command id="robjects_cmd_str" label="&sciviews.robjects.str;"
+ oncommand="sv.r.objects.do('str');" accesskey="T"/>
+ <command id="robjects_cmd_names" label="&sciviews.robjects.names;"
+ oncommand="sv.r.objects.do('names');" accesskey="N"/>
+ <command id="robjects_cmd_help" label="&sciviews.robjects.help;"
+ oncommand="sv.r.objects.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="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="sv.r.objects.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="sv.r.objects.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="sv.r.objects.setFilterBy(this, 'name')"/>
+ <menuitem id="sciviews_robjects_context_filterByClass"
+ label="&sciviews.robjects.filterByClass;"
+ accesskey="c" type="checkbox"
+ oncommand="sv.r.objects.setFilterBy(this, 'class')"/>
+ <menuitem id="sciviews_robjects_context_filterByGroup"
+ label="&sciviews.robjects.filterByGroup;"
+ accesskey="g" type="checkbox"
+ oncommand="sv.r.objects.setFilterBy(this, 'group')"/>
+ <menuseparator/>
+ <menuitem id="sciviews_robjects_context_clrFilter"
+ label="&sciviews.robjects.clrFilter;" accesskey="l"
+ oncommand="document.getElementById('sciviews_robjects_filterbox').value = ''; sv.r.objects.applyFilter();"/>
+ </menupopup>
+ </toolbarbutton>
+ <textbox id="sciviews_robjects_filterbox" flex="1" type="timed"
+ timeout="500" tooltiptext="&sciviews.robjects.filter.tip;"
+ oninput="sv.r.objects.applyFilter();"
+ emptytext="&sciviews.robjects.filterEmptyText;"/>
+ </hbox>
+ <vbox id="robjects_searchpath_panel"
+ persist="height collapsed" flex="1">
+ <listbox flex="1" id="sciviews_robjects_searchpath_listbox"
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/sciviews -r 188
More information about the Sciviews-commits
mailing list