[evolution/wip/webkit-composer: 958/966] Rename EEditorTableDialog to EHTMLEditorTableDialog



commit 090b20650637cc0b4e48fc9bffd328aa42aba5a5
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 13:34:22 2014 +0200

    Rename EEditorTableDialog to EHTMLEditorTableDialog

 .../evolution-util/evolution-util-docs.sgml        |    2 +-
 .../evolution-util/evolution-util-sections.txt     |   28 ++--
 doc/reference/evolution-util/evolution-util.types  |    2 +-
 e-util/Makefile.am                                 |    4 +-
 e-util/e-editor-table-dialog.h                     |   69 ---------
 e-util/e-html-editor-actions.c                     |    4 +-
 e-util/e-html-editor-private.h                     |    2 +-
 ...table-dialog.c => e-html-editor-table-dialog.c} |  152 ++++++++++----------
 e-util/e-html-editor-table-dialog.h                |   69 +++++++++
 e-util/e-util.h                                    |    2 +-
 10 files changed, 167 insertions(+), 167 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index 2682f69..2dbd3e7 100644
--- a/doc/reference/evolution-util/evolution-util-docs.sgml
+++ b/doc/reference/evolution-util/evolution-util-docs.sgml
@@ -100,7 +100,6 @@
 
   <chapter>
     <title>HTML Editing</title>
-    <xi:include href="xml/e-editor-table-dialog.xml"/>
     <xi:include href="xml/e-editor-text-dialog.xml"/>
     <xi:include href="xml/e-color-chooser-widget.xml"/>
     <xi:include href="xml/e-color-combo.xml"/>
@@ -121,6 +120,7 @@
     <xi:include href="xml/e-html-editor-replace-dialog.xml"/>
     <xi:include href="xml/e-html-editor-selection.xml"/>
     <xi:include href="xml/e-html-editor-spell-check-dialog.xml"/>
+    <xi:include href="xml/e-html-editor-table-dialog.xml"/>
     <xi:include href="xml/e-html-editor-widget.xml"/>
     <xi:include href="xml/e-image-chooser-dialog.xml"/>
     <xi:include href="xml/e-spell-checker.xml"/>
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt 
b/doc/reference/evolution-util/evolution-util-sections.txt
index 73a46c9..d777887 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1849,21 +1849,21 @@ EHTMLEditorSpellCheckDialogPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-table-dialog</FILE>
-<TITLE>EEditorTableDialog</TITLE>
-EEditorTableDialog
-e_editor_table_dialog_new
-<SUBSECTION Standard>
-E_EDITOR_TABLE_DIALOG
-E_IS_EDITOR_TABLE_DIALOG
-E_TYPE_EDITOR_TABLE_DIALOG
-E_EDITOR_TABLE_DIALOG_CLASS
-E_IS_EDITOR_TABLE_DIALOG_CLASS
-E_EDITOR_TABLE_DIALOG_GET_CLASS
-EEditorTableDialogClass
-e_editor_table_dialog_get_type
-<SUBSECTION Private>
-EEditorTableDialogPrivate
+<FILE>e-html-editor-table-dialog</FILE>
+<TITLE>EHTMLEditorTableDialog</TITLE>
+EHTMLEditorTableDialog
+e_html_editor_table_dialog_new
+<SUBSECTION Standard>
+E_HTML_EDITOR_TABLE_DIALOG
+E_IS_HTML_EDITOR_TABLE_DIALOG
+E_TYPE_HTML_EDITOR_TABLE_DIALOG
+E_HTML_EDITOR_TABLE_DIALOG_CLASS
+E_IS_HTML_EDITOR_TABLE_DIALOG_CLASS
+E_HTML_EDITOR_TABLE_DIALOG_GET_CLASS
+EHTMLEditorTableDialogClass
+e_html_editor_table_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorTableDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types 
b/doc/reference/evolution-util/evolution-util.types
index 570cec6..03caf24 100644
--- a/doc/reference/evolution-util/evolution-util.types
+++ b/doc/reference/evolution-util/evolution-util.types
@@ -63,7 +63,6 @@ e_contact_store_get_type
 e_data_capture_get_type
 e_date_edit_get_type
 e_destination_store_get_type
-e_editor_table_dialog_get_type
 e_editor_text_dialog_get_type
 e_html_editor_get_type
 e_html_editor_cell_dialog_get_type
@@ -77,6 +76,7 @@ e_html_editor_paragraph_dialog_get_type
 e_html_editor_replace_dialog_get_type
 e_html_editor_selection_get_type
 e_html_editor_spell_check_dialog_get_type
+e_html_editor_table_dialog_get_type
 e_html_editor_view_get_type
 e_emoticon_action_get_type
 e_emoticon_chooser_get_type
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index a17d45d..3d425cd 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -177,7 +177,6 @@ evolution_util_include_HEADERS =  \
        e-destination-store.h \
        e-dialog-utils.h \
        e-dialog-widgets.h \
-       e-editor-table-dialog.h \
        e-editor-text-dialog.h \
        e-emoticon-action.h \
        e-emoticon-chooser-menu.h \
@@ -210,6 +209,7 @@ evolution_util_include_HEADERS =  \
        e-html-editor-replace-dialog.h \
        e-html-editor-selection.h \
        e-html-editor-spell-check-dialog.h \
+       e-html-editor-table-dialog.h \
        e-html-editor-utils.h \
        e-html-editor-view.h \
        e-html-editor.h \
@@ -448,7 +448,6 @@ libevolution_util_la_SOURCES = \
        e-destination-store.c \
        e-dialog-utils.c \
        e-dialog-widgets.c \
-       e-editor-table-dialog.c \
        e-editor-text-dialog.c \
        e-emoticon-action.c \
        e-emoticon-chooser-menu.c \
@@ -482,6 +481,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-replace-dialog.c \
        e-html-editor-selection.c \
        e-html-editor-spell-check-dialog.c \
+       e-html-editor-table-dialog.c \
        e-html-editor-utils.c \
        e-html-editor-view.c \
        e-html-editor.c \
