diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-13 23:08:00 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-16 17:27:21 +0800 |
commit | f0154b61b01a8cfe1db948126d64508880116fa4 (patch) | |
tree | ccdb5b5018ad7856b88ca8be32af1a5dfdeac77b | |
parent | 706a49f918e7ae2b0cd8acef45b7cde21f625571 (diff) | |
download | gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.tar gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.tar.gz gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.tar.bz2 gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.tar.lz gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.tar.xz gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.tar.zst gsoc2013-empathy-f0154b61b01a8cfe1db948126d64508880116fa4.zip |
add EmpathyCalendarButton
https://bugzilla.gnome.org/show_bug.cgi?id=671981
-rw-r--r-- | libempathy-gtk/Makefile.am | 2 | ||||
-rw-r--r-- | libempathy-gtk/empathy-calendar-button.c | 273 | ||||
-rw-r--r-- | libempathy-gtk/empathy-calendar-button.h | 68 | ||||
-rw-r--r-- | tests/interactive/.gitignore | 1 | ||||
-rw-r--r-- | tests/interactive/Makefile.am | 4 | ||||
-rw-r--r-- | tests/interactive/test-empathy-calendar-button.c | 72 |
6 files changed, 419 insertions, 1 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 32426a934..abc48fed3 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -36,6 +36,7 @@ libempathy_gtk_handwritten_source = \ empathy-avatar-image.c \ empathy-bad-password-dialog.c \ empathy-base-password-dialog.c \ + empathy-calendar-button.c \ empathy-call-utils.c \ empathy-cell-renderer-activatable.c \ empathy-cell-renderer-expander.c \ @@ -102,6 +103,7 @@ libempathy_gtk_headers = \ empathy-avatar-image.h \ empathy-bad-password-dialog.h \ empathy-base-password-dialog.h \ + empathy-calendar-button.h \ empathy-call-utils.h \ empathy-cell-renderer-activatable.h \ empathy-cell-renderer-expander.h \ diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c new file mode 100644 index 000000000..9f4c4795e --- /dev/null +++ b/libempathy-gtk/empathy-calendar-button.c @@ -0,0 +1,273 @@ +/* + * empathy-calendar-button.c - Source for EmpathyCalendarButton + * Copyright (C) 2012 Collabora Ltd. + * + * This library 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include <glib/gi18n-lib.h> + +#include "empathy-calendar-button.h" + +#include <libempathy/empathy-utils.h> + +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING +#include <libempathy/empathy-debug.h> + +G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX) + +/* signal enum */ +enum { + DATE_CHANGED, + LAST_SIGNAL, +}; + +static guint signals[LAST_SIGNAL] = {0}; + +struct _EmpathyCalendarButtonPriv { + GDate *date; + + GtkWidget *button_date; + GtkWidget *button_clear; + GtkWidget *dialog; + GtkWidget *calendar; +}; + +static void +empathy_calendar_button_finalize (GObject *object) +{ + EmpathyCalendarButton *self = (EmpathyCalendarButton *) object; + + tp_clear_pointer (&self->priv->date, g_date_free); + + G_OBJECT_CLASS (empathy_calendar_button_parent_class)->finalize (object); +} + +static void +update_label (EmpathyCalendarButton *self) +{ + if (self->priv->date == NULL) + { + gtk_button_set_label (GTK_BUTTON (self->priv->button_date), + _("Select...")); + } + else + { + gchar buffer[128]; + + g_date_strftime (buffer, 128, "%e %b %Y", self->priv->date); + gtk_button_set_label (GTK_BUTTON (self->priv->button_date), buffer); + } +} + +static void +empathy_calendar_button_constructed (GObject *object) +{ + EmpathyCalendarButton *self = (EmpathyCalendarButton *) object; + + G_OBJECT_CLASS (empathy_calendar_button_parent_class)->constructed ( + object); + + update_label (self); +} + +static void +dialog_response (GtkDialog *dialog, + gint response, + EmpathyCalendarButton *self) +{ + GDate *date; + guint year, month, day; + + if (response != GTK_RESPONSE_OK) + goto out; + + gtk_calendar_get_date (GTK_CALENDAR (self->priv->calendar), + &year, &month, &day); + date = g_date_new_dmy (day, month + 1, year); + + empathy_calendar_button_set_date (self, date); + + g_date_free (date); + +out: + gtk_widget_hide (GTK_WIDGET (dialog)); +} + +static gboolean +dialog_destroy (GtkWidget *widget, + EmpathyCalendarButton *self) +{ + self->priv->dialog = NULL; + self->priv->calendar = NULL; + + return FALSE; +} + +static void +update_calendar (EmpathyCalendarButton *self) +{ + if (self->priv->calendar == NULL) + return; + + gtk_calendar_clear_marks (GTK_CALENDAR (self->priv->calendar)); + + if (self->priv->date == NULL) + return; + + gtk_calendar_select_day (GTK_CALENDAR (self->priv->calendar), + g_date_get_day (self->priv->date)); + gtk_calendar_select_month (GTK_CALENDAR (self->priv->calendar), + g_date_get_month (self->priv->date) - 1, + g_date_get_year (self->priv->date)); + gtk_calendar_mark_day (GTK_CALENDAR (self->priv->calendar), + g_date_get_day (self->priv->date)); +} + +static void +empathy_calendar_button_date_clicked (GtkButton *button, + EmpathyCalendarButton *self) +{ + if (self->priv->dialog == NULL) + { + GtkWidget *parent, *content; + + parent = gtk_widget_get_toplevel (GTK_WIDGET (button)); + + self->priv->dialog = gtk_dialog_new_with_buttons (NULL, + GTK_WINDOW (parent), GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Select"), GTK_RESPONSE_OK, + NULL); + + gtk_window_set_transient_for (GTK_WINDOW (self->priv->dialog), + GTK_WINDOW (parent)); + + self->priv->calendar = gtk_calendar_new (); + + update_calendar (self); + + content = gtk_dialog_get_content_area (GTK_DIALOG (self->priv->dialog)); + + gtk_box_pack_start (GTK_BOX (content), self->priv->calendar, TRUE, TRUE, + 6); + gtk_widget_show (self->priv->calendar); + + g_signal_connect (self->priv->dialog, "response", + G_CALLBACK (dialog_response), self); + g_signal_connect (self->priv->dialog, "destroy", + G_CALLBACK (dialog_destroy), self); + } + + gtk_window_present (GTK_WINDOW (self->priv->dialog)); +} + +static void +empathy_calendar_button_clear_clicked (GtkButton *button, + EmpathyCalendarButton *self) +{ + empathy_calendar_button_set_date (self, NULL); +} + +static void +empathy_calendar_button_init (EmpathyCalendarButton *self) +{ + GtkWidget *image; + GtkStyleContext *context; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + EMPATHY_TYPE_CALENDAR_BUTTON, EmpathyCalendarButtonPriv); + + context = gtk_widget_get_style_context (GTK_WIDGET (self)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED); + + /* Date */ + self->priv->button_date = gtk_button_new (); + + g_signal_connect (self->priv->button_date, "clicked", + G_CALLBACK (empathy_calendar_button_date_clicked), self); + + gtk_button_set_alignment (GTK_BUTTON (self->priv->button_date), 0, 0.5); + + gtk_box_pack_start (GTK_BOX (self), self->priv->button_date, TRUE, TRUE, 0); + + /* Clear */ + self->priv->button_clear = gtk_button_new (); + + image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, + GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (self->priv->button_clear), image); + + g_signal_connect (self->priv->button_clear, "clicked", + G_CALLBACK (empathy_calendar_button_clear_clicked), self); + + gtk_box_pack_start (GTK_BOX (self), self->priv->button_clear, + FALSE, FALSE, 0); +} + +static void +empathy_calendar_button_class_init (EmpathyCalendarButtonClass *klass) +{ + GObjectClass *oclass = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (EmpathyCalendarButtonPriv)); + + oclass->finalize = empathy_calendar_button_finalize; + oclass->constructed = empathy_calendar_button_constructed; + + signals[DATE_CHANGED] = g_signal_new ("date-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, 0, + NULL, NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, 1, G_TYPE_DATE); +} + +GtkWidget * +empathy_calendar_button_new (void) +{ + return g_object_new (EMPATHY_TYPE_CALENDAR_BUTTON, + "orientation", GTK_ORIENTATION_HORIZONTAL, + NULL); +} + +GDate * +empathy_calendar_button_get_date (EmpathyCalendarButton *self) +{ + return self->priv->date; +} + +void +empathy_calendar_button_set_date (EmpathyCalendarButton *self, + GDate *date) +{ + if (date == self->priv->date) + return; + + tp_clear_pointer (&self->priv->date, g_date_free); + + if (date != NULL) + { + /* There is no g_date_copy()... */ + self->priv->date = g_date_new_dmy (date->day, date->month, date->year); + } + + update_label (self); + update_calendar (self); + + g_signal_emit (self, signals[DATE_CHANGED], 0, self->priv->date); +} diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h new file mode 100644 index 000000000..3f1aed1f1 --- /dev/null +++ b/libempathy-gtk/empathy-calendar-button.h @@ -0,0 +1,68 @@ +/* + * empathy-calendar-button.h - Header for EmpathyCalendarButton + * Copyright (C) 2012 Collabora Ltd. + * + * This library 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __EMPATHY_CALENDAR_BUTTON_H__ +#define __EMPATHY_CALENDAR_BUTTON_H__ + +#include <glib-object.h> +#include <gtk/gtk.h> + +G_BEGIN_DECLS + +typedef struct _EmpathyCalendarButton EmpathyCalendarButton; +typedef struct _EmpathyCalendarButtonClass EmpathyCalendarButtonClass; +typedef struct _EmpathyCalendarButtonPriv EmpathyCalendarButtonPriv; + +struct _EmpathyCalendarButtonClass { + GtkBoxClass parent_class; +}; + +struct _EmpathyCalendarButton { + GtkBox parent; + EmpathyCalendarButtonPriv *priv; +}; + +GType empathy_calendar_button_get_type (void); + +#define EMPATHY_TYPE_CALENDAR_BUTTON \ + (empathy_calendar_button_get_type ()) +#define EMPATHY_CALENDAR_BUTTON(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CALENDAR_BUTTON, \ + EmpathyCalendarButton)) +#define EMPATHY_CALENDAR_BUTTON_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CALENDAR_BUTTON, \ + EmpathyCalendarButtonClass)) +#define EMPATHY_IS_CALENDAR_BUTTON(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CALENDAR_BUTTON)) +#define EMPATHY_IS_CALENDAR_BUTTON_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CALENDAR_BUTTON)) +#define EMPATHY_CALENDAR_BUTTON_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALENDAR_BUTTON, \ + EmpathyCalendarButtonClass)) + +GtkWidget * empathy_calendar_button_new (void); + +GDate * empathy_calendar_button_get_date (EmpathyCalendarButton *self); + +void empathy_calendar_button_set_date (EmpathyCalendarButton *self, + GDate *date); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_CALENDAR_BUTTON_H__*/ diff --git a/tests/interactive/.gitignore b/tests/interactive/.gitignore index ea3271654..535570e16 100644 --- a/tests/interactive/.gitignore +++ b/tests/interactive/.gitignore @@ -9,3 +9,4 @@ test-empathy-presence-chooser test-empathy-status-preset-dialog test-empathy-protocol-chooser test-empathy-account-chooser +test-empathy-calendar-button diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index bb0f41548..5cb89bb10 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -19,7 +19,8 @@ noinst_PROGRAMS = \ test-empathy-presence-chooser \ test-empathy-status-preset-dialog \ test-empathy-protocol-chooser \ - test-empathy-account-chooser + test-empathy-account-chooser \ + test-empathy-calendar-button empathy_logs_SOURCES = empathy-logs.c test_empathy_contact_blocking_dialog_SOURCES = test-empathy-contact-blocking-dialog.c @@ -27,3 +28,4 @@ test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c test_empathy_account_chooser_SOURCES = test-empathy-account-chooser.c +test_empathy_calendar_button_SOURCES = test-empathy-calendar-button.c diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c new file mode 100644 index 000000000..df91f1f2d --- /dev/null +++ b/tests/interactive/test-empathy-calendar-button.c @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2012 Collabora Ltd. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk> + */ + +#include "config.h" + +#include <libempathy-gtk/empathy-calendar-button.h> + +static void +date_changed_cb (EmpathyCalendarButton *button, + GDate *date, + gpointer user_data) +{ + if (date == NULL) + { + g_print ("date changed: none\n"); + } + else + { + gchar buffer[128]; + + g_date_strftime (buffer, 128, "%x", date); + g_print ("date changed: %s\n", buffer); + } +} + +int +main (int argc, + char **argv) +{ + GtkWidget *win, *button; + GDate *date; + + gtk_init (&argc, &argv); + + win = gtk_window_new (GTK_WINDOW_TOPLEVEL); + + g_signal_connect_swapped (win, "destroy", + G_CALLBACK (gtk_main_quit), NULL); + + button = empathy_calendar_button_new (); + + date = g_date_new_dmy (30, 11, 1984); + empathy_calendar_button_set_date (EMPATHY_CALENDAR_BUTTON (button), date); + g_date_free (date); + + g_signal_connect (button, "date-changed", + G_CALLBACK (date_changed_cb), NULL); + + gtk_container_add (GTK_CONTAINER (win), button); + gtk_widget_show_all (win); + + gtk_main (); + return 0; +} |