GNOME.org
 

[evolution/wip/webkit-composer: 955/966] Rename EEditorParagraphDialog to EHTMLEditorParagraphDialog

commit de81c0d92a1e8c4cfb13b2254a91252314252221
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 11:56:33 2014 +0200

    Rename EEditorParagraphDialog to EHTMLEditorParagraphDialog

 .../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-paragraph-dialog.h                 |   70 -------------------
 e-util/e-html-editor-actions.c                     |    2 +-
 ...h-dialog.c => e-html-editor-paragraph-dialog.c} |   34 +++++-----
 e-util/e-html-editor-paragraph-dialog.h            |   71 ++++++++++++++++++++
 e-util/e-html-editor-private.h                     |    2 +-
 e-util/e-util.h                                    |    2 +-
 10 files changed, 109 insertions(+), 108 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index 323ba89..6fc04dd 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-paragraph-dialog.xml"/>
     <xi:include href="xml/e-editor-replace-dialog.xml"/>
     <xi:include href="xml/e-editor-spell-check-dialog.xml"/>
     <xi:include href="xml/e-editor-table-dialog.xml"/>
@@ -120,6 +119,7 @@
     <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-paragraph-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 e9537bb..fbd4a9d 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1728,21 +1728,21 @@ EHTMLEditorPageDialogPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-paragraph-dialog</FILE>
-<TITLE>EEditorParagraphDialog</TITLE>
-EEditorParagraphDialog
-e_editor_paragraph_dialog_new
-<SUBSECTION Standard>
-E_EDITOR_PARAGRAPH_DIALOG
-E_IS_EDITOR_PARAGRAPH_DIALOG
-E_TYPE_EDITOR_PARAGRAPH_DIALOG
-E_EDITOR_PARAGRAPH_DIALOG_CLASS
-E_IS_EDITOR_PARAGRAPH_DIALOG_CLASS
-E_EDITOR_PARAGRAPH_DIALOG_GET_CLASS
-EEditorParagraphClass
-e_editor_paragraph_dialog_get_type
-<SUBSECTION Private>
-EEditorParagraphDialogPrivate
+<FILE>e-html-editor-paragraph-dialog</FILE>
+<TITLE>EHTMLEditorParagraphDialog</TITLE>
+EHTMLEditorParagraphDialog
+e_html_editor_paragraph_dialog_new
+<SUBSECTION Standard>
+E_HTML_EDITOR_PARAGRAPH_DIALOG
+E_IS_HTML_EDITOR_PARAGRAPH_DIALOG
+E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG
+E_HTML_EDITOR_PARAGRAPH_DIALOG_CLASS
+E_IS_HTML_EDITOR_PARAGRAPH_DIALOG_CLASS
+E_HTML_EDITOR_PARAGRAPH_DIALOG_GET_CLASS
+EHTMLEditorParagraphDialogClass
+e_html_editor_paragraph_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorParagraphDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types 
b/doc/reference/evolution-util/evolution-util.types
index 82a0a5e..1edd434 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_paragraph_dialog_get_type
 e_editor_replace_dialog_get_type
 e_editor_spell_check_dialog_get_type
 e_editor_table_dialog_get_type
@@ -76,6 +75,7 @@ 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_paragraph_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 800bbb8..7161f1d 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-paragraph-dialog.h \
        e-editor-replace-dialog.h \
        e-editor-spell-check-dialog.h \
        e-editor-table-dialog.h \
@@ -209,6 +208,7 @@ evolution_util_include_HEADERS =  \
        e-html-editor-image-dialog.h \
        e-html-editor-link-dialog.h \
        e-html-editor-page-dialog.h \
+       e-html-editor-paragraph-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-paragraph-dialog.c \
        e-editor-replace-dialog.c \
        e-editor-spell-check-dialog.c \
        e-editor-table-dialog.c \
@@ -480,6 +479,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-image-dialog.c \
        e-html-editor-link-dialog.c \
        e-html-editor-page-dialog.c \
+       e-html-editor-paragraph-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 9916f9c..8459cb8 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -774,7 +774,7 @@ action_properties_paragraph_cb (GtkAction *action,
 {
        if (editor->priv->paragraph_dialog == NULL) {
                editor->priv->paragraph_dialog =
-                       e_editor_paragraph_dialog_new (editor);
+                       e_html_editor_paragraph_dialog_new (editor);
        }
 
        gtk_window_present (GTK_WINDOW (editor->priv->paragraph_dialog));
diff --git a/e-util/e-editor-paragraph-dialog.c b/e-util/e-html-editor-paragraph-dialog.c
similarity index 81%
rename from e-util/e-editor-paragraph-dialog.c
rename to e-util/e-html-editor-paragraph-dialog.c
index bbd72e0..f0fce97 100644
--- a/e-util/e-editor-paragraph-dialog.c
+++ b/e-util/e-html-editor-paragraph-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-text-dialog.c
+ * e-html-editor-paragraph-dialog.c
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,22 +22,22 @@
 #include <config.h>
 #endif
 
-#include "e-editor-paragraph-dialog.h"
+#include "e-html-editor-paragraph-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "e-action-combo-box.h"
 
-#define E_EDITOR_PARAGRAPH_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_PARAGRAPH_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_PARAGRAPH_DIALOG, EEditorParagraphDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG, EHTMLEditorParagraphDialogPrivate))
 
 G_DEFINE_TYPE (
-       EEditorParagraphDialog,
-       e_editor_paragraph_dialog,
+       EHTMLEditorParagraphDialog,
+       e_html_editor_paragraph_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
-struct _EEditorParagraphDialogPrivate {
+struct _EHTMLEditorParagraphDialogPrivate {
        GtkWidget *style_combo;
 
        GtkWidget *left_button;
@@ -46,14 +46,14 @@ struct _EEditorParagraphDialogPrivate {
 };
 
 static void
-editor_paragraph_dialog_constructed (GObject *object)
+html_editor_paragraph_dialog_constructed (GObject *object)
 {
        GtkGrid *main_layout, *grid;
        GtkWidget *widget;
        EHTMLEditor *editor;
-       EEditorParagraphDialog *dialog;
+       EHTMLEditorParagraphDialog *dialog;
 
-       dialog = E_EDITOR_PARAGRAPH_DIALOG (object);
+       dialog = E_HTML_EDITOR_PARAGRAPH_DIALOG (object);
        editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
@@ -125,29 +125,29 @@ editor_paragraph_dialog_constructed (GObject *object)
 }
 
 static void
-e_editor_paragraph_dialog_class_init (EEditorParagraphDialogClass *class)
+e_html_editor_paragraph_dialog_class_init (EHTMLEditorParagraphDialogClass *class)
 {
        GObjectClass *object_class;
 
        g_type_class_add_private (
-               class, sizeof (EEditorParagraphDialogPrivate));
+               class, sizeof (EHTMLEditorParagraphDialogPrivate));
 
        object_class = G_OBJECT_CLASS (class);
-       object_class->constructed = editor_paragraph_dialog_constructed;
+       object_class->constructed = html_editor_paragraph_dialog_constructed;
 }
 
 static void
-e_editor_paragraph_dialog_init (EEditorParagraphDialog *dialog)
+e_html_editor_paragraph_dialog_init (EHTMLEditorParagraphDialog *dialog)
 {
-       dialog->priv = E_EDITOR_PARAGRAPH_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_PARAGRAPH_DIALOG_GET_PRIVATE (dialog);
 }
 
 GtkWidget *
-e_editor_paragraph_dialog_new (EHTMLEditor *editor)
+e_html_editor_paragraph_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_PARAGRAPH_DIALOG,
+                       E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG,
                        "editor", editor,
                        "title", N_("Paragraph Properties"),
                        NULL));
diff --git a/e-util/e-html-editor-paragraph-dialog.h b/e-util/e-html-editor-paragraph-dialog.h
new file mode 100644
index 0000000..17855bd
--- /dev/null
+++ b/e-util/e-html-editor-paragraph-dialog.h
@@ -0,0 +1,71 @@
+/*
+ * e-html-editor-paragraph-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_PARAGRAPH_DIALOG_H
+#define E_HTML_EDITOR_PARAGRAPH_DIALOG_H
+
+#include <e-util/e-html-editor-dialog.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG \
+       (e_html_editor_paragraph_dialog_get_type ())
+#define E_HTML_EDITOR_PARAGRAPH_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG, EHTMLEditorParagraphDialog))
+#define E_HTML_EDITOR_PARAGRAPH_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG, EHTMLEditorParagraphDialogClass))
+#define E_IS_HTML_EDITOR_PARAGRAPH_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG))
+#define E_IS_HTML_EDITOR_PARAGRAPH_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG))
+#define E_HTML_EDITOR_PARAGRAPH_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_HTML_EDITOR_PARAGRAPH_DIALOG, EHTMLEditorParagraphDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorParagraphDialog EHTMLEditorParagraphDialog;
+typedef struct _EHTMLEditorParagraphDialogClass EHTMLEditorParagraphDialogClass;
+typedef struct _EHTMLEditorParagraphDialogPrivate EHTMLEditorParagraphDialogPrivate;
+
+struct _EHTMLEditorParagraphDialog {
+       EHTMLEditorDialog parent;
+       EHTMLEditorParagraphDialogPrivate *priv;
+};
+
+struct _EHTMLEditorParagraphDialogClass {
+       EHTMLEditorDialogClass parent_class;
+};
+
+GType          e_html_editor_paragraph_dialog_get_type
+                                               (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_paragraph_dialog_new
+                                               (EHTMLEditor *editor);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_PARAGRAPH_DIALOG_H */
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index 17efd7b..fda261f 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -31,11 +31,11 @@
 #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-paragraph-dialog.h>
 #include <e-html-editor-view.h>
 #include <e-editor-replace-dialog.h>
 #include <e-editor-table-dialog.h>
 #include <e-editor-text-dialog.h>
-#include <e-editor-paragraph-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 e675b4d..ccdddc2 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-paragraph-dialog.h>
 #include <e-util/e-editor-replace-dialog.h>
 #include <e-util/e-editor-spell-check-dialog.h>
 #include <e-util/e-editor-table-dialog.h>
@@ -123,6 +122,7 @@
 #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-paragraph-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]