[gnome-control-center] [appearance] use GtkInfoBar rather than a copy of GeditMessageArea
- From: Thomas Wood <thos src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-control-center] [appearance] use GtkInfoBar rather than a copy of GeditMessageArea
- Date: Tue, 19 Jan 2010 13:10:30 +0000 (UTC)
commit 54bcf1874dcf6ba27f969eea0657bbebca26260b
Author: Thomas Wood <thomas wood intel com>
Date: Tue Jan 19 13:03:32 2010 +0000
[appearance] use GtkInfoBar rather than a copy of GeditMessageArea
GtkInfoBar (available in Gtk+ 2.18) replaces GeditMessageArea.
capplets/appearance/Makefile.am | 2 -
capplets/appearance/appearance-style.c | 13 +-
capplets/appearance/appearance-themes.c | 25 +-
capplets/appearance/gedit-message-area.c | 626 ------------------------------
capplets/appearance/gedit-message-area.h | 129 ------
configure.ac | 2 +-
6 files changed, 21 insertions(+), 776 deletions(-)
---
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
index b940d73..f894f41 100644
--- a/capplets/appearance/Makefile.am
+++ b/capplets/appearance/Makefile.am
@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
appearance-themes.h \
appearance-style.c \
appearance-style.h \
- gedit-message-area.c \
- gedit-message-area.h \
gnome-wp-info.c \
gnome-wp-info.h \
gnome-wp-item.c \
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index ae95d90..f66b826 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 The GNOME Foundation
+ * Copyright (C) 2007, 2010 The GNOME Foundation
* Written by Thomas Wood <thos gnome org>
* All Rights Reserved
*
@@ -28,7 +28,6 @@
#include "gconf-property-editor.h"
#include "theme-thumbnail.h"
#include "capplet-util.h"
-#include "gedit-message-area.h"
typedef void (* ThumbnailGenFunc) (void *type,
ThemeThumbnailFunc theme,
@@ -221,17 +220,18 @@ update_message_area (AppearanceData *data)
GtkWidget *hbox;
GtkWidget *parent;
GtkWidget *icon;
+ GtkWidget *content;
if (engine == NULL)
return;
- data->style_message_area = gedit_message_area_new ();
+ data->style_message_area = gtk_info_bar_new ();
g_signal_connect (data->style_message_area, "response",
(GCallback) style_message_area_response_cb, data);
- data->style_install_button = gedit_message_area_add_button (
- GEDIT_MESSAGE_AREA (data->style_message_area),
+ data->style_install_button = gtk_info_bar_add_button (
+ GTK_INFO_BAR (data->style_message_area),
_("Install"), GTK_RESPONSE_APPLY);
data->style_message_label = gtk_label_new (NULL);
@@ -243,7 +243,8 @@ update_message_area (AppearanceData *data)
gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), data->style_message_label, TRUE, TRUE, 0);
- gedit_message_area_set_contents (GEDIT_MESSAGE_AREA (data->style_message_area), hbox);
+ content = gtk_info_bar_get_content_area (GTK_INFO_BAR (data->style_message_area));
+ gtk_container_add (GTK_CONTAINER (content), hbox);
gtk_widget_show_all (data->style_message_area);
gtk_widget_set_no_show_all (data->style_message_area, TRUE);
diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c
index 522106b..308e7ab 100644
--- a/capplets/appearance/appearance-themes.c
+++ b/capplets/appearance/appearance-themes.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 The GNOME Foundation
+ * Copyright (C) 2007, 2010 The GNOME Foundation
* Written by Thomas Wood <thos gnome org>
* Jens Granseuer <jensgr gmx net>
* All Rights Reserved
@@ -26,7 +26,6 @@
#include "theme-save.h"
#include "theme-util.h"
#include "gtkrc-utils.h"
-#include "gedit-message-area.h"
#include <glib/gi18n.h>
#include <libwindow-settings/gnome-wm-manager.h>
@@ -658,30 +657,31 @@ theme_message_area_update (AppearanceData *data)
if (data->theme_message_area == NULL) {
GtkWidget *hbox;
GtkWidget *parent;
+ GtkWidget *content;
if (!show_apply_background && !show_revert_font && !show_apply_font && !show_error)
return;
- data->theme_message_area = gedit_message_area_new ();
+ data->theme_message_area = gtk_info_bar_new ();
gtk_widget_set_no_show_all (data->theme_message_area, TRUE);
g_signal_connect (data->theme_message_area, "response",
(GCallback) theme_message_area_response_cb, data);
- data->apply_background_button = gedit_message_area_add_button (
- GEDIT_MESSAGE_AREA (data->theme_message_area),
+ data->apply_background_button = gtk_info_bar_add_button (
+ GTK_INFO_BAR (data->theme_message_area),
_("Apply Background"),
RESPONSE_APPLY_BG);
- data->apply_font_button = gedit_message_area_add_button (
- GEDIT_MESSAGE_AREA (data->theme_message_area),
+ data->apply_font_button = gtk_info_bar_add_button (
+ GTK_INFO_BAR (data->theme_message_area),
_("Apply Font"),
RESPONSE_APPLY_FONT);
- data->revert_font_button = gedit_message_area_add_button (
- GEDIT_MESSAGE_AREA (data->theme_message_area),
+ data->revert_font_button = gtk_info_bar_add_button (
+ GTK_INFO_BAR (data->theme_message_area),
_("Revert Font"),
RESPONSE_REVERT_FONT);
- data->install_button = gedit_message_area_add_button (
- GEDIT_MESSAGE_AREA (data->theme_message_area),
+ data->install_button = gtk_info_bar_add_button (
+ GTK_INFO_BAR (data->theme_message_area),
_("Install"),
RESPONSE_INSTALL_ENGINE);
@@ -699,7 +699,8 @@ theme_message_area_update (AppearanceData *data)
gtk_box_pack_start (GTK_BOX (hbox), data->theme_info_icon, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), data->theme_error_icon, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), data->theme_message_label, TRUE, TRUE, 0);
- gedit_message_area_set_contents (GEDIT_MESSAGE_AREA (data->theme_message_area), hbox);
+ content = gtk_info_bar_get_content_area (GTK_INFO_BAR (data->theme_message_area));
+ gtk_container_add (GTK_CONTAINER (content), hbox);
parent = appearance_capplet_get_widget (data, "theme_list_vbox");
gtk_box_pack_start (GTK_BOX (parent), data->theme_message_area, FALSE, FALSE, 0);
diff --git a/configure.ac b/configure.ac
index 158d141..a5f847d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ dnl ==============================================
dnl Check that we meet the dependencies
dnl ==============================================
-COMMON_MODULES="gtk+-2.0 >= 2.15.0 dnl
+COMMON_MODULES="gtk+-2.0 >= 2.18.0 dnl
glib-2.0 >= 2.17.4 dnl
gthread-2.0 dnl
gio-2.0 dnl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]