Encodings menu improvements, part 3: Refactored the encodings list; it no

2003-10-13  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-embed-single.c: (ephy_embed_single_free_passwords):
	* embed/ephy-embed-single.h:
	* embed/ephy-embed-utils.c:
	(ephy_embed_utils_build_encodings_submenu):
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* lib/Makefile.am:
	* lib/ephy-encodings.c: (ephy_encoding_info_free),
	(encodings_info_cmp), (ephy_encodings_get_list):
	* lib/ephy-encodings.h:
	* lib/ephy-langs.c: (ephy_lang_group_info_free),
	(lang_group_info_cmp), (ephy_lang_get_group_list),
	(fonts_language_info_cmp), (ephy_font_langs_get_codes_list),
	(ephy_font_langs_get_list):
	* lib/ephy-langs.h:
	* po/POTFILES.in:
	* src/ephy-encoding-menu.c: (ephy_encoding_menu_set_window),
	(ephy_encoding_menu_rebuild):
	* src/prefs-dialog.c: (prefs_dialog_finalize),
	(get_current_language_code), (create_fonts_language_menu),
	(default_encoding_menu_changed_cb), (find_encoding_in_list_cmp),
	(create_default_encoding_menu):

	Encodings menu improvements, part 3: Refactored the encodings
	list; it no longer is neccessary to have it in the embed single.
	Ported all callers to new infrastructure.

5 files changed, 354 insertions, 52 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7caefb55d..64c469144 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,6 +35,7 @@ NOINST_H_FILES = \
 INST_H_FILES = \
 	ephy-dialog.h				\
 	ephy-langs.h				\
+	ephy-encodings.h			\
 	ephy-node.h				\
 	ephy-node-db.h				\
 	ephy-types.h
@@ -50,6 +51,7 @@ libephy_la_SOURCES = \
 	ephy-dialog.h				\
 	ephy-dnd.c				\
 	ephy-dnd.h				\
+	ephy-encodings.c			\
 	ephy-file-helpers.c			\
 	ephy-file-helpers.h			\
 	ephy-glade.c				\
diff --git a/lib/ephy-encodings.c b/lib/ephy-encodings.c
new file mode 100644
index 000000000..c02705c72
--- /dev/null
+++ b/lib/ephy-encodings.c
@@ -0,0 +1,183 @@
+/*
+ *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003 Christian Persch
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ephy-encodings.h"
+#include "ephy-string.h"
+#include <bonobo/bonobo-i18n.h>
+#include <string.h>
+
+/**
+ * translatable encodings titles
+ * NOTE: if you add /change encodings, please also update the schema file
+ * epiphany.schemas.in
+ */
+static const 
+struct
+{
+	char *title;
+	char *name;
+	EphyLanguageGroup group;
+}
+encodings[] =
+{ 
+	/* translators: access keys need only be unique within the same LG_group */
+	{ N_("Arabic (_IBM-864)"),                  "IBM864",                LG_ARABIC },
+	{ N_("Arabic (ISO-_8859-6)"),               "ISO-8859-6",            LG_ARABIC },
+	{ N_("Arabic (_MacArabic)"),                "x-mac-arabic",          LG_ARABIC },
+	{ N_("Arabic (_Windows-1256)"),             "windows-1256",          LG_ARABIC },
+	{ N_("Baltic (_ISO-8859-13)"),              "ISO-8859-13",           LG_BALTIC },
+	{ N_("Baltic (I_SO-8859-4)"),               "ISO-8859-4",            LG_BALTIC },
+	{ N_("Baltic (_Windows-1257)"),             "windows-1257",          LG_BALTIC },
+	{ N_("Central European (_IBM-852)"),        "IBM852",                LG_CENTRAL_EUROPEAN },
+	{ N_("Central European (I_SO-8859-2)"),     "ISO-8859-2",	     LG_CENTRAL_EUROPEAN },
+	{ N_("Central European (_MacCE)"),          "x-mac-ce",              LG_CENTRAL_EUROPEAN },
+	{ N_("Central European (_Windows-1250)"),   "windows-1250",          LG_CENTRAL_EUROPEAN },
+	{ N_("Croatian (Mac_Croatian)"),            "x-mac-croatian",        LG_CENTRAL_EUROPEAN },
+	{ N_("Chinese Simplified (_GB18030)"),      "gb18030",               LG_CHINESE },
+	{ N_("Chinese Simplified (G_B2312)"),       "GB2312",                LG_CHINESE },
+	{ N_("Chinese Simplified (GB_K)"),          "x-gbk",                 LG_CHINESE },
+	{ N_("Chinese Simplified (_HZ)"),           "HZ-GB-2312",	     LG_CHINESE },
+	{ N_("Chinese Simplified (_ISO-2022-CN)"),  "ISO-2022-CN",           LG_CHINESE },
+	{ N_("Chinese Traditional (Big_5)"),        "Big5",                  LG_CHINESE },
+	{ N_("Chinese Traditional (Big5-HK_SCS)"),  "Big5-HKSCS",	     LG_CHINESE },
+	{ N_("Chinese Traditional (_EUC-TW)"),      "x-euc-tw",              LG_CHINESE },
+	{ N_("Cyrillic (_IBM-855)"),                "IBM855",                LG_CYRILLIC },
+	{ N_("Cyrillic (I_SO-8859-5)"),             "ISO-8859-5",	     LG_CYRILLIC },
+	{ N_("Cyrillic (IS_O-IR-111)"),             "ISO-IR-111",	     LG_CYRILLIC },
+	{ N_("Cyrillic (_KOI8-R)"),                 "KOI8-R",                LG_CYRILLIC },
+	{ N_("Cyrillic (_MacCyrillic)"),            "x-mac-cyrillic",        LG_CYRILLIC },
+	{ N_("Cyrillic (_Windows-1251)"),           "windows-1251",          LG_CYRILLIC },
+	{ N_("Cyrillic/Russian (_CP-866)"),         "IBM866",                LG_CYRILLIC },
+	{ N_("Cyrillic/Ukrainian (_KOI8-U)"),       "KOI8-U",                LG_CYRILLIC },
+	{ N_("Cyrillic/Ukrainian (Mac_Ukrainian)"), "x-mac-ukrainian",       LG_CYRILLIC },
+	{ N_("Greek (_ISO-8859-7)"),                "ISO-8859-7",            LG_GREEK },
+	{ N_("Greek (_MacGreek)"),                  "x-mac-greek",           LG_GREEK },
+	{ N_("Greek (_Windows-1253)"),              "windows-1253",          LG_GREEK },
+	{ N_("Gujarati (_MacGujarati)"),            "x-mac-gujarati",        LG_INDIAN },
+	{ N_("Gurmukhi (Mac_Gurmukhi)"),            "x-mac-gurmukhi",        LG_INDIAN },
+	{ N_("Hindi (Mac_Devanagari)"),             "x-mac-devanagari",      LG_INDIAN },
+	{ N_("Hebrew (_IBM-862)"),                  "IBM862",                LG_HEBREW },
+	{ N_("Hebrew (IS_O-8859-8-I)"),             "ISO-8859-8-I",          LG_HEBREW },
+	{ N_("Hebrew (_MacHebrew)"),                "x-mac-hebrew",          LG_HEBREW },
+	{ N_("Hebrew (_Windows-1255)"),             "windows-1255",          LG_HEBREW },
+	{ N_("_Visual Hebrew (ISO-8859-8)"),        "ISO-8859-8",            LG_HEBREW },
+	{ N_("Japanese (_EUC-JP)"),                 "EUC-JP",                LG_JAPANESE },
+	{ N_("Japanese (_ISO-2022-JP)"),            "ISO-2022-JP",           LG_JAPANESE },
+	{ N_("Japanese (_Shift-JIS)"),              "Shift_JIS",             LG_JAPANESE },
+	{ N_("Korean (_EUC-KR)"),                   "EUC-KR",                LG_KOREAN },
+	{ N_("Korean (_ISO-2022-KR)"),              "ISO-2022-KR",           LG_KOREAN },
+	{ N_("Korean (_JOHAB)"),                    "x-johab",               LG_KOREAN },
+	{ N_("Korean (_UHC)"),                      "x-windows-949",         LG_KOREAN },
+	{ N_("Turkish (_IBM-857)"),                 "IBM857",                LG_TURKISH },
+	{ N_("Turkish (I_SO-8859-9)"),              "ISO-8859-9",            LG_TURKISH },
+	{ N_("Turkish (_MacTurkish)"),              "x-mac-turkish",         LG_TURKISH },
+	{ N_("Turkish (_Windows-1254)"),            "windows-1254",          LG_TURKISH },
+	{ N_("Unicode (UTF-_7)"),                   "UTF-7",                 LG_UNICODE },
+	{ N_("Unicode (UTF-_8)"),                   "UTF-8",                 LG_UNICODE },
+	{ N_("Vietnamese (_TCVN)"),                 "x-viet-tcvn5712",       LG_VIETNAMESE },
+	{ N_("Vietnamese (_VISCII)"),               "VISCII",                LG_VIETNAMESE },
+	{ N_("Vietnamese (V_PS)"),                  "x-viet-vps",            LG_VIETNAMESE },
+	{ N_("Vietnamese (_Windows-1258)"),         "windows-1258",          LG_VIETNAMESE },
+	{ N_("Western (_IBM-850)"),                 "IBM850",                LG_WESTERN },
+	{ N_("Western (I_SO-8859-1)"),              "ISO-8859-1",            LG_WESTERN },
+	{ N_("Western (IS_O-8859-15)"),             "ISO-8859-15",           LG_WESTERN },
+	{ N_("Western (_MacRoman)"),                "x-mac-roman",           LG_WESTERN },
+	{ N_("Western (_Windows-1252)"),            "windows-1252",          LG_WESTERN },
+	{ N_("_Armenian (ARMSCII-8)"),              "armscii-8",             LG_OTHER },
+	{ N_("_Celtic (ISO-8859-14)"),              "ISO-8859-14",           LG_OTHER },
+	{ N_("_Farsi (MacFarsi)"),                  "x-mac-farsi",           LG_OTHER },
+	{ N_("_Georgian (GEOSTD8)"),                "geostd8",               LG_OTHER },
+	{ N_("_Icelandic (MacIcelandic)"),          "x-mac-icelandic",       LG_OTHER },
+	{ N_("_Nordic (ISO-8859-10)"),              "ISO-8859-10",           LG_OTHER },
+	{ N_("_Romanian (MacRomanian)"),            "x-mac-romanian",        LG_OTHER },
+	{ N_("R_omanian (ISO-8859-16)"),            "ISO-8859-16",           LG_OTHER },
+	{ N_("South _European (ISO-8859-3)"),       "ISO-8859-3",            LG_OTHER },
+	{ N_("Thai (TIS-_620)"),                    "TIS-620",               LG_OTHER },
+#if MOZILLA_SNAPSHOT >= 10 
+	{ N_("Thai (IS_O-8859-11)"),                "iso-8859-11",           LG_OTHER },
+	{ N_("_Thai (Windows-874)"),                "windows-874",           LG_OTHER },
+#endif	
+	{ N_("_User Defined"),                      "x-user-defined",        LG_OTHER },
+};
+static const guint n_encodings = G_N_ELEMENTS (encodings);
+
+void
+ephy_encoding_info_free (EphyEncodingInfo *info)
+{
+	g_return_if_fail (info != NULL);
+
+	g_free (info->title);
+	g_free (info->key);
+	g_free (info->encoding);
+
+	g_free (info);
+}
+
+static int
+encodings_info_cmp (const EphyEncodingInfo *i1, const EphyEncodingInfo *i2)
+{
+	return strcmp (i1->key, i2->key);
+}
+
+GList *
+ephy_encodings_get_list (EphyLanguageGroup group, gboolean elide_underscores)
+{
+	GList *list = NULL;
+	guint i;
+
+	for (i = 0; i < n_encodings; i++)
+	{
+		if (group == LG_ALL || group == encodings[i].group)
+		{
+			EphyEncodingInfo *info;
+			char *elided = NULL;
+
+			info = g_new0 (EphyEncodingInfo, 1);
+
+			info->group = encodings[i].group;
+			info->encoding = g_strdup (encodings[i].name);
+
+			elided = ephy_string_elide_underscores (_(encodings[i].title));
+
+			/* collate without underscores */
+			info->key = g_utf8_collate_key (elided, -1);
+
+			if (elide_underscores)
+			{
+				info->title = elided;
+			}
+			else
+			{
+				g_free (elided);
+
+				info->title = g_strdup (_(encodings[i].title));
+			}
+
+			list = g_list_prepend (list, info);
+		}
+	}
+
+	return g_list_sort (list, (GCompareFunc) encodings_info_cmp);
+}
diff --git a/lib/ephy-encodings.h b/lib/ephy-encodings.h
new file mode 100644
index 000000000..59f14393e
--- /dev/null
+++ b/lib/ephy-encodings.h
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003 Christian Persch
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
+ */
+
+#ifndef EPHY_ENCODINGS_H
+#define EPHY_ENCODINGS_H
+
+#include <glib.h>
+#include "ephy-langs.h"
+
+G_BEGIN_DECLS
+
+typedef struct
+{
+	char *encoding;
+	EphyLanguageGroup group;
+	char *title;
+	char *key;
+} EphyEncodingInfo;
+
+GList	*ephy_encodings_get_list	(EphyLanguageGroup group,
+					 gboolean elide_underscores);
+
+void	 ephy_encoding_info_free	(EphyEncodingInfo *info);
+
+G_END_DECLS
+
+#endif
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index 55f339e3b..dee178846 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -14,38 +14,71 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include "ephy-langs.h"
+#include "ephy-string.h"
 #include <bonobo/bonobo-i18n.h>
