summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--data/epiphany.schemas.in44
-rw-r--r--data/glade/prefs-dialog.glade297
-rw-r--r--embed/ephy-embed-prefs.h5
-rw-r--r--embed/mozilla/default-prefs.js3
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp5
-rw-r--r--src/prefs-dialog.c10
7 files changed, 16 insertions, 360 deletions
diff --git a/ChangeLog b/ChangeLog
index f7f9071b9..d7352439c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
2003-05-18 Marco Pesenti Gritti <marco@it.gnome.org>
* Makefile.am:
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>
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 4582a15a5..3ced536ee 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -10,12 +10,7 @@
#define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/rendering/font_min_size"
#define CONF_RENDERING_LANGUAGE "/apps/epiphany/rendering/lang"
#define CONF_RENDERING_USE_OWN_COLORS "/apps/epiphany/rendering/use_own_colors"
-#define CONF_RENDERING_USE_SYSTEM_COLORS "/apps/epiphany/rendering/use_system_colors"
#define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany/rendering/use_own_fonts"
-#define CONF_RENDERING_BG_COLOR "/apps/epiphany/rendering/background_color"
-#define CONF_RENDERING_TEXT_COLOR "/apps/epiphany/rendering/text_color"
-#define CONF_RENDERING_VISITED_LINKS "/apps/epiphany/rendering/visited_link_color"
-#define CONF_RENDERING_UNVISITED_LINKS "/apps/epiphany/rendering/unvisited_link_color"
#define CONF_RENDERING_UNDERLINE_LINKS "/apps/epiphany/rendering/underline_links"
#define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany/security/allow_popups"
#define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany/security/java_enabled"
diff --git a/embed/mozilla/default-prefs.js b/embed/mozilla/default-prefs.js
index c1ac9deed..be5a185c5 100644
--- a/embed/mozilla/default-prefs.js
+++ b/embed/mozilla/default-prefs.js
@@ -22,3 +22,6 @@ user_pref("network.dir.generate_html", true);
user_pref("security.warn_entering_secure", false);
user_pref("security.warn_leaving_secure", false);
user_pref("security.warn_submit_insecure", false);
+
+// Always use the system colors if a page doesn't specify its own.
+user_pref("browser.display.use_system_colors", true);
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index d9cc51689..0ef4b18d0 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -138,10 +138,6 @@ conversion_table [] =
{
{ CONF_SECURITY_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
{ CONF_SECURITY_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
- { CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
- { CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
- { CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
- { CONF_RENDERING_VISITED_LINKS, STRING_PREF, "browser.visited_color"},
{ CONF_RENDERING_UNDERLINE_LINKS, BOOL_PREF, "browser.underline_anchors"},
{ CONF_NETWORK_PROXY_AUTO_URL, STRING_PREF, "network.proxy.autoconfig_url"},
{ CONF_NETWORK_HTTP_PROXY, STRING_PREF, "network.proxy.http"},
@@ -157,7 +153,6 @@ conversion_table [] =
{ CONF_NETWORK_DISK_CACHE, INT_PREF, "browser.cache.disk.capacity"},
{ CONF_NETWORK_CACHE_COMPARE, INT_PREF, "browser.cache.check_doc_frequency"},
{ CONF_SECURITY_COOKIES_ACCEPT, BOOL_PREF, "network.cookie.warnAboutCookies"},
- { CONF_RENDERING_USE_SYSTEM_COLORS, BOOL_PREF, "browser.display.use_system_colors"},
{ NULL, 0, NULL }
};
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 8171093dd..dbff591f9 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -208,11 +208,6 @@ enum
VARIABLE_SIZE_PROP,
MIN_SIZE_PROP,
PROPORTIONAL_PROP,
- BACKGROUND_PROP,
- TEXT_PROP,
- UNVISITED_PROP,
- VISITED_PROP,
- USE_SYSCOLORS_PROP,
USE_COLORS_PROP,
USE_FONTS_PROP,
@@ -250,11 +245,6 @@ EphyDialogProperty properties [] =
{ VARIABLE_SIZE_PROP, "variable_size_spinbutton", NULL, PT_NORMAL, NULL },
{ MIN_SIZE_PROP, "min_size_spinbutton", NULL, PT_NORMAL, NULL },
{ PROPORTIONAL_PROP, "proportional_optionmenu", CONF_RENDERING_DEFAULT_FONT, PT_AUTOAPPLY, NULL },
- { BACKGROUND_PROP, "background_cpick", CONF_RENDERING_BG_COLOR, PT_AUTOAPPLY, NULL },
- { TEXT_PROP, "text_cpick", CONF_RENDERING_TEXT_COLOR, PT_AUTOAPPLY, NULL },
- { UNVISITED_PROP, "unvisited_cpick", CONF_RENDERING_UNVISITED_LINKS, PT_AUTOAPPLY, NULL },
- { VISITED_PROP, "visited_cpick", CONF_RENDERING_VISITED_LINKS, PT_AUTOAPPLY, NULL },
- { USE_SYSCOLORS_PROP, "use_syscolors_checkbutton", CONF_RENDERING_USE_SYSTEM_COLORS, PT_AUTOAPPLY, NULL },
{ USE_COLORS_PROP, "use_colors_checkbutton", CONF_RENDERING_USE_OWN_COLORS, PT_AUTOAPPLY, NULL },
{ USE_FONTS_PROP, "use_fonts_checkbutton", CONF_RENDERING_USE_OWN_FONTS, PT_AUTOAPPLY, NULL },
View Lorry Controller Status