GNOME.org
 

[evolution/wip/webkit-composer: 949/966] Rename EEditorCellDialog to EHTMLEditorCellDialog

commit c1d46c115b75cab596474f0679aa75276ff21317
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 10:14:45 2014 +0200

    Rename EEditorCellDialog to EHTMLEditorCellDialog

 .../evolution-util/evolution-util-docs.sgml        |    2 +-
 .../evolution-util/evolution-util-sections.txt     |   30 +++---
 e-util/Makefile.am                                 |    4 +-
 e-util/e-editor-cell-dialog.h                      |   71 ------------
 e-util/e-html-editor-actions.c                     |    6 +-
 ...r-cell-dialog.c => e-html-editor-cell-dialog.c} |  114 ++++++++++----------
 e-util/e-html-editor-cell-dialog.h                 |   72 ++++++++++++
 e-util/e-html-editor-private.h                     |    4 +-
 e-util/e-util.h                                    |    2 +-
 9 files changed, 153 insertions(+), 152 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index 10019f9..5e1c665 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-cell-dialog.xml"/>
     <xi:include href="xml/e-editor-find-dialog.xml"/>
     <xi:include href="xml/e-editor-hrule-dialog.xml"/>
     <xi:include href="xml/e-editor-image-dialog.xml"/>
@@ -119,6 +118,7 @@
     <xi:include href="xml/e-emoticon-chooser-menu.xml"/>
     <xi:include href="xml/e-emoticon-tool-button.xml"/>
     <xi:include href="xml/e-html-editor.xml"/>
+    <xi:include href="xml/e-html-editor-cell-dialog.xml"/>
     <xi:include href="xml/e-html-editor-selection.xml"/>
     <xi:include href="xml/e-html-editor-widget.xml"/>
     <xi:include href="xml/e-html-editor-dialog.xml"/>
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt 
b/doc/reference/evolution-util/evolution-util-sections.txt
index 8b7e9b0..24502bb 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1599,22 +1599,22 @@ EEditorPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-cell-dialog</FILE>
-<TITLE>EEditorCellDialog</TITLE>
-EEditorCellDialog
-e_editor_cell_dialog_new
-e_editor_cell_dialog_show
-<SUBSECTION Standard>
-E_EDITOR_CELL_DIALOG
-E_IS_EDITOR_CELL_DIALOG
-E_TYPE_EDITOR_CELL_DIALOG
-E_EDITOR_CELL_DIALOG_CLASS
-E_IS_EDITOR_CELL_DIALOG_CLASS
-E_EDITOR_CELL_DIALOG_GET_CLASS
-EEditorCellDialogClass
-e_editor_cell_dialog_get_type
-<SUBSECTION Private>
-EEditorCellDialogPrivate
+<FILE>e-html-editor-cell-dialog</FILE>
+<TITLE>EHTMLEditorCellDialog</TITLE>
+EHTMLEditorCellDialog
+e_html_editor_cell_dialog_new
+e_html_editor_cell_dialog_show
+<SUBSECTION Standard>
+E_HTML_EDITOR_CELL_DIALOG
+E_IS_HTML_EDITOR_CELL_DIALOG
+E_TYPE_HTML_EDITOR_CELL_DIALOG
+E_HTML_EDITOR_CELL_DIALOG_CLASS
+E_IS_HTML_EDITOR_CELL_DIALOG_CLASS
+E_HTML_EDITOR_CELL_DIALOG_GET_CLASS
+EHTMLEditorCellDialogClass
+e_html_editor_cell_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorCellDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 5ad2282..fecfaa0 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-cell-dialog.h \
        e-editor-find-dialog.h \
        e-editor-hrule-dialog.h \
        e-editor-image-dialog.h \
@@ -208,6 +207,7 @@ evolution_util_include_HEADERS =  \
        e-filter-rule.h \
        e-focus-tracker.h \
        e-html-editor-actions.h \
+       e-html-editor-cell-dialog.h \
        e-html-editor-dialog.h \
        e-html-editor-selection.h \
        e-html-editor-utils.h \
@@ -448,7 +448,6 @@ libevolution_util_la_SOURCES = \
        e-destination-store.c \
        e-dialog-utils.c \
        e-dialog-widgets.c \
-       e-editor-cell-dialog.c \
        e-editor-find-dialog.c \
        e-editor-hrule-dialog.c \
        e-editor-image-dialog.c \
@@ -479,6 +478,7 @@ libevolution_util_la_SOURCES = \
        e-filter-rule.c \
        e-focus-tracker.c \
        e-html-editor-actions.c \
