Encoding menu improvements, Part 4: The Rewrite.

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

	Encoding menu improvements, Part 4:
	The Rewrite.

	* data/glade/epiphany.glade:
	* data/ui/epiphany-ui.xml:
	* data/ui/nautilus-epiphany-view.xml.in:
	* embed/Makefile.am:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_init),
	(ephy_embed_shell_finalize), (ephy_embed_shell_new),
	(ephy_embed_shell_get_encodings):
	* embed/ephy-embed-shell.h:
	* embed/ephy-embed-utils.c: (ephy_embed_utils_save):
	* embed/ephy-embed-utils.h:
	* embed/ephy-embed.c: (ephy_embed_get_encoding_info):
	* embed/ephy-embed.h:
	* embed/ephy-encodings.c: (ephy_encodings_get_type),
	(ephy_encodings_finalize), (ephy_encodings_class_init),
	(ephy_encodings_get_node), (ephy_encodings_get_encodings),
	(ephy_encodings_get_detectors), (ephy_encodings_get_all),
	(ephy_encodings_get_categories), (ephy_encodings_add_recent),
	(ephy_encodings_get_recent), (ephy_encodings_init),
	(ephy_encoding_info_free), (ephy_encodings_new):
	* embed/ephy-encodings.h:
	* embed/mozilla/EphyWrapper.cpp:
	* embed/mozilla/EphyWrapper.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* lib/Makefile.am:
	* lib/ephy-encodings.c:
	* lib/ephy-encodings.h:
	* lib/ephy-langs.c: (ephy_font_languages), (ephy_font_n_languages):
	* lib/ephy-langs.h:
	* src/Makefile.am:
	* src/ephy-encoding-dialog.c: (ephy_encoding_dialog_get_type),
	(setup_filter), (sync_embed_cb), (sync_active_tab),
	(ephy_encoding_dialog_set_window), (activate_choice),
	(activate_automatic), (ephy_encoding_dialog_response_cb),
	(category_node_selected_cb), (view_node_selected_cb),
	(view_node_activated_cb), (ephy_encoding_dialog_init),
	(ephy_encoding_dialog_finalize),
	(ephy_encoding_dialog_set_property),
	(ephy_encoding_dialog_get_property),
	(ephy_encoding_dialog_class_init), (ephy_encoding_dialog_new):
	* src/ephy-encoding-dialog.h:
	* src/ephy-encoding-menu.c: (ephy_encoding_menu_init),
	(sort_encodings), (add_menu_item), (update_encoding_menu_cb),
	(encoding_activate_cb), (add_action),
	(ephy_encoding_menu_view_dialog_cb),
	(ephy_encoding_menu_automatic_cb), (ephy_encoding_menu_set_window),
	(ephy_encoding_menu_finalize), (ephy_encoding_menu_class_init),
	(ephy_encoding_menu_new):
	* src/ephy-nautilus-view.c: (gnv_bonobo_control_activate_cb),
	(gnv_cmd_select_encoding), (gnv_cmd_edit_find):
	* src/ephy-window.c: (ephy_window_set_active_tab),
	(setup_notebook), (ephy_window_set_property),
	(ephy_window_get_property), (ephy_window_class_init):
	* src/language-editor.h:
	* src/pdm-dialog.c: (setup_passwords_treeview),
	(setup_cookies_treeview):
	* src/prefs-dialog.c: (prefs_dialog_finalize),
	(get_current_language_code), (fonts_language_info_cmp),
	(create_fonts_language_menu), (find_encoding_in_list_cmp),
	(sort_encodings), (create_optionmenu), (prefs_dialog_init):

	Made encodings menu dynamic, containing recently used items + items
	related to the currently active encoding. Split encodings out as a
	embed shell service, port all users over to that. Harvest all encoding
	info we can get from mozilla.

1 files changed, 8 insertions, 107 deletions

diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index dee178846..5669253e0 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -23,11 +23,10 @@
 #endif
 
 #include "ephy-langs.h"
-#include "ephy-string.h"
+
 #include <bonobo/bonobo-i18n.h>
-#include <string.h>
 
-static const FontsLanguageInfo font_languages[] =
+static const EphyFontsLanguageInfo font_languages [] =
 {
 	{ N_("Arabic"),					"ar" },
 	{ N_("Baltic"),					"x-baltic" },
@@ -51,112 +50,14 @@ static const FontsLanguageInfo font_languages[] =
 };
 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
-ephy_lang_group_info_free (EphyLanguageGroupInfo *info)
-{
-	g_return_if_fail (info != NULL);
-
-	g_free (info->title);
-	g_free (info->key);
-
-	g_free (info);
-}
-
-static gint
-lang_group_info_cmp (const EphyLanguageGroupInfo *i1, const EphyLanguageGroupInfo *i2)
-{
-	return strcmp (i1->key, i2->key);
-}
-
-GList *
-ephy_lang_get_group_list (void)
-{
-	GList *list = NULL;
-	guint i;
-
-	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);
-}
-
-GList *
-ephy_font_langs_get_codes_list (void)
+const EphyFontsLanguageInfo *
+ephy_font_languages (void)
 {
-	guint i;
-	GList *list = NULL;
-
-	for (i=0; i < n_font_languages; i++)
-	{
-		list = g_list_prepend (list, font_languages[i].code);
-	}
-
-	return list;
+	return font_languages;
 }
 
-GList *
-ephy_font_langs_get_list (void)
+guint			 
+ephy_font_n_languages (void)
 {
-	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);
+	return n_font_languages;
 }