diff options
| -rw-r--r-- | debian/copyright | 3 | ||||
| -rw-r--r-- | debian/libayatana-ido3-0.4-0.symbols | 3 | ||||
| -rw-r--r-- | example/Makefile.am | 16 | ||||
| -rw-r--r-- | example/messagedialog.c | 59 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/idomessagedialog.c | 433 | ||||
| -rw-r--r-- | src/idomessagedialog.h | 78 | ||||
| -rw-r--r-- | src/libayatana-ido.h | 1 |
8 files changed, 1 insertions, 596 deletions
diff --git a/debian/copyright b/debian/copyright index 29dd1b3..32be1aa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -49,7 +49,6 @@ Files: AUTHORS.Canonical configure.ac example/Makefile.am example/menus.c - example/messagedialog.c libayatana-ido3.pc.in m4/gcov.m4 src/Makefile.am @@ -77,8 +76,6 @@ Files: src/idocalendarmenuitem.c src/idocalendarmenuitem.h src/idoentrymenuitem.c src/idoentrymenuitem.h - src/idomessagedialog.c - src/idomessagedialog.h src/idorange.c src/idorange.h src/idoscalemenuitem.c diff --git a/debian/libayatana-ido3-0.4-0.symbols b/debian/libayatana-ido3-0.4-0.symbols index 1802ceb..5b911e5 100644 --- a/debian/libayatana-ido3-0.4-0.symbols +++ b/debian/libayatana-ido3-0.4-0.symbols @@ -46,9 +46,6 @@ libayatana-ido3-0.4.so.0 libayatana-ido3-0.4-0 #MINVER# ido_location_menu_item_new_from_model@Base 0.4.0 ido_location_menu_item_set_timezone@Base 0.4.0 ido_menu_item_factory_get_type@Base 0.4.0 - ido_message_dialog_get_type@Base 0.1.8 - ido_message_dialog_new@Base 0.1.8 - ido_message_dialog_new_with_markup@Base 0.1.8 ido_progress_menu_item_new_from_model@Base 0.4.0 ido_range_get_type@Base 0.1.9 ido_range_new@Base 0.1.9 diff --git a/example/Makefile.am b/example/Makefile.am index 1709835..d52ac1c 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,23 +1,11 @@ VER=3 noinst_PROGRAMS = \ - messagedialog \ menus -messagedialog_SOURCES = \ - messagedialog.c - menus_SOURCES = \ menus.c -messagedialog_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - $(GCC_FLAGS) \ - $(GTK_CFLAGS) \ - $(MAINTAINER_CFLAGS) - menus_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ @@ -26,8 +14,6 @@ menus_CPPFLAGS = \ $(GTK_CFLAGS) \ $(MAINTAINER_CFLAGS) -messagedialog_LDADD = $(top_builddir)/src/libayatana-ido$(VER)-0.4.la $(GTK_LIBS) - menus_LDADD = $(top_builddir)/src/libayatana-ido$(VER)-0.4.la $(GTK_LIBS) -DISTCLEANFILES = Makefile.in
\ No newline at end of file +DISTCLEANFILES = Makefile.in diff --git a/example/messagedialog.c b/example/messagedialog.c deleted file mode 100644 index d9cfc21..0000000 --- a/example/messagedialog.c +++ /dev/null @@ -1,59 +0,0 @@ -#include <gtk/gtk.h> - -#include "idomessagedialog.h" -#include "config.h" - -static void -response_cb (GtkDialog *dialog, - gint response, - gpointer user_data) -{ - gtk_widget_destroy (GTK_WIDGET (dialog)); -} - -static void -button_clicked_cb (GtkWidget *button, gpointer data) -{ - GtkWidget *window = (GtkWidget *) data; - GtkWidget *dialog = ido_message_dialog_new (GTK_WINDOW (window), - GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CLOSE, - "This is a test of the emergency broadcasting system"); - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - "If this had been an actual emergency, you'd be dead already"); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (response_cb), NULL); - gtk_widget_show (dialog); -} - -int -main (int argc, char *argv[]) -{ - GtkWidget *window; - GtkWidget *vbox; - GtkWidget *button; - - gtk_init (&argc, &argv); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window), "Message Dialogs"); - g_signal_connect (window, "destroy", gtk_main_quit, NULL); - - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - - gtk_container_add (GTK_CONTAINER (window), vbox); - - button = gtk_button_new_with_label ("Confirmation dialog"); - g_signal_connect (button, "clicked", - G_CALLBACK (button_clicked_cb), - window); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - - gtk_widget_show_all (window); - - gtk_main (); - - return 0; -} diff --git a/src/Makefile.am b/src/Makefile.am index b9cf3dd..a0645be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,6 @@ sources_h = \ idoalarmmenuitem.h \ idocalendarmenuitem.h \ idoentrymenuitem.h \ - idomessagedialog.h \ idorange.h \ idoscalemenuitem.h \ idoswitchmenuitem.h \ @@ -78,7 +77,6 @@ libayatana_ido_0_4_la_SOURCES = \ idocalendarmenuitem.c \ idoalarmmenuitem.c \ idoentrymenuitem.c \ - idomessagedialog.c \ idorange.c \ idoscalemenuitem.c \ idoswitchmenuitem.c \ @@ -104,7 +102,6 @@ libayatana_idoincludedir=$(includedir)/libayatana-ido3-0.4/libayatana-ido libayatana_idoinclude_HEADERS = \ idocalendarmenuitem.h \ idoentrymenuitem.h \ - idomessagedialog.h \ idorange.h \ idoscalemenuitem.h \ idoswitchmenuitem.h \ @@ -143,7 +140,6 @@ AyatanaIdo3_0_4_gir_LIBS = libayatana-ido3-0.4.la AyatanaIdo3_0_4_gir_FILES = \ idocalendarmenuitem.h \ idoentrymenuitem.h \ - idomessagedialog.h \ idorange.h \ idoscalemenuitem.h \ idoswitchmenuitem.h \ diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c deleted file mode 100644 index 0e26a86..0000000 --- a/src/idomessagedialog.c +++ /dev/null @@ -1,433 +0,0 @@ -/* - * Copyright (C) 2010 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of either or both of the following licenses: - * - * 1) the GNU Lesser General Public License version 3, as published by the - * Free Software Foundation; and/or - * 2) the GNU Lesser General Public License version 2.1, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the applicable version of the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of both the GNU Lesser General Public - * License version 3 and version 2.1 along with this program. If not, see - * <http://www.gnu.org/licenses/> - * - * Authors: - * Cody Russell <crussell@canonical.com> - * - * Design and specification: - * Matthew Paul Thomas <mpt@canonical.com> - */ - -#include <string.h> - -#include <gtk/gtk.h> - -#include "idomessagedialog.h" -#include "idotimeline.h" -#include "config.h" - -static GtkWidget *ido_message_dialog_get_secondary_label (IdoMessageDialog *dialog); -static GtkWidget *ido_message_dialog_get_primary_label (IdoMessageDialog *dialog); - -typedef struct { - GtkWidget *action_area; - GtkWidget *primary_label; - GtkWidget *secondary_label; - - gboolean expanded; -} IdoMessageDialogPrivate; - -typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext; - -struct _IdoMessageDialogMorphContext -{ - GtkWidget *widget; - IdoTimeline *timeline; - - GtkRequisition start; - GtkRequisition end; -}; - -G_DEFINE_TYPE_WITH_PRIVATE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG) - -static void -ido_message_dialog_map (GtkWidget *widget) -{ - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget); - IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - - GTK_WIDGET_CLASS (ido_message_dialog_parent_class)->map (widget); - - priv->primary_label = ido_message_dialog_get_primary_label (dialog); - priv->secondary_label = ido_message_dialog_get_secondary_label (dialog); - - gtk_widget_hide (priv->secondary_label); - - gtk_label_set_selectable (GTK_LABEL (priv->primary_label), FALSE); - gtk_label_set_selectable (GTK_LABEL (priv->secondary_label), FALSE); - - /* XXX: We really want to use gtk_window_set_deletable (GTK_WINDOW (widget), FALSE) - * here, but due to a bug in compiz this is more compatible. - * - * See: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/240794 - */ - gdk_window_set_functions (gtk_widget_get_window (widget), - GDK_FUNC_RESIZE | GDK_FUNC_MOVE); - - ido_message_dialog_get_secondary_label (IDO_MESSAGE_DIALOG (widget)); -} - -static IdoMessageDialogMorphContext * -ido_message_dialog_morph_context_new (GtkWidget *widget, - IdoTimeline *timeline, - gpointer identifier, - GtkRequisition *start, - GtkRequisition *end) -{ - IdoMessageDialogMorphContext *context; - - context = g_slice_new (IdoMessageDialogMorphContext); - - context->widget = widget; - context->timeline = timeline; - context->start = *start; - context->end = *end; - - return context; -} - -static void -ido_message_dialog_morph_context_free (IdoMessageDialogMorphContext *context) -{ - g_object_unref (context->timeline); - - g_slice_free (IdoMessageDialogMorphContext, context); -} - -static void -timeline_frame_cb (IdoTimeline *timeline, - gdouble progress, - gpointer user_data) -{ - IdoMessageDialogMorphContext *context = user_data; - GtkRequisition start = context->start; - GtkRequisition end = context->end; - gint width_diff; - gint height_diff; - gint width, height; - - width_diff = (MAX(start.width, end.width) - MIN(start.width, end.width)) * progress; - height_diff = (MAX(start.height, end.height) - MIN(start.height, end.height)) * progress; - - gtk_window_get_size (GTK_WINDOW (context->widget), - &width, - &height); - - gtk_widget_set_size_request (context->widget, - width_diff ? start.width + width_diff : -1, - height_diff ? start.height + height_diff : -1); -} - -static void -timeline_finished_cb (IdoTimeline *timeline, - gpointer user_data) -{ - IdoMessageDialogMorphContext *context = user_data; - IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (IDO_MESSAGE_DIALOG (context->widget)); - - gtk_widget_show (priv->action_area); - gtk_widget_show (priv->secondary_label); - - ido_message_dialog_morph_context_free (context); -} - -static gboolean -ido_message_dialog_focus_in_event (GtkWidget *widget, - GdkEventFocus *event) -{ - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget); - IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - - if (!priv->expanded) - { - GtkRequisition start; - GtkRequisition end; - IdoTimeline *timeline; - IdoMessageDialogMorphContext *context; - - gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &start); - - priv->expanded = TRUE; - - gtk_widget_show (priv->action_area); - gtk_widget_show (priv->secondary_label); - - gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &end); - - gtk_widget_hide (priv->action_area); - gtk_widget_hide (priv->secondary_label); - - timeline = ido_timeline_new (500); - context = ido_message_dialog_morph_context_new (GTK_WIDGET (dialog), - timeline, - "foo", - &start, - &end); - g_signal_connect (timeline, - "frame", - G_CALLBACK (timeline_frame_cb), - context); - g_signal_connect (timeline, - "finished", - G_CALLBACK (timeline_finished_cb), - context); - - ido_timeline_start (timeline); - } - - return FALSE; -} - -static void -ido_message_dialog_constructed (GObject *object) -{ - - IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (object); - IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog); - GtkWidget *vbox; - GtkWidget *event_box; - - event_box = gtk_event_box_new (); - gtk_widget_show (event_box); - - vbox = gtk_dialog_get_content_area (GTK_DIALOG (object)); - - // FIXME: I dare you to find a better way! - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - priv->action_area = gtk_dialog_get_action_area (GTK_DIALOG (object)); - G_GNUC_END_IGNORE_DEPRECATIONS; - - g_object_ref (G_OBJECT (vbox)); - gtk_container_remove (GTK_CONTAINER (object), vbox); - gtk_container_add (GTK_CONTAINER (event_box), vbox); - gtk_container_add (GTK_CONTAINER (object), event_box); - - gtk_widget_hide (priv->action_area); -} - -static void -ido_message_dialog_class_init (IdoMessageDialogClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); - - object_class->constructed = ido_message_dialog_constructed; - - widget_class->map = ido_message_dialog_map; - widget_class->focus_in_event = ido_message_dialog_focus_in_event; -} - -static void -ido_message_dialog_init (IdoMessageDialog *dialog) -{ - gtk_window_set_focus_on_map (GTK_WINDOW (dialog), FALSE); -} - -/** - * ido_message_dialog_new: - * @parent: transient parent, or %NULL for none - * @flags: flags - * @type: type of message - * @buttons: a set of buttons to use - * @message_format: printf()-style format string, or %NULL - * @...: arguments for @message_format - * - * Creates a new message dialog, which is based upon - * GtkMessageDialog so it shares API and functionality - * with it. IdoMessageDialog differs in that it has two - * states. The initial state hides the action buttons - * and the secondary message. When a user clicks on the - * dialog it will expand to provide the secondary message - * and the action buttons. - * - * Return Value: a new #IdoMessageDialog - **/ -GtkWidget* -ido_message_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GtkMessageType type, - GtkButtonsType buttons, - const gchar *message_format, - ...) -{ - GtkWidget *widget; - GtkDialog *dialog; - gchar* msg = NULL; - va_list args; - - g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); - - widget = g_object_new (IDO_TYPE_MESSAGE_DIALOG, - "message-type", type, - "buttons", buttons, - NULL); - dialog = GTK_DIALOG (widget); - - if (message_format) - { - va_start (args, message_format); - msg = g_strdup_vprintf (message_format, args); - va_end (args); - - g_object_set (G_OBJECT (widget), "text", msg, NULL); - - g_free (msg); - } - - if (parent != NULL) - gtk_window_set_transient_for (GTK_WINDOW (widget), - GTK_WINDOW (parent)); - - if (flags & GTK_DIALOG_MODAL) - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - - if (flags & GTK_DIALOG_DESTROY_WITH_PARENT) - gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); - - return widget; -} - -/** - * ido_message_dialog_new_with_markup: - * @parent: transient parent, or %NULL for none - * @flags: flags - * @type: type of message - * @buttons: a set of buttons to use - * @message_format: printf()-style format string, or %NULL - * @...: arguments for @message_format. They will be escaped to allow valid XML. - * - * Creates a new message dialog, which is based upon - * GtkMessageDialog so it shares API and functionality - * with it. IdoMessageDialog differs in that it has two - * states. The initial state hides the action buttons - * and the secondary message. When a user clicks on the - * dialog it will expand to provide the secondary message - * and the action buttons. - * - * Return Value: a new #IdoMessageDialog - **/ -GtkWidget* -ido_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 = ido_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; -} - - /* - * This is almost humorously stupid. We jump through some hoops and kill - * a few kittens here because we want to preserve API compatibility with - * GtkMessageDialog and extend it instead of duplicating its functionality. - * If only GtkMessageDialog were easier to extend then maybe all those - * kittens wouldn't have had to die... - */ -static GtkWidget * -ido_message_dialog_get_label (IdoMessageDialog *dialog, gboolean primary) -{ - GList *list; - gchar *text; - gchar *secondary_text; - GtkWidget *content; - GList *children; - - g_object_get (G_OBJECT (dialog), - "text", &text, - "secondary-text", &secondary_text, - NULL); - - g_return_val_if_fail (IDO_IS_MESSAGE_DIALOG (dialog), NULL); - - content = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - children = gtk_container_get_children (GTK_CONTAINER (content)); - - for (list = children; list != NULL; list = list->next) - { - if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (list->data) == GTK_ORIENTATION_HORIZONTAL) - { - GList *hchildren; - GList *hlist; - GtkWidget *hbox = GTK_WIDGET (list->data); - - hchildren = gtk_container_get_children (GTK_CONTAINER (hbox)); - - for (hlist = hchildren; hlist != NULL; hlist = hlist->next) - { - if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (hlist->data) == GTK_ORIENTATION_VERTICAL) - { - GList *vlist; - GtkWidget *vbox = GTK_WIDGET (hlist->data); - GList *vchildren; - - vchildren = gtk_container_get_children (GTK_CONTAINER (vbox)); - - for (vlist = vchildren; vlist != NULL; vlist = vlist->next) - { - GtkLabel *label; - - label = GTK_LABEL (vlist->data); - - if (strcmp ((primary ? text : secondary_text), - gtk_label_get_label (label)) == 0) - { - return GTK_WIDGET (label); - } - } - } - } - } - } - - return NULL; -} - -static GtkWidget * -ido_message_dialog_get_secondary_label (IdoMessageDialog *dialog) -{ - return ido_message_dialog_get_label (dialog, FALSE); -} - -static GtkWidget * -ido_message_dialog_get_primary_label (IdoMessageDialog *dialog) -{ - return ido_message_dialog_get_label (dialog, TRUE); -} diff --git a/src/idomessagedialog.h b/src/idomessagedialog.h deleted file mode 100644 index 4313fb3..0000000 --- a/src/idomessagedialog.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2010 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of either or both of the following licenses: - * - * 1) the GNU Lesser General Public License version 3, as published by the - * Free Software Foundation; and/or - * 2) the GNU Lesser General Public License version 2.1, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the applicable version of the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of both the GNU Lesser General Public - * License version 3 and version 2.1 along with this program. If not, see - * <http://www.gnu.org/licenses/> - * - * Authors: - * Cody Russell <crussell@canonical.com> - * - * Design and specification: - * Matthew Paul Thomas <mpt@canonical.com> - */ - -#ifndef __IDO_MESSAGE_DIALOG_H__ -#define __IDO_MESSAGE_DIALOG_H__ - -#include <gtk/gtk.h> - -#define IDO_TYPE_MESSAGE_DIALOG (ido_message_dialog_get_type ()) -#define IDO_MESSAGE_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialog)) -#define IDO_MESSAGE_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialogClass)) -#define IDO_IS_MESSAGE_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), IDO_TYPE_MESSAGE_DIALOG)) -#define IDO_IS_MESSAGE_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), IDO_TYPE_MESSAGE_DIALOG)) -#define IDO_MESSAGE_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialogClass)) - -typedef struct _IdoMessageDialog IdoMessageDialog; -typedef struct _IdoMessageDialogClass IdoMessageDialogClass; - -struct _IdoMessageDialog -{ - GtkMessageDialog parent_instance; -}; - -struct _IdoMessageDialogClass -{ - GtkMessageDialogClass parent_class; - - /* Padding for future expansion */ - void (*_ido_reserved1) (void); - void (*_ido_reserved2) (void); - void (*_ido_reserved3) (void); - void (*_ido_reserved4) (void); -}; - -GType ido_message_dialog_get_type (void) G_GNUC_CONST; - -GtkWidget* ido_message_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - GtkMessageType type, - GtkButtonsType buttons, - const gchar *message_format, - ...) G_GNUC_PRINTF (5, 6); - -GtkWidget* ido_message_dialog_new_with_markup (GtkWindow *parent, - GtkDialogFlags flags, - GtkMessageType type, - GtkButtonsType buttons, - const gchar *message_format, - ...) G_GNUC_PRINTF (5, 6); - -G_END_DECLS - -#endif /* __IDO_MESSAGE_DIALOG_H__ */ diff --git a/src/libayatana-ido.h b/src/libayatana-ido.h index c56ae69..37a2eee 100644 --- a/src/libayatana-ido.h +++ b/src/libayatana-ido.h @@ -29,7 +29,6 @@ #include <libayatana-ido/idocalendarmenuitem.h> #include <libayatana-ido/idoscalemenuitem.h> #include <libayatana-ido/idoentrymenuitem.h> -#include <libayatana-ido/idomessagedialog.h> void ido_init (void); |