1.7.5

updates.json

@@ -2,8 +2,8 @@
   "addons": {
     "ClassicThemeRestorer@ArisT2Noia4dev": {
       "updates": [
-        { "version": "1.7.4",
-          "update_link": "https://github.com/Aris-t2/ClassicThemeRestorer/releases/download/1.7.4/CTR_v1.7.4.xpi",
+        { "version": "1.7.5",
+          "update_link": "https://github.com/Aris-t2/ClassicThemeRestorer/releases/download/1.7.5/CTR_v1.7.5.xpi",
           "applications": {
             "gecko": { "strict_min_version": "45" }
 		  }

xpi/content/css/alt_appbutton_icons.css

@@ -5,4 +5,10 @@
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton2.png") !important;
 	}
+
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton2_32.png") !important;
+		}
+	}
 }

xpi/content/css/alt_appbutton_icons2.css

@@ -5,4 +5,12 @@
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-inv.png") !important;
 	}
+
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-inv_32.png") !important;
+		  width: 31px !important;
+		}
+	}
+
 }

xpi/content/css/alt_appbutton_icons3.css

@@ -5,4 +5,11 @@
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-dark.png") !important;
 	}
+
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-dark_32.png") !important;
+		  width: 31px !important;
+		}
+	}
 }

xpi/content/css/alt_appbutton_icons4.css

@@ -5,4 +5,9 @@
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton3.png") !important;
 	}
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton3_32.png") !important;
+		}
+	}
 }

xpi/content/css/alt_appbutton_icons5.css

@@ -5,4 +5,10 @@
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-grey.png") !important;
 	}
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-grey_32.png") !important;
+		  width: 31px !important;
+		}
+	}
 }

xpi/content/css/alt_appbutton_icons6.css

@@ -10,4 +10,10 @@
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/Toolbar-inverted.png") !important;
 	  -moz-image-region: rect(0px, 486px, 18px, 468px) !important;
 	}
+
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  width: 31px !important;
+		}
+	}
 }

xpi/content/css/alt_appbutton_icons7.css

@@ -10,4 +10,9 @@
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/Toolbar.png") !important;
 	  -moz-image-region: rect(0px, 486px, 18px, 468px) !important;
 	}
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  width: 31px !important;
+		}
+	}
 }

xpi/content/css/appbutton2io.css

@@ -13,6 +13,13 @@
       margin-bottom: -0.5px !important;
 	}
 
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton2 > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-inv_32.png") !important;
+		  width: 32px !important;
+		}
+	}
+
 	#ctraddon_appbutton2{
 	  width: 32px !important;
 	}

xpi/content/css/appbutton2io2.css

@@ -13,6 +13,13 @@
       margin-bottom: -0.5px !important;
 	}
 
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton2 > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-inv_32.png") !important;
+		  width: 32px !important;
+		}
+	}
+
 	#ctraddon_appbutton2{
 	  width: 32px !important;
 	}

xpi/content/css/paneluibutton_tweak.css

@@ -29,6 +29,13 @@
 	  -moz-image-region: rect(0, 26px, 18px, 0px) !important;
 	  width: 26px !important;
 	}
+
+	@media (min-resolution: 1.1dppx) {
+		#TabsToolbar #ctraddon_panelui-button #PanelUI-menu-button .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton_32.png") !important;
+		  -moz-image-region: rect(0, 52px, 36px, 0px) !important;
+		}
+	}
 
 	#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_panelui-button #PanelUI-menu-button:hover:active,
 	#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_panelui-button #PanelUI-menu-button[open]{

xpi/content/ctr_oldsearch.xml

@@ -661,7 +661,36 @@
         ]]></body>
       </method>
 
+      <method name="openSearch">
+        <body>
+          <![CDATA[
+            // Don't open search popup if history popup is open
+            if (!this.popupOpen) {
+              let searchBox = document.getBindingParent(this);
+              searchBox.searchButton.open = true;
+              return false;
+            }
+            return true;
+          ]]>
+        </body>
+      </method>
+
 	</implementation>
