aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/e-itip-control.c137
-rw-r--r--calendar/gui/e-itip-control.glade311
3 files changed, 440 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ded6e7dddd..81554efd26 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-12 Jesse Pavel <jpavel@helixcode.com>
+
+ * gui/e-itip-control.{c,glade}: Made the control much more
+ relavent to the function at hand.
+
2000-10-12 Damon Chaplin <damon@helixcode.com>
* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 670cfed67f..463941e6c2 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -14,12 +14,14 @@
#include <glade/glade.h>
#include <icaltypes.h>
#include <ical.h>
+#include <time.h>
#include "e-itip-control.h"
+#include <cal-util/cal-component.h>
-#define DEFAULT_WIDTH 300
-#define DEFAULT_HEIGHT 200
+#define DEFAULT_WIDTH 500
+#define DEFAULT_HEIGHT 400
typedef struct _EItipControlPrivate EItipControlPrivate;
@@ -28,11 +30,28 @@ struct _EItipControlPrivate {
GladeXML *xml;
GtkWidget *main_frame;
GtkWidget *text_box;
+ GtkWidget *organizer_entry, *dtstart_label, *dtend_label;
+ GtkWidget *summary_entry, *description_box;
- icalcomponent *main_comp;
+ icalcomponent *main_comp, *comp;
+ CalComponent *cal_comp;
};
+#if 0
+static icalparameter *
+get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)
+{
+ icalparameter *param;
+
+ for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);
+ param != NULL && icalparameter_isa (param) != kind;
+ param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );
+
+ return param;
+}
+#endif
+
static void
itip_control_destroy_cb (GtkObject *object,
gpointer data)
@@ -40,6 +59,10 @@ itip_control_destroy_cb (GtkObject *object,
EItipControlPrivate *priv = data;
gtk_object_unref (GTK_OBJECT (priv->xml));
+ if (priv->main_comp != NULL) {
+ icalcomponent_free (priv->main_comp);
+ }
+
g_free (priv);
}
@@ -111,7 +134,7 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
{
EItipControlPrivate *priv = data;
gchar *vcalendar;
- gint pos, length;
+ gint pos, length, length2;
if (type && g_strcasecmp (type, "text/calendar") != 0 &&
g_strcasecmp (type, "text/x-calendar") != 0) {
@@ -129,9 +152,106 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
/* Do something with the data, here. */
pos = 0;
length = strlen (vcalendar);
+ length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1));
+
+
+ if (length2 > 0)
+ gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length2);
+
+ gtk_editable_insert_text (GTK_EDITABLE (priv->text_box),
+ vcalendar,
+ length,
+ &pos);
+
+ priv->main_comp = icalparser_parse_string (vcalendar);
+ if (priv->main_comp == NULL) {
+ g_printerr ("e-itip-control.c: the iCalendar data was invalid!\n");
+ return;
+ }
+
+ priv->comp = icalcomponent_get_first_component (priv->main_comp,
+ ICAL_ANY_COMPONENT);
+ if (priv->comp == NULL) {
+ g_printerr ("e-itip-control.c: I could not extract a proper component from\n"
+ " the vCalendar data.\n");
+ icalcomponent_free (priv->main_comp);
+ return;
+ }
+
+#if 0
+ priv->cal_comp = cal_component_new ();
+ if (cal_component_set_icalcomponent (priv->cal_comp, priv->comp) == FALSE)) {
+ gtk_object_destroy (GTK_OBJECT (priv->cal_comp));
+ icalcomponent_free (main_comp);
+ }
+#endif
+
+ /* Okay, good then; now I will pick apart the CalComponent to get
+ all the things I'll show in my control. */
+ {
+ icalproperty *prop;
+ gchar *new_text;
+ gchar *organizer, *description, *summary;
+ struct icaltimetype dtstart, dtend;
+ time_t tstart, tend;
+
+ prop = icalcomponent_get_first_property (priv->comp, ICAL_ORGANIZER_PROPERTY);
+ if (prop) {
+ organizer = icalproperty_get_organizer (prop);
+
+ /* Here I strip off the "MAILTO:" if it is present. */
+ new_text = strchr (organizer, ':');
+ if (new_text != NULL)
+ new_text++;
+ else
+ new_text = organizer;
+
+ gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), new_text);
+ }
+
+ prop = icalcomponent_get_first_property (priv->comp, ICAL_SUMMARY_PROPERTY);
+ if (prop) {
+ summary = icalproperty_get_summary (prop);
+ gtk_entry_set_text (GTK_ENTRY (priv->summary_entry), summary);
+ }
+
+ prop = icalcomponent_get_first_property (priv->comp, ICAL_DESCRIPTION_PROPERTY);
+ if (prop) {
+ description = icalproperty_get_summary (prop);
+
+ pos = 0;
+ length = strlen (description);
+ length2 = strlen (gtk_editable_get_chars
+ (GTK_EDITABLE (priv->description_box), 0, -1));
+
+ if (length2 > 0)
+ gtk_editable_delete_text (GTK_EDITABLE (priv->description_box), 0, length2);
+
+ gtk_editable_insert_text (GTK_EDITABLE (priv->description_box),
+ description,
+ length,
+ &pos);
+ }
+
+ prop = icalcomponent_get_first_property (priv->comp, ICAL_DTSTART_PROPERTY);
+ dtstart = icalproperty_get_dtstart (prop);
+ prop = icalcomponent_get_first_property (priv->comp, ICAL_DTEND_PROPERTY);
+ dtend = icalproperty_get_dtend (prop);
+
+ tstart = icaltime_as_timet (dtstart);
+ tend = icaltime_as_timet (dtend);
+
+ gtk_label_set_text (GTK_LABEL (priv->dtstart_label), ctime (&tstart));
+ gtk_label_set_text (GTK_LABEL (priv->dtend_label), ctime (&tend));
+ }
+
+ pos = 0;
+ length = strlen (vcalendar);
+ length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1));
+
- if (length > 0)
- gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length);
+ if (length2 > 0)
+ gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length2);
gtk_editable_insert_text (GTK_EDITABLE (priv->text_box),
vcalendar,
@@ -203,6 +323,11 @@ e_itip_control_factory (BonoboGenericFactory *Factory, void *closure)
/* Create the control. */
priv->main_frame = glade_xml_get_widget (priv->xml, "main_frame");
priv->text_box = glade_xml_get_widget (priv->xml, "text_box");
+ priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
+ priv->dtstart_label = glade_xml_get_widget (priv->xml, "dtstart_label");
+ priv->dtend_label = glade_xml_get_widget (priv->xml, "dtend_label");
+ priv->summary_entry = glade_xml_get_widget (priv->xml, "summary_entry");
+ priv->description_box = glade_xml_get_widget (priv->xml, "description_box");
gtk_text_set_editable (GTK_TEXT (priv->text_box), FALSE);
gtk_signal_connect (GTK_OBJECT (priv->main_frame), "destroy",
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
index 4f40977c90..7fc075b943 100644
--- a/calendar/gui/e-itip-control.glade
+++ b/calendar/gui/e-itip-control.glade
@@ -28,7 +28,7 @@
<class>GtkFrame</class>
<name>main_frame</name>
<border_width>4</border_width>
- <label>Testing iTip control</label>
+ <label>Test iTip control</label>
<label_xalign>0.11</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
@@ -36,16 +36,313 @@
<class>GtkScrolledWindow</class>
<name>scrolledwindow1</name>
<hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
- <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
+ <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
- <class>GtkText</class>
- <name>text_box</name>
- <can_focus>True</can_focus>
- <editable>False</editable>
- <text></text>
+ <class>GtkViewport</class>
+ <name>viewport1</name>
+ <shadow_type>GTK_SHADOW_IN</shadow_type>
+
+ <widget>
+ <class>GtkVBox</class>
+ <name>vbox1</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
+
+ <widget>
+ <class>GtkTable</class>
+ <name>table1</name>
+ <rows>4</rows>
+ <columns>2</columns>
+ <homogeneous>False</homogeneous>
+ <row_spacing>0</row_spacing>
+ <column_spacing>9</column_spacing>
+ <child>
+ <padding>6</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
+
+ <widget>
+ <class>GtkEntry</class>
+ <name>organizer_entry</name>
+ <can_focus>True</can_focus>
+ <editable>False</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkEntry</class>
+ <name>summary_entry</name>
+ <can_focus>True</can_focus>
+ <editable>True</editable>
+ <text_visible>True</text_visible>
+ <text_max_length>0</text_max_length>
+ <text></text>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>False</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkScrolledWindow</class>
+ <name>scrolledwindow2</name>
+ <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+ <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+ <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+ <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+
+ <widget>
+ <class>GtkText</class>
+ <name>description_box</name>
+ <can_focus>True</can_focus>
+ <editable>False</editable>
+ <text></text>
+ </widget>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label7</name>
+ <label>Date:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label6</name>
+ <label>Organizer:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>0</top_attach>
+ <bottom_attach>1</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label8</name>
+ <label>Summary:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>2</top_attach>
+ <bottom_attach>3</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label9</name>
+ <label>Description:</label>
+ <justify>GTK_JUSTIFY_RIGHT</justify>
+ <wrap>False</wrap>
+ <xalign>1</xalign>
+ <yalign>0</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <left_attach>0</left_attach>
+ <right_attach>1</right_attach>
+ <top_attach>3</top_attach>
+ <bottom_attach>4</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>False</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkAlignment</class>
+ <name>alignment1</name>
+ <xalign>0</xalign>
+ <yalign>0</yalign>
+ <xscale>1</xscale>
+ <yscale>1</yscale>
+ <child>
+ <left_attach>1</left_attach>
+ <right_attach>2</right_attach>
+ <top_attach>1</top_attach>
+ <bottom_attach>2</bottom_attach>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <xexpand>True</xexpand>
+ <yexpand>False</yexpand>
+ <xshrink>False</xshrink>
+ <yshrink>False</yshrink>
+ <xfill>True</xfill>
+ <yfill>True</yfill>
+ </child>
+
+ <widget>
+ <class>GtkHBox</class>
+ <name>hbox1</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>dtstart_label</name>
+ <label>date-start</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label3</name>
+ <label>to</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>19</xpad>
+ <ypad>0</ypad>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>dtend_label</name>
+ <label>date-end</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+ </widget>
+ </widget>
+ </widget>
+
+ <widget>
+ <class>GtkText</class>
+ <name>text_box</name>
+ <can_focus>True</can_focus>
+ <editable>False</editable>
+ <text></text>
+ <child>
+ <padding>0</padding>
+ <expand>True</expand>
+ <fill>True</fill>
+ </child>
+ </widget>
+ </widget>
</widget>
</widget>
</widget>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:19:01 +0800