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, 151 insertions, 0 deletions

diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
new file mode 100644
index 000000000..29034e13a
--- /dev/null
+++ b/embed/ephy-encodings.h
@@ -0,0 +1,151 @@
+/*
+ *  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-object.h>
+#include <glib.h>
+
+#include "ephy-node.h"
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_ENCODINGS		(ephy_encodings_get_type ())
+#define EPHY_ENCODINGS(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_ENCODINGS, EphyEncodings))
+#define EPHY_ENCODINGS_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST ((k), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
+#define EPHY_IS_ENCODINGS(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_ENCODINGS))
+#define EPHY_IS_ENCODINGS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ENCODINGS))
+#define EPHY_ENCODINGS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
+
+typedef struct EphyEncodingsPrivate EphyEncodingsPrivate;
+
+typedef enum
+{
+	LG_NONE			= 0,
+	LG_ARABIC		= 1 << 0,
+	LG_BALTIC		= 1 << 1,
+	LG_CAUCASIAN		= 1 << 2,
+	LG_C_EUROPEAN		= 1 << 3,
+	LG_CHINESE_TRAD		= 1 << 4,
+	LG_CHINESE_SIMP		= 1 << 5,
+	LG_CYRILLIC		= 1 << 6,
+	LG_GREEK		= 1 << 7,
+	LG_HEBREW		= 1 << 8,
+	LG_INDIAN		= 1 << 9,
+	LG_JAPANESE		= 1 << 10,
+	LG_KOREAN		= 1 << 12,
+	LG_NORDIC		= 1 << 13,
+	LG_PERSIAN		= 1 << 14,
+	LG_SE_EUROPEAN		= 1 << 15,
+	LG_THAI			= 1 << 16,
+	LG_TURKISH		= 1 << 17,
+	LG_UKRAINIAN		= 1 << 18,
+	LG_UNICODE		= 1 << 19,
+	LG_VIETNAMESE		= 1 << 20,
+	LG_WESTERN		= 1 << 21,
+	LG_ALL			= 0x3fffff,
+}
+EphyLanguageGroup;
+
+/* from htmlparser/nsIParser.h */
+/* note: the value order defines the priority */
+typedef enum
+{
+	EMBED_ENCODING_UNINITIALISED		= 0,
+	EMBED_ENCODING_WEAK_DOCTYPE_DEFAULT	= 1,
+	EMBED_ENCODING_USER_DEFAULT		= 2,
+	EMBED_ENCODING_DOCTYPE_DEFAULT		= 3,
+	EMBED_ENCODING_CACHE			= 4,
+	EMBED_ENCODING_PARENT_FRAME		= 5,
+	EMBED_ENCODING_BOOKMARKS		= 6,
+	EMBED_ENCODING_AUTODETECTION		= 7,
+	EMBED_ENCODING_HINT_PREV_DOC		= 8,
+	EMBED_ENCODING_META_TAG			= 9,
+	EMBED_ENCODING_BOM			= 10,
+	EMBED_ENCODING_CHANNEL			= 11,
+	EMBED_ENCODING_PARENT_FORCED		= 12,
+	EMBED_ENCODING_USER_FORCED		= 13,
+	EMBED_ENCODING_OTHER_COMPONENT		= 14,
+	EMBED_ENCODING_PREV_LOADING		= 15
+}
+EphyEncodingSource;
+
+typedef struct
+{
+	char *encoding;
+	char *default_encoding;
+	char *hint_encoding;
+	char *prev_doc_encoding;
+	char *forced_encoding;
+	char *parent_encoding;
+	EphyEncodingSource encoding_source;
+	EphyEncodingSource hint_encoding_source;
+	EphyEncodingSource parent_encoding_source;
+}
+EphyEncodingInfo;
+
+enum
+{
+	EPHY_NODE_ENCODING_PROP_TITLE = 1,
+	EPHY_NODE_ENCODING_PROP_TITLE_ELIDED = 2,
+	EPHY_NODE_ENCODING_PROP_COLLATION_KEY = 3,
+	EPHY_NODE_ENCODING_PROP_ENCODING = 4,
+	EPHY_NODE_ENCODING_PROP_LANGUAGE_GROUPS = 5,
+	EPHY_NODE_ENCODING_PROP_IS_AUTODETECTOR = 6
+};
+
+typedef struct
+{
+	GObject parent;
+	EphyEncodingsPrivate *priv;
+} EphyEncodings;
+
+typedef struct
+{
+	GObjectClass parent_class;
+} EphyEncodingsClass;
+
+GType		 ephy_encodings_get_type        (void);
+
+EphyEncodings	*ephy_encodings_new             (void);
+
+EphyNode	*ephy_encodings_get_node	(EphyEncodings *encodings,
+						 const char *code);
+
+GList		*ephy_encodings_get_encodings	(EphyEncodings *encodings,
+						 EphyLanguageGroup group_mask);
+
+EphyNode	*ephy_encodings_get_all		(EphyEncodings *encodings);
+
+EphyNode	*ephy_encodings_get_categories	(EphyEncodings *encodings);
+
+GList		*ephy_encodings_get_detectors	(EphyEncodings *encodings);
+
+void		 ephy_encodings_add_recent	(EphyEncodings *encodings,
+						 const char *code);
+
+GList		*ephy_encodings_get_recent	(EphyEncodings *encodings);
+
+void		 ephy_encoding_info_free	(EphyEncodingInfo *info);
+
+G_END_DECLS
+
+#endif