From 4015281028a036ee859360bb7feb3a6aeb8f56cb Mon Sep 17 00:00:00 2001
From: Diego Escalante Urrelo <descalante@igalia.com>
Date: Tue, 7 Dec 2010 19:51:11 +0100
Subject: prefs-dialog: new custom font selection UI

Allow users to set custom sans, serif and monospace fonts if they don't want
the defaults, which are the desktop wide settings in the
org.gnome.desktop.interface schema.

Bug #636761
---
 data/glade/prefs-dialog.ui             | 86 ++++++++++++++++++++++++++++++++--
 data/org.gnome.epiphany.gschema.xml.in | 20 ++++++++
 2 files changed, 102 insertions(+), 4 deletions(-)

(limited to 'data')

diff --git a/data/glade/prefs-dialog.ui b/data/glade/prefs-dialog.ui
index e2c385731..b98558566 100644
--- a/data/glade/prefs-dialog.ui
+++ b/data/glade/prefs-dialog.ui
@@ -272,7 +272,7 @@
                       <object class="GtkLabel" id="label1312">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Minimum size:</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>
@@ -300,6 +300,84 @@
                     <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>
+                        <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="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" id="custom_fonts_vbox">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</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="position">0</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="position">1</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="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </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">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkCheckButton" id="use_fonts_checkbutton">
                     <property name="label" translatable="yes">Let web pages specify their own _fonts</property>
@@ -312,7 +390,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
@@ -327,7 +405,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
@@ -376,7 +454,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">4</property>
+                    <property name="position">5</property>
                   </packing>
                 </child>
               </object>
diff --git a/data/org.gnome.epiphany.gschema.xml.in b/data/org.gnome.epiphany.gschema.xml.in
index 587a5ebcb..eb7a1fe2d 100644
--- a/data/org.gnome.epiphany.gschema.xml.in
+++ b/data/org.gnome.epiphany.gschema.xml.in
@@ -92,6 +92,26 @@
 			<default>7</default>
 			<summary>Minimum font size</summary>
 		</key>
+		<key type="b" name="use-gnome-fonts">
+			<default>true</default>
+			<summary>Use GNOME fonts</summary>
+			<description>Use GNOME desktop wide font configuration.</description>
+		</key>
+		<key type="s" name="sans-serif-font">
+			<default>'Sans 10'</default>
+			<summary>Custom sans-serif font</summary>
+			<description>A value to be used to override sans-serif desktop font when use-gnome-fonts is set.</description>
+		</key>
+		<key type="s" name="serif-font">
+			<default>'Serif 10'</default>
+			<summary>Custom serif font</summary>
+			<description>A value to be used to override serif desktop font when use-gnome-fonts is set.</description>
+		</key>
+		<key type="s" name="monospace-font">
+			<default>'Monospace 10'</default>
+			<summary>Custom monospace font</summary>
+			<description>A value to be used to override monospace desktop font when use-gnome-fonts is set.</description>
+		</key>
 		<key type="b" name="use-own-colors">
 			<default>false</default>
 			<summary>Use own colors</summary>
-- 
cgit v1.2.3