+       e-html-editor-cell-dialog.c \
        e-html-editor-dialog.c \
        e-html-editor-private.h \
        e-html-editor-selection.c \
diff --git a/e-util/e-html-editor-actions.c b/e-util/e-html-editor-actions.c
index 332da90..cf382ab 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -722,11 +722,11 @@ action_properties_cell_cb (GtkAction *action,
 {
        if (editor->priv->cell_dialog == NULL) {
                editor->priv->cell_dialog =
-                       e_editor_cell_dialog_new (editor);
+                       e_html_editor_cell_dialog_new (editor);
        }
 
-       e_editor_cell_dialog_show (
-               E_EDITOR_CELL_DIALOG (editor->priv->cell_dialog),
+       e_html_editor_cell_dialog_show (
+               E_HTML_EDITOR_CELL_DIALOG (editor->priv->cell_dialog),
                editor->priv->table_cell);
 }
 
diff --git a/e-util/e-editor-cell-dialog.c b/e-util/e-html-editor-cell-dialog.c
similarity index 88%
rename from e-util/e-editor-cell-dialog.c
rename to e-util/e-html-editor-cell-dialog.c
index d4c03e0..8700cbb 100644
--- a/e-util/e-editor-cell-dialog.c
+++ b/e-util/e-html-editor-cell-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-cell-dialog.c
+ * e-html-editor-cell-dialog.c
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "e-editor-cell-dialog.h"
+#include "e-html-editor-cell-dialog.h"
 
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
@@ -32,11 +32,11 @@
 #include "e-image-chooser-dialog.h"
 #include "e-misc-utils.h"
 
-#define E_EDITOR_CELL_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_CELL_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_CELL_DIALOG, EEditorCellDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_CELL_DIALOG, EHTMLEditorCellDialogPrivate))
 
-struct _EEditorCellDialogPrivate {
+struct _EHTMLEditorCellDialogPrivate {
        GtkWidget *scope_cell_button;
        GtkWidget *scope_table_button;
        GtkWidget *scope_row_button;
@@ -76,8 +76,8 @@ typedef void (*DOMUlongFunc) (WebKitDOMHTMLTableCellElement *cell, gulong val, g
 typedef void (*DOMBoolFunc) (WebKitDOMHTMLTableCellElement *cell, gboolean val, gpointer user_data);
 
 G_DEFINE_TYPE (
-       EEditorCellDialog,
-       e_editor_cell_dialog,
+       EHTMLEditorCellDialog,
+       e_html_editor_cell_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
 static void
@@ -122,7 +122,7 @@ for_each_cell_do (WebKitDOMElement *row,
 }
 
 static void
-editor_cell_dialog_set_attribute (EEditorCellDialog *dialog,
+html_editor_cell_dialog_set_attribute (EHTMLEditorCellDialog *dialog,
                                   gpointer func,
                                   GValue *value,
                                   gpointer user_data)
@@ -206,7 +206,7 @@ editor_cell_dialog_set_attribute (EEditorCellDialog *dialog,
 }
 
 static void
-editor_cell_dialog_set_scope (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_scope (EHTMLEditorCellDialog *dialog)
 {
        if (gtk_toggle_button_get_active (
                GTK_TOGGLE_BUTTON (dialog->priv->scope_cell_button))) {
@@ -232,7 +232,7 @@ editor_cell_dialog_set_scope (EEditorCellDialog *dialog)
 }
 
 static  void
-editor_cell_dialog_set_valign (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_valign (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
 
@@ -242,14 +242,14 @@ editor_cell_dialog_set_valign (EEditorCellDialog *dialog)
                gtk_combo_box_get_active_id (
                        GTK_COMBO_BOX (dialog->priv->valign_combo)));
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_v_align, &val, NULL);
 
        g_value_unset (&val);
 }
 
 static void
-editor_cell_dialog_set_halign (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_halign (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
 
@@ -259,14 +259,14 @@ editor_cell_dialog_set_halign (EEditorCellDialog *dialog)
                gtk_combo_box_get_active_id (
                        GTK_COMBO_BOX (dialog->priv->halign_combo)));
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_align, &val, NULL);
 
        g_value_unset (&val);
 }
 
 static void
-editor_cell_dialog_set_wrap_text (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_wrap_text (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
 
@@ -276,7 +276,7 @@ editor_cell_dialog_set_wrap_text (EEditorCellDialog *dialog)
                !gtk_toggle_button_get_active (
                        GTK_TOGGLE_BUTTON (dialog->priv->wrap_text_check)));
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_no_wrap, &val, NULL);
 }
 
@@ -285,7 +285,7 @@ cell_set_header_style (WebKitDOMHTMLTableCellElement *cell,
                        gboolean header_style,
                        gpointer user_data)
 {
-       EEditorCellDialog *dialog = user_data;
+       EHTMLEditorCellDialog *dialog = user_data;
        WebKitDOMDocument *document;
        WebKitDOMNodeList *nodes;
        WebKitDOMElement *new_cell;
@@ -336,7 +336,7 @@ cell_set_header_style (WebKitDOMHTMLTableCellElement *cell,
 }
 
 static void
-editor_cell_dialog_set_header_style (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_header_style (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
 
@@ -346,12 +346,12 @@ editor_cell_dialog_set_header_style (EEditorCellDialog *dialog)
                gtk_toggle_button_get_active (
                        GTK_TOGGLE_BUTTON (dialog->priv->header_style_check)));
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, cell_set_header_style, &val, dialog);
 }
 
 static void
-editor_cell_dialog_set_width (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_width (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
        gchar *width;
@@ -373,14 +373,14 @@ editor_cell_dialog_set_width (EEditorCellDialog *dialog)
 
        g_value_init (&val, G_TYPE_STRING);
        g_value_take_string (&val, width);
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_width, &val, NULL);
 
        g_free (width);
 }
 
 static void
-editor_cell_dialog_set_column_span (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_column_span (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
 
@@ -390,12 +390,12 @@ editor_cell_dialog_set_column_span (EEditorCellDialog *dialog)
                gtk_spin_button_get_value_as_int (
                        GTK_SPIN_BUTTON (dialog->priv->col_span_edit)));
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_col_span, &val, NULL);
 }
 
 static void
-editor_cell_dialog_set_row_span (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_row_span (EHTMLEditorCellDialog *dialog)
 {
        GValue val = { 0 };
 
@@ -405,12 +405,12 @@ editor_cell_dialog_set_row_span (EEditorCellDialog *dialog)
                gtk_spin_button_get_value_as_int (
                        GTK_SPIN_BUTTON (dialog->priv->row_span_edit)));
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_row_span, &val, NULL);
 }
 
 static void
-editor_cell_dialog_set_background_color (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_background_color (EHTMLEditorCellDialog *dialog)
 {
        gchar *color;
        GdkRGBA rgba;
@@ -423,7 +423,7 @@ editor_cell_dialog_set_background_color (EEditorCellDialog *dialog)
        g_value_init (&val, G_TYPE_STRING);
        g_value_take_string (&val, color);
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, webkit_dom_html_table_cell_element_set_bg_color, &val, NULL);
 
        g_free (color);
@@ -444,7 +444,7 @@ cell_set_background_image (WebKitDOMHTMLTableCellElement *cell,
 }
 
 static void
-editor_cell_dialog_set_background_image (EEditorCellDialog *dialog)
+html_editor_cell_dialog_set_background_image (EHTMLEditorCellDialog *dialog)
 {
        const gchar *uri;
        GValue val = { 0 };
@@ -455,18 +455,18 @@ editor_cell_dialog_set_background_image (EEditorCellDialog *dialog)
        g_value_init (&val, G_TYPE_STRING);
        g_value_take_string (&val, (gchar *) uri);
 
-       editor_cell_dialog_set_attribute (
+       html_editor_cell_dialog_set_attribute (
                dialog, cell_set_background_image, &val, NULL);
 }
 
 static void
-editor_cell_dialog_show (GtkWidget *widget)
+html_editor_cell_dialog_show (GtkWidget *widget)
 {
-       EEditorCellDialog *dialog;
+       EHTMLEditorCellDialog *dialog;
        gchar *tmp;
        GdkRGBA color;
 
-       dialog = E_EDITOR_CELL_DIALOG (widget);
+       dialog = E_HTML_EDITOR_CELL_DIALOG (widget);
 
        gtk_toggle_button_set_active (
                GTK_TOGGLE_BUTTON (dialog->priv->scope_cell_button), TRUE);
@@ -555,28 +555,28 @@ editor_cell_dialog_show (GtkWidget *widget)
        }
        g_free (tmp);
 
-       GTK_WIDGET_CLASS (e_editor_cell_dialog_parent_class)->show (widget);
+       GTK_WIDGET_CLASS (e_html_editor_cell_dialog_parent_class)->show (widget);
 }
 
 static void
-e_editor_cell_dialog_class_init (EEditorCellDialogClass *class)
+e_html_editor_cell_dialog_class_init (EHTMLEditorCellDialogClass *class)
 {
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (EEditorCellDialogPrivate));
+       g_type_class_add_private (class, sizeof (EHTMLEditorCellDialogPrivate));
 
        widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = editor_cell_dialog_show;
+       widget_class->show = html_editor_cell_dialog_show;
 }
 
 static void
-e_editor_cell_dialog_init (EEditorCellDialog *dialog)
+e_html_editor_cell_dialog_init (EHTMLEditorCellDialog *dialog)
 {
        GtkGrid *main_layout, *grid;
        GtkWidget *widget;
        GtkFileFilter *file_filter;
 
-       dialog->priv = E_EDITOR_CELL_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_CELL_DIALOG_GET_PRIVATE (dialog);
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
 
@@ -602,7 +602,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_cell_dialog_set_scope), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_scope), dialog);
 
        /* Scope: row */
        widget = gtk_image_new_from_icon_name ("stock_select-row", GTK_ICON_SIZE_BUTTON);
@@ -615,7 +615,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_cell_dialog_set_scope), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_scope), dialog);
 
        /* Scope: table */
        widget = gtk_image_new_from_icon_name ("stock_select-table", GTK_ICON_SIZE_BUTTON);