diff --git a/e-util/e-html-editor-actions.c b/e-util/e-html-editor-actions.c
index 1b0d38b..f2c2abe 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -547,7 +547,7 @@ action_insert_table_cb (GtkAction *action,
 {
        if (editor->priv->table_dialog == NULL)
                editor->priv->table_dialog =
-                       e_editor_table_dialog_new (editor);
+                       e_html_editor_table_dialog_new (editor);
 
        gtk_window_present (GTK_WINDOW (editor->priv->table_dialog));
 }
@@ -798,7 +798,7 @@ action_properties_table_cb (GtkAction *action,
 {
        if (editor->priv->table_dialog == NULL) {
                editor->priv->table_dialog =
-                       e_editor_table_dialog_new (editor);
+                       e_html_editor_table_dialog_new (editor);
        }
 
        gtk_window_present (GTK_WINDOW (editor->priv->table_dialog));
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index e5fc8b1..4159b36 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -34,8 +34,8 @@
 #include <e-html-editor-paragraph-dialog.h>
 #include <e-html-editor-replace-dialog.h>
 #include <e-html-editor-spell-check-dialog.h>
+#include <e-html-editor-table-dialog.h>
 #include <e-html-editor-view.h>
-#include <e-editor-table-dialog.h>
 #include <e-editor-text-dialog.h>
 
 #ifdef HAVE_XFREE
diff --git a/e-util/e-editor-table-dialog.c b/e-util/e-html-editor-table-dialog.c
similarity index 83%
rename from e-util/e-editor-table-dialog.c
rename to e-util/e-html-editor-table-dialog.c
index d9b91e7..467d2a6 100644
--- a/e-util/e-editor-table-dialog.c
+++ b/e-util/e-html-editor-table-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-table-dialog.h
+ * e-html-editor-table-dialog.h
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "e-editor-table-dialog.h"
+#include "e-html-editor-table-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -31,11 +31,11 @@
 #include "e-image-chooser-dialog.h"
 #include "e-misc-utils.h"
 
-#define E_EDITOR_TABLE_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_TABLE_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_TABLE_DIALOG, EEditorTableDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_TABLE_DIALOG, EHTMLEditorTableDialogPrivate))
 
-struct _EEditorTableDialogPrivate {
+struct _EHTMLEditorTableDialogPrivate {
        GtkWidget *rows_edit;
        GtkWidget *columns_edit;
 
@@ -59,12 +59,12 @@ struct _EEditorTableDialogPrivate {
 static GdkRGBA white = { 1, 1, 1, 1 };
 
 G_DEFINE_TYPE (
-       EEditorTableDialog,
-       e_editor_table_dialog,
+       EHTMLEditorTableDialog,
+       e_html_editor_table_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
 static WebKitDOMElement *
-editor_table_dialog_create_table (EEditorTableDialog *dialog)
+html_editor_table_dialog_create_table (EHTMLEditorTableDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorSelection *editor_selection;
@@ -128,7 +128,7 @@ editor_table_dialog_create_table (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_row_count (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_row_count (EHTMLEditorTableDialog *dialog)
 {
        WebKitDOMHTMLCollection *rows;
        gulong ii, current_count, expected_count;
@@ -154,7 +154,7 @@ editor_table_dialog_set_row_count (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_row_count (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_row_count (EHTMLEditorTableDialog *dialog)
 {
        WebKitDOMHTMLCollection *rows;
 
@@ -168,7 +168,7 @@ editor_table_dialog_get_row_count (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_column_count (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_column_count (EHTMLEditorTableDialog *dialog)
 {
        WebKitDOMHTMLCollection *rows;
        gulong ii, row_count, expected_columns;
@@ -206,7 +206,7 @@ editor_table_dialog_set_column_count (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_column_count (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_column_count (EHTMLEditorTableDialog *dialog)
 {
        WebKitDOMHTMLCollection *rows, *columns;
        WebKitDOMNode *row;
@@ -225,7 +225,7 @@ editor_table_dialog_get_column_count (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_width (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_width (EHTMLEditorTableDialog *dialog)
 {
        gchar *width;
 
@@ -259,7 +259,7 @@ editor_table_dialog_set_width (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_width (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_width (EHTMLEditorTableDialog *dialog)
 {
        gchar *width;
 
@@ -287,7 +287,7 @@ editor_table_dialog_get_width (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_alignment (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_alignment (EHTMLEditorTableDialog *dialog)
 {
        g_return_if_fail (dialog->priv->table_element);
 
@@ -298,7 +298,7 @@ editor_table_dialog_set_alignment (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_alignment (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_alignment (EHTMLEditorTableDialog *dialog)
 {
        gchar *alignment;
 
@@ -314,7 +314,7 @@ editor_table_dialog_get_alignment (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_padding (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_padding (EHTMLEditorTableDialog *dialog)
 {
        gchar *padding;
 
@@ -332,7 +332,7 @@ editor_table_dialog_set_padding (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_padding (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_padding (EHTMLEditorTableDialog *dialog)
 {
        gchar *padding;
        gint padding_int;
@@ -354,7 +354,7 @@ editor_table_dialog_get_padding (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_spacing (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_spacing (EHTMLEditorTableDialog *dialog)
 {
        gchar *spacing;
 
@@ -372,7 +372,7 @@ editor_table_dialog_set_spacing (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_spacing (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_spacing (EHTMLEditorTableDialog *dialog)
 {
        gchar *spacing;
        gint spacing_int;
@@ -394,7 +394,7 @@ editor_table_dialog_get_spacing (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_border (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_border (EHTMLEditorTableDialog *dialog)
 {
        gchar *border;
 
@@ -412,7 +412,7 @@ editor_table_dialog_set_border (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_border (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_border (EHTMLEditorTableDialog *dialog)
 {
        gchar *border;
        gint border_int;
@@ -434,7 +434,7 @@ editor_table_dialog_get_border (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_background_color (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_background_color (EHTMLEditorTableDialog *dialog)
 {
        gchar *color;
        GdkRGBA rgba;
@@ -453,7 +453,7 @@ editor_table_dialog_set_background_color (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_background_color (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_background_color (EHTMLEditorTableDialog *dialog)
 {
        gchar *color;
        GdkRGBA rgba;
@@ -472,7 +472,7 @@ editor_table_dialog_get_background_color (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_set_background_image (EEditorTableDialog *dialog)
+html_editor_table_dialog_set_background_image (EHTMLEditorTableDialog *dialog)
 {
        const gchar *filename;
 
@@ -493,7 +493,7 @@ editor_table_dialog_set_background_image (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_background_image (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_background_image (EHTMLEditorTableDialog *dialog)
 {
        g_return_if_fail (dialog->priv->table_element);
 
@@ -518,21 +518,21 @@ editor_table_dialog_get_background_image (EEditorTableDialog *dialog)
 }
 
 static void
-editor_table_dialog_get_values (EEditorTableDialog *dialog)
+html_editor_table_dialog_get_values (EHTMLEditorTableDialog *dialog)
 {
-       editor_table_dialog_get_row_count (dialog);
-       editor_table_dialog_get_column_count (dialog);
-       editor_table_dialog_get_width (dialog);
-       editor_table_dialog_get_alignment (dialog);
-       editor_table_dialog_get_spacing (dialog);
-       editor_table_dialog_get_padding (dialog);
-       editor_table_dialog_get_border (dialog);
-       editor_table_dialog_get_background_color (dialog);
-       editor_table_dialog_get_background_image (dialog);
+       html_editor_table_dialog_get_row_count (dialog);
+       html_editor_table_dialog_get_column_count (dialog);
+       html_editor_table_dialog_get_width (dialog);
+       html_editor_table_dialog_get_alignment (dialog);
+       html_editor_table_dialog_get_spacing (dialog);
+       html_editor_table_dialog_get_padding (dialog);
+       html_editor_table_dialog_get_border (dialog);
+       html_editor_table_dialog_get_background_color (dialog);
+       html_editor_table_dialog_get_background_image (dialog);
 }
 
 static void
-editor_table_dialog_reset_values (EEditorTableDialog *dialog)
+html_editor_table_dialog_reset_values (EHTMLEditorTableDialog *dialog)
 {
        gtk_spin_button_set_value (
                GTK_SPIN_BUTTON (dialog->priv->rows_edit), 3);
@@ -560,28 +560,28 @@ editor_table_dialog_reset_values (EEditorTableDialog *dialog)
        gtk_file_chooser_unselect_all (
                GTK_FILE_CHOOSER (dialog->priv->background_image_button));
 
-       editor_table_dialog_set_row_count (dialog);
-       editor_table_dialog_set_column_count (dialog);
-       editor_table_dialog_set_width (dialog);
-       editor_table_dialog_set_alignment (dialog);
-       editor_table_dialog_set_spacing (dialog);
-       editor_table_dialog_set_padding (dialog);
-       editor_table_dialog_set_border (dialog);
-       editor_table_dialog_set_background_color (dialog);
-       editor_table_dialog_set_background_image (dialog);
+       html_editor_table_dialog_set_row_count (dialog);
+       html_editor_table_dialog_set_column_count (dialog);
+       html_editor_table_dialog_set_width (dialog);
+       html_editor_table_dialog_set_alignment (dialog);
+       html_editor_table_dialog_set_spacing (dialog);
+       html_editor_table_dialog_set_padding (dialog);
+       html_editor_table_dialog_set_border (dialog);
+       html_editor_table_dialog_set_background_color (dialog);
+       html_editor_table_dialog_set_background_image (dialog);
 }
 
 static void
-editor_table_dialog_show (GtkWidget *widget)
+html_editor_table_dialog_show (GtkWidget *widget)
 {
-       EEditorTableDialog *dialog;
+       EHTMLEditorTableDialog *dialog;
        EHTMLEditor *editor;
        EHTMLEditorView *view;
        WebKitDOMDocument *document;
        WebKitDOMDOMWindow *window;
        WebKitDOMDOMSelection *selection;
 
-       dialog = E_EDITOR_TABLE_DIALOG (widget);
+       dialog = E_HTML_EDITOR_TABLE_DIALOG (widget);
        editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
        view = e_html_editor_get_view (editor);
 
@@ -598,51 +598,51 @@ editor_table_dialog_show (GtkWidget *widget)
 
                if (!table) {
                        dialog->priv->table_element = WEBKIT_DOM_HTML_TABLE_ELEMENT (
-                               editor_table_dialog_create_table (dialog));
-                       editor_table_dialog_reset_values (dialog);
+                               html_editor_table_dialog_create_table (dialog));
+                       html_editor_table_dialog_reset_values (dialog);
                } else {
                        dialog->priv->table_element =
                                WEBKIT_DOM_HTML_TABLE_ELEMENT (table);
-                       editor_table_dialog_get_values (dialog);
+                       html_editor_table_dialog_get_values (dialog);
                }
        }
 
        /* Chain up to parent implementation */
-       GTK_WIDGET_CLASS (e_editor_table_dialog_parent_class)->show (widget);
+       GTK_WIDGET_CLASS (e_html_editor_table_dialog_parent_class)->show (widget);
 }
 
 static void
-editor_table_dialog_hide (GtkWidget *widget)
+html_editor_table_dialog_hide (GtkWidget *widget)
 {
-       EEditorTableDialogPrivate *priv;
+       EHTMLEditorTableDialogPrivate *priv;
 
-       priv = E_EDITOR_TABLE_DIALOG_GET_PRIVATE (widget);
+       priv = E_HTML_EDITOR_TABLE_DIALOG_GET_PRIVATE (widget);
 
        priv->table_element = NULL;
 
-       GTK_WIDGET_CLASS (e_editor_table_dialog_parent_class)->hide (widget);
+       GTK_WIDGET_CLASS (e_html_editor_table_dialog_parent_class)->hide (widget);
 }
 
 static void
-e_editor_table_dialog_class_init (EEditorTableDialogClass *class)
+e_html_editor_table_dialog_class_init (EHTMLEditorTableDialogClass *class)
 {
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (EEditorTableDialogPrivate));
+       g_type_class_add_private (class, sizeof (EHTMLEditorTableDialogPrivate));
 
        widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = editor_table_dialog_show;
-       widget_class->hide = editor_table_dialog_hide;
+       widget_class->show = html_editor_table_dialog_show;
+       widget_class->hide = html_editor_table_dialog_hide;
 }
 
 static void
-e_editor_table_dialog_init (EEditorTableDialog *dialog)
+e_html_editor_table_dialog_init (EHTMLEditorTableDialog *dialog)
 {
        GtkGrid *main_layout, *grid;
        GtkWidget *widget;
        GtkFileFilter *file_filter;
 
-       dialog->priv = E_EDITOR_TABLE_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_TABLE_DIALOG_GET_PRIVATE (dialog);
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
 
@@ -667,7 +667,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 2, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_table_dialog_set_row_count), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_row_count), dialog);
        dialog->priv->rows_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Rows:"));
@@ -684,7 +684,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_table_dialog_set_column_count), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_column_count), dialog);
        dialog->priv->columns_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("C_olumns:"));
@@ -709,7 +709,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 0, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_table_dialog_set_width), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_width), dialog);
        dialog->priv->width_check = widget;
 
        widget = gtk_spin_button_new_with_range (1, 100, 1);
@@ -717,7 +717,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_table_dialog_set_width), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_width), dialog);
        dialog->priv->width_edit = widget;
 
        widget = gtk_combo_box_text_new ();
@@ -726,7 +726,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 2, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_table_dialog_set_width), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_width), dialog);
        dialog->priv->width_units = widget;
 
        /* Spacing */
@@ -735,7 +735,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_table_dialog_set_spacing), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_spacing), dialog);
        dialog->priv->spacing_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Spacing:"));
@@ -752,7 +752,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_table_dialog_set_padding), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_padding), dialog);
        dialog->priv->padding_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Padding:"));
@@ -769,7 +769,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 2, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_table_dialog_set_border), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_border), dialog);
        dialog->priv->border_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Border:"));
@@ -788,7 +788,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 1, 2, 1);
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_table_dialog_set_alignment), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_alignment), dialog);
        dialog->priv->alignment_combo = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Alignment:"));
@@ -815,7 +815,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "notify::current-color",
-               G_CALLBACK (editor_table_dialog_set_background_color), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_background_color), dialog);
        dialog->priv->background_color_button = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Color:"));
@@ -841,7 +841,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "file-set",
-               G_CALLBACK (editor_table_dialog_set_background_image), dialog);
+               G_CALLBACK (html_editor_table_dialog_set_background_image), dialog);
        dialog->priv->background_image_button = widget;
 
        widget =gtk_label_new_with_mnemonic (_("Image:"));
@@ -854,11 +854,11 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
 }
 
 GtkWidget *
-e_editor_table_dialog_new (EHTMLEditor *editor)
+e_html_editor_table_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_TABLE_DIALOG,
+                       E_TYPE_HTML_EDITOR_TABLE_DIALOG,
                        "editor", editor,
                        "title", N_("Table Properties"),
                        NULL));
diff --git a/e-util/e-html-editor-table-dialog.h b/e-util/e-html-editor-table-dialog.h
new file mode 100644
index 0000000..70c790d
--- /dev/null
+++ b/e-util/e-html-editor-table-dialog.h
@@ -0,0 +1,69 @@
+/*
+ * e-html-editor-table-dialog.h
+ *
+ * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
+#error "Only <e-util/e-util.h> should be included directly."
+#endif
+
+#ifndef E_HTML_EDITOR_TABLE_DIALOG_H
+#define E_HTML_EDITOR_TABLE_DIALOG_H
+
+#include <e-util/e-html-editor-dialog.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_TABLE_DIALOG \
+       (e_html_editor_table_dialog_get_type ())
+#define E_HTML_EDITOR_TABLE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_HTML_EDITOR_TABLE_DIALOG, EHTMLEditorTableDialog))
+#define E_HTML_EDITOR_TABLE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_HTML_EDITOR_TABLE_DIALOG, EHTMLEditorTableDialogClass))
+#define E_IS_HTML_EDITOR_TABLE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_HTML_EDITOR_TABLE_DIALOG))
+#define E_IS_HTML_EDITOR_TABLE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_HTML_EDITOR_TABLE_DIALOG))
+#define E_HTML_EDITOR_TABLE_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_HTML_EDITOR_TABLE_DIALOG, EHTMLEditorTableDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorTableDialog EHTMLEditorTableDialog;
+typedef struct _EHTMLEditorTableDialogClass EHTMLEditorTableDialogClass;
+typedef struct _EHTMLEditorTableDialogPrivate EHTMLEditorTableDialogPrivate;
+
+struct _EHTMLEditorTableDialog {
+       EHTMLEditorDialog parent;
+       EHTMLEditorTableDialogPrivate *priv;
+};
+
+struct _EHTMLEditorTableDialogClass {
+       EHTMLEditorDialogClass parent_class;
+};
+
+GType          e_html_editor_table_dialog_get_type     (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_table_dialog_new  (EHTMLEditor *editor);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_TABLE_DIALOG_H */
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 61f3b70..92084e3 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -91,7 +91,6 @@
 #include <e-util/e-destination-store.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-editor-table-dialog.h>
 #include <e-util/e-editor-text-dialog.h>
 #include <e-util/e-emoticon-action.h>
 #include <e-util/e-emoticon-chooser-menu.h>
@@ -124,6 +123,7 @@
 #include <e-util/e-html-editor-replace-dialog.h>
 #include <e-util/e-html-editor-selection.h>
 #include <e-util/e-html-editor-spell-check-dialog.h>
+#include <e-util/e-html-editor-table-dialog.h>
 #include <e-util/e-html-editor-utils.h>
 #include <e-util/e-html-editor-view.h>
 #include <e-util/e-html-editor.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]