Remove fine grain color settings. Always use the system theme colors in

2003-05-19  David Bordoley  <bordoley@msu.edu>

	* data/epiphany.schemas.in:
	* data/glade/prefs-dialog.glade:
	* embed/ephy-embed-prefs.h:
	* embed/mozilla/default-prefs.js:
	* embed/mozilla/mozilla-notifiers.cpp: (conversion_table []):
	* src/prefs-dialog.c: (properties []):

	Remove fine grain color settings. Always use the system theme
	colors in the case where a page doesn't set it own colors.

2 files changed, 1 insertions, 340 deletions

diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 3bc3acb12..ccce5152d 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -72,50 +72,6 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/epiphany/rendering/background_color</key>
-        <applyto>/apps/epiphany/rendering/background_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#FFFFFF</default>
-        <locale name="C">
-        <short>Default page background color</short>
-        <long>Default page background color in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/rendering/text_color</key>
-        <applyto>/apps/epiphany/rendering/text_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#000000</default>
-        <locale name="C">
-        <short>Default page text color</short>
-        <long>Default page text color in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/rendering/visited_link_color</key>
-        <applyto>/apps/epiphany/rendering/visited_link_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#FF0000</default>
-        <locale name="C">
-        <short>Default visited link color</short>
-        <long>Default color for visited links in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/rendering/unvisited_link_color</key>
-        <applyto>/apps/epiphany/rendering/unvisited_link_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#0000FF</default>
-        <locale name="C">
-        <short>Default unvisited link color</short>
-        <long>Default color for unvisited links in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
         <key>/schemas/apps/epiphany/rendering/underline_links</key>
         <applyto>/apps/epiphany/rendering/underline_links</applyto>
         <owner>epiphany</owner>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index d6392065f..e5a695f15 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -1333,126 +1333,10 @@
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox163">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="background_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the background color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1250">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Background</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">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</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="hbox165">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="text_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the text color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1251">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Text</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>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</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="GtkCheckButton" id="use_syscolors_checkbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Use s_ystem colors</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="GtkCheckButton" id="use_colors_checkbutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Al_ways use these colors</property>
+				  <property name="label" translatable="yes">Al_ways use the desktop theme colors</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
@@ -1486,185 +1370,6 @@
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox176">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label1280">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Links&lt;/b&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</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>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox166">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label1281">
-			      <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.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox177">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox167">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="unvisited_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the unvisited link color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1249">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Unvisited link</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">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox168">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="visited_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the visited link color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1248">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Visited link</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>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <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>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <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>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>