1.5.8beta2

<b>[locale(s)]</b>
- Polish (pl-PL) translation updated (thanks to Mrere)

<b>[fix(es)]</b>
- Fx52+: General UI (1) > bookmarks menu button > popups panel menu
appearance
- Toolbars (3) > 'Aero' colors: colorize findbar too
- Toolbars (3) > 'Aero' colors: add-on manager glitch

<b>[add-on compatibility]</b>
- Findbar tweak & 'Toolbars (2) > Findbar > custom width for findbox'
option

6 files changed, 53 insertions, 19 deletions

diff --git a/xpi/content/css/win8/bmbut_pmenu_extra.css b/xpi/content/css/win8/bmbut_pmenu_extra.css
index a2f273b..a170b26 100644
--- a/xpi/content/css/win8/bmbut_pmenu_extra.css
+++ b/xpi/content/css/win8/bmbut_pmenu_extra.css
@@ -7,8 +7,15 @@
 	  background: var(--panel-arrowcontent-background) !important;
 	  border: var(--panel-arrowcontent-border) !important;
 	}
+
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
 	}
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/winaero/bmbut_pmenu_extra.css b/xpi/content/css/winaero/bmbut_pmenu_extra.css
index 3ad347d..a170b26 100644
--- a/xpi/content/css/winaero/bmbut_pmenu_extra.css
+++ b/xpi/content/css/winaero/bmbut_pmenu_extra.css
@@ -12,5 +12,10 @@
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
 	}