@@ -628,7 +628,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_cell_dialog_set_scope), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_scope), dialog);
 
        /* Scope: column */
        widget = gtk_image_new_from_icon_name ("stock_select-column", GTK_ICON_SIZE_BUTTON);
@@ -641,7 +641,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_cell_dialog_set_scope), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_scope), dialog);
 
        /* == Alignment & Behavior == */
        widget = gtk_label_new ("");
@@ -666,7 +666,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_cell_dialog_set_halign), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_halign), dialog);
 
        widget = gtk_label_new_with_mnemonic (_("_Horizontal:"));
        gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
@@ -684,7 +684,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_cell_dialog_set_valign), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_valign), dialog);
 
        widget = gtk_label_new_with_mnemonic (_("_Vertical:"));
        gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
@@ -697,7 +697,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_cell_dialog_set_wrap_text), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_wrap_text), dialog);
 
        /* Header Style */
        widget = gtk_check_button_new_with_mnemonic (_("_Header Style"));
@@ -705,7 +705,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_cell_dialog_set_header_style), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_header_style), dialog);
 
        widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
        gtk_box_pack_start (GTK_BOX (widget), dialog->priv->wrap_text_check, FALSE, FALSE, 0);
@@ -735,7 +735,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_cell_dialog_set_width), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_width), dialog);
        g_object_bind_property (
                dialog->priv->width_check, "active",
                widget, "sensitive",
@@ -749,7 +749,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_cell_dialog_set_width), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_width), dialog);
        g_object_bind_property (
                dialog->priv->width_check, "active",
                widget, "sensitive",
@@ -762,7 +762,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_cell_dialog_set_row_span), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_row_span), dialog);
 
        widget = gtk_label_new_with_mnemonic (_("Row S_pan:"));
        gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
