[evolution/wip/webkit-composer] Rename EEditorTextDialog to EHTMLEditorTextDialog

From: Tomas Popela <tpopela src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/wip/webkit-composer] Rename EEditorTextDialog to EHTMLEditorTextDialog
Date: Mon, 31 Mar 2014 12:13:00 +0000 (UTC)
commit c7ce6ca14621380c98c510be3341eab1a05bcda6
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 13:44:18 2014 +0200

    Rename EEditorTextDialog to EHTMLEditorTextDialog

 .../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-html-editor-actions.c                     |    2 +-
 e-util/e-html-editor-private.h                     |    2 +-
 ...r-text-dialog.c => e-html-editor-text-dialog.c} |   60 ++++++++++----------
 ...r-text-dialog.h => e-html-editor-text-dialog.h} |   48 ++++++++--------
 e-util/e-util.h                                    |    2 +-
 9 files changed, 75 insertions(+), 75 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index 2dbd3e7..262ddae 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-text-dialog.xml"/>
     <xi:include href="xml/e-color-chooser-widget.xml"/>
     <xi:include href="xml/e-color-combo.xml"/>
     <xi:include href="xml/e-emoticon.xml"/>
@@ -121,6 +120,7 @@
     <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-text-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 7029b8b..5caac91 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1866,21 +1866,21 @@ EHTMLEditorTableDialogPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-text-dialog</FILE>
-<TITLE>EEditorTextDialog</TITLE>
-EEditorTextDialog
-e_editor_text_dialog_new
-<SUBSECTION Standard>
-E_EDITOR_TEXT_DIALOG
-E_IS_EDITOR_TEXT_DIALOG
-E_TYPE_EDITOR_TEXT_DIALOG
-E_EDITOR_TEXT_DIALOG_CLASS
-E_IS_EDITOR_TEXT_DIALOG_CLASS
-E_EDITOR_TEXT_DIALOG_GET_CLASS
-EEditorTextDialogClass
-e_editor_text_dialog_get_type
-<SUBSECTION Private>
-EEditorTextDialogPrivate
+<FILE>e-html-editor-text-dialog</FILE>
+<TITLE>EHTMLEditorTextDialog</TITLE>
+EHTMLEditorTextDialog
+e_html_editor_text_dialog_new
+<SUBSECTION Standard>
+E_HTML_EDITOR_TEXT_DIALOG
+E_IS_HTML_EDITOR_TEXT_DIALOG
+E_TYPE_HTML_EDITOR_TEXT_DIALOG
+E_HTML_EDITOR_TEXT_DIALOG_CLASS
+E_IS_HTML_EDITOR_TEXT_DIALOG_CLASS
+E_HTML_EDITOR_TEXT_DIALOG_GET_CLASS
+EHTMLEditorTextDialogClass
+e_html_editor_text_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorTextDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types 
b/doc/reference/evolution-util/evolution-util.types
index 03caf24..8128567 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_text_dialog_get_type
 e_html_editor_get_type
 e_html_editor_cell_dialog_get_type
 e_html_editor_dialog_get_type
@@ -77,6 +76,7 @@ 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_text_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 ca15819..6962fec 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -176,7 +176,6 @@ evolution_util_include_HEADERS =  \
        e-destination-store.h \
        e-dialog-utils.h \
        e-dialog-widgets.h \
-       e-editor-text-dialog.h \
        e-emoticon-action.h \
        e-emoticon-chooser-menu.h \
        e-emoticon-chooser.h \
@@ -209,6 +208,7 @@ evolution_util_include_HEADERS =  \
        e-html-editor-selection.h \
        e-html-editor-spell-check-dialog.h \
        e-html-editor-table-dialog.h \
+       e-html-editor-text-dialog.h \
        e-html-editor-utils.h \
        e-html-editor-view.h \
        e-html-editor.h \
@@ -447,7 +447,6 @@ libevolution_util_la_SOURCES = \
        e-destination-store.c \
        e-dialog-utils.c \
        e-dialog-widgets.c \
-       e-editor-text-dialog.c \
        e-emoticon-action.c \
        e-emoticon-chooser-menu.c \
        e-emoticon-chooser.c \
@@ -481,6 +480,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-selection.c \
        e-html-editor-spell-check-dialog.c \
        e-html-editor-table-dialog.c \
+       e-html-editor-text-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 f2c2abe..6db3ad4 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -810,7 +810,7 @@ action_properties_text_cb (GtkAction *action,
 {
        if (editor->priv->text_dialog == NULL) {
                editor->priv->text_dialog =
-                       e_editor_text_dialog_new (editor);
+                       e_html_editor_text_dialog_new (editor);
        }
 
        gtk_window_present (GTK_WINDOW (editor->priv->text_dialog));
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index 4159b36..13e387b 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -35,8 +35,8 @@
 #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-text-dialog.h>
 #include <e-html-editor-view.h>
-#include <e-editor-text-dialog.h>
 
 #ifdef HAVE_XFREE
 #include <X11/XF86keysym.h>
diff --git a/e-util/e-editor-text-dialog.c b/e-util/e-html-editor-text-dialog.c
similarity index 82%
rename from e-util/e-editor-text-dialog.c
rename to e-util/e-html-editor-text-dialog.c
index 1e8240c..2db792c 100644
--- a/e-util/e-editor-text-dialog.c
+++ b/e-util/e-html-editor-text-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-text-dialog.c
+ * e-html-editor-text-dialog.c
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,17 +22,17 @@
 #include <config.h>
 #endif
 
-#include "e-editor-text-dialog.h"
+#include "e-html-editor-text-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "e-color-combo.h"
 
-#define E_EDITOR_TEXT_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_TEXT_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_TEXT_DIALOG, EEditorTextDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_TEXT_DIALOG, EHTMLEditorTextDialogPrivate))
 
-struct _EEditorTextDialogPrivate {
+struct _EHTMLEditorTextDialogPrivate {
        GtkWidget *bold_check;
        GtkWidget *italic_check;
        GtkWidget *underline_check;
@@ -43,12 +43,12 @@ struct _EEditorTextDialogPrivate {
 };
 
 G_DEFINE_TYPE (
-       EEditorTextDialog,
-       e_editor_text_dialog,
+       EHTMLEditorTextDialog,
+       e_html_editor_text_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
 static void
-editor_text_dialog_set_bold (EEditorTextDialog *dialog)
+html_editor_text_dialog_set_bold (EHTMLEditorTextDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -65,7 +65,7 @@ editor_text_dialog_set_bold (EEditorTextDialog *dialog)
 }
 
 static void
-editor_text_dialog_set_italic (EEditorTextDialog *dialog)
+html_editor_text_dialog_set_italic (EHTMLEditorTextDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -82,7 +82,7 @@ editor_text_dialog_set_italic (EEditorTextDialog *dialog)
 }
 
 static void
-editor_text_dialog_set_underline (EEditorTextDialog *dialog)
+html_editor_text_dialog_set_underline (EHTMLEditorTextDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -99,7 +99,7 @@ editor_text_dialog_set_underline (EEditorTextDialog *dialog)
 }
 
 static void
-editor_text_dialog_set_strikethrough (EEditorTextDialog *dialog)
+html_editor_text_dialog_set_strikethrough (EHTMLEditorTextDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -116,7 +116,7 @@ editor_text_dialog_set_strikethrough (EEditorTextDialog *dialog)
 }
 
 static void
-editor_text_dialog_set_color (EEditorTextDialog *dialog)
+html_editor_text_dialog_set_color (EHTMLEditorTextDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -133,7 +133,7 @@ editor_text_dialog_set_color (EEditorTextDialog *dialog)
 }
 
 static void
-editor_text_dialog_set_size (EEditorTextDialog *dialog)
+html_editor_text_dialog_set_size (EHTMLEditorTextDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -149,15 +149,15 @@ editor_text_dialog_set_size (EEditorTextDialog *dialog)
 }
 
 static void
-editor_text_dialog_show (GtkWidget *widget)
+html_editor_text_dialog_show (GtkWidget *widget)
 {
-       EEditorTextDialog *dialog;
+       EHTMLEditorTextDialog *dialog;
        EHTMLEditor *editor;
        EHTMLEditorView *view;
        EHTMLEditorSelection *selection;
        GdkRGBA rgba;
 
-       dialog = E_EDITOR_TEXT_DIALOG (widget);
+       dialog = E_HTML_EDITOR_TEXT_DIALOG (widget);
        editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
        view = e_html_editor_get_view (editor);
        selection = e_html_editor_view_get_selection (view);
@@ -183,27 +183,27 @@ editor_text_dialog_show (GtkWidget *widget)
        e_color_combo_set_current_color (
                E_COLOR_COMBO (dialog->priv->color_check), &rgba);
 
-       GTK_WIDGET_CLASS (e_editor_text_dialog_parent_class)->show (widget);
+       GTK_WIDGET_CLASS (e_html_editor_text_dialog_parent_class)->show (widget);
 }
 
 static void
-e_editor_text_dialog_class_init (EEditorTextDialogClass *class)
+e_html_editor_text_dialog_class_init (EHTMLEditorTextDialogClass *class)
 {
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (EEditorTextDialogPrivate));
+       g_type_class_add_private (class, sizeof (EHTMLEditorTextDialogPrivate));
 
        widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = editor_text_dialog_show;
+       widget_class->show = html_editor_text_dialog_show;
 }
 
 static void
-e_editor_text_dialog_init (EEditorTextDialog *dialog)
+e_html_editor_text_dialog_init (EHTMLEditorTextDialog *dialog)
 {
        GtkGrid *main_layout;
        GtkWidget *widget;
 
-       dialog->priv = E_EDITOR_TEXT_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_TEXT_DIALOG_GET_PRIVATE (dialog);
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
 
@@ -215,7 +215,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
        gtk_grid_attach (main_layout, widget, 1, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_text_dialog_set_bold), dialog);
+               G_CALLBACK (html_editor_text_dialog_set_bold), dialog);
        dialog->priv->bold_check = widget;
 
        /* Italic */
@@ -226,7 +226,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
        gtk_grid_attach (main_layout, widget, 1, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_text_dialog_set_italic), dialog);
+               G_CALLBACK (html_editor_text_dialog_set_italic), dialog);
        dialog->priv->italic_check = widget;
 
        /* Underline */
@@ -237,7 +237,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
        gtk_grid_attach (main_layout, widget, 1, 2, 1, 1);
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_text_dialog_set_underline), dialog);
+               G_CALLBACK (html_editor_text_dialog_set_underline), dialog);
        dialog->priv->underline_check = widget;
 
        widget = gtk_image_new_from_stock (GTK_STOCK_STRIKETHROUGH, GTK_ICON_SIZE_BUTTON);