+
+    <handlers>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="alt"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+      <handler event="keypress" keycode="VK_F4"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+    </handlers>
 
   </binding>
 

xpi/content/ctr_oldsearch52.xml

@@ -663,7 +663,36 @@
         ]]></body>
       </method>
 
+      <method name="openSearch">
+        <body>
+          <![CDATA[
+            // Don't open search popup if history popup is open
+            if (!this.popupOpen) {
+              let searchBox = document.getBindingParent(this);
+              searchBox.searchButton.open = true;
+              return false;
+            }
+            return true;
+          ]]>
+        </body>
+      </method>
+
 	</implementation>
+
+    <handlers>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="alt"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+      <handler event="keypress" keycode="VK_F4"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+    </handlers>
 
   </binding>
 

xpi/content/ctr_oldsearch56.xml

@@ -662,8 +662,37 @@
           }
         ]]></body>
       </method>
+
+      <method name="openSearch">
+        <body>
+          <![CDATA[
+            // Don't open search popup if history popup is open
+            if (!this.popupOpen) {
+              let searchBox = document.getBindingParent(this);
+              searchBox.searchButton.open = true;
+              return false;
+            }
+            return true;
+          ]]>
+        </body>
+      </method>
 
 	</implementation>
+
+    <handlers>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+      <handler event="keypress" keycode="VK_UP" modifiers="alt"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+      <handler event="keypress" keycode="VK_F4"
+               phase="capturing"
+               action="return this.openSearch();"/>
+
+    </handlers>
 
   </binding>
 

xpi/content/overlay.css

@@ -150,6 +150,13 @@
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton.png");
 	}
 
+	@media (min-resolution: 1.1dppx) {
+		#ctraddon_appbutton > .toolbarbutton-icon {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton_32.png");
+		  width: 40px !important;
+		}
+	}
+
 	#nav-bar #ctraddon_appbutton > .toolbarbutton-icon{
 	  margin-left: -3px;
 	  margin-right: -3px;

xpi/content/overlay.dtd

@@ -55,7 +55,7 @@
 <!ENTITY quitApplicationCmdWin2.accesskey	"">
 <!ENTITY quitApplicationCmd.label		"Quit">
 <!ENTITY quitApplicationCmd.accesskey	"Q">
-<!ENTITY quitApplicationCmdMac.label	"Quit Firefox">
+<!ENTITY quitApplicationCmdMac2.label	"Quit &brandShortName;">
 <!ENTITY quitApplicationCmd.accesskey	"Q">
 <!ENTITY bookmarksMenu.label			"Bookmarks">
 <!ENTITY appMenuHistory.viewSidebar.label "View History Sidebar">

xpi/content/overlayMac.xul

@@ -24,7 +24,7 @@
 
 <overlay id="classic_theme_restorer-overlay_Mac" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<menuitem id="appmenu-quit"
-			  label="&quitApplicationCmdMac.label;"
+			  label="&quitApplicationCmdMac2.label;"
 			  accesskey="&quitApplicationCmd.accesskey;"/>
 
 	<menu id="appmenu_customize" label="&preferencesCmdUnix.label;"/>

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.7.4</em:version>
+		<em:version>1.7.5</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
@@ -15,12 +15,14 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>45.0</em:minVersion>
-				<em:maxVersion>56.*</em:maxVersion>
+				<em:maxVersion>62.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
+
+		<em:updateURL>https://raw.githubusercontent.com/Aris-t2/ClassicThemeRestorer/master/updates.json</em:updateURL>
 
 		<em:description>'Classic Theme Restorer' restores many customization features Firefox lost over time like old 'Firefox'-button, squared tabs, add-ons bar, small navigation bar buttons, old search, old preference window, old location bar menu, eye-friendly add-ons manager, old buttons and many more.</em:description>
-		<em:homepageURL>https://addons.mozilla.org/addon/classicthemerestorer/</em:homepageURL>
+		<em:homepageURL>https://github.com/Aris-t2/ClassicThemeRestorer/</em:homepageURL>
 		<em:creator>Aris</em:creator>
 
 		<em:contributor>InternalError503 (Toady)</em:contributor>