aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Pavel <jpavel@src.gnome.org>2000-10-20 06:52:59 +0800
committerJesse Pavel <jpavel@src.gnome.org>2000-10-20 06:52:59 +0800
commit9dd3248b61831d6530fb61dfde4b277d3820e7ed (patch)
treeb7061f91ead0c27fb1853a22e9e329897c886458
parent260d58ea7515ae6f3b7c3abe3c40680b6ad7dd84 (diff)
downloadgsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.tar
gsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.tar.gz
gsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.tar.bz2
gsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.tar.lz
gsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.tar.xz
gsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.tar.zst
gsoc2013-evolution-9dd3248b61831d6530fb61dfde4b277d3820e7ed.zip
*** empty log message ***
svn path=/trunk/; revision=6062
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/gui/Makefile.am3
-rw-r--r--calendar/gui/e-itip-control.glade2
-rw-r--r--calendar/gui/e-meeting-edit.c90
4 files changed, 100 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a222fbcc0f..78e0b26619 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -3,6 +3,16 @@
* gui/event-editor.[ch]: added a public function which causes the
event editor to reload its widgets to the associated CalComponent.
+ * gui/e-meeting-edit.c: added rudimentary support for the phat
+ e-meeting-time-selector widget, though it has no effect on the
+ component yet.
+
+ * gui/Makefile.am: the meeting editor depends on the meeting widget
+ library, now.
+
+ * gui/e-itip-control.glade: I added another toolbar button that summons
+ from the hoary deep the meeting time widget.
+
2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
* gui/Makefile.am: Add `event-editor-dialog.glade.h'.
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index cf9c385aa2..d886346abb 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -30,7 +30,8 @@ LINK_FLAGS = \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical.a
+ $(top_builddir)/libical/src/libical/libical.a \
+ $(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a
gladedir = $(datadir)/evolution/glade
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
index 8a683f72aa..e17d20190e 100644
--- a/calendar/gui/e-itip-control.glade
+++ b/calendar/gui/e-itip-control.glade
@@ -93,7 +93,7 @@
<class>GtkEntry</class>
<name>summary_entry</name>
<can_focus>True</can_focus>
- <editable>True</editable>
+ <editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index 6ae266174d..06fc070204 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -24,6 +24,7 @@
#include <glade/glade.h>
#include <icaltypes.h>
#include <ical.h>
+#include <widgets/meeting-time-sel/e-meeting-time-sel.h>
#include "e-meeting-edit.h"
#define E_MEETING_GLADE_XML "e-meeting-dialog.glade"
@@ -41,6 +42,7 @@ struct _EMeetingEditorPrivate {
GtkWidget *organizer_entry;
GtkWidget *role_entry;
GtkWidget *rsvp_check;
+ GtkWidget *schedule_button;
gint changed_signal_id;
@@ -362,6 +364,81 @@ edit_attendee (icalproperty *prop, gpointer data)
return retval;
}
+static void
+schedule_button_clicked_cb (GtkWidget *widget, gpointer data)
+{
+ EMeetingEditorPrivate *priv;
+
+ EMeetingTimeSelector *mts;
+ EMeetingTimeSelectorAttendeeType type;
+ GtkWidget *dialog;
+ gchar *attendee;
+ gint cntr, row;
+ icalproperty *prop;
+ icalparameter *param;
+ gint button_num;
+
+ priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
+
+
+ gtk_widget_push_visual (gdk_imlib_get_visual ());
+ gtk_widget_push_colormap (gdk_imlib_get_colormap ());
+
+ dialog = gnome_dialog_new ("Schedule Meeting", "Set Time", "Cancel", NULL);
+
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
+ gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
+
+ mts = (EMeetingTimeSelector *)e_meeting_time_selector_new ();
+ gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (dialog)->vbox), GTK_WIDGET (mts));
+ gtk_window_add_accel_group (GTK_WINDOW (dialog),
+ E_MEETING_TIME_SELECTOR (mts)->accel_group);
+ gtk_widget_show (GTK_WIDGET (mts));
+
+ gtk_widget_pop_visual ();
+ gtk_widget_pop_colormap ();
+
+
+ /* Let's stick all the attendees that we have in our clist, into the
+ meeting time widget. */
+ for (cntr = 0; cntr < priv->numentries; cntr++ ) {
+ gtk_clist_get_text (GTK_CLIST (priv->attendee_list), cntr,
+ ADDRESS_COL, &attendee);
+ row = e_meeting_time_selector_attendee_add (mts, attendee, NULL);
+
+ prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list), cntr);
+ param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
+
+ switch (icalparameter_get_role (param)) {
+ case ICAL_ROLE_CHAIR:
+ case ICAL_ROLE_REQPARTICIPANT:
+ type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;
+ break;
+ default:
+ type = E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON;
+ }
+
+ e_meeting_time_selector_attendee_set_type (mts, row, type);
+ }
+
+ /* I don't want the meeting widget to be destroyed before I can
+ extract information from it; so now the dialog window will just
+ be hidden when the user clicks a button or closes it. */
+ gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);
+
+ gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);
+
+ button_num = gnome_dialog_run (GNOME_DIALOG (dialog));
+
+ if (button_num == 0) {
+ /* The user clicked "Set Time". */
+ }
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+
+ return;
+}
+
static void
add_button_clicked_cb (GtkWidget *widget, gpointer data)
@@ -442,8 +519,8 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data)
}
else {
icalproperty *prop, *new_prop;
- icalparameter *param, *new_param;
- icalvalue *value, *new_value;
+ icalparameter *param;
+ icalvalue *value;
prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
priv->selected_row);
@@ -460,12 +537,15 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data)
icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
+ icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
+#if 0
+ /* This was used when I was debugging libical. */
param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
if (param != NULL)
g_print ("e-meeting-edit.c: param should be NULL, but it isn't.\n");
+#endif
- icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_ROLE_PARAMETER));
g_assert (param != NULL);
@@ -574,6 +654,7 @@ e_meeting_edit (EMeetingEditor *editor)
priv->attendee_list = glade_xml_get_widget (priv->xml, "attendee_list");
priv->role_entry = glade_xml_get_widget (priv->xml, "role_entry");
priv->rsvp_check = glade_xml_get_widget (priv->xml, "rsvp_check");
+ priv->schedule_button = glade_xml_get_widget (priv->xml, "schedule_button");
gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), ROLE_COL, GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), RSVP_COL, GTK_JUSTIFY_CENTER);
@@ -590,6 +671,9 @@ e_meeting_edit (EMeetingEditor *editor)
gtk_signal_connect (GTK_OBJECT (priv->attendee_list), "select_row",
GTK_SIGNAL_FUNC (list_row_select_cb), editor);
+
+ gtk_signal_connect (GTK_OBJECT (priv->schedule_button), "clicked",
+ GTK_SIGNAL_FUNC (schedule_button_clicked_cb), editor);
add_button = glade_xml_get_widget (priv->xml, "add_button");
delete_button = glade_xml_get_widget (priv->xml, "delete_button");