@@ -776,7 +776,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_cell_dialog_set_column_span), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_column_span), dialog);
 
        widget = gtk_label_new_with_mnemonic (_("Co_lumn Span:"));
        gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
@@ -802,7 +802,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "notify::current-color",
-               G_CALLBACK (editor_cell_dialog_set_background_color), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_background_color), dialog);
        dialog->priv->background_color_picker = widget;
 
        widget = gtk_label_new_with_mnemonic (_("C_olor:"));
@@ -828,7 +828,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "file-set",
-               G_CALLBACK (editor_cell_dialog_set_background_image), dialog);
+               G_CALLBACK (html_editor_cell_dialog_set_background_image), dialog);
        dialog->priv->background_image_chooser = widget;
 
        widget =gtk_label_new_with_mnemonic (_("_Image:"));
@@ -841,23 +841,23 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
 }
 
 GtkWidget *
-e_editor_cell_dialog_new (EHTMLEditor *editor)
+e_html_editor_cell_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_CELL_DIALOG,
+                       E_TYPE_HTML_EDITOR_CELL_DIALOG,
                        "editor", editor,
                        "title", N_("Cell Properties"),
                        NULL));
 }
 
 void
-e_editor_cell_dialog_show (EEditorCellDialog *dialog,
+e_html_editor_cell_dialog_show (EHTMLEditorCellDialog *dialog,
                            WebKitDOMNode *cell)
 {
-       EEditorCellDialogClass *class;
+       EHTMLEditorCellDialogClass *class;
 
-       g_return_if_fail (E_IS_EDITOR_CELL_DIALOG (dialog));
+       g_return_if_fail (E_IS_HTML_EDITOR_CELL_DIALOG (dialog));
        g_return_if_fail (cell != NULL);
 
        dialog->priv->cell = e_html_editor_dom_node_find_parent_element (cell, "TD");
@@ -866,7 +866,7 @@ e_editor_cell_dialog_show (EEditorCellDialog *dialog,
                        e_html_editor_dom_node_find_parent_element (cell, "TH");
        }
 
-       class = E_EDITOR_CELL_DIALOG_GET_CLASS (dialog);
+       class = E_HTML_EDITOR_CELL_DIALOG_GET_CLASS (dialog);
        GTK_WIDGET_CLASS (class)->show (GTK_WIDGET (dialog));
 }
 
diff --git a/e-util/e-html-editor-cell-dialog.h b/e-util/e-html-editor-cell-dialog.h
new file mode 100644
index 0000000..3a7f608
--- /dev/null
+++ b/e-util/e-html-editor-cell-dialog.h
@@ -0,0 +1,72 @@
+/*
+ * e-html-editor-cell-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_CELL_DIALOG_H
+#define E_HTML_EDITOR_CELL_DIALOG_H
+
+#include <e-util/e-html-editor-dialog.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_CELL_DIALOG \
+       (e_html_editor_cell_dialog_get_type ())
+#define E_HTML_EDITOR_CELL_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_HTML_EDITOR_CELL_DIALOG, EHTMLEditorCellDialog))
+#define E_HTML_EDITOR_CELL_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_HTML_EDITOR_CELL_DIALOG, EHTMLEditorCellDialogClass))
+#define E_IS_HTML_EDITOR_CELL_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_HTML_EDITOR_CELL_DIALOG))
+#define E_IS_HTML_EDITOR_CELL_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_HTML_EDITOR_CELL_DIALOG))
+#define E_HTML_EDITOR_CELL_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_HTML_EDITOR_CELL_DIALOG, EHTMLEditorCellDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorCellDialog EHTMLEditorCellDialog;
+typedef struct _EHTMLEditorCellDialogClass EHTMLEditorCellDialogClass;
+typedef struct _EHTMLEditorCellDialogPrivate EHTMLEditorCellDialogPrivate;
+
+struct _EHTMLEditorCellDialog {
+       EHTMLEditorDialog parent;
+       EHTMLEditorCellDialogPrivate *priv;
+};
+
+struct _EHTMLEditorCellDialogClass {
+       EHTMLEditorDialogClass parent_class;
+};
+
+GType          e_html_editor_cell_dialog_get_type
+                                               (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_cell_dialog_new   (EHTMLEditor *editor);
+void           e_html_editor_cell_dialog_show  (EHTMLEditorCellDialog *dialog,
+                                                WebKitDOMNode *cell);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_CELL_DIALOG_H */
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index ac63dd3..fb72087 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -21,10 +21,11 @@
 #ifndef E_HTML_EDITOR_PRIVATE_H
 #define E_HTML_EDITOR_PRIVATE_H
 
-#include <e-html-editor.h>
 #include <e-action-combo-box.h>
 #include <e-color-combo.h>
+#include <e-html-editor.h>
 #include <e-html-editor-actions.h>
+#include <e-html-editor-cell-dialog.h>
 #include <e-html-editor-view.h>
 #include <e-editor-find-dialog.h>
 #include <e-editor-replace-dialog.h>
@@ -35,7 +36,6 @@
 #include <e-editor-image-dialog.h>
 #include <e-editor-text-dialog.h>
 #include <e-editor-paragraph-dialog.h>
-#include <e-editor-cell-dialog.h>
 #include <e-editor-spell-check-dialog.h>
 
 #ifdef HAVE_XFREE
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 8cc6278..ecac003 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-cell-dialog.h>
 #include <e-util/e-editor-find-dialog.h>
 #include <e-util/e-editor-hrule-dialog.h>
 #include <e-util/e-editor-image-dialog.h>
@@ -122,6 +121,7 @@
 #include <e-util/e-filter-rule.h>
 #include <e-util/e-focus-tracker.h>
 #include <e-util/e-html-editor-actions.h>
+#include <e-util/e-html-editor-cell-dialog.h>
 #include <e-util/e-html-editor-dialog.h>
 #include <e-util/e-html-editor-selection.h>
 #include <e-util/e-html-editor-utils.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]