+#include <string.h>
 
 static const FontsLanguageInfo font_languages[] =
 {
-	{ N_("Arabic"),			"ar" },
-	{ N_("Baltic"),			"x-baltic" },
-	{ N_("Central European"),	"x-central-euro" },
-	{ N_("Cyrillic"),		"x-cyrillic" },
-	{ N_("Devanagari"),		"x-devanagari" },
-	{ N_("Greek"),			"el" },
-	{ N_("Hebrew"),			"he" },
-	{ N_("Japanese"),		"ja" },
-	{ N_("Korean"),			"ko" },
-	{ N_("Simplified Chinese"),	"zh-CN" },
-	{ N_("Tamil"),			"x-tamil" },
-	{ N_("Thai"),			"th" },
-	{ N_("Traditional Chinese"),	"zh-TW" },
-	{ N_("Turkish"),		"tr" },
-	{ N_("Unicode"),		"x-unicode" },
-	{ N_("Western"),		"x-western" },
+	{ N_("Arabic"),					"ar" },
+	{ N_("Baltic"),					"x-baltic" },
+	{ N_("Central European"),			"x-central-euro" },
+	{ N_("Cyrillic"),				"x-cyrillic" },
+	{ N_("Devanagari"),				"x-devanagari" },
+	{ N_("Greek"),					"el" },
+	{ N_("Hebrew"),					"he" },
+	{ N_("Japanese"),				"ja" },
+	{ N_("Korean"),					"ko" },
+	{ N_("Simplified Chinese"),			"zh-CN" },
+	{ N_("Tamil"),					"x-tamil" },
+	{ N_("Thai"),					"th" },
+	{ N_("Traditional Chinese"),			"zh-TW" },
+#if MOZILLA_SNAPSHOT >= 11
+	{ N_("Traditional Chinese (Hong Kong)"),	"zh-HK" },
+#endif
+	{ N_("Turkish"),				"tr" },
+	{ N_("Unicode"),				"x-unicode" },
+	{ N_("Western"),				"x-western" }
 };
 static const guint n_font_languages = G_N_ELEMENTS (font_languages);
 
