GNOME.org
 

[evolution/wip/webkit-composer] Rename EEditorReplaceDialog to EHTMLEditorReplaceDialog

commit 7f725795d3ffc87bc6bbac791b19831bf7c03db8
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Mar 31 12:54:04 2014 +0200

    Rename EEditorReplaceDialog to EHTMLEditorReplaceDialog

 .../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-replace-dialog.h                   |   71 --------------------
 e-util/e-html-editor-actions.c                     |    2 +-
 e-util/e-html-editor-private.h                     |    2 +-
 ...ace-dialog.c => e-html-editor-replace-dialog.c} |   54 ++++++++--------
 e-util/e-html-editor-replace-dialog.h              |   71 ++++++++++++++++++++
 e-util/e-util.h                                    |    2 +-
 10 files changed, 119 insertions(+), 119 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml 
b/doc/reference/evolution-util/evolution-util-docs.sgml
index 6fc04dd..b49f264 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-replace-dialog.xml"/>
     <xi:include href="xml/e-editor-spell-check-dialog.xml"/>
     <xi:include href="xml/e-editor-table-dialog.xml"/>
     <xi:include href="xml/e-editor-text-dialog.xml"/>
@@ -120,6 +119,7 @@
     <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-replace-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 48bcd3c..746c779 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1745,21 +1745,21 @@ EHTMLEditorParagraphDialogPrivate
 </SECTION>
 
 <SECTION>
-<FILE>e-editor-replace-dialog</FILE>
-<TITLE>EEditorReplaceDialog</TITLE>
-EEditorReplaceDialog
-e_editor_replace_dialog_new
-<SUBSECTION Standard>
-E_EDITOR_REPLACE_DIALOG
-E_IS_EDITOR_REPLACE_DIALOG
-E_TYPE_EDITOR_REPLACE_DIALOG
-E_EDITOR_REPLACE_DIALOG_CLASS
-E_IS_EDITOR_REPLACE_DIALOG_CLASS
-E_EDITOR_REPLACE_DIALOG_GET_CLASS
-EEditorReplaceDialogClass
-e_editor_replace_dialog_get_type
-<SUBSECTION Private>
-EEditorReplaceDialogPrivate
+<FILE>e-html-editor-replace-dialog</FILE>
+<TITLE>EHTMLEditorReplaceDialog</TITLE>
+EHTMLEditorReplaceDialog
+e_html_editor_replace_dialog_new
+<SUBSECTION Standard>
+E_HTML_EDITOR_REPLACE_DIALOG
+E_IS_HTML_EDITOR_REPLACE_DIALOG
+E_TYPE_HTML_EDITOR_REPLACE_DIALOG
+E_HTML_EDITOR_REPLACE_DIALOG_CLASS
+E_IS_HTML_EDITOR_REPLACE_DIALOG_CLASS
+E_HTML_EDITOR_REPLACE_DIALOG_GET_CLASS
+EHTMLEditorReplaceDialogClass
+e_html_editor_replace_dialog_get_type
+<SUBSECTION Private>
+EHTMLEditorReplaceDialogPrivate
 </SECTION>
 
 <SECTION>
diff --git a/doc/reference/evolution-util/evolution-util.types 
b/doc/reference/evolution-util/evolution-util.types
index 1edd434..a298136 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_replace_dialog_get_type
 e_editor_spell_check_dialog_get_type
 e_editor_table_dialog_get_type
 e_editor_text_dialog_get_type
@@ -76,6 +75,7 @@ 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_replace_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 790857e..1b87f6a 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-replace-dialog.h \
        e-editor-spell-check-dialog.h \
        e-editor-table-dialog.h \
        e-editor-text-dialog.h \
@@ -208,6 +207,7 @@ evolution_util_include_HEADERS =  \
        e-html-editor-link-dialog.h \
        e-html-editor-page-dialog.h \
        e-html-editor-paragraph-dialog.h \
+       e-html-editor-replace-dialog.h \
        e-html-editor-selection.h \
        e-html-editor-utils.h \
        e-html-editor-view.h \
