diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/epiphany.schemas.in | 77 | ||||
| -rw-r--r-- | data/glade/prefs-dialog.glade | 517 |
2 files changed, 153 insertions, 441 deletions
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index 7626161f9..b613144fe 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -35,25 +35,6 @@ </locale> </schema> <schema> - <key>/schemas/apps/epiphany/dialogs/preferences_font_language</key> - <applyto>/apps/epiphany/dialogs/preferences_font_language</applyto> - <owner>epiphany</owner> - <type>string</type> - <locale name="C"> - <default>x-western</default> - <short>The currently selected fonts language</short> - <long> - The currently selected fonts language. Valid values are "ar" (arabic), - "x-baltic" (baltic languages), "x-central-euro" (central european languages), - "x-cyrillic" (languages written with cyrillic alphabet), "el" (greek), - "he" (hebrew), "ja" (japanese), "ko" (korean), "zh-CN" (simplified chinese), - "th" (thai), "zh-TW" (traditional chinese), "tr" (turkish), "x-unicode" (other - languages), "x-western" (languages written in latin script), "x-tamil" (tamil) - and "x-devanagari" (devanagari). - </long> - </locale> - </schema> - <schema> <key>/schemas/apps/epiphany/web/use_own_colors</key> <applyto>/apps/epiphany/web/use_own_colors</applyto> <owner>epiphany</owner> @@ -78,6 +59,52 @@ </locale> </schema> <schema> + <key>/schemas/apps/epiphany/web/use_desktop_fonts</key> + <applyto>/apps/epiphany/web/use_desktop_fonts</applyto> + <owner>epiphany</owner> + <type>bool</type> + <default>true</default> + <locale name="C"> + <short>Use desktop fonts</short> + <long>Use "Desktop Font" and "Terminal Font" for variable and + fixed width fonts.</long> + </locale> + </schema> + <schema> + <key>/schemas/apps/epiphany/web/fixed_width_font</key> + <applyto>/apps/epiphany/web/fixed_width_font</applyto> + <owner>epiphany</owner> + <type>string</type> + <default>Monospace 10</default> + <locale name="C"> + <short>Fixed width font</short> + <long>Name of the fixed width font.</long> + </locale> + </schema> + <schema> + <key>/schemas/apps/epiphany/web/variable_width_font</key> + <applyto>/apps/epiphany/web/variable_width_font</applyto> + <owner>epiphany</owner> + <type>string</type> + <default>Sans 10</default> + <locale name="C"> + <short>Variable width font</short> + <long>Name of the variable width font.</long> + </locale> + </schema> + <schema> + <key>/schemas/apps/epiphany/web/minimum_font_size</key> + <applyto>/apps/epiphany/web/minimum_font_size</applyto> + <owner>epiphany</owner> + <type>int</type> + <default>6</default> + <locale name="C"> + <short>Minimum font size</short> + <long>The minum size of fonts, even if specified differently + by the web page author.</long> + </locale> + </schema> + <schema> <key>/schemas/apps/epiphany/general/ask_download_dest</key> <applyto>/apps/epiphany/general/ask_download_dest</applyto> <owner>epiphany</owner> @@ -173,18 +200,6 @@ </locale> </schema> <schema> - <key>/schemas/apps/epiphany/web/default_font_type</key> - <applyto>/apps/epiphany/web/default_font_type</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>serif</default> - <locale name="C"> - <short>Default font type</short> - <long>Default font type. Possible values are "serif" and "sans-serif". - </long> - </locale> - </schema> - <schema> <key>/schemas/apps/epiphany/dialogs/downloader_show_details</key> <applyto>/apps/epiphany/dialogs/downloader_show_details</applyto> <owner>epiphany</owner> diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index 44e0e5498..52a9a86a8 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -495,307 +495,116 @@ </child> <child> - <widget class="GtkTable" id="table70"> + <widget class="GtkVBox" id="vbox195"> <property name="visible">True</property> - <property name="n_rows">7</property> - <property name="n_columns">4</property> <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1132"> - <property name="visible">True</property> - <property name="label" translatable="yes">Siz_e:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">fixed_size_spinbutton</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkSpinButton" id="fixed_size_spinbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">1 0 100 1 10 10</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1131"> - <property name="visible">True</property> - <property name="label" translatable="yes">Si_ze:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">variable_size_spinbutton</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <property name="spacing">6</property> <child> - <widget class="GtkSpinButton" id="variable_size_spinbutton"> + <widget class="GtkCheckButton" id="use_desktop_fonts_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">False</property> - <property name="update_policy">GTK_UPDATE_ALWAYS</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">False</property> - <property name="adjustment">0 0 100 1 10 10</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1133"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Proportional:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">proportional_optionmenu</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1134"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Serif:</property> + <property name="label" translatable="yes">_Use desktop fonts</property> <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">combo-entry1</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1135"> - <property name="visible">True</property> - <property name="label" translatable="yes">S_ans serif:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">combo-entry2</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1138"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Monospace:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">combo-entry5</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1121"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Language:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">fonts_language_optionmenu</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkOptionMenu" id="fonts_language_optionmenu"> + <widget class="GtkHBox" id="hbox181"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">-1</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> - <child internal-child="menu"> - <widget class="GtkMenu" id="menu2"> + <child> + <widget class="GtkLabel" id="variable_width_label"> <property name="visible">True</property> + <property name="label" translatable="yes">_Variable width:</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">variable_width_fontpicker</property> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkOptionMenu" id="proportional_optionmenu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">0</property> <child> - <widget class="GtkMenu" id="menu3"> - - <child> - <widget class="GtkMenuItem" id="serif1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Serif</property> - <property name="use_underline">True</property> - </widget> - </child> - - <child> - <widget class="GtkMenuItem" id="sans_serif1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sans Serif</property> - <property name="use_underline">True</property> - </widget> - </child> + <widget class="GnomeFontPicker" id="variable_width_fontpicker"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property> + <property name="show_size">True</property> + <property name="use_font_in_label">False</property> + <property name="label_font_size">14</property> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> </widget> <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"></property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox133"> + <widget class="GtkHBox" id="hbox182"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">12</property> <child> - <widget class="GtkCheckButton" id="use_fonts_checkbutton"> + <widget class="GtkLabel" id="fixed_width_label"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Always use _these fonts</property> + <property name="label" translatable="yes">_Fixed width:</property> <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="mnemonic_widget">fixed_width_fontpicker</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GnomeFontPicker" id="fixed_width_fontpicker"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property> + <property name="show_size">True</property> + <property name="use_font_in_label">False</property> + <property name="label_font_size">14</property> </widget> <packing> <property name="padding">0</property> @@ -803,11 +612,24 @@ <property name="fill">True</property> </packing> </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox183"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label1217"> + <widget class="GtkLabel" id="minimum_size_label"> <property name="visible">True</property> - <property name="label" translatable="yes">Min_imum font size:</property> + <property name="label" translatable="yes">_Minimum size:</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -817,7 +639,6 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">min_size_spinbutton</property> </widget> <packing> <property name="padding">0</property> @@ -827,7 +648,7 @@ </child> <child> - <widget class="GtkSpinButton" id="min_size_spinbutton"> + <widget class="GtkSpinButton" id="spinbutton1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="climb_rate">1</property> @@ -836,162 +657,38 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">0 0 100 1 10 10</property> + <property name="adjustment">1 0 100 1 10 10</property> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> </packing> </child> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">4</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkCombo" id="serif_combo"> - <property name="visible">True</property> - <property name="value_in_list">False</property> - <property name="allow_empty">True</property> - <property name="case_sensitive">False</property> - <property name="enable_arrow_keys">True</property> - <property name="enable_arrows_always">False</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="combo-entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - </widget> - </child> - - <child internal-child="list"> - <widget class="GtkList" id="combo-list1"> - <property name="visible">True</property> - <property name="selection_mode">GTK_SELECTION_BROWSE</property> - </widget> - </child> - </widget> - <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"></property> - </packing> - </child> - - <child> - <widget class="GtkCombo" id="sansserif_combo"> - <property name="visible">True</property> - <property name="value_in_list">False</property> - <property name="allow_empty">True</property> - <property name="case_sensitive">False</property> - <property name="enable_arrow_keys">True</property> - <property name="enable_arrows_always">False</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="combo-entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - </widget> - </child> - - <child internal-child="list"> - <widget class="GtkList" id="combo-list2"> - <property name="visible">True</property> - <property name="selection_mode">GTK_SELECTION_BROWSE</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCombo" id="monospace_combo"> - <property name="visible">True</property> - <property name="value_in_list">False</property> - <property name="allow_empty">True</property> - <property name="case_sensitive">False</property> - <property name="enable_arrow_keys">True</property> - <property name="enable_arrows_always">False</property> - - <child internal-child="entry"> - <widget class="GtkEntry" id="combo-entry5"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - </widget> - </child> - - <child internal-child="list"> - <widget class="GtkList" id="combo-list5"> - <property name="visible">True</property> - <property name="selection_mode">GTK_SELECTION_BROWSE</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <widget class="GtkLabel" id="label1275"> + <widget class="GtkCheckButton" id="use_fonts_checkbutton"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Always use these fonts</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> |