-
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/winxp/bmbut_pmenu_extra.css b/xpi/content/css/winxp/bmbut_pmenu_extra.css
index 871c8a5..a170b26 100644
--- a/xpi/content/css/winxp/bmbut_pmenu_extra.css
+++ b/xpi/content/css/winxp/bmbut_pmenu_extra.css
@@ -12,4 +12,10 @@
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
 	}
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index 212c073..6e40289 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -122,6 +122,7 @@ classicthemerestorerjs.ctr = {
 	try{if (this.appversion >= 48) document.getElementById("main-window").setAttribute('fx48plus',true);} catch(e){}
 	try{if (this.appversion >= 50) document.getElementById("main-window").setAttribute('fx50plus',true);} catch(e){}
 	try{if (this.appversion >= 51) document.getElementById("main-window").setAttribute('fx51plus',true);} catch(e){}
+	try{if (this.appversion >= 52) document.getElementById("main-window").setAttribute('fx52plus',true);} catch(e){}
 
 	// add CTR version number to '#main-window' node, so other add-ons/themes can easier distinguish between versions
 	AddonManager.getAddonByID('ClassicThemeRestorer@ArisT2Noia4dev', function(addon) {
@@ -357,13 +358,7 @@ classicthemerestorerjs.ctr = {
 			classicthemerestorerjs.ctr.loadUnloadCSS('tabs_devedextra',false);
 
 			var devtheme=false;
-
-			try {
-			  if(Services.prefs.getBranch("browser.devedition.theme.").getBoolPref('enabled')!=false){
-				devtheme=true;
-			  }
-			} catch(e) {}
-			
+		
 			if(classicthemerestorerjs.ctr.fxdevelopertheme==true) devtheme=true;
 
 			if (branch.getCharPref("tabs")!="tabs_default" && classicthemerestorerjs.ctr.fxdefaulttheme==true && devtheme==false){
@@ -657,13 +652,7 @@ classicthemerestorerjs.ctr = {
 		  case "aerocolors": case "aerocolorsg":
 		 
 			var devtheme=false;
-
-			try {
-			  if(Services.prefs.getBranch("browser.devedition.theme.").getBoolPref('enabled')!=false){
-				devtheme=true;
-			  }
-			} catch(e) {}
-			
+	
 			if(classicthemerestorerjs.ctr.fxdevelopertheme==true) devtheme=true;
 	
 			if (branch.getBoolPref("aerocolors") && classicthemerestorerjs.ctr.fxdefaulttheme==true && devtheme==false) {
@@ -2066,6 +2055,14 @@ classicthemerestorerjs.ctr = {
 		  case "alt_addonsm":
 			if (branch.getBoolPref("alt_addonsm") && classicthemerestorerjs.ctr.fxdefaulttheme==true) classicthemerestorerjs.ctr.loadUnloadCSS("alt_addonsm",true);
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("alt_addonsm",false);
+
+			var devtheme=false;
+			if(classicthemerestorerjs.ctr.fxdevelopertheme==true) devtheme=true;
+			
+			if (branch.getBoolPref("aerocolors") && classicthemerestorerjs.ctr.fxdefaulttheme==true && devtheme==false) { 
+			  classicthemerestorerjs.ctr.loadUnloadCSS("aerocolors",false);
+			  classicthemerestorerjs.ctr.loadUnloadCSS("aerocolors",true);
+			}
 		  break;
 
 		  case "addonversion":
@@ -2137,6 +2134,24 @@ classicthemerestorerjs.ctr = {
 		  case "bmbnounsort":
 			if (branch.getBoolPref("bmbnounsort")) classicthemerestorerjs.ctr.loadUnloadCSS("bmbnounsort",true);
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("bmbnounsort",false);
+			  
+			// for MacOSX: hide item using js instead of css or it won't work
+			if (classicthemerestorerjs.ctr.osstring=="Darwin"){
+				if (branch.getBoolPref("bmbnounsort")) {
+					setTimeout(function(){
+					  try{
+						document.getElementById("menu_unsortedBookmarks").collapsed = true;
+					  } catch(e){}
+					},500);
+				}
+				else {
+				  setTimeout(function(){
+					try{
+					  document.getElementById("menu_unsortedBookmarks").collapsed = false;
+					} catch(e){}
+				  },500);
+				}
+			}
 		  break;
 
 		  case "bmbutnotext":
@@ -4426,7 +4441,8 @@ classicthemerestorerjs.ctr = {
 						#main-window[defaultfxtheme="true"][tabsontop="false"] #TabsToolbar:not(:-moz-lwtheme),\
 						#main-window[defaultfxtheme="true"] :not(#theFoxOnlyBetter-slimChrome-toolbars) > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(.devtools-tabbar):not(#developer-toolbar):not(.devtools-responsiveui-toolbar):not(#puzzleBars-urlbar-bar):not(#theFoxOnlyBetter-skyLights-container):not(#theFoxOnlyBetter-slimChrome-slimmer),\
 						#main-window[defaultfxtheme="true"] #theFoxOnlyBetter-slimChrome-container > *:not(#theFoxOnlyBetter-slimChrome-toolbars-bottom):not(:-moz-lwtheme),\
-						#main-window[defaultfxtheme="true"] #ctraddon_urlextrabar:not(:-moz-lwtheme){\
+						#main-window[defaultfxtheme="true"] #ctraddon_urlextrabar:not(:-moz-lwtheme),\
+						#main-window[defaultfxtheme="true"] findbar{\
 						  background-image:unset !important;\
 						  background-color:'+main_ab_color+' !important;\
 						}\
@@ -4790,7 +4806,7 @@ classicthemerestorerjs.ctr = {
 			
 				this.findbarwidth=ios.newURI("data:text/css;charset=utf-8," + encodeURIComponent('\
 					findbar .findbar-textbox{\
-					  min-width: unset !important;\
+					  min-width: '+this.prefs.getIntPref('findb_widthva')+'px !important;\
 					  width: '+this.prefs.getIntPref('findb_widthva')+'px !important;\
 					  max-width: unset !important;\
 					}\
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 4dd1a3a..c92b16b 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.8beta1</em:version>
+		<em:version>1.5.8beta2</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd
index e648372..240521c 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	"Findboxes width">
+<!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">