From 391bbbee851c7e90e28322cf48a9277cc7aab883 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 9 Sep 2003 20:16:23 +0000 Subject: First important step in solving the fonts mess. Allow to select the 2003-09-09 Marco Pesenti Gritti * data/default-prefs.js: * data/glade/prefs-dialog.glade: * embed/ephy-embed-single.c: (ephy_embed_single_get_font_list): * embed/ephy-embed-single.h: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-notifiers.cpp: * src/prefs-dialog.c: (setup_font_menu), (attach_fonts_signals), (setup_size_controls), (setup_fonts), (prefs_dialog_init): First important step in solving the fonts mess. Allow to select the variable width instead of families. Also use points instead of pixels. Set a minimum font size by default. --- data/default-prefs.js | 3 + data/glade/prefs-dialog.glade | 633 +++++++++++++++--------------------------- 2 files changed, 222 insertions(+), 414 deletions(-) (limited to 'data') diff --git a/data/default-prefs.js b/data/default-prefs.js index ceba11b0f..e225055a1 100644 --- a/data/default-prefs.js +++ b/data/default-prefs.js @@ -36,3 +36,6 @@ pref("keyword.enabled", true); pref("security.warn_entering_secure", false); pref("security.warn_leaving_secure", false); pref("security.warn_submit_insecure", false); + +// fonts +pref("font.size.unit", "pt"); diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index 44e0e5498..ec6224ce2 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -495,319 +495,199 @@ - + True - 7 - 4 False - 6 - 12 + 18 - + True - Siz_e: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - fixed_size_spinbutton - - - 2 - 3 - 4 - 5 - fill - - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - - - 3 - 4 - 4 - 5 - - - - - - - - True - Si_ze: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - variable_size_spinbutton - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 10 - - - 3 - 4 - 1 - 2 - fill - - - - - - - True - _Proportional: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proportional_optionmenu - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _Serif: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - combo-entry1 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - S_ans serif: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - combo-entry2 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - _Monospace: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - combo-entry5 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - _Language: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - fonts_language_optionmenu - - - 0 - 1 - 0 - 1 - fill - - - + 4 + 3 + False + 6 + 12 - - - True - True - -1 + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 2 + 3 + 2 + 3 + + + + - - + + True + _Variable width: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + combo-entry1 + + 0 + 1 + 1 + 2 + fill + + - - - 1 - 2 - 0 - 1 - fill - - - - - - True - True - 0 + + + True + _Fixed width: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + combo-entry5 + + + 0 + 1 + 2 + 3 + fill + + + - + + True + For _Language: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + fonts_language_optionmenu + + + 0 + 1 + 0 + 1 + fill + + + - - + + + True + False + True + False + True + False + + + True - Serif - True + True + False + True + 0 + + True + * + False - - + + True - Sans Serif - True + GTK_SELECTION_BROWSE + + 1 + 2 + 1 + 2 + + - - - 1 - 2 - 1 - 2 - - - - - - - True - False - 12 - + True - True - Always use _these fonts - True - GTK_RELIEF_NORMAL - False - False - True + False + True + False + True + False + + + + True + True + False + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + - 0 - True - True + 1 + 2 + 2 + 3 + True - Min_imum font size: + Min_imum size: True False GTK_JUSTIFY_LEFT @@ -820,14 +700,17 @@ min_size_spinbutton - 0 - False - False + 0 + 1 + 3 + 4 + fill + - + True True 1 @@ -839,159 +722,81 @@ 0 0 100 1 10 10 - 0 - False - True + 2 + 3 + 1 + 2 + + - - - 0 - 4 - 6 - 7 - fill - - - - - True - False - True - False - True - False - - - - True - True - False - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - - 1 - 2 - 2 - 3 - - - - - - - True - False - True - False - True - False - - - + + True True - False - True - 0 - - True - * - False - - + -1 - - - True - GTK_SELECTION_BROWSE + + + True + + + + 1 + 3 + 0 + 1 + fill + + - - - 1 - 2 - 3 - 4 - - - - - - True - False - True - False - True - False - - - + + True True - False - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + 2 + 3 + 3 + 4 + + + - 1 - 2 - 4 - 5 - + 0 + True + True - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 + True + Always use _these fonts + True + GTK_RELIEF_NORMAL + False + False + True - 0 - 1 - 5 - 6 - fill - + 0 + False + False -- cgit v1.2.3