1.5.8.1

1.5.8.1 (major hotfix release) <b>[locale(s)]</b> - Spanish (es) translation updated (thanks to strel) - Japanese (ja) translation updated (thanks to mm_k) <b>[fix(es)]</b> - Fx50+ & 'Location bar (3) > Remove Search with... and Visit' items - Fx52+ & big icon mode: missing icons - Fx52+ & customization palette: missing icons - Fx52+ & Location bar (3) > Autocomplete popup > 'Alt. appearance': not affecting all forms anymore - Fx52+: improved compatibility of 'old search' -- switched to popup 'default search' uses -- removed not needed content from popup (one off search, header, icons...) -- the step was needed to keep compatibility with future Fx builds - Win10 & 'Tabs (1) > Tabs not on top v2': caption buttons glitch - full themes & some CTRs options: options were hidden - Developer Edition theme & CTRs prefwindow - Firefox button menu: 'Web Developer' menuitem issues <b>[new option(s)]</b> - Searchbar > Old search > open in new tab > 'exclude about:newtab' - Searchbar > Old search > open in new tab > 'exclude about:blank' - Searchbar > Old search > open in new tab > 'exclude about:home' <b>[add-on compatibility]</b> - Last Pass button & CTRs 'icons+text/text' modes - TabMixPlus & Win 10 & multirow tabs & tabs not on top: active tab glitch
Aris-t2 · Oct 21, 2016 · 83bfc25 · 83bfc25
1 parent ede8a9a
commit 83bfc25
Show file tree

Hide file tree

Showing 12 changed files with 159 additions and 11 deletions.
diff --git a/xpi/content/css/mode_icons_and_text.css b/xpi/content/css/mode_icons_and_text.css
@@ -195,5 +195,15 @@
 		  width: 18px !important;
 		}
 	}
+
+	/*LastPass*/
+	#navigator-toolbox toolbar:not(#TabsToolbar) #lpt_lastpass-compact-btn:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text,
+	#ctraddon_addon-bar #lpt_lastpass-compact-btn:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text	{
+	  display: -moz-box !important;
+	}
+
+	#navigator-toolbox toolbar:not(#TabsToolbar) #lpt_lastpass-compact-btn	{
+      padding-top: 9px !important;
+	}
 
 }
diff --git a/xpi/content/css/mode_icons_and_text3.css b/xpi/content/css/mode_icons_and_text3.css
@@ -253,5 +253,15 @@
 		  width: 18px !important;
 		}
 	}
+
+	/*LastPass*/
+	#navigator-toolbox toolbar:not(#TabsToolbar) #lpt_lastpass-compact-btn:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text,
+	#ctraddon_addon-bar #lpt_lastpass-compact-btn:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text	{
+	  display: -moz-box !important;
+	}
+
+	#navigator-toolbox toolbar:not(#TabsToolbar) #lpt_lastpass-compact-btn	{
+      padding-top: 6px !important;
+	}
 
 }
diff --git a/xpi/content/css/mode_icons_big.css b/xpi/content/css/mode_icons_big.css
@@ -7,6 +7,10 @@
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 
+	#main-window[fx52plus="true"] #nav-bar :-moz-any(#home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button,#e10s-button,#panic-button,#web-apps-button)[cui-areatype="toolbar"] {
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
+
 	#nav-bar #ctraddon_back-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/menuPanel3.png) !important;
@@ -59,6 +63,13 @@
 	  background: -moz-image-rect(url("chrome://browser/skin/menuPanel.png"),
 					0, 256, 32, 224) center no-repeat !important;
 	}
+
+	#main-window[fx52plus="true"] #nav-bar #downloads-indicator-icon {
+	  width:32px !important;
+	  height:32px !important;
+	  background: -moz-image-rect(url("chrome://browser/skin/menuPanel.svg"),
+					0, 256, 32, 224) center no-repeat !important;
+	}
 
 	#nav-bar #add-ons-button[cui-areatype="toolbar"] {
 	  -moz-image-region: rect(0px, 288px, 32px, 256px) !important;
@@ -182,6 +193,11 @@
 	  list-style-image: url("chrome://browser/skin/menuPanel.png") !important;
 	  -moz-image-region: rect(0px, 992px, 32px, 960px) !important;
 	}
