r3dfox modern theme replaced with os versions

Author: K4sum1

browser/components/preferences/main.inc.xhtml

@@ -58,6 +58,21 @@
   </hbox>
   <description id="r3dfoxFakeScrollDescription" class="tip-caption" data-l10n-id="r3dfox-fake-scroll-type-desc"/>
 
+  <hbox align="center">
+    <label id="r3dfoxWinTheme" data-l10n-id="r3dfox-win-theme-type" control="r3dfoxWinThemeType"/>
+    <menulist id="r3dfoxWinThemeType" preference="widget.native-controls.override-win-version">
+      <menupopup>
+        <menuitem label="Current OS version (Default)" value="0"/>
+        <menuitem label="Windows XP" value="5"/>
+        <menuitem label="Windows Vista" value="6"/>
+        <menuitem label="Windows 7" value="7"/>
+        <menuitem label="Windows 8" value="8"/>
+        <menuitem label="Windows 10 (Modern)" value="10"/>
+      </menupopup>
+    </menulist>
+  </hbox>
+  <description id="r3dfoxWinThemeDescription" class="tip-caption" data-l10n-id="r3dfox-win-theme-type-desc"/>
+
   <hbox align="center">
     <checkbox id="r3dfoxTheme"
               data-l10n-id="r3dfox-theme"
@@ -107,13 +122,6 @@
   </hbox>
   <description class="indent tip-caption" data-l10n-id="r3dfox-menubar-desc"/>
 
-  <hbox align="center">
-    <checkbox id="r3dfoxGlowMenubar"
-              data-l10n-id="r3dfox-glow-menubar"
-              preference="r3dfox.glow.menubar"/>
-  </hbox>
-  <description class="indent tip-caption" data-l10n-id="r3dfox-glow-menubar-desc"/>
-
   <hbox align="center">
     <checkbox id="r3dfoxNavbar"
               data-l10n-id="r3dfox-navbar"
@@ -163,13 +171,6 @@
   </hbox>
   <description class="indent tip-caption" data-l10n-id="r3dfox-view-image-desc"/>
 
-  <hbox align="center">
-    <checkbox id="r3dfoxmodern"
-              data-l10n-id="r3dfox-modern"
-              preference="widget.windows-style.modern"/>
-  </hbox>
-  <description class="indent tip-caption" data-l10n-id="r3dfox-modern-desc"/>
-
   <hbox align="center">
     <checkbox id="r3dfoxcsp"
               data-l10n-id="r3dfox-csp"

browser/components/preferences/main.js

@@ -64,22 +64,21 @@ Preferences.addAll([
   { id: "widget.non-native-theme.enabled", type: "bool",  inverted: true },
   { id: "widget.native-controls.scrollbar-style", type: "int" },
   { id: "widget.non-native-theme.scrollbar.style", type: "int" },
+  { id: "widget.native-controls.override-win-version", type: "int" },
   { id: "r3dfox.colors.enabled", type: "bool" },
   { id: "r3dfox.colors.esr", type: "bool" },
   { id: "r3dfox.colors.plasmafox", type: "bool" },
   { id: "r3dfox.customizations.enabled", type: "bool" },
   { id: "r3dfox.drag-space.enabled", type: "bool" },
   { id: "r3dfox.backgrounds.enabled", type: "bool" },
   { id: "r3dfox.transparent.menubar", type: "bool" },
-  { id: "r3dfox.glow.menubar", type: "bool" },
   { id: "r3dfox.translucent.navbar", type: "bool" },
   { id: "r3dfox.less.aero.fog", type: "bool" },
   { id: "r3dfox.aero.fog", type: "bool" },
   { id: "r3dfox.force.transparency", type: "bool" },
   { id: "r3dfox.caption.text.color", type: "bool" },
   { id: "browser.urlbar.oneOffsInstant", type: "bool" },
   { id: "r3dfox.view.image", type: "bool" },
-  { id: "widget.windows-style.modern", type: "bool" },
   { id: "browser.e10s.disabled", type: "bool" },
   { id: "security.csp.enable", type: "bool",  inverted: true },
   { id: "network.stricttransportsecurity.enabled", type: "bool",  inverted: true },

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -148,6 +148,10 @@ r3dfox-fake-scroll-type = Non-native scrollbar theme
 
 r3dfox-fake-scroll-type-desc = This controls the theme of the scrollbar.
 
+r3dfox-win-theme-type = Windows version theme override
+
+r3dfox-win-theme-type-desc = Override Windows version theme (requires restart)
+
 r3dfox-theme =
     .label = Use r3dfox theme styles
 
@@ -183,11 +187,6 @@ r3dfox-menubar =
 
 r3dfox-menubar-desc = This removes the menubar background.
 
-r3dfox-glow-menubar =
-    .label = Menubar text glow
-
-r3dfox-glow-menubar-desc = This enables/disables the menubar text glow. Can help with reading the text on some backgrounds or colors.
-
 r3dfox-navbar =
     .label = Translucent design
 
@@ -223,11 +222,6 @@ r3dfox-view-image =
 
 r3dfox-view-image-desc = Restore the classic View Image and View Background Image context menu options instead of always opening images in a new tab.
 
-r3dfox-modern =
-    .label = Modern UI (Requires browser restart)
-
-r3dfox-modern-desc = Enable for standard Firefox Windows 10 UI on all platforms.
-
 r3dfox-csp =
     .label = Disable Content Security Policy (CSP)
 

browser/themes/shared/r3dfox.css

@@ -141,12 +141,6 @@
 
 /* Aero fog and other settings */
 
-@media (-moz-windows-default-theme), (-moz-windows-compositor) {
-  #main-menubar:not([lwtheme]) {
-    color: black;
-  }
-}
-
 @media (-moz-bool-pref: "r3dfox.aero.fog") {
   @media (-moz-windows-compositor), (-moz-windows-glass) {
     #navigator-toolbox:not([lwtheme]) {
@@ -193,7 +187,7 @@
   #main-menubar:not([lwtheme]) {
     color: white !important;
   }
-  @media (-moz-bool-pref: "r3dfox.glow.menubar") {
+  @media (-moz-windows-glass) {
     #toolbar-menubar {
       text-shadow: 0 0 .5em black, 0 0 .5em black, 0 1px 0 rgba(0,0,0,.4) !important;
     }
@@ -234,12 +228,6 @@
   }
 }
 
-@media not (-moz-bool-pref: "r3dfox.glow.menubar") {
-  #toolbar-menubar {
-    text-shadow: none !important;
-  }
-}
-
 @media (-moz-bool-pref: "r3dfox.translucent.navbar") {
   @media (-moz-bool-pref: "r3dfox.aero.fog") {
     @media (-moz-windows-glass) {