GNOME.org
 

[evolution/wip/webkit-composer: 952/966] Rename EEditorImageDialog to EHTMLEditorImageDialog

commit c8932b4d488d8a5b58220ab645ec35e8868cbdc9
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 11:13:28 2014 +0200

    Rename EEditorImageDialog to EHTMLEditorImageDialog

 .../evolution-util/evolution-util-docs.sgml        |    2 +-
 .../evolution-util/evolution-util-sections.txt     |   30 +++---
 doc/reference/evolution-util/evolution-util.types  |    2 +-
 e-util/Makefile.am                                 |    4 +-
 e-util/e-editor-image-dialog.h                     |   72 --------------
 e-util/e-html-editor-actions.c                     |    6 +-
 ...image-dialog.c => e-html-editor-image-dialog.c} |  104 ++++++++++----------
 e-util/e-html-editor-image-dialog.h                |   73 ++++++++++++++
 e-util/e-html-editor-private.h                     |    2 +-
 e-util/e-util.h                                    |    2 +-
 10 files changed, 149 insertions(+), 148 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index e667b4c..b7b08a3 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-image-dialog.xml"/>
     <xi:include href="xml/e-editor-link-dialog.xml"/>
     <xi:include href="xml/e-editor-page-dialog.xml"/>
     <xi:include href="xml/e-editor-paragraph-dialog.xml"/>
@@ -120,6 +119,7 @@
     <xi:include href="xml/e-html-editor-dialog.xml"/>
     <xi:include href="xml/e-html-editor-find-dialog.xml"/>
     <xi:include href="xml/e-html-editor-hrule-dialog.xml"/>
+    <xi:include href="xml/e-html-editor-image-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-image-chooser-dialog.xml"/>
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt 
b/doc/reference/evolution-util/evolution-util-sections.txt
index bf86efe..217cba7 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1673,22 +1673,22 @@ EHTMLEditorHRuleDialogPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-image-dialog</FILE>
-<TITLE>EEditorImageDialog</TITLE>
-EEditorImageDialog
-e_editor_image_dialog_new
-e_editor_image_dialog_show
-<SUBSECTION Standard>
-E_EDITOR_IMAGE_DIALOG
-E_IS_EDITOR_IMAGE_DIALOG
-E_TYPE_EDITOR_IMAGE_DIALOG
-E_EDITOR_IMAGE_DIALOG_CLASS
-E_IS_EDITOR_IMAGE_DIALOG_CLASS
-E_EDITOR_IMAGE_DIALOG_GET_CLASS
-EEditorImageDialogClass
-e_editor_image_dialog_get_type
-<SUBSECTION Private>
-EEditorImageDialogPrivate
+<FILE>e-html-editor-image-dialog</FILE>
+<TITLE>EHTMLEditorImageDialog</TITLE>
+EHTMLEditorImageDialog
+e_html_editor_image_dialog_new
+e_html_editor_image_dialog_show
+<SUBSECTION Standard>
+E_HTML_EDITOR_IMAGE_DIALOG
+E_IS_HTML_EDITOR_IMAGE_DIALOG
+E_TYPE_HTML_EDITOR_IMAGE_DIALOG
+E_HTML_EDITOR_IMAGE_DIALOG_CLASS
+E_IS_HTML_EDITOR_IMAGE_DIALOG_CLASS
+E_HTML_EDITOR_IMAGE_DIALOG_GET_CLASS
+EHTMLEditorImageDialogClass
+e_html_editor_image_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorImageDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types 
b/doc/reference/evolution-util/evolution-util.types
index 2b7b2aa..9e49ed2 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_image_dialog_get_type
 e_editor_link_dialog_get_type
 e_editor_page_dialog_get_type
 e_editor_paragraph_dialog_get_type
@@ -76,6 +75,7 @@ e_html_editor_cell_dialog_get_type
 e_html_editor_dialog_get_type
 e_html_editor_find_dialog_get_type
 e_html_editor_hrule_dialog_get_type
