зеркало из https://github.com/mozilla/pjs.git
Bug 568700 - Font aliases and defaults for Android, r=vlad
--HG-- extra : rebase_source : 0c5b021d2d8bacbfdb3fda6704ce0c6c8ced5d78
This commit is contained in:
Matt Brubeck
Родитель
602522921b
Коммит
e1e7b5a31b
|
|
@ -1258,6 +1258,7 @@ pref("dom.ipc.plugins.timeoutSecs", 10);
|
|||
pref("dom.ipc.plugins.timeoutSecs", 0);
|
||||
#endif
|
||||
|
||||
#ifndef ANDROID
|
||||
#ifndef XP_MACOSX
|
||||
#ifdef XP_UNIX
|
||||
// Linux plugins using Xt instead of Xembed don't work out-of-process yet.
|
||||
|
|
@ -1265,6 +1266,7 @@ pref("dom.ipc.plugins.enabled.libvlcplugin.so", false);
|
|||
pref("dom.ipc.plugins.enabled.nppdf.so", false);
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
pref("svg.enabled", true);
|
||||
pref("svg.smil.enabled", true);
|
||||
|
|
@ -2453,6 +2455,281 @@ pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
|
|||
# BeOS
|
||||
#endif
|
||||
|
||||
#ifdef ANDROID
|
||||
// Handled differently under Mac/Windows
|
||||
pref("network.hosts.smtp_server", "localhost");
|
||||
pref("network.hosts.pop_server", "pop");
|
||||
pref("network.protocol-handler.warn-external.file", false);
|
||||
pref("browser.drag_out_of_frame_style", 1);
|
||||
|
||||
// Middle-mouse handling
|
||||
pref("middlemouse.paste", true);
|
||||
pref("middlemouse.contentLoadURL", true);
|
||||
pref("middlemouse.openNewWindow", true);
|
||||
pref("middlemouse.scrollbarPosition", true);
|
||||
|
||||
// Clipboard behavior
|
||||
pref("clipboard.autocopy", true);
|
||||
|
||||
pref("browser.urlbar.clickSelectsAll", false);
|
||||
|
||||
// Tab focus model bit field:
|
||||
// 1 focuses text controls, 2 focuses other form elements, 4 adds links.
|
||||
// Leave this at the default, 7, to match mozilla1.0-era user expectations.
|
||||
// pref("accessibility.tabfocus", 1);
|
||||
|
||||
// autocomplete keyboard grab workaround
|
||||
pref("autocomplete.grab_during_popup", true);
|
||||
pref("autocomplete.ungrab_during_mode_switch", true);
|
||||
|
||||
// Default to using the system filepicker if possible, but allow
|
||||
// toggling to use the XUL filepicker
|
||||
pref("ui.allow_platform_file_picker", true);
|
||||
|
||||
// should NetworkManager be authoritative for online/offline status?
|
||||
pref("toolkit.networkmanager.disable", true);
|
||||
|
||||
pref("helpers.global_mime_types_file", "/etc/mime.types");
|
||||
pref("helpers.global_mailcap_file", "/etc/mailcap");
|
||||
pref("helpers.private_mime_types_file", "~/.mime.types");
|
||||
pref("helpers.private_mailcap_file", "~/.mailcap");
|
||||
pref("java.global_java_version_file", "/etc/.java/versions");
|
||||
pref("java.private_java_version_file", "~/.java/versions");
|
||||
pref("java.default_java_location_solaris", "/usr/j2se");
|
||||
pref("java.default_java_location_others", "/usr/java");
|
||||
pref("java.java_plugin_library_name", "javaplugin_oji");
|
||||
pref("applications.telnet", "xterm -e telnet %h %p");
|
||||
pref("applications.tn3270", "xterm -e tn3270 %h");
|
||||
pref("applications.rlogin", "xterm -e rlogin %h");
|
||||
pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
|
||||
pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
|
||||
pref("print.printer_list", ""); // list of printers, separated by spaces
|
||||
pref("print.print_reversed", false);
|
||||
pref("print.print_color", true);
|
||||
pref("print.print_landscape", false);
|
||||
pref("print.print_paper_size", 0);
|
||||
|
||||
// print_extra_margin enables platforms to specify an extra gap or margin
|
||||
// around the content of the page for Print Preview only
|
||||
pref("print.print_extra_margin", 0); // twips
|
||||
|
||||
pref("font.allow_double_byte_special_chars", true);
|
||||
// font names
|
||||
|
||||
pref("font.alias-list", "sans,sans-serif,serif,monospace");
|
||||
|
||||
// ar
|
||||
|
||||
pref("font.name.serif.el", "Droid Serif");
|
||||
pref("font.name.sans-serif.el", "Droid Sans");
|
||||
pref("font.name.monospace.el", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.he", "Droid Serif");
|
||||
pref("font.name.sans-serif.he", "Droid Sans");
|
||||
pref("font.name.monospace.he", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.ja", "Droid Serif");
|
||||
pref("font.name.sans-serif.ja", "Droid Sans");
|
||||
pref("font.name.monospace.ja", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.ko", "Droid Serif");
|
||||
pref("font.name.sans-serif.ko", "Droid Sans");
|
||||
pref("font.name.monospace.ko", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.th", "Droid Serif");
|
||||
pref("font.name.sans-serif.th", "Droid Sans");
|
||||
pref("font.name.monospace.th", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.tr", "Droid Serif");
|
||||
pref("font.name.sans-serif.tr", "Droid Sans");
|
||||
pref("font.name.monospace.tr", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.x-baltic", "Droid Serif");
|
||||
pref("font.name.sans-serif.x-baltic", "Droid Sans");
|
||||
pref("font.name.monospace.x-baltic", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.x-central-euro", "Droid Serif");
|
||||
pref("font.name.sans-serif.x-central-euro", "Droid Sans");
|
||||
pref("font.name.monospace.x-central-euro", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.x-cyrillic", "Droid Serif");
|
||||
pref("font.name.sans-serif.x-cyrillic", "Droid Sans");
|
||||
pref("font.name.monospace.x-cyrillic", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.x-unicode", "Droid Serif");
|
||||
pref("font.name.sans-serif.x-unicode", "Droid Sans");
|
||||
pref("font.name.monospace.x-unicode", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.x-user-def", "Droid Serif");
|
||||
pref("font.name.sans-serif.x-user-def", "Droid Sans");
|
||||
pref("font.name.monospace.x-user-def", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.x-western", "Droid Serif");
|
||||
pref("font.name.sans-serif.x-western", "Droid Sans");
|
||||
pref("font.name.monospace.x-western", "Droid Sans Mono");
|
||||
|
||||
pref("font.name.serif.zh-CN", "Droid Serif");
|
||||
pref("font.name.sans-serif.zh-CN", "Droid Sans");
|
||||
pref("font.name.monospace.zh-CN", "Droid Sans Mono");
|
||||
|
||||
// ming_uni.ttf (HKSCS-2001)
|
||||
// http://www.info.gov.hk/digital21/eng/hkscs/download/uime.exe
|
||||
pref("font.name.serif.zh-HK", "Droid Serif");
|
||||
pref("font.name.sans-serif.zh-HK", "Droid Sans");
|
||||
pref("font.name.monospace.zh-HK", "Droid Sans Mono");
|
||||
|
||||
// zh-TW
|
||||
|
||||
pref("font.default.ar", "sans-serif");
|
||||
pref("font.size.variable.ar", 16);
|
||||
pref("font.size.fixed.ar", 12);
|
||||
|
||||
pref("font.default.el", "sans-serif");
|
||||
pref("font.size.variable.el", 16);
|
||||
pref("font.size.fixed.el", 12);
|
||||
|
||||
pref("font.default.he", "sans-serif");
|
||||
pref("font.size.variable.he", 16);
|
||||
pref("font.size.fixed.he", 12);
|
||||
|
||||
pref("font.default.ja", "sans-serif");
|
||||
pref("font.size.variable.ja", 16);
|
||||
pref("font.size.fixed.ja", 16);
|
||||
|
||||
pref("font.default.ko", "sans-serif");
|
||||
pref("font.size.variable.ko", 16);
|
||||
pref("font.size.fixed.ko", 16);
|
||||
|
||||
pref("font.default.th", "serif");
|
||||
pref("font.size.variable.th", 16);
|
||||
pref("font.size.fixed.th", 13);
|
||||
pref("font.minimum-size.th", 13);
|
||||
|
||||
pref("font.default.tr", "sans-serif");
|
||||
pref("font.size.variable.tr", 16);
|
||||
pref("font.size.fixed.tr", 12);
|
||||
|
||||
pref("font.default.x-baltic", "sans-serif");
|
||||
pref("font.size.variable.x-baltic", 16);
|
||||
pref("font.size.fixed.x-baltic", 12);
|
||||
|
||||
pref("font.default.x-central-euro", "sans-serif");
|
||||
pref("font.size.variable.x-central-euro", 16);
|
||||
pref("font.size.fixed.x-central-euro", 12);
|
||||
|
||||
pref("font.default.x-cyrillic", "sans-serif");
|
||||
pref("font.size.variable.x-cyrillic", 16);
|
||||
pref("font.size.fixed.x-cyrillic", 12);
|
||||
|
||||
pref("font.default.x-unicode", "sans-serif");
|
||||
pref("font.size.variable.x-unicode", 16);
|
||||
pref("font.size.fixed.x-unicode", 12);
|
||||
|
||||
pref("font.default.x-user-def", "sans-serif");
|
||||
pref("font.size.variable.x-user-def", 16);
|
||||
pref("font.size.fixed.x-user-def", 12);
|
||||
|
||||
pref("font.default.x-western", "sans-serif");
|
||||
pref("font.size.variable.x-western", 16);
|
||||
pref("font.size.fixed.x-western", 12);
|
||||
|
||||
pref("font.default.zh-CN", "sans-serif");
|
||||
pref("font.size.variable.zh-CN", 16);
|
||||
pref("font.size.fixed.zh-CN", 16);
|
||||
|
||||
pref("font.default.zh-TW", "sans-serif");
|
||||
pref("font.size.variable.zh-TW", 16);
|
||||
pref("font.size.fixed.zh-TW", 16);
|
||||
|
||||
pref("font.default.zh-HK", "sans-serif");
|
||||
pref("font.size.variable.zh-HK", 16);
|
||||
pref("font.size.fixed.zh-HK", 16);
|
||||
|
||||
pref("font.default.x-devanagari", "serif");
|
||||
pref("font.size.variable.x-devanagari", 16);
|
||||
pref("font.size.fixed.x-devanagari", 13);
|
||||
|
||||
pref("font.default.x-tamil", "serif");
|
||||
pref("font.size.variable.x-tamil", 16);
|
||||
pref("font.size.fixed.x-tamil", 13);
|
||||
|
||||
pref("font.default.x-armn", "serif");
|
||||
pref("font.size.variable.x-armn", 16);
|
||||
pref("font.size.fixed.x-armn", 13);
|
||||
|
||||
pref("font.default.x-beng", "serif");
|
||||
pref("font.size.variable.x-beng", 16);
|
||||
pref("font.size.fixed.x-beng", 13);
|
||||
|
||||
pref("font.default.x-cans", "serif");
|
||||
pref("font.size.variable.x-cans", 16);
|
||||
pref("font.size.fixed.x-cans", 13);
|
||||
|
||||
pref("font.default.x-ethi", "serif");
|
||||
pref("font.size.variable.x-ethi", 16);
|
||||
pref("font.size.fixed.x-ethi", 13);
|
||||
|
||||
pref("font.default.x-geor", "serif");
|
||||
pref("font.size.variable.x-geor", 16);
|
||||
pref("font.size.fixed.x-geor", 13);
|
||||
|
||||
pref("font.default.x-gujr", "serif");
|
||||
pref("font.size.variable.x-gujr", 16);
|
||||
pref("font.size.fixed.x-gujr", 13);
|
||||
|
||||
pref("font.default.x-guru", "serif");
|
||||
pref("font.size.variable.x-guru", 16);
|
||||
pref("font.size.fixed.x-guru", 13);
|
||||
|
||||
pref("font.default.x-khmr", "serif");
|
||||
pref("font.size.variable.x-khmr", 16);
|
||||
pref("font.size.fixed.x-khmr", 13);
|
||||
|
||||
pref("font.default.x-mlym", "serif");
|
||||
pref("font.size.variable.x-mlym", 16);
|
||||
pref("font.size.fixed.x-mlym", 13);
|
||||
|
||||
pref("font.default.x-orya", "serif");
|
||||
pref("font.size.variable.x-orya", 16);
|
||||
pref("font.size.fixed.x-orya", 13);
|
||||
|
||||
pref("font.default.x-telu", "serif");
|
||||
pref("font.size.variable.x-telu", 16);
|
||||
pref("font.size.fixed.x-telu", 13);
|
||||
|
||||
pref("font.default.x-knda", "serif");
|
||||
pref("font.size.variable.x-knda", 16);
|
||||
pref("font.size.fixed.x-knda", 13);
|
||||
|
||||
pref("font.default.x-sinh", "serif");
|
||||
pref("font.size.variable.x-sinh", 16);
|
||||
pref("font.size.fixed.x-sinh", 13);
|
||||
|
||||
pref("font.default.x-tibt", "serif");
|
||||
pref("font.size.variable.x-tibt", 16);
|
||||
pref("font.size.fixed.x-tibt", 13);
|
||||
|
||||
/* PostScript print module prefs */
|
||||
// pref("print.postscript.enabled", true);
|
||||
pref("print.postscript.paper_size", "letter");
|
||||
pref("print.postscript.orientation", "portrait");
|
||||
pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
|
||||
|
||||
// Setting default_level_parent to true makes the default level for popup
|
||||
// windows "top" instead of "parent". On GTK2 platform, this is implemented
|
||||
// with override-redirect windows which is the normal way to implement
|
||||
// temporary popup windows. Setting this to false would make the default
|
||||
// level "parent" which is implemented with managed windows.
|
||||
// A problem with using managed windows is that metacity sometimes deactivates
|
||||
// the parent window when the managed popup is shown.
|
||||
pref("ui.panel.default_level_parent", true);
|
||||
|
||||
pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
|
||||
|
||||
# ANDROID
|
||||
#endif
|
||||
|
||||
#ifndef ANDROID
|
||||
#ifndef XP_MACOSX
|
||||
#ifdef XP_UNIX
|
||||
// Handled differently under Mac/Windows
|
||||
|
|
@ -2714,13 +2991,15 @@ pref("print.postscript.paper_size", "letter");
|
|||
pref("print.postscript.orientation", "portrait");
|
||||
pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
|
||||
|
||||
// Setting default_level_parent to true makes the default level for popup
|
||||
// windows "top" instead of "parent". On GTK2 platform, this is implemented
|
||||
// with override-redirect windows which is the normal way to implement
|
||||
// temporary popup windows. Setting this to false would make the default
|
||||
// level "parent" which is implemented with managed windows.
|
||||
// A problem with using managed windows is that metacity sometimes deactivates
|
||||
// the parent window when the managed popup is shown.
|
||||
// On GTK2 platform, we should use topmost window level for the default window
|
||||
// level of <panel> element of XUL. GTK2 has only two window types. One is
|
||||
// normal top level window, other is popup window. The popup window is always
|
||||
// topmost window level, therefore, we are using normal top level window for
|
||||
// non-topmost panel, but it is pretty hacky. On some Window Managers, we have
|
||||
// 2 problems:
|
||||
// 1. The non-topmost panel steals focus from its parent window at showing.
|
||||
// 2. The parent of non-topmost panel is not activated when the panel is hidden.
|
||||
// So, we have no reasons we should use non-toplevel window for popup.
|
||||
pref("ui.panel.default_level_parent", true);
|
||||
|
||||
pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
|
||||
|
|
@ -2728,6 +3007,7 @@ pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
|
|||
# XP_UNIX
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if OS_ARCH==OpenVMS
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче