From 6c9fa09f48640516cdb899fc853c0f27ddadef53 Mon Sep 17 00:00:00 2001 From: "amardare%qnx.com" Date: Thu, 26 Feb 2004 15:25:48 +0000 Subject: [PATCH] Before the unification was made, the js were executed in this order: all.js unix.js photon.js. Now the photon and xp_unix changed places. The photon section should be after the XP_UNIX section. r=bsmedberg sr=darin git-svn-id: svn://10.0.0.236/trunk@153283 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libpref/src/init/all.js | 136 ++++++++++++------------ 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js index 5cdff0164ac..d7dc66ef267 100644 --- a/mozilla/modules/libpref/src/init/all.js +++ b/mozilla/modules/libpref/src/init/all.js @@ -1422,74 +1422,6 @@ pref("browser.download.dir", "/boot/home/Downloads"); # BeOS #endif -#if MOZ_WIDGET_TOOLKIT==photon - -// font names -pref("font.name.serif.x-western", "serif"); -pref("font.name.sans-serif.x-western", "sans-serif"); -pref("font.name.monospace.x-western", "monospace"); -pref("font.name.cursive.x-western", "cursive"); -pref("font.name.fantasy.x-western", "fantasy"); - -pref("font.name.serif.el", "serif"); -pref("font.name.sans-serif.el", "sans-serif"); -pref("font.name.monospace.el", "monospace"); - -pref("font.name.serif.he", "serif"); -pref("font.name.sans-serif.he", "sans-serif"); -pref("font.name.monospace.he", "monospace"); - -pref("font.name.serif.ja", "serif"); -pref("font.name.sans-serif.ja", "sans-serif"); -pref("font.name.monospace.ja", "monospace"); - -pref("font.name.serif.ko", "serif"); -pref("font.name.sans-serif.ko", "sans-serif"); -pref("font.name.monospace.ko", "monospace"); - -pref("font.name.serif.tr", "serif"); -pref("font.name.sans-serif.tr", "sans-serif"); -pref("font.name.monospace.tr", "monospace"); - -pref("font.name.serif.x-baltic", "serif"); -pref("font.name.sans-serif.x-baltic", "sans-serif"); -pref("font.name.monospace.x-baltic", "monospace"); - -pref("font.name.serif.x-central-euro", "serif"); -pref("font.name.sans-serif.x-central-euro", "sans-serif"); -pref("font.name.monospace.x-central-euro", "monospace"); - -pref("font.name.serif.x-cyrillic", "serif"); -pref("font.name.sans-serif.x-cyrillic", "sans-serif"); -pref("font.name.monospace.x-cyrillic", "monospace"); - -pref("font.name.serif.x-unicode", "serif"); -pref("font.name.sans-serif.x-unicode", "sans-serif"); -pref("font.name.monospace.x-unicode", "monospace"); - -pref("font.name.serif.x-user-def", "serif"); -pref("font.name.sans-serif.x-user-def", "sans-serif"); -pref("font.name.monospace.x-user-def", "monospace"); - -pref("font.name.serif.zh-CN", "serif"); -pref("font.name.sans-serif.zh-CN", "sans-serif"); -pref("font.name.monospace.zh-CN", "monospace"); - -pref("font.size.variable.x-western", 14); -pref("font.size.fixed.x-western", 12); - -pref("applications.telnet", "pterm telnet %h %p"); -pref("applications.tn3270", "pterm tn3270 %h"); -pref("applications.rlogin", "pterm rlogin %h"); -pref("applications.rlogin_with_user", "pterm rlogin %h -l %u"); - -// 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", 90); // twips (90 twips is an eigth of an inch) - -# photon -#endif - #ifndef XP_MACOSX #ifdef XP_UNIX // Handled differently under Mac/Windows @@ -1832,6 +1764,74 @@ pref("print.postscript.nativefont.zh-HK", ""); #endif #endif +#if MOZ_WIDGET_TOOLKIT==photon + +// font names +pref("font.name.serif.x-western", "serif"); +pref("font.name.sans-serif.x-western", "sans-serif"); +pref("font.name.monospace.x-western", "monospace"); +pref("font.name.cursive.x-western", "cursive"); +pref("font.name.fantasy.x-western", "fantasy"); + +pref("font.name.serif.el", "serif"); +pref("font.name.sans-serif.el", "sans-serif"); +pref("font.name.monospace.el", "monospace"); + +pref("font.name.serif.he", "serif"); +pref("font.name.sans-serif.he", "sans-serif"); +pref("font.name.monospace.he", "monospace"); + +pref("font.name.serif.ja", "serif"); +pref("font.name.sans-serif.ja", "sans-serif"); +pref("font.name.monospace.ja", "monospace"); + +pref("font.name.serif.ko", "serif"); +pref("font.name.sans-serif.ko", "sans-serif"); +pref("font.name.monospace.ko", "monospace"); + +pref("font.name.serif.tr", "serif"); +pref("font.name.sans-serif.tr", "sans-serif"); +pref("font.name.monospace.tr", "monospace"); + +pref("font.name.serif.x-baltic", "serif"); +pref("font.name.sans-serif.x-baltic", "sans-serif"); +pref("font.name.monospace.x-baltic", "monospace"); + +pref("font.name.serif.x-central-euro", "serif"); +pref("font.name.sans-serif.x-central-euro", "sans-serif"); +pref("font.name.monospace.x-central-euro", "monospace"); + +pref("font.name.serif.x-cyrillic", "serif"); +pref("font.name.sans-serif.x-cyrillic", "sans-serif"); +pref("font.name.monospace.x-cyrillic", "monospace"); + +pref("font.name.serif.x-unicode", "serif"); +pref("font.name.sans-serif.x-unicode", "sans-serif"); +pref("font.name.monospace.x-unicode", "monospace"); + +pref("font.name.serif.x-user-def", "serif"); +pref("font.name.sans-serif.x-user-def", "sans-serif"); +pref("font.name.monospace.x-user-def", "monospace"); + +pref("font.name.serif.zh-CN", "serif"); +pref("font.name.sans-serif.zh-CN", "sans-serif"); +pref("font.name.monospace.zh-CN", "monospace"); + +pref("font.size.variable.x-western", 14); +pref("font.size.fixed.x-western", 12); + +pref("applications.telnet", "pterm telnet %h %p"); +pref("applications.tn3270", "pterm tn3270 %h"); +pref("applications.rlogin", "pterm rlogin %h"); +pref("applications.rlogin_with_user", "pterm rlogin %h -l %u"); + +// 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", 90); // twips (90 twips is an eigth of an inch) + +# photon +#endif + #if OS_ARCH==OpenVMS pref("mail.use_builtin_movemail", false);