+e_html_editor_image_dialog_get_type
 e_html_editor_selection_get_type
 e_html_editor_view_get_type
 e_emoticon_action_get_type
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 18c2978..cd25b0e 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-image-dialog.h \
        e-editor-link-dialog.h \
        e-editor-page-dialog.h \
        e-editor-paragraph-dialog.h \
@@ -209,6 +208,7 @@ evolution_util_include_HEADERS =  \
        e-html-editor-dialog.h \
        e-html-editor-find-dialog.h \
        e-html-editor-hrule-dialog.h \
+       e-html-editor-image-dialog.h \
        e-html-editor-selection.h \
        e-html-editor-utils.h \
        e-html-editor-view.h \
@@ -448,7 +448,6 @@ libevolution_util_la_SOURCES = \
        e-destination-store.c \
        e-dialog-utils.c \
        e-dialog-widgets.c \
-       e-editor-image-dialog.c \
        e-editor-link-dialog.c \
        e-editor-page-dialog.c \
        e-editor-paragraph-dialog.c \
@@ -480,6 +479,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-dialog.c \
        e-html-editor-find-dialog.c \
        e-html-editor-hrule-dialog.c \
+       e-html-editor-image-dialog.c \
        e-html-editor-private.h \
        e-html-editor-selection.c \
        e-html-editor-utils.c \