@@ -247,7 +247,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
        gtk_grid_attach (main_layout, widget, 1, 3, 1, 1);
        g_signal_connect_swapped (
                widget, "toggled",
-               G_CALLBACK (editor_text_dialog_set_strikethrough), dialog);
+               G_CALLBACK (html_editor_text_dialog_set_strikethrough), dialog);
        dialog->priv->strikethrough_check = widget;
 
        /* Color */
@@ -255,7 +255,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
        gtk_grid_attach (main_layout, widget, 3, 0, 1, 1);
        g_signal_connect_swapped (
                widget, "notify::current-color",
-               G_CALLBACK (editor_text_dialog_set_color), dialog);
+               G_CALLBACK (html_editor_text_dialog_set_color), dialog);
        dialog->priv->color_check = widget;
 
        widget = gtk_label_new_with_mnemonic (_("_Color:"));
@@ -275,7 +275,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
        gtk_grid_attach (main_layout, widget, 3, 1, 1, 1);
        g_signal_connect_swapped (
                widget, "changed",
-               G_CALLBACK (editor_text_dialog_set_size), dialog);
+               G_CALLBACK (html_editor_text_dialog_set_size), dialog);
        dialog->priv->size_check = widget;
 
        widget = gtk_label_new_with_mnemonic (_("Si_ze:"));
@@ -287,11 +287,11 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
 }
 
 GtkWidget *
-e_editor_text_dialog_new (EHTMLEditor *editor)
+e_html_editor_text_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_TEXT_DIALOG,
+                       E_TYPE_HTML_EDITOR_TEXT_DIALOG,
                        "editor", editor,
                        "title", N_("Text Properties"),
                        NULL));
diff --git a/e-util/e-editor-text-dialog.h b/e-util/e-html-editor-text-dialog.h
similarity index 50%
rename from e-util/e-editor-text-dialog.h
rename to e-util/e-html-editor-text-dialog.h
index 2af043f..006b780 100644
--- a/e-util/e-editor-text-dialog.h
+++ b/e-util/e-html-editor-text-dialog.h
@@ -1,5 +1,5 @@
 /*
- * e-editor-text-dialog.h
+ * e-html-editor-text-dialog.h
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,48 +22,48 @@
 #error "Only <e-util/e-util.h> should be included directly."
 #endif
 
-#ifndef E_EDITOR_TEXT_DIALOG_H
-#define E_EDITOR_TEXT_DIALOG_H
+#ifndef E_HTML_EDITOR_TEXT_DIALOG_H
+#define E_HTML_EDITOR_TEXT_DIALOG_H
 
 #include <e-util/e-html-editor-dialog.h>
 
 /* Standard GObject macros */
-#define E_TYPE_EDITOR_TEXT_DIALOG \
-       (e_editor_text_dialog_get_type ())
-#define E_EDITOR_TEXT_DIALOG(obj) \
+#define E_TYPE_HTML_EDITOR_TEXT_DIALOG \
+       (e_html_editor_text_dialog_get_type ())
+#define E_HTML_EDITOR_TEXT_DIALOG(obj) \
        (G_TYPE_CHECK_INSTANCE_CAST \
-       ((obj), E_TYPE_EDITOR_TEXT_DIALOG, EEditorTextDialog))
-#define E_EDITOR_TEXT_DIALOG_CLASS(cls) \
+       ((obj), E_TYPE_HTML_EDITOR_TEXT_DIALOG, EHTMLEditorTextDialog))
+#define E_HTML_EDITOR_TEXT_DIALOG_CLASS(cls) \
        (G_TYPE_CHECK_CLASS_CAST \
-       ((cls), E_TYPE_EDITOR_TEXT_DIALOG, EEditorTextDialogClass))
-#define E_IS_EDITOR_TEXT_DIALOG(obj) \
+       ((cls), E_TYPE_HTML_EDITOR_TEXT_DIALOG, EHTMLEditorTextDialogClass))
+#define E_IS_HTML_EDITOR_TEXT_DIALOG(obj) \
        (G_TYPE_CHECK_INSTANCE_TYPE \
-       ((obj), E_TYPE_EDITOR_TEXT_DIALOG))
-#define E_IS_EDITOR_TEXT_DIALOG_CLASS(cls) \
+       ((obj), E_TYPE_HTML_EDITOR_TEXT_DIALOG))
+#define E_IS_HTML_EDITOR_TEXT_DIALOG_CLASS(cls) \
        (G_TYPE_CHECK_CLASS_TYPE \
-       ((cls), E_TYPE_EDITOR_TEXT_DIALOG))
-#define E_EDITOR_TEXT_DIALOG_GET_CLASS(obj) \
+       ((cls), E_TYPE_HTML_EDITOR_TEXT_DIALOG))
+#define E_HTML_EDITOR_TEXT_DIALOG_GET_CLASS(obj) \
        (G_TYPE_INSTANCE_GET_CLASS \
-       ((obj), E_TYPE_EDITOR_TEXT_DIALOG, EEditorTextDialogClass))
+       ((obj), E_TYPE_HTML_EDITOR_TEXT_DIALOG, EHTMLEditorTextDialogClass))
 
 G_BEGIN_DECLS
 
-typedef struct _EEditorTextDialog EEditorTextDialog;
-typedef struct _EEditorTextDialogClass EEditorTextDialogClass;
-typedef struct _EEditorTextDialogPrivate EEditorTextDialogPrivate;
+typedef struct _EHTMLEditorTextDialog EHTMLEditorTextDialog;
+typedef struct _EHTMLEditorTextDialogClass EHTMLEditorTextDialogClass;
+typedef struct _EHTMLEditorTextDialogPrivate EHTMLEditorTextDialogPrivate;
 
-struct _EEditorTextDialog {
+struct _EHTMLEditorTextDialog {
        EHTMLEditorDialog parent;
-       EEditorTextDialogPrivate *priv;
+       EHTMLEditorTextDialogPrivate *priv;
 };
 
-struct _EEditorTextDialogClass {
+struct _EHTMLEditorTextDialogClass {
        EHTMLEditorDialogClass parent_class;
 };
 
-GType          e_editor_text_dialog_get_type   (void) G_GNUC_CONST;
-GtkWidget *    e_editor_text_dialog_new        (EHTMLEditor *editor);
+GType          e_html_editor_text_dialog_get_type      (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_text_dialog_new   (EHTMLEditor *editor);
 
 G_END_DECLS
 
-#endif /* E_EDITOR_TEXT_DIALOG_H */
+#endif /* E_HTML_EDITOR_TEXT_DIALOG_H */
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 92084e3..e9b06fe 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-text-dialog.h>
 #include <e-util/e-emoticon-action.h>
 #include <e-util/e-emoticon-chooser-menu.h>
 #include <e-util/e-emoticon-chooser.h>
@@ -124,6 +123,7 @@
 #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-text-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]