New function to set the EDateEdit's value when a row is selected in the
2001-02-28 Federico Mena Quintero <federico@ximian.com> * gui/event-editor.c (recurrence_exception_select_row_cb): New function to set the EDateEdit's value when a row is selected in the exception date list. Fixes bug #1638. (append_exception): Set the value as well. Block/unblock signals from the clist as appropriate. Gotta love non-model/view widgets. (recurrence_exception_delete_cb): Be more paranoid about the contents of the list row's data. (recur_to_comp_object): Likewise. (fill_exception_widgets): Select the first row after we are done appending the exception dates. svn path=/trunk/; revision=8430
This commit is contained in:
Federico Mena Quintero
committed by
Federico Mena Quintero
Federico Mena Quintero
parent
f50ddd9de1
commit
25152d9caa
@ -1,3 +1,16 @@
|
||||
2001-02-28 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gui/event-editor.c (recurrence_exception_select_row_cb): New
|
||||
function to set the EDateEdit's value when a row is selected in
|
||||
the exception date list. Fixes bug #1638.
|
||||
(append_exception): Set the value as well. Block/unblock signals
|
||||
from the clist as appropriate. Gotta love non-model/view widgets.
|
||||
(recurrence_exception_delete_cb): Be more paranoid about the
|
||||
contents of the list row's data.
|
||||
(recur_to_comp_object): Likewise.
|
||||
(fill_exception_widgets): Select the first row after we are done
|
||||
appending the exception dates.
|
||||
|
||||
2001-02-26 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
* gui/alarm-notify/Makefile.am (libalarm_a_SOURCES): Create a
|
||||
|
||||
@ -11,7 +11,7 @@ idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
|
||||
$(CORBA_GENERATED): $(idls)
|
||||
$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
|
||||
|
||||
bin_PROGRAMS = evolution-alarm-notify
|
||||
bin_PROGRAMS = evolution-alarm-notify evolution-alarm-client
|
||||
|
||||
noinst_LIBRARIES = libalarm.a
|
||||
|
||||
@ -42,15 +42,24 @@ evolution_alarm_notify_SOURCES = \
|
||||
alarm-queue.h \
|
||||
notify-main.c
|
||||
|
||||
evolution_alarm_notify_LDADD = \
|
||||
libalarm.a \
|
||||
$(top_builddir)/calendar/cal-client/libcal-client.la \
|
||||
$(top_builddir)/calendar/cal-util/libcal-util.la \
|
||||
$(top_builddir)/libical/src/libical/libical.la \
|
||||
$(BONOBO_VFS_GNOME_LIBS) \
|
||||
$(EXTRA_GNOME_LIBS) \
|
||||
evolution_alarm_notify_LDADD = \
|
||||
libalarm.a \
|
||||
$(top_builddir)/calendar/cal-client/libcal-client.la \
|
||||
$(top_builddir)/calendar/cal-util/libcal-util.la \
|
||||
$(top_builddir)/libical/src/libical/libical.la \
|
||||
$(BONOBO_VFS_GNOME_LIBS) \
|
||||
$(EXTRA_GNOME_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
evolution_alarm_client_SOURCES = \
|
||||
client-main.c \
|
||||
$(CORBA_GENERATED)
|
||||
|
||||
evolution_alarm_client_LDADD = \
|
||||
$(BONOBO_VFS_GNOME_LIBS) \
|
||||
$(EXTRA_GNOME_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
oafdir = $(datadir)/oaf
|
||||
oaf_in_files = \
|
||||
GNOME_Evolution_Calendar_AlarmNotify.oaf.in
|
||||
|
||||
@ -55,7 +55,6 @@ alarm_notify_factory_fn (BonoboGenericFactory *factory, void *data)
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
|
||||
bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
|
||||
textdomain (PACKAGE);
|
||||
|
||||
|
||||
@ -231,6 +231,8 @@ static void reminder_delete_cb (GtkWidget *widget, EventEditor *ee);
|
||||
static void recurrence_exception_add_cb (GtkWidget *widget, EventEditor *ee);
|
||||
static void recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee);
|
||||
static void recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee);
|
||||
static void recurrence_exception_select_row_cb (GtkCList *clist, gint row, gint col, GdkEvent *event,
|
||||
gpointer data);
|
||||
static void field_changed (GtkWidget *widget,
|
||||
EventEditor *ee);
|
||||
static void event_editor_set_changed (EventEditor *ee,
|
||||
@ -1223,6 +1225,10 @@ init_widgets (EventEditor *ee)
|
||||
gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_delete), "clicked",
|
||||
GTK_SIGNAL_FUNC (recurrence_exception_delete_cb), ee);
|
||||
|
||||
/* Selections in the exceptions list */
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_list), "select_row",
|
||||
GTK_SIGNAL_FUNC (recurrence_exception_select_row_cb), ee);
|
||||
|
||||
/*
|
||||
* Connect the default signal handler to use to make sure the "changed"
|
||||
@ -1243,9 +1249,6 @@ init_widgets (EventEditor *ee)
|
||||
gtk_signal_connect (GTK_OBJECT (priv->classification_confidential),
|
||||
"toggled",
|
||||
GTK_SIGNAL_FUNC (field_changed), ee);
|
||||
|
||||
|
||||
/* Recurrence Page. */
|
||||
}
|
||||
|
||||
static const int classification_map[] = {
|
||||
@ -1447,6 +1450,7 @@ fill_exception_widgets (EventEditor *ee)
|
||||
{
|
||||
EventEditorPrivate *priv;
|
||||
GSList *list, *l;
|
||||
gboolean added;
|
||||
|
||||
priv = ee->priv;
|
||||
g_assert (priv->comp != NULL);
|
||||
@ -1455,16 +1459,23 @@ fill_exception_widgets (EventEditor *ee)
|
||||
|
||||
cal_component_get_exdate_list (priv->comp, &list);
|
||||
|
||||
added = FALSE;
|
||||
|
||||
for (l = list; l; l = l->next) {
|
||||
CalComponentDateTime *cdt;
|
||||
time_t ext;
|
||||
|
||||
added = TRUE;
|
||||
|
||||
cdt = l->data;
|
||||
ext = icaltime_as_timet (*cdt->value);
|
||||
append_exception (ee, ext);
|
||||
}
|
||||
|
||||
cal_component_free_exdate_list (list);
|
||||
|
||||
if (added)
|
||||
gtk_clist_select_row (GTK_CLIST (priv->recurrence_exception_list), 0, 0);
|
||||
}
|
||||
|
||||
/* Computes a weekday mask for the start day of a calendar component, for use in
|
||||
@ -2315,6 +2326,7 @@ recur_to_comp_object (EventEditor *ee, CalComponent *comp)
|
||||
cdt->tzid = NULL;
|
||||
|
||||
tim = gtk_clist_get_row_data (exception_list, i);
|
||||
g_assert (tim != NULL);
|
||||
*cdt->value = icaltime_from_timet (*tim, FALSE);
|
||||
|
||||
list = g_slist_prepend (list, cdt);
|
||||
@ -3119,11 +3131,17 @@ append_exception (EventEditor *ee, time_t t)
|
||||
|
||||
clist = GTK_CLIST (priv->recurrence_exception_list);
|
||||
|
||||
gtk_signal_handler_block_by_data (GTK_OBJECT (clist), ee);
|
||||
|
||||
c[0] = get_exception_string (t);
|
||||
i = e_utf8_gtk_clist_append (clist, c);
|
||||
|
||||
gtk_clist_set_row_data (clist, i, tt);
|
||||
|
||||
gtk_clist_select_row (clist, i, 0);
|
||||
gtk_signal_handler_unblock_by_data (GTK_OBJECT (clist), ee);
|
||||
|
||||
e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_exception_date), t);
|
||||
|
||||
gtk_widget_set_sensitive (priv->recurrence_exception_modify, TRUE);
|
||||
gtk_widget_set_sensitive (priv->recurrence_exception_delete, TRUE);
|
||||
@ -3179,6 +3197,7 @@ recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee)
|
||||
EventEditorPrivate *priv;
|
||||
GtkCList *clist;
|
||||
int sel;
|
||||
time_t *t;
|
||||
|
||||
priv = ee->priv;
|
||||
|
||||
@ -3190,7 +3209,9 @@ recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee)
|
||||
|
||||
sel = GPOINTER_TO_INT (clist->selection->data);
|
||||
|
||||
g_free (gtk_clist_get_row_data (clist, sel)); /* free the time_t stored there */
|
||||
t = gtk_clist_get_row_data (clist, sel);
|
||||
g_assert (t != NULL);
|
||||
g_free (t);
|
||||
|
||||
gtk_clist_remove (clist, sel);
|
||||
if (sel >= clist->rows)
|
||||
@ -3206,6 +3227,25 @@ recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee)
|
||||
preview_recur (ee);
|
||||
}
|
||||
|
||||
/* Callback used when a row is selected in the list of exception dates. We must
|
||||
* update the date/time widgets to reflect the exception's value.
|
||||
*/
|
||||
static void
|
||||
recurrence_exception_select_row_cb (GtkCList *clist, gint row, gint col, GdkEvent *event,
|
||||
gpointer data)
|
||||
{
|
||||
EventEditor *ee;
|
||||
EventEditorPrivate *priv;
|
||||
time_t *t;
|
||||
|
||||
ee = EVENT_EDITOR (data);
|
||||
priv = ee->priv;
|
||||
|
||||
t = gtk_clist_get_row_data (clist, row);
|
||||
g_assert (t != NULL);
|
||||
|
||||
e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_exception_date), *t);
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
make_date_edit (void)
|
||||
|
||||
Reference in New Issue
Block a user