[Sciviews-commits] r132 - in komodo/SciViews-K: . content content/js content/js/tools locale/en-GB locale/fr-FR
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed May 20 16:00:03 CEST 2009
Author: prezez
Date: 2009-05-20 16:00:03 +0200 (Wed, 20 May 2009)
New Revision: 132
Added:
komodo/SciViews-K/sciviewsk-0.7.2-beta-ko.xpi
Modified:
komodo/SciViews-K/content/RBrowserOverlay.xul
komodo/SciViews-K/content/js/robjects.js
komodo/SciViews-K/content/js/sciviews.js
komodo/SciViews-K/content/js/tools/io.js
komodo/SciViews-K/locale/en-GB/sciviewsk.dtd
komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd
Log:
Bug fixed in "sv.getTextRange", resulting in wrong block selection (selection was limited by invisible markers).
object browser: Fold/unfold all tooltips added, dtd updated.
new xpi: increased build number to 0.7.2
Modified: komodo/SciViews-K/content/RBrowserOverlay.xul
===================================================================
--- komodo/SciViews-K/content/RBrowserOverlay.xul 2009-05-19 16:48:58 UTC (rev 131)
+++ komodo/SciViews-K/content/RBrowserOverlay.xul 2009-05-20 14:00:03 UTC (rev 132)
@@ -163,7 +163,7 @@
label="&sciviews.robjects.tab;"
insertafter="project_tab,codebrowser_tab"
tooltiptext="&sciviews.robjects.tip;"
- onclick="rObjectsTree.getPackageList(false)"
+ onclick="rObjectsTree.getPackageList(false);"
/>
</tabs>
<tabpanels id="project_toolbox_tabpanels">
@@ -352,15 +352,17 @@
id="sciviews_robjects_foldAll_button"
label="Fold All"
buttonstyle="pictures"
- class="robjects-fold-all-icon"
+ 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"
+ class="robjects-expand-all-icon"
oncommand="rObjectsTree.foldAll(false);"
+ tooltiptext="&sciviews.robjects.unfoldAll;"
/>
<!--<toolbarbutton
id="sciviews_robjects_tmpInitialize_button"
Modified: komodo/SciViews-K/content/js/robjects.js
===================================================================
--- komodo/SciViews-K/content/js/robjects.js 2009-05-19 16:48:58 UTC (rev 131)
+++ komodo/SciViews-K/content/js/robjects.js 2009-05-20 14:00:03 UTC (rev 132)
@@ -1054,7 +1054,6 @@
sv.r.evalCallback(cmd, _parseObjectList);
}
-
//TODO: on package deletion -> remove it also from the search path
this.removeSelected = function(doRemove) {
var item, type, name, vItem, cmd = [];
@@ -1161,7 +1160,9 @@
return true;
}
-this.getSelectedNames = function(fullNames) {
+this.getSelectedNames = function(fullNames, dblQuoteSubObjects) {
+ if (typeof dblQuoteSubObjects == 'undefined')
+ dblQuoteSubObjects = false;
var rows = this.getSelectedRows();
var namesArr = new Array();
var cellText, item;
@@ -1170,15 +1171,36 @@
for (i in selectedItemsOrd) {
item = selectedItemsOrd[i];
cellText = item[name];
- if (cellText != "") {
- if (item.type == 'object' &&
- cellText.search(/^[a-z\.][\w\._]*$/i) == -1)
- cellText = "`" + cellText + "`";
- else if (item.type == "args" && name == "name")
- cellText += "="; // attach '=' to function args, but not to full names
- namesArr.push(cellText);
+
+ // optimize this later...
+ if (cellText) {
+ if (name == "name" || item.type == 'object') {
+ if (dblQuoteSubObjects && item.type == "sub-object") {
+ cellText = "\"" + cellText + "\"";
+ } else if (cellText.search(/^[a-z\.][\w\._]*$/i) == -1)
+ cellText = "`" + cellText + "`";
+ if (item.type == "args" && name == "name")
+ cellText += "="; // attach '=' to function args, but not to full names
+ }
}
+ /*if (cellText && (name == "name" || item.type == 'object')) {
+ if (cellText.search(/^[a-z\.][\w\._]*$/i) == -1)
+ cellText = "`" + cellText + "`";
+ }*/
+
+ namesArr.push(cellText);
+
+
+ //if (cellText != "") {
+ // if (item.type == 'object' &&
+ // cellText.search(/^[a-z\.][\w\._]*$/i) == -1)
+ // cellText = "`" + cellText + "`";
+ // else if (item.type == "args" && name == "name")
+ // cellText += "="; // attach '=' to function args, but not to full names
+ // namesArr.push(cellText);
+ //}
+
}
return (namesArr);
}
@@ -1330,8 +1352,6 @@
selectedItems.push(_this.visibleData[selectedRows[i]].origItem);
var curRowIdx = selectedRows.indexOf(_this.selection.currentIndex);
-
-
// this maintains array of selected items in order they were added to selection
var prevItems = _this.selectedItemsOrd;
var newItems = [];
@@ -1347,8 +1367,6 @@
}
_this.selectedItemsOrd = newItems;
- sv.debugMsg(newItems);
-
//sv.debugMsg(event.type)
//sv.debugMsg("keyCode: " + event.keyCode + "; charCode: " + event.charCode +
//"; which: " + event.which + "; .ctrlKey: " + event.ctrlKey);
@@ -1365,7 +1383,6 @@
// sv.debugMsg("Select: " + _this.visibleData[_this.selection.currentIndex].origItem.name);
// }
// return;
-
case 46: // Delete key
_this.removeSelected(event.shiftKey);
event.originalTarget.focus();
Modified: komodo/SciViews-K/content/js/sciviews.js
===================================================================
--- komodo/SciViews-K/content/js/sciviews.js 2009-05-19 16:48:58 UTC (rev 131)
+++ komodo/SciViews-K/content/js/sciviews.js 2009-05-20 14:00:03 UTC (rev 132)
@@ -220,9 +220,9 @@
case "block":
// Select all content between two bookmarks
var Mark1, Mark2;
- Mark1 = ke.markerPrevious(curLine, -1);
+ Mark1 = ke.markerPrevious(curLine, 64);
if (Mark1 == -1) Mark1 = 0;
- Mark2 = ke.markerNext(curLine, -1);
+ Mark2 = ke.markerNext(curLine, 64);
if (Mark2 == -1) Mark2 = ke.lineCount - 1;
pStart = ke.positionFromLine(Mark1);
Modified: komodo/SciViews-K/content/js/tools/io.js
===================================================================
--- komodo/SciViews-K/content/js/tools/io.js 2009-05-19 16:48:58 UTC (rev 131)
+++ komodo/SciViews-K/content/js/tools/io.js 2009-05-20 14:00:03 UTC (rev 132)
@@ -162,7 +162,6 @@
-
/*
Stuff:
Modified: komodo/SciViews-K/locale/en-GB/sciviewsk.dtd
===================================================================
--- komodo/SciViews-K/locale/en-GB/sciviewsk.dtd 2009-05-19 16:48:58 UTC (rev 131)
+++ komodo/SciViews-K/locale/en-GB/sciviewsk.dtd 2009-05-20 14:00:03 UTC (rev 132)
@@ -21,12 +21,14 @@
<!ENTITY sciviews.robjects.refresh.tip "Refresh R objects">
<!ENTITY sciviews.robjects.showHide "Search path">
<!ENTITY sciviews.robjects.showHide.tip "Show/hide search path">
-<!ENTITY sciviews.robjects.filter.tip "Filter objects">
+<!ENTITY sciviews.robjects.filter.tip "Filter by regular expression">
<!ENTITY sciviews.robjects.Name "Name">
<!ENTITY sciviews.robjects.Dims "Dims">
<!ENTITY sciviews.robjects.Group "Group">
<!ENTITY sciviews.robjects.Class "Class">
<!ENTITY sciviews.robjects.FullName "Full name">
+<!ENTITY sciviews.robjects.foldAll "Fold all objects of current branch">
+<!ENTITY sciviews.robjects.unfoldAll "Unfold all objects of current branch">
<!ENTITY sciviews.robjects.insName "Insert name into text">
<!ENTITY sciviews.robjects.insFullName "Insert full name into text">
Modified: komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd
===================================================================
--- komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd 2009-05-19 16:48:58 UTC (rev 131)
+++ komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd 2009-05-20 14:00:03 UTC (rev 132)
@@ -21,12 +21,14 @@
<!ENTITY sciviews.robjects.refresh.tip "RŽactualiser les objets R">
<!ENTITY sciviews.robjects.showHide "Chemin de recherche">
<!ENTITY sciviews.robjects.showHide.tip "Montrer/cacher le chemin de recherche">
-<!ENTITY sciviews.robjects.filter.tip "Filtrer le nom des objets">
+<!ENTITY sciviews.robjects.filter.tip "Filtrer by regular expression">
<!ENTITY sciviews.robjects.Name "Nom">
<!ENTITY sciviews.robjects.Dims "Dims">
<!ENTITY sciviews.robjects.Group "Groupe">
<!ENTITY sciviews.robjects.Class "Classe">
<!ENTITY sciviews.robjects.FullName "Full name">
++<!ENTITY sciviews.robjects.foldAll "Fold all objects of current branch">
++<!ENTITY sciviews.robjects.unfoldAll "Unfold all objects of current branch">
<!ENTITY sciviews.robjects.insName "Inserer le nom dans le texte">
<!ENTITY sciviews.robjects.insFullName "Inserer le nom complet dans le texte">
Added: komodo/SciViews-K/sciviewsk-0.7.2-beta-ko.xpi
===================================================================
(Binary files differ)
Property changes on: komodo/SciViews-K/sciviewsk-0.7.2-beta-ko.xpi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Sciviews-commits
mailing list