From afa1d5df9f208dc554cdb3ede0ab07f85be96650 Mon Sep 17 00:00:00 2001 From: David Bordoley Date: Mon, 19 May 2003 12:41:52 +0000 Subject: Remove fine grain color settings. Always use the system theme colors in 2003-05-19 David Bordoley * 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. --- ChangeLog | 12 ++ data/epiphany.schemas.in | 44 ------ data/glade/prefs-dialog.glade | 297 +----------------------------------- embed/ephy-embed-prefs.h | 5 - embed/mozilla/default-prefs.js | 3 + embed/mozilla/mozilla-notifiers.cpp | 5 - src/prefs-dialog.c | 10 -- 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 + + * 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 * 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 @@ -71,50 +71,6 @@ requests. - - /schemas/apps/epiphany/rendering/background_color - /apps/epiphany/rendering/background_color - epiphany - string - #FFFFFF - - Default page background color - Default page background color in #RRGGBB hex format. - - - - /schemas/apps/epiphany/rendering/text_color - /apps/epiphany/rendering/text_color - epiphany - string - #000000 - - Default page text color - Default page text color in #RRGGBB hex format. - - - - /schemas/apps/epiphany/rendering/visited_link_color - /apps/epiphany/rendering/visited_link_color - epiphany - string - #FF0000 - - Default visited link color - Default color for visited links in #RRGGBB hex format. - - - - /schemas/apps/epiphany/rendering/unvisited_link_color - /apps/epiphany/rendering/unvisited_link_color - epiphany - string - #0000FF - - Default unvisited link color - Default color for unvisited links in #RRGGBB hex format. - - /schemas/apps/epiphany/rendering/underline_links /apps/epiphany/rendering/underline_links 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 @@ -1332,127 +1332,11 @@ False 6 - - - True - False - 6 - - - - True - True - True - False - Pick the background color - - - 0 - False - False - - - - - - True - _Background - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - True - True - False - Pick the text color - - - 0 - False - False - - - - - - True - _Text - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - True - Use s_ystem colors - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - True True - Al_ways use these colors + Al_ways use the desktop theme colors True GTK_RELIEF_NORMAL False @@ -1486,185 +1370,6 @@ True - - - - True - False - 6 - - - - True - <b>Links</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - True - False - Pick the unvisited link color - - - 0 - False - False - - - - - - True - _Unvisited link - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - True - True - False - Pick the visited link color - - - 0 - False - False - - - - - - True - _Visited link - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - 0 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 }, -- cgit v1.2.3