@@ -447,7 +447,6 @@ libevolution_util_la_SOURCES = \
        e-destination-store.c \
        e-dialog-utils.c \
        e-dialog-widgets.c \
-       e-editor-replace-dialog.c \
        e-editor-spell-check-dialog.c \
        e-editor-table-dialog.c \
        e-editor-text-dialog.c \
@@ -480,6 +479,7 @@ libevolution_util_la_SOURCES = \
        e-html-editor-page-dialog.c \
        e-html-editor-paragraph-dialog.c \
        e-html-editor-private.h \
+       e-html-editor-replace-dialog.c \
        e-html-editor-selection.c \
        e-html-editor-utils.c \
        e-html-editor-view.c \
diff --git a/e-util/e-html-editor-actions.c b/e-util/e-html-editor-actions.c
index 8459cb8..960d473 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -862,7 +862,7 @@ action_show_replace_cb (GtkAction *action,
 {
        if (editor->priv->replace_dialog == NULL) {
                editor->priv->replace_dialog =
-                       e_editor_replace_dialog_new (editor);
+                       e_html_editor_replace_dialog_new (editor);
        }
 
        gtk_window_present (GTK_WINDOW (editor->priv->replace_dialog));
diff --git a/e-util/e-html-editor-private.h b/e-util/e-html-editor-private.h
index fda261f..fbf0756 100644
--- a/e-util/e-html-editor-private.h
+++ b/e-util/e-html-editor-private.h
@@ -32,8 +32,8 @@
 #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-replace-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-spell-check-dialog.h>
diff --git a/e-util/e-editor-replace-dialog.c b/e-util/e-html-editor-replace-dialog.c
similarity index 81%
rename from e-util/e-editor-replace-dialog.c
rename to e-util/e-html-editor-replace-dialog.c
index 16e04d9..b4582eb 100644
--- a/e-util/e-editor-replace-dialog.c
+++ b/e-util/e-html-editor-replace-dialog.c
@@ -1,5 +1,5 @@
 /*
- * e-editor-replace-dialog.h
+ * e-html-editor-replace-dialog.h
  *
  * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
  *
@@ -22,20 +22,20 @@
 #include <config.h>
 #endif
 
-#include "e-editor-replace-dialog.h"
+#include "e-html-editor-replace-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#define E_EDITOR_REPLACE_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_REPLACE_DIALOG_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
-       ((obj), E_TYPE_EDITOR_REPLACE_DIALOG, EEditorReplaceDialogPrivate))
+       ((obj), E_TYPE_HTML_EDITOR_REPLACE_DIALOG, EHTMLEditorReplaceDialogPrivate))
 
 G_DEFINE_TYPE (
-       EEditorReplaceDialog,
-       e_editor_replace_dialog,
+       EHTMLEditorReplaceDialog,
+       e_html_editor_replace_dialog,
        E_TYPE_HTML_EDITOR_DIALOG);
 
-struct _EEditorReplaceDialogPrivate {
+struct _EHTMLEditorReplaceDialogPrivate {
        GtkWidget *search_entry;
        GtkWidget *replace_entry;
 
@@ -51,7 +51,7 @@ struct _EEditorReplaceDialogPrivate {
 };
 
 static gboolean
-jump (EEditorReplaceDialog *dialog)
+jump (EHTMLEditorReplaceDialog *dialog)
 {
        EHTMLEditor *editor;
        WebKitWebView *webview;
@@ -75,7 +75,7 @@ jump (EEditorReplaceDialog *dialog)
 }
 
 static void
-editor_replace_dialog_skip_cb (EEditorReplaceDialog *dialog)
+html_editor_replace_dialog_skip_cb (EHTMLEditorReplaceDialog *dialog)
 {
        if (!jump (dialog)) {
                gtk_label_set_label (
@@ -88,7 +88,7 @@ editor_replace_dialog_skip_cb (EEditorReplaceDialog *dialog)
 }
 
 static void
-editor_replace_dialog_replace_cb (EEditorReplaceDialog *dialog)
+html_editor_replace_dialog_replace_cb (EHTMLEditorReplaceDialog *dialog)
 {
        EHTMLEditor *editor;
        EHTMLEditorView *view;
@@ -115,7 +115,7 @@ editor_replace_dialog_replace_cb (EEditorReplaceDialog *dialog)
 }
 
 static void
-editor_replace_dialog_replace_all_cb (EEditorReplaceDialog *dialog)
+html_editor_replace_dialog_replace_all_cb (EHTMLEditorReplaceDialog *dialog)
 {
        gint i = 0;
        gchar *result;
@@ -145,7 +145,7 @@ editor_replace_dialog_replace_all_cb (EEditorReplaceDialog *dialog)
 }
 
 static void
-editor_replace_dialog_entry_changed (EEditorReplaceDialog *dialog)
+html_editor_replace_dialog_entry_changed (EHTMLEditorReplaceDialog *dialog)
 {
        gboolean ready;
        ready = ((gtk_entry_get_text_length (
@@ -159,36 +159,36 @@ editor_replace_dialog_entry_changed (EEditorReplaceDialog *dialog)
 }
 
 static void
-editor_replace_dialog_show (GtkWidget *widget)
+html_editor_replace_dialog_show (GtkWidget *widget)
 {
-       EEditorReplaceDialog *dialog = E_EDITOR_REPLACE_DIALOG (widget);
+       EHTMLEditorReplaceDialog *dialog = E_HTML_EDITOR_REPLACE_DIALOG (widget);
 
        gtk_widget_grab_focus (dialog->priv->search_entry);
        gtk_widget_hide (dialog->priv->result_label);
 
        /* Chain up to parent implementation */
-       GTK_WIDGET_CLASS (e_editor_replace_dialog_parent_class)->show (widget);
+       GTK_WIDGET_CLASS (e_html_editor_replace_dialog_parent_class)->show (widget);
 }
 
 static void
-e_editor_replace_dialog_class_init (EEditorReplaceDialogClass *class)
+e_html_editor_replace_dialog_class_init (EHTMLEditorReplaceDialogClass *class)
 {
        GtkWidgetClass *widget_class;
 
-       g_type_class_add_private (class, sizeof (EEditorReplaceDialogPrivate));
+       g_type_class_add_private (class, sizeof (EHTMLEditorReplaceDialogPrivate));
 
        widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = editor_replace_dialog_show;
+       widget_class->show = html_editor_replace_dialog_show;
 }
 
 static void
-e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
+e_html_editor_replace_dialog_init (EHTMLEditorReplaceDialog *dialog)
 {
        GtkGrid *main_layout;
        GtkWidget *widget, *layout;
        GtkBox *button_box;
 
-       dialog->priv = E_EDITOR_REPLACE_DIALOG_GET_PRIVATE (dialog);
+       dialog->priv = E_HTML_EDITOR_REPLACE_DIALOG_GET_PRIVATE (dialog);
 
        main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
 
@@ -197,7 +197,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
        dialog->priv->search_entry = widget;
        g_signal_connect_swapped (
                widget, "notify::text-length",
-               G_CALLBACK (editor_replace_dialog_entry_changed), dialog);
+               G_CALLBACK (html_editor_replace_dialog_entry_changed), dialog);
 
        widget = gtk_label_new_with_mnemonic (_("R_eplace:"));
        gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->search_entry);
@@ -209,7 +209,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
        dialog->priv->replace_entry = widget;
        g_signal_connect_swapped (
                widget, "notify::text-length",
-               G_CALLBACK (editor_replace_dialog_entry_changed), dialog);
+               G_CALLBACK (html_editor_replace_dialog_entry_changed), dialog);
 
        widget = gtk_label_new_with_mnemonic (_("_With:"));
        gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->replace_entry);
@@ -243,7 +243,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
        dialog->priv->skip_button = widget;
        g_signal_connect_swapped (
                widget, "clicked",
-               G_CALLBACK (editor_replace_dialog_skip_cb), dialog);
+               G_CALLBACK (html_editor_replace_dialog_skip_cb), dialog);
 
        widget = gtk_button_new_with_mnemonic (_("_Replace"));
        gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
@@ -251,7 +251,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
        dialog->priv->replace_button = widget;
        g_signal_connect_swapped (
                widget, "clicked",
-               G_CALLBACK (editor_replace_dialog_replace_cb), dialog);
+               G_CALLBACK (html_editor_replace_dialog_replace_cb), dialog);
 
        widget = gtk_button_new_with_mnemonic (_("Replace _All"));
        gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
@@ -259,17 +259,17 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
        dialog->priv->replace_all_button = widget;
        g_signal_connect_swapped (
                widget, "clicked",
-               G_CALLBACK (editor_replace_dialog_replace_all_cb), dialog);
+               G_CALLBACK (html_editor_replace_dialog_replace_all_cb), dialog);
 
        gtk_widget_show_all (GTK_WIDGET (main_layout));
 }
 
 GtkWidget *
-e_editor_replace_dialog_new (EHTMLEditor *editor)
+e_html_editor_replace_dialog_new (EHTMLEditor *editor)
 {
        return GTK_WIDGET (
                g_object_new (
-                       E_TYPE_EDITOR_REPLACE_DIALOG,
+                       E_TYPE_HTML_EDITOR_REPLACE_DIALOG,
                        "editor", editor,
                        "icon-name", GTK_STOCK_FIND_AND_REPLACE,
                        "title", N_("Replace"),
diff --git a/e-util/e-html-editor-replace-dialog.h b/e-util/e-html-editor-replace-dialog.h
new file mode 100644
index 0000000..f253e42
--- /dev/null
+++ b/e-util/e-html-editor-replace-dialog.h
@@ -0,0 +1,71 @@
+/*
+ * e-html-editor-replace-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_REPLACE_DIALOG_H
+#define E_HTML_EDITOR_REPLACE_DIALOG_H
+
+#include <e-util/e-html-editor-dialog.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_REPLACE_DIALOG \
+       (e_html_editor_replace_dialog_get_type ())
+#define E_HTML_EDITOR_REPLACE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_HTML_EDITOR_REPLACE_DIALOG, EHTMLEditorReplaceDialog))
+#define E_HTML_EDITOR_REPLACE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_HTML_EDITOR_REPLACE_DIALOG, EHTMLEditorReplaceDialogClass))
+#define E_IS_HTML_EDITOR_REPLACE_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_HTML_EDITOR_REPLACE_DIALOG))
+#define E_IS_HTML_EDITOR_REPLACE_DIALOG_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_HTML_EDITOR_REPLACE_DIALOG))
+#define E_HTML_EDITOR_REPLACE_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_HTML_EDITOR_REPLACE_DIALOG, EHTMLEditorReplaceDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorReplaceDialog EHTMLEditorReplaceDialog;
+typedef struct _EHTMLEditorReplaceDialogClass EHTMLEditorReplaceDialogClass;
+typedef struct _EHTMLEditorReplaceDialogPrivate EHTMLEditorReplaceDialogPrivate;
+
+struct _EHTMLEditorReplaceDialog {
+       EHTMLEditorDialog parent;
+       EHTMLEditorReplaceDialogPrivate *priv;
+};
+
+struct _EHTMLEditorReplaceDialogClass {
+       EHTMLEditorDialogClass parent_class;
+};
+
+GType          e_html_editor_replace_dialog_get_type
+                                               (void) G_GNUC_CONST;
+GtkWidget *    e_html_editor_replace_dialog_new        (EHTMLEditor *editor);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_REPLACE_DIALOG_H */
+
diff --git a/e-util/e-util.h b/e-util/e-util.h
index ccdddc2..ec86aa4 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-replace-dialog.h>
 #include <e-util/e-editor-spell-check-dialog.h>
 #include <e-util/e-editor-table-dialog.h>
 #include <e-util/e-editor-text-dialog.h>
@@ -123,6 +122,7 @@
 #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-replace-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]