diff options
Diffstat (limited to 'xpi')
26 files changed, 76 insertions, 23 deletions
diff --git a/xpi/content/css/tabsttitleintitlebar.css b/xpi/content/css/tabsttitleintitlebar.css index 7370262..0f21bc8 100644 --- a/xpi/content/css/tabsttitleintitlebar.css +++ b/xpi/content/css/tabsttitleintitlebar.css @@ -15,6 +15,11 @@ #ctraddon_titlebartitle:-moz-locale-dir(rtl) { float:right; } + + #ctraddon_titlebarspacer { + visibility: collapse; + } + /* adjust length for different window sizes */ @media not all and (min-width: 2000px) { #ctraddon_titlebartitle { diff --git a/xpi/content/css/tabsttitleintitlebar_centered.css b/xpi/content/css/tabsttitleintitlebar_centered.css new file mode 100644 index 0000000..e600bde --- /dev/null +++ b/xpi/content/css/tabsttitleintitlebar_centered.css @@ -0,0 +1,9 @@ +@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); + +@-moz-document url(chrome://browser/content/browser.xul) { + + #ctraddon_titlebarspacer { + visibility: visible !important; + } + +}
\ No newline at end of file diff --git a/xpi/content/options.js b/xpi/content/options.js index b1df3ea..425019e 100644 --- a/xpi/content/options.js +++ b/xpi/content/options.js @@ -504,6 +504,13 @@ classicthemerestorerjso.ctr = { "extensions.classicthemerestorer.", function(branch, name) { switch (name) { + + case "tttitlebar": + if(branch.getBoolPref("tttitlebar")) + document.getElementById('ctraddon_pw_tttitlebar_c').disabled = false; + else + document.getElementById('ctraddon_pw_tttitlebar_c').disabled = true; + break; case "ctabmwidth": case "ctabwidth": if(branch.getIntPref("ctabmwidth")<48 || branch.getIntPref("ctabwidth")<48 ) diff --git a/xpi/content/options.xul b/xpi/content/options.xul index 5223b0b..8dc68fa 100644 --- a/xpi/content/options.xul +++ b/xpi/content/options.xul @@ -54,6 +54,7 @@ <preference id="ctraddon_tabsontop" name="extensions.classicthemerestorer.tabsontop" type="string" instantApply="true"/> <preference id="ctraddon_square_edges" name="extensions.classicthemerestorer.square_edges" type="bool" instantApply="true"/> <preference id="ctraddon_tttitlebar" name="extensions.classicthemerestorer.tttitlebar" type="bool" instantApply="true"/> + <preference id="ctraddon_tttitlebar_c" name="extensions.classicthemerestorer.tttitlebar_c" type="bool" instantApply="true"/> <preference id="ctraddon_ctabheightcb" name="extensions.classicthemerestorer.ctabheightcb" type="bool" instantApply="true"/> <preference id="ctraddon_ctabheight" name="extensions.classicthemerestorer.ctabheight" type="int" instantApply="true"/> @@ -425,7 +426,10 @@ </menulist> <checkbox label="&Ctr_square_edges;" preference="ctraddon_square_edges" id="ctraddon_pw_square_edges"/> - <checkbox label="&Ctr_tttitlebar;" preference="ctraddon_tttitlebar" id="ctraddon_pw_tttitlebar" class="ctraddon_windowsonly" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart();"/> + <hbox class="ctraddon_windowsonly"> + <checkbox label="&Ctr_tttitlebar;" preference="ctraddon_tttitlebar" id="ctraddon_pw_tttitlebar" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart();"/> + <checkbox label="&Ctr_centered;" preference="ctraddon_tttitlebar_c" id="ctraddon_pw_tttitlebar_c"/> + </hbox> <description class="ctraddon_font1">&Ctr_emptytfavico;</description> <radiogroup preference="ctraddon_emptyfavico_t" id="ctraddon_pw_emptyfavico_t" orient="horizontal" value=""> @@ -1283,12 +1287,12 @@ <checkbox label="&Ctr_osearch_dm;" preference="ctraddon_osearch_dm" id="ctraddon_pw_osearch_dm" class="ctraddon_winmaconly"/> <checkbox label="&Ctr_ctroldsearchc;" preference="ctraddon_ctroldsearchc" id="ctraddon_pw_ctroldsearchc"/> <hbox align="center" class="ctraddonsuboption"> - <textbox id="ctraddon_pw_ctroldsearchcdelay" size="4" maxlength="4" preference="ctraddon_ctrosearchct" type="number" min="0" max="9999"/> + <textbox id="ctraddon_pw_ctroldsearchcdelay" size="5" maxlength="5" preference="ctraddon_ctrosearchct" type="number" min="0" max="99999"/> <description>&Ctr_nbisizedelay; &Ctr_ctrosearchdel;</description> </hbox> <checkbox label="&Ctr_ctroldsearchr;" preference="ctraddon_ctroldsearchr" id="ctraddon_pw_ctroldsearchr"/> <hbox align="center" class="ctraddonsuboption"> - <textbox id="ctraddon_pw_ctroldsearchrdelay" size="4" maxlength="4" preference="ctraddon_ctrosearchrt" type="number" min="0" max="9999"/> + <textbox id="ctraddon_pw_ctroldsearchrdelay" size="5" maxlength="5" preference="ctraddon_ctrosearchrt" type="number" min="0" max="99999"/> <description>&Ctr_nbisizedelay; &Ctr_ctrosearchdel;</description> </hbox> <checkbox label="&Ctr_osearch_meoit;" preference="ctraddon_osearch_meoit" id="ctraddon_pw_osearch_meoit"/> diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js index 1b5e513..3112eb8 100644 --- a/xpi/content/overlay.js +++ b/xpi/content/overlay.js @@ -442,6 +442,11 @@ classicthemerestorerjs.ctr = { else classicthemerestorerjs.ctr.loadUnloadCSS("square_edges",false); break; + case "tttitlebar_c": + if (branch.getBoolPref("tttitlebar_c") && branch.getBoolPref("tttitlebar")) classicthemerestorerjs.ctr.loadUnloadCSS("tttitlebar_c",true); + else classicthemerestorerjs.ctr.loadUnloadCSS("tttitlebar_c",false); + break; + case "ctabheightcb": if (branch.getBoolPref("ctabheightcb")) classicthemerestorerjs.ctr.loadUnloadCSS("ctabheight",true); else classicthemerestorerjs.ctr.loadUnloadCSS("ctabheight",false); @@ -2775,7 +2780,7 @@ classicthemerestorerjs.ctr = { // this button can only be placed on Firefox titlebar using Windows OS if(classicthemerestorerjs.ctr.osstring == "WINNT"){ - var buttontitle = "Firefox"; // init with default title + var buttontitle = Services.appinfo.name; // init with default title var custombuttontitle = Services.prefs.getBranch("extensions.classicthemerestorer.").getCharPref('appbuttontxt'); var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].createInstance(Ci.nsIScriptableUnicodeConverter); @@ -3501,29 +3506,31 @@ classicthemerestorerjs.ctr = { if(classicthemerestorerjs.ctr.osstring=="WINNT" && classicthemerestorerjs.ctr.fxdefaulttheme==true) { try { - + + var titlebarspacer1 = document.createElement("spacer"); + titlebarspacer1.setAttribute("id", "ctraddon_titlebarspacer"); + titlebarspacer1.setAttribute("ordinal", "0"); + titlebarspacer1.setAttribute("flex", "1"); + var titlebartitle = document.createElement("toolbarbutton"); titlebartitle.setAttribute("id", "ctraddon_titlebartitle"); titlebartitle.setAttribute("ordinal", "0"); - titlebartitle.setAttribute("label", gBrowser.contentTitle); - + titlebartitle.setAttribute("label", gBrowser.contentTitle || Services.appinfo.name); + + document.getElementById("titlebar-content").appendChild(titlebarspacer1); document.getElementById("titlebar-content").appendChild(titlebartitle); - window.addEventListener("load", function update_title() { - document.getElementById("ctraddon_titlebartitle").setAttribute("label", gBrowser.contentTitle); - }, false); - window.addEventListener("DOMContentLoaded", function update_title() { - document.getElementById("ctraddon_titlebartitle").setAttribute("label", gBrowser.contentTitle); - }, false); - window.addEventListener("TabOpen", function update_title() { - document.getElementById("ctraddon_titlebartitle").setAttribute("label", gBrowser.contentTitle); - }, false); - window.addEventListener("TabSelect", function update_title() { - document.getElementById("ctraddon_titlebartitle").setAttribute("label", gBrowser.contentTitle); - }, false); - window.addEventListener("TabAttrModified", function update_title() { - document.getElementById("ctraddon_titlebartitle").setAttribute("label", gBrowser.contentTitle); - }, false); + window.addEventListener("load", update_title, false); + window.addEventListener("DOMContentLoaded", update_title, false); + window.addEventListener("TabOpen", update_title, false); + window.addEventListener("TabSelect", update_title, false); + window.addEventListener("TabAttrModified", update_title, false); + + function update_title() { + if (gBrowser.contentTitle=="") + document.getElementById("ctraddon_titlebartitle").setAttribute("label", Services.appinfo.name); + else document.getElementById("ctraddon_titlebartitle").setAttribute("label", gBrowser.contentTitle); + } } catch(e) {} @@ -3924,6 +3931,7 @@ classicthemerestorerjs.ctr = { case "square_edges": manageCSS("tabssquare_edges.css"); break; case "tttitlebar": manageCSS("tabsttitleintitlebar.css"); break; + case "tttitlebar_c": manageCSS("tabsttitleintitlebar_centered.css"); break; case "closetab_active": manageCSS("closetab_active.css"); break; case "closetab_none": manageCSS("closetab_none.css"); break; diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js index d3b689f..25b107f 100644 --- a/xpi/defaults/preferences/options.js +++ b/xpi/defaults/preferences/options.js @@ -14,6 +14,7 @@ pref("extensions.classicthemerestorer.closeonleft",false); pref("extensions.classicthemerestorer.closetabbig",false); pref("extensions.classicthemerestorer.closeicon",'closeicon_default'); pref("extensions.classicthemerestorer.tttitlebar",false); +pref("extensions.classicthemerestorer.tttitlebar_c",false); //Appbutton settings pref("extensions.classicthemerestorer.appbutton",'appbutton_v1'); diff --git a/xpi/install.rdf b/xpi/install.rdf index 0c74f5c..e48e7e5 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.8beta8</em:version> + <em:version>1.5.8beta9</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 2589099..495ab45 100644 --- a/xpi/locale/cs/options.dtd +++ b/xpi/locale/cs/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Min/max/zavřít (Fullscreen)"> <!ENTITY Ctr_rr "Restartujte &brandShortName;!"> <!ENTITY Ctr_window "okno"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Tlačítka"> <!ENTITY Ctr_cuibutnormal "Normální"> diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd index ad2f8f4..8a3dac7 100644 --- a/xpi/locale/da/options.dtd +++ b/xpi/locale/da/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Minimere/maksimere/luk (Fuldskærm)"> <!ENTITY Ctr_rr "Genstart påkrævet!"> <!ENTITY Ctr_window "vindue"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Knapper"> <!ENTITY Ctr_cuibutnormal "Standard"> diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd index 0bb7031..6526bb4 100644 --- a/xpi/locale/de/options.dtd +++ b/xpi/locale/de/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Kontrollelemente (Vollbild)"> <!ENTITY Ctr_rr "Neustart benötigt!"> <!ENTITY Ctr_window "Fenster"> +<!ENTITY Ctr_centered "Zentriert"> <!ENTITY Ctr_cuibuttons "Schaltflächen"> <!ENTITY Ctr_cuibutnormal "Normal"> diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd index 2b767bb..a344035 100644 --- a/xpi/locale/dsb/options.dtd +++ b/xpi/locale/dsb/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Min./maks./zacyniś (połna wobrazowka)"> <!ENTITY Ctr_rr "Startujśo &brandShortName; znowego!"> <!ENTITY Ctr_window "wokno"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Tłocaški"> <!ENTITY Ctr_cuibutnormal "Normalny"> diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd index 2a24908..74de188 100644 --- a/xpi/locale/el/options.dtd +++ b/xpi/locale/el/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Ελαχιστοποίηση/Μεγιστοποίηση/Κλείσιμο (Πλήρης οθόνη)"> <!ENTITY Ctr_rr "Απαιτείται επανεκκίνηση!"> <!ENTITY Ctr_window "Παράθυρο"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Κουμπιά"> <!ENTITY Ctr_cuibutnormal "Κανονικά"> diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd index 7da7cd2..419c2f2 100644 --- a/xpi/locale/en-US/options.dtd +++ b/xpi/locale/en-US/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Min/max/close (full screen)"> <!ENTITY Ctr_rr "Restart required!"> <!ENTITY Ctr_window "window"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Buttons"> <!ENTITY Ctr_cuibutnormal "Normal"> diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd index 449f8bf..fc1d06d 100644 --- a/xpi/locale/es/options.dtd +++ b/xpi/locale/es/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Min/Max/Cerrar (pantalla completa)"> <!ENTITY Ctr_rr "¡Requiere reiniciar!"> <!ENTITY Ctr_window "ventana"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Botones"> <!ENTITY Ctr_cuibutnormal "Normales"> diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd index c31bdc3..f43b322 100644 --- a/xpi/locale/et/options.dtd +++ b/xpi/locale/et/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Min/max/sulge (Täisekraan)"> <!ENTITY Ctr_rr "Taaskäivitamine vajalik!"> <!ENTITY Ctr_window "aken"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Nupud"> <!ENTITY Ctr_cuibutnormal "Tavalised"> diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd index b7ef3be..abdc45b 100644 --- a/xpi/locale/fr/options.dtd +++ b/xpi/locale/fr/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Réduire/Restaurer/Fermer (plein écran)"> <!ENTITY Ctr_rr "Redémarrage nécessaire !"> <!ENTITY Ctr_window "fenêtre"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Boutons :"> <!ENTITY Ctr_cuibutnormal "Taille normale"> diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd index 48e3f0c..508969c 100644 --- a/xpi/locale/hsb/options.dtd +++ b/xpi/locale/hsb/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Min./maks./začinić (połna wobrazowka)"> <!ENTITY Ctr_rr "Startujće &brandShortName; znowa!"> <!ENTITY Ctr_window "wokno"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Tłóčatka"> <!ENTITY Ctr_cuibutnormal "Normalny"> diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd index 0c6ee7d..e456607 100644 --- a/xpi/locale/it/options.dtd +++ b/xpi/locale/it/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Pulsanti controllo finestra (A tutto schermo)"> <!ENTITY Ctr_rr "Riavviare &brandShortName;!"> <!ENTITY Ctr_window "la finestra"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Pulsanti"> <!ENTITY Ctr_cuibutnormal "Normali"> diff --git a/xpi/locale/ja/options.dtd b/xpi/locale/ja/options.dtd index d0083a3..235dcf7 100644 --- a/xpi/locale/ja/options.dtd +++ b/xpi/locale/ja/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "最小/最大/閉じる (フルスクリーン)"> <!ENTITY Ctr_rr "要 &brandShortName; 再起動"> <!ENTITY Ctr_window "ウィンドウ"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "ボタン"> <!ENTITY Ctr_cuibutnormal "通常"> diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd index fc3fcfa..cbf88fd 100644 --- a/xpi/locale/pl/options.dtd +++ b/xpi/locale/pl/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Minimalizuj, Maksymalizuj, Zamknij (pełny ekran)"> <!ENTITY Ctr_rr "Wymagany restart!"> <!ENTITY Ctr_window "okno"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Przyciski"> <!ENTITY Ctr_cuibutnormal "Normalne"> diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd index cceb38d..e79c7f0 100644 --- a/xpi/locale/pt-BR/options.dtd +++ b/xpi/locale/pt-BR/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Mínimo/máximo/fechar (tela cheia)"> <!ENTITY Ctr_rr "Reinicie o &brandShortName;!"> <!ENTITY Ctr_window "Janela"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Botões"> <!ENTITY Ctr_cuibutnormal "Normais"> diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd index 21422a3..17d0024 100644 --- a/xpi/locale/ru/options.dtd +++ b/xpi/locale/ru/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Мин/макс/закрыть (полноэкранный)"> <!ENTITY Ctr_rr "Перезапустите &brandShortName;!"> <!ENTITY Ctr_window "окно"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Кнопки:"> <!ENTITY Ctr_cuibutnormal "Обычные"> diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd index 202156f..609405d 100644 --- a/xpi/locale/sl/options.dtd +++ b/xpi/locale/sl/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "Skrči/Razpni/Zapri (celozaslonski način)"> <!ENTITY Ctr_rr "Zahtevan je ponovni zagon!"> <!ENTITY Ctr_window "okno"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Gumbi"> <!ENTITY Ctr_cuibutnormal "Običajno"> diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd index 10188f7..a9ca27e 100644 --- a/xpi/locale/uk/options.dtd +++ b/xpi/locale/uk/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "мін/макс/закрити (повний екран)"> <!ENTITY Ctr_rr "Перезапустіть &brandShortName;!"> <!ENTITY Ctr_window "вікно"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "Кнопки"> <!ENTITY Ctr_cuibutnormal "Нормальні"> diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd index a52b8b5..397e243 100644 --- a/xpi/locale/zh-CN/options.dtd +++ b/xpi/locale/zh-CN/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "最小化/最大化/关闭 (全屏)"> <!ENTITY Ctr_rr "需要重启 &brandShortName;!"> <!ENTITY Ctr_window "window"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "按钮"> <!ENTITY Ctr_cuibutnormal "标准"> diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd index cfa6079..4c87686 100644 --- a/xpi/locale/zh-TW/options.dtd +++ b/xpi/locale/zh-TW/options.dtd @@ -15,6 +15,7 @@ <!ENTITY Ctr_windowcontrols "最小化/最大化/關閉 (全螢幕)"> <!ENTITY Ctr_rr "需重啟 &brandShortName;!"> <!ENTITY Ctr_window "視窗"> +<!ENTITY Ctr_centered "Centered"> <!ENTITY Ctr_cuibuttons "按鈕"> <!ENTITY Ctr_cuibutnormal "標準圖示"> |