Author: daburna
Date: 2008-02-01 12:57:59 +0100 (Fri, 01 Feb 2008)
New Revision: 4425
Modified:
yacybar/CHANGELOG
yacybar/chrome/yacybar/content/prefs.xul
yacybar/chrome/yacybar/content/sidebarOverlay.xul
yacybar/chrome/yacybar/content/yacybarOverlay.js
yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd
yacybar/chrome/yacybar/locale/de-DE/yacybar.properties
yacybar/chrome/yacybar/locale/en-US/yacybar.dtd
yacybar/chrome/yacybar/locale/en-US/yacybar.properties
Log:
#added mediasearch (very ugly code!!!)
Modified: yacybar/CHANGELOG
===================================================================
--- yacybar/CHANGELOG 2008-01-31 23:40:47 UTC (rev 4424)
+++ yacybar/CHANGELOG 2008-02-01 11:57:59 UTC (rev 4425)
@@ -1,3 +1,4 @@
++ added mediasearch (daburna)
+ added property-files for translating .js files (daburna)
+ added UTF-8 for all xml files (daburna)
+ added missing css for QPH at statusbar (daburna)
@@ -2,3 +3,3 @@
+ added bookmark icon (daburna)
-- removed "order by"-function
+- removed "order by"-function (daburna)
Modified: yacybar/chrome/yacybar/content/prefs.xul
===================================================================
--- yacybar/chrome/yacybar/content/prefs.xul 2008-01-31 23:40:47 UTC (rev
4424)
+++ yacybar/chrome/yacybar/content/prefs.xul 2008-02-01 11:57:59 UTC (rev
4425)
@@ -52,7 +52,10 @@
name="extensions.yacybar.QuickCrawl.last.xdstopw"
type="bool"/>
- <!-- searching preferences -->
+ <!-- searching preferences -->
+ <preference id="yacybar_searchContent"
+ name="extensions.yacybar.search.content"
+ type="string"/>
<preference id="yacybar_searchMaxResults"
name="extensions.yacybar.search.maxResults"
type="int"/>
<preference id="yacybar_searchResource"
@@ -138,11 +141,22 @@
<!-- search preferences -->
<tabpanel id="yacyBar_PrefsSearchTab"
orient="vertical">
-
<description>&prefs.tabpanel.description.searching;</description>
-
+
<description>&prefs.tabpanel.description.searching;</description>
<grid>
<rows>
<row>
+ <label
value="&prefs.tabpanel.label.value.content;"/>
+ <menulist
id="search.content" preference="yacybar_searchContent" editable="false">
+
<menupopup>
+
<menuitem label="&prefs.tabpanel.menuitem.label.text;"/>
+
<menuitem label="&prefs.tabpanel.menuitem.label.image;"/>
+
<menuitem label="&prefs.tabpanel.menuitem.label.audio;"/>
+
<menuitem label="&prefs.tabpanel.menuitem.label.video;"/>
+
<menuitem label="&prefs.tabpanel.menuitem.label.app;"/>
+
</menupopup>
+ </menulist>
+ </row>
+ <row>
<label
value="&prefs.tabpanel.label.value.maxresults;"/>
<menulist
preference="yacybar_searchMaxResults" id="search.MaxResults" editable="true">
<menupopup>
@@ -156,7 +170,8 @@
<row>
<label
value="&prefs.tabpanel.label.value.res;"/>
<menulist
preference="yacybar_searchResource" id="search.Resource" editable="false">
-
<menupopup>
+
<menupopup>
+<!-- ids vergeben, da lokal falsche Angabe ist -->
<menuitem label="&prefs.tabpanel.menuitem.label.global;"/>
<menuitem label="&prefs.tabpanel.menuitem.label.local;"/>
</menupopup>
Modified: yacybar/chrome/yacybar/content/sidebarOverlay.xul
===================================================================
--- yacybar/chrome/yacybar/content/sidebarOverlay.xul 2008-01-31 23:40:47 UTC
(rev 4424)
+++ yacybar/chrome/yacybar/content/sidebarOverlay.xul 2008-02-01 11:57:59 UTC
(rev 4425)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://yacybar/skin/sidebarOverlay.css"
type="text/css"?>
+<?xml-stylesheet href="chrome://yacybar/skin/sidebarOverlay.css"
type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://yacybar/locale/yacybar.dtd">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
width="600"
height="250"
persist="width height screenX screenY sizeMode"
- title="QuickCrawl">
+ title="&sidebarOverlay.window.title;">
<script src="sidebarOverlay.js" />
<script src="functions.js" />
@@ -45,7 +46,7 @@
</richlistbox>
<hbox>
<hbox id="commandBar" flex="1" align="right">
- <button id="cleanUpButton" label="CleanUp" onclick="cleanup();"/>
+ <button id="cleanUpButton" label="&sidebarOverlay.button.label;"
onclick="cleanup();"/>
</hbox>
<resizer id="windowResizer" dir="bottomright"/>
Modified: yacybar/chrome/yacybar/content/yacybarOverlay.js
===================================================================
--- yacybar/chrome/yacybar/content/yacybarOverlay.js 2008-01-31 23:40:47 UTC
(rev 4424)
+++ yacybar/chrome/yacybar/content/yacybarOverlay.js 2008-02-01 11:57:59 UTC
(rev 4425)
@@ -55,11 +55,12 @@
}
// init search settings
+ if (!Branch.prefHasUserValue("search.content"))
Branch.setCharPref("search.content","text");
if (!Branch.prefHasUserValue("search.maxResults"))
Branch.setIntPref("search.maxResults",10);
if (!Branch.prefHasUserValue("search.resource"))
Branch.setCharPref("search.resource","global");
if (!Branch.prefHasUserValue("search.maxSearchTime"))
Branch.setIntPref("search.maxSearchTime",6);
if (!Branch.prefHasUserValue("search.urlMaskFilter"))
Branch.setCharPref("search.urlMaskFilter",".*");
-
+
// init peer monitoring settings
if (!Branch.prefHasUserValue("peerMonitoring.enabled"))
Branch.setBoolPref("peerMonitoring.enabled",false);
if (!Branch.prefHasUserValue("peerMonitoring.refreshRate"))
Branch.setIntPref("peerMonitoring.refreshRate",30000);
@@ -105,15 +106,23 @@
function getSearchURL(keyword) {
// alert(searchwords);
+ var content = Branch.getCharPref("search.content");
var maxResults = Branch.getIntPref("search.maxResults");
var resource = Branch.getCharPref("search.resource");
var maxSearchTime = Branch.getIntPref("search.maxSearchTime");
- var urlMask = Branch.getCharPref("search.urlMaskFilter");
+ var urlMask = Branch.getCharPref("search.urlMaskFilter");
+ var stringBundle = document.getElementById("yacybar-string-bundle");
if (urlMask == "") urlMask = ".*";
+ if (content == stringBundle.getString("yacybar_content_text")) content =
"text";
+ if (content == stringBundle.getString("yacybar_content_image")) content =
"image";
+ if (content == stringBundle.getString("yacybar_content_audio")) content =
"audio";
+ if (content == stringBundle.getString("yacybar_content_video")) content =
"video";
+ if (content == stringBundle.getString("yacybar_content_app")) content =
"app";
return getBaseURL() +
"/yacysearch.html" +
- "?search=" + keyword +
+ "?search=" + keyword +
+ "&contentdom=" + content +
"&count=" + maxResults +
"&resource=" + resource +
"&time=" + maxSearchTime +
Modified: yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd
===================================================================
--- yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd 2008-01-31 23:40:47 UTC
(rev 4424)
+++ yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd 2008-02-01 11:57:59 UTC
(rev 4425)
@@ -61,6 +61,12 @@
<!ENTITY prefs.tabpanel.hbox.checkbox.label.remote "Remote Indexierung">
<!ENTITY prefs.tabpanel.hbox.checkbox.label.stop "Statische Stopp-Wörter
ausschliessen">
<!ENTITY prefs.tabpanel.description.searching "Einstellungen, die für die
Suche benutzt werden sollen.">
+<!ENTITY prefs.tabpanel.label.value.content "Inhalt">
+<!ENTITY prefs.tabpanel.menuitem.label.text "Text">
+<!ENTITY prefs.tabpanel.menuitem.label.image "Bilder">
+<!ENTITY prefs.tabpanel.menuitem.label.audio "Audio">
+<!ENTITY prefs.tabpanel.menuitem.label.video "Video">
+<!ENTITY prefs.tabpanel.menuitem.label.app "Anwendungen">
<!ENTITY prefs.tabpanel.label.value.maxresults "Max. Ergbnisanzahl">
<!ENTITY prefs.tabpanel.label.value.res "Quelle">
<!ENTITY prefs.tabpanel.menuitem.label.global "global">
@@ -85,10 +91,13 @@
<!ENTITY quickcrawl.groupbox.checkbox.stopwords "Statische Stopp-Wörter
ausschliessen">
<!ENTITY quickcrawl.checkbox.label.default "Angaben als Standard benutzen und
nicht nochmal fragen">
+<!ENTITY sidebarOverlay.window.title "QuickCrawl">
+<!ENTITY sidebarOverlay.button.label "Aufräumen">
+
<!ENTITY statusBar.statusbarpanel.tooltip.qph "Anfragen pro Stunde">
<!ENTITY statusBar.statusbarpanel.tooltip.ppm "Seiten pro Minute">
-<!ENTITY statusBar.statusbarpanel.tooltip.url "Gespeichert URLs">
-<!ENTITY statusBar.statusbarpanel.tooltip.rwi "Gespeichert RWI">
+<!ENTITY statusBar.statusbarpanel.tooltip.url "Gespeicherte URLs">
+<!ENTITY statusBar.statusbarpanel.tooltip.rwi "Gespeicherte RWI">
<!ENTITY statusBar.statusbarpanel.tooltip.menu "YaCyBar Statusbar Menü">
<!ENTITY statusBar.menuitem.label.qph "QPH anzeigen">
<!ENTITY statusBar.menuitem.label.ppm "PPM anzeigen">
Modified: yacybar/chrome/yacybar/locale/de-DE/yacybar.properties
===================================================================
--- yacybar/chrome/yacybar/locale/de-DE/yacybar.properties 2008-01-31
23:40:47 UTC (rev 4424)
+++ yacybar/chrome/yacybar/locale/de-DE/yacybar.properties 2008-02-01
11:57:59 UTC (rev 4425)
@@ -20,6 +20,13 @@
# yacybaroverlays
+# Diese Übersetzungen müssen die gleichen sein wie in der dtd Datei für
prefs.tabpanel.menuitem.label.text etc.
+yacybar_content_text=Text
+yacybar_content_image=Bilder
+yacybar_content_audio=Audio
+yacybar_content_video=Video
+yacybar_content_app=Anwendungen
+
yacybar_proxyon=Proxy ist AN
yacybar_proxyoff=Proxy ist AUS
yacybar_indexingon=Indexierung ist AN
Modified: yacybar/chrome/yacybar/locale/en-US/yacybar.dtd
===================================================================
--- yacybar/chrome/yacybar/locale/en-US/yacybar.dtd 2008-01-31 23:40:47 UTC
(rev 4424)
+++ yacybar/chrome/yacybar/locale/en-US/yacybar.dtd 2008-02-01 11:57:59 UTC
(rev 4425)
@@ -61,6 +61,12 @@
<!ENTITY prefs.tabpanel.hbox.checkbox.label.remote "Remote Indexing">
<!ENTITY prefs.tabpanel.hbox.checkbox.label.stop "Exclude static Stop-Words">
<!ENTITY prefs.tabpanel.description.searching "Settings that should be used
for searching.">
+<!ENTITY prefs.tabpanel.label.value.content "Content">
+<!ENTITY prefs.tabpanel.menuitem.label.text "text">
+<!ENTITY prefs.tabpanel.menuitem.label.image "image">
+<!ENTITY prefs.tabpanel.menuitem.label.audio "audio">
+<!ENTITY prefs.tabpanel.menuitem.label.video "video">
+<!ENTITY prefs.tabpanel.menuitem.label.app "application">
<!ENTITY prefs.tabpanel.label.value.maxresults "Max. number of results">
<!ENTITY prefs.tabpanel.label.value.res "Resource">
<!ENTITY prefs.tabpanel.menuitem.label.global "global">
@@ -85,6 +91,9 @@
<!ENTITY quickcrawl.groupbox.checkbox.stopwords "Exclude static Stop-Words">
<!ENTITY quickcrawl.checkbox.label.default "Use this as the default and do not
ask again">
+<!ENTITY sidebarOverlay.window.title "QuickCrawl">
+<!ENTITY sidebarOverlay.button.label "CleanUp">
+
<!ENTITY statusBar.statusbarpanel.tooltip.qph "Queries Per Hour">
<!ENTITY statusBar.statusbarpanel.tooltip.ppm "Pages Per Minute">
<!ENTITY statusBar.statusbarpanel.tooltip.url "Stored URLs">
Modified: yacybar/chrome/yacybar/locale/en-US/yacybar.properties
===================================================================
--- yacybar/chrome/yacybar/locale/en-US/yacybar.properties 2008-01-31
23:40:47 UTC (rev 4424)
+++ yacybar/chrome/yacybar/locale/en-US/yacybar.properties 2008-02-01
11:57:59 UTC (rev 4425)
@@ -19,6 +19,13 @@
# yacybaroverlays
+# these ones must be the same as in the dtd file for
prefs.tabpanel.menuitem.label.text etc.
+yacybar_content_text=text
+yacybar_content_image=image
+yacybar_content_audio=audio
+yacybar_content_video=video
+yacybar_content_app=application
+
yacybar_proxyoff=Proxy is ON
yacybar_proxyon=Proxy is OFF
yacybar_indexingon=Indexing is ON
_______________________________________________
YaCy-svn mailing list
YaCy-svn@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/yacy-svn
