Author: daburna
Date: 2008-02-07 21:35:24 +0100 (Thu, 07 Feb 2008)
New Revision: 4458
Modified:
yacybar/CHANGELOG
yacybar/chrome/yacybar/content/contentArea.xul
yacybar/chrome/yacybar/content/statusBar.js
yacybar/chrome/yacybar/content/statusBar.xul
yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd
yacybar/chrome/yacybar/locale/en-US/yacybar.dtd
Log:
#added link to own peer stats at statusbar / todo: show only when loged in
#added add bookmark function for contentarea
#added accesskeys for contentarea
Modified: yacybar/CHANGELOG
===================================================================
--- yacybar/CHANGELOG 2008-02-06 21:15:24 UTC (rev 4457)
+++ yacybar/CHANGELOG 2008-02-07 20:35:24 UTC (rev 4458)
@@ -1,3 +1,7 @@
++ added link to own peer stats at statusbar (daburna)
++ added add bookmark function for contentarea (daburna)
++ added accesskeys for contentarea (daburna)
+
v 0.2.4 - 05.02.2008
=====================================================================
+ added new iconset (daburna)
Modified: yacybar/chrome/yacybar/content/contentArea.xul
===================================================================
--- yacybar/chrome/yacybar/content/contentArea.xul 2008-02-06 21:15:24 UTC
(rev 4457)
+++ yacybar/chrome/yacybar/content/contentArea.xul 2008-02-07 20:35:24 UTC
(rev 4458)
@@ -9,19 +9,24 @@
<!-- Context menu additions -->
<popup id="contentAreaContextMenu">
<menuseparator />
- <menu id ="YaCyBar-context" label="YaCyBar" class="menu-iconic">
+ <menu id ="YaCyBar-context"
label="&contentArea.menu.label.yacybar;" class="menu-iconic"
accesskey="&contentArea.menu.accesskey.yacybar;">
<menupopup id="YaCyBar-context-items">
- <menuitem id="crawlLink"
label="&contentArea.menuitem.label.crawllink;"
+ <menuitem id="crawlLink"
label="&contentArea.menuitem.label.crawllink;"
accesskey="&contentArea.menuitem.accesskey.crawllink;"
oncommand="crawllink();"
tooltiptext="&contentArea.menuitem.tooltip.crawllink;"
class="menuitem-iconic" />
- <menuitem id="crawlPage"
label="&contentArea.menuitem.label.crawlpage;"
+ <menuitem id="crawlPage"
label="&contentArea.menuitem.label.crawlpage;"
accesskey="&contentArea.menuitem.accesskey.crawlpage;"
oncommand="crawlpage();"
tooltiptext="&contentArea.menuitem.tooltip.crawlpage;"
class="menuitem-iconic" />
- <menuitem id="searchSelected"
label="&contentArea.menuitem.label.search;"
+ <menuitem id="searchSelected"
label="&contentArea.menuitem.label.search;"
accesskey="&contentArea.menuitem.accesskey.search;"
oncommand="searchSelected();"
tooltiptext="&contentArea.menuitem.tooltip.search;"
+ class="menuitem-iconic" />
+ <menuitem id="menuitem-addbookmark"
label="&contentArea.menuitem.label.addBM;"
accesskey="&contentArea.menuitem.accesskey.addBM;"
+ selected="true"
+ oncommand="showAddBookmark()"
+ tooltiptext="&contentArea.menuitem.tooltip.addBM;"
class="menuitem-iconic" />
<menuseparator />
<menuitem id="about"
label="&contentArea.menuitem.label.about;"
accesskey="&contentArea.menuitem.accesskey.about;"
Modified: yacybar/chrome/yacybar/content/statusBar.js
===================================================================
--- yacybar/chrome/yacybar/content/statusBar.js 2008-02-06 21:15:24 UTC (rev
4457)
+++ yacybar/chrome/yacybar/content/statusBar.js 2008-02-07 20:35:24 UTC (rev
4458)
@@ -81,7 +81,8 @@
var name = your.getElementsByTagName("name")[0].firstChild.nodeValue;
var type =
your.getElementsByTagName("type")[0].firstChild.nodeValue;
var url =
your.getElementsByTagName("links")[0].firstChild.nodeValue;
- var rwi =
your.getElementsByTagName("words")[0].firstChild.nodeValue;
+ var rwi =
your.getElementsByTagName("words")[0].firstChild.nodeValue;
+ var hash =
your.getElementsByTagName("hash")[0].firstChild.nodeValue;
var qphPanel =
document.getElementById('yacybar_statusBar_qph');
var ppmPanel =
document.getElementById('yacybar_statusBar_ppm');
@@ -93,6 +94,7 @@
ppmPanel.label = "PPM: " + ppm;
urlPanel.label = "#URL: " + groupDigits(url);
rwiPanel.label = "#RWI: " + groupDigits(rwi);
+ stats = hash;
peerTypePanel.setAttribute("peerType", type);
peerTypePanel.tooltipText =
stringBundle.getString("yacybar_peertype") + type;
@@ -149,5 +151,15 @@
document.getElementById('cmd_showPeerType').setAttribute("checked","true");
}
updateStatus();
+}
+
+function loadURL(newURL) {
+ // gBrowser.addTab(newURL);
+ window._content.document.location = newURL;
+ window.content.focus();
+}
+
+function showStats(event) {
+ loadURL("http://www.yacystats.de/peer/"+stats);
}
-
+// TODO show only if loged in
Modified: yacybar/chrome/yacybar/content/statusBar.xul
===================================================================
--- yacybar/chrome/yacybar/content/statusBar.xul 2008-02-06 21:15:24 UTC
(rev 4457)
+++ yacybar/chrome/yacybar/content/statusBar.xul 2008-02-07 20:35:24 UTC
(rev 4458)
@@ -21,8 +21,14 @@
<menuitem id="cmd_showRWI"
label="&statusBar.menuitem.label.rwi;" type="checkbox"
oncommand="toggle('yacybar_statusBar_rwi');"/>
<menuitem id="cmd_showPeerType"
label="&statusBar.menuitem.label.peertype;" type="checkbox"
oncommand="toggle('yacybar_statusBar_peerType');"/>
<menuseparator />
- <menuitem id="cmd_MonitoringControl"
label="&statusBar.menuitem.label.monitoring;" type="checkbox"
oncommand="setMonitoring();"/>
- <menuseparator />
+ <menuitem id="cmd_MonitoringControl"
label="&statusBar.menuitem.label.monitoring;" type="checkbox"
oncommand="setMonitoring();"
accesskey="&statusBar.menuitem.accesskey.monitoring;"/>
+ <menuseparator />
+ <menuitem id="hash"
label="&statusBar.menuitem.label.peerstats;"
accesskey="&statusBar.menuitem.accesskey.peerstats;"
+
tooltiptext="&statusBar.menuitem.tooltip.peerstats;"
+
oncommand="showStats(event)"
+
onclick="showStats(event)"
+
class="menuitem-iconic"/>
+ <menuseparator />
<menuitem id="about"
label="&statusBar.menuitem.label.about;"
accesskey="&statusBar.menuitem.accesskey.about;"
tooltiptext="&statusBar.menuitem.tooltip.about;"
oncommand="showAbout()"
Modified: yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd
===================================================================
--- yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd 2008-02-06 21:15:24 UTC
(rev 4457)
+++ yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd 2008-02-07 20:35:24 UTC
(rev 4458)
@@ -3,12 +3,20 @@
<!ENTITY about.text.contributors "Beitragende:">
<!ENTITY about.text.homepage "Homepage">
+<!ENTITY contentArea.menu.label.yacybar "YaCy-Bar">
+<!ENTITY contentArea.menu.accesskey.yacybar "Y">
<!ENTITY contentArea.menuitem.label.crawllink "Diesen Link crawlen">
+<!ENTITY contentArea.menuitem.accesskey.crawllink "L">
<!ENTITY contentArea.menuitem.tooltip.crawllink "Diesen Link crawlen">
<!ENTITY contentArea.menuitem.label.crawlpage "Aktuelle Seite crawlen">
+<!ENTITY contentArea.menuitem.accesskey.crawlpage "C">
<!ENTITY contentArea.menuitem.tooltip.crawlpage "Aktuelle Seite crawlen">
<!ENTITY contentArea.menuitem.label.search "Suche dieses Wort">
+<!ENTITY contentArea.menuitem.accesskey.search "S">
<!ENTITY contentArea.menuitem.tooltip.search "Suche nach dem markierten Wort">
+<!ENTITY contentArea.menuitem.label.addBM "Seite zu Lesezeichen hinzufügen">
+<!ENTITY contentArea.menuitem.accesskey.addBM "Z">
+<!ENTITY contentArea.menuitem.tooltip.addBM "Aktuelle Seite zu Lesezeichen
hinzufügen">
<!ENTITY contentArea.menuitem.label.about "Über YaCyBar">
<!ENTITY contentArea.menuitem.accesskey.about "Ü">
<!ENTITY contentArea.menuitem.tooltip.about "Über die YaCyBar">
@@ -106,6 +114,10 @@
<!ENTITY statusBar.menuitem.label.rwi "#RWI anzeigen">
<!ENTITY statusBar.menuitem.label.peertype "Peer-Typ anzeigen">
<!ENTITY statusBar.menuitem.label.monitoring "Kontrolle aktivieren">
+<!ENTITY statusBar.menuitem.accesskey.monitoring "K">
+<!ENTITY statusBar.menuitem.label.peerstats "Peer Statistik">
+<!ENTITY statusBar.menuitem.accesskey.peerstats "S">
+<!ENTITY statusBar.menuitem.tooltip.peerstats "Zeigt die Peer Statistik auf
yacystats">
<!ENTITY statusBar.menuitem.label.about "Über YaCy-Bar">
<!ENTITY statusBar.menuitem.accesskey.about "Ü">
<!ENTITY statusBar.menuitem.tooltip.about "Über die YaCy-Bar">
Modified: yacybar/chrome/yacybar/locale/en-US/yacybar.dtd
===================================================================
--- yacybar/chrome/yacybar/locale/en-US/yacybar.dtd 2008-02-06 21:15:24 UTC
(rev 4457)
+++ yacybar/chrome/yacybar/locale/en-US/yacybar.dtd 2008-02-07 20:35:24 UTC
(rev 4458)
@@ -3,12 +3,20 @@
<!ENTITY about.text.contributors "Contributors:">
<!ENTITY about.text.homepage "Homepage">
+<!ENTITY contentArea.menu.label.yacybar "YaCyBar">
+<!ENTITY contentArea.menu.accesskey.yacybar "Y">
<!ENTITY contentArea.menuitem.label.crawllink "Crawl this link">
+<!ENTITY contentArea.menuitem.accesskey.crawllink "L">
<!ENTITY contentArea.menuitem.tooltip.crawllink "Crawl this link">
<!ENTITY contentArea.menuitem.label.crawlpage "Crawl current page">
+<!ENTITY contentArea.menuitem.accesskey.crawlpage "P">
<!ENTITY contentArea.menuitem.tooltip.crawlpage "Crawl current page">
<!ENTITY contentArea.menuitem.label.search "Search this keyword">
+<!ENTITY contentArea.menuitem.accesskey.search "S">
<!ENTITY contentArea.menuitem.tooltip.search "Search for selected keyword">
+<!ENTITY contentArea.menuitem.label.addBM "Add Bookmark">
+<!ENTITY contentArea.menuitem.accesskey.addBM "B">
+<!ENTITY contentArea.menuitem.tooltip.addBM "Add current page to Bookmarks">
<!ENTITY contentArea.menuitem.label.about "About YaCyBar">
<!ENTITY contentArea.menuitem.accesskey.about "A">
<!ENTITY contentArea.menuitem.tooltip.about "About the YaCyBar">
@@ -106,6 +114,10 @@
<!ENTITY statusBar.menuitem.label.rwi "Show #RWI">
<!ENTITY statusBar.menuitem.label.peertype "Show PeerType">
<!ENTITY statusBar.menuitem.label.monitoring "Enable Monitoring">
+<!ENTITY statusBar.menuitem.accesskey.monitoring "E">
+<!ENTITY statusBar.menuitem.label.peerstats "Peer Statistics">
+<!ENTITY statusBar.menuitem.accesskey.peerstats "S">
+<!ENTITY statusBar.menuitem.tooltip.peerstats "Shows your Peer Statistics at
yacystats">
<!ENTITY statusBar.menuitem.label.about "About YaCyBar">
<!ENTITY statusBar.menuitem.accesskey.about "A">
<!ENTITY statusBar.menuitem.tooltip.about "About the YaCyBar">
_______________________________________________
YaCy-svn mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/yacy-svn
