wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 639134 - update pref UI and internet explorer profile migration code for new tristate pref, r=jaws

Browse Source
This commit is contained in:
Gijs Kruitbosch 2014-11-27 19:12:03 +00:00
parent b089406711
commit 99f64a2eb3
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/migration/IEProfileMigrator.js
View File

@ -531,8 +531,8 @@ Settings.prototype = {
yesNoToBoolean); yesNoToBoolean);
this._set("Software\\Microsoft\\Internet Explorer\\Settings", this._set("Software\\Microsoft\\Internet Explorer\\Settings",
"Always Use My Colors", "Always Use My Colors",
"browser.display.use_document_colors", "browser.display.document_color_use",
function (v) !Boolean(v)); function (v) !Boolean(v) ? 0 : 2);
this._set("Software\\Microsoft\\Internet Explorer\\Settings", this._set("Software\\Microsoft\\Internet Explorer\\Settings",
"Always Use My Font Face", "Always Use My Font Face",
"browser.display.use_document_fonts", "browser.display.use_document_fonts",

18
browser/components/preferences/colors.xul
View File

@ -28,7 +28,7 @@
helpTopic="prefs-fonts-and-colors"> helpTopic="prefs-fonts-and-colors">
<preferences> <preferences>
<preference id="browser.display.use_document_colors" name="browser.display.use_document_colors" type="bool"/> <preference id="browser.display.document_color_use" name="browser.display.document_color_use" type="int"/>
<preference id="browser.anchor_color" name="browser.anchor_color" type="string"/> <preference id="browser.anchor_color" name="browser.anchor_color" type="string"/>
<preference id="browser.visited_color" name="browser.visited_color" type="string"/> <preference id="browser.visited_color" name="browser.visited_color" type="string"/>
<preference id="browser.underline_anchors" name="browser.underline_anchors" type="bool"/> <preference id="browser.underline_anchors" name="browser.underline_anchors" type="bool"/>
@ -80,10 +80,16 @@
</hbox> </hbox>
</groupbox> </groupbox>
</hbox> </hbox>
<hbox> <vbox align="start">
<checkbox id="useDocumentColors" <label accesskey="&allowPagesToUseColors.accesskey;"
label="&allowPagesToUse.label;" accesskey="&allowPagesToUse.accesskey;" control="useDocumentColors">&allowPagesToUseColors.label;</label>
preference="browser.display.use_document_colors" flex="1"/> <menulist id="useDocumentColors" preference="browser.display.document_color_use">
</hbox> <menupopup>
<menuitem label="&allowPagesToUseColors.automatic.label;" value="0" id="documentColorAutomatic"/>
<menuitem label="&allowPagesToUseColors.always.label;" value="1" id="documentColorAlways"/>
<menuitem label="&allowPagesToUseColors.never.label;" value="2" id="documentColorNever"/>
</menupopup>
</menulist>
</vbox>
</prefpane> </prefpane>
</prefwindow> </prefwindow>

8
browser/locales/en-US/chrome/browser/preferences/colors.dtd
View File

@ -6,8 +6,12 @@
<!ENTITY window.width "38em"> <!ENTITY window.width "38em">
<!ENTITY window.macWidth "41em"> <!ENTITY window.macWidth "41em">
<!ENTITY allowPagesToUse.label "Allow pages to choose their own colors, instead of my selections above"> <!ENTITY allowPagesToUseColors.label "Allow pages to choose their own colors, instead of my selections above:">
<!ENTITY allowPagesToUse.accesskey "A"> <!ENTITY allowPagesToUseColors.accesskey "A">
<!ENTITY allowPagesToUseColors.automatic.label "Automatic">
<!ENTITY allowPagesToUseColors.always.label "Always">
<!ENTITY allowPagesToUseColors.never.label "Never">
<!ENTITY color "Text and Background"> <!ENTITY color "Text and Background">
<!ENTITY textColor.label "Text:"> <!ENTITY textColor.label "Text:">