set sensitivity of font pickers based on share setting.

2003-04-09  Larry Ewing  <lewing@ximian.com>

	* mail-preferences.c 	(font_share_changed): set sensitivity of
	font pickers based on share setting.
	(mail_preferences_construct): initialize font prefs.
	(mail_preferences_apply): set the font prefs.
	(font_changed): add gnome-font-picker changed function.

	* mail-preferences.h: add font pref widgets.

	* mail-config.c (mail_config_init): add notify to on fonts dir.
	(config_write_fonts): write out a gtkrc that overrides the gtkhtml
	fonts settings based on the gconf keys.

	* mail-config.glade: move display font setttings to mail prefs.

	* evolution-mail.schemas: add font settings.

svn path=/trunk/; revision=20779

1 files changed, 171 insertions, 136 deletions

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index cfd7abd6f7..dce4679adb 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -3068,6 +3068,174 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 	  <property name="spacing">3</property>
 
 	  <child>
+	    <widget class="GtkFrame" id="frame3">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox161">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="radFontUseSame">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Use the same fonts as other applications</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="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkTable" id="tblScreen">
+		      <property name="border_width">4</property>
+		      <property name="visible">True</property>
+		      <property name="n_rows">2</property>
+		      <property name="n_columns">2</property>
+		      <property name="homogeneous">False</property>
+		      <property name="row_spacing">4</property>
+		      <property name="column_spacing">6</property>
+
+		      <child>
+			<widget class="GtkLabel" id="lblScreenVariable">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Standard Font:</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_RIGHT</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">radFontVariable</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>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GnomeFontPicker" id="radFontFixed">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="title" translatable="yes">Select HTML fixed width font</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>
+			  <signal name="font_set" handler="changed"/>
+			</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="x_options">fill</property>
+			  <property name="y_options"></property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GnomeFontPicker" id="radFontVariable">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="title" translatable="yes">Select HTML variable width font</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>
+			  <signal name="font_set" handler="changed"/>
+			</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="GtkLabel" id="label444">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Terminal Font:</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_RIGHT</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">radFontFixed</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>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label460">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Message Fonts</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.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
 	    <widget class="GtkFrame" id="frameMessageDisplay">
 	      <property name="visible">True</property>
 	      <property name="label_xalign">0</property>
@@ -3403,8 +3571,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 
@@ -5131,140 +5299,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
       <property name="spacing">4</property>
 
       <child>
-	<widget class="GtkFrame" id="frame3">
-	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	  <child>
-	    <widget class="GtkTable" id="tblScreen">
-	      <property name="border_width">4</property>
-	      <property name="visible">True</property>
-	      <property name="n_rows">2</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">4</property>
-	      <property name="column_spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="lblScreenVariable">
-		  <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_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">screen_variable</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>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label444">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Fixed-width:</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">screen_fixed</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="GnomeFontPicker" id="screen_fixed">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="title" translatable="yes">Select HTML fixed width font</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>
-		  <signal name="font_set" handler="changed"/>
-		</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="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GnomeFontPicker" id="screen_variable">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="title" translatable="yes">Select HTML variable width font</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>
-		  <signal name="font_set" handler="changed"/>
-		</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>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label460">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">On Screen fonts</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.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
+	<placeholder/>
       </child>
 
       <child>