diff options
26 files changed, 57 insertions, 512 deletions
diff --git a/xpi/content/css/alt_autocomplete.css b/xpi/content/css/alt_autocomplete.css index 078a706..a40f8a7 100644 --- a/xpi/content/css/alt_autocomplete.css +++ b/xpi/content/css/alt_autocomplete.css @@ -2,22 +2,20 @@ @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); @-moz-document url(chrome://browser/content/browser.xul) { - - panel[type="autocomplete-richlistbox"], - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { - -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings.xml#urlbar-rich-result-popup") !important; - } - + + /* Richlist item code for Firefox 48 and 49 */ panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem, #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings.xml#autocomplete-richlistitem") !important; } - - #main-window[fx50plus="true"] panel[type="autocomplete-richlistbox"], - #main-window[fx50plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { + + /* Firefox 51 popup code works fine with Firefox 48+ */ + panel[type="autocomplete-richlistbox"], + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#urlbar-rich-result-popup") !important; } + /* Richlist item code for Firefox 50 beta2+ and 51+; (50b1 not supported anymore)*/ #main-window[fx50plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem, #main-window[fx50plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem { -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#autocomplete-richlistitem") !important; @@ -64,10 +62,8 @@ margin-top:-2px !important; } - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-action, - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-url, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{ + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem :-moz-any(.ac-url, .ac-action), + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-url, .ac-action){ -moz-margin-start: 21px !important; } diff --git a/xpi/content/css/autocompl_no_title1.css b/xpi/content/css/autocompl_no_title1.css index 4d85250..16ca64f 100644 --- a/xpi/content/css/autocompl_no_title1.css +++ b/xpi/content/css/autocompl_no_title1.css @@ -2,10 +2,12 @@ @-moz-document url(chrome://browser/content/browser.xul) { - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title, + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) .ac-title, + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) .ac-title, panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator { + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator, + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:-moz-any([actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"]) :-moz-any(.ac-url, .ac-action), + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:-moz-any([actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"]) :-moz-any(.ac-url, .ac-action){ display: none !important; } diff --git a/xpi/content/css/autocompl_no_title2.css b/xpi/content/css/autocompl_no_title2.css index b4cc5c0..9c1e990 100644 --- a/xpi/content/css/autocompl_no_title2.css +++ b/xpi/content/css/autocompl_no_title2.css @@ -4,37 +4,29 @@ panel[type="autocomplete-richlistbox"], #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { - -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings.xml#urlbar-rich-result-popup") !important; - } - - #main-window[fx51plus="true"] panel[type="autocomplete-richlistbox"], - #main-window[fx51plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] { -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#urlbar-rich-result-popup") !important; } - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title, + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) .ac-title, + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) .ac-title, panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator { + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator, + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:-moz-any([actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"]) :-moz-any(.ac-url, .ac-action), + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:-moz-any([actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"]) :-moz-any(.ac-url, .ac-action){ display: none !important; } - - panel[type="autocomplete-richlistbox"] .ac-type-icon, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .ac-type-icon { - -moz-box-ordinal-group: 1000000 !important; - } - - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-action, - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-url, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action, - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{ + + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:-moz-any([actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"]) .ac-title, + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:-moz-any([actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"]) .ac-title, + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) :-moz-any(.ac-url, .ac-action), + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not(:-moz-any([collapse="true"],[actiontype="searchengine"],[actiontype="visiturl"],[actiontype="switchtab"])) :-moz-any(.ac-url, .ac-action){ -moz-margin-start: -6px !important; margin-top:-3px !important; } - - panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]), - #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]) { - display: block !important; + + panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-type-icon, + #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-type-icon { + -moz-box-ordinal-group: 1000000 !important; } panel[type="autocomplete-richlistbox"] .search-one-offs, diff --git a/xpi/content/options.xul b/xpi/content/options.xul index 62c7552..a3f78bb 100644 --- a/xpi/content/options.xul +++ b/xpi/content/options.xul @@ -1419,6 +1419,11 @@ <groupbox> <caption label="&Ctr_findbar;" class="ctraddon_topic"/> <checkbox label="&Ctr_findbar_hws;" preference="ctraddon_findb_hide_ws" id="ctraddon_pw_findb_hide_ws" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart()"/> + <hbox align="center"> + <checkbox label="&Ctr_findbar_width;" preference="ctraddon_findb_widthcb" id="ctraddon_pw_findb_widthcb"/> + <textbox size="3" maxlength="3" preference="ctraddon_findb_widthva" type="number" min="0" max="999" id="ctraddon_pw_findb_widthva"/> + <label value="px"/> + </hbox> <description class="ctraddon_font1">&Ctr_findbarpos;</description> <menulist preference="ctraddon_findbar"> <menupopup> @@ -1428,11 +1433,6 @@ <menuitem value="findbar_topa" label="&Ctr_findbar_topa;"/> </menupopup> </menulist> - <hbox align="center"> - <checkbox label="&Ctr_findbar_width;" preference="ctraddon_findb_widthcb" id="ctraddon_pw_findb_widthcb"/> - <textbox size="3" maxlength="3" preference="ctraddon_findb_widthva" type="number" min="0" max="999" id="ctraddon_pw_findb_widthva"/> - <label value="px"/> - </hbox> </groupbox> </box> diff --git a/xpi/content/urlbarBindings.xml b/xpi/content/urlbarBindings.xml index 1be405c..afda82d 100644 --- a/xpi/content/urlbarBindings.xml +++ b/xpi/content/urlbarBindings.xml @@ -6,7 +6,7 @@ and chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup to simulate pre-Fx48 look of location bars autocomplete popup. - Remove all default comentets to reduce file size. + Removed all default comments to reduce file size. --> <!DOCTYPE bindings [ @@ -23,451 +23,6 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl"> - <binding id="urlbar-rich-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-rich-result-popup"> - - <content ignorekeys="true" level="top" consumeoutsideclicks="never" - aria-owns="richlistbox"> - <xul:hbox anonid="search-suggestions-notification" - align="center" - role="alert" - aria-describedby="search-suggestions-notification-text"> - <xul:description flex="1"> - &urlbar.searchSuggestionsNotification.question; - <xul:label id="search-suggestions-notification-learn-more" - class="text-link" - role="link" - value="&urlbar.searchSuggestionsNotification.learnMore;" - accesskey="&urlbar.searchSuggestionsNotification.learnMore.accesskey;" - onclick="document.getBindingParent(this).openSearchSuggestionsNotificationLearnMoreURL();" - control="search-suggestions-notification-learn-more"/> - </xul:description> - <xul:button anonid="search-suggestions-notification-disable" - label="&urlbar.searchSuggestionsNotification.disable;" - accesskey="&urlbar.searchSuggestionsNotification.disable.accesskey;" - onclick="document.getBindingParent(this).dismissSearchSuggestionsNotification(false);"/> - <xul:button anonid="search-suggestions-notification-enable" - label="&urlbar.searchSuggestionsNotification.enable;" - accesskey="&urlbar.searchSuggestionsNotification.enable.accesskey;" - onclick="document.getBindingParent(this).dismissSearchSuggestionsNotification(true);"/> - </xul:hbox> - <xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox" - flex="1"/> - <xul:hbox anonid="footer"> - <children/> - </xul:hbox> - </content> - - <implementation> - <field name="_maxResults">0</field> - - <field name="_bundle" readonly="true"> - Cc["@mozilla.org/intl/stringbundle;1"]. - getService(Ci.nsIStringBundleService). - createBundle("chrome://browser/locale/places/places.properties"); - </field> - - <field name="searchSuggestionsNotification" readonly="true"> - document.getAnonymousElementByAttribute( - this, "anonid", "search-suggestions-notification" - ); - </field> - - <field name="footer" readonly="true"> - document.getAnonymousElementByAttribute(this, "anonid", "footer"); - </field> - - <method name="openSearchSuggestionsNotificationLearnMoreURL"> - <body><![CDATA[ - let url = Services.urlFormatter.formatURL( - Services.prefs.getCharPref("app.support.baseURL") + "suggestions" - ); - openUILinkIn(url, "tab"); - ]]></body> - </method> - - <method name="dismissSearchSuggestionsNotification"> - <parameter name="enableSuggestions"/> - <body><![CDATA[ - // Make sure the urlbar is focused. It won't be, for example, if the - // user used an accesskey to make an opt-in choice. mIgnoreFocus - // prevents the text from being selected. - this.input.mIgnoreFocus = true; - this.input.focus(); - this.input.mIgnoreFocus = false; - - Services.prefs.setBoolPref( - "browser.urlbar.suggest.searches", enableSuggestions - ); - Services.prefs.setBoolPref( - "browser.urlbar.userMadeSearchSuggestionsChoice", true - ); - // The input's pref observer will now hide the notification. - ]]></body> - </method> - - <method name="getNextIndex"> - <parameter name="reverse"/> - <parameter name="amount"/> - <parameter name="index"/> - <parameter name="maxRow"/> - <body><![CDATA[ - if (maxRow < 0) - return -1; - - let newIndex = index + (reverse ? -1 : 1) * amount; - - // We only want to wrap if navigation is in any direction by one item, - // otherwise we clamp to one end of the list. - // ie, hitting page-down will only cause is to wrap if we're already - // at one end of the list. - - // Allow the selection to be removed if the first result is not a - // heuristic result. - if (!this._isFirstResultHeuristic) { - if (reverse && index == -1 || newIndex > maxRow && index != maxRow) - newIndex = maxRow; - else if (!reverse && index == -1 || newIndex < 0 && index != 0) - newIndex = 0; - - if (newIndex < 0 && index == 0 || newIndex > maxRow && index == maxRow) - newIndex = -1; - - return newIndex; - } - - // Otherwise do not allow the selection to be removed. - if (newIndex < 0) { - newIndex = index > 0 ? 0 : maxRow; - } else if (newIndex > maxRow) { - newIndex = index < maxRow ? maxRow : 0; - } - return newIndex; - ]]></body> - </method> - - <property name="_isFirstResultHeuristic" readonly="true"> - <getter> - <![CDATA[ - // The popup usually has a special "heuristic" first result (added - // by UnifiedComplete.js) that is automatically selected when the - // popup opens. - return this.input.mController.matchCount > 0 && - this.input.mController - .getStyleAt(0) - .split(/\s+/).indexOf("heuristic") > 0; - ]]> - </getter> - </property> - - <property name="maxResults" readonly="true"> - <getter> - <![CDATA[ - if (!this._maxResults) { - var prefService = - Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - this._maxResults = prefService.getIntPref("browser.urlbar.maxRichResults"); - } - return this._maxResults; - ]]> - </getter> - </property> - - <method name="openAutocompletePopup"> - <parameter name="aInput"/> - <parameter name="aElement"/> - <body> - <![CDATA[ - // initially the panel is hidden - // to avoid impacting startup / new window performance - aInput.popup.hidden = false; - - if (aInput.shouldShowSearchSuggestionsNotification) { - this._showSearchSuggestionsNotification(); - } - - this._openAutocompletePopup(aInput, aElement); - ]]> - </body> - </method> - - <method name="_openAutocompletePopup"> - <parameter name="aInput"/> - <parameter name="aElement"/> - <body><![CDATA[ - if (this.mPopupOpen) { - return; - } - - this.invalidate(); - - var width = 300; - - try{ - width = Math.round(document.getElementById("urlbar").getBoundingClientRect().width); - } catch(e){} - - this.setAttribute("width", width); - - if(Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("urlresults") - || Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("cresultshcb")) { - - var height = 400; - var cheight = Services.prefs.getBranch("extensions.classicthemerestorer.").getIntPref("cresultsh"); - - // urlbars bottom position - var urlbbotpos = document.getElementById("urlbar").boxObject.screenY + document.getElementById("urlbar").boxObject.height - window.screen.top; - - try{ - if(document.getElementById("main-window").hasAttribute("inFullscreen")) - height = screen.height - urlbbotpos - 3; - else - height = screen.availHeight - urlbbotpos - 3; - - if(document.getElementById('urlbar-container').parentNode.parentNode.id=="browser-bottombox") - height = document.getElementById("main-window").boxObject.height - - document.getElementById("navigator-toolbox").boxObject.height - - document.getElementById("browser-bottombox").boxObject.height; - - } catch(e){} - - this.removeAttribute("height"); - - if (Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("cresultshcb")) { - if (cheight < height) { - this.setAttribute("maxheight", cheight); - } else { - this.setAttribute("maxheight", height); - } - } else { - this.setAttribute("maxheight", height); - } - - } - - // if CTRs movable location bar is on a bottom toolbar, open autocomplete popup above location bar - if(document.getElementById('urlbar-container').parentNode.parentNode.id=="browser-bottombox") - this.openPopup(aElement, "before_end", 0, 0, false, false); - else - this.openPopup(aElement, "after_start", 0, -1, false, false); - ]]></body> - </method> - - <method name="_updateFooterVisibility"> - <body> - <![CDATA[ - this.footer.collapsed = this._matchCount == 0; - ]]> - </body> - </method> - - <method name="_showSearchSuggestionsNotification"> - <parameter name="aInput"/> - <parameter name="aElement"/> - <body> - <![CDATA[ - this.richlistbox.flex = 0; - this.setAttribute("dontanimate", "true"); - - this.classList.add("showSearchSuggestionsNotification"); - this._updateFooterVisibility(); - - if (!this.popupOpen) { - let event = document.createEvent("Events"); - event.initEvent("AlertActive", true, true); - this.searchSuggestionsNotification.dispatchEvent(event); - } - ]]> - </body> - </method> - - <method name="searchSuggestionsNotificationWasDismissed"> - <parameter name="enableSuggestions"/> - <body> - <![CDATA[ - if (!this.popupOpen) { - this._hideSearchSuggestionsNotification(); - return; - } - this._hideSearchSuggestionsNotificationWithAnimation().then(() => { - if (enableSuggestions && this.input.textValue) { - - this.input.controller.startSearch(this.input.textValue); - } - }); - ]]> - </body> - </method> - - <method name="_hideSearchSuggestionsNotification"> - <body> - <![CDATA[ - this.classList.remove("showSearchSuggestionsNotification"); - this.richlistbox.flex = 1; - this.removeAttribute("dontanimate"); - if (this._matchCount) { - this._invalidate(); - } else { - this.closePopup(); - } - ]]> - </body> - </method> - - <method name="_hideSearchSuggestionsNotificationWithAnimation"> - <body> - <![CDATA[ - return new Promise(resolve => { - let notificationHeight = this.searchSuggestionsNotification - .getBoundingClientRect() - .height; - this.searchSuggestionsNotification.style.marginTop = - "-" + notificationHeight + "px"; - - let popupHeightPx = - (this.getBoundingClientRect().height - notificationHeight) + "px"; - this.style.height = popupHeightPx; - - let onTransitionEnd = () => { - this.removeEventListener("transitionend", onTransitionEnd, true); - this.searchSuggestionsNotification.style.marginTop = "0px"; - this.style.removeProperty("height"); - this._hideSearchSuggestionsNotification(); - resolve(); - }; - this.addEventListener("transitionend", onTransitionEnd, true); - }); - ]]> - </body> - </method> - - <method name="onPopupClick"> - <parameter name="aEvent"/> - <body> - <![CDATA[ - - if (aEvent.button == 2) - return; - - var controller = this.view.QueryInterface(Components.interfaces.nsIAutoCompleteController); - - if (aEvent.button == 0 && !aEvent.shiftKey && !aEvent.ctrlKey && - !aEvent.altKey && !aEvent.metaKey) { - controller.handleEnter(true); - return; - } - - if (gURLBar && this.mInput == gURLBar) { - var url = controller.getValueAt(this.selectedIndex); - var options = {}; - - this.closePopup(); - controller.handleEscape(); - - let action = this.mInput._parseActionUrl(url); - if (action) { - switch (action.type) { - case "switchtab": // Fall through. - case "keyword": // Fall through. - case "visiturl": { - url = action.params.url; - break; - } - case "searchengine": { - [url, options.postData] = - this.input._parseAndRecordSearchEngineAction(action); - break; - } - default: { - return; - } - } - } - - openUILink(url, aEvent, options); - } - ]]> - </body> - </method> - - <method name="createResultLabel"> - <parameter name="item"/> - <parameter name="proposedLabel"/> - <body> - <![CDATA[ - let parts = [proposedLabel]; - - let action = this.mInput._parseActionUrl(item.getAttribute("url")); - if (action) { - switch (action.type) { - case "searchengine": - parts = [ - action.params.searchSuggestion || action.params.searchQuery, - action.params.engineName, - ]; - break; - case "switchtab": - case "remotetab": - parts = [ - item.getAttribute("title"), - item.getAttribute("displayurl"), - ]; - break; - } - } - - let types = item.getAttribute("type").split(/\s+/); - let type = types.find(type => type != "action" && type != "heuristic"); - try { - - parts.push(this._bundle.GetStringFromName(type + "ResultLabel")); - } catch (e) {} - - return parts.filter(str => str).join(" "); - ]]> - </body> - </method> - - <method name="onResultsAdded"> - <body> - <![CDATA[ - - var appversion = parseInt(Services.appinfo.version); - - if(appversion < '48') { - if (!Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete")) - return; - } - - if (this.selectedIndex == -1 && this._isFirstResultHeuristic) { - this._ignoreNextSelect = true; - - this.richlistbox.suppressMenuItemEvent = true; - - this.selectedIndex = 0; - this.richlistbox.suppressMenuItemEvent = false; - this._ignoreNextSelect = false; - } - - this.input.gotResultForCurrentQuery = true; - if (this.input.handleEnterWhenGotResult) { - this.input.handleEnterWhenGotResult = false; - this.input.mController.handleEnter(false); - } - ]]> - </body> - </method> - - </implementation> - <handlers> - - <handler event="mousedown"><![CDATA[ - event.preventDefault(); - ]]></handler> - - </handlers> - </binding> - <binding id="autocomplete-richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem"> <content align="start" diff --git a/xpi/content/urlbarBindings51.xml b/xpi/content/urlbarBindings51.xml index 99fac6a..8aec605 100644 --- a/xpi/content/urlbarBindings51.xml +++ b/xpi/content/urlbarBindings51.xml @@ -6,7 +6,7 @@ and chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup to simulate pre-Fx48 look of location bars autocomplete popup. - All default coments removed to reduce file size. + Removed all default comments to reduce file size. Many "empty" methods to provide compatibility with future Fx builds. --> diff --git a/xpi/install.rdf b/xpi/install.rdf index ec33e92..0e26786 100644 --- a/xpi/install.rdf +++ b/xpi/install.rdf @@ -5,7 +5,7 @@ <Description rdf:about="urn:mozilla:install-manifest"> <em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id> <em:name>Classic Theme Restorer</em:name> - <em:version>1.5.8beta4</em:version> + <em:version>1.5.8beta5</em:version> <em:type>2</em:type> <em:multiprocessCompatible>true</em:multiprocessCompatible> diff --git a/xpi/locale/cs/options.dtd b/xpi/locale/cs/options.dtd index a34ff66..1bdd1f2 100644 --- a/xpi/locale/cs/options.dtd +++ b/xpi/locale/cs/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sec)"> <!ENTITY Ctr_findbar "Findbar"> <!ENTITY Ctr_findbar_hws "Close findbar when scrolling page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Lišta vyhledávání"> <!ENTITY Ctr_findbar_def "Výchozí umístění"> <!ENTITY Ctr_findbar_top "Nahoře"> diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd index 5cac74c..27f9b30 100644 --- a/xpi/locale/da/options.dtd +++ b/xpi/locale/da/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sekund)"> <!ENTITY Ctr_findbar "Findbar"> <!ENTITY Ctr_findbar_hws "Close findbar when scrolling page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Placering af søgelinje"> <!ENTITY Ctr_findbar_def "Bunden (standard)"> <!ENTITY Ctr_findbar_top "Toppen"> diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd index f3b71c9..dd289e3 100644 --- a/xpi/locale/de/options.dtd +++ b/xpi/locale/de/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 Sekunde)"> <!ENTITY Ctr_findbar "Suchleiste"> <!ENTITY Ctr_findbar_hws "Suchleiste schließen sobald auf der Seite navigiert wird"> -<!ENTITY Ctr_findbar_width "Breite der Suchbox"> +<!ENTITY Ctr_findbar_width "Breite der Suchbox: "> <!ENTITY Ctr_findbarpos "Position der Suchleiste"> <!ENTITY Ctr_findbar_def "Unten (Standard)"> <!ENTITY Ctr_findbar_top "Oben"> diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd index 26382ca..5b6826b 100644 --- a/xpi/locale/dsb/options.dtd +++ b/xpi/locale/dsb/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sekunda)"> <!ENTITY Ctr_findbar "Pytańska rědka"> <!ENTITY Ctr_findbar_hws "Pytańsku rědku zacyniś, gaž bok se kula"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Pozicija pytańskeje rědki"> <!ENTITY Ctr_findbar_def "Dołojce (standard)"> <!ENTITY Ctr_findbar_top "Górjejce"> diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd index 856daf9..ea5dac8 100644 --- a/xpi/locale/el/options.dtd +++ b/xpi/locale/el/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 δευτερόλεπτο)"> <!ENTITY Ctr_findbar "Γραμμή εύρεσης"> <!ENTITY Ctr_findbar_hws "Κλείσιμο γραμμής εύρεσης κατά την κύλιση της σελίδας"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Θέση γραμμής εύρεσης"> <!ENTITY Ctr_findbar_def "Κάτω μέρος (προεπιλογή)"> <!ENTITY Ctr_findbar_top "Κορυφή"> diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd index 9398d8d..6468ea2 100644 --- a/xpi/locale/en-US/options.dtd +++ b/xpi/locale/en-US/options.dtd @@ -152,8 +152,8 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sec)"> <!ENTITY Ctr_findbar "Findbar"> <!ENTITY Ctr_findbar_hws "Close findbar when scrolling page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> -<!ENTITY Ctr_findbarpos "Findbar position"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> +<!ENTITY Ctr_findbarpos "Findbars position"> <!ENTITY Ctr_findbar_def "Bottom (default)"> <!ENTITY Ctr_findbar_top "Top"> <!ENTITY Ctr_findbar_topa "Top (alternative content order)"> diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd index 1a126d2..a5a7da7 100644 --- a/xpi/locale/es/options.dtd +++ b/xpi/locale/es/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 seg)"> <!ENTITY Ctr_findbar "Barra de herramientas de búsqueda"> <!ENTITY Ctr_findbar_hws "Cerrar la barra de herramientas de búsqueda al desplazar la página"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Posición en la ventana de la barra de herramientas de búsqueda"> <!ENTITY Ctr_findbar_def "Abajo (predeterminada)"> <!ENTITY Ctr_findbar_top "Arriba"> diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd index 04b9ad2..dbb1e08 100644 --- a/xpi/locale/et/options.dtd +++ b/xpi/locale/et/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sekund)"> <!ENTITY Ctr_findbar "Leidmisriba"> <!ENTITY Ctr_findbar_hws "Lehte kerides sulge leidmisriba"> -<!ENTITY Ctr_findbar_width "Sisestuskasti laius"> +<!ENTITY Ctr_findbar_width "Sisestuskasti laius: "> <!ENTITY Ctr_findbarpos "Leidmisriba asukoht"> <!ENTITY Ctr_findbar_def "All (vaikimisi)"> <!ENTITY Ctr_findbar_top "Üleval"> diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd index 8a55c53..75db1ac 100644 --- a/xpi/locale/fr/options.dtd +++ b/xpi/locale/fr/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 s) de retard d'initialisation, au démarrage du navigateur"> <!ENTITY Ctr_findbar "Barre de recherche"> <!ENTITY Ctr_findbar_hws "Fermer la barre de recherche lors du défilement de la page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Position de la barre de recherche :"> <!ENTITY Ctr_findbar_def "En bas (par défaut)"> <!ENTITY Ctr_findbar_top "En haut"> diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd index c900bf7..00d49d6 100644 --- a/xpi/locale/hsb/options.dtd +++ b/xpi/locale/hsb/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sekunda)"> <!ENTITY Ctr_findbar "Pytanska lajsta"> <!ENTITY Ctr_findbar_hws "Pytanske polo začinić, hdyž so strona kula"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Pozicijia pytanskeje lajsty"> <!ENTITY Ctr_findbar_def "Deleka (standard)"> <!ENTITY Ctr_findbar_top "Horjeka"> diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd index 197c98e..df71da6 100644 --- a/xpi/locale/it/options.dtd +++ b/xpi/locale/it/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 sec)"> <!ENTITY Ctr_findbar "Findbar"> <!ENTITY Ctr_findbar_hws "Close findbar when scrolling page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Posizione della barra di ricerca nel testo"> <!ENTITY Ctr_findbar_def "Posizione predefinita"> <!ENTITY Ctr_findbar_top "In alto"> diff --git a/xpi/locale/ja/options.dtd b/xpi/locale/ja/options.dtd index ee41b8e..c99041a 100644 --- a/xpi/locale/ja/options.dtd +++ b/xpi/locale/ja/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "㍉秒 (1 秒 ＝ 1000 ㍉秒)"> <!ENTITY Ctr_findbar "検索バー"> <!ENTITY Ctr_findbar_hws "ページをスクロールしたら検索バーを閉じる"> -<!ENTITY Ctr_findbar_width "検索ボックスの横幅"> +<!ENTITY Ctr_findbar_width "検索ボックスの横幅: "> <!ENTITY Ctr_findbarpos "検索バー"> <!ENTITY Ctr_findbar_def "デフォルト位置"> <!ENTITY Ctr_findbar_top "上に表示"> @@ -282,7 +282,7 @@ <!ENTITY Ctr_autocompl_it "「…で検索」と「…を開く」を表示しない (可能ならば)"> <!ENTITY Ctr_autocompl_hl "一致部分を強調表示する"> <!ENTITY Ctr_autocompl_rhl "検索結果のハイライト色を Aero カラーにする"> -<!ENTITY Ctr_autocompl_not "Hide page title"> +<!ENTITY Ctr_autocompl_not "ページタイトルを隠す"> <!ENTITY Ctr_autocompl_sep "結果を境界線で区切る"> <!ENTITY Ctr_urlbar_uc "検索候補機能を統合しない"> <!ENTITY Ctr_lbsugresi "候補数を制限しない"> diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd index 19c1e5f..619909d 100644 --- a/xpi/locale/pl/options.dtd +++ b/xpi/locale/pl/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 s)"> <!ENTITY Ctr_findbar "Pasek wyszukiwania"> <!ENTITY Ctr_findbar_hws "Zamknij pasek wyszukiwania przy przewijaniu strony"> -<!ENTITY Ctr_findbar_width "Szerokość pola wyszukiwania"> +<!ENTITY Ctr_findbar_width "Szerokość pola wyszukiwania: "> <!ENTITY Ctr_findbarpos "Pozycja paska wyszukiwania"> <!ENTITY Ctr_findbar_def "Dolna (domyślna)"> <!ENTITY Ctr_findbar_top "Górna"> diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd index c6261e5..f1d089e 100644 --- a/xpi/locale/pt-BR/options.dtd +++ b/xpi/locale/pt-BR/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "msegs. (1000 msegs. = 1 seg.)"> <!ENTITY Ctr_findbar "Findbar"> <!ENTITY Ctr_findbar_hws "Close findbar when scrolling page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Barra de pesquisas"> <!ENTITY Ctr_findbar_def "Posição padrão"> <!ENTITY Ctr_findbar_top "Posição no topo"> diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd index 29e06a3..80f1ea0 100644 --- a/xpi/locale/ru/options.dtd +++ b/xpi/locale/ru/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "мс (1000 мс = 1 сек)"> <!ENTITY Ctr_findbar "Панель поиска"> <!ENTITY Ctr_findbar_hws "Закрывать панель поиска при прокрутке страницы"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Положение панели поиска"> <!ENTITY Ctr_findbar_def "внизу (по умолчанию)"> <!ENTITY Ctr_findbar_top "вверху"> diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd index 6c82544..03ef8ec 100644 --- a/xpi/locale/sl/options.dtd +++ b/xpi/locale/sl/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "ms (1000 ms = 1 s)"> <!ENTITY Ctr_findbar "Iskalna vrstica"> <!ENTITY Ctr_findbar_hws "Zapri iskalno vrstico ob pomikanju po strani"> -<!ENTITY Ctr_findbar_width "Širina iskalnih polj"> +<!ENTITY Ctr_findbar_width "Širina iskalnih polj: "> <!ENTITY Ctr_findbarpos "Položaj iskalne vrstice"> <!ENTITY Ctr_findbar_def "Spodaj (privzeto)"> <!ENTITY Ctr_findbar_top "Zgoraj"> diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd index dba99dd..a1ed2e5 100644 --- a/xpi/locale/uk/options.dtd +++ b/xpi/locale/uk/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "мс (1000 мс = 1 сек)"> <!ENTITY Ctr_findbar "Панель пошуку"> <!ENTITY Ctr_findbar_hws "Закрити панель пошуку, коли прокручується сторінка"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "Панель пошуку"> <!ENTITY Ctr_findbar_def "Типова позиція"> <!ENTITY Ctr_findbar_top "Нагорі"> diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd index 47e6cc1..c53e26d 100644 --- a/xpi/locale/zh-CN/options.dtd +++ b/xpi/locale/zh-CN/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "毫秒 (1000 毫秒 = 1 秒)"> <!ENTITY Ctr_findbar "查找栏"> <!ENTITY Ctr_findbar_hws "滚动页面时关闭查找栏"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "查找栏位置"> <!ENTITY Ctr_findbar_def "底部(默认)"> <!ENTITY Ctr_findbar_top "顶部"> diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd index 87dfcf9..4ea9cf2 100644 --- a/xpi/locale/zh-TW/options.dtd +++ b/xpi/locale/zh-TW/options.dtd @@ -152,7 +152,7 @@ <!ENTITY Ctr_nbisizedelay "毫秒 (1000 毫秒 = 1 秒)"> <!ENTITY Ctr_findbar "Findbar"> <!ENTITY Ctr_findbar_hws "Close findbar when scrolling page"> -<!ENTITY Ctr_findbar_width "Findboxes width"> +<!ENTITY Ctr_findbar_width "Findboxes width: "> <!ENTITY Ctr_findbarpos "尋找列位於"> <!ENTITY Ctr_findbar_def "預設位置"> <!ENTITY Ctr_findbar_top "頂部"> |