gtkhtml r8728 - branches/mbarnes-composer/components/editor

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Feb 10 18:11:30 2008
New Revision: 8728
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8728&view=rev

Log:
Add a "filename" property as a convenience to GtkhtmlEditor extensions.


Modified:
   branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor-private.h
   branches/mbarnes-composer/components/editor/gtkhtml-editor.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor.h

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c	Sun Feb 10 18:11:30 2008
@@ -250,6 +250,9 @@
 	GtkhtmlEditorPrivate *priv = editor->priv;
 
 	g_hash_table_destroy (priv->available_spell_checkers);
+
+	g_free (priv->filename);
+	g_free (priv->current_folder);
 }
 
 gchar *

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-private.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-private.h	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-private.h	Sun Feb 10 18:11:30 2008
@@ -150,6 +150,11 @@
 
 	/*** Miscellaneous ***/
 
+	/* Note, 'filename' is not used by GtkhtmlEditor itself but is here
+	 * for the convenience of extending the editor to support saving to
+	 * a file. */
+
+	gchar *filename;
 	gchar *current_folder;
 	GtkhtmlColorPalette *palette;
 	GtkhtmlColorState *text_color;

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.c	Sun Feb 10 18:11:30 2008
@@ -27,6 +27,7 @@
 enum {
 	PROP_0,
 	PROP_CURRENT_FOLDER,
+	PROP_FILENAME,
 	PROP_HTML_MODE
 };
 
@@ -524,6 +525,12 @@
 				g_value_get_string (value));
 			return;
 
+		case PROP_FILENAME:
+			gtkhtml_editor_set_filename (
+				GTKHTML_EDITOR (object),
+				g_value_get_boolean (value));
+			return;
+
 		case PROP_HTML_MODE:
 			gtkhtml_editor_set_html_mode (
 				GTKHTML_EDITOR (object),
@@ -547,6 +554,12 @@
 				GTKHTML_EDITOR (object)));
 			return;
 
+		case PROP_FILENAME:
+			g_value_set_string (
+				value, gtkhtml_editor_get_filename (
+				GTKHTML_EDITOR (object)));
+			return;
+
 		case PROP_HTML_MODE:
 			g_value_set_boolean (
 				value, gtkhtml_editor_get_html_mode (
@@ -614,6 +627,17 @@
 
 	g_object_class_install_property (
 		object_class,
+		PROP_FILENAME,
+		g_param_spec_string (
+			"filename",
+			_("Filename"),
+			_("The filename to use when saving"),
+			NULL,
+			G_PARAM_CONSTRUCT |
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
 		PROP_HTML_MODE,
 		g_param_spec_boolean (
 			"html-mode",
@@ -832,6 +856,26 @@
 	g_object_notify (G_OBJECT (editor), "current-folder");
 }
 
+const gchar *
+gtkhtml_editor_get_filename (GtkhtmlEditor *editor)
+{
+	g_return_val_if_fail (GTKHTML_IS_EDITOR (editor), NULL);
+
+	return editor->priv->filename;
+}
+
+void
+gtkhtml_editor_set_filename (GtkhtmlEditor *editor,
+                             const gchar *filename)
+{
+	g_return_if_fail (GTKHTML_IS_EDITOR (editor));
+
+	g_free (editor->priv->filename);
+	editor->priv->filename = g_strdup (filename);
+
+	g_object_notify (G_OBJECT (editor), "filename");
+}
+
 gint
 gtkhtml_editor_file_chooser_dialog_run (GtkhtmlEditor *editor,
                                         GtkWidget *dialog)

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.h	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.h	Sun Feb 10 18:11:30 2008
@@ -66,10 +66,10 @@
 struct _GtkhtmlEditorClass {
 	GtkWindowClass parent_class;
 
-	void	(*cut_clipboard)	(GtkhtmlEditor *editor);
-	void	(*copy_clipboard)	(GtkhtmlEditor *editor);
-	void	(*paste_clipboard)	(GtkhtmlEditor *editor);
-	void	(*select_all)		(GtkhtmlEditor *editor);
+	void		(*cut_clipboard)	(GtkhtmlEditor *editor);
+	void		(*copy_clipboard)	(GtkhtmlEditor *editor);
+	void		(*paste_clipboard)	(GtkhtmlEditor *editor);
+	void		(*select_all)		(GtkhtmlEditor *editor);
 };
 
 GType		gtkhtml_editor_get_type		(void);
@@ -91,6 +91,9 @@
 void		gtkhtml_editor_set_current_folder
 						(GtkhtmlEditor *editor,
 						 const gchar *current_folder);
+const gchar *	gtkhtml_editor_get_filename	(GtkhtmlEditor *editor);
+void		gtkhtml_editor_set_filename	(GtkhtmlEditor *editor,
+						 const gchar *filename);
 gint		gtkhtml_editor_file_chooser_dialog_run
 						(GtkhtmlEditor *editor,
 						 GtkWidget *dialog);