+static const
+struct
+{
+	EphyLanguageGroup group;
+	char *title;
+}
+lang_group_names[] =
+{
+        { LG_ARABIC,		N_("_Arabic")		},
+        { LG_BALTIC,		N_("_Baltic")		},
+        { LG_CENTRAL_EUROPEAN,	N_("Central _European") },
+        { LG_CHINESE,		N_("Chi_nese")		},
+        { LG_CYRILLIC,		N_("_Cyrillic")		},
+        { LG_GREEK,		N_("_Greek")		},
+        { LG_HEBREW,		N_("_Hebrew")		},
+        { LG_INDIAN,		N_("_Indian")		},
+        { LG_JAPANESE,		N_("_Japanese")		},
+        { LG_KOREAN,		N_("_Korean")		},
+        { LG_TURKISH,		N_("_Turkish")		},
+        { LG_UNICODE,		N_("_Unicode")		},
+        { LG_VIETNAMESE,	N_("_Vietnamese")	},
+        { LG_WESTERN,		N_("_Western")		},
+        { LG_OTHER,		N_("_Other")		}
+};
+static const guint n_lang_group_names = G_N_ELEMENTS (lang_group_names);
+
 void
-language_group_info_free (LanguageGroupInfo *info)
+ephy_lang_group_info_free (EphyLanguageGroupInfo *info)
 {
 	g_return_if_fail (info != NULL);
 
@@ -55,26 +88,75 @@ language_group_info_free (LanguageGroupInfo *info)
 	g_free (info);
 }
 
