[Sciviews-commits] r271 - in komodo/SciViews-K/content: . js
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat May 8 20:49:24 CEST 2010
Author: prezez
Date: 2010-05-08 20:49:23 +0200 (Sat, 08 May 2010)
New Revision: 271
Modified:
komodo/SciViews-K/content/RObjectsOverlay.xul
komodo/SciViews-K/content/js/r.js
Log:
Change to the R-object browser's search box.
sv.r.running is now 'true' at Komodo's start.
Modified: komodo/SciViews-K/content/RObjectsOverlay.xul
===================================================================
--- komodo/SciViews-K/content/RObjectsOverlay.xul 2010-05-05 12:22:37 UTC (rev 270)
+++ komodo/SciViews-K/content/RObjectsOverlay.xul 2010-05-08 18:49:23 UTC (rev 271)
@@ -1,43 +1,43 @@
<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ <!-- ***** 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/
+ 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.
+ 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.
+ 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)
+ 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.
+ 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 ***** -->
+ ***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN"
- "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" [
+"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" [
<!ENTITY % sciviewskDTD SYSTEM "chrome://sciviewsk/locale/sciviewsk.dtd">
- %sciviewskDTD;
+%sciviewskDTD;
]>
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
@@ -46,34 +46,34 @@
<?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">
+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();">
+ onpopupshowing="sv.r.objects.contextOnShow();">
<menuitem class="primary_menu_item" id="menu_robjects_cmd_insertfullname"
- command="robjects_cmd_insertfullname" acceltext="Ins"/>
+ command="robjects_cmd_insertfullname" acceltext="Ins"/>
<menuitem id="menu_robjects_cmd_insertname"
- command="robjects_cmd_insertname" acceltext="Ctrl+Ins"/>
+ command="robjects_cmd_insertname" acceltext="Ctrl+Ins"/>
<menuitem id="menu_robjects_cmd_insertquoted"
- command="robjects_cmd_insertquoted" acceltext="Shift+Ins"/>
+ command="robjects_cmd_insertquoted" acceltext="Shift+Ins"/>
<menuseparator keep="false" intoplevel="true"/>
<menuitem id="menu_robjects_cmd_removeobj"
- command="robjects_cmd_removeobj" acceltext="Del"
- key="key_cmd_delete" />
+ command="robjects_cmd_removeobj" acceltext="Del"
+ key="key_cmd_delete" />
<menuitem id="menu_robjects_cmd_deletenow"
- command="robjects_cmd_deletenow" class="menuitem-iconic list-item-remove-icon"
- acceltext="Shift+Del"/>
+ command="robjects_cmd_deletenow" class="menuitem-iconic list-item-remove-icon"
+ acceltext="Shift+Del"/>
<menuseparator keep="false" intoplevel="true"/>
<menuitem id="menu_robjects_cmd_selectall"
- command="robjects_cmd_selectall" acceltext="Ctrl+A"/>
+ command="robjects_cmd_selectall" acceltext="Ctrl+A"/>
<menuitem id="menu_robjects_cmd_selectsiblings"
- command="robjects_cmd_selectsiblings" acceltext="Ctrl+Shift+A"/>
+ command="robjects_cmd_selectsiblings" acceltext="Ctrl+Shift+A"/>
<!--<menuitem id="menu_robjects_cmd_attach" command="robjects_cmd_attach"/>
<menuitem id="menu_robjects_cmd_detach" command="robjects_cmd_detach"/>-->
@@ -86,60 +86,60 @@
<menuitem id="menu_robjects_cmd_names" command="robjects_cmd_names"/>
<menuitem id="menu_robjects_cmd_write_table"
- class="menuitem-iconic save-buffer-icon"
- command="robjects_cmd_write_table"/>
+ class="menuitem-iconic save-buffer-icon"
+ command="robjects_cmd_write_table"/>
<menuseparator keep="false" intoplevel="true"/>
<menuitem id="menu_robjects_cmd_help" command="robjects_cmd_help"/>
- </menupopup>
- </popupset>
+ </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>
+ 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_insertfullname" label="&sciviews.robjects.insFullName;"
- oncommand="sv.r.objects.insertName(true);" accesskey="F"/>
+ oncommand="sv.r.objects.insertName(true);" accesskey="F"/>
<command id="robjects_cmd_insertname" label="&sciviews.robjects.insName;"
- oncommand="sv.r.objects.insertName(false);" accesskey="I"/>
+ oncommand="sv.r.objects.insertName(false);" accesskey="I"/>
<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.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"/>
+ 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"/>
+ 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"/>
+ 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"/>
+ 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"/>
+ oncommand="sv.r.objects.do('names');" accesskey="N"/>
<command id="robjects_cmd_write_table" label="&sciviews.robjects.write_table;"
- oncommand="sv.r.objects.do('write.table');" accesskey="T"/>
+ oncommand="sv.r.objects.do('write.table');" accesskey="T"/>
<command id="robjects_cmd_help" label="&sciviews.robjects.help;"
- oncommand="sv.r.objects.do('help');" accesskey="H"/>
+ oncommand="sv.r.objects.do('help');" accesskey="H"/>
<command id="robjects_cmd_deletenow" label="&sciviews.robjects.deleteNow;"
- oncommand="sv.r.objects.removeSelected(true);" accesskey="&sciviews.robjects.deleteNow.acc;"/>
+ oncommand="sv.r.objects.removeSelected(true);" accesskey="&sciviews.robjects.deleteNow.acc;"/>
<command id="robjects_cmd_insertquoted" label="&sciviews.robjects.insertQuoted;"
- oncommand="sv.r.objects.insertName(false, true);" accesskey="&sciviews.robjects.insertQuoted.acc;"/>
+ oncommand="sv.r.objects.insertName(false, true);" accesskey="&sciviews.robjects.insertQuoted.acc;"/>
<command id="robjects_cmd_selectall" label="&sciviews.robjects.selectAll;"
- oncommand="sv.r.objects.selection.selectAll();" accesskey="&sciviews.robjects.selectAll.acc;"/>
+ oncommand="sv.r.objects.selection.selectAll();" accesskey="&sciviews.robjects.selectAll.acc;"/>
<command id="robjects_cmd_selectsiblings" label="&sciviews.robjects.selectSiblings;"
- oncommand="sv.r.objects.selectAllSiblings(sv.r.objects.selection.currentIndex);"
- accesskey="&sciviews.robjects.selectSiblings.acc;"/>
+ oncommand="sv.r.objects.selectAllSiblings(sv.r.objects.selection.currentIndex);"
+ accesskey="&sciviews.robjects.selectSiblings.acc;"/>
</commandset>
@@ -147,157 +147,161 @@
<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;"/>
+ 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;"/>
+ 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);"/>
+ 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">
+ 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);"/>
+ 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"/>
+ 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">
+ 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();"/>
+ 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);"/>
+ 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();"/>
+ 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.install(null, 'local');"/>
+ accesskey="c" class="menuitem-iconic r-pkg-install-local-icon"
+ oncommand="sv.r.pkg.install(null, 'local');"/>
<menuitem id="r_objects_pkg_update" label="Update"
- accesskey="u" class="menuitem-iconic r-pkg-update-icon"
- oncommand="sv.r.pkg.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();"/>
+ 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">
+ 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')"/>
+ 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')"/>
+ 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')"/>
+ 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();"/>
+ 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;"/>
+ <textbox id="sciviews_robjects_filterbox" flex="1"
+ type="search" timeout="500"
+ tooltiptext="&sciviews.robjects.filter.tip;"
+ style="min-width: 40px; max-width: 200px; margin-right: 0px;"
+ class="search-box"
+ oncommand="sv.r.objects.applyFilter();"
+ emptytext="&sciviews.robjects.filterEmptyText;"
+ />
</hbox>
<vbox id="robjects_searchpath_panel"
- persist="height collapsed" state="collapsed" flex="1">
+ persist="height collapsed" state="collapsed" flex="1">
<listbox flex="1" id="sciviews_robjects_searchpath_listbox"
- ondragdrop="nsDragAndDrop.drop(event, sv.r.objects.packageListObserver);"
- ondragover="nsDragAndDrop.dragOver(event, sv.r.objects.packageListObserver);"
- ondraggesture="nsDragAndDrop.startDrag(event, sv.r.objects.packageListObserver);"
- onkeypress="sv.r.objects.packageListKeyEvent(event);"
- oncommand="sv.r.objects.packageSelectedEvent(event);"/>
+ ondragdrop="nsDragAndDrop.drop(event, sv.r.objects.packageListObserver);"
+ ondragover="nsDragAndDrop.dragOver(event, sv.r.objects.packageListObserver);"
+ ondraggesture="nsDragAndDrop.startDrag(event, sv.r.objects.packageListObserver);"
+ onkeypress="sv.r.objects.packageListKeyEvent(event);"
+ oncommand="sv.r.objects.packageSelectedEvent(event);"/>
</vbox>
<splitter id="sciviews_robjects_splitter" collapse="before"
- resizeafter="closest" resizebefore="closest" persist="state"
- observes="cmd_robjects_viewSearchPath">
+ 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="sv.r.objects.onEvent(event);"
- onkeypress="sv.r.objects.onEvent(event);">
+ persist="sortDirection sortResource"
+ sortDirection="ascending" sortResource="r-name"
+ enableColumnDrag="true"
+ onselect="sv.r.objects.onEvent(event);"
+ onkeypress="sv.r.objects.onEvent(event);">
<treecols>
<treecol id="r-name" label="&sciviews.robjects.Name;"
- primary="true" sortActive="true"
- persist="width ordinal hidden"
- onclick="sv.r.objects.sort(this);" ordinal="1" flex="4"/>
+ primary="true" sortActive="true"
+ persist="width ordinal hidden"
+ onclick="sv.r.objects.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="sv.r.objects.sort(this);" flex="1" ordinal="3"/>
+ persist="width ordinal hidden"
+ onclick="sv.r.objects.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="sv.r.objects.sort(this);" ordinal="5"/>
+ flex="2" hidden="true" persist="width ordinal hidden"
+ onclick="sv.r.objects.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="sv.r.objects.sort(this);" ordinal="7"/>
+ flex="2" hidden="true" persist="width ordinal hidden"
+ onclick="sv.r.objects.sort(this);" ordinal="7"/>
<splitter class="tree-splitter" ordinal="8"/>
<treecol id="r-fullName" label="&sciviews.robjects.FullName;"
- persist="width ordinal hidden" flex="1" hidden="true" ordinal="9"/>
+ persist="width ordinal hidden" flex="1" hidden="true" ordinal="9"/>
</treecols>
<treechildren id="sciviews_robjects_objects_tree_main"
- ondraggesture="nsDragAndDrop.startDrag(event, sv.r.objects.listObserver);"
- ondragdrop="nsDragAndDrop.drop(event, sv.r.objects.listObserver);"
- ondragover="nsDragAndDrop.dragOver(event, sv.r.objects.listObserver);"
- onclick="sv.r.objects.onEvent(event);"
- ondblclick="sv.r.objects.onEvent(event);"
- context="rObjectsContext">
+ ondraggesture="nsDragAndDrop.startDrag(event, sv.r.objects.listObserver);"
+ ondragdrop="nsDragAndDrop.drop(event, sv.r.objects.listObserver);"
+ ondragover="nsDragAndDrop.dragOver(event, sv.r.objects.listObserver);"
+ onclick="sv.r.objects.onEvent(event);"
+ ondblclick="sv.r.objects.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="sv.r.objects.foldAll(true);"
- tooltiptext="&sciviews.robjects.foldAll;"/>
+ label="Fold All" buttonstyle="pictures"
+ class="robjects-fold-all-icon"
+ oncommand="sv.r.objects.foldAll(true);"
+ tooltiptext="&sciviews.robjects.foldAll;"/>
<toolbarbutton id="sciviews_robjects_ExpandAll_button"
- label="Expand All" buttonstyle="pictures"
- class="robjects-expand-all-icon"
- oncommand="sv.r.objects.foldAll(false);"
- tooltiptext="&sciviews.robjects.unfoldAll;"/>
- <!--<toolbarbutton id="sciviews_robjects_tmpInitialize_button"
+ label="Expand All" buttonstyle="pictures"
+ class="robjects-expand-all-icon"
+ oncommand="sv.r.objects.foldAll(false);"
+ tooltiptext="&sciviews.robjects.unfoldAll;"/>
+ <!--<toolbarbutton id="sciviews_robjects_tmpInitialize_button"
label="Init!" oncommand="sv.r.objectsInit();"/>-->
</hbox>
</vbox>
Modified: komodo/SciViews-K/content/js/r.js
===================================================================
--- komodo/SciViews-K/content/js/r.js 2010-05-05 12:22:37 UTC (rev 270)
+++ komodo/SciViews-K/content/js/r.js 2010-05-08 18:49:23 UTC (rev 271)
@@ -117,7 +117,8 @@
//}
// Indicate if R is currently running
-sv.r.running = false;
+//FIXME: before we solve the issue of updating R status:
+sv.r.running = true; // = false;
// Used to record pending commands while R is starting
sv.r.pendingCmd = "";
@@ -1461,7 +1462,7 @@
} catch(e) {
sv.log.exception(e, "Unknown error while creating .pot file with"
+ " sv.r.kpf2pot(). (" + e + ")", true);
- }
+ }
}
// Create a translation (.pot) file for a package
@@ -1499,8 +1500,8 @@
} catch(e) {
sv.log.exception(e, "Unknown error while translating a project file with"
+ " sv.r.kpfTranslate(). (" + e + ")", true);
- }
-}
+ }
+}
// Translate a package
sv.r.kpzTranslate = function (kpzFile) {
@@ -1518,8 +1519,8 @@
} catch(e) {
sv.log.exception(e, "Unknown error while translating package file with"
+ " sv.r.kpzTranslate(). (" + e + ")", true);
- }
-}
+ }
+}
//// Define the 'sv.r.pkg' namespace ///////////////////////////////////////////
More information about the Sciviews-commits
mailing list