+
+	#main-window[fx52plus="true"] #nav-bar #pocket-button[cui-areatype="toolbar"] {
+	  list-style-image: url("chrome://browser/skin/menuPanel.svg") !important;
+	  -moz-image-region: rect(0px, 992px, 32px, 960px) !important;
+	}
 
 	/* fixes bug with tabview buttons wrong panel icon */
 	#nav-bar #tabview-button[cui-areatype="toolbar"],
@@ -190,18 +206,35 @@
 	  -moz-image-region: rect(0px, 608px, 32px, 576px) !important;
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
+
+	#main-window[fx52plus="true"] #nav-bar #tabview-button[cui-areatype="toolbar"],
+	#main-window[fx52plus="true"] #tabview-button[cui-areatype="menu-panel"],
+	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #tabview-button {
+	  -moz-image-region: rect(0px, 608px, 32px, 576px) !important;
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
 
 	/* extra buttons from CTR add-on*/
 	#nav-bar #ctraddon_stop-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
+
+	#main-window[fx52plus="true"] #ctraddon_stop-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 96px, 32px, 64px) !important;
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
 
 	#nav-bar #ctraddon_reload-button > .toolbarbutton-icon{
 	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
 
+	#main-window[fx52plus="true"] #ctraddon_reload-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px) !important;
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg) !important;
+	}
+
 	#nav-bar #ctraddon_restart-button > .toolbarbutton-icon{
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/[email protected]) !important;
 	}

diff --git a/xpi/content/css/mode_txtonly.css b/xpi/content/css/mode_txtonly.css
@@ -115,4 +115,14 @@
 	  display: -moz-box !important;
 	}
 
+	/*LastPass*/
+	#navigator-toolbox toolbar:not(#TabsToolbar) #lpt_lastpass-compact-btn:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text,
+	#ctraddon_addon-bar #lpt_lastpass-compact-btn:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text	{
+	  display: -moz-box !important;
+	}
+
+	#navigator-toolbox toolbar:not(#TabsToolbar) #lpt_lastpass-compact-btn	{
+      padding-top: 5px !important;
+	}
+
 }
diff --git a/xpi/content/css/oldsearch.css b/xpi/content/css/oldsearch.css
@@ -129,4 +129,15 @@
 	#main-window[fx52plus="true"] #PopupSearchAutoComplete .search-panel-tree > .autocomplete-treebody {
 	  margin-bottom: -4px !important;
 	}
+
+	#main-window[fx52plus="true"] #PopupSearchAutoComplete .search-panel-tree .autocomplete-treebody::-moz-tree-cell(fromhistory),
+	#main-window[fx52plus="true"] #PopupSearchAutoComplete .search-panel-tree .autocomplete-treebody::-moz-tree-cell-text(fromhistory){
+	  opacity: .4 !important;
+	}
+
+	#main-window[fx52plus="true"] #PopupSearchAutoComplete .search-panel-tree .autocomplete-treebody::-moz-tree-cell(fromhistory,selected),
+	#main-window[fx52plus="true"] #PopupSearchAutoComplete .search-panel-tree .autocomplete-treebody::-moz-tree-cell-text(fromhistory,selected){
+	  opacity: 1.0 !important;
+	}
+
 }
diff --git a/xpi/content/ctr_oldsearch.xml b/xpi/content/ctr_oldsearch.xml
@@ -448,11 +448,30 @@
           var where = "current";
 		  var newTabPref = Services.prefs.getBranch("browser.search.").getBoolPref("openintab");
 		  
-		  Components.utils.import("resource://gre/modules/Services.jsm", {})
+		  Components.utils.import("resource://gre/modules/Services.jsm", {});
+		  
+		  var {NewTabURL} = Components.utils.import("resource:///modules/NewTabURL.jsm", {});
+		  var ctr_newtaburl = NewTabURL.get();
+		  var ctr_blankpage = "about:blank";
+		  var ctr_ahomepage = "about:home";
 		  
 		  // force search to open in a new tab, if the corresponding browser preference it active
 		  try {
-			if(newTabPref) where = "tab";
+			if(newTabPref) {
+			  
+			  if(!Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("search_ant") &&
+				gBrowser.currentURI.spec==ctr_newtaburl)
+				  where = "current";
+			  else if(!Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("search_abl") &&
+				gBrowser.currentURI.spec==ctr_blankpage)
+				  where = "current";
+			  else if(!Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("search_aho") &&
+				gBrowser.currentURI.spec==ctr_ahomepage)
+				  where = "current";
+			  else where = "tab";
+			  
+			}
+			
 		  } catch(e) {}
 
           // Open ctrl/cmd clicks on one-off buttons in a new background tab.

