diff options
| -rw-r--r-- | data/glade/prefs-dialog.ui | 267 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 2 |
2 files changed, 188 insertions, 81 deletions
diff --git a/data/glade/prefs-dialog.ui b/data/glade/prefs-dialog.ui index 9ede1b745..9a4455091 100644 --- a/data/glade/prefs-dialog.ui +++ b/data/glade/prefs-dialog.ui @@ -267,54 +267,15 @@ <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkHBox" id="hbox177"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label1312"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Minimum font size:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">min_size_spinbutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="min_size_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="use_gnome_fonts_checkbutton"> - <property name="label" translatable="yes">_Use system fonts</property> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Fonts</b></property> + <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> @@ -327,42 +288,158 @@ <property name="visible">True</property> <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="custom_fonts_vbox"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkFontButton" id="sans_fontbutton"> + <object class="GtkHBox" id="hbox177"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_font">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label1312"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Minimum font size:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">min_size_spinbutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="min_size_spinbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="adjustment">adjustment1</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkFontButton" id="serif_fontbutton"> + <object class="GtkCheckButton" id="use_gnome_fonts_checkbutton"> + <property name="label" translatable="yes">_Use system fonts</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="font_name">Serif 12</property> - <property name="use_font">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> + <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkFontButton" id="mono_fontbutton"> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="font_name">Monospace 12</property> - <property name="use_font">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkTable" id="custom_fonts_table"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkFontButton" id="sans_fontbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_font">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkFontButton" id="serif_fontbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="font_name">Serif 12</property> + <property name="use_font">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkFontButton" id="mono_fontbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="font_name">Monospace 12</property> + <property name="use_font">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sans serif font:</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Serif font:</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Monospace font:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + </object> + </child> </object> <packing> + <property name="expand">False</property> <property name="position">2</property> </packing> </child> @@ -377,21 +454,19 @@ </object> <packing> <property name="expand">False</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="css_container"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="spacing">24</property> + <property name="orientation">vertical</property> <child> - <object class="GtkCheckButton" id="css_checkbox"> - <property name="label" translatable="yes">Use custom _stylesheet</property> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Style</b></property> + <property name="use_markup">True</property> </object> <packing> <property name="expand">False</property> @@ -400,33 +475,64 @@ </packing> </child> <child> - <object class="GtkHButtonBox" id="css_edit_box"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="layout_style">end</property> + <property name="left_padding">12</property> <child> - <object class="GtkButton" id="css_edit_button"> - <property name="label" translatable="yes">_Edit Stylesheet…</property> + <object class="GtkHBox" id="css_container"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="spacing">24</property> + <child> + <object class="GtkCheckButton" id="css_checkbox"> + <property name="label" translatable="yes">Use custom _stylesheet</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="css_edit_box"> + <property name="visible">True</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="css_edit_button"> + <property name="label" translatable="yes">_Edit Stylesheet…</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> </child> </object> <packing> + <property name="expand">False</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="position">5</property> + <property name="position">1</property> </packing> </child> </object> @@ -738,6 +844,7 @@ <property name="climb_rate">1</property> </object> <packing> + <property name="expand">False</property> <property name="position">0</property> </packing> </child> diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 2dd2ea2bc..74637a365 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -1061,7 +1061,7 @@ static const PrefsDialogPreference preferences[] = G_SETTINGS_BIND_GET, NULL, NULL }, /* Font buttons */ - { "custom_fonts_vbox", "sensitive", + { "custom_fonts_table", "sensitive", EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_USE_GNOME_FONTS, G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN, NULL, NULL }, |