+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat, Inc.
*
*/
/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2003. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+#include <string.h>
+
#include "gtkmessagedialog.h"
+#include "gtkaccessible.h"
#include "gtklabel.h"
#include "gtkhbox.h"
+#include "gtkvbox.h"
#include "gtkimage.h"
#include "gtkstock.h"
#include "gtkiconfactory.h"
#include "gtkintl.h"
-#include <string.h>
+#include "gtkprivate.h"
+#include "gtkalias.h"
+
+#define GTK_MESSAGE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogPrivate))
+
+typedef struct _GtkMessageDialogPrivate GtkMessageDialogPrivate;
+
+struct _GtkMessageDialogPrivate
+{
+ GtkWidget *secondary_label;
+ guint message_type : 3;
+ guint has_primary_markup : 1;
+ guint has_secondary_text : 1;
+};
-static void gtk_message_dialog_class_init (GtkMessageDialogClass *klass);
-static void gtk_message_dialog_init (GtkMessageDialog *dialog);
static void gtk_message_dialog_style_set (GtkWidget *widget,
GtkStyle *prev_style);
static void gtk_message_dialog_add_buttons (GtkMessageDialog *message_dialog,
GtkButtonsType buttons);
-
enum {
PROP_0,
PROP_MESSAGE_TYPE,
- PROP_BUTTONS
+ PROP_BUTTONS,
+ PROP_TEXT,
+ PROP_USE_MARKUP,
+ PROP_SECONDARY_TEXT,
+ PROP_SECONDARY_USE_MARKUP,
+ PROP_IMAGE
};
-static gpointer parent_class;
-
-GType
-gtk_message_dialog_get_type (void)
-{
- static GType dialog_type = 0;
-
- if (!dialog_type)
- {
- static const GTypeInfo dialog_info =
- {
- sizeof (GtkMessageDialogClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_message_dialog_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkMessageDialog),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_message_dialog_init,
- };
-
- dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkMessageDialog",
- &dialog_info, 0);
- }
-
- return dialog_type;
-}
+G_DEFINE_TYPE (GtkMessageDialog, gtk_message_dialog, GTK_TYPE_DIALOG)
static void
gtk_message_dialog_class_init (GtkMessageDialogClass *class)
widget_class = GTK_WIDGET_CLASS (class);
gobject_class = G_OBJECT_CLASS (class);
-
- parent_class = g_type_class_peek_parent (class);
widget_class->style_set = gtk_message_dialog_style_set;
gobject_class->get_property = gtk_message_dialog_get_property;
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("message_border",
- _("Image/label border"),
- _("Width of border around the label and image in the message dialog"),
+ g_param_spec_int ("message-border",
+ P_("Image/label border"),
+ P_("Width of border around the label and image in the message dialog"),
0,
G_MAXINT,
- 8,
- G_PARAM_READABLE));
+ 12,
+ GTK_PARAM_READABLE));
+ /**
+ * GtkMessageDialog:use-separator:
+ *
+ * Whether to draw a separator line between the message label and the buttons
+ * in the dialog.
+ *
+ * Since: 2.4
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boolean ("use-separator",
+ P_("Use separator"),
+ P_("Whether to put a separator between the message dialog's text and the buttons"),
+ FALSE,
+ GTK_PARAM_READABLE));
+ /**
+ * GtkMessageDialog:message-type:
+ *
+ * The type of the message. The type is used to determine
+ * the image that is shown in the dialog, unless the image is
+ * explicitly set by the ::image property.
+ */
g_object_class_install_property (gobject_class,
PROP_MESSAGE_TYPE,
- g_param_spec_enum ("message_type",
- _("Message Type"),
- _("The type of message"),
+ g_param_spec_enum ("message-type",
+ P_("Message Type"),
+ P_("The type of message"),
GTK_TYPE_MESSAGE_TYPE,
GTK_MESSAGE_INFO,
- G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
PROP_BUTTONS,
g_param_spec_enum ("buttons",
- _("Message Buttons"),
- _("The buttons shown in the message dialog"),
+ P_("Message Buttons"),
+ P_("The buttons shown in the message dialog"),
GTK_TYPE_BUTTONS_TYPE,
GTK_BUTTONS_NONE,
- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
+ GTK_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
+ /**
+ * GtkMessageDialog:text:
+ *
+ * The primary text of the message dialog. If the dialog has
+ * a secondary text, this will appear as the title.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TEXT,
+ g_param_spec_string ("text",
+ P_("Text"),
+ P_("The primary text of the message dialog"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkMessageDialog:use-markup:
+ *
+ * %TRUE if the primary text of the dialog includes Pango markup.
+ * See pango_parse_markup().
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_USE_MARKUP,
+ g_param_spec_boolean ("use-markup",
+ P_("Use Markup"),
+ P_("The primary text of the title includes Pango markup."),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkMessageDialog:secondary-text:
+ *
+ * The secondary text of the message dialog.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SECONDARY_TEXT,
+ g_param_spec_string ("secondary-text",
+ P_("Secondary Text"),
+ P_("The secondary text of the message dialog"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkMessageDialog:secondary-use-markup:
+ *
+ * %TRUE if the secondary text of the dialog includes Pango markup.
+ * See pango_parse_markup().
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SECONDARY_USE_MARKUP,
+ g_param_spec_boolean ("secondary-use-markup",
+ P_("Use Markup in secondary"),
+ P_("The secondary text includes Pango markup."),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkMessageDialog:image:
+ *
+ * The image for this dialog.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_IMAGE,
+ g_param_spec_object ("image",
+ P_("Image"),
+ P_("The image"),
+ GTK_TYPE_WIDGET,
+ GTK_PARAM_READWRITE));
+
+ g_type_class_add_private (gobject_class,
+ sizeof (GtkMessageDialogPrivate));
}
static void
gtk_message_dialog_init (GtkMessageDialog *dialog)
{
- GtkWidget *hbox;
+ GtkWidget *hbox, *vbox;
+ GtkMessageDialogPrivate *priv;
+
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
+
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+ gtk_window_set_title (GTK_WINDOW (dialog), "");
+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE);
+
+ priv->has_primary_markup = FALSE;
+ priv->has_secondary_text = FALSE;
+ priv->secondary_label = gtk_label_new (NULL);
+ gtk_widget_set_no_show_all (priv->secondary_label, TRUE);
dialog->label = gtk_label_new (NULL);
dialog->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (dialog->image), 0.5, 0.0);
- gtk_label_set_line_wrap (GTK_LABEL (dialog->label), TRUE);
+ gtk_label_set_line_wrap (GTK_LABEL (dialog->label), TRUE);
gtk_label_set_selectable (GTK_LABEL (dialog->label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.0);
- hbox = gtk_hbox_new (FALSE, 6);
+ gtk_label_set_line_wrap (GTK_LABEL (priv->secondary_label), TRUE);
+ gtk_label_set_selectable (GTK_LABEL (priv->secondary_label), TRUE);
+ gtk_misc_set_alignment (GTK_MISC (priv->secondary_label), 0.0, 0.0);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ vbox = gtk_vbox_new (FALSE, 12);
+
+ gtk_box_pack_start (GTK_BOX (vbox), dialog->label,
+ FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (vbox), priv->secondary_label,
+ TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), dialog->image,
FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), dialog->label,
+ gtk_box_pack_start (GTK_BOX (hbox), vbox,
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
hbox,
FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14); /* 14 + 2 * 5 = 24 */
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
+
gtk_widget_show_all (hbox);
+
+ _gtk_dialog_set_ignore_separator (GTK_DIALOG (dialog), TRUE);
}
-static GtkMessageType
-gtk_message_dialog_get_message_type (GtkMessageDialog *dialog)
+static void
+setup_primary_label_font (GtkMessageDialog *dialog)
{
- const gchar* stock_id = NULL;
+ gint size;
+ PangoFontDescription *font_desc;
+ GtkMessageDialogPrivate *priv;
- g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (dialog), GTK_MESSAGE_INFO);
- g_return_val_if_fail (GTK_IS_IMAGE(dialog->image), GTK_MESSAGE_INFO);
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
- stock_id = GTK_IMAGE(dialog->image)->data.stock.stock_id;
+ /* unset the font settings */
+ gtk_widget_modify_font (dialog->label, NULL);
- /* Look at the stock id of the image to guess the
- * GtkMessageType value that was used to choose it
- * in setup_type()
- */
- if (strcmp (stock_id, GTK_STOCK_DIALOG_INFO) == 0)
- return GTK_MESSAGE_INFO;
- else if (strcmp (stock_id, GTK_STOCK_DIALOG_QUESTION) == 0)
- return GTK_MESSAGE_QUESTION;
- else if (strcmp (stock_id, GTK_STOCK_DIALOG_WARNING) == 0)
- return GTK_MESSAGE_WARNING;
- else if (strcmp (stock_id, GTK_STOCK_DIALOG_ERROR) == 0)
- return GTK_MESSAGE_ERROR;
- else
+ if (priv->has_secondary_text && !priv->has_primary_markup)
{
- g_assert_not_reached ();
- return GTK_MESSAGE_INFO;
+ size = pango_font_description_get_size (dialog->label->style->font_desc);
+ font_desc = pango_font_description_new ();
+ pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
+ pango_font_description_set_size (font_desc, size * PANGO_SCALE_LARGE);
+ gtk_widget_modify_font (dialog->label, font_desc);
+ pango_font_description_free (font_desc);
}
}
setup_type (GtkMessageDialog *dialog,
GtkMessageType type)
{
+ GtkMessageDialogPrivate *priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
const gchar *stock_id = NULL;
- GtkStockItem item;
-
+ AtkObject *atk_obj;
+
+ priv->message_type = type;
+
switch (type)
{
case GTK_MESSAGE_INFO:
case GTK_MESSAGE_ERROR:
stock_id = GTK_STOCK_DIALOG_ERROR;
break;
-
+
+ case GTK_MESSAGE_OTHER:
+ break;
+
default:
- g_warning ("Unknown GtkMessageType %d", type);
+ g_warning ("Unknown GtkMessageType %u", type);
break;
}
- if (stock_id == NULL)
- stock_id = GTK_STOCK_DIALOG_INFO;
-
- if (gtk_stock_lookup (stock_id, &item))
- {
- gtk_image_set_from_stock (GTK_IMAGE (dialog->image), stock_id,
- GTK_ICON_SIZE_DIALOG);
+ if (stock_id)
+ gtk_image_set_from_stock (GTK_IMAGE (dialog->image), stock_id,
+ GTK_ICON_SIZE_DIALOG);
- gtk_window_set_title (GTK_WINDOW (dialog), item.label);
+ atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
+ if (GTK_IS_ACCESSIBLE (atk_obj))
+ {
+ atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
+ if (stock_id)
+ {
+ GtkStockItem item;
+
+ gtk_stock_lookup (stock_id, &item);
+ atk_object_set_name (atk_obj, item.label);
+ }
}
- else
- g_warning ("Stock dialog ID doesn't exist?");
}
static void
GParamSpec *pspec)
{
GtkMessageDialog *dialog;
-
+ GtkMessageDialogPrivate *priv;
+
dialog = GTK_MESSAGE_DIALOG (object);
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
switch (prop_id)
{
case PROP_BUTTONS:
gtk_message_dialog_add_buttons (dialog, g_value_get_enum (value));
break;
+ case PROP_TEXT:
+ if (priv->has_primary_markup)
+ gtk_label_set_markup (GTK_LABEL (dialog->label),
+ g_value_get_string (value));
+ else
+ gtk_label_set_text (GTK_LABEL (dialog->label),
+ g_value_get_string (value));
+ break;
+ case PROP_USE_MARKUP:
+ priv->has_primary_markup = g_value_get_boolean (value) != FALSE;
+ gtk_label_set_use_markup (GTK_LABEL (dialog->label),
+ priv->has_primary_markup);
+ setup_primary_label_font (dialog);
+ break;
+ case PROP_SECONDARY_TEXT:
+ {
+ const gchar *txt = g_value_get_string (value);
+
+ if (gtk_label_get_use_markup (GTK_LABEL (priv->secondary_label)))
+ gtk_label_set_markup (GTK_LABEL (priv->secondary_label), txt);
+ else
+ gtk_label_set_text (GTK_LABEL (priv->secondary_label), txt);
+
+ if (txt)
+ {
+ priv->has_secondary_text = TRUE;
+ gtk_widget_show (priv->secondary_label);
+ }
+ else
+ {
+ priv->has_secondary_text = FALSE;
+ gtk_widget_hide (priv->secondary_label);
+ }
+ setup_primary_label_font (dialog);
+ }
+ break;
+ case PROP_SECONDARY_USE_MARKUP:
+ gtk_label_set_use_markup (GTK_LABEL (priv->secondary_label),
+ g_value_get_boolean (value));
+ break;
+ case PROP_IMAGE:
+ gtk_message_dialog_set_image (dialog, (GtkWidget *)g_value_get_object (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
GParamSpec *pspec)
{
GtkMessageDialog *dialog;
-
+ GtkMessageDialogPrivate *priv;
+
dialog = GTK_MESSAGE_DIALOG (object);
-
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
+
switch (prop_id)
{
case PROP_MESSAGE_TYPE:
- g_value_set_enum (value, gtk_message_dialog_get_message_type (dialog));
+ g_value_set_enum (value, (GtkMessageType) priv->message_type);
+ break;
+ case PROP_TEXT:
+ g_value_set_string (value, gtk_label_get_label (GTK_LABEL (dialog->label)));
+ break;
+ case PROP_USE_MARKUP:
+ g_value_set_boolean (value, priv->has_primary_markup);
+ break;
+ case PROP_SECONDARY_TEXT:
+ if (priv->has_secondary_text)
+ g_value_set_string (value,
+ gtk_label_get_label (GTK_LABEL (priv->secondary_label)));
+ else
+ g_value_set_string (value, NULL);
+ break;
+ case PROP_SECONDARY_USE_MARKUP:
+ if (priv->has_secondary_text)
+ g_value_set_boolean (value,
+ gtk_label_get_use_markup (GTK_LABEL (priv->secondary_label)));
+ else
+ g_value_set_boolean (value, FALSE);
+ break;
+ case PROP_IMAGE:
+ g_value_set_object (value, dialog->image);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
-
/**
* gtk_message_dialog_new:
- * @parent: transient parent, or NULL for none
+ * @parent: transient parent, or %NULL for none
* @flags: flags
* @type: type of message
* @buttons: set of buttons to use
- * @message_format: printf()-style format string, or NULL
+ * @message_format: printf()-style format string, or %NULL
* @Varargs: arguments for @message_format
*
* Creates a new message dialog, which is a simple dialog with an icon
{
GtkWidget *widget;
GtkDialog *dialog;
- gchar* msg = 0;
+ gchar* msg = NULL;
va_list args;
-
+
+ g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
+
widget = g_object_new (GTK_TYPE_MESSAGE_DIALOG,
- "message_type", type,
+ "message-type", type,
"buttons", buttons,
NULL);
dialog = GTK_DIALOG (widget);
va_start (args, message_format);
msg = g_strdup_vprintf (message_format, args);
va_end (args);
-
-
+
gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (widget)->label),
msg);
-
+
g_free (msg);
}
if (flags & GTK_DIALOG_DESTROY_WITH_PARENT)
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
- if (flags & GTK_DIALOG_NO_SEPARATOR)
- gtk_dialog_set_has_separator (dialog, FALSE);
+ return widget;
+}
+
+/**
+ * gtk_message_dialog_new_with_markup:
+ * @parent: transient parent, or %NULL for none
+ * @flags: flags
+ * @type: type of message
+ * @buttons: set of buttons to use
+ * @message_format: printf()-style format string, or %NULL
+ * @Varargs: arguments for @message_format
+ *
+ * Creates a new message dialog, which is a simple dialog with an icon
+ * indicating the dialog type (error, warning, etc.) and some text which
+ * is marked up with the <link linkend="PangoMarkupFormat">Pango text markup language</link>.
+ * When the user clicks a button a "response" signal is emitted with
+ * response IDs from #GtkResponseType. See #GtkDialog for more details.
+ *
+ * Special XML characters in the printf() arguments passed to this
+ * function will automatically be escaped as necessary.
+ * (See g_markup_printf_escaped() for how this is implemented.)
+ * Usually this is what you want, but if you have an existing
+ * Pango markup string that you want to use literally as the
+ * label, then you need to use gtk_message_dialog_set_markup()
+ * instead, since you can't pass the markup string either
+ * as the format (it might contain '%' characters) or as a string
+ * argument.
+ *
+ * <informalexample><programlisting>
+ * GtkWidget *dialog;
+ * dialog = gtk_message_dialog_new (main_application_window,
+ * GTK_DIALOG_DESTROY_WITH_PARENT,
+ * GTK_MESSAGE_ERROR,
+ * GTK_BUTTONS_CLOSE,
+ * NULL);
+ * gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog),
+ * markup);
+ * </programlisting></informalexample>
+ *
+ * Return value: a new #GtkMessageDialog
+ *
+ * Since: 2.4
+ **/
+GtkWidget*
+gtk_message_dialog_new_with_markup (GtkWindow *parent,
+ GtkDialogFlags flags,
+ GtkMessageType type,
+ GtkButtonsType buttons,
+ const gchar *message_format,
+ ...)
+{
+ GtkWidget *widget;
+ va_list args;
+ gchar *msg = NULL;
+
+ g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
+
+ widget = gtk_message_dialog_new (parent, flags, type, buttons, NULL);
+
+ if (message_format)
+ {
+ va_start (args, message_format);
+ msg = g_markup_vprintf_escaped (message_format, args);
+ va_end (args);
+
+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (widget), msg);
+
+ g_free (msg);
+ }
return widget;
}
+/**
+ * gtk_message_dialog_set_image:
+ * @dialog: a #GtkMessageDialog
+ * @image: the image
+ *
+ * Sets the dialog's image to @image.
+ *
+ * Since: 2.10
+ **/
+void
+gtk_message_dialog_set_image (GtkMessageDialog *dialog,
+ GtkWidget *image)
+{
+ GtkMessageDialogPrivate *priv;
+ GtkWidget *parent;
+
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog));
+
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (dialog);
+
+ priv->message_type = GTK_MESSAGE_OTHER;
+
+ parent = dialog->image->parent;
+ gtk_container_add (GTK_CONTAINER (parent), image);
+ gtk_container_remove (GTK_CONTAINER (parent), dialog->image);
+ gtk_box_reorder_child (GTK_BOX (parent), image, 0);
+
+ dialog->image = image;
+
+ g_object_notify (G_OBJECT (dialog), "image");
+}
+
+/**
+ * gtk_message_dialog_set_markup:
+ * @message_dialog: a #GtkMessageDialog
+ * @str: markup string (see <link linkend="PangoMarkupFormat">Pango markup format</link>)
+ *
+ * Sets the text of the message dialog to be @str, which is marked
+ * up with the <link linkend="PangoMarkupFormat">Pango text markup
+ * language</link>.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog,
+ const gchar *str)
+{
+ GtkMessageDialogPrivate *priv;
+
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
+
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (message_dialog);
+ priv->has_primary_markup = TRUE;
+ gtk_label_set_markup (GTK_LABEL (message_dialog->label), str);
+}
+
+/**
+ * gtk_message_dialog_format_secondary_text:
+ * @message_dialog: a #GtkMessageDialog
+ * @message_format: printf()-style format string, or %NULL
+ * @Varargs: arguments for @message_format
+ *
+ * Sets the secondary text of the message dialog to be @message_format
+ * (with printf()-style).
+ *
+ * Note that setting a secondary text makes the primary text become
+ * bold, unless you have provided explicit markup.
+ *
+ * Since: 2.6
+ **/
+void
+gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog,
+ const gchar *message_format,
+ ...)
+{
+ va_list args;
+ gchar *msg = NULL;
+ GtkMessageDialogPrivate *priv;
+
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
+
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (message_dialog);
+
+ if (message_format)
+ {
+ priv->has_secondary_text = TRUE;
+
+ va_start (args, message_format);
+ msg = g_strdup_vprintf (message_format, args);
+ va_end (args);
+
+ gtk_widget_show (priv->secondary_label);
+ gtk_label_set_text (GTK_LABEL (priv->secondary_label), msg);
+
+ g_free (msg);
+ }
+ else
+ {
+ priv->has_secondary_text = FALSE;
+ gtk_widget_hide (priv->secondary_label);
+ }
+
+ setup_primary_label_font (message_dialog);
+}
+
+/**
+ * gtk_message_dialog_format_secondary_markup:
+ * @message_dialog: a #GtkMessageDialog
+ * @message_format: printf()-style markup string (see
+ <link linkend="PangoMarkupFormat">Pango markup format</link>), or %NULL
+ * @Varargs: arguments for @message_format
+ *
+ * Sets the secondary text of the message dialog to be @message_format (with
+ * printf()-style), which is marked up with the
+ * <link linkend="PangoMarkupFormat">Pango text markup language</link>.
+ *
+ * Note that setting a secondary text makes the primary text become
+ * bold, unless you have provided explicit markup.
+ *
+ * Due to an oversight, this function does not escape special XML characters
+ * like gtk_message_dialog_new_with_markup() does. Thus, if the arguments
+ * may contain special XML characters, you should use g_markup_printf_escaped()
+ * to escape it.
+
+ * <informalexample><programlisting>
+ * gchar *msg;
+ *
+ * msg = g_markup_printf_escaped (message_format, ...);
+ * gtk_message_dialog_format_secondary_markup (message_dialog, "%s", msg);
+ * g_free (msg);
+ * </programlisting></informalexample>
+ *
+ * Since: 2.6
+ **/
+void
+gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog,
+ const gchar *message_format,
+ ...)
+{
+ va_list args;
+ gchar *msg = NULL;
+ GtkMessageDialogPrivate *priv;
+
+ g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog));
+
+ priv = GTK_MESSAGE_DIALOG_GET_PRIVATE (message_dialog);
+
+ if (message_format)
+ {
+ priv->has_secondary_text = TRUE;
+
+ va_start (args, message_format);
+ msg = g_strdup_vprintf (message_format, args);
+ va_end (args);
+
+ gtk_widget_show (priv->secondary_label);
+ gtk_label_set_markup (GTK_LABEL (priv->secondary_label), msg);
+
+ g_free (msg);
+ }
+ else
+ {
+ priv->has_secondary_text = FALSE;
+ gtk_widget_hide (priv->secondary_label);
+ }
+
+ setup_primary_label_font (message_dialog);
+}
+
static void
gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog,
GtkButtonsType buttons)
gtk_dialog_add_button (dialog,
GTK_STOCK_YES,
GTK_RESPONSE_YES);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ GTK_RESPONSE_YES,
+ GTK_RESPONSE_NO,
+ -1);
break;
case GTK_BUTTONS_OK_CANCEL:
gtk_dialog_add_button (dialog,
GTK_STOCK_OK,
GTK_RESPONSE_OK);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ GTK_RESPONSE_OK,
+ GTK_RESPONSE_CANCEL,
+ -1);
break;
default:
gtk_message_dialog_style_set (GtkWidget *widget,
GtkStyle *prev_style)
{
+ GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (widget);
+ gboolean use_separator;
GtkWidget *parent;
- gint border_width = 0;
+ gint border_width;
parent = GTK_WIDGET (GTK_MESSAGE_DIALOG (widget)->image->parent);
if (parent)
{
- gtk_widget_style_get (widget, "message_border",
+ gtk_widget_style_get (widget, "message-border",
&border_width, NULL);
gtk_container_set_border_width (GTK_CONTAINER (parent),
- border_width);
+ MAX (0, border_width - 7));
}
- if (GTK_WIDGET_CLASS (parent_class)->style_set)
- (GTK_WIDGET_CLASS (parent_class)->style_set) (widget, prev_style);
+ gtk_widget_style_get (widget,
+ "use-separator", &use_separator,
+ NULL);
+
+ _gtk_dialog_set_ignore_separator (GTK_DIALOG (widget), FALSE);
+ gtk_dialog_set_has_separator (GTK_DIALOG (widget), use_separator);
+ _gtk_dialog_set_ignore_separator (GTK_DIALOG (widget), TRUE);
+
+ setup_primary_label_font (dialog);
+
+ if (GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set)
+ (GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set) (widget, prev_style);
}
+
+#define __GTK_MESSAGE_DIALOG_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff