GNOME.org
 

[evolution/wip/webkit-composer: 954/966] Rename EEditorPageDialog to EHTMLEditorPageDialog

commit c015a862c8546e9736f6922d35a7d2bcbfbceff3
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 11:42:17 2014 +0200

    Rename EEditorPageDialog to EHTMLEditorPageDialog

 .../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-page-dialog.h                      |   69 -------------------
 e-util/e-html-editor-actions.c                     |    2 +-
 ...r-page-dialog.c => e-html-editor-page-dialog.c} |   56 ++++++++--------
 e-util/e-html-editor-page-dialog.h                 |   70 ++++++++++++++++++++
 e-util/e-html-editor-private.h                     |    2 +-
 e-util/e-util.h                                    |    2 +-
 10 files changed, 119 insertions(+), 118 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index 3f77e4f..323ba89 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-page-dialog.xml"/>
     <xi:include href="xml/e-editor-paragraph-dialog.xml"/>
     <xi:include href="xml/e-editor-replace-dialog.xml"/>
     <xi:include href="xml/e-editor-spell-check-dialog.xml"/>
@@ -120,6 +119,7 @@
     <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-link-dialog.xml"/>
+    <xi:include href="xml/e-html-editor-page-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 8ca5302..e9537bb 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1710,21 +1710,21 @@ EHTMLEditorLinkDialogPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-page-dialog</FILE>
-<TITLE>EEditorPageDialog</TITLE>
-EEditorPageDialog
-e_editor_page_dialog_new
-<SUBSECTION Standard>
-E_EDITOR_PAGE_DIALOG
-E_IS_EDITOR_PAGE_DIALOG
-E_TYPE_EDITOR_PAGE_DIALOG
-E_EDITOR_PAGE_DIALOG_CLASS
-E_IS_EDITOR_PAGE_DIALOG_CLASS
-E_EDITOR_PAGE_DIALOG_GET_CLASS
-EEditorPageDialogClass
-e_editor_page_dialog_get_type
-<SUBSECTION Private>
-EEditorPageDialogPrivate
+<FILE>e-html-editor-page-dialog</FILE>
+<TITLE>EHTMLEditorPageDialog</TITLE>
+EHTMLEditorPageDialog
+e_html_editor_page_dialog_new
+<SUBSECTION Standard>
+E_HTML_EDITOR_PAGE_DIALOG
+E_IS_HTML_EDITOR_PAGE_DIALOG
+E_TYPE_HTML_EDITOR_PAGE_DIALOG
+E_HTML_EDITOR_PAGE_DIALOG_CLASS
+E_IS_HTML_EDITOR_PAGE_DIALOG_CLASS
+E_HTML_EDITOR_PAGE_DIALOG_GET_CLASS
+EHTMLEditorPageDialogClass
+e_html_editor_page_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorPageDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types 
b/doc/reference/evolution-util/evolution-util.types
index 6881cf0..82a0a5e 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_page_dialog_get_type
 e_editor_paragraph_dialog_get_type
 e_editor_replace_dialog_get_type
 e_editor_spell_check_dialog_get_type
@@ -76,6 +75,7 @@ e_html_editor_find_dialog_get_type
 e_html_editor_hrule_dialog_get_type
 e_html_editor_image_dialog_get_type
 e_html_editor_link_dialog_get_type
+e_html_editor_page_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 230c8f4..800bbb8 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-page-dialog.h \
        e-editor-paragraph-dialog.h \
        e-editor-replace-dialog.h \
        e-editor-spell-check-dialog.h \
@@ -209,6 +208,7 @@ evolution_util_include_HEADERS =  \
        e-html-editor-hrule-dialog.h \
        e-html-editor-image-dialog.h \
        e-html-editor-link-dialog.h \
+       e-html-editor-page-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-page-dialog.c \
        e-editor-paragraph-dialog.c \
        e-editor-replace-dialog.c \
        e-editor-spell-check-dialog.c \
@@ -480,6 +479,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-hrule-dialog.c \
        e-html-editor-image-dialog.c \
        e-html-editor-link-dialog.c \
+       e-html-editor-page-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 5cfbd4e..9916f9c 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -762,7 +762,7 @@ action_properties_page_cb (GtkAction *action,
 {
        if (editor->priv->page_dialog == NULL) {
                editor->priv->page_dialog =
-                       e_editor_page_dialog_new (editor);
+                       e_html_editor_page_dialog_new (editor);
        }
 
        gtk_window_present (GTK_WINDOW (editor->priv->page_dialog));
diff --git a/e-util/e-editor-page-dialog.c b/e-util/e-html-editor-page-dialog.c
similarity index 88%
rename from e-util/e-editor-page-dialog.c
rename to e-util/e-html-editor-page-dialog.c
index 2bd2494..53c8fce 100644
--- a/e-util/e-editor-page-dialog.c
+++ b/e-util/e-html-editor-page-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-page-dialog.h
+ * e-html-editor-page-dialog.h
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,18 +22,18 @@
 #include <config.h>
 #endif
 
-#include "e-editor-page-dialog.h"
+#include "e-html-editor-page-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "e-color-combo.h"
 #include "e-misc-utils.h"
 
-#define E_EDITOR_PAGE_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_PAGE_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_PAGE_DIALOG, EEditorPageDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_PAGE_DIALOG, EHTMLEditorPageDialogPrivate))
 
-struct _EEditorPageDialogPrivate {
+struct _EHTMLEditorPageDialogPrivate {
        GtkWidget *text_color_picker;
        GtkWidget *link_color_picker;
        GtkWidget *background_color_picker;
@@ -136,12 +136,12 @@ static const Template templates[] = {
 };
 
 G_DEFINE_TYPE (
-       EEditorPageDialog,
-       e_editor_page_dialog,
+       EHTMLEditorPageDialog,
+       e_html_editor_page_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
 static void
-editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
+html_editor_page_dialog_set_text_color (EHTMLEditorPageDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -166,7 +166,7 @@ editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
 }
 
 static void
-editor_page_dialog_set_link_color (EEditorPageDialog *dialog)
+html_editor_page_dialog_set_link_color (EHTMLEditorPageDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -191,7 +191,7 @@ editor_page_dialog_set_link_color (EEditorPageDialog *dialog)
 }
 
 static void
-editor_page_dialog_set_background_color (EEditorPageDialog *dialog)
+html_editor_page_dialog_set_background_color (EHTMLEditorPageDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -217,7 +217,7 @@ editor_page_dialog_set_background_color (EEditorPageDialog *dialog)
 }
 
 static void
-editor_page_dialog_set_background_from_template (EEditorPageDialog *dialog)
+html_editor_page_dialog_set_background_from_template (EHTMLEditorPageDialog *dialog)
 {
        const Template *tmplt;
 
@@ -253,7 +253,7 @@ editor_page_dialog_set_background_from_template (EEditorPageDialog *dialog)
 }
 
 static void
-editor_page_dialog_set_background_image (EEditorPageDialog *dialog)
+html_editor_page_dialog_set_background_image (EHTMLEditorPageDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -277,17 +277,17 @@ editor_page_dialog_set_background_image (EEditorPageDialog *dialog)
 }
 
 static void
-editor_page_dialog_show (GtkWidget *widget)
+html_editor_page_dialog_show (GtkWidget *widget)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
-       EEditorPageDialog *dialog;
+       EHTMLEditorPageDialog *dialog;
        WebKitDOMDocument *document;
        WebKitDOMHTMLElement *body;
        gchar *tmp;
        GdkRGBA rgba;
 
-       dialog = E_EDITOR_PAGE_DIALOG (widget);
+       dialog = E_HTML_EDITOR_PAGE_DIALOG (widget);
        editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
        view = e_html_editor_get_view (editor);
 
@@ -371,28 +371,28 @@ editor_page_dialog_show (GtkWidget *widget)
        e_color_combo_set_current_color (
                E_COLOR_COMBO (dialog->priv->background_color_picker), &rgba);
 
-       GTK_WIDGET_CLASS (e_editor_page_dialog_parent_class)->show (widget);
+       GTK_WIDGET_CLASS (e_html_editor_page_dialog_parent_class)->show (widget);
 }
 
 static void
-e_editor_page_dialog_class_init (EEditorPageDialogClass *class)
+e_html_editor_page_dialog_class_init (EHTMLEditorPageDialogClass *class)
 {
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (EEditorPageDialogPrivate));
+       g_type_class_add_private (class, sizeof (EHTMLEditorPageDialogPrivate));
 
        widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = editor_page_dialog_show;
+       widget_class->show = html_editor_page_dialog_show;
 }
 
 static void
-e_editor_page_dialog_init (EEditorPageDialog *dialog)
+e_html_editor_page_dialog_init (EHTMLEditorPageDialog *dialog)
 {
        GtkGrid *grid, *main_layout;
        GtkWidget *widget;
        gint ii;
 
-       dialog->priv = E_EDITOR_PAGE_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_PAGE_DIALOG_GET_PRIVATE (dialog);
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
 
@@ -413,7 +413,7 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
        gtk_widget_set_hexpand (widget, TRUE);
        g_signal_connect_swapped (
                widget, "notify::current-color",
-               G_CALLBACK (editor_page_dialog_set_text_color), dialog);
+               G_CALLBACK (html_editor_page_dialog_set_text_color), dialog);
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        dialog->priv->text_color_picker = widget;
 
@@ -428,7 +428,7 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
        gtk_widget_set_hexpand (widget, TRUE);
        g_signal_connect_swapped (
                widget, "notify::current-color",
-               G_CALLBACK (editor_page_dialog_set_link_color), dialog);
+               G_CALLBACK (html_editor_page_dialog_set_link_color), dialog);
        gtk_grid_attach (grid, widget, 1, 1, 1, 1);
        dialog->priv->link_color_picker = widget;
 
@@ -443,7 +443,7 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
        gtk_widget_set_hexpand (widget, TRUE);
        g_signal_connect_swapped (
                widget, "notify::current-color",
-               G_CALLBACK (editor_page_dialog_set_background_color), dialog);
+               G_CALLBACK (html_editor_page_dialog_set_background_color), dialog);
        gtk_grid_attach (grid, widget, 1, 2, 1, 1);
        dialog->priv->background_color_picker = widget;
 
@@ -473,7 +473,7 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
        }
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_page_dialog_set_background_from_template), dialog);
+               G_CALLBACK (html_editor_page_dialog_set_background_from_template), dialog);
        gtk_grid_attach (grid, widget, 1, 0, 1, 1);
        dialog->priv->background_template_combo = widget;
 
