[evolution/wip/webkit-composer: 662/966] EEditor: Pack an EAlertBar widget.
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 662/966] EEditor: Pack an EAlertBar widget.
- Date: Wed, 23 Apr 2014 10:49:05 +0000 (UTC)
commit 2326fa1e63d025c17e54fcc4b155eb9cf6a9a2e8
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Feb 7 15:43:15 2013 -0500
EEditor: Pack an EAlertBar widget.
e-util/e-editor-private.h | 1 +
e-util/e-editor.c | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-editor-private.h b/e-util/e-editor-private.h
index 5c9cf23..5acf2fb 100644
--- a/e-util/e-editor-private.h
+++ b/e-util/e-editor-private.h
@@ -61,6 +61,7 @@ struct _EEditorPrivate {
GtkWidget *main_toolbar;
GtkWidget *edit_toolbar;
GtkWidget *html_toolbar;
+ GtkWidget *alert_bar;
GtkWidget *edit_area;
GtkWidget *find_dialog;
diff --git a/e-util/e-editor.c b/e-util/e-editor.c
index 2a84ff5..3e9268c 100644
--- a/e-util/e-editor.c
+++ b/e-util/e-editor.c
@@ -23,6 +23,8 @@
#include <enchant/enchant.h>
#include "e-editor.h"
+
+#include "e-alert-bar.h"
#include "e-editor-private.h"
#include "e-editor-utils.h"
#include "e-editor-selection.h"
@@ -598,6 +600,14 @@ editor_constructed (GObject *object)
priv->html_toolbar = g_object_ref (widget);
gtk_widget_show (widget);
+ /* Construct the alert bar for errors. */
+
+ widget = e_alert_bar_new ();
+ gtk_widget_set_hexpand (widget, TRUE);
+ gtk_grid_attach (GTK_GRID (editor), widget, 0, 2, 1, 1);
+ priv->alert_bar = g_object_ref (widget);
+ /* EAlertBar controls its own visibility. */
+
/* Construct the main editing area. */
widget = gtk_scrolled_window_new (NULL, NULL);
@@ -608,7 +618,7 @@ editor_constructed (GObject *object)
GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
gtk_widget_set_hexpand (widget, TRUE);
gtk_widget_set_vexpand (widget, TRUE);
- gtk_grid_attach (GTK_GRID (editor), widget, 0, 2, 1, 1);
+ gtk_grid_attach (GTK_GRID (editor), widget, 0, 3, 1, 1);
priv->scrolled_window = g_object_ref (widget);
gtk_widget_show (widget);
@@ -708,6 +718,7 @@ editor_dispose (GObject *object)
g_clear_object (&priv->main_toolbar);
g_clear_object (&priv->edit_toolbar);
g_clear_object (&priv->html_toolbar);
+ g_clear_object (&priv->alert_bar);
g_clear_object (&priv->edit_area);
g_clear_object (&priv->color_combo_box);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]