added entry for the LOCATION field
2001-12-05 Rodrigo Moya <rodrigo@ximian.com> * gui/dialogs/event-page.glade: added entry for the LOCATION field * gui/dialogs/event-page.c: added support for the new LOCATION entry added in the Event editor. svn path=/trunk/; revision=14901
This commit is contained in:
Rodrigo Moya
committed by
Rodrigo Moya
Rodrigo Moya
parent
b07d0414a2
commit
2c6ca58b20
@ -1,3 +1,10 @@
|
||||
2001-12-05 Rodrigo Moya <rodrigo@ximian.com>
|
||||
|
||||
* gui/dialogs/event-page.glade: added entry for the LOCATION field
|
||||
|
||||
* gui/dialogs/event-page.c: added support for the new LOCATION entry
|
||||
added in the Event editor.
|
||||
|
||||
2001-12-05 Zbigniew Chyla <cyba@gnome.pl>
|
||||
|
||||
* gui/itip-utils.c (comp_subject, comp_description):
|
||||
|
||||
@ -51,6 +51,7 @@ struct _EventPagePrivate {
|
||||
GtkWidget *main;
|
||||
|
||||
GtkWidget *summary;
|
||||
GtkWidget *location;
|
||||
|
||||
GtkWidget *start_time;
|
||||
GtkWidget *end_time;
|
||||
@ -170,6 +171,7 @@ event_page_init (EventPage *epage)
|
||||
|
||||
priv->main = NULL;
|
||||
priv->summary = NULL;
|
||||
priv->location = NULL;
|
||||
priv->start_time = NULL;
|
||||
priv->end_time = NULL;
|
||||
priv->start_timezone = NULL;
|
||||
@ -403,6 +405,7 @@ clear_widgets (EventPage *epage)
|
||||
|
||||
/* Summary, description */
|
||||
e_dialog_editable_set (priv->summary, NULL);
|
||||
e_dialog_editable_set (priv->location, NULL);
|
||||
e_dialog_editable_set (priv->description, NULL);
|
||||
|
||||
/* Start and end times */
|
||||
@ -465,6 +468,7 @@ event_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
|
||||
CalComponentClassification cl;
|
||||
CalComponentTransparency transparency;
|
||||
CalComponentDateTime start_date, end_date;
|
||||
const char *location;
|
||||
const char *categories;
|
||||
GSList *l;
|
||||
|
||||
@ -479,11 +483,14 @@ event_page_fill_widgets (CompEditorPage *page, CalComponent *comp)
|
||||
/* Clean the page */
|
||||
clear_widgets (epage);
|
||||
|
||||
/* Summary, description(s) */
|
||||
/* Summary, location, description(s) */
|
||||
|
||||
cal_component_get_summary (comp, &text);
|
||||
e_dialog_editable_set (priv->summary, text.value);
|
||||
|
||||
cal_component_get_location (comp, &location);
|
||||
e_dialog_editable_set (priv->location, location);
|
||||
|
||||
cal_component_get_description_list (comp, &l);
|
||||
if (l) {
|
||||
text = *(CalComponentText *)l->data;
|
||||
@ -597,6 +604,17 @@ event_page_fill_component (CompEditorPage *page, CalComponent *comp)
|
||||
cal_component_set_summary (comp, &text);
|
||||
}
|
||||
|
||||
if (str)
|
||||
g_free (str);
|
||||
|
||||
/* Location */
|
||||
|
||||
str = e_dialog_editable_get (priv->location);
|
||||
if (!str || strlen (str) == 0)
|
||||
cal_component_set_location (comp, NULL);
|
||||
else
|
||||
cal_component_set_location (comp, str);
|
||||
|
||||
if (str)
|
||||
g_free (str);
|
||||
|
||||
@ -747,6 +765,7 @@ get_widgets (EventPage *epage)
|
||||
gtk_widget_unparent (priv->main);
|
||||
|
||||
priv->summary = GW ("general-summary");
|
||||
priv->location = GW ("location");
|
||||
|
||||
priv->start_time = GW ("start-time");
|
||||
priv->end_time = GW ("end-time");
|
||||
@ -772,6 +791,7 @@ get_widgets (EventPage *epage)
|
||||
#undef GW
|
||||
|
||||
return (priv->summary
|
||||
&& priv->location
|
||||
&& priv->start_time
|
||||
&& priv->end_time
|
||||
&& priv->start_timezone
|
||||
@ -1284,6 +1304,8 @@ init_widgets (EventPage *epage)
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (priv->summary), "changed",
|
||||
GTK_SIGNAL_FUNC (field_changed_cb), epage);
|
||||
gtk_signal_connect (GTK_OBJECT (priv->location), "changed",
|
||||
GTK_SIGNAL_FUNC (field_changed_cb), epage);
|
||||
gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed",
|
||||
GTK_SIGNAL_FUNC (field_changed_cb), epage);
|
||||
gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed",
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
<widget>
|
||||
<class>GtkTable</class>
|
||||
<name>table11</name>
|
||||
<rows>1</rows>
|
||||
<rows>2</rows>
|
||||
<columns>2</columns>
|
||||
<homogeneous>False</homogeneous>
|
||||
<row_spacing>4</row_spacing>
|
||||
@ -98,6 +98,57 @@
|
||||
<yfill>False</yfill>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget>
|
||||
<class>GtkLabel</class>
|
||||
<name>label61</name>
|
||||
<label>L_ocation:</label>
|
||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||
<wrap>False</wrap>
|
||||
<xalign>7.45058e-09</xalign>
|
||||
<yalign>0.5</yalign>
|
||||
<xpad>0</xpad>
|
||||
<ypad>0</ypad>
|
||||
<default_focus_target>location</default_focus_target>
|
||||
<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>False</yfill>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget>
|
||||
<class>GtkEntry</class>
|
||||
<name>location</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>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>False</yfill>
|
||||
</child>
|
||||
</widget>
|
||||
</widget>
|
||||
|
||||
<widget>
|
||||
|
||||
Reference in New Issue
Block a user