diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | data/art/Makefile.am | 2 | ||||
| -rw-r--r-- | data/art/epiphany.png | bin | 3539 -> 0 bytes | |||
| -rw-r--r-- | data/epiphany.desktop.in | 2 | ||||
| -rw-r--r-- | data/epiphany.schemas.in | 12 | ||||
| -rw-r--r-- | data/glade/prefs-dialog.glade | 548 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-notifiers.cpp | 38 | ||||
| -rw-r--r-- | lib/ephy-dialog.c | 22 | ||||
| -rw-r--r-- | lib/ephy-dialog.h | 4 | ||||
| -rw-r--r-- | src/ephy-main.c | 22 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 49 | ||||
| -rw-r--r-- | src/window-commands.c | 33 |
12 files changed, 386 insertions, 365 deletions
@@ -1,3 +1,22 @@ +2003-07-02 Marco Pesenti Gritti <marco@it.gnome.org> + + * 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. + 2003-07-02 Christian Persch <chpe@cvs.gnome.org> * src/bookmarks/ephy-topic-action.c: (ephy_topic_action_sync_label), 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 Binary files differdeleted file mode 100644 index 82869dc80..000000000 --- a/data/art/epiphany.png +++ /dev/null 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 @@ -204,18 +204,6 @@ </locale> </schema> <schema> - <key>/schemas/apps/epiphany/web/cache_compare</key> - <applyto>/apps/epiphany/web/cache_compare</applyto> - <owner>epiphany</owner> - <type>string</type> - <default>automatic</default> - <locale name="C"> - <short>When to compare cached copy</short> - <long>When to compare cached copy to web copy. Possible values are - once per session, every time, never, automatic.</long> - </locale> - </schema> - <schema> <key>/schemas/apps/epiphany/web/language</key> <applyto>/apps/epiphany/web/language</applyto> <owner>epiphany</owner> 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 @@ <property name="fill">True</property> </packing> </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1285"> - <property name="visible">True</property> - <property name="label" translatable="yes">Security</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">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="network_page_box"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">18</property> <child> <widget class="GtkVBox" id="vbox162"> @@ -1531,102 +1499,6 @@ <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label1282"> - <property name="visible">True</property> - <property name="label" translatable="yes">Compare page:</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> - - <child> - <widget class="GtkRadioButton" id="cache_compare_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Once per _session</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">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton54"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">E_very time</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> - <property name="group">cache_compare_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton55"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Never</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> - <property name="group">cache_compare_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="radiobutton56"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Automatically</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> - <property name="group">cache_compare_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> <widget class="GtkHBox" id="hbox174"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -1760,10 +1632,42 @@ </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> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1285"> + <property name="visible">True</property> + <property name="label" translatable="yes">Privacy</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">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="network_page_box"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> <child> <widget class="GtkVBox" id="vbox156"> @@ -1774,7 +1678,7 @@ <child> <widget class="GtkLabel" id="label1242"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Language</b></property> + <property name="label" translatable="yes"><b>Encodings</b></property> <property name="use_underline">True</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -1820,177 +1724,269 @@ </child> <child> - <widget class="GtkTable" id="table85"> + <widget class="GtkVBox" id="vbox194"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">3</property> <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1205"> - <property name="visible">True</property> - <property name="label" translatable="yes">Autodetec_t encoding:</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> - <property name="mnemonic_widget">auto_encoding_optionmenu</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> + <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="label1206"> + <widget class="GtkHBox" id="hbox180"> <property name="visible">True</property> - <property name="label" translatable="yes">_Default encoding:</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">default_encoding_optionmenu</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> + <property name="homogeneous">False</property> + <property name="spacing">12</property> - <child> - <widget class="GtkLabel" id="label1208"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Language:</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> - <property name="mnemonic_widget">language_optionmenu</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="default_encoding_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Default:</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">default_encoding_optionmenu</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> - <child> - <widget class="GtkOptionMenu" id="language_optionmenu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">-1</property> + <child> + <widget class="GtkOptionMenu" id="default_encoding_optionmenu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="history">-1</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <widget class="GtkOptionMenu" id="default_encoding_optionmenu"> + <widget class="GtkHBox" id="hbox179"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">-1</property> - </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> + <property name="homogeneous">False</property> + <property name="spacing">12</property> - <child> - <widget class="GtkOptionMenu" id="auto_encoding_optionmenu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="history">-1</property> + <child> + <widget class="GtkLabel" id="auto_encoding_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Autodetec_t:</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> + <property name="mnemonic_widget">auto_encoding_optionmenu</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> - <child internal-child="menu"> - <widget class="GtkMenu" id="menu6"> + <child> + <widget class="GtkOptionMenu" id="auto_encoding_optionmenu"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="history">-1</property> + + <child internal-child="menu"> + <widget class="GtkMenu" id="menu6"> + <property name="visible">True</property> + </widget> + </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> </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="y_options"></property> + <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> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> - <child> - <widget class="GtkButton" id="language_more_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Mo_re...</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <signal name="clicked" handler="prefs_language_more_button_clicked_cb" last_modification_time="Tue, 14 May 2002 11:07:13 GMT"/> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkVBox" id="vbox191"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkLabel" id="label1298"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Languages</b></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="hbox176"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label1299"> + <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">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox192"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> <child> - <widget class="GtkImage" id="image3"> + <widget class="GtkVBox" id="vbox193"> <property name="visible">True</property> - <property name="stock">gtk-select-font</property> - <property name="icon_size">6</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="hbox178"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="language_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Language:</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> + <property name="mnemonic_widget">language_optionmenu</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkOptionMenu" id="language_optionmenu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="history">-1</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="language_more_button"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Mo_re...</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <signal name="clicked" handler="prefs_language_more_button_clicked_cb" last_modification_time="Tue, 14 May 2002 11:07:13 GMT"/> + </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> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">0</property> - <property name="bottom_attach">2</property> - <property name="y_options">fill</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -2003,8 +1999,8 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> @@ -2024,7 +2020,7 @@ <child> <widget class="GtkLabel" id="label1286"> <property name="visible">True</property> - <property name="label" translatable="yes">Advanced</property> + <property name="label" translatable="yes">Language</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index bf06296f8..81120997b 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -102,11 +102,6 @@ mozilla_cookies_accept_notifier (GConfClient *client, guint cnxn_id, GConfEntry *entry, char *pref); -static void -mozilla_cache_compare_notifier (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - char *pref); /* Keeps the list of the notifiers we installed for mozilla prefs */ /* to be able to remove them when exiting */ @@ -165,8 +160,6 @@ custom_notifiers [] = (GConfClientNotifyFunc) mozilla_proxy_autoconfig_notifier }, { CONF_NETWORK_CACHE_SIZE, (GConfClientNotifyFunc) mozilla_cache_size_notifier }, - { CONF_NETWORK_CACHE_COMPARE, - (GConfClientNotifyFunc) mozilla_cache_compare_notifier }, { CONF_SECURITY_COOKIES_ACCEPT, (GConfClientNotifyFunc) mozilla_cookies_accept_notifier }, @@ -308,37 +301,6 @@ mozilla_cookies_accept_notifier (GConfClient *client, } static void -mozilla_cache_compare_notifier (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - char *pref) -{ - const char *mode; - int mozilla_mode = 0; - - mode = gconf_value_get_string(entry->value); - - if (strcmp (mode, "once per session") == 0) - { - mozilla_mode = 0; - } - else if (strcmp (mode, "every time") == 0) - { - mozilla_mode = 1; - } - else if (strcmp (mode, "never") == 0) - { - mozilla_mode = 2; - } - else if (strcmp (mode, "automatic") == 0) - { - mozilla_mode = 3; - } - - mozilla_prefs_set_int ("browser.cache.check_doc_frequency", mozilla_mode); -} - -static void mozilla_font_notifier (GConfClient *client, guint cnxn_id, GConfEntry *entry, diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c index 2100eb1f6..aa5ed1a16 100644 --- a/lib/ephy-dialog.c +++ b/lib/ephy-dialog.c @@ -1283,3 +1283,25 @@ ephy_dialog_get_value (EphyDialog *dialog, return klass->get_value (dialog, property_id, value); } +void +ephy_dialog_set_size_group (EphyDialog *dialog, + int *controls_id, + guint n_controls) +{ + GtkSizeGroup *size_group; + int i; + + size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + for (i = 0; i < n_controls; i++) + { + GtkWidget *widget; + guint id; + + id = controls_id[i]; + widget = dialog->priv->props[id].widget; + g_return_if_fail (GTK_IS_WIDGET (widget)); + + gtk_size_group_add_widget (size_group, widget); + } +} diff --git a/lib/ephy-dialog.h b/lib/ephy-dialog.h index 0a6f16a2d..9bc054e6b 100644 --- a/lib/ephy-dialog.h +++ b/lib/ephy-dialog.h @@ -99,6 +99,10 @@ void ephy_dialog_add_enum (EphyDialog *dialog, guint n_items, const char **items); +void ephy_dialog_set_size_group (EphyDialog *dialog, + int *controls_id, + guint n_controls); + gint ephy_dialog_run (EphyDialog *dialog); void ephy_dialog_show (EphyDialog *dialog); diff --git a/src/ephy-main.c b/src/ephy-main.c index 787140248..97121fe97 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -29,6 +29,7 @@ #include <libbonoboui.h> #include <libgnome/gnome-program.h> #include <libgnomeui/gnome-ui-init.h> +#include <libgnomeui/gnome-icon-theme.h> #include <gtk/gtkwindow.h> #include <libgnomevfs/gnome-vfs-init.h> #include <glade/glade-init.h> @@ -145,17 +146,28 @@ main (int argc, char *argv[]) if (first_instance) { + GnomeIconTheme *icon_theme; + gnome_vfs_init (); glade_gnome_init (); ephy_shell_new (); - file = gnome_program_locate_file - (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, - "epiphany.png", TRUE, NULL); - gtk_window_set_default_icon_from_file (file, NULL); - g_free (file); + icon_theme = gnome_icon_theme_new (); + file = gnome_icon_theme_lookup_icon (icon_theme, "web-browser", + -1, NULL, NULL); + g_object_unref (icon_theme); + + if (file) + { + gtk_window_set_default_icon_from_file (file, NULL); + g_free (file); + } + else + { + g_warning ("Web browser gnome icon not found"); + } g_idle_add ((GSourceFunc) ephy_main_start, NULL); diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index b07df0fd3..763a2e395 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -167,13 +167,6 @@ char *cookies_accept_enum [] = static guint n_cookies_accept_enum = G_N_ELEMENTS (cookies_accept_enum); static const -char *cache_compare_enum [] = -{ - "once per session", "every time", "never", "automatic" -}; -static guint n_cache_compare_enum = G_N_ELEMENTS (cache_compare_enum); - -static const char *proportional_enum [] = { "serif", "sans-serif" @@ -231,18 +224,20 @@ enum USE_COLORS_PROP, USE_FONTS_PROP, - /* Security */ + /* Privacy */ ALLOW_POPUPS_PROP, ALLOW_JAVA_PROP, ALLOW_JS_PROP, ACCEPT_COOKIES_PROP, - - /* Advanced */ - CACHE_COMPARE_PROP, DISK_CACHE_PROP, + + /* Language */ AUTO_ENCODING_PROP, DEFAULT_ENCODING_PROP, LANGUAGE_PROP, + LANGUAGE_LABEL_PROP, + DEFAULT_ENCODING_LABEL_PROP, + AUTO_ENCODING_LABEL_PROP }; #define CONF_FONTS_FOR_LANGUAGE "/apps/epiphany/dialogs/preferences_font_language" @@ -269,22 +264,33 @@ EphyDialogProperty properties [] = { 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 }, - /* Security */ + /* Privacy */ { ALLOW_POPUPS_PROP, "popups_allow_checkbutton", CONF_SECURITY_ALLOW_POPUPS, PT_AUTOAPPLY, NULL }, { ALLOW_JAVA_PROP, "enable_java_checkbutton", CONF_SECURITY_JAVA_ENABLED, PT_AUTOAPPLY, NULL }, { ALLOW_JS_PROP, "enable_javascript_checkbutton", CONF_SECURITY_JAVASCRIPT_ENABLED, PT_AUTOAPPLY, NULL }, { ACCEPT_COOKIES_PROP, "cookies_radiobutton", CONF_SECURITY_COOKIES_ACCEPT, PT_AUTOAPPLY, NULL }, - - /* Advanced */ - { CACHE_COMPARE_PROP, "cache_compare_radiobutton", CONF_NETWORK_CACHE_COMPARE, PT_AUTOAPPLY, NULL }, { DISK_CACHE_PROP, "disk_cache_spin", CONF_NETWORK_CACHE_SIZE, PT_AUTOAPPLY, NULL }, + + /* Languages */ { AUTO_ENCODING_PROP, "auto_encoding_optionmenu", NULL, PT_NORMAL, NULL }, { DEFAULT_ENCODING_PROP, "default_encoding_optionmenu", NULL, PT_NORMAL, NULL }, { LANGUAGE_PROP, "language_optionmenu", NULL, PT_NORMAL, NULL }, + { LANGUAGE_LABEL_PROP, "language_label", NULL, PT_NORMAL, NULL }, + { DEFAULT_ENCODING_LABEL_PROP, "default_encoding_label", NULL, PT_NORMAL, NULL }, + { AUTO_ENCODING_LABEL_PROP, "auto_encoding_label", NULL, PT_NORMAL, NULL }, { -1, NULL, NULL } }; +static +int lang_size_group [] = +{ + LANGUAGE_LABEL_PROP, + DEFAULT_ENCODING_LABEL_PROP, + AUTO_ENCODING_LABEL_PROP +}; +static guint n_lang_size_group = G_N_ELEMENTS (lang_size_group); + typedef struct { gchar *name; @@ -1075,13 +1081,14 @@ prefs_dialog_init (PrefsDialog *pd) "prefs-dialog.glade", "prefs_dialog"); - ephy_dialog_add_enum (EPHY_DIALOG (pd), CACHE_COMPARE_PROP, - n_cache_compare_enum, cache_compare_enum); ephy_dialog_add_enum (EPHY_DIALOG (pd), ACCEPT_COOKIES_PROP, n_cookies_accept_enum, cookies_accept_enum); ephy_dialog_add_enum (EPHY_DIALOG (pd), PROPORTIONAL_PROP, n_proportional_enum, proportional_enum); + ephy_dialog_set_size_group (EPHY_DIALOG (pd), lang_size_group, + n_lang_size_group); + pd->priv->window = ephy_dialog_get_control (dialog, WINDOW_PROP); pd->priv->notebook = ephy_dialog_get_control (dialog, NOTEBOOK_PROP); pd->priv->langs = NULL; @@ -1108,8 +1115,6 @@ prefs_dialog_init (PrefsDialog *pd) create_language_menu (pd); } -/* Network page callbacks */ - void prefs_dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer data) { @@ -1175,7 +1180,7 @@ void prefs_homepage_blank_button_clicked_cb (GtkWidget *button, EphyDialog *dialog) { - set_homepage_entry (dialog, "about:blank"); + set_homepage_entry (dialog, ""); } static void @@ -1202,11 +1207,11 @@ fill_language_editor (LanguageEditor *le, PrefsDialog *dialog) { i = g_list_position (dialog->priv->langs, lang); li = (EphyLangItem *) lang->data; - + language_editor_add (le, li->name, i); } } - + g_slist_foreach (strings, (GFunc) g_free, NULL); g_slist_free (strings); } diff --git a/src/window-commands.c b/src/window-commands.c index 10e154293..d1a93099f 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -46,6 +46,7 @@ #include <bonobo/bonobo-i18n.h> #include <libgnomeui/gnome-about.h> #include <libgnomeui/gnome-stock-icons.h> +#include <libgnomeui/gnome-icon-theme.h> #include <libgnome/gnome-program.h> #include <gtk/gtkeditable.h> @@ -723,8 +724,9 @@ window_cmd_help_about (EggAction *action, static GtkWidget *about = NULL; GtkWidget** ptr; GdkPixbuf *icon; - const char *icon_path; + char *icon_path; GdkPixbuf *logo; + GnomeIconTheme *icon_theme; static gchar *authors[] = { "Marco Pesenti Gritti <mpeseng@tin.it>", @@ -750,10 +752,21 @@ window_cmd_help_about (EggAction *action, return; } - icon_path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, - "epiphany.png", TRUE, NULL); - logo = gdk_pixbuf_new_from_file (icon_path, NULL); - g_return_if_fail (logo != NULL); + icon_theme = gnome_icon_theme_new (); + icon_path = gnome_icon_theme_lookup_icon (icon_theme, "web-browser", + -1, NULL, NULL); + g_object_unref (icon_theme); + + if (icon_path) + { + logo = gdk_pixbuf_new_from_file (icon_path, NULL); + g_free (icon_path); + } + else + { + logo = NULL; + g_warning ("Web browser gnome icon not found"); + } about = gnome_about_new( "Epiphany", VERSION, @@ -768,11 +781,11 @@ window_cmd_help_about (EggAction *action, gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); - - icon = gtk_widget_render_icon (about, - GNOME_STOCK_ABOUT, - GTK_ICON_SIZE_MENU, - NULL); + + icon = gtk_widget_render_icon (about, + GNOME_STOCK_ABOUT, + GTK_ICON_SIZE_MENU, + NULL); gtk_window_set_icon (GTK_WINDOW (about), icon); g_object_unref(icon); |