-void
-encoding_info_free (EncodingInfo *info)
+static gint
+lang_group_info_cmp (const EphyLanguageGroupInfo *i1, const EphyLanguageGroupInfo *i2)
 {
-	g_return_if_fail (info != NULL);
+	return strcmp (i1->key, i2->key);
+}
 
-	g_free (info->title);
-	g_free (info->key);
-	g_free (info->encoding);
+GList *
+ephy_lang_get_group_list (void)
+{
+	GList *list = NULL;
+	guint i;
 
-	g_free (info);
+	for (i = 0; i < n_lang_group_names; i++)
+	{
+		EphyLanguageGroupInfo *info;
+		char *elided = NULL;
+
+		info = g_new0 (EphyLanguageGroupInfo, 1);
+
+		info->title = g_strdup (_(lang_group_names[i].title));
+		info->group = lang_group_names[i].group;
+
+		/* collate without underscores */
+		elided = ephy_string_elide_underscores (info->title);
+		info->key = g_utf8_collate_key (elided, -1);
+		g_free (elided);
+
+		list = g_list_prepend (list, info);
+	}
+
+	return g_list_sort (list, (GCompareFunc) lang_group_info_cmp);
+}
+
+static int
+fonts_language_info_cmp (const FontsLanguageInfo *i1, const FontsLanguageInfo *i2)
+{
+	return g_utf8_collate (i1->title, i2->title);
 }
 
-guint
-ephy_langs_get_n_font_languages (void)
+GList *
+ephy_font_langs_get_codes_list (void)
 {
-	return n_font_languages;
+	guint i;
+	GList *list = NULL;
+
+	for (i=0; i < n_font_languages; i++)
+	{
+		list = g_list_prepend (list, font_languages[i].code);
+	}
+
+	return list;
 }
 
-const FontsLanguageInfo *
-ephy_langs_get_font_languages (void)
+GList *
+ephy_font_langs_get_list (void)
 {
-	return font_languages;
+	GList *list = NULL;
+	guint i;
+
+	for (i = 0; i < n_font_languages; i++)
+	{
+		FontsLanguageInfo *info;
+
+		info = g_new0 (FontsLanguageInfo, 1);
+		info->title = _(font_languages[i].title);
+		info->code = font_languages[i].code;
+
+		list = g_list_prepend (list, info);
+	}
+
+	return g_list_sort (list, (GCompareFunc) fonts_language_info_cmp);
 }
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index 274d5a8a7..c4007dd73 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -46,38 +46,28 @@ typedef enum
 	LG_WESTERN,
 	LG_OTHER,
 	LG_ALL
-} LanguageGroup;
+} EphyLanguageGroup;
 
 typedef struct
 {
-	gchar *title;
-	gchar *key;
-	LanguageGroup group;
-} LanguageGroupInfo;
+	EphyLanguageGroup group;
+	char *title;
+	char *key;
+} EphyLanguageGroupInfo;
 
 typedef struct
 {
-	gchar *title;
-	gchar *key;
-	gchar *encoding;
-	LanguageGroup group;
-} EncodingInfo;
-
-/* language encoding groups */
-typedef struct
-{
-	gchar *title;
-	gchar* code;
+	char *title;
+	char *code;
 } FontsLanguageInfo;
 
-guint			 ephy_langs_get_n_font_languages (void);
-
-const FontsLanguageInfo *ephy_langs_get_font_languages   (void);
+GList	*ephy_font_langs_get_list	(void);
 
-void			 language_group_info_free	 (LanguageGroupInfo *info);
+GList	*ephy_font_langs_get_codes_list	(void);
 
-void			 encoding_info_free		 (EncodingInfo *info);
+GList	*ephy_lang_get_group_list	(void);
 
+void	 ephy_lang_group_info_free	(EphyLanguageGroupInfo *info);
 
 G_END_DECLS