[evolution/wip/webkit-composer: 557/966] Dialogs refactoring and fixes
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 557/966] Dialogs refactoring and fixes
- Date: Wed, 23 Apr 2014 10:40:15 +0000 (UTC)
commit e6bc1602ad97defa55c360a9e68e4ffaafabcea9
Author: Dan Vrátil <dvratil redhat com>
Date: Mon Aug 20 15:42:12 2012 +0200
Dialogs refactoring and fixes
- move more common code to EEditorDialo base class
- add mnemonics
- fix layouts and aligment
e-util/e-editor-cell-dialog.c | 70 +++----
e-util/e-editor-dialog.c | 156 +------------
e-util/e-editor-dialog.h | 4 +
e-util/e-editor-find-dialog.c | 29 +--
e-util/e-editor-hrule-dialog.c | 49 ++---
e-util/e-editor-image-dialog.c | 68 +++---
e-util/e-editor-link-dialog.c | 33 +--
e-util/e-editor-page-dialog.c | 196 +----------------
e-util/e-editor-paragraph-dialog.c | 78 -------
e-util/e-editor-replace-dialog.c | 32 +---
e-util/e-editor-spell-check-dialog.c | 400 +---------------------------------
e-util/e-editor-table-dialog.c | 61 +++---
e-util/e-editor-text-dialog.c | 119 +----------
13 files changed, 146 insertions(+), 1149 deletions(-)
---
diff --git a/e-util/e-editor-cell-dialog.c b/e-util/e-editor-cell-dialog.c
index 1b4700a..c3995d0 100644
--- a/e-util/e-editor-cell-dialog.c
+++ b/e-util/e-editor-cell-dialog.c
@@ -64,8 +64,6 @@ struct _EEditorCellDialogPrivate {
GtkWidget *background_color_picker;
GtkWidget *background_image_chooser;
- GtkWidget *close_button;
-
WebKitDOMElement *cell;
guint scope;
};
@@ -562,35 +560,32 @@ e_editor_cell_dialog_class_init (EEditorCellDialogClass *klass)
static void
e_editor_cell_dialog_init (EEditorCellDialog *dialog)
{
- GtkBox *main_layout;
- GtkGrid *grid;
+ GtkGrid *main_layout, *grid;
GtkWidget *widget;
GtkFileFilter *file_filter;
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_CELL_DIALOG, EEditorCellDialogPrivate);
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* == Scope == */
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Scope</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Scope: cell */
widget = gtk_image_new_from_icon_name ("stock_select-cell", GTK_ICON_SIZE_BUTTON);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
- widget = gtk_radio_button_new_with_mnemonic(NULL, _("Cell"));
+ widget = gtk_radio_button_new_with_mnemonic(NULL, _("C_ell"));
gtk_grid_attach (grid, widget, 1, 0, 1, 1);
dialog->priv->scope_cell_button = widget;
@@ -603,7 +598,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
gtk_grid_attach (grid, widget, 2, 0, 1, 1);
widget = gtk_radio_button_new_with_mnemonic_from_widget (
- GTK_RADIO_BUTTON (dialog->priv->scope_cell_button), _("Row"));
+ GTK_RADIO_BUTTON (dialog->priv->scope_cell_button), _("_Row"));
gtk_grid_attach (grid, widget, 3, 0, 1, 1);
dialog->priv->scope_row_button = widget;
@@ -616,7 +611,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
widget = gtk_radio_button_new_with_mnemonic_from_widget (
- GTK_RADIO_BUTTON (dialog->priv->scope_cell_button), _("Table"));
+ GTK_RADIO_BUTTON (dialog->priv->scope_cell_button), _("_Table"));
gtk_grid_attach (grid, widget, 1, 1, 1, 1);
dialog->priv->scope_table_button = widget;
@@ -629,7 +624,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
gtk_grid_attach (grid, widget, 2, 1, 1, 1);
widget = gtk_radio_button_new_with_mnemonic_from_widget (
- GTK_RADIO_BUTTON (dialog->priv->scope_cell_button), _("Column"));
+ GTK_RADIO_BUTTON (dialog->priv->scope_cell_button), _("Col_umn"));
gtk_grid_attach (grid, widget, 3, 1, 1, 1);
dialog->priv->scope_column_button = widget;
@@ -641,12 +636,12 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Alignment & Behavior</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Horizontal */
@@ -662,7 +657,8 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget, "changed",
G_CALLBACK (editor_cell_dialog_set_halign), dialog);
- widget = gtk_label_new_with_mnemonic (_("Horizontal:"));
+ widget = gtk_label_new_with_mnemonic (_("_Horizontal:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->halign_combo);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -679,12 +675,13 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget, "changed",
G_CALLBACK (editor_cell_dialog_set_valign), dialog);
- widget = gtk_label_new_with_mnemonic (_("Vertical:"));
+ widget = gtk_label_new_with_mnemonic (_("_Vertical:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->valign_combo);
gtk_grid_attach (grid, widget, 2, 0, 1, 1);
/* Wrap Text */
- widget = gtk_check_button_new_with_mnemonic (_("Wrap Text"));
+ widget = gtk_check_button_new_with_mnemonic (_("_Wrap Text"));
dialog->priv->wrap_text_check = widget;
g_signal_connect_swapped (
@@ -692,7 +689,7 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
G_CALLBACK (editor_cell_dialog_set_wrap_text), dialog);
/* Header Style */
- widget = gtk_check_button_new_with_mnemonic (_("Header Style"));
+ widget = gtk_check_button_new_with_mnemonic (_("_Header Style"));
dialog->priv->header_style_check = widget;
g_signal_connect_swapped (
@@ -708,16 +705,16 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Layout</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 4, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 5, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Width */
- widget = gtk_check_button_new_with_mnemonic (_("Width"));
+ widget = gtk_check_button_new_with_mnemonic (_("_Width"));
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
dialog->priv->width_check = widget;
@@ -756,7 +753,8 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget, "value-changed",
G_CALLBACK (editor_cell_dialog_set_row_span), dialog);
- widget = gtk_label_new_with_mnemonic (_("Row Span:"));
+ widget = gtk_label_new_with_mnemonic (_("Row S_pan:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->row_span_edit);
gtk_grid_attach (grid, widget, 3, 0, 1, 1);
@@ -769,7 +767,8 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget, "value-changed",
G_CALLBACK (editor_cell_dialog_set_column_span), dialog);
- widget = gtk_label_new_with_mnemonic (_("Column Span:"));
+ widget = gtk_label_new_with_mnemonic (_("Co_lumn Span:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->col_span_edit);
gtk_grid_attach (grid, widget, 3, 1, 1, 1);
@@ -777,12 +776,12 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Background</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 6, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 7, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Color */
@@ -795,7 +794,8 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
G_CALLBACK (editor_cell_dialog_set_background_color), dialog);
dialog->priv->background_color_picker = widget;
- widget = gtk_label_new_with_mnemonic (_("_Color:"));
+ widget = gtk_label_new_with_mnemonic (_("C_olor:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_color_picker);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -821,24 +821,12 @@ e_editor_cell_dialog_init (EEditorCellDialog *dialog)
dialog->priv->background_image_chooser = widget;
- widget =gtk_label_new_with_mnemonic (_("Image:"));
+ widget =gtk_label_new_with_mnemonic (_("_Image:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_image_chooser);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
- /* == Button box == */
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (gtk_widget_hide), dialog);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_box_pack_start (main_layout, GTK_WIDGET (widget), TRUE, TRUE, 0);
- gtk_box_pack_start (
- GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 0);
-
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
diff --git a/e-util/e-editor-dialog.c b/e-util/e-editor-dialog.c
index 9013149..754af82 100644
--- a/e-util/e-editor-dialog.c
+++ b/e-util/e-editor-dialog.c
@@ -1,11 +1,6 @@
/*
* e-editor-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Refactor EEditorDialog... classes
* 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
@@ -27,17 +22,6 @@
#include "e-editor-dialog.h"
-<<<<<<< HEAD
-#define E_EDITOR_DIALOG_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_EDITOR_DIALOG, EEditorDialogPrivate))
-
-struct _EEditorDialogPrivate {
- EEditor *editor;
-
- GtkBox *button_box;
- GtkGrid *container;
-=======
G_DEFINE_ABSTRACT_TYPE (
EEditorDialog,
e_editor_dialog,
@@ -45,7 +29,9 @@ G_DEFINE_ABSTRACT_TYPE (
struct _EEditorDialogPrivate {
EEditor *editor;
->>>>>>> Refactor EEditorDialog... classes
+
+ GtkBox *button_box;
+ GtkGrid *container;
};
enum {
@@ -53,19 +39,6 @@ enum {
PROP_EDITOR,
};
-<<<<<<< HEAD
-G_DEFINE_ABSTRACT_TYPE (
- EEditorDialog,
- e_editor_dialog,
- GTK_TYPE_WINDOW);
-
-static void
-editor_dialog_set_editor (EEditorDialog *dialog,
- EEditor *editor)
-{
- dialog->priv->editor = g_object_ref (editor);
-
-=======
static void
editor_dialog_set_editor (EEditorDialog *dialog,
EEditor *editor)
@@ -76,22 +49,11 @@ editor_dialog_set_editor (EEditorDialog *dialog,
GTK_WINDOW (dialog),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (editor))));
->>>>>>> Refactor EEditorDialog... classes
g_object_notify (G_OBJECT (dialog), "editor");
}
static void
editor_dialog_get_property (GObject *object,
-<<<<<<< HEAD
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (property_id) {
- case PROP_EDITOR:
- g_value_set_object (
- value,
-=======
guint property_id,
GValue *value,
GParamSpec *pspec)
@@ -99,7 +61,6 @@ editor_dialog_get_property (GObject *object,
switch (property_id) {
case PROP_EDITOR:
g_value_set_object (value,
->>>>>>> Refactor EEditorDialog... classes
e_editor_dialog_get_editor (E_EDITOR_DIALOG (object)));
return;
}
@@ -109,15 +70,9 @@ editor_dialog_get_property (GObject *object,
static void
editor_dialog_set_property (GObject *object,
-<<<<<<< HEAD
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
-=======
guint property_id,
const GValue *value,
GParamSpec *pspec)
->>>>>>> Refactor EEditorDialog... classes
{
switch (property_id) {
case PROP_EDITOR:
@@ -131,44 +86,9 @@ editor_dialog_set_property (GObject *object,
}
static void
-<<<<<<< HEAD
-editor_dialog_constructed (GObject *object)
-{
- EEditorDialog *dialog = E_EDITOR_DIALOG (object);
-
- /* Chain up to parent implementation first */
- G_OBJECT_CLASS (e_editor_dialog_parent_class)->constructed (object);
-
- gtk_window_set_transient_for (
- GTK_WINDOW (dialog),
- GTK_WINDOW (gtk_widget_get_toplevel (
- GTK_WIDGET (dialog->priv->editor))));
-}
-
-static void
-editor_dialog_show (GtkWidget *widget)
-{
- EEditorDialogPrivate *priv;
-
- priv = E_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);
-}
-
-static void
-editor_dialog_dispose (GObject *object)
-{
- EEditorDialogPrivate *priv;
-
- priv = E_EDITOR_DIALOG_GET_PRIVATE (object);
-=======
editor_dialog_dispose (GObject *object)
{
EEditorDialogPrivate *priv = E_EDITOR_DIALOG (object)->priv;
->>>>>>> Refactor EEditorDialog... classes
g_clear_object (&priv->editor);
@@ -177,26 +97,10 @@ editor_dialog_dispose (GObject *object)
}
static void
-<<<<<<< HEAD
-e_editor_dialog_class_init (EEditorDialogClass *class)
-{
- GObjectClass *object_class;
- GtkWidgetClass *widget_class;
-
- g_type_class_add_private (class, sizeof (EEditorDialogPrivate));
-
- 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;
-
- widget_class = GTK_WIDGET_CLASS (class);
- widget_class->show = editor_dialog_show;
-=======
e_editor_dialog_class_init (EEditorDialogClass *klass)
{
GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (EEditorDialogPrivate));
@@ -205,37 +109,28 @@ e_editor_dialog_class_init (EEditorDialogClass *klass)
object_class->get_property = editor_dialog_get_property;
object_class->set_property = editor_dialog_set_property;
object_class->dispose = editor_dialog_dispose;
->>>>>>> Refactor EEditorDialog... classes
+
+ widget_class = GTK_WIDGET_CLASS (klass);
+ widget_class->show = editor_dialog_show;
g_object_class_install_property (
object_class,
PROP_EDITOR,
g_param_spec_object (
"editor",
-<<<<<<< HEAD
- NULL,
- NULL,
- E_TYPE_EDITOR,
- G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-=======
NULL,
NULL,
E_TYPE_EDITOR,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
->>>>>>> Refactor EEditorDialog... classes
}
static void
e_editor_dialog_init (EEditorDialog *dialog)
{
-<<<<<<< HEAD
- GtkBox *main_layout;
- GtkGrid *grid;
- GtkWidget *widget, *button_box;
-
- dialog->priv = E_EDITOR_DIALOG_GET_PRIVATE (dialog);
+ dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ dialog, E_TYPE_EDITOR_DIALOG, EEditorDialogPrivate);
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
+ main_layout = GTK_BOX (gtk_vbox_new (FALSE, 5));
gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
@@ -259,18 +154,10 @@ e_editor_dialog_init (EEditorDialog *dialog)
dialog->priv->button_box = GTK_BOX (button_box);
gtk_widget_show_all (GTK_WIDGET (main_layout));
-=======
- dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- dialog, E_TYPE_EDITOR_DIALOG, EEditorDialogPrivate);
->>>>>>> Refactor EEditorDialog... classes
g_object_set (
G_OBJECT (dialog),
"destroy-with-parent", TRUE,
-<<<<<<< HEAD
- "modal", TRUE,
-=======
->>>>>>> Refactor EEditorDialog... classes
"resizable", FALSE,
"type-hint", GDK_WINDOW_TYPE_HINT_POPUP_MENU,
"window-position", GTK_WIN_POS_CENTER_ON_PARENT,
@@ -282,11 +169,8 @@ e_editor_dialog_init (EEditorDialog *dialog)
G_CALLBACK (gtk_widget_hide_on_delete), NULL);
}
-<<<<<<< HEAD
-=======
->>>>>>> Refactor EEditorDialog... classes
EEditor *
e_editor_dialog_get_editor (EEditorDialog *dialog)
{
@@ -294,23 +178,3 @@ e_editor_dialog_get_editor (EEditorDialog *dialog)
return dialog->priv->editor;
}
-<<<<<<< HEAD
-
-GtkGrid *
-e_editor_dialog_get_container (EEditorDialog *dialog)
-{
- g_return_val_if_fail (E_IS_EDITOR_DIALOG (dialog), NULL);
-
- return dialog->priv->container;
-}
-
-GtkBox *
-e_editor_dialog_get_button_box (EEditorDialog *dialog)
-{
- g_return_val_if_fail (E_IS_EDITOR_DIALOG (dialog), NULL);
-
- return dialog->priv->button_box;
-}
-
-=======
->>>>>>> Refactor EEditorDialog... classes
diff --git a/e-util/e-editor-dialog.h b/e-util/e-editor-dialog.h
index cbc4e40..0828337 100644
--- a/e-util/e-editor-dialog.h
+++ b/e-util/e-editor-dialog.h
@@ -80,6 +80,10 @@ GType e_editor_dialog_get_type (void);
EEditor * e_editor_dialog_get_editor (EEditorDialog *dialog);
Refactor EEditorDialog... classes
+GtkBox * e_editor_dialog_get_button_box (EEditorDialog *dialog);
+
+GtkGrid * e_editor_dialog_get_container (EEditorDialog *dialog);
+
G_END_DECLS
#endif /* E_EDITOR_DIALOG_H */
diff --git a/e-util/e-editor-find-dialog.c b/e-util/e-editor-find-dialog.c
index b8cb8a3..eeb0553 100644
--- a/e-util/e-editor-find-dialog.c
+++ b/e-util/e-editor-find-dialog.c
@@ -37,7 +37,6 @@ struct _EEditorFindDialogPrivate {
GtkWidget *wrap_search;
GtkWidget *find_button;
- GtkWidget *cancel_button;
GtkWidget *result_label;
};
@@ -62,12 +61,6 @@ editor_find_dialog_show (GtkWidget *widget)
}
static void
-editor_find_dialog_close_cb (EEditorFindDialog *dialog)
-{
- gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static void
editor_find_dialog_find_cb (EEditorFindDialog *dialog)
{
gboolean found;
@@ -132,25 +125,25 @@ e_editor_find_dialog_class_init (EEditorFindDialogClass *klass)
static void
e_editor_find_dialog_init (EEditorFindDialog *dialog)
{
- GtkBox *main_layout, *box;
+ GtkGrid *main_layout;
+ GtkBox *box;
GtkWidget *widget;
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_FIND_DIALOG, EEditorFindDialogPrivate);
- main_layout = GTK_BOX (gtk_vbox_new (FALSE, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
widget = gtk_entry_new ();
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_widget_set_hexpand (widget, TRUE);
+ gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
dialog->priv->entry = widget;
g_signal_connect (
widget, "key-release-event",
G_CALLBACK (entry_key_release_event), dialog);
box = GTK_BOX (gtk_hbox_new (FALSE, 5));
- gtk_box_pack_start (main_layout, GTK_WIDGET (box), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (box), 0, 1, 1, 1);
widget = gtk_check_button_new_with_mnemonic (N_("Search _backwards"));
gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
@@ -174,7 +167,7 @@ e_editor_find_dialog_init (EEditorFindDialog *dialog)
G_CALLBACK (reset_dialog), dialog);
box = GTK_BOX (gtk_hbox_new (FALSE, 5));
- gtk_box_pack_start (main_layout, GTK_WIDGET (box), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (box), 0, 2, 1, 1);
widget = gtk_label_new ("");
gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
@@ -186,13 +179,7 @@ e_editor_find_dialog_init (EEditorFindDialog *dialog)
gtk_box_pack_end (box, widget, TRUE, TRUE, 0);
box = GTK_BOX (widget);
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_box_pack_start (box, widget, FALSE, FALSE, 5);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_find_dialog_close_cb), dialog);
- dialog->priv->cancel_button = widget;
-
+ box = e_editor_dialog_get_button_box (E_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-hrule-dialog.c b/e-util/e-editor-hrule-dialog.c
index 0528c12..110b033 100644
--- a/e-util/e-editor-hrule-dialog.c
+++ b/e-util/e-editor-hrule-dialog.c
@@ -40,8 +40,6 @@ struct _EEditorHRuleDialogPrivate {
GtkWidget *alignment_combo;
GtkWidget *shaded_check;
- GtkWidget *close_button;
-
WebKitDOMHTMLHRElement *hr_element;
};
@@ -188,11 +186,11 @@ editor_hrule_dialog_get_shading (EEditorHRuleDialog *dialog)
}
static void
-editor_hrule_dialog_close (EEditorHRuleDialog *dialog)
+editor_hrule_dialog_hide (GtkWidget *gtk_widget)
{
- gtk_widget_hide (GTK_WIDGET (dialog));
+ E_EDITOR_HRULE_DIALOG (gtk_widget)->priv->hr_element = NULL;
- dialog->priv->hr_element = NULL;
+ GTK_WIDGET_CLASS (e_editor_hrule_dialog_parent_class)->hide (gtk_widget);
}
static void
@@ -278,34 +276,31 @@ e_editor_hrule_dialog_class_init (EEditorHRuleDialogClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->show = editor_hrule_dialog_show;
+ widget_class->hide = editor_hrule_dialog_hide;
}
static void
e_editor_hrule_dialog_init (EEditorHRuleDialog *dialog)
{
- GtkBox *main_layout;
- GtkGrid *grid;
+ GtkGrid *main_layout, *grid;
GtkWidget *widget;
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_HRULE_DIALOG, EEditorHRuleDialogPrivate);
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
-
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* == Size == */
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Size</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_column_spacing (grid, 5);
gtk_grid_set_row_spacing (grid, 5);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1);
/* Width */
widget = gtk_spin_button_new_with_range (0.0, 100.0, 1.0);
@@ -317,7 +312,8 @@ e_editor_hrule_dialog_init (EEditorHRuleDialog *dialog)
dialog->priv->width_edit = widget;
gtk_grid_attach (grid, widget, 1, 0, 1, 1);
- widget = gtk_label_new_with_mnemonic (_("Width:"));
+ widget = gtk_label_new_with_mnemonic (_("_Width:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->size_edit);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -341,7 +337,8 @@ e_editor_hrule_dialog_init (EEditorHRuleDialog *dialog)
dialog->priv->size_edit = widget;
gtk_grid_attach (grid, widget, 1, 1, 1, 1);
- widget = gtk_label_new_with_mnemonic (_("Size:"));
+ widget = gtk_label_new_with_mnemonic (_("_Size:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->size_edit);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
@@ -350,13 +347,13 @@ e_editor_hrule_dialog_init (EEditorHRuleDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Style</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_column_spacing (grid, 5);
gtk_grid_set_row_spacing (grid, 5);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1);
/* Alignment */
widget = gtk_combo_box_text_new ();
@@ -373,31 +370,19 @@ e_editor_hrule_dialog_init (EEditorHRuleDialog *dialog)
dialog->priv->alignment_combo = widget;
gtk_grid_attach (grid, widget, 1, 0, 2, 1);
- widget = gtk_label_new_with_mnemonic (_("Alignment:"));
+ widget = gtk_label_new_with_mnemonic (_("_Alignment:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), widget);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
/* Shaded */
- widget = gtk_check_button_new_with_mnemonic (_("Shaded"));
+ widget = gtk_check_button_new_with_mnemonic (_("S_haded"));
g_signal_connect_swapped (
widget, "toggled",
G_CALLBACK (editor_hrule_dialog_set_shading), dialog);
dialog->priv->shaded_check = widget;
gtk_grid_attach (grid, widget, 0, 1, 2, 1);
-
- /* == Button box == */
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_hrule_dialog_close), dialog);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 5);
-
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
diff --git a/e-util/e-editor-image-dialog.c b/e-util/e-editor-image-dialog.c
index 40686e0..0004e8d 100644
--- a/e-util/e-editor-image-dialog.c
+++ b/e-util/e-editor-image-dialog.c
@@ -50,8 +50,6 @@ struct _EEditorImageDialogPrivate {
GtkWidget *url_edit;
GtkWidget *test_url_button;
- GtkWidget *close_button;
-
WebKitDOMHTMLImageElement *image;
};
@@ -391,11 +389,11 @@ editor_image_dialog_show (GtkWidget *gtk_widget)
}
static void
-editor_image_dialog_close (EEditorImageDialog *dialog)
+editor_image_dialog_hide (GtkWidget *gtk_widget)
{
- dialog->priv->image = NULL;
+ E_EDITOR_IMAGE_DIALOG (gtk_widget)->priv->image = NULL;
- gtk_widget_hide (GTK_WIDGET (dialog));
+ GTK_WIDGET_CLASS (e_editor_image_dialog_parent_class)->hide (gtk_widget);
}
static void
@@ -408,33 +406,31 @@ e_editor_image_dialog_class_init (EEditorImageDialogClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->show = editor_image_dialog_show;
+ widget_class->hide = editor_image_dialog_hide;
}
static void
e_editor_image_dialog_init (EEditorImageDialog *dialog)
{
- GtkBox *main_layout;
- GtkGrid *grid;
+ GtkGrid *main_layout, *grid;
GtkWidget *widget;
GtkFileFilter *file_filter;
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_IMAGE_DIALOG, EEditorImageDialogPrivate);
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* == General == */
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>General</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Source */
@@ -456,7 +452,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_src), dialog);
dialog->priv->file_chooser = widget;
- widget = gtk_label_new_with_mnemonic (_("Source:"));
+ widget = gtk_label_new_with_mnemonic (_("_Source:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->file_chooser);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -469,7 +466,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_alt), dialog);
dialog->priv->description_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("Description:"));
+ widget = gtk_label_new_with_mnemonic (_("_Description:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->description_edit);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
@@ -478,12 +476,12 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Layout</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Width */
@@ -494,7 +492,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_width), dialog);
dialog->priv->width_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("Width:"));
+ widget = gtk_label_new_with_mnemonic (_("_Width:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->width_edit);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -517,7 +516,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_height), dialog);
dialog->priv->height_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("Height:"));
+ widget = gtk_label_new_with_mnemonic (_("_Height:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->height_edit);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
@@ -544,7 +544,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_alignment), dialog);
dialog->priv->alignment = widget;
- widget = gtk_label_new_with_mnemonic (_("Alignment"));
+ widget = gtk_label_new_with_mnemonic (_("_Alignment"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->alignment);
gtk_grid_attach (grid, widget, 0, 2, 1, 1);
@@ -556,7 +557,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_x_padding), dialog);
dialog->priv->x_padding_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("X-Padding:"));
+ widget = gtk_label_new_with_mnemonic (_("_X-Padding:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->x_padding_edit);
gtk_grid_attach (grid, widget, 4, 0, 1, 1);
@@ -571,7 +573,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_y_padding), dialog);
dialog->priv->y_padding_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("Y-Padding:"));
+ widget = gtk_label_new_with_mnemonic (_("_Y-Padding:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->y_padding_edit);
gtk_grid_attach (grid, widget, 4, 1, 1, 1);
@@ -586,7 +589,8 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_border), dialog);
dialog->priv->border_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("Border:"));
+ widget = gtk_label_new_with_mnemonic (_("_Border:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->border_edit);
gtk_grid_attach (grid, widget, 4, 2, 1, 1);
@@ -597,12 +601,12 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Link</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 4, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 5, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
widget = gtk_entry_new ();
@@ -613,28 +617,18 @@ e_editor_image_dialog_init (EEditorImageDialog *dialog)
G_CALLBACK (editor_image_dialog_set_url), dialog);
dialog->priv->url_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("URL:"));
+ widget = gtk_label_new_with_mnemonic (_("_URL:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->url_edit);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
- widget = gtk_button_new_with_label (_("Test URL..."));
+ widget = gtk_button_new_with_label (_("_Test URL..."));
gtk_grid_attach (grid, widget, 2, 0, 1, 1);
g_signal_connect_swapped (
widget, "clicked",
G_CALLBACK (editor_image_dialog_test_url), dialog);
dialog->priv->test_url_button = widget;
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_image_dialog_close), dialog);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
- gtk_box_pack_start (GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 5);
-
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
diff --git a/e-util/e-editor-link-dialog.c b/e-util/e-editor-link-dialog.c
index ae7707f..a034cbc 100644
--- a/e-util/e-editor-link-dialog.c
+++ b/e-util/e-editor-link-dialog.c
@@ -37,7 +37,6 @@ struct _EEditorLinkDialogPrivate {
GtkWidget *test_button;
GtkWidget *remove_link_button;
- GtkWidget *close_button;
GtkWidget *ok_button;
};
@@ -267,21 +266,18 @@ e_editor_link_dialog_init (EEditorLinkDialog *dialog)
dialog, E_TYPE_EDITOR_LINK_DIALOG,
EEditorLinkDialogPrivate);
- main_layout = GTK_GRID (gtk_grid_new ());
- gtk_grid_set_row_spacing (main_layout, 10);
- gtk_grid_set_column_spacing (main_layout, 10);
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
widget = gtk_entry_new ();
gtk_grid_attach (main_layout, widget, 1, 0, 1, 1);
dialog->priv->url_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("URL:"));
+ widget = gtk_label_new_with_mnemonic (_("_URL:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->url_edit);
gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
- widget = gtk_button_new_with_label (_("Test URL..."));
+ widget = gtk_button_new_with_mnemonic (_("_Test URL..."));
gtk_grid_attach (main_layout, widget, 2, 0, 1, 1);
g_signal_connect_swapped (
widget, "clicked",
@@ -292,23 +288,14 @@ e_editor_link_dialog_init (EEditorLinkDialog *dialog)
gtk_grid_attach (main_layout, widget, 1, 1, 2, 1);
dialog->priv->label_edit = widget;
- widget = gtk_label_new_with_mnemonic (_("Description:"));
+ widget = gtk_label_new_with_mnemonic (_("_Description:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->label_edit);
gtk_grid_attach (main_layout, widget, 0, 1, 1, 1);
- button_box = GTK_BOX (gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL));
- gtk_box_set_spacing (button_box, 5);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_END);
- gtk_grid_attach (main_layout, GTK_WIDGET (button_box), 0, 2, 3, 1);
-
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_link_dialog_close), dialog);
- gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_new_with_label (_("Remove Link"));
+ button_box = e_editor_dialog_get_button_box (E_EDITOR_DIALOG (dialog));
+
+ widget = gtk_button_new_with_mnemonic (_("_Remove Link"));
g_signal_connect_swapped (
widget, "clicked",
G_CALLBACK (editor_link_dialog_remove_link), dialog);
@@ -319,7 +306,7 @@ e_editor_link_dialog_init (EEditorLinkDialog *dialog)
g_signal_connect_swapped (
widget, "clicked",
G_CALLBACK (editor_link_dialog_ok), dialog);
- gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
+ gtk_box_pack_end (button_box, widget, FALSE, FALSE, 5);
dialog->priv->ok_button = widget;
gtk_widget_show_all (GTK_WIDGET (main_layout));
diff --git a/e-util/e-editor-page-dialog.c b/e-util/e-editor-page-dialog.c
index 690deef..3327361 100644
--- a/e-util/e-editor-page-dialog.c
+++ b/e-util/e-editor-page-dialog.c
@@ -1,11 +1,6 @@
/*
* e-editor-page-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Page Properties' dialog work
* 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
@@ -32,16 +27,10 @@
#include "e-color-combo.h"
#include "e-misc-utils.h"
-<<<<<<< HEAD
-#define E_EDITOR_PAGE_DIALOG_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_EDITOR_PAGE_DIALOG, EEditorPageDialogPrivate))
-=======
G_DEFINE_TYPE (
EEditorPageDialog,
e_editor_page_dialog,
E_TYPE_EDITOR_DIALOG);
->>>>>>> Make 'Page Properties' dialog work
struct _EEditorPageDialogPrivate {
GtkWidget *text_color_picker;
@@ -50,11 +39,6 @@ struct _EEditorPageDialogPrivate {
GtkWidget *background_template_combo;
GtkWidget *background_image_filechooser;
-<<<<<<< HEAD
-=======
-
- GtkWidget *close_button;
->>>>>>> Make 'Page Properties' dialog work
};
typedef struct _Template {
@@ -148,17 +132,8 @@ static const Template templates[] = {
{ 1.0 , 1.0 , 1.0 , 1 },
0
}
-<<<<<<< HEAD
-};
-
-G_DEFINE_TYPE (
- EEditorPageDialog,
- e_editor_page_dialog,
- E_TYPE_EDITOR_DIALOG);
-=======
};
->>>>>>> Make 'Page Properties' dialog work
static void
editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
@@ -170,11 +145,7 @@ editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
GdkRGBA rgba;
gchar *color;
-<<<<<<< HEAD
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
-=======
editor = e_editor_dialog_get_editor(E_EDITOR_DIALOG (dialog));
->>>>>>> Make 'Page Properties' dialog work
widget = e_editor_get_editor_widget (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (widget));
body = webkit_dom_document_get_body (document);
@@ -182,15 +153,9 @@ editor_page_dialog_set_text_color (EEditorPageDialog *dialog)
e_color_combo_get_current_color (
E_COLOR_COMBO (dialog->priv->text_color_picker), &rgba);
-<<<<<<< HEAD
- color = g_strdup_printf ("#%06x", e_rgba_to_value (&rgba));
- webkit_dom_html_body_element_set_text (
- WEBKIT_DOM_HTML_BODY_ELEMENT (body), color);
-=======
color = g_strdup_printf("#%06x", e_rgba_to_value (&rgba));
webkit_dom_html_body_element_set_text (
(WebKitDOMHTMLBodyElement *) body, color);
->>>>>>> Make 'Page Properties' dialog work
g_free (color);
}
@@ -205,11 +170,7 @@ editor_page_dialog_set_link_color (EEditorPageDialog *dialog)
GdkRGBA rgba;
gchar *color;
-<<<<<<< HEAD
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
-=======
editor = e_editor_dialog_get_editor(E_EDITOR_DIALOG (dialog));
->>>>>>> Make 'Page Properties' dialog work
widget = e_editor_get_editor_widget (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (widget));
body = webkit_dom_document_get_body (document);
@@ -217,15 +178,9 @@ editor_page_dialog_set_link_color (EEditorPageDialog *dialog)
e_color_combo_get_current_color (
E_COLOR_COMBO (dialog->priv->link_color_picker), &rgba);
-<<<<<<< HEAD
- color = g_strdup_printf ("#%06x", e_rgba_to_value (&rgba));
- webkit_dom_html_body_element_set_link (
- WEBKIT_DOM_HTML_BODY_ELEMENT (body), color);
-=======
color = g_strdup_printf("#%06x", e_rgba_to_value (&rgba));
webkit_dom_html_body_element_set_link (
(WebKitDOMHTMLBodyElement *) body, color);
->>>>>>> Make 'Page Properties' dialog work
g_free (color);
}
@@ -240,11 +195,7 @@ editor_page_dialog_set_background_color (EEditorPageDialog *dialog)
GdkRGBA rgba;
gchar *color;
-<<<<<<< HEAD
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
-=======
editor = e_editor_dialog_get_editor(E_EDITOR_DIALOG (dialog));
->>>>>>> Make 'Page Properties' dialog work
widget = e_editor_get_editor_widget (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (widget));
body = webkit_dom_document_get_body (document);
@@ -252,17 +203,10 @@ editor_page_dialog_set_background_color (EEditorPageDialog *dialog)
e_color_combo_get_current_color (
E_COLOR_COMBO (dialog->priv->background_color_picker), &rgba);
-<<<<<<< HEAD
- color = g_strdup_printf ("#%06x", e_rgba_to_value (&rgba));
-
- webkit_dom_html_body_element_set_bg_color (
- WEBKIT_DOM_HTML_BODY_ELEMENT (body), color);
-=======
color = g_strdup_printf("#%06x", e_rgba_to_value (&rgba));
webkit_dom_html_body_element_set_bg_color (
(WebKitDOMHTMLBodyElement *) body, color);
->>>>>>> Make 'Page Properties' dialog work
g_free (color);
}
@@ -276,10 +220,7 @@ editor_page_dialog_set_background_from_template (EEditorPageDialog *dialog)
gtk_combo_box_get_active (
GTK_COMBO_BOX (dialog->priv->background_template_combo))];
-<<<<<<< HEAD
-=======
->>>>>>> Make 'Page Properties' dialog work
/* Special case - 'none' template */
if (tmplt->filename == NULL) {
gtk_file_chooser_unselect_all (
@@ -314,15 +255,9 @@ editor_page_dialog_set_background_image (EEditorPageDialog *dialog)
EEditorWidget *widget;
WebKitDOMDocument *document;
WebKitDOMHTMLElement *body;
-<<<<<<< HEAD
- gchar *uri;
-
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
-=======
const gchar *uri;
editor = e_editor_dialog_get_editor(E_EDITOR_DIALOG (dialog));
->>>>>>> Make 'Page Properties' dialog work
widget = e_editor_get_editor_widget (editor);
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (widget));
body = webkit_dom_document_get_body (document);
@@ -332,22 +267,10 @@ editor_page_dialog_set_background_image (EEditorPageDialog *dialog)
dialog->priv->background_image_filechooser));
webkit_dom_html_body_element_set_background (
-<<<<<<< HEAD
- WEBKIT_DOM_HTML_BODY_ELEMENT (body), uri ? uri : "");
-
- g_free (uri);
-=======
(WebKitDOMHTMLBodyElement *) body, uri ? uri : "");
}
static void
-editor_page_dialog_close (EEditorPageDialog *dialog)
-{
- gtk_widget_hide (GTK_WIDGET (dialog));
->>>>>>> Make 'Page Properties' dialog work
-}
-
-static void
editor_page_dialog_show (GtkWidget *widget)
{
EEditor *editor;
@@ -366,11 +289,7 @@ editor_page_dialog_show (GtkWidget *widget)
body = webkit_dom_document_get_body (document);
tmp = webkit_dom_html_body_element_get_background (
-<<<<<<< HEAD
- WEBKIT_DOM_HTML_BODY_ELEMENT (body));
-=======
(WebKitDOMHTMLBodyElement *) body);
->>>>>>> Make 'Page Properties' dialog work
if (tmp && *tmp) {
gint ii;
gchar *fname = g_filename_from_uri (tmp, NULL, NULL);
@@ -389,16 +308,9 @@ editor_page_dialog_show (GtkWidget *widget)
gtk_combo_box_set_active (
GTK_COMBO_BOX (dialog->priv->background_template_combo), 0);
}
-<<<<<<< HEAD
- g_free (tmp);
-
- tmp = webkit_dom_html_body_element_get_text (
- WEBKIT_DOM_HTML_BODY_ELEMENT (body));
-=======
tmp = webkit_dom_html_body_element_get_text (
(WebKitDOMHTMLBodyElement *) body);
->>>>>>> Make 'Page Properties' dialog work
if (!tmp || !*tmp) {
GdkColor *color;
GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (editor_widget));
@@ -410,22 +322,13 @@ editor_page_dialog_show (GtkWidget *widget)
rgba.blue = ((gdouble) color->blue) / G_MAXUINT16;
} else {
gdk_rgba_parse (&rgba, tmp);
-<<<<<<< HEAD
- }
- g_free (tmp);
-=======
g_free (tmp);
}
->>>>>>> Make 'Page Properties' dialog work
e_color_combo_set_current_color (
E_COLOR_COMBO (dialog->priv->text_color_picker), &rgba);
tmp = webkit_dom_html_body_element_get_link (
-<<<<<<< HEAD
- WEBKIT_DOM_HTML_BODY_ELEMENT (body));
-=======
(WebKitDOMHTMLBodyElement *) body);
->>>>>>> Make 'Page Properties' dialog work
if (!tmp || !*tmp) {
GdkColor color;
gtk_widget_style_get (
@@ -437,22 +340,13 @@ editor_page_dialog_show (GtkWidget *widget)
rgba.blue = ((gdouble) color.blue) / G_MAXUINT16;
} else {
gdk_rgba_parse (&rgba, tmp);
-<<<<<<< HEAD
- }
- g_free (tmp);
-=======
g_free (tmp);
}
->>>>>>> Make 'Page Properties' dialog work
e_color_combo_set_current_color (
E_COLOR_COMBO (dialog->priv->link_color_picker), &rgba);
tmp = webkit_dom_html_body_element_get_bg_color (
-<<<<<<< HEAD
- WEBKIT_DOM_HTML_BODY_ELEMENT (body));
-=======
(WebKitDOMHTMLBodyElement *) body);
->>>>>>> Make 'Page Properties' dialog work
if (!tmp || !*tmp) {
GdkColor *color;
GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (editor_widget));
@@ -465,33 +359,16 @@ editor_page_dialog_show (GtkWidget *widget)
} else {
gdk_rgba_parse (&rgba, tmp);
-<<<<<<< HEAD
- }
- g_free (tmp);
- e_color_combo_set_current_color (
- E_COLOR_COMBO (dialog->priv->background_color_picker), &rgba);
-
-=======
g_free (tmp);
}
e_color_combo_set_current_color (
E_COLOR_COMBO (dialog->priv->background_color_picker), &rgba);
->>>>>>> Make 'Page Properties' dialog work
GTK_WIDGET_CLASS (e_editor_page_dialog_parent_class)->show (widget);
}
static void
-<<<<<<< HEAD
-e_editor_page_dialog_class_init (EEditorPageDialogClass *class)
-{
- GtkWidgetClass *widget_class;
-
- g_type_class_add_private (class, sizeof (EEditorPageDialogPrivate));
-
- widget_class = GTK_WIDGET_CLASS (class);
-=======
e_editor_page_dialog_class_init (EEditorPageDialogClass *klass)
{
GtkWidgetClass *widget_class;
@@ -500,53 +377,31 @@ e_editor_page_dialog_class_init (EEditorPageDialogClass *klass)
g_type_class_add_private (klass, sizeof (EEditorPageDialogPrivate));
widget_class = GTK_WIDGET_CLASS (klass);
->>>>>>> Make 'Page Properties' dialog work
widget_class->show = editor_page_dialog_show;
}
static void
e_editor_page_dialog_init (EEditorPageDialog *dialog)
{
-<<<<<<< HEAD
GtkGrid *grid, *main_layout;
GtkWidget *widget;
gint ii;
- dialog->priv = E_EDITOR_PAGE_DIALOG_GET_PRIVATE (dialog);
-
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
-=======
- GtkBox *main_layout;
- GtkGrid *grid;
- GtkWidget *widget;
- gint ii;
-
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_PAGE_DIALOG, EEditorPageDialogPrivate);
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
->>>>>>> Make 'Page Properties' dialog work
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* == Colors == */
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Colors</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
-=======
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
->>>>>>> Make 'Page Properties' dialog work
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1);
-=======
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
->>>>>>> Make 'Page Properties' dialog work
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Text */
@@ -558,12 +413,8 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
gtk_grid_attach (grid, widget, 1, 0, 1, 1);
dialog->priv->text_color_picker = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Text:"));
- gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Text:"));
->>>>>>> Make 'Page Properties' dialog work
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->text_color_picker);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -577,12 +428,8 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
gtk_grid_attach (grid, widget, 1, 1, 1, 1);
dialog->priv->link_color_picker = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Link:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Link:"));
->>>>>>> Make 'Page Properties' dialog work
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->link_color_picker);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
@@ -596,12 +443,8 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
gtk_grid_attach (grid, widget, 1, 2, 1, 1);
dialog->priv->background_color_picker = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Background:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Background:"));
->>>>>>> Make 'Page Properties' dialog work
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_color_picker);
gtk_grid_attach (grid, widget, 0, 2, 1, 1);
@@ -610,20 +453,12 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Background Image</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
-=======
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
->>>>>>> Make 'Page Properties' dialog work
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1);
-=======
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
->>>>>>> Make 'Page Properties' dialog work
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Template */
@@ -638,12 +473,8 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
gtk_grid_attach (grid, widget, 1, 0, 1, 1);
dialog->priv->background_template_combo = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Template:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Template:"));
->>>>>>> Make 'Page Properties' dialog work
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_template_combo);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -657,39 +488,16 @@ e_editor_page_dialog_init (EEditorPageDialog *dialog)
gtk_grid_attach (grid, widget, 1, 1, 1, 1);
dialog->priv->background_image_filechooser = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Custom:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Custom:"));
->>>>>>> Make 'Page Properties' dialog work
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_image_filechooser);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
-<<<<<<< HEAD
- gtk_widget_show_all (GTK_WIDGET (main_layout));
-}
-
-=======
-
- /* == Button box == */
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_page_dialog_close), dialog);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 5);
-
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
->>>>>>> Make 'Page Properties' dialog work
GtkWidget *
e_editor_page_dialog_new (EEditor *editor)
{
diff --git a/e-util/e-editor-paragraph-dialog.c b/e-util/e-editor-paragraph-dialog.c
index d526028..7b4327f 100644
--- a/e-util/e-editor-paragraph-dialog.c
+++ b/e-util/e-editor-paragraph-dialog.c
@@ -1,11 +1,6 @@
/*
* e-editor-text-dialog.c
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Paragraph Properties' dialog work
* 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
@@ -31,13 +26,6 @@
#include "e-action-combo-box.h"
-<<<<<<< HEAD
-#define E_EDITOR_PARAGRAPH_DIALOG_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_EDITOR_PARAGRAPH_DIALOG, EEditorParagraphDialogPrivate))
-
-=======
->>>>>>> Make 'Paragraph Properties' dialog work
G_DEFINE_TYPE (
EEditorParagraphDialog,
e_editor_paragraph_dialog,
@@ -49,22 +37,12 @@ struct _EEditorParagraphDialogPrivate {
GtkWidget *left_button;
GtkWidget *center_button;
GtkWidget *right_button;
-<<<<<<< HEAD
-=======
-
- GtkWidget *close_button;
->>>>>>> Make 'Paragraph Properties' dialog work
};
static void
editor_paragraph_dialog_constructed (GObject *object)
{
-<<<<<<< HEAD
GtkGrid *main_layout, *grid;
-=======
- GtkBox *main_layout;
- GtkGrid *grid;
->>>>>>> Make 'Paragraph Properties' dialog work
GtkWidget *widget;
EEditor *editor;
EEditorParagraphDialog *dialog;
@@ -72,32 +50,18 @@ editor_paragraph_dialog_constructed (GObject *object)
dialog = E_EDITOR_PARAGRAPH_DIALOG (object);
editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
-<<<<<<< HEAD
main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
-=======
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
->>>>>>> Make 'Paragraph Properties' dialog work
/* == General == */
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>General</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
-=======
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
->>>>>>> Make 'Paragraph Properties' dialog work
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1);
-=======
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
->>>>>>> Make 'Paragraph Properties' dialog work
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Style */
@@ -107,12 +71,8 @@ editor_paragraph_dialog_constructed (GObject *object)
gtk_grid_attach (grid, widget, 1, 0, 1, 1);
dialog->priv->style_combo = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Style:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Style:"));
->>>>>>> Make 'Paragraph Properties' dialog work
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->style_combo);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -120,20 +80,12 @@ editor_paragraph_dialog_constructed (GObject *object)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Alignment</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
-=======
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
->>>>>>> Make 'Paragraph Properties' dialog work
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
-<<<<<<< HEAD
gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1);
-=======
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
->>>>>>> Make 'Paragraph Properties' dialog work
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Left */
@@ -163,35 +115,10 @@ editor_paragraph_dialog_constructed (GObject *object)
e_editor_get_action (editor, "justify-right"));
dialog->priv->right_button = widget;
-<<<<<<< HEAD
-=======
- /* == Button box == */
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (gtk_widget_hide), dialog);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
- gtk_box_pack_start (GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 5);
-
->>>>>>> Make 'Paragraph Properties' dialog work
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
static void
-<<<<<<< HEAD
-e_editor_paragraph_dialog_class_init (EEditorParagraphDialogClass *class)
-{
- GObjectClass *object_class;
-
- g_type_class_add_private (
- class, sizeof (EEditorParagraphDialogPrivate));
-
- object_class = G_OBJECT_CLASS (class);
-=======
e_editor_paragraph_dialog_class_init (EEditorParagraphDialogClass *klass)
{
GObjectClass *object_class;
@@ -200,19 +127,14 @@ e_editor_paragraph_dialog_class_init (EEditorParagraphDialogClass *klass)
g_type_class_add_private (klass, sizeof (EEditorParagraphDialogPrivate));
object_class = G_OBJECT_CLASS (klass);
->>>>>>> Make 'Paragraph Properties' dialog work
object_class->constructed = editor_paragraph_dialog_constructed;
}
static void
e_editor_paragraph_dialog_init (EEditorParagraphDialog *dialog)
{
-<<<<<<< HEAD
- dialog->priv = E_EDITOR_PARAGRAPH_DIALOG_GET_PRIVATE (dialog);
-=======
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_PARAGRAPH_DIALOG, EEditorParagraphDialogPrivate);
->>>>>>> Make 'Paragraph Properties' dialog work
}
GtkWidget *
diff --git a/e-util/e-editor-replace-dialog.c b/e-util/e-editor-replace-dialog.c
index 150af90..7508c2e 100644
--- a/e-util/e-editor-replace-dialog.c
+++ b/e-util/e-editor-replace-dialog.c
@@ -39,7 +39,6 @@ struct _EEditorReplaceDialogPrivate {
GtkWidget *result_label;
- GtkWidget *close_button;
GtkWidget *skip_button;
GtkWidget *replace_button;
GtkWidget *replace_all_button;
@@ -137,12 +136,6 @@ editor_replace_dialog_replace_all_cb (EEditorReplaceDialog *dialog)
}
static void
-editor_replace_dialog_close_cb (EEditorReplaceDialog *dialog)
-{
- gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static void
editor_replace_dialog_entry_changed (EEditorReplaceDialog *dialog)
{
gboolean ready;
@@ -227,16 +220,13 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
{
GtkGrid *main_layout;
GtkWidget *widget, *layout;
+ GtkBox *button_box;
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_REPLACE_DIALOG,
EEditorReplaceDialogPrivate);
- main_layout = GTK_GRID (gtk_grid_new ());
- gtk_grid_set_row_spacing (main_layout, 10);
- gtk_grid_set_column_spacing (main_layout, 10);
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
widget = gtk_entry_new ();
gtk_grid_attach (main_layout, widget, 1, 0, 2, 1);
@@ -281,20 +271,10 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
gtk_grid_attach (main_layout, widget, 0, 3, 2, 1);
dialog->priv->result_label = widget;
- layout = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_set_spacing (GTK_BOX (layout), 5);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (layout), GTK_BUTTONBOX_START);
- gtk_grid_attach (main_layout, layout, 2, 3, 1, 1);
-
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_box_pack_start (GTK_BOX (layout), widget, FALSE, FALSE, 5);
- dialog->priv->close_button = widget;
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_replace_dialog_close_cb), dialog);
+ button_box = e_editor_dialog_get_button_box (E_EDITOR_DIALOG (dialog));
widget = gtk_button_new_with_mnemonic (_("_Skip"));
- gtk_box_pack_start (GTK_BOX (layout), widget, FALSE, FALSE, 5);
+ gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
gtk_widget_set_sensitive (widget, FALSE);
dialog->priv->skip_button = widget;
g_signal_connect_swapped (
@@ -302,7 +282,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
G_CALLBACK (editor_replace_dialog_skip_cb), dialog);
widget = gtk_button_new_with_mnemonic (_("_Replace"));
- gtk_box_pack_start (GTK_BOX (layout), widget, FALSE, FALSE, 5);
+ gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
gtk_widget_set_sensitive (widget, FALSE);
dialog->priv->replace_button = widget;
g_signal_connect_swapped (
@@ -310,7 +290,7 @@ e_editor_replace_dialog_init (EEditorReplaceDialog *dialog)
G_CALLBACK (editor_replace_dialog_replace_cb), dialog);
widget = gtk_button_new_with_mnemonic (_("Replace _All"));
- gtk_box_pack_start (GTK_BOX (layout), widget, FALSE, FALSE, 5);
+ gtk_box_pack_start (button_box, widget, FALSE, FALSE, 5);
gtk_widget_set_sensitive (widget, FALSE);
dialog->priv->replace_all_button = widget;
g_signal_connect_swapped (
diff --git a/e-util/e-editor-spell-check-dialog.c b/e-util/e-editor-spell-check-dialog.c
index 2a65e22..2447ec5 100644
--- a/e-util/e-editor-spell-check-dialog.c
+++ b/e-util/e-editor-spell-check-dialog.c
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-/*
- * e-editor-spell-dialog.c
- *
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
-=======
/* e-editor-spell-dialog.c
->>>>>>> Port spell-checking
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -31,15 +24,6 @@
#include <glib/gi18n-lib.h>
#include <enchant/enchant.h>
-<<<<<<< HEAD
-#include "e-editor-widget.h"
-#include "e-spell-checker.h"
-#include "e-spell-dictionary.h"
-
-#define E_EDITOR_SPELL_CHECK_DIALOG_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_EDITOR_SPELL_CHECK_DIALOG, EEditorSpellCheckDialogPrivate))
-=======
#include "e-editor-spell-checker.h"
#include "e-editor-widget.h"
@@ -53,7 +37,6 @@ enum {
COMBO_COLUMN_DICTIONARY, /* E_TYPE_SPELL_DICTIONARY */
COMBO_COLUMN_TEXT /* G_TYPE_STRING */
};
->>>>>>> Port spell-checking
struct _EEditorSpellCheckDialogPrivate {
GtkWidget *add_word_button;
@@ -65,40 +48,6 @@ struct _EEditorSpellCheckDialogPrivate {
GtkWidget *skip_button;
GtkWidget *suggestion_label;
GtkWidget *tree_view;
-<<<<<<< HEAD
-
- WebKitDOMDOMSelection *selection;
-
- gchar *word;
- ESpellDictionary *current_dict;
-};
-
-enum {
- COLUMN_NAME,
- COLUMN_DICTIONARY,
- NUM_COLUMNS
-};
-
-G_DEFINE_TYPE (
- EEditorSpellCheckDialog,
- e_editor_spell_check_dialog,
- E_TYPE_EDITOR_DIALOG)
-
-static void
-editor_spell_check_dialog_set_word (EEditorSpellCheckDialog *dialog,
- const gchar *word)
-{
- EEditor *editor;
- EEditorWidget *editor_widget;
- GtkTreeView *tree_view;
- GtkListStore *store;
- gchar *markup;
- GList *list, *link;
-
- if (word == NULL)
- return;
-=======
- GtkWidget *close_button;
GList *dictionaries;
WebKitDOMDOMSelection *selection;
@@ -119,7 +68,6 @@ editor_spell_check_dialog_set_word (EEditorSpellCheckDialog *dialog,
if (word == NULL) {
return;
}
->>>>>>> Port spell-checking
if (dialog->priv->word != word) {
g_free (dialog->priv->word);
@@ -131,18 +79,6 @@ editor_spell_check_dialog_set_word (EEditorSpellCheckDialog *dialog,
GTK_LABEL (dialog->priv->suggestion_label), markup);
g_free (markup);
-<<<<<<< HEAD
- tree_view = GTK_TREE_VIEW (dialog->priv->tree_view);
- store = GTK_LIST_STORE (gtk_tree_view_get_model (tree_view));
- gtk_list_store_clear (store);
-
- list = e_spell_dictionary_get_suggestions (
- dialog->priv->current_dict, word, -1);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- GtkTreeIter iter;
- gchar *suggestion = link->data;
-=======
store = GTK_LIST_STORE (
gtk_tree_view_get_model (
GTK_TREE_VIEW (dialog->priv->tree_view)));
@@ -153,48 +89,23 @@ editor_spell_check_dialog_set_word (EEditorSpellCheckDialog *dialog,
for (ii = 0; suggestions && suggestions[ii]; ii++) {
GtkTreeIter iter;
gchar *suggestion = suggestions[ii];
->>>>>>> Port spell-checking
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, suggestion, -1);
}
-<<<<<<< HEAD
- g_list_free_full (list, (GDestroyNotify) g_free);
-
- /* We give focus to WebKit so that the currently selected word
- * is highlited. Without focus selection is not visible (at
- * 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_widget = e_editor_get_editor_widget (editor);
- gtk_widget_grab_focus (GTK_WIDGET (editor_widget));
-=======
g_strfreev (suggestions);
->>>>>>> Port spell-checking
}
static gboolean
select_next_word (EEditorSpellCheckDialog *dialog)
{
-<<<<<<< HEAD
- WebKitDOMNode *anchor, *focus;
- gulong anchor_offset, focus_offset;
-=======
WebKitDOMNode *anchor;
gulong anchor_offset;
->>>>>>> Port spell-checking
anchor = webkit_dom_dom_selection_get_anchor_node (dialog->priv->selection);
anchor_offset = webkit_dom_dom_selection_get_anchor_offset (dialog->priv->selection);
-<<<<<<< HEAD
- focus = webkit_dom_dom_selection_get_focus_node (dialog->priv->selection);
- focus_offset = webkit_dom_dom_selection_get_focus_offset (dialog->priv->selection);
-
-=======
->>>>>>> Port spell-checking
/* Jump _behind_ next word */
webkit_dom_dom_selection_modify (
dialog->priv->selection, "move", "forward", "word");
@@ -205,21 +116,6 @@ select_next_word (EEditorSpellCheckDialog *dialog)
webkit_dom_dom_selection_modify (
dialog->priv->selection, "extend", "forward", "word");
-<<<<<<< HEAD
- /* If the selection didn't change, then we have most probably
- * reached the end of document - return FALSE */
- return !((anchor == webkit_dom_dom_selection_get_anchor_node (
- dialog->priv->selection)) &&
- (anchor_offset == webkit_dom_dom_selection_get_anchor_offset (
- dialog->priv->selection)) &&
- (focus == webkit_dom_dom_selection_get_focus_node (
- dialog->priv->selection)) &&
- (focus_offset == webkit_dom_dom_selection_get_focus_offset (
- dialog->priv->selection)));
-}
-
-static gboolean
-=======
/* If the selection start didn't change, then we have most probably
* reached the end of document - return FALSE */
return ((anchor != webkit_dom_dom_selection_get_anchor_node (
@@ -230,7 +126,6 @@ static gboolean
static void
->>>>>>> Port spell-checking
editor_spell_check_dialog_next (EEditorSpellCheckDialog *dialog)
{
WebKitDOMNode *start = NULL, *end = NULL;
@@ -242,15 +137,6 @@ editor_spell_check_dialog_next (EEditorSpellCheckDialog *dialog)
} else {
/* Remember last selected word */
start = webkit_dom_dom_selection_get_anchor_node (
-<<<<<<< HEAD
- dialog->priv->selection);
- end = webkit_dom_dom_selection_get_focus_node (
- dialog->priv->selection);
- start_offset = webkit_dom_dom_selection_get_anchor_offset (
- dialog->priv->selection);
- end_offset = webkit_dom_dom_selection_get_focus_offset (
- dialog->priv->selection);
-=======
dialog->priv->selection);
end = webkit_dom_dom_selection_get_focus_node (
dialog->priv->selection);
@@ -258,7 +144,6 @@ editor_spell_check_dialog_next (EEditorSpellCheckDialog *dialog)
dialog->priv->selection);
end_offset = webkit_dom_dom_selection_get_focus_offset (
dialog->priv->selection);
->>>>>>> Port spell-checking
}
while (select_next_word (dialog)) {
@@ -267,12 +152,7 @@ editor_spell_check_dialog_next (EEditorSpellCheckDialog *dialog)
gint loc, len;
gchar *word;
-<<<<<<< HEAD
- range = webkit_dom_dom_selection_get_range_at (
- dialog->priv->selection, 0, NULL);
-=======
range = webkit_dom_dom_selection_get_range_at (dialog->priv->selection, 0, NULL);
->>>>>>> Port spell-checking
word = webkit_dom_range_get_text (range);
checker = WEBKIT_SPELL_CHECKER (webkit_get_text_checker ());
@@ -283,11 +163,7 @@ editor_spell_check_dialog_next (EEditorSpellCheckDialog *dialog)
if (loc != -1) {
editor_spell_check_dialog_set_word (dialog, word);
g_free (word);
-<<<<<<< HEAD
- return TRUE;
-=======
return;
->>>>>>> Port spell-checking
}
g_free (word);
@@ -302,34 +178,17 @@ editor_spell_check_dialog_next (EEditorSpellCheckDialog *dialog)
}
/* Close the dialog */
-<<<<<<< HEAD
- gtk_widget_hide (GTK_WIDGET (dialog));
- return FALSE;
-=======
gtk_widget_hide (GTK_WIDGET (dialog));
->>>>>>> Port spell-checking
}
static gboolean
select_previous_word (EEditorSpellCheckDialog *dialog)
{
-<<<<<<< HEAD
- WebKitDOMNode *old_anchor_node;
- WebKitDOMNode *new_anchor_node;
- gulong old_anchor_offset;
- gulong new_anchor_offset;
-
- old_anchor_node = webkit_dom_dom_selection_get_anchor_node (
- dialog->priv->selection);
- old_anchor_offset = webkit_dom_dom_selection_get_anchor_offset (
- dialog->priv->selection);
-=======
WebKitDOMNode *anchor;
gulong anchor_offset;
anchor = webkit_dom_dom_selection_get_anchor_node (dialog->priv->selection);
anchor_offset = webkit_dom_dom_selection_get_anchor_offset (dialog->priv->selection);
->>>>>>> Port spell-checking
/* Jump on the beginning of current word */
webkit_dom_dom_selection_modify (
@@ -343,41 +202,6 @@ select_previous_word (EEditorSpellCheckDialog *dialog)
/* If the selection start didn't change, then we have most probably
* reached the beginnig of document. Return FALSE */
-<<<<<<< HEAD
-
- new_anchor_node = webkit_dom_dom_selection_get_anchor_node (
- dialog->priv->selection);
- new_anchor_offset = webkit_dom_dom_selection_get_anchor_offset (
- dialog->priv->selection);
-
- return (new_anchor_node != old_anchor_node) ||
- (new_anchor_offset != old_anchor_offset);
-}
-
-static gboolean
-editor_spell_check_dialog_prev (EEditorSpellCheckDialog *dialog)
-{
- WebKitDOMNode *start = NULL, *end = NULL;
- gulong start_offset, end_offset;
-
- if (dialog->priv->word == NULL) {
- webkit_dom_dom_selection_modify (
- dialog->priv->selection,
- "move", "right", "documentboundary");
- webkit_dom_dom_selection_modify (
- dialog->priv->selection,
- "extend", "backward", "word");
- } else {
- /* Remember last selected word */
- start = webkit_dom_dom_selection_get_anchor_node (
- dialog->priv->selection);
- end = webkit_dom_dom_selection_get_focus_node (
- dialog->priv->selection);
- start_offset = webkit_dom_dom_selection_get_anchor_offset (
- dialog->priv->selection);
- end_offset = webkit_dom_dom_selection_get_focus_offset (
- dialog->priv->selection);
-=======
return ((anchor != webkit_dom_dom_selection_get_anchor_node (
dialog->priv->selection)) ||
(anchor_offset != webkit_dom_dom_selection_get_anchor_offset (
@@ -405,7 +229,6 @@ editor_spell_check_dialog_prev (EEditorSpellCheckDialog *dialog)
dialog->priv->selection);
end_offset = webkit_dom_dom_selection_get_focus_offset (
dialog->priv->selection);
->>>>>>> Port spell-checking
}
while (select_previous_word (dialog)) {
@@ -414,31 +237,18 @@ editor_spell_check_dialog_prev (EEditorSpellCheckDialog *dialog)
gint loc, len;
gchar *word;
-<<<<<<< HEAD
- range = webkit_dom_dom_selection_get_range_at (
- dialog->priv->selection, 0, NULL);
-=======
range = webkit_dom_dom_selection_get_range_at (dialog->priv->selection, 0, NULL);
->>>>>>> Port spell-checking
word = webkit_dom_range_get_text (range);
checker = WEBKIT_SPELL_CHECKER (webkit_get_text_checker ());
webkit_spell_checker_check_spelling_of_string (
-<<<<<<< HEAD
- checker, word, &loc, &len);
-=======
checker, word, &loc, &len);
->>>>>>> Port spell-checking
/* Found misspelled word! */
if (loc != -1) {
editor_spell_check_dialog_set_word (dialog, word);
g_free (word);
-<<<<<<< HEAD
- return TRUE;
-=======
return;
->>>>>>> Port spell-checking
}
g_free (word);
@@ -454,10 +264,6 @@ editor_spell_check_dialog_prev (EEditorSpellCheckDialog *dialog)
/* Close the dialog */
gtk_widget_hide (GTK_WIDGET (dialog));
-<<<<<<< HEAD
- return FALSE;
-=======
->>>>>>> Port spell-checking
}
static void
@@ -476,11 +282,7 @@ editor_spell_check_dialog_replace (EEditorSpellCheckDialog *dialog)
editor_selection = e_editor_widget_get_selection (widget);
selection = gtk_tree_view_get_selection (
-<<<<<<< HEAD
- GTK_TREE_VIEW (dialog->priv->tree_view));
-=======
GTK_TREE_VIEW (dialog->priv->tree_view));
->>>>>>> Port spell-checking
gtk_tree_selection_get_selected (selection, &model, &iter);
gtk_tree_model_get (model, &iter, 0, &replacement, -1);
@@ -507,11 +309,7 @@ editor_spell_check_dialog_replace_all (EEditorSpellCheckDialog *dialog)
editor_selection = e_editor_widget_get_selection (widget);
selection = gtk_tree_view_get_selection (
-<<<<<<< HEAD
- GTK_TREE_VIEW (dialog->priv->tree_view));
-=======
GTK_TREE_VIEW (dialog->priv->tree_view));
->>>>>>> Port spell-checking
gtk_tree_selection_get_selected (selection, &model, &iter);
gtk_tree_model_get (model, &iter, 0, &replacement, -1);
@@ -524,10 +322,7 @@ editor_spell_check_dialog_replace_all (EEditorSpellCheckDialog *dialog)
e_editor_selection_insert_html (
editor_selection, replacement);
-<<<<<<< HEAD
-=======
->>>>>>> Port spell-checking
}
g_free (replacement);
@@ -537,18 +332,11 @@ editor_spell_check_dialog_replace_all (EEditorSpellCheckDialog *dialog)
static void
editor_spell_check_dialog_ignore (EEditorSpellCheckDialog *dialog)
{
-<<<<<<< HEAD
- if (dialog->priv->word == NULL)
- return;
-
- e_spell_dictionary_ignore_word (
-=======
if (dialog->priv->word == NULL) {
return;
}
enchant_dict_add_to_session (
->>>>>>> Port spell-checking
dialog->priv->current_dict, dialog->priv->word, -1);
editor_spell_check_dialog_next (dialog);
@@ -557,18 +345,11 @@ editor_spell_check_dialog_ignore (EEditorSpellCheckDialog *dialog)
static void
editor_spell_check_dialog_learn (EEditorSpellCheckDialog *dialog)
{
-<<<<<<< HEAD
- if (dialog->priv->word == NULL)
- return;
-
- e_spell_dictionary_learn_word (
-=======
if (dialog->priv->word == NULL) {
return;
}
enchant_dict_add_to_personal (
->>>>>>> Port spell-checking
dialog->priv->current_dict, dialog->priv->word, -1);
editor_spell_check_dialog_next (dialog);
@@ -577,16 +358,6 @@ editor_spell_check_dialog_learn (EEditorSpellCheckDialog *dialog)
static void
editor_spell_check_dialog_set_dictionary (EEditorSpellCheckDialog *dialog)
{
-<<<<<<< HEAD
- GtkComboBox *combo_box;
- GtkTreeModel *model;
- GtkTreeIter iter;
- ESpellDictionary *dictionary;
-
- combo_box = GTK_COMBO_BOX (dialog->priv->dictionary_combo);
- gtk_combo_box_get_active_iter (combo_box, &iter);
- model = gtk_combo_box_get_model (combo_box);
-=======
GtkTreeModel *model;
GtkTreeIter iter;
EnchantDict *dictionary;
@@ -595,7 +366,6 @@ editor_spell_check_dialog_set_dictionary (EEditorSpellCheckDialog *dialog)
GTK_COMBO_BOX (dialog->priv->dictionary_combo), &iter);
model = gtk_combo_box_get_model (
GTK_COMBO_BOX (dialog->priv->dictionary_combo));
->>>>>>> Port spell-checking
gtk_tree_model_get (model, &iter, 1, &dictionary, -1);
@@ -606,15 +376,6 @@ editor_spell_check_dialog_set_dictionary (EEditorSpellCheckDialog *dialog)
}
static void
-<<<<<<< HEAD
-editor_spell_check_dialog_show (GtkWidget *widget)
-{
- EEditorSpellCheckDialog *dialog;
- WebKitDOMDocument *document;
- WebKitDOMDOMWindow *window;
-
- dialog = E_EDITOR_SPELL_CHECK_DIALOG (widget);
-=======
editor_spell_check_dialog_show (GtkWidget *gtk_widget)
{
EEditorSpellCheckDialog *dialog;
@@ -626,7 +387,6 @@ editor_spell_check_dialog_show (GtkWidget *gtk_widget)
dialog = E_EDITOR_SPELL_CHECK_DIALOG (gtk_widget);
editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
widget = e_editor_get_editor_widget (editor);
->>>>>>> Port spell-checking
g_free (dialog->priv->word);
dialog->priv->word = NULL;
@@ -635,44 +395,6 @@ editor_spell_check_dialog_show (GtkWidget *gtk_widget)
window = webkit_dom_document_get_default_view (document);
dialog->priv->selection = webkit_dom_dom_window_get_selection (window);
-<<<<<<< HEAD
- /* Select the first word or quit */
- if (editor_spell_check_dialog_next (dialog)) {
- GTK_WIDGET_CLASS (e_editor_spell_check_dialog_parent_class)->
- show (widget);
- }
-}
-
-static void
-editor_spell_check_dialog_finalize (GObject *object)
-{
- EEditorSpellCheckDialogPrivate *priv;
-
- priv = E_EDITOR_SPELL_CHECK_DIALOG_GET_PRIVATE (object);
-
- g_free (priv->word);
-
- /* Chain up to parent's finalize() method. */
- G_OBJECT_CLASS (e_editor_spell_check_dialog_parent_class)->
- finalize (object);
-}
-
-static void
-editor_spell_check_dialog_constructed (GObject *object)
-{
- EEditorSpellCheckDialog *dialog;
-
- /* Chain up to parent's constructed() method. */
- G_OBJECT_CLASS (e_editor_spell_check_dialog_parent_class)->
- constructed (object);
-
- dialog = E_EDITOR_SPELL_CHECK_DIALOG (object);
- e_editor_spell_check_dialog_update_dictionaries (dialog);
-}
-
-static void
-e_editor_spell_check_dialog_class_init (EEditorSpellCheckDialogClass *class)
-=======
/* Select the first word */
editor_spell_check_dialog_next (dialog);
@@ -692,21 +414,10 @@ editor_spell_check_dialog_finalize (GObject *object)
static void
e_editor_spell_check_dialog_class_init (EEditorSpellCheckDialogClass *klass)
->>>>>>> Port spell-checking
{
GtkWidgetClass *widget_class;
GObjectClass *object_class;
-<<<<<<< HEAD
- g_type_class_add_private (
- class, sizeof (EEditorSpellCheckDialogPrivate));
-
- object_class = G_OBJECT_CLASS (class);
- object_class->finalize = editor_spell_check_dialog_finalize;
- object_class->constructed = editor_spell_check_dialog_constructed;
-
- widget_class = GTK_WIDGET_CLASS (class);
-=======
e_editor_spell_check_dialog_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (EEditorSpellCheckDialogPrivate));
@@ -714,7 +425,6 @@ e_editor_spell_check_dialog_class_init (EEditorSpellCheckDialogClass *klass)
object_class->finalize = editor_spell_check_dialog_finalize;
widget_class = GTK_WIDGET_CLASS (klass);
->>>>>>> Port spell-checking
widget_class->show = editor_spell_check_dialog_show;
}
@@ -722,29 +432,15 @@ static void
e_editor_spell_check_dialog_init (EEditorSpellCheckDialog *dialog)
{
GtkWidget *widget;
-<<<<<<< HEAD
- GtkGrid *main_layout;
-=======
GtkGrid *main_layout;
->>>>>>> Port spell-checking
GtkListStore *store;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
-<<<<<<< HEAD
- dialog->priv = E_EDITOR_SPELL_CHECK_DIALOG_GET_PRIVATE (dialog);
-
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
-=======
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_SPELL_CHECK_DIALOG, EEditorSpellCheckDialogPrivate);
- main_layout = GTK_GRID (gtk_grid_new ());
- gtk_grid_set_row_spacing (main_layout, 10);
- gtk_grid_set_column_spacing (main_layout, 10);
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
->>>>>>> Port spell-checking
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* == Suggestions == */
widget = gtk_label_new ("");
@@ -762,11 +458,7 @@ e_editor_spell_check_dialog_init (EEditorSpellCheckDialog *dialog)
/* Column */
column = gtk_tree_view_column_new_with_attributes (
-<<<<<<< HEAD
- "", gtk_cell_renderer_text_new (), "text", 0, NULL);
-=======
"", gtk_cell_renderer_text_new (), "text", 0, NULL);
->>>>>>> Port spell-checking
gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
/* Store */
@@ -884,85 +576,12 @@ e_editor_spell_check_dialog_init (EEditorSpellCheckDialog *dialog)
widget, "clicked",
G_CALLBACK (editor_spell_check_dialog_learn), dialog);
-<<<<<<< HEAD
-=======
- /* Close Button */
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- dialog->priv->close_button = widget;
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (gtk_widget_hide), dialog);
-
- /* Button box */
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_grid_attach (main_layout, widget, 0, 8, 2, 1);
- gtk_box_pack_start (GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 5);
-
->>>>>>> Port spell-checking
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
GtkWidget *
e_editor_spell_check_dialog_new (EEditor *editor)
{
-<<<<<<< HEAD
- return g_object_new (
- E_TYPE_EDITOR_SPELL_CHECK_DIALOG,
- "editor", editor,
- "title", N_("Spell Checking"),
- NULL);
-}
-
-void
-e_editor_spell_check_dialog_update_dictionaries (EEditorSpellCheckDialog *dialog)
-{
- EEditor *editor;
- EEditorWidget *editor_widget;
- ESpellChecker *spell_checker;
- GtkComboBox *combo_box;
- GtkListStore *store;
- GQueue queue = G_QUEUE_INIT;
- gchar **languages;
- guint n_languages = 0;
- guint ii;
-
- g_return_if_fail (E_IS_EDITOR_SPELL_CHECK_DIALOG (dialog));
-
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
- editor_widget = e_editor_get_editor_widget (editor);
- spell_checker = e_editor_widget_get_spell_checker (editor_widget);
-
- languages = e_spell_checker_list_active_languages (
- spell_checker, &n_languages);
- for (ii = 0; ii < n_languages; ii++) {
- ESpellDictionary *dictionary;
-
- dictionary = e_spell_checker_ref_dictionary (
- spell_checker, languages[ii]);
- if (dictionary != NULL)
- g_queue_push_tail (&queue, dictionary);
- else
- g_warning (
- "%s: No '%s' dictionary found",
- G_STRFUNC, languages[ii]);
- }
- g_strfreev (languages);
-
- /* Populate a list store for the combo box. */
- store = gtk_list_store_new (
- NUM_COLUMNS,
- G_TYPE_STRING, /* COLUMN_NAME */
- E_TYPE_SPELL_DICTIONARY); /* COLUMN_DICTIONARY */
-
- while (!g_queue_is_empty (&queue)) {
- ESpellDictionary *dictionary;
- GtkTreeIter iter;
- const gchar *name;
-
- dictionary = g_queue_pop_head (&queue);
- name = e_spell_dictionary_get_name (dictionary);
-=======
return GTK_WIDGET (
g_object_new (
E_TYPE_EDITOR_SPELL_CHECK_DIALOG,
@@ -1006,22 +625,10 @@ e_editor_spell_check_dialog_set_dictionaries (EEditorSpellCheckDialog *dialog,
while (list != NULL) {
EnchantDict *dictionary = list->data;
GtkTreeIter iter;
->>>>>>> Port spell-checking
gtk_list_store_append (store, &iter);
gtk_list_store_set (
store, &iter,
-<<<<<<< HEAD
- COLUMN_NAME, name,
- COLUMN_DICTIONARY, dictionary,
- -1);
-
- g_object_unref (dictionary);
- }
-
- /* FIXME Try to restore selection. */
- combo_box = GTK_COMBO_BOX (dialog->priv->dictionary_combo);
-=======
0, e_editor_spell_checker_get_dict_name (dictionary),
1, dictionary, -1);
@@ -1029,13 +636,8 @@ e_editor_spell_check_dialog_set_dictionaries (EEditorSpellCheckDialog *dialog,
}
/* FIXME: Try to restore selection */
->>>>>>> Port spell-checking
gtk_combo_box_set_model (combo_box, GTK_TREE_MODEL (store));
gtk_combo_box_set_active (combo_box, 0);
g_object_unref (store);
}
-<<<<<<< HEAD
-
-=======
->>>>>>> Port spell-checking
diff --git a/e-util/e-editor-table-dialog.c b/e-util/e-editor-table-dialog.c
index 20fde99..a3a8a71 100644
--- a/e-util/e-editor-table-dialog.c
+++ b/e-util/e-editor-table-dialog.c
@@ -52,8 +52,6 @@ struct _EEditorTableDialogPrivate {
GtkWidget *background_image_button;
GtkWidget *image_chooser_dialog;
- GtkWidget *close_button;
-
WebKitDOMHTMLTableElement *table_element;
};
@@ -481,14 +479,6 @@ editor_table_dialog_get_background_image (EEditorTableDialog *dialog)
}
static void
-editor_table_dialog_close (EEditorTableDialog *dialog)
-{
- gtk_widget_hide (GTK_WIDGET (dialog));
-
- dialog->priv->table_element = NULL;
-}
-
-static void
editor_table_dialog_get_values (EEditorTableDialog *dialog)
{
editor_table_dialog_get_row_count (dialog);
@@ -584,6 +574,14 @@ editor_table_dialog_show (GtkWidget *widget)
}
static void
+editor_table_dialog_hide (GtkWidget *widget)
+{
+ E_EDITOR_TABLE_DIALOG (widget)->priv->table_element = NULL;
+
+ GTK_WIDGET_CLASS (e_editor_table_dialog_parent_class)->hide (widget);
+}
+
+static void
e_editor_table_dialog_class_init (EEditorTableDialogClass *klass)
{
GtkWidgetClass *widget_class;
@@ -593,33 +591,31 @@ e_editor_table_dialog_class_init (EEditorTableDialogClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->show = editor_table_dialog_show;
+ widget_class->hide = editor_table_dialog_hide;
}
static void
e_editor_table_dialog_init (EEditorTableDialog *dialog)
{
- GtkBox *main_layout, *box;
- GtkGrid *grid;
+ GtkGrid *main_layout, *grid;
GtkWidget *widget;
GtkFileFilter *file_filter;
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_TABLE_DIALOG, EEditorTableDialogPrivate);
- main_layout = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* == General == */
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>General</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Rows */
@@ -635,6 +631,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->rows_edit = widget;
widget = gtk_label_new_with_mnemonic (_("_Rows:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->rows_edit);
gtk_grid_attach (grid, widget, 1, 0, 1, 1);
@@ -651,6 +648,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->columns_edit = widget;
widget = gtk_label_new_with_mnemonic (_("C_olumns:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->columns_edit);
gtk_grid_attach (grid, widget, 4, 0, 1, 1);
@@ -659,16 +657,17 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Layout</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Width */
- widget = gtk_check_button_new_with_mnemonic (_("Width:"));
+ widget = gtk_check_button_new_with_mnemonic (_("_Width:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
g_signal_connect_swapped (
widget, "toggled",
@@ -702,6 +701,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->spacing_edit = widget;
widget = gtk_label_new_with_mnemonic (_("_Spacing:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->spacing_edit);
gtk_grid_attach (grid, widget, 4, 0, 1, 1);
@@ -718,6 +718,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->padding_edit = widget;
widget = gtk_label_new_with_mnemonic (_("_Padding:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->padding_edit);
gtk_grid_attach (grid, widget, 4, 1, 1, 1);
@@ -734,6 +735,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->border_edit = widget;
widget = gtk_label_new_with_mnemonic (_("_Border:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->border_edit);
gtk_grid_attach (grid, widget, 4, 2, 1, 1);
@@ -752,6 +754,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->alignment_combo = widget;
widget = gtk_label_new_with_mnemonic (_("_Alignment:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->alignment_combo);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
@@ -759,12 +762,12 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
widget = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (widget), _("<b>Background</b>"));
gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
- gtk_box_pack_start (main_layout, widget, TRUE, TRUE, 5);
+ gtk_grid_attach (main_layout, widget, 0, 4, 1, 1);
grid = GTK_GRID (gtk_grid_new ());
gtk_grid_set_row_spacing (grid, 5);
gtk_grid_set_column_spacing (grid, 5);
- gtk_box_pack_start (main_layout, GTK_WIDGET (grid), TRUE, TRUE, 0);
+ gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 5, 1, 1);
gtk_widget_set_margin_left (GTK_WIDGET (grid), 10);
/* Color */
@@ -778,6 +781,7 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
dialog->priv->background_color_button = widget;
widget = gtk_label_new_with_mnemonic (_("_Color:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_color_button);
gtk_grid_attach (grid, widget, 0, 0, 1, 1);
@@ -804,22 +808,11 @@ e_editor_table_dialog_init (EEditorTableDialog *dialog)
widget =gtk_label_new_with_mnemonic (_("Image:"));
+ gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (
GTK_LABEL (widget), dialog->priv->background_image_button);
gtk_grid_attach (grid, widget, 0, 1, 1, 1);
- /* == Button box == */
- box = GTK_BOX (gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL));
- gtk_button_box_set_layout (GTK_BUTTON_BOX (box), GTK_BUTTONBOX_END);
- gtk_box_pack_start (main_layout, GTK_WIDGET (box), TRUE, TRUE, 0);
-
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (editor_table_dialog_close), dialog);
- dialog->priv->close_button = widget;
-
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
diff --git a/e-util/e-editor-text-dialog.c b/e-util/e-editor-text-dialog.c
index 09f012a..dd1756b 100644
--- a/e-util/e-editor-text-dialog.c
+++ b/e-util/e-editor-text-dialog.c
@@ -1,11 +1,6 @@
/*
* e-editor-text-dialog.c
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Text Properties' dialog work
* 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
@@ -31,16 +26,10 @@
#include "e-color-combo.h"
-<<<<<<< HEAD
-#define E_EDITOR_TEXT_DIALOG_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_EDITOR_TEXT_DIALOG, EEditorTextDialogPrivate))
-=======
G_DEFINE_TYPE (
EEditorTextDialog,
e_editor_text_dialog,
E_TYPE_EDITOR_DIALOG);
->>>>>>> Make 'Text Properties' dialog work
struct _EEditorTextDialogPrivate {
GtkWidget *bold_check;
@@ -50,19 +39,8 @@ struct _EEditorTextDialogPrivate {
GtkWidget *color_check;
GtkWidget *size_check;
-<<<<<<< HEAD
};
-G_DEFINE_TYPE (
- EEditorTextDialog,
- e_editor_text_dialog,
- E_TYPE_EDITOR_DIALOG);
-=======
-
- GtkWidget *close_button;
-};
-
->>>>>>> Make 'Text Properties' dialog work
static void
editor_text_dialog_set_bold (EEditorTextDialog *dialog)
@@ -166,33 +144,6 @@ editor_text_dialog_set_size (EEditorTextDialog *dialog)
}
static void
-<<<<<<< HEAD
-editor_text_dialog_show (GtkWidget *widget)
-{
- EEditorTextDialog *dialog;
- EEditor *editor;
- EEditorWidget *editor_widget;
- EEditorSelection *selection;
- GdkRGBA rgba;
-
- dialog = E_EDITOR_TEXT_DIALOG (widget);
- editor = e_editor_dialog_get_editor (E_EDITOR_DIALOG (dialog));
- editor_widget = e_editor_get_editor_widget (editor);
- selection = e_editor_widget_get_selection (editor_widget);
-
- gtk_toggle_button_set_active (
- GTK_TOGGLE_BUTTON (dialog->priv->bold_check),
- e_editor_selection_is_bold (selection));
- gtk_toggle_button_set_active (
- GTK_TOGGLE_BUTTON (dialog->priv->italic_check),
- e_editor_selection_is_italic (selection));
- gtk_toggle_button_set_active (
- GTK_TOGGLE_BUTTON (dialog->priv->underline_check),
- e_editor_selection_is_underline (selection));
- gtk_toggle_button_set_active (
- GTK_TOGGLE_BUTTON (dialog->priv->strikethrough_check),
- e_editor_selection_is_strike_through (selection));
-=======
editor_text_dialog_show (GtkWidget *gtk_widget)
{
EEditorTextDialog *dialog;
@@ -218,7 +169,6 @@ editor_text_dialog_show (GtkWidget *gtk_widget)
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (dialog->priv->strikethrough_check),
e_editor_selection_get_strike_through (selection));
->>>>>>> Make 'Text Properties' dialog work
gtk_combo_box_set_active (
GTK_COMBO_BOX (dialog->priv->size_check),
@@ -228,19 +178,6 @@ editor_text_dialog_show (GtkWidget *gtk_widget)
e_color_combo_set_current_color (
E_COLOR_COMBO (dialog->priv->color_check), &rgba);
-<<<<<<< HEAD
- GTK_WIDGET_CLASS (e_editor_text_dialog_parent_class)->show (widget);
-}
-
-static void
-e_editor_text_dialog_class_init (EEditorTextDialogClass *class)
-{
- GtkWidgetClass *widget_class;
-
- g_type_class_add_private (class, sizeof (EEditorTextDialogPrivate));
-
- widget_class = GTK_WIDGET_CLASS (class);
-=======
GTK_WIDGET_CLASS (e_editor_text_dialog_parent_class)->show (gtk_widget);
}
@@ -253,7 +190,6 @@ e_editor_text_dialog_class_init (EEditorTextDialogClass *klass)
g_type_class_add_private (klass, sizeof (EEditorTextDialogPrivate));
widget_class = GTK_WIDGET_CLASS (klass);
->>>>>>> Make 'Text Properties' dialog work
widget_class->show = editor_text_dialog_show;
}
@@ -263,30 +199,16 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
GtkGrid *main_layout;
GtkWidget *widget;
-<<<<<<< HEAD
- dialog->priv = E_EDITOR_TEXT_DIALOG_GET_PRIVATE (dialog);
-
- main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
-=======
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_EDITOR_TEXT_DIALOG, EEditorTextDialogPrivate);
- main_layout = GTK_GRID (gtk_grid_new ());
- gtk_grid_set_row_spacing (main_layout, 5);
- gtk_grid_set_column_spacing (main_layout, 5);
- gtk_container_add (GTK_CONTAINER (dialog), GTK_WIDGET (main_layout));
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
->>>>>>> Make 'Text Properties' dialog work
+ main_layout = e_editor_dialog_get_container (E_EDITOR_DIALOG (dialog));
/* Bold */
widget = gtk_image_new_from_stock (GTK_STOCK_BOLD, GTK_ICON_SIZE_BUTTON);
gtk_grid_attach (main_layout, widget, 0, 0, 1, 1);
-<<<<<<< HEAD
widget = gtk_check_button_new_with_mnemonic (_("_Bold"));
-=======
- widget = gtk_check_button_new_with_mnemonic (_("Bold"));
->>>>>>> Make 'Text Properties' dialog work
gtk_grid_attach (main_layout, widget, 1, 0, 1, 1);
g_signal_connect_swapped (
widget, "toggled",
@@ -297,11 +219,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
widget = gtk_image_new_from_stock (GTK_STOCK_ITALIC, GTK_ICON_SIZE_BUTTON);
gtk_grid_attach (main_layout, widget, 0, 1, 1, 1);
-<<<<<<< HEAD
widget = gtk_check_button_new_with_mnemonic (_("_Italic"));
-=======
- widget = gtk_check_button_new_with_mnemonic (_("Italic"));
->>>>>>> Make 'Text Properties' dialog work
gtk_grid_attach (main_layout, widget, 1, 1, 1, 1);
g_signal_connect_swapped (
widget, "toggled",
@@ -312,11 +230,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
widget = gtk_image_new_from_stock (GTK_STOCK_UNDERLINE, GTK_ICON_SIZE_BUTTON);
gtk_grid_attach (main_layout, widget, 0, 2, 1, 1);
-<<<<<<< HEAD
widget = gtk_check_button_new_with_mnemonic (_("_Underline"));
-=======
- widget = gtk_check_button_new_with_mnemonic (_("Underline"));
->>>>>>> Make 'Text Properties' dialog work
gtk_grid_attach (main_layout, widget, 1, 2, 1, 1);
g_signal_connect_swapped (
widget, "toggled",
@@ -326,11 +240,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
widget = gtk_image_new_from_stock (GTK_STOCK_STRIKETHROUGH, GTK_ICON_SIZE_BUTTON);
gtk_grid_attach (main_layout, widget, 0, 3, 1, 1);
-<<<<<<< HEAD
widget = gtk_check_button_new_with_mnemonic (_("_Strikethrough"));
-=======
- widget = gtk_check_button_new_with_mnemonic (_("Strikethrough"));
->>>>>>> Make 'Text Properties' dialog work
gtk_grid_attach (main_layout, widget, 1, 3, 1, 1);
g_signal_connect_swapped (
widget, "toggled",
@@ -345,12 +255,8 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
G_CALLBACK (editor_text_dialog_set_color), dialog);
dialog->priv->color_check = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("_Color:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
-=======
- widget = gtk_label_new_with_mnemonic (_("Color:"));
->>>>>>> Make 'Text Properties' dialog work
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->color_check);
gtk_grid_attach (main_layout, widget, 2, 0, 1, 1);
@@ -369,7 +275,6 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
G_CALLBACK (editor_text_dialog_set_size), dialog);
dialog->priv->size_check = widget;
-<<<<<<< HEAD
widget = gtk_label_new_with_mnemonic (_("Si_ze:"));
gtk_label_set_justify (GTK_LABEL (widget), GTK_JUSTIFY_RIGHT);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->size_check);
@@ -378,29 +283,7 @@ e_editor_text_dialog_init (EEditorTextDialog *dialog)
gtk_widget_show_all (GTK_WIDGET (main_layout));
}
-=======
- widget = gtk_label_new_with_mnemonic (_("Size:"));
- gtk_label_set_mnemonic_widget (GTK_LABEL (widget), dialog->priv->size_check);
- gtk_grid_attach (main_layout, widget, 2, 1, 1, 1);
-
- /* Close button */
- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- g_signal_connect_swapped (
- widget, "clicked",
- G_CALLBACK (gtk_widget_hide), dialog);
- dialog->priv->close_button = widget;
-
- widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
- gtk_container_set_border_width (GTK_CONTAINER (widget), 5);
- gtk_grid_attach (main_layout, widget, 0, 4, 4, 1);
- gtk_box_pack_start (GTK_BOX (widget), dialog->priv->close_button, FALSE, FALSE, 5);
-
- gtk_widget_show_all (GTK_WIDGET (main_layout));
-}
-
->>>>>>> Make 'Text Properties' dialog work
GtkWidget *
e_editor_text_dialog_new (EEditor *editor)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
