diff options
| -rw-r--r-- | ChangeLog | 46 | ||||
| -rw-r--r-- | data/epiphany.schemas.in | 32 | ||||
| -rw-r--r-- | data/glade/prefs-dialog.glade | 8 |
3 files changed, 74 insertions, 12 deletions
@@ -1,3 +1,49 @@ +2003-05-28 Christian Persch <chpe@cvs.gnome.org> + + The "s/charset/encoding/" mega patch :) + + * *, */*, */*/*: + + s/charset/encoding/ + + * embed/mozilla/mozilla-embed-single.c: (impl_get_charsets), + (impl_get_language_groups), (control_charsets_list), + (mozilla_embed_single_init), (fill_charset_lists): + * embed/ephy-embed-single.h: + * embed/ephy-embed-single.c: + + Sort the returned list of charsets resp. language groups according + to the localised strings in the current locale. Allow for underscore + eliding to be able to use the list in both menus (underscore -> accel) + and in the prefs option menu (no accels). + + * lib/ephy-string.h: + * lib/ephy-string.c: (ephy_str_elide_underscores): + + New helper function for eliding underscores. + + * lib/ephy-langs.h: + * lib/ephy-langs.c: + + A few more common lang/encoding related defines and struct, as well + as helper functions to free them in one go. + + * embed/ephy-embed-utils.h: + * embed/ephy-embed-utils.c: (ephy_embed_utils_build_charsets_submenu): + * src/ephy-encoding-menu.c: (ephy_encoding_menu_verb_cb), + (build_group), (build_charset), (ephy_encoding_menu_rebuild): + * src/ephy-nautilus-view.c: (gnv_cmd_set_charset): + * src/prefs-dialog.c: (prefs_dialog_init), + (default_charset_menu_changed_cb), (find_charset_in_list_cmp), + (create_default_charset_menu), (prefs_dialog_finalize): + + Show the list of charsets and language groups sorted in the current + locale. + + * data/epiphany.schemas.in: + + Document the possible charset values. + 2003-05-28 Marco Pesenti Gritti <marco@it.gnome.org> * configure.in: diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in index dd07a1819..a50684d32 100644 --- a/data/epiphany.schemas.in +++ b/data/epiphany.schemas.in @@ -137,14 +137,30 @@ </locale> </schema> <schema> - <key>/schemas/apps/epiphany/rendering/default_charset</key> - <applyto>/apps/epiphany/rendering/default_charset</applyto> + <key>/schemas/apps/epiphany/rendering/default_encoding</key> + <applyto>/apps/epiphany/rendering/default_encoding</applyto> <owner>epiphany</owner> <type>string</type> - <default>Western (ISO-8859-1)</default> - <locale name="C"> - <short>Default charset</short> - <long>Default charset.</long> + <default>ISO-8859-1</default> + <locale name="C"> + <short>Default encoding</short> + <long>Default encoding. Accepted values are: armscii-8, Big5, + Big5-HKSCS, EUC-JP, EUC-KR, gb18030, GB2312, geostd8, HZ-GB-2312, + IBM850, IBM852, IBM855, IBM857, IBM862, IBM864, IBM864i, IBM866, + ISO-2022-CN, ISO-2022-JP, ISO-2022-KR, ISO-8859-1, ISO-8859-10, + ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16, ISO-8859-2, + ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-6-E, + ISO-8859-6-I, ISO-8859-7, ISO-8859-8, ISO-8859-8-E, ISO-8859-8-I, + ISO-8859-9, ISO-IR-111, KOI8-R, KOI8-U, Shift_JIS, T.61-8bit, TIS-620, + us-ascii, UTF-16BE, UTF-16LE, UTF-32BE, UTF-32LE, UTF-7, UTF-8, VISCII, + windows-1250, windows-1251, windows-1252, windows-1253, windows-1254, + windows-1255, windows-1256, windows-1257, windows-1258, windows-936, + x-euc-tw, x-gbk, x-imap4-modified-utf7, x-johab, x-mac-arabic, x-mac-ce, + x-mac-croatian, x-mac-cyrillic, x-mac-devanagari, x-mac-farsi, + x-mac-greek, x-mac-gujarati, x-mac-gurmukhi, x-mac-hebrew, + x-mac-icelandic, x-mac-roman, x-mac-romanian, x-mac-turkish, + x-mac-ukrainian, x-u-escaped, x-user-defined, x-viet-tcvn5712, + x-viet-vps and x-windows-949.</long> </locale> </schema> <schema> @@ -398,8 +414,8 @@ </locale> </schema> <schema> - <key>/schemas/apps/epiphany/rendering/autodetect_charset</key> - <applyto>/apps/epiphany/rendering/autodetect_charset</applyto> + <key>/schemas/apps/epiphany/rendering/autodetect_encoding</key> + <applyto>/apps/epiphany/rendering/autodetect_encoding</applyto> <owner>epiphany</owner> <type>int</type> <default>0</default> diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade index 3d9b7abd9..c4bd6a2e9 100644 --- a/data/glade/prefs-dialog.glade +++ b/data/glade/prefs-dialog.glade @@ -2039,7 +2039,7 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">autocharset_optionmenu</property> + <property name="mnemonic_widget">auto_encoding_optionmenu</property> </widget> <packing> <property name="left_attach">0</property> @@ -2064,7 +2064,7 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">default_charset_optionmenu</property> + <property name="mnemonic_widget">default_encoding_optionmenu</property> </widget> <packing> <property name="left_attach">0</property> @@ -2118,7 +2118,7 @@ </child> <child> - <widget class="GtkOptionMenu" id="default_charset_optionmenu"> + <widget class="GtkOptionMenu" id="default_encoding_optionmenu"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="history">-1</property> @@ -2134,7 +2134,7 @@ </child> <child> - <widget class="GtkOptionMenu" id="autocharset_optionmenu"> + <widget class="GtkOptionMenu" id="auto_encoding_optionmenu"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="history">0</property> |