diff --git a/e-util/e-html-editor-actions.c b/e-util/e-html-editor-actions.c
index c7dca4f..7024708 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -736,11 +736,11 @@ action_properties_image_cb (GtkAction *action,
 {
        if (editor->priv->image_dialog == NULL) {
                editor->priv->image_dialog =
-                       e_editor_image_dialog_new (editor);
+                       e_html_editor_image_dialog_new (editor);
        }
 
-       e_editor_image_dialog_show (
-               E_EDITOR_IMAGE_DIALOG (editor->priv->image_dialog),
+       e_html_editor_image_dialog_show (
+               E_HTML_EDITOR_IMAGE_DIALOG (editor->priv->image_dialog),
                editor->priv->image);
 }
 
diff --git a/e-util/e-editor-image-dialog.c b/e-util/e-html-editor-image-dialog.c
similarity index 85%
rename from e-util/e-editor-image-dialog.c
rename to e-util/e-html-editor-image-dialog.c
index a69bb74..346de44 100644
--- a/e-util/e-editor-image-dialog.c
+++ b/e-util/e-html-editor-image-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-image-dialog.h
+ * e-html-editor-image-dialog.h
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include "e-editor-image-dialog.h"
+#include "e-html-editor-image-dialog.h"
 
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
@@ -30,11 +30,11 @@
 #include "e-html-editor-utils.h"
 #include "e-image-chooser-dialog.h"
 
-#define E_EDITOR_IMAGE_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_IMAGE_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_IMAGE_DIALOG, EEditorImageDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_IMAGE_DIALOG, EHTMLEditorImageDialogPrivate))
 
-struct _EEditorImageDialogPrivate {
+struct _EHTMLEditorImageDialogPrivate {
        GtkWidget *file_chooser;
        GtkWidget *description_edit;
 
@@ -55,12 +55,12 @@ struct _EEditorImageDialogPrivate {
 };
 
 G_DEFINE_TYPE (
-       EEditorImageDialog,
-       e_editor_image_dialog,
+       EHTMLEditorImageDialog,
+       e_html_editor_image_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
 static void
-editor_image_dialog_set_src (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_src (EHTMLEditorImageDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorSelection *editor_selection;
@@ -78,7 +78,7 @@ editor_image_dialog_set_src (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_alt (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_alt (EHTMLEditorImageDialog *dialog)
 {
        webkit_dom_html_image_element_set_alt (
                dialog->priv->image,
@@ -86,7 +86,7 @@ editor_image_dialog_set_alt (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_width (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_width (EHTMLEditorImageDialog *dialog)
 {
        gint requested;
        gulong natural;
@@ -118,7 +118,7 @@ editor_image_dialog_set_width (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_width_units (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_width_units (EHTMLEditorImageDialog *dialog)
 {
        gint requested;
        gulong natural;
@@ -171,7 +171,7 @@ editor_image_dialog_set_width_units (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_height (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_height (EHTMLEditorImageDialog *dialog)
 {
        gint requested;
        gulong natural;
@@ -203,7 +203,7 @@ editor_image_dialog_set_height (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_height_units (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_height_units (EHTMLEditorImageDialog *dialog)
 {
        gint requested;
        gulong natural;
@@ -256,7 +256,7 @@ editor_image_dialog_set_height_units (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_alignment (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_alignment (EHTMLEditorImageDialog *dialog)
 {
        webkit_dom_html_image_element_set_align (
                dialog->priv->image,
@@ -265,7 +265,7 @@ editor_image_dialog_set_alignment (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_x_padding (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_x_padding (EHTMLEditorImageDialog *dialog)
 {
        webkit_dom_html_image_element_set_hspace (
                dialog->priv->image,
@@ -274,7 +274,7 @@ editor_image_dialog_set_x_padding (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_y_padding (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_y_padding (EHTMLEditorImageDialog *dialog)
 {
        webkit_dom_html_image_element_set_vspace (
                dialog->priv->image,
@@ -283,7 +283,7 @@ editor_image_dialog_set_y_padding (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_border (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_border (EHTMLEditorImageDialog *dialog)
 {
        gchar *val;
 
@@ -297,7 +297,7 @@ editor_image_dialog_set_border (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_set_url (EEditorImageDialog *dialog)
+html_editor_image_dialog_set_url (EHTMLEditorImageDialog *dialog)
 {
        WebKitDOMElement *link;
        const gchar *url;
@@ -347,7 +347,7 @@ editor_image_dialog_set_url (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_test_url (EEditorImageDialog *dialog)
+html_editor_image_dialog_test_url (EHTMLEditorImageDialog *dialog)
 {
        gtk_show_uri (
                gtk_window_get_screen (GTK_WINDOW (dialog)),
@@ -357,14 +357,14 @@ editor_image_dialog_test_url (EEditorImageDialog *dialog)
 }
 
 static void
-editor_image_dialog_show (GtkWidget *widget)
+html_editor_image_dialog_show (GtkWidget *widget)
 {
-       EEditorImageDialog *dialog;
+       EHTMLEditorImageDialog *dialog;
        WebKitDOMElement *link;
        gchar *tmp;
        glong val;
 
-       dialog = E_EDITOR_IMAGE_DIALOG (widget);
+       dialog = E_HTML_EDITOR_IMAGE_DIALOG (widget);
 
        if (!dialog->priv->image) {
                return;
@@ -425,41 +425,41 @@ editor_image_dialog_show (GtkWidget *widget)
        }
 
        /* Chain up to parent implementation */
-       GTK_WIDGET_CLASS (e_editor_image_dialog_parent_class)->show (widget);
+       GTK_WIDGET_CLASS (e_html_editor_image_dialog_parent_class)->show (widget);
 }
 
 static void
-editor_image_dialog_hide (GtkWidget *widget)
+html_editor_image_dialog_hide (GtkWidget *widget)
 {
-       EEditorImageDialogPrivate *priv;
+       EHTMLEditorImageDialogPrivate *priv;
 
-       priv = E_EDITOR_IMAGE_DIALOG_GET_PRIVATE (widget);
+       priv = E_HTML_EDITOR_IMAGE_DIALOG_GET_PRIVATE (widget);
 
        priv->image = NULL;
 
-       GTK_WIDGET_CLASS (e_editor_image_dialog_parent_class)->hide (widget);
+       GTK_WIDGET_CLASS (e_html_editor_image_dialog_parent_class)->hide (widget);
 }
 
 static void
-e_editor_image_dialog_class_init (EEditorImageDialogClass *class)
+e_html_editor_image_dialog_class_init (EHTMLEditorImageDialogClass *class)
 {
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (EEditorImageDialogPrivate));
+       g_type_class_add_private (class, sizeof (EHTMLEditorImageDialogPrivate));
 
        widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = editor_image_dialog_show;
-       widget_class->hide = editor_image_dialog_hide;
+       widget_class->show = html_editor_image_dialog_show;
+       widget_class->hide = html_editor_image_dialog_hide;
 }
 
 static void
-e_editor_image_dialog_init (EEditorImageDialog *dialog)
+e_html_editor_image_dialog_init (EHTMLEditorImageDialog *dialog)
 {
        GtkGrid *main_layout, *grid;
        GtkWidget *widget;
        GtkFileFilter *file_filter;
 
-       dialog->priv = E_EDITOR_IMAGE_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_IMAGE_DIALOG_GET_PRIVATE (dialog);
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
 
@@ -491,7 +491,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "file-set",
-               G_CALLBACK (editor_image_dialog_set_src), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_src), dialog);
        dialog->priv->file_chooser = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Source:"));
@@ -505,7 +505,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "notify::text",
-               G_CALLBACK (editor_image_dialog_set_alt), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_alt), dialog);
        dialog->priv->description_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Description:"));
@@ -530,7 +530,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_image_dialog_set_width), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_width), dialog);
        dialog->priv->width_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Width:"));
@@ -546,7 +546,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 2, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_image_dialog_set_width_units), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_width_units), dialog);
        dialog->priv->width_units = widget;
 
        /* Height */
@@ -554,7 +554,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_image_dialog_set_height), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_height), dialog);
        dialog->priv->height_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Height:"));
@@ -570,7 +570,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 2, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_image_dialog_set_height_units), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_height_units), dialog);
        dialog->priv->height_units = widget;
 
        /* Alignment */
@@ -582,7 +582,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 1, 2, 1, 1);
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_image_dialog_set_alignment), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_alignment), dialog);
        dialog->priv->alignment = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Alignment"));
@@ -595,7 +595,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_image_dialog_set_x_padding), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_x_padding), dialog);
        dialog->priv->x_padding_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_X-Padding:"));
@@ -611,7 +611,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_image_dialog_set_y_padding), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_y_padding), dialog);
        dialog->priv->y_padding_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Y-Padding:"));
@@ -627,7 +627,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 5, 2, 1, 1);
        g_signal_connect_swapped (
                widget, "value-changed",
-               G_CALLBACK (editor_image_dialog_set_border), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_border), dialog);
        dialog->priv->border_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Border:"));
@@ -655,7 +655,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_widget_set_hexpand (widget, TRUE);
        g_signal_connect_swapped (
                widget, "notify::text",
-               G_CALLBACK (editor_image_dialog_set_url), dialog);
+               G_CALLBACK (html_editor_image_dialog_set_url), dialog);
        dialog->priv->url_edit = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_URL:"));
@@ -667,30 +667,30 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
        gtk_grid_attach (grid, widget, 2, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "clicked",
-               G_CALLBACK (editor_image_dialog_test_url), dialog);
+               G_CALLBACK (html_editor_image_dialog_test_url), dialog);
        dialog->priv->test_url_button = widget;
 
        gtk_widget_show_all (GTK_WIDGET (main_layout));
 }
 
 GtkWidget *
-e_editor_image_dialog_new (EHTMLEditor *editor)
+e_html_editor_image_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_IMAGE_DIALOG,
+                       E_TYPE_HTML_EDITOR_IMAGE_DIALOG,
                        "editor", editor,
                        "title", N_("Image Properties"),
                        NULL));
 }
 
 void
-e_editor_image_dialog_show (EEditorImageDialog *dialog,
-                            WebKitDOMNode *image)
+e_html_editor_image_dialog_show (EHTMLEditorImageDialog *dialog,
+                                 WebKitDOMNode *image)
 {
-       EEditorImageDialogClass *class;
+       EHTMLEditorImageDialogClass *class;
 
-       g_return_if_fail (E_IS_EDITOR_IMAGE_DIALOG (dialog));
+       g_return_if_fail (E_IS_HTML_EDITOR_IMAGE_DIALOG (dialog));
 
        if (image) {
                dialog->priv->image = WEBKIT_DOM_HTML_IMAGE_ELEMENT (image);
@@ -698,6 +698,6 @@ e_editor_image_dialog_show (EEditorImageDialog *dialog,
                dialog->priv->image = NULL;
        }
 
-       class = E_EDITOR_IMAGE_DIALOG_GET_CLASS (dialog);
+       class = E_HTML_EDITOR_IMAGE_DIALOG_GET_CLASS (dialog);
        GTK_WIDGET_CLASS (class)->show (GTK_WIDGET (dialog));
 }
diff --git a/e-util/e-html-editor-image-dialog.h b/e-util/e-html-editor-image-dialog.h
new file mode 100644
index 0000000..efdbaf9
--- /dev/null
+++ b/e-util/e-html-editor-image-dialog.h
@@ -0,0 +1,73 @@
+/*
+ * e-html-editor-image-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_IMAGE_DIALOG_H
+#define E_HTML_EDITOR_IMAGE_DIALOG_H
+
+#include <e-util/e-html-editor-dialog.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_IMAGE_DIALOG \
+       (e_html_editor_image_dialog_get_type ())
+#define E_HTML_EDITOR_IMAGE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_HTML_EDITOR_IMAGE_DIALOG, EHTMLEditorImageDialog))
+#define E_HTML_EDITOR_IMAGE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_HTML_EDITOR_IMAGE_DIALOG, EHTMLEditorImageDialogClass))
+#define E_IS_HTML_EDITOR_IMAGE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_HTML_EDITOR_IMAGE_DIALOG))
+#define E_IS_HTML_EDITOR_IMAGE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_HTML_EDITOR_IMAGE_DIALOG))
+#define E_HTML_EDITOR_IMAGE_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_HTML_EDITOR_IMAGE_DIALOG, EHTMLEditorImageDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorImageDialog EHTMLEditorImageDialog;
+typedef struct _EHTMLEditorImageDialogClass EHTMLEditorImageDialogClass;
+typedef struct _EHTMLEditorImageDialogPrivate EHTMLEditorImageDialogPrivate;
+
+struct _EHTMLEditorImageDialog {
+       EHTMLEditorDialog parent;
+       EHTMLEditorImageDialogPrivate *priv;
+};
+
+struct _EHTMLEditorImageDialogClass {
+       EHTMLEditorDialogClass parent_class;
+};
+
+GType          e_html_editor_image_dialog_get_type
+                                               (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_image_dialog_new  (EHTMLEditor *editor);
+void           e_html_editor_image_dialog_show (EHTMLEditorImageDialog *dialog,
+                                                WebKitDOMNode *image);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_IMAGE_DIALOG_H */
+
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index 3730663..80c3e9b 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -28,12 +28,12 @@
 #include <e-html-editor-cell-dialog.h>
 #include <e-html-editor-find-dialog.h>
 #include <e-html-editor-hrule-dialog.h>
+#include <e-html-editor-image-dialog.h>
 #include <e-html-editor-view.h>
 #include <e-editor-replace-dialog.h>
 #include <e-editor-link-dialog.h>
 #include <e-editor-table-dialog.h>
 #include <e-editor-page-dialog.h>
-#include <e-editor-image-dialog.h>
 #include <e-editor-text-dialog.h>
 #include <e-editor-paragraph-dialog.h>
 #include <e-editor-spell-check-dialog.h>
diff --git a/e-util/e-util.h b/e-util/e-util.h
index a567338..fc6b8ee 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-image-dialog.h>
 #include <e-util/e-editor-link-dialog.h>
 #include <e-util/e-editor-page-dialog.h>
 #include <e-util/e-editor-paragraph-dialog.h>
@@ -123,6 +122,7 @@
 #include <e-util/e-html-editor-dialog.h>
 #include <e-util/e-html-editor-find-dialog.h>
 #include <e-util/e-html-editor-hrule-dialog.h>
+#include <e-util/e-html-editor-image-dialog.h>
 #include <e-util/e-html-editor-selection.h>
 #include <e-util/e-html-editor-utils.h>
 #include <e-util/e-html-editor-view.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]