diff --git a/xpi/content/ctr_oldsearch52.xml b/xpi/content/ctr_oldsearch52.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 
 <!--
-	This is a duplicate of default 'search.xml' taken from Firefox 41.
-    A few checks for deprecated boolean preferences had to be removed
-	for this to work on Firefox 43+. Additionally 'open-engine-manager' 
-	button points to default in-content search preferences.
-	'OneoffUI' binding, checks of oneoff items and telemetry code also got removed.
-	All "< ! - -  ### - - >" comments got removed to reduce file size.
+	This is a clone of 'ctr_oldsearch.xml' with only one difference:
+    inside xul:textbox
+				autocompletepopup="PopupAutoComplete"
+	was repaced by	
+				autocompletepopup="PopupSearchAutoComplete"
+	to use default searches popup as base.
 -->
 
 <!DOCTYPE bindings [
@@ -448,11 +448,30 @@
           var where = "current";
 		  var newTabPref = Services.prefs.getBranch("browser.search.").getBoolPref("openintab");
 		  
-		  Components.utils.import("resource://gre/modules/Services.jsm", {})
+		  Components.utils.import("resource://gre/modules/Services.jsm", {});
+		  
+		  var {NewTabURL} = Components.utils.import("resource:///modules/NewTabURL.jsm", {});
+		  var ctr_newtaburl = NewTabURL.get();
+		  var ctr_blankpage = "about:blank";
+		  var ctr_ahomepage = "about:home";
 		  
 		  // force search to open in a new tab, if the corresponding browser preference it active
 		  try {
-			if(newTabPref) where = "tab";
+			if(newTabPref) {
+			  
+			  if(!Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("search_ant") &&
+				gBrowser.currentURI.spec==ctr_newtaburl)
+				  where = "current";
+			  else if(!Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("search_abl") &&
+				gBrowser.currentURI.spec==ctr_blankpage)
+				  where = "current";
+			  else if(!Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("search_aho") &&
+				gBrowser.currentURI.spec==ctr_ahomepage)
+				  where = "current";
+			  else where = "tab";
+			  
+			}
+			
 		  } catch(e) {}
 
           // Open ctrl/cmd clicks on one-off buttons in a new background tab.

diff --git a/xpi/content/options.js b/xpi/content/options.js
@@ -916,6 +916,10 @@ classicthemerestorerjso.ctr = {
     document.getElementById('ctraddon_pw_osearch_iwidth').disabled = which;
     document.getElementById('ctraddon_pw_osearch_meoit').disabled = which;
 	document.getElementById('ctraddon_pw_osearch_cwidth').disabled = which;
+	document.getElementById('ctraddon_pw_search_ant').disabled = which;
+	document.getElementById('ctraddon_pw_search_abl').disabled = which;
+	document.getElementById('ctraddon_pw_search_aho').disabled = which;
+
 	if(this.prefs.getBoolPref("osearch_cwidth") && which == false) {
 	  document.getElementById('ctraddon_os_spsize_minw').disabled = false;
 	  document.getElementById('ctraddon_os_spsize_maxw').disabled = false;

diff --git a/xpi/content/options.xul b/xpi/content/options.xul
@@ -94,6 +94,9 @@
 		<preference id="ctraddon_ctrosearchct"	name="extensions.classicthemerestorer.ctrosearchct"	 type="int"		instantApply="true"/>
 		<preference id="ctraddon_ctroldsearchr"	name="extensions.classicthemerestorer.ctroldsearchr" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_ctrosearchrt"	name="extensions.classicthemerestorer.ctrosearchrt"	 type="int"		instantApply="true"/>
+		<preference id="ctraddon_search_ant"	name="extensions.classicthemerestorer.search_ant"	 type="bool"	instantApply="true"/>
+		<preference id="ctraddon_search_abl"	name="extensions.classicthemerestorer.search_abl"	 type="bool"	instantApply="true"/>
+		<preference id="ctraddon_search_aho"	name="extensions.classicthemerestorer.search_aho"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_osearch_dm"	name="extensions.classicthemerestorer.osearch_dm"	 type="bool"	instantApply="true"/>
 		<preference id="ctraddon_osearch_meoit"	name="extensions.classicthemerestorer.osearch_meoit" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_osearch_iwidth" name="extensions.classicthemerestorer.osearch_iwidth" type="bool"	instantApply="true"/>
@@ -1284,6 +1287,11 @@
 		<checkbox label="&Ctr_ctroldsearch;"	preference="ctraddon_ctroldsearch" id="ctraddon_pw_ctroldsearch" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwCtrOldSearch(true);} else {classicthemerestorerjso.ctr.ctrpwCtrOldSearch(false);}"/>
 		<checkbox label="&Ctr_search_oit;"		preference="ctraddon_search_oit" id="ctraddon_pw_search_oit" />
 		<description class="ctraddonsuboption">about:config &gt;&gt; browser.search.openintab</description>
+		<hbox class="ctraddonsuboption">
+		  <checkbox label="about:newtab"		preference="ctraddon_search_ant" id="ctraddon_pw_search_ant"/>
+		  <checkbox label="about:blank"			preference="ctraddon_search_abl" id="ctraddon_pw_search_abl"/>
+		  <checkbox label="about:home"			preference="ctraddon_search_aho" id="ctraddon_pw_search_aho"/>
+		</hbox>
 		<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">

diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
@@ -299,6 +299,11 @@
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel.png);
 	}
 
+	#main-window[fx52plus="true"] #ctraddon_appbutton[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_appbutton > .toolbarbutton-icon{
+	  list-style-image: url(chrome://classic_theme_restorer/content/images/appbutton_menuPanel.svg);
+	}
+
 	#ctraddon_panelui-button[cui-areatype="menu-panel"] #PanelUI-menu-button > .toolbarbutton-icon,
 	toolbarpaletteitem[place="palette"] > #ctraddon_panelui-button {
 	  background: -moz-image-rect(url("chrome://classic_theme_restorer/content/images/menuPanel2.png"),
@@ -318,6 +323,14 @@
 	  -moz-image-region: rect(0px, 96px, 32px, 64px);
 	  list-style-image: url(chrome://browser/skin/menuPanel.png);
 	}
+
+	#main-window[defaultfxtheme="true"][fx52plus="true"]  #ctraddon_stop-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[defaultfxtheme="true"][fx52plus="true"]  toolbarpaletteitem[place="palette"] > #ctraddon_stop-button > .toolbarbutton-icon,
+	#main-window[fx52plus="true"] #ctraddon_stop-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_stop-button > .toolbarbutton-icon {
+	  -moz-image-region: rect(0px, 96px, 32px, 64px);
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg);
+	}
 
 	#main-window[defaultfxtheme="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	#main-window[defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon,
@@ -326,6 +339,14 @@
 	  -moz-image-region: rect(0px, 64px, 32px, 32px);
 	  list-style-image: url(chrome://browser/skin/menuPanel.png);
 	}
+
+	#main-window[defaultfxtheme="true"][fx52plus="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[defaultfxtheme="true"][fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon,
+	#main-window[fx52plus="true"] #ctraddon_reload-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
+	#main-window[fx52plus="true"] toolbarpaletteitem[place="palette"] > #ctraddon_reload-button > .toolbarbutton-icon{
+	  -moz-image-region: rect(0px, 64px, 32px, 32px);
+	  list-style-image: url(chrome://browser/skin/menuPanel.svg);
+	}
 
 	#main-window[defaultfxtheme="true"] #ctraddon_go-button[cui-areatype="menu-panel"] > .toolbarbutton-icon,
 	#main-window[defaultfxtheme="true"] toolbarpaletteitem[place="palette"] > #ctraddon_go-button > .toolbarbutton-icon,

diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js
@@ -70,6 +70,9 @@ pref("extensions.classicthemerestorer.ctrosearchct",0);
 pref("extensions.classicthemerestorer.ctroldsearchr",false);
 pref("extensions.classicthemerestorer.ctrosearchrt",0);
 pref("extensions.classicthemerestorer.osearch_meoit",false);
+pref("extensions.classicthemerestorer.search_ant",true);
+pref("extensions.classicthemerestorer.search_abl",true);
+pref("extensions.classicthemerestorer.search_aho",true);
 pref("extensions.classicthemerestorer.osearch_dm",false);
 pref("extensions.classicthemerestorer.osearch_iwidth",true);
 pref("extensions.classicthemerestorer.osearch_cwidth",false);

diff --git 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.8.1beta6</em:version>
+		<em:version>1.5.8.1</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>