From 2507de9eae5d185af79d6425178ac571c4f48a75 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 2 Jul 2003 09:09:26 +0000 Subject: Use the browser icon from gnome icon theme. Get rid of cache comparing 2003-07-02 Marco Pesenti Gritti * data/art/Makefile.am: * data/art/epiphany.png: * data/epiphany.desktop.in: * data/epiphany.schemas.in: * data/glade/prefs-dialog.glade: * embed/mozilla/mozilla-notifiers.cpp: * lib/ephy-dialog.c: (ephy_dialog_set_size_group): * lib/ephy-dialog.h: * src/ephy-main.c: (main): * src/prefs-dialog.c: (prefs_dialog_init), (prefs_homepage_blank_button_clicked_cb), (fill_language_editor): * src/window-commands.c: (window_cmd_help_about): Use the browser icon from gnome icon theme. Get rid of cache comparing prefs and rehash prefs pages to make them more specific. --- data/art/Makefile.am | 2 +- data/art/epiphany.png | Bin 3539 -> 0 bytes data/epiphany.desktop.in | 2 +- data/epiphany.schemas.in | 12 - data/glade/prefs-dialog.glade | 548 +++++++++++++++++++++--------------------- 5 files changed, 274 insertions(+), 290 deletions(-) delete mode 100644 data/art/epiphany.png (limited to 'data') diff --git a/data/art/Makefile.am b/data/art/Makefile.am index 755ec912b..bfd94661d 100644 --- a/data/art/Makefile.am +++ b/data/art/Makefile.am @@ -12,7 +12,7 @@ art_DATA = \ epiphany-bookmarks.png \ epiphany-tab-loading.gif -appicon_DATA = epiphany.png epiphany-bookmarks.png +appicon_DATA = epiphany-bookmarks.png appicondir = $(datadir)/pixmaps artdir = $(pkgdatadir)/art diff --git a/data/art/epiphany.png b/data/art/epiphany.png deleted file mode 100644 index 82869dc80..000000000 Binary files a/data/art/epiphany.png and /dev/null differ diff --git a/data/epiphany.desktop.in b/data/epiphany.desktop.in index e0fe8c546..649ea2189 100644 --- a/data/epiphany.desktop.in +++ b/data/epiphany.desktop.in @@ -5,7 +5,7 @@ Exec=epiphany %U StartupNotify=true Terminal=0 Type=Application -Icon=epiphany.png +Icon=web-browser.png X-GNOME-DocPath= X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=epiphany diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index 6bd35aebb..cfa5565ae 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -203,18 +203,6 @@ Size of disk cache, in MB. - - /schemas/apps/epiphany/web/cache_compare - /apps/epiphany/web/cache_compare - epiphany - string - automatic - - When to compare cached copy - When to compare cached copy to web copy. Possible values are - once per session, every time, never, automatic. - - /schemas/apps/epiphany/web/language /apps/epiphany/web/language diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index f92f54b5d..c492247dc 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -1431,38 +1431,6 @@ True - - - False - True - - - - - - True - Security - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - 12 - True - False - 18 @@ -1530,102 +1498,6 @@ False 6 - - - True - Compare page: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - Once per _session - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - True - True - - - - - - True - True - E_very time - True - GTK_RELIEF_NORMAL - False - False - True - cache_compare_radiobutton - - - 0 - True - True - - - - - - True - True - _Never - True - GTK_RELIEF_NORMAL - False - False - True - cache_compare_radiobutton - - - 0 - True - True - - - - - - True - True - _Automatically - True - GTK_RELIEF_NORMAL - False - False - True - cache_compare_radiobutton - - - 0 - True - True - - - True @@ -1760,10 +1632,42 @@ 0 - False - False + True + True + + + False + True + + + + + + True + Privacy + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 12 + True + False + 18 @@ -1774,7 +1678,7 @@ True - <b>Language</b> + <b>Encodings</b> True True GTK_JUSTIFY_LEFT @@ -1820,177 +1724,269 @@ - + True - 3 - 3 False - 6 - 12 - - - - True - Autodetec_t encoding: - True - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - auto_encoding_optionmenu - - - 0 - 1 - 0 - 1 - fill - - - + 6 - + True - _Default encoding: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - default_encoding_optionmenu - - - 0 - 1 - 1 - 2 - fill - - - + False + 12 - - - True - _Language: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - language_optionmenu - - - 0 - 1 - 2 - 3 - fill - - - + + + True + _Default: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + default_encoding_optionmenu + + + 0 + False + False + + - - - True - True - -1 + + + True + True + -1 + + + 0 + True + True + + - 1 - 2 - 2 - 3 - fill - + 0 + True + True - + True - True - -1 - - - 1 - 2 - 1 - 2 - fill - - - + False + 12 - - - True - True - -1 + + + True + Autodetec_t: + True + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + auto_encoding_optionmenu + + + 0 + False + False + + - - + + True + True + -1 + + + + True + + + + 0 + True + True + - 1 - 2 - 0 - 1 - + 0 + True + True + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + True + + - - - True - True - True - Mo_re... - True - GTK_RELIEF_NORMAL - - - - 2 - 3 - 2 - 3 - - - + + + True + False + 6 + + + + True + <b>Languages</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 + True + + + + + + True + False + 12 - + True - gtk-select-font - 6 - 0.5 - 0.5 - 0 - 0 + False + 6 + + + + True + False + 12 + + + + True + _Language: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + language_optionmenu + + + 0 + False + False + + + + + + True + True + -1 + + + 0 + True + True + + + + + + True + True + True + Mo_re... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + 0 + True + True + + - 2 - 3 - 0 - 2 - fill + 0 + True + True @@ -2003,8 +1999,8 @@ 0 - True - True + False + False @@ -2024,7 +2020,7 @@ True - Advanced + Language False False GTK_JUSTIFY_LEFT -- cgit v1.2.3