[evolution/wip/webkit-composer] Rename EEditorDialog to EHTMLEditorDialog
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer] Rename EEditorDialog to EHTMLEditorDialog
- Date: Fri, 28 Mar 2014 14:09:06 +0000 (UTC)
commit f5e509eb7e604a2e26a37f534164037a0fdf8a3e
Author: Tomas Popela <tpopela redhat com>
Date: Fri Mar 28 15:04:20 2014 +0100
Rename EEditorDialog to EHTMLEditorDialog
.../evolution-util/evolution-util-sections.txt | 28 ++++----
e-util/Makefile.am | 4 +-
e-util/e-editor-cell-dialog.c | 4 +-
e-util/e-editor-cell-dialog.h | 6 +-
e-util/e-editor-dialog.h | 72 ------------------
e-util/e-editor-find-dialog.c | 8 +-
e-util/e-editor-find-dialog.h | 6 +-
e-util/e-editor-hrule-dialog.c | 6 +-
e-util/e-editor-hrule-dialog.h | 6 +-
e-util/e-editor-image-dialog.c | 6 +-
e-util/e-editor-image-dialog.h | 6 +-
e-util/e-editor-link-dialog.c | 12 ++--
e-util/e-editor-link-dialog.h | 6 +-
e-util/e-editor-page-dialog.c | 14 ++--
e-util/e-editor-page-dialog.h | 6 +-
e-util/e-editor-paragraph-dialog.c | 6 +-
e-util/e-editor-paragraph-dialog.h | 6 +-
e-util/e-editor-replace-dialog.c | 12 ++--
e-util/e-editor-replace-dialog.h | 6 +-
e-util/e-editor-spell-check-dialog.c | 14 ++--
e-util/e-editor-spell-check-dialog.h | 6 +-
e-util/e-editor-table-dialog.c | 8 +-
e-util/e-editor-table-dialog.h | 6 +-
e-util/e-editor-text-dialog.c | 18 ++--
e-util/e-editor-text-dialog.h | 6 +-
.../{e-editor-dialog.c => e-html-editor-dialog.c} | 80 ++++++++++----------
e-util/e-html-editor-dialog.h | 74 ++++++++++++++++++
e-util/e-util.h | 2 +-
28 files changed, 218 insertions(+), 216 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt
b/doc/reference/evolution-util/evolution-util-sections.txt
index cf38717..1be9f8d 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -1617,22 +1617,22 @@ EEditorCellDialogPrivate
</SECTION>
<SECTION>
-<FILE>e-editor-dialog</FILE>
-<TITLE>EEditorDialog</TITLE>
-e_editor_dialog_get_editor
-e_editor_dialog_get_button_box
-e_editor_dialog_get_container
-<SUBSECTION Standard>
-E_EDITOR_DIALOG
-E_IS_EDITOR_DIALOG
-E_TYPE_EDITOR_DIALOG
-E_EDITOR_DIALOG_CLASS
-E_IS_EDITOR_DIALOG_CLASS
-E_EDITOR_DIALOG_GET_CLASS
+<FILE>e-html-editor-dialog</FILE>
+<TITLE>EHTMLEditorDialog</TITLE>
+e_html_editor_dialog_get_editor
+e_html_editor_dialog_get_button_box
+e_html_editor_dialog_get_container
+<SUBSECTION Standard>
+E_HTML_EDITOR_DIALOG
+E_IS_HTML_EDITOR_DIALOG
+E_TYPE_HTML_EDITOR_DIALOG
+E_HTML_EDITOR_DIALOG_CLASS
+E_IS_HTML_EDITOR_DIALOG_CLASS
+E_HTML_EDITOR_DIALOG_GET_CLASS
EEditorDialogClass
-e_editor_dialog_get_type
+e_html_editor_dialog_get_type
<SUBSECTION Private>
-EEditorDialogPrivate
+EHTMLEditorDialogPrivate
</SECTION>
<SECTION>
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 39b263d..21811e5 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -177,7 +177,6 @@ evolution_util_include_HEADERS = \
e-dialog-utils.h \
e-dialog-widgets.h \
e-editor-cell-dialog.h \
- e-editor-dialog.h \
e-editor-find-dialog.h \
e-editor-hrule-dialog.h \
e-editor-image-dialog.h \
@@ -208,6 +207,7 @@ evolution_util_include_HEADERS = \
e-filter-rule.h \
e-focus-tracker.h \
e-html-editor-actions.h \
+ e-html-editor-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-dialog-utils.c \
e-dialog-widgets.c \
e-editor-cell-dialog.c \
- e-editor-dialog.c \
e-editor-find-dialog.c \
e-editor-hrule-dialog.c \
e-editor-image-dialog.c \
@@ -479,6 +478,7 @@ libevolution_util_la_SOURCES = \
e-filter-rule.c \
e-focus-tracker.c \
e-html-editor-actions.c \
+ e-html-editor-dialog.c \
e-html-editor-private.h \
e-html-editor-selection.c \
e-html-editor-utils.c \
diff --git a/e-util/e-editor-cell-dialog.c b/e-util/e-editor-cell-dialog.c
index 8f7a2d1..d4c03e0 100644
--- a/e-util/e-editor-cell-dialog.c
+++ b/e-util/e-editor-cell-dialog.c
@@ -78,7 +78,7 @@ typedef void (*DOMBoolFunc) (WebKitDOMHTMLTableCellElement *cell, gboolean val,
G_DEFINE_TYPE (
EEditorCellDialog,
e_editor_cell_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static void
call_cell_dom_func (WebKitDOMHTMLTableCellElement *cell,
@@ -578,7 +578,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
dialog->priv = E_EDITOR_CELL_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == Scope == */
widget = gtk_label_new ("");
diff --git a/e-util/e-editor-cell-dialog.h b/e-util/e-editor-cell-dialog.h
index 67624d0..d25ae88 100644
--- a/e-util/e-editor-cell-dialog.h
+++ b/e-util/e-editor-cell-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_CELL_DIALOG_H
#define E_EDITOR_CELL_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_CELL_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorCellDialogClass EEditorCellDialogClass;
typedef struct _EEditorCellDialogPrivate EEditorCellDialogPrivate;
struct _EEditorCellDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorCellDialogPrivate *priv;
};
struct _EEditorCellDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_cell_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-find-dialog.c b/e-util/e-editor-find-dialog.c
index 0f8108d..58967b2 100644
--- a/e-util/e-editor-find-dialog.c
+++ b/e-util/e-editor-find-dialog.c
@@ -45,7 +45,7 @@ struct _EEditorFindDialogPrivate {
G_DEFINE_TYPE (
EEditorFindDialog,
e_editor_find_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static void
reset_dialog (EEditorFindDialog *dialog)
@@ -73,7 +73,7 @@ editor_find_dialog_find_cb (EEditorFindDialog *dialog)
EHTMLEditor *editor;
EHTMLEditorView *view;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
found = webkit_web_view_search_text (
WEBKIT_WEB_VIEW (view),
@@ -143,7 +143,7 @@ e_editor_find_dialog_init (EEditorFindDialog *dialog)
dialog->priv = E_EDITOR_FIND_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
widget = gtk_entry_new ();
gtk_widget_set_hexpand (widget, TRUE);
@@ -190,7 +190,7 @@ e_editor_find_dialog_init (EEditorFindDialog *dialog)
gtk_box_pack_end (box, widget, TRUE, TRUE, 0);
box = GTK_BOX (widget);
- box = e_editor_dialog_get_button_box (E_EDITOR_DIALOG (dialog));
+ box = e_html_editor_dialog_get_button_box (E_HTML_EDITOR_DIALOG (dialog));
widget = gtk_button_new_from_stock (GTK_STOCK_FIND);
gtk_box_pack_start (box, widget, FALSE, FALSE, 5);
g_signal_connect_swapped (
diff --git a/e-util/e-editor-find-dialog.h b/e-util/e-editor-find-dialog.h
index 4434127..ad21f23 100644
--- a/e-util/e-editor-find-dialog.h
+++ b/e-util/e-editor-find-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_FIND_DIALOG_H
#define E_EDITOR_FIND_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_FIND_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorFindDialogClass EEditorFindDialogClass;
typedef struct _EEditorFindDialogPrivate EEditorFindDialogPrivate;
struct _EEditorFindDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorFindDialogPrivate *priv;
};
struct _EEditorFindDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_find_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-hrule-dialog.c b/e-util/e-editor-hrule-dialog.c
index fe9aa78..b72eb9f 100644
--- a/e-util/e-editor-hrule-dialog.c
+++ b/e-util/e-editor-hrule-dialog.c
@@ -48,7 +48,7 @@ struct _EEditorHRuleDialogPrivate {
G_DEFINE_TYPE (
EEditorHRuleDialog,
e_editor_hrule_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static void
editor_hrule_dialog_set_alignment (EEditorHRuleDialog *dialog)
@@ -220,7 +220,7 @@ editor_hrule_dialog_show (GtkWidget *widget)
WebKitDOMElement *rule;
dialog = E_EDITOR_HRULE_DIALOG (widget);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
editor_selection = e_html_editor_view_get_selection (view);
@@ -312,7 +312,7 @@ e_editor_hrule_dialog_init (EEditorHRuleDialog *dialog)
dialog->priv = E_EDITOR_HRULE_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == Size == */
widget = gtk_label_new ("");
diff --git a/e-util/e-editor-hrule-dialog.h b/e-util/e-editor-hrule-dialog.h
index daea09a..0f1d011 100644
--- a/e-util/e-editor-hrule-dialog.h
+++ b/e-util/e-editor-hrule-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_HRULE_DIALOG_H
#define E_EDITOR_HRULE_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_HRULE_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorHRuleDialogClass EEditorHRuleDialogClass;
typedef struct _EEditorHRuleDialogPrivate EEditorHRuleDialogPrivate;
struct _EEditorHRuleDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorHRuleDialogPrivate *priv;
};
struct _EEditorHRuleDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_hrule_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-image-dialog.c b/e-util/e-editor-image-dialog.c
index 09c531b..a69bb74 100644
--- a/e-util/e-editor-image-dialog.c
+++ b/e-util/e-editor-image-dialog.c
@@ -57,7 +57,7 @@ struct _EEditorImageDialogPrivate {
G_DEFINE_TYPE (
EEditorImageDialog,
e_editor_image_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static void
editor_image_dialog_set_src (EEditorImageDialog *dialog)
@@ -66,7 +66,7 @@ editor_image_dialog_set_src (EEditorImageDialog *dialog)
EHTMLEditorSelection *editor_selection;
EHTMLEditorView *view;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
editor_selection = e_html_editor_view_get_selection (view);
@@ -461,7 +461,7 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
dialog->priv = E_EDITOR_IMAGE_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == General == */
widget = gtk_label_new ("");
diff --git a/e-util/e-editor-image-dialog.h b/e-util/e-editor-image-dialog.h
index a5b6a27..1e0c94d 100644
--- a/e-util/e-editor-image-dialog.h
+++ b/e-util/e-editor-image-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_IMAGE_DIALOG_H
#define E_EDITOR_IMAGE_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_IMAGE_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorImageDialogClass EEditorImageDialogClass;
typedef struct _EEditorImageDialogPrivate EEditorImageDialogPrivate;
struct _EEditorImageDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorImageDialogPrivate *priv;
};
struct _EEditorImageDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_image_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-link-dialog.c b/e-util/e-editor-link-dialog.c
index f607a27..f3d2c47 100644
--- a/e-util/e-editor-link-dialog.c
+++ b/e-util/e-editor-link-dialog.c
@@ -36,7 +36,7 @@
G_DEFINE_TYPE (
EEditorLinkDialog,
e_editor_link_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
struct _EEditorLinkDialogPrivate {
GtkWidget *url_edit;
@@ -91,7 +91,7 @@ editor_link_dialog_remove_link (EEditorLinkDialog *dialog)
EHTMLEditorView *view;
EHTMLEditorSelection *selection;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
e_html_editor_selection_unlink (selection);
@@ -111,7 +111,7 @@ editor_link_dialog_ok (EEditorLinkDialog *dialog)
WebKitDOMRange *range;
WebKitDOMElement *link;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -222,7 +222,7 @@ editor_link_dialog_show (GtkWidget *widget)
WebKitDOMElement *link;
dialog = E_EDITOR_LINK_DIALOG (widget);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
@@ -319,7 +319,7 @@ e_editor_link_dialog_init (EEditorLinkDialog *dialog)
dialog->priv = E_EDITOR_LINK_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
widget = gtk_entry_new ();
gtk_grid_attach (main_layout, widget, 1, 0, 1, 1);
@@ -358,7 +358,7 @@ e_editor_link_dialog_init (EEditorLinkDialog *dialog)
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->label_edit);
gtk_grid_attach (main_layout, widget, 0, 1, 1, 1);
- button_box = e_editor_dialog_get_button_box (E_EDITOR_DIALOG (dialog));
+ button_box = e_html_editor_dialog_get_button_box (E_HTML_EDITOR_DIALOG (dialog));
widget = gtk_button_new_with_mnemonic (_("_Remove Link"));
g_signal_connect_swapped (
diff --git a/e-util/e-editor-link-dialog.h b/e-util/e-editor-link-dialog.h
index 9b2a15e..b0a6953 100644
--- a/e-util/e-editor-link-dialog.h
+++ b/e-util/e-editor-link-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_LINK_DIALOG_H
#define E_EDITOR_LINK_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_LINK_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorLinkDialogClass EEditorLinkDialogClass;
typedef struct _EEditorLinkDialogPrivate EEditorLinkDialogPrivate;
struct _EEditorLinkDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorLinkDialogPrivate *priv;
};
struct _EEditorLinkDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_link_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-page-dialog.c b/e-util/e-editor-page-dialog.c
index c34f0b5..2bd2494 100644
--- a/e-util/e-editor-page-dialog.c
+++ b/e-util/e-editor-page-dialog.c
@@ -138,7 +138,7 @@ static const Template templates[] = {
G_DEFINE_TYPE (
EEditorPageDialog,
e_editor_page_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static void
editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
@@ -150,7 +150,7 @@ editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
GdkRGBA rgba;
gchar *color;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
body = webkit_dom_document_get_body (document);
@@ -175,7 +175,7 @@ editor_page_dialog_set_link_color (EEditorPageDialog *dialog)
GdkRGBA rgba;
gchar *color;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
body = webkit_dom_document_get_body (document);
@@ -200,7 +200,7 @@ editor_page_dialog_set_background_color (EEditorPageDialog *dialog)
GdkRGBA rgba;
gchar *color;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
body = webkit_dom_document_get_body (document);
@@ -261,7 +261,7 @@ editor_page_dialog_set_background_image (EEditorPageDialog *dialog)
WebKitDOMHTMLElement *body;
gchar *uri;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
body = webkit_dom_document_get_body (document);
@@ -288,7 +288,7 @@ editor_page_dialog_show (GtkWidget *widget)
GdkRGBA rgba;
dialog = E_EDITOR_PAGE_DIALOG (widget);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
@@ -394,7 +394,7 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
dialog->priv = E_EDITOR_PAGE_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == Colors == */
widget = gtk_label_new ("");
diff --git a/e-util/e-editor-page-dialog.h b/e-util/e-editor-page-dialog.h
index d04b028..122bbed 100644
--- a/e-util/e-editor-page-dialog.h
+++ b/e-util/e-editor-page-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_PAGE_DIALOG_H
#define E_EDITOR_PAGE_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_PAGE_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorPageDialogClass EEditorPageDialogClass;
typedef struct _EEditorPageDialogPrivate EEditorPageDialogPrivate;
struct _EEditorPageDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorPageDialogPrivate *priv;
};
struct _EEditorPageDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_page_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-paragraph-dialog.c b/e-util/e-editor-paragraph-dialog.c
index 9527a73..bbd72e0 100644
--- a/e-util/e-editor-paragraph-dialog.c
+++ b/e-util/e-editor-paragraph-dialog.c
@@ -35,7 +35,7 @@
G_DEFINE_TYPE (
EEditorParagraphDialog,
e_editor_paragraph_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
struct _EEditorParagraphDialogPrivate {
GtkWidget *style_combo;
@@ -54,9 +54,9 @@ editor_paragraph_dialog_constructed (GObject *object)
EEditorParagraphDialog *dialog;
dialog = E_EDITOR_PARAGRAPH_DIALOG (object);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == General == */
widget = gtk_label_new ("");
diff --git a/e-util/e-editor-paragraph-dialog.h b/e-util/e-editor-paragraph-dialog.h
index 14f1243..99e2695 100644
--- a/e-util/e-editor-paragraph-dialog.h
+++ b/e-util/e-editor-paragraph-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_PARAGRAPH_DIALOG_H
#define E_EDITOR_PARAGRAPH_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_PARAGRAPH_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorParagraphDialogClass EEditorParagraphDialogClass;
typedef struct _EEditorParagraphDialogPrivate EEditorParagraphDialogPrivate;
struct _EEditorParagraphDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorParagraphDialogPrivate *priv;
};
struct _EEditorParagraphDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_paragraph_dialog_get_type
diff --git a/e-util/e-editor-replace-dialog.c b/e-util/e-editor-replace-dialog.c
index bd860ad..16e04d9 100644
--- a/e-util/e-editor-replace-dialog.c
+++ b/e-util/e-editor-replace-dialog.c
@@ -33,7 +33,7 @@
G_DEFINE_TYPE (
EEditorReplaceDialog,
e_editor_replace_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
struct _EEditorReplaceDialogPrivate {
GtkWidget *search_entry;
@@ -57,7 +57,7 @@ jump (EEditorReplaceDialog *dialog)
WebKitWebView *webview;
gboolean found;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
webview = WEBKIT_WEB_VIEW (
e_html_editor_get_view (editor));
@@ -105,7 +105,7 @@ editor_replace_dialog_replace_cb (EEditorReplaceDialog *dialog)
gtk_widget_hide (dialog->priv->result_label);
}
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -124,7 +124,7 @@ editor_replace_dialog_replace_all_cb (EEditorReplaceDialog *dialog)
EHTMLEditorSelection *selection;
const gchar *replacement;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
replacement = gtk_entry_get_text (GTK_ENTRY (dialog->priv->replace_entry));
@@ -190,7 +190,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
dialog->priv = E_EDITOR_REPLACE_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
widget = gtk_entry_new ();
gtk_grid_attach (main_layout, widget, 1, 0, 2, 1);
@@ -235,7 +235,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
gtk_grid_attach (main_layout, widget, 0, 3, 2, 1);
dialog->priv->result_label = widget;
- button_box = e_editor_dialog_get_button_box (E_EDITOR_DIALOG (dialog));
+ button_box = e_html_editor_dialog_get_button_box (E_HTML_EDITOR_DIALOG (dialog));
widget = gtk_button_new_with_mnemonic (_("_Skip"));
gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
diff --git a/e-util/e-editor-replace-dialog.h b/e-util/e-editor-replace-dialog.h
index 52eb6f0..22cc3fe 100644
--- a/e-util/e-editor-replace-dialog.h
+++ b/e-util/e-editor-replace-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_REPLACE_DIALOG_H
#define E_EDITOR_REPLACE_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_REPLACE_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorReplaceDialogClass EEditorReplaceDialogClass;
typedef struct _EEditorReplaceDialogPrivate EEditorReplaceDialogPrivate;
struct _EEditorReplaceDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorReplaceDialogPrivate *priv;
};
struct _EEditorReplaceDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_replace_dialog_get_type
diff --git a/e-util/e-editor-spell-check-dialog.c b/e-util/e-editor-spell-check-dialog.c
index 2c5da90..c70c42c 100644
--- a/e-util/e-editor-spell-check-dialog.c
+++ b/e-util/e-editor-spell-check-dialog.c
@@ -61,7 +61,7 @@ enum {
G_DEFINE_TYPE (
EEditorSpellCheckDialog,
e_editor_spell_check_dialog,
- E_TYPE_EDITOR_DIALOG)
+ E_TYPE_HTML_EDITOR_DIALOG)
static void
editor_spell_check_dialog_set_word (EEditorSpellCheckDialog *dialog,
@@ -109,7 +109,7 @@ editor_spell_check_dialog_set_word (EEditorSpellCheckDialog *dialog,
* least with my default color scheme). The focus in fact is not
* given to WebKit, because this dialog is modal, but it satisfies
* it in a way that it paints the selection :) */
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
gtk_widget_grab_focus (GTK_WIDGET (view));
}
@@ -314,7 +314,7 @@ editor_spell_check_dialog_replace (EEditorSpellCheckDialog *dialog)
GtkTreeIter iter;
gchar *replacement;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
editor_selection = e_html_editor_view_get_selection (view);
@@ -341,7 +341,7 @@ editor_spell_check_dialog_replace_all (EEditorSpellCheckDialog *dialog)
GtkTreeIter iter;
gchar *replacement;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
editor_selection = e_html_editor_view_get_selection (view);
@@ -423,7 +423,7 @@ editor_spell_check_dialog_show (GtkWidget *widget)
g_free (dialog->priv->word);
dialog->priv->word = NULL;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
@@ -492,7 +492,7 @@ e_editor_spell_check_dialog_init (EEditorSpellCheckDialog *dialog)
dialog->priv = E_EDITOR_SPELL_CHECK_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == Suggestions == */
widget = gtk_label_new ("");
@@ -656,7 +656,7 @@ e_editor_spell_check_dialog_update_dictionaries (EEditorSpellCheckDialog *dialog
g_return_if_fail (E_IS_EDITOR_SPELL_CHECK_DIALOG (dialog));
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
spell_checker = e_html_editor_view_get_spell_checker (view);
diff --git a/e-util/e-editor-spell-check-dialog.h b/e-util/e-editor-spell-check-dialog.h
index bbdf6fe..3e2cc59 100644
--- a/e-util/e-editor-spell-check-dialog.h
+++ b/e-util/e-editor-spell-check-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_SPELL_CHECK_DIALOG_H
#define E_EDITOR_SPELL_CHECK_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_SPELL_CHECK_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorSpellCheckDialogClass EEditorSpellCheckDialogClass;
typedef struct _EEditorSpellCheckDialogPrivate EEditorSpellCheckDialogPrivate;
struct _EEditorSpellCheckDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorSpellCheckDialogPrivate *priv;
};
struct _EEditorSpellCheckDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_spell_check_dialog_get_type
diff --git a/e-util/e-editor-table-dialog.c b/e-util/e-editor-table-dialog.c
index 43a618e..d9b91e7 100644
--- a/e-util/e-editor-table-dialog.c
+++ b/e-util/e-editor-table-dialog.c
@@ -61,7 +61,7 @@ static GdkRGBA white = { 1, 1, 1, 1 };
G_DEFINE_TYPE (
EEditorTableDialog,
e_editor_table_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static WebKitDOMElement *
editor_table_dialog_create_table (EEditorTableDialog *dialog)
@@ -73,7 +73,7 @@ editor_table_dialog_create_table (EEditorTableDialog *dialog)
WebKitDOMElement *table, *br, *caret, *parent, *element;
gint i;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
editor_selection = e_html_editor_view_get_selection (view);
@@ -582,7 +582,7 @@ editor_table_dialog_show (GtkWidget *widget)
WebKitDOMDOMSelection *selection;
dialog = E_EDITOR_TABLE_DIALOG (widget);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ editor = e_html_editor_dialog_get_editor (E_HTML_EDITOR_DIALOG (dialog));
view = e_html_editor_get_view (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
@@ -644,7 +644,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv = E_EDITOR_TABLE_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* == General == */
widget = gtk_label_new ("");
diff --git a/e-util/e-editor-table-dialog.h b/e-util/e-editor-table-dialog.h
index c112393..da686f5 100644
--- a/e-util/e-editor-table-dialog.h
+++ b/e-util/e-editor-table-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_TABLE_DIALOG_H
#define E_EDITOR_TABLE_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_TABLE_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorTableDialogClass EEditorTableDialogClass;
typedef struct _EEditorTableDialogPrivate EEditorTableDialogPrivate;
struct _EEditorTableDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorTableDialogPrivate *priv;
};
struct _EEditorTableDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_table_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-text-dialog.c b/e-util/e-editor-text-dialog.c
index 3b0b00e..1e8240c 100644
--- a/e-util/e-editor-text-dialog.c
+++ b/e-util/e-editor-text-dialog.c
@@ -45,7 +45,7 @@ struct _EEditorTextDialogPrivate {
G_DEFINE_TYPE (
EEditorTextDialog,
e_editor_text_dialog,
- E_TYPE_EDITOR_DIALOG);
+ E_TYPE_HTML_EDITOR_DIALOG);
static void
editor_text_dialog_set_bold (EEditorTextDialog *dialog)
@@ -54,7 +54,7 @@ editor_text_dialog_set_bold (EEditorTextDialog *dialog)
EHTMLEditorView *view;
EHTMLEditorSelection *selection;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -71,7 +71,7 @@ editor_text_dialog_set_italic (EEditorTextDialog *dialog)
EHTMLEditorView *view;
EHTMLEditorSelection *selection;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -88,7 +88,7 @@ editor_text_dialog_set_underline (EEditorTextDialog *dialog)
EHTMLEditorView *view;
EHTMLEditorSelection *selection;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -105,7 +105,7 @@ editor_text_dialog_set_strikethrough (EEditorTextDialog *dialog)
EHTMLEditorView *view;
EHTMLEditorSelection *selection;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -123,7 +123,7 @@ editor_text_dialog_set_color (EEditorTextDialog *dialog)
EHTMLEditorSelection *selection;
GdkRGBA rgba;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -140,7 +140,7 @@ editor_text_dialog_set_size (EEditorTextDialog *dialog)
EHTMLEditorSelection *selection;
gint size;
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
size = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->size_check));
@@ -158,7 +158,7 @@ editor_text_dialog_show (GtkWidget *widget)
GdkRGBA rgba;
dialog = E_EDITOR_TEXT_DIALOG (widget);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
+ 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);
@@ -205,7 +205,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
dialog->priv = E_EDITOR_TEXT_DIALOG_GET_PRIVATE (dialog);
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
+ main_layout = e_html_editor_dialog_get_container (E_HTML_EDITOR_DIALOG (dialog));
/* Bold */
widget = gtk_image_new_from_stock (GTK_STOCK_BOLD, GTK_ICON_SIZE_BUTTON);
diff --git a/e-util/e-editor-text-dialog.h b/e-util/e-editor-text-dialog.h
index 9215ef7..2af043f 100644
--- a/e-util/e-editor-text-dialog.h
+++ b/e-util/e-editor-text-dialog.h
@@ -25,7 +25,7 @@
#ifndef E_EDITOR_TEXT_DIALOG_H
#define E_EDITOR_TEXT_DIALOG_H
-#include <e-util/e-editor-dialog.h>
+#include <e-util/e-html-editor-dialog.h>
/* Standard GObject macros */
#define E_TYPE_EDITOR_TEXT_DIALOG \
@@ -53,12 +53,12 @@ typedef struct _EEditorTextDialogClass EEditorTextDialogClass;
typedef struct _EEditorTextDialogPrivate EEditorTextDialogPrivate;
struct _EEditorTextDialog {
- EEditorDialog parent;
+ EHTMLEditorDialog parent;
EEditorTextDialogPrivate *priv;
};
struct _EEditorTextDialogClass {
- EEditorDialogClass parent_class;
+ EHTMLEditorDialogClass parent_class;
};
GType e_editor_text_dialog_get_type (void) G_GNUC_CONST;
diff --git a/e-util/e-editor-dialog.c b/e-util/e-html-editor-dialog.c
similarity index 68%
rename from e-util/e-editor-dialog.c
rename to e-util/e-html-editor-dialog.c
index a7fee8d..5b43ebd 100644
--- a/e-util/e-editor-dialog.c
+++ b/e-util/e-html-editor-dialog.c
@@ -1,5 +1,5 @@
/*
- * e-editor-dialog.h
+ * e-html-editor-dialog.h
*
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
*
@@ -22,13 +22,13 @@
#include <config.h>
#endif
-#include "e-editor-dialog.h"
+#include "e-html-editor-dialog.h"
-#define E_EDITOR_DIALOG_GET_PRIVATE(obj) \
+#define E_HTML_EDITOR_DIALOG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_EDITOR_DIALOG, EEditorDialogPrivate))
+ ((obj), E_TYPE_HTML_EDITOR_DIALOG, EHTMLEditorDialogPrivate))
-struct _EEditorDialogPrivate {
+struct _EHTMLEditorDialogPrivate {
EHTMLEditor *editor;
GtkBox *button_box;
@@ -41,12 +41,12 @@ enum {
};
G_DEFINE_ABSTRACT_TYPE (
- EEditorDialog,
- e_editor_dialog,
+ EHTMLEditorDialog,
+ e_html_editor_dialog,
GTK_TYPE_WINDOW);
static void
-editor_dialog_set_editor (EEditorDialog *dialog,
+html_editor_dialog_set_editor (EHTMLEditorDialog *dialog,
EHTMLEditor *editor)
{
dialog->priv->editor = g_object_ref (editor);
@@ -55,7 +55,7 @@ editor_dialog_set_editor (EEditorDialog *dialog,
}
static void
-editor_dialog_get_property (GObject *object,
+html_editor_dialog_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
@@ -64,8 +64,8 @@ editor_dialog_get_property (GObject *object,
case PROP_EDITOR:
g_value_set_object (
value,
- e_editor_dialog_get_editor (
- E_EDITOR_DIALOG (object)));
+ e_html_editor_dialog_get_editor (
+ E_HTML_EDITOR_DIALOG (object)));
return;
}
@@ -73,15 +73,15 @@ editor_dialog_get_property (GObject *object,
}
static void
-editor_dialog_set_property (GObject *object,
+html_editor_dialog_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
switch (property_id) {
case PROP_EDITOR:
- editor_dialog_set_editor (
- E_EDITOR_DIALOG (object),
+ html_editor_dialog_set_editor (
+ E_HTML_EDITOR_DIALOG (object),
g_value_get_object (value));
return;
}
@@ -90,12 +90,12 @@ editor_dialog_set_property (GObject *object,
}
static void
-editor_dialog_constructed (GObject *object)
+html_editor_dialog_constructed (GObject *object)
{
- EEditorDialog *dialog = E_EDITOR_DIALOG (object);
+ EHTMLEditorDialog *dialog = E_HTML_EDITOR_DIALOG (object);
/* Chain up to parent implementation first */
- G_OBJECT_CLASS (e_editor_dialog_parent_class)->constructed (object);
+ G_OBJECT_CLASS (e_html_editor_dialog_parent_class)->constructed (object);
gtk_window_set_transient_for (
GTK_WINDOW (dialog),
@@ -104,47 +104,47 @@ editor_dialog_constructed (GObject *object)
}
static void
-editor_dialog_show (GtkWidget *widget)
+html_editor_dialog_show (GtkWidget *widget)
{
- EEditorDialogPrivate *priv;
+ EHTMLEditorDialogPrivate *priv;
- priv = E_EDITOR_DIALOG_GET_PRIVATE (widget);
+ priv = E_HTML_EDITOR_DIALOG_GET_PRIVATE (widget);
gtk_widget_show_all (GTK_WIDGET (priv->container));
gtk_widget_show_all (GTK_WIDGET (priv->button_box));
- GTK_WIDGET_CLASS (e_editor_dialog_parent_class)->show (widget);
+ GTK_WIDGET_CLASS (e_html_editor_dialog_parent_class)->show (widget);
}
static void
-editor_dialog_dispose (GObject *object)
+html_editor_dialog_dispose (GObject *object)
{
- EEditorDialogPrivate *priv;
+ EHTMLEditorDialogPrivate *priv;
- priv = E_EDITOR_DIALOG_GET_PRIVATE (object);
+ priv = E_HTML_EDITOR_DIALOG_GET_PRIVATE (object);
g_clear_object (&priv->editor);
/* Chain up to parent's implementation */
- G_OBJECT_CLASS (e_editor_dialog_parent_class)->dispose (object);
+ G_OBJECT_CLASS (e_html_editor_dialog_parent_class)->dispose (object);
}
static void
-e_editor_dialog_class_init (EEditorDialogClass *class)
+e_html_editor_dialog_class_init (EHTMLEditorDialogClass *class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- g_type_class_add_private (class, sizeof (EEditorDialogPrivate));
+ g_type_class_add_private (class, sizeof (EHTMLEditorDialogPrivate));
object_class = G_OBJECT_CLASS (class);
- object_class->get_property = editor_dialog_get_property;
- object_class->set_property = editor_dialog_set_property;
- object_class->dispose = editor_dialog_dispose;
- object_class->constructed = editor_dialog_constructed;
+ object_class->get_property = html_editor_dialog_get_property;
+ object_class->set_property = html_editor_dialog_set_property;
+ object_class->dispose = html_editor_dialog_dispose;
+ object_class->constructed = html_editor_dialog_constructed;
widget_class = GTK_WIDGET_CLASS (class);
- widget_class->show = editor_dialog_show;
+ widget_class->show = html_editor_dialog_show;
g_object_class_install_property (
object_class,
@@ -171,13 +171,13 @@ key_press_event_cb (GtkWidget *widget,
}
static void
-e_editor_dialog_init (EEditorDialog *dialog)
+e_html_editor_dialog_init (EHTMLEditorDialog *dialog)
{
GtkBox *main_layout;
GtkGrid *grid;
GtkWidget *widget, *button_box;
- dialog->priv = E_EDITOR_DIALOG_GET_PRIVATE (dialog);
+ dialog->priv = E_HTML_EDITOR_DIALOG_GET_PRIVATE (dialog);
main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
@@ -223,25 +223,25 @@ e_editor_dialog_init (EEditorDialog *dialog)
}
EHTMLEditor *
-e_editor_dialog_get_editor (EEditorDialog *dialog)
+e_html_editor_dialog_get_editor (EHTMLEditorDialog *dialog)
{
- g_return_val_if_fail (E_IS_EDITOR_DIALOG (dialog), NULL);
+ g_return_val_if_fail (E_IS_HTML_EDITOR_DIALOG (dialog), NULL);
return dialog->priv->editor;
}
GtkGrid *
-e_editor_dialog_get_container (EEditorDialog *dialog)
+e_html_editor_dialog_get_container (EHTMLEditorDialog *dialog)
{
- g_return_val_if_fail (E_IS_EDITOR_DIALOG (dialog), NULL);
+ g_return_val_if_fail (E_IS_HTML_EDITOR_DIALOG (dialog), NULL);
return dialog->priv->container;
}
GtkBox *
-e_editor_dialog_get_button_box (EEditorDialog *dialog)
+e_html_editor_dialog_get_button_box (EHTMLEditorDialog *dialog)
{
- g_return_val_if_fail (E_IS_EDITOR_DIALOG (dialog), NULL);
+ g_return_val_if_fail (E_IS_HTML_EDITOR_DIALOG (dialog), NULL);
return dialog->priv->button_box;
}
diff --git a/e-util/e-html-editor-dialog.h b/e-util/e-html-editor-dialog.h
new file mode 100644
index 0000000..37fc7a5
--- /dev/null
+++ b/e-util/e-html-editor-dialog.h
@@ -0,0 +1,74 @@
+/*
+ * e-html-editor-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_DIALOG_H
+#define E_HTML_EDITOR_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <e-util/e-html-editor.h>
+
+/* Standard GObject macros */
+#define E_TYPE_HTML_EDITOR_DIALOG \
+ (e_html_editor_dialog_get_type ())
+#define E_HTML_EDITOR_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_HTML_EDITOR_DIALOG, EHTMLEditorDialog))
+#define E_HTML_EDITOR_DIALOG_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_HTML_EDITOR_DIALOG, EHTMLEditorDialogClass))
+#define E_IS_HTML_EDITOR_DIALOG(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_HTML_EDITOR_DIALOG))
+#define E_IS_HTML_EDITOR_DIALOG_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_HTML_EDITOR_DIALOG))
+#define E_HTML_EDITOR_DIALOG_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_HTML_EDITOR_DIALOG, EHTMLEditorDialogClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EHTMLEditorDialog EHTMLEditorDialog;
+typedef struct _EHTMLEditorDialogClass EHTMLEditorDialogClass;
+typedef struct _EHTMLEditorDialogPrivate EHTMLEditorDialogPrivate;
+
+struct _EHTMLEditorDialog {
+ GtkWindow parent;
+ EHTMLEditorDialogPrivate *priv;
+};
+
+struct _EHTMLEditorDialogClass {
+ GtkWindowClass parent_class;
+};
+
+GType e_html_editor_dialog_get_type (void) G_GNUC_CONST;
+EHTMLEditor * e_html_editor_dialog_get_editor (EHTMLEditorDialog *dialog);
+GtkBox * e_html_editor_dialog_get_button_box
+ (EHTMLEditorDialog *dialog);
+GtkGrid * e_html_editor_dialog_get_container
+ (EHTMLEditorDialog *dialog);
+
+G_END_DECLS
+
+#endif /* E_HTML_EDITOR_DIALOG_H */
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 6aa415b..8cc6278 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -92,7 +92,6 @@
#include <e-util/e-dialog-utils.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-editor-cell-dialog.h>
-#include <e-util/e-editor-dialog.h>
#include <e-util/e-editor-find-dialog.h>
#include <e-util/e-editor-hrule-dialog.h>
#include <e-util/e-editor-image-dialog.h>
@@ -123,6 +122,7 @@
#include <e-util/e-filter-rule.h>
#include <e-util/e-focus-tracker.h>
#include <e-util/e-html-editor-actions.h>
+#include <e-util/e-html-editor-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]