@@ -488,7 +488,7 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
                _("Selection a file"), GTK_FILE_CHOOSER_ACTION_OPEN);
        g_signal_connect_swapped (
                widget, "selection-changed",
-               G_CALLBACK (editor_page_dialog_set_background_image), dialog);
+               G_CALLBACK (html_editor_page_dialog_set_background_image), dialog);
        gtk_grid_attach (grid, widget, 1, 1, 1, 1);
        dialog->priv->background_image_filechooser = widget;
 
@@ -502,11 +502,11 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
 }
 
 GtkWidget *
-e_editor_page_dialog_new (EHTMLEditor *editor)
+e_html_editor_page_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_PAGE_DIALOG,
+                       E_TYPE_HTML_EDITOR_PAGE_DIALOG,
                        "editor", editor,
                        "title", N_("Page Properties"),
                        NULL));
diff --git a/e-util/e-html-editor-page-dialog.h b/e-util/e-html-editor-page-dialog.h
new file mode 100644
index 0000000..5678efc
--- /dev/null
+++ b/e-util/e-html-editor-page-dialog.h
@@ -0,0 +1,70 @@
+/*
+ * e-html-editor-page-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_PAGE_DIALOG_H
+#define E_HTML_EDITOR_PAGE_DIALOG_H
+
+#include <e-util/e-html-editor-dialog.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_PAGE_DIALOG \
+       (e_html_editor_page_dialog_get_type ())
+#define E_HTML_EDITOR_PAGE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_HTML_EDITOR_PAGE_DIALOG, EHTMLEditorPageDialog))
+#define E_HTML_EDITOR_PAGE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_HTML_EDITOR_PAGE_DIALOG, EHTMLEditorPageDialogClass))
+#define E_IS_HTML_EDITOR_PAGE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_HTML_EDITOR_PAGE_DIALOG))
+#define E_IS_HTML_EDITOR_PAGE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_HTML_EDITOR_PAGE_DIALOG))
+#define E_HTML_EDITOR_PAGE_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_HTML_EDITOR_PAGE_DIALOG, EHTMLEditorPageDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorPageDialog EHTMLEditorPageDialog;
+typedef struct _EHTMLEditorPageDialogClass EHTMLEditorPageDialogClass;
+typedef struct _EHTMLEditorPageDialogPrivate EHTMLEditorPageDialogPrivate;
+
+struct _EHTMLEditorPageDialog {
+       EHTMLEditorDialog parent;
+       EHTMLEditorPageDialogPrivate *priv;
+};
+
+struct _EHTMLEditorPageDialogClass {
+       EHTMLEditorDialogClass parent_class;
+};
+
+GType          e_html_editor_page_dialog_get_type
+                                               (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_page_dialog_new   (EHTMLEditor *editor);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_PAGE_DIALOG_H */
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index 87e5186..17efd7b 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -30,10 +30,10 @@
 #include <e-html-editor-hrule-dialog.h>
 #include <e-html-editor-image-dialog.h>
 #include <e-html-editor-link-dialog.h>
+#include <e-html-editor-page-dialog.h>
 #include <e-html-editor-view.h>
 #include <e-editor-replace-dialog.h>
 #include <e-editor-table-dialog.h>
-#include <e-editor-page-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 dcb23a0..e675b4d 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-page-dialog.h>
 #include <e-util/e-editor-paragraph-dialog.h>
 #include <e-util/e-editor-replace-dialog.h>
 #include <e-util/e-editor-spell-check-dialog.h>
@@ -123,6 +122,7 @@
 #include <e-util/e-html-editor-hrule-dialog.h>
 #include <e-util/e-html-editor-image-dialog.h>
 #include <e-util/e-html-editor-link-dialog.h>
+#include <e-util/e-html-editor-page-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]