Author: daburna Date: 2008-01-31 15:05:34 +0100 (Thu, 31 Jan 2008) New Revision: 4421
Modified: yacybar/CHANGELOG yacybar/chrome/yacybar/content/contentArea.xul yacybar/chrome/yacybar/content/prefs.xul yacybar/chrome/yacybar/content/yacybarOverlay.js yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd yacybar/chrome/yacybar/locale/en-US/yacybar.dtd yacybar/install.rdf Log: #removed outdated order-by function Modified: yacybar/CHANGELOG =================================================================== --- yacybar/CHANGELOG 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/CHANGELOG 2008-01-31 14:05:34 UTC (rev 4421) @@ -2,6 +2,7 @@ + added UTF-8 for all xml files (daburna) + added missing css for QPH at statusbar (daburna) + added bookmark icon (daburna) +- removed "order by"-function v 0.2.3 - 23.01.2008 ===================================================================== Modified: yacybar/chrome/yacybar/content/contentArea.xul =================================================================== --- yacybar/chrome/yacybar/content/contentArea.xul 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/chrome/yacybar/content/contentArea.xul 2008-01-31 14:05:34 UTC (rev 4421) @@ -24,7 +24,7 @@ tooltiptext="&contentArea.menuitem.tooltip.search;" class="menuitem-iconic" /> <menuseparator /> - <menuitem id="about" label="&contentArea.menuitem.label.about;" accesskey="A" + <menuitem id="about" label="&contentArea.menuitem.label.about;" accesskey="&contentArea.menuitem.accesskey.about;" tooltiptext="&contentArea.menuitem.tooltip.about;" oncommand="showAbout()" class="menuitem-iconic"/> Modified: yacybar/chrome/yacybar/content/prefs.xul =================================================================== --- yacybar/chrome/yacybar/content/prefs.xul 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/chrome/yacybar/content/prefs.xul 2008-01-31 14:05:34 UTC (rev 4421) @@ -158,19 +158,6 @@ </menulist> </row> <row> - <label value="&prefs.tabpanel.label.value.order;"/> - <menulist preference="yacybar_searchOrderBy" id="search.OrderBy" editable="false"> - <menupopup> - <menuitem label="&prefs.tabpanel.menuitem.label.ybr-date-quality;"/> - <menuitem label="&prefs.tabpanel.menuitem.label.ybr-quality-date;"/> - <menuitem label="&prefs.tabpanel.menuitem.label.date-ybr-quality;"/> - <menuitem label="&prefs.tabpanel.menuitem.label.quality-ybr-date;"/> - <menuitem label="&prefs.tabpanel.menuitem.label.date-quality-ybr;"/> - <menuitem label="&prefs.tabpanel.menuitem.label.quality-date-ybr;"/> - </menupopup> - </menulist> - </row> - <row> <label value="&prefs.tabpanel.label.value.res;"/> <menulist preference="yacybar_searchResource" id="search.Resource" editable="false"> <menupopup> Modified: yacybar/chrome/yacybar/content/yacybarOverlay.js =================================================================== --- yacybar/chrome/yacybar/content/yacybarOverlay.js 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/chrome/yacybar/content/yacybarOverlay.js 2008-01-31 14:05:34 UTC (rev 4421) @@ -56,7 +56,6 @@ // init search settings if (!Branch.prefHasUserValue("search.maxResults")) Branch.setIntPref("search.maxResults",10); - if (!Branch.prefHasUserValue("search.orderBy")) Branch.setCharPref("search.orderBy","YBR-Date-Quality"); 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",".*"); @@ -107,7 +106,6 @@ // alert(searchwords); var maxResults = Branch.getIntPref("search.maxResults"); - var orderBy = Branch.getCharPref("search.orderBy"); var resource = Branch.getCharPref("search.resource"); var maxSearchTime = Branch.getIntPref("search.maxSearchTime"); var urlMask = Branch.getCharPref("search.urlMaskFilter"); @@ -116,8 +114,7 @@ return getBaseURL() + "/yacysearch.html" + "?search=" + keyword + - "&count=" + maxResults + - "&order=" + orderBy + + "&count=" + maxResults + "&resource=" + resource + "&time=" + maxSearchTime + "&urlmaskfilter=" + urlMask; Modified: yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd =================================================================== --- yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/chrome/yacybar/locale/de-DE/yacybar.dtd 2008-01-31 14:05:34 UTC (rev 4421) @@ -10,6 +10,7 @@ <!ENTITY contentArea.menuitem.label.search "Suche dieses Wort"> <!ENTITY contentArea.menuitem.tooltip.search "Suche nach dem markierten Wort"> <!ENTITY contentArea.menuitem.label.about "Über YaCyBar"> +<!ENTITY contentArea.menuitem.accesskey.about "Ü"> <!ENTITY contentArea.menuitem.tooltip.about "Über die YaCyBar"> <!ENTITY addBM.dialog.title "YaCyBar - Lesezeichen hinzufügen"> @@ -61,13 +62,6 @@ <!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.maxresults "Max. Ergbnisanzahl"> -<!ENTITY prefs.tabpanel.label.value.order "Sortiert nach"> -<!ENTITY prefs.tabpanel.menuitem.label.ybr-date-quality "YBR-Datum-Qualität"> -<!ENTITY prefs.tabpanel.menuitem.label.ybr-quality-date "YBR-Qualität-Datum"> -<!ENTITY prefs.tabpanel.menuitem.label.date-ybr-quality "Datum-YBR-Qualität"> -<!ENTITY prefs.tabpanel.menuitem.label.quality-ybr-date "Qualität-YBR-Datum"> -<!ENTITY prefs.tabpanel.menuitem.label.date-quality-ybr "Datum-Qualität-YBR"> -<!ENTITY prefs.tabpanel.menuitem.label.quality-date-ybr "Qualität-Datum-YBR"> <!ENTITY prefs.tabpanel.label.value.res "Quelle"> <!ENTITY prefs.tabpanel.menuitem.label.global "global"> <!ENTITY prefs.tabpanel.menuitem.label.local "lokal"> Modified: yacybar/chrome/yacybar/locale/en-US/yacybar.dtd =================================================================== --- yacybar/chrome/yacybar/locale/en-US/yacybar.dtd 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/chrome/yacybar/locale/en-US/yacybar.dtd 2008-01-31 14:05:34 UTC (rev 4421) @@ -10,6 +10,7 @@ <!ENTITY contentArea.menuitem.label.search "Search this keyword"> <!ENTITY contentArea.menuitem.tooltip.search "Search for selected keyword"> <!ENTITY contentArea.menuitem.label.about "About YaCyBar"> +<!ENTITY contentArea.menuitem.accesskey.about "A"> <!ENTITY contentArea.menuitem.tooltip.about "About the YaCyBar"> <!ENTITY addBM.dialog.title "YaCyBar - Add Bookmark"> @@ -61,13 +62,6 @@ <!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.maxresults "Max. number of results"> -<!ENTITY prefs.tabpanel.label.value.order "Order by"> -<!ENTITY prefs.tabpanel.menuitem.label.ybr-date-quality "YBR-Date-Quality"> -<!ENTITY prefs.tabpanel.menuitem.label.ybr-quality-date "YBR-Quality-Date"> -<!ENTITY prefs.tabpanel.menuitem.label.date-ybr-quality "Date-YBR-Quality"> -<!ENTITY prefs.tabpanel.menuitem.label.quality-ybr-date "Quality-YBR-Date"> -<!ENTITY prefs.tabpanel.menuitem.label.date-quality-ybr "Date-Quality-YBR"> -<!ENTITY prefs.tabpanel.menuitem.label.quality-date-ybr "Quality-Date-YBR"> <!ENTITY prefs.tabpanel.label.value.res "Resource"> <!ENTITY prefs.tabpanel.menuitem.label.global "global"> <!ENTITY prefs.tabpanel.menuitem.label.local "local"> Modified: yacybar/install.rdf =================================================================== --- yacybar/install.rdf 2008-01-30 21:58:30 UTC (rev 4420) +++ yacybar/install.rdf 2008-01-31 14:05:34 UTC (rev 4421) @@ -17,6 +17,15 @@ <!--<em:optionsURL>chrome://yacybar/content/prefs.xul</em:optionsURL>--> <em:aboutURL>chrome://yacybar/content/about.xul</em:aboutURL> + <!-- localized only works in firefox 3 --> + <em:localized> + <Description> + <em:locale>de-DE</em:locale> + <em:name>YaCy-Bar</em:name> + <em:description>Eine Toolbar für die P2P Suchmaschine YaCy</em:description> + </Description> + </em:localized> + <em:file> <Description about="urn:mozilla:extension:file:yacybar"> <em:package>content/</em:package> _______________________________________________ YaCy-svn mailing list YaCy-svn@lists.berlios.de https://lists.berlios.de/mailman/listinfo/yacy-svn