From 452dc1600d0a6ae63474220e3ce74664058ece5c Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Sat, 22 Jul 2006 10:17:18 +0000 Subject: Added support Gw notes. svn path=/trunk/; revision=32378 --- calendar/gui/dialogs/comp-editor-page.h | 1 + calendar/gui/dialogs/comp-editor.h | 1 + calendar/gui/dialogs/memo-editor.c | 14 +- calendar/gui/dialogs/memo-editor.h | 2 +- calendar/gui/dialogs/memo-page.c | 450 +++++++++++++++++++++++++++++++- calendar/gui/dialogs/memo-page.glade | 235 ++++++++++++++++- calendar/gui/dialogs/memo-page.h | 2 +- 7 files changed, 681 insertions(+), 24 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index a5ddb03e89..b7a10222cd 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -49,6 +49,7 @@ typedef enum { COMP_EDITOR_PAGE_DELEGATE = 1<<2, COMP_EDITOR_PAGE_USER_ORG = 1<<3, COMP_EDITOR_PAGE_IS_ASSIGNED = 1<<4, + COMP_EDITOR_PAGE_IS_SHARED = 1<<5 } CompEditorPageFlags; typedef struct { diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 1c11e1540c..fdf811aedc 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -65,6 +65,7 @@ typedef enum { COMP_EDITOR_DELEGATE = 1<<2, COMP_EDITOR_USER_ORG = 1<<3, COMP_EDITOR_IS_ASSIGNED = 1<<4, + COMP_EDITOR_IS_SHARED = 1 << 5 } CompEditorFlags; GtkType comp_editor_get_type (void); diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index 27babe97fe..2c6356988d 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -208,10 +208,11 @@ memo_editor_construct (MemoEditor *me, ECal *client) MemoEditorPrivate *priv; CompEditor *editor = COMP_EDITOR (me); gboolean read_only = FALSE; + guint32 flags = comp_editor_get_flags (editor); priv = me->priv; - priv->memo_page = memo_page_new (editor->uic); + priv->memo_page = memo_page_new (editor->uic, flags); g_object_ref (priv->memo_page); gtk_object_sink (GTK_OBJECT (priv->memo_page)); comp_editor_append_page (COMP_EDITOR (me), @@ -225,6 +226,8 @@ memo_editor_construct (MemoEditor *me, ECal *client) bonobo_ui_component_set_prop (editor->uic, "/Toolbar/ecal3", "hidden", "1", NULL); comp_editor_set_e_cal (COMP_EDITOR (me), client); + + init_widgets (me); @@ -241,6 +244,12 @@ memo_editor_set_e_cal (CompEditor *editor, ECal *client) static void memo_editor_edit_comp (CompEditor *editor, ECalComponent *comp) { + CompEditorFlags flags = comp_editor_get_flags (editor); + ECal *client = comp_editor_get_e_cal (editor); + + if (flags & COMP_EDITOR_IS_SHARED) + comp_editor_set_needs_send (editor, itip_organizer_is_user (comp, client)); + if (COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp) COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp (editor, comp); } @@ -289,11 +298,12 @@ memo_editor_finalize (GObject *object) * editor could not be created. **/ MemoEditor * -memo_editor_new (ECal *client) +memo_editor_new (ECal *client, CompEditorFlags flags) { MemoEditor *me; me = g_object_new (TYPE_MEMO_EDITOR, NULL); + comp_editor_set_flags (COMP_EDITOR (me), flags); return memo_editor_construct (me, client); } diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h index 79c86e9d4e..b5a76a0b88 100644 --- a/calendar/gui/dialogs/memo-editor.h +++ b/calendar/gui/dialogs/memo-editor.h @@ -53,7 +53,7 @@ struct _MemoEditorClass { GtkType memo_editor_get_type (void); MemoEditor *memo_editor_construct (MemoEditor *te, ECal *client); -MemoEditor *memo_editor_new (ECal *client); +MemoEditor *memo_editor_new (ECal *client, CompEditorFlags flags); #endif /* __MEMO_EDITOR_H__ */ diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 4fa478238f..42850b60b3 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -36,10 +36,14 @@ #include #include #include +#include +#include +#include #include #include "common/authentication.h" #include "e-util/e-dialog-widgets.h" +#include #include "e-util/e-categories-config.h" #include "e-util/e-util-private.h" #include "../calendar-config.h" @@ -59,16 +63,39 @@ struct _MemoPagePrivate { GtkWidget *memo_content; + EAccountList *accounts; + /* Bonobo Controller for the menu/toolbar */ BonoboUIComponent *uic; ECalComponentClassification classification; + /* Organizer */ + GtkWidget *org_label; + GtkWidget *org_combo; + + /* To field */ + GtkWidget *to_button; + GtkWidget *to_hbox; + GtkWidget *to_entry; + + /* Summary */ + GtkWidget *summary_label; + GtkWidget *summary_entry; + + /* Start date */ + GtkWidget *start_label; + GtkWidget *start_date; + GtkWidget *categories_btn; GtkWidget *categories; GtkWidget *source_selector; + char *default_address; + + ENameSelector *name_selector; + gboolean updating; }; @@ -137,7 +164,6 @@ memo_page_init (MemoPage *mpage) priv->categories = NULL; priv->updating = FALSE; - } /* Destroy handler for the memo page */ @@ -161,6 +187,11 @@ memo_page_finalize (GObject *object) priv->xml = NULL; } + if (priv->default_address) { + g_free (priv->default_address); + priv->default_address = NULL; + } + g_free (priv); mpage->priv = NULL; @@ -215,7 +246,7 @@ memo_page_focus_main_widget (CompEditorPage *page) mpage = MEMO_PAGE (page); priv = mpage->priv; - gtk_widget_grab_focus (priv->memo_content); + gtk_widget_grab_focus (priv->summary_entry); } /* Fills the widgets with default values */ @@ -226,6 +257,9 @@ clear_widgets (MemoPage *mpage) priv = mpage->priv; + /* Summary */ + e_dialog_editable_set (priv->summary_entry, NULL); + /* memo content */ gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->memo_content)), "", 0); @@ -235,6 +269,9 @@ clear_widgets (MemoPage *mpage) /* Categories */ e_dialog_editable_set (priv->categories, NULL); + + if (priv->default_address) + gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry), priv->default_address); } void @@ -254,7 +291,7 @@ sensitize_widgets (MemoPage *mpage) if (!e_cal_is_read_only (COMP_EDITOR_PAGE (mpage)->client, &read_only, NULL)) read_only = TRUE; - if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_IS_ASSIGNED) + if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_IS_SHARED) sens = COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_PAGE_USER_ORG; sensitize = (!read_only && sens); @@ -264,9 +301,20 @@ sensitize_widgets (MemoPage *mpage) if (!e_cal_is_read_only (COMP_EDITOR_PAGE (mpage)->client, &read_only, NULL)) read_only = TRUE; - gtk_widget_set_sensitive (priv->memo_content, !read_only); + gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->memo_content), sensitize); + gtk_widget_set_sensitive (priv->start_date, sensitize); gtk_widget_set_sensitive (priv->categories_btn, !read_only); gtk_entry_set_editable (GTK_ENTRY (priv->categories), !read_only); + gtk_entry_set_editable (GTK_ENTRY (priv->summary_entry), sensitize); + + if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_IS_SHARED) { + gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry), sensitize); + + if (priv->to_entry) { + gtk_entry_set_editable (GTK_ENTRY (priv->to_entry), !read_only); + gtk_widget_grab_focus (priv->to_entry); + } + } bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassPublic", "sensitive", sensitize ? "1" : "0" , NULL); @@ -274,7 +322,7 @@ sensitize_widgets (MemoPage *mpage) , NULL); bonobo_ui_component_set_prop (priv->uic, "/commands/ActionClassConfidential", "sensitive", sensitize ? "1" : "0", NULL); - bonobo_ui_component_set_prop (priv->uic, "/commands/ViewCategories", "sensitive", sensitize ? "1" : "0" + bonobo_ui_component_set_prop (priv->uic, "/commands/InsertAttachments", "sensitive", sensitize ? "1" : "0" , NULL); } @@ -285,6 +333,8 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) MemoPage *mpage; MemoPagePrivate *priv; ECalComponentClassification cl; + ECalComponentText text; + ECalComponentDateTime d; GSList *l; const char *categories; ESource *source; @@ -297,6 +347,10 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) /* Clean the screen */ clear_widgets (mpage); + /* Summary */ + e_cal_component_get_summary (comp, &text); + e_dialog_editable_set (priv->summary_entry, text.value); + e_cal_component_get_description_list (comp, &l); if (l && l->data) { ECalComponentText *dtext; @@ -310,6 +364,16 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) } e_cal_component_free_text_list (l); + /* Start Date. */ + e_cal_component_get_dtstart (comp, &d); + if (d.value) { + struct icaltimetype *start_tt = d.value; + e_date_edit_set_date (E_DATE_EDIT (priv->start_date), + start_tt->year, start_tt->month, + start_tt->day); + } else if (!(page->flags & COMP_EDITOR_PAGE_NEW_ITEM)) + e_date_edit_set_time (E_DATE_EDIT (priv->start_date), -1); + /* Classification. */ e_cal_component_get_classification (comp, &cl); @@ -340,6 +404,31 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) e_cal_component_get_categories (comp, &categories); e_dialog_editable_set (priv->categories, categories); + if (e_cal_component_has_organizer (comp)) { + ECalComponentOrganizer organizer; + + e_cal_component_get_organizer (comp, &organizer); + if (organizer.value != NULL) { + const gchar *strip = itip_strip_mailto (organizer.value); + gchar *string; + GList *list = NULL; + + if ( organizer.cn != NULL) + string = g_strdup_printf ("%s <%s>", organizer.cn, strip); + else + string = g_strdup (strip); + + if (itip_organizer_is_user (comp, page->client)) { + } else { + list = g_list_append (list, string); + gtk_combo_set_popdown_strings (GTK_COMBO (priv->org_combo), list); + gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry), FALSE); + } + g_free (string); + g_list_free (list); + } + } + /* Source */ source = e_cal_get_source (page->client); e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); @@ -351,12 +440,162 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) return TRUE; } +static gboolean +fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) +{ + EDestinationStore *destination_store; + GString *str = NULL; + GList *l, *destinations; + ENameSelectorModel *name_selector_model = e_name_selector_peek_model (name_selector); + icalcomponent *icalcomp; + icalproperty *icalprop; + + e_name_selector_model_peek_section (name_selector_model, "To", + NULL, &destination_store); + + destinations = e_destination_store_list_destinations (destination_store); + for (l = destinations; l; l = g_list_next (l)) { + EDestination *destination = l->data, *des = NULL; + const GList *list_dests = NULL, *l; + GList card_dest; + + if (e_destination_is_evolution_list (destination)) { + list_dests = e_destination_list_get_dests (destination); + } else { + EContact *contact = e_destination_get_contact (destination); + /* check if the contact is contact list which is not expanded yet */ + /* we expand it by getting the list again from the server forming the query */ + if (contact && e_contact_get (contact , E_CONTACT_IS_LIST)) { + EBook *book = NULL; + ENameSelectorDialog *dialog; + EContactStore *c_store; + GList *books, *l; + char *uri = e_contact_get (contact, E_CONTACT_BOOK_URI); + + dialog = e_name_selector_peek_dialog (name_selector); + c_store = dialog->name_selector_model->contact_store; + books = e_contact_store_get_books (c_store); + + for (l = books; l; l = l->next) { + EBook *b = l->data; + if (g_str_equal (uri, e_book_get_uri (b))) { + book = b; + break; + } + } + + if (book) { + GList *contacts; + EContact *n_con = NULL; + char *qu; + EBookQuery *query; + + qu = g_strdup_printf ("(is \"full_name\" \"%s\")", + (char *) e_contact_get (contact, E_CONTACT_FULL_NAME)); + query = e_book_query_from_string (qu); + + if (!e_book_get_contacts (book, query, &contacts, NULL)) { + g_warning ("Could not get contact from the book \n"); + return; + } else { + des = e_destination_new (); + n_con = contacts->data; + + e_destination_set_contact (des, n_con, 0); + list_dests = e_destination_list_get_dests (des); + + g_list_foreach (contacts, (GFunc) g_object_unref, NULL); + g_list_free (contacts); + } + + e_book_query_unref (query); + g_free (qu); + } + } else { + card_dest.next = NULL; + card_dest.prev = NULL; + card_dest.data = destination; + list_dests = &card_dest; + } + } + + for (l = list_dests; l; l = l->next) { + EDestination *dest = l->data; + const char *name, *attendee = NULL; + + name = e_destination_get_name (dest); + + /* If we couldn't get the attendee prior, get the email address as the default */ + if (attendee == NULL || *attendee == '\0') { + attendee = e_destination_get_email (dest); + } + + if (attendee == NULL || *attendee == '\0') + continue; + + if (!str) { + str = g_string_new (""); + g_string_prepend (str, attendee); + continue; + } + g_string_prepend (str, ";"); + g_string_prepend (str, attendee); + } + } + + g_list_free (destinations); + + if (str && *str->str) { + icalcomp = e_cal_component_get_icalcomponent (comp); + icalprop = icalproperty_new_x (str->str); + icalproperty_set_x_name (icalprop, "X-EVOLUTION-RECIPIENTS"); + icalcomponent_add_property (icalcomp, icalprop); + + g_string_free (str, FALSE); + return TRUE; + } else + return FALSE; +} + +static EAccount * +get_current_account (MemoPage *page) +{ + MemoPagePrivate *priv; + EIterator *it; + const char *str; + + priv = page->priv; + + str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry)); + if (!str) + return NULL; + + for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { + EAccount *a = (EAccount *)e_iterator_get(it); + char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); + + if (!strcmp (full, str)) { + g_free (full); + g_object_unref (it); + + return a; + } + + g_free (full); + } + g_object_unref (it); + + return NULL; +} + /* fill_component handler for the memo page */ static gboolean memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) { MemoPage *mpage; MemoPagePrivate *priv; + ECalComponentDateTime start_date; + struct icaltimetype start_tt; char *cat, *str; int i; GtkTextBuffer *text_buffer; @@ -366,6 +605,24 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) priv = mpage->priv; text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->memo_content)); + /* Summary */ + str = e_dialog_editable_get (priv->summary_entry); + if (!str || strlen (str) == 0) + e_cal_component_set_summary (comp, NULL); + else { + ECalComponentText text; + + text.value = str; + text.altrep = NULL; + + e_cal_component_set_summary (comp, &text); + } + + if (str) { + g_free (str); + str = NULL; + } + /* Memo Content */ gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start); @@ -374,7 +631,6 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (!str || strlen (str) == 0){ e_cal_component_set_description_list (comp, NULL); - e_cal_component_set_summary(comp, NULL); } else { int idxToUse = -1, nstr = strlen(str); @@ -410,7 +666,6 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) l.data = &text; l.next = NULL; - e_cal_component_set_summary(comp, &sumText); e_cal_component_set_description_list (comp, &l); g_free(txt); @@ -419,6 +674,22 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (str) g_free (str); + /* Dates */ + start_tt = icaltime_null_time (); + start_tt.is_date = 1; + start_date.value = &start_tt; + start_date.tzid = NULL; + + if (!e_date_edit_date_is_valid (E_DATE_EDIT (priv->start_date))) { + comp_editor_page_display_validation_error (page, _("Start date is wrong"), priv->start_date); + return FALSE; + } + e_date_edit_get_date (E_DATE_EDIT (priv->start_date), + &start_tt.year, + &start_tt.month, + &start_tt.day); + e_cal_component_set_dtstart (comp, &start_date); + /* Classification. */ e_cal_component_set_classification (comp, priv->classification); @@ -433,6 +704,37 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (str) g_free (str); + if ((page->flags & COMP_EDITOR_PAGE_IS_SHARED) && fill_comp_with_recipients (priv->name_selector, comp)) { + ECalComponentOrganizer organizer = {NULL, NULL, NULL, NULL}; + + EAccount *a; + gchar *addr = NULL; + + /* Find the identity for the organizer or sentby field */ + a = get_current_account (mpage); + + /* Sanity Check */ + if (a == NULL) { + e_notice (page, GTK_MESSAGE_ERROR, + _("The organizer selected no longer has an account.")); + return FALSE; + } + + if (a->id->address == NULL || strlen (a->id->address) == 0) { + e_notice (page, GTK_MESSAGE_ERROR, + _("An organizer is required.")); + return FALSE; + } + + addr = g_strdup_printf ("MAILTO:%s", a->id->address); + + organizer.value = addr; + organizer.cn = a->id->name; + e_cal_component_set_organizer (comp, &organizer); + + g_free (addr); + } + return TRUE; } @@ -479,6 +781,18 @@ get_widgets (MemoPage *mpage) gtk_widget_ref (priv->main); gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main); + priv->org_label = GW ("org-label"); + priv->org_combo = GW ("org-combo"); + + priv->to_button = GW ("to-button"); + priv->to_hbox = GW ("to-hbox"); + + priv->summary_label = GW ("sum-label"); + priv->summary_entry = GW ("sum-entry"); + + priv->start_label = GW ("start-label"); + priv->start_date = GW ("start-date"); + priv->memo_content = GW ("memo_content"); priv->categories_btn = GW ("categories-button"); @@ -490,7 +804,8 @@ get_widgets (MemoPage *mpage) return (priv->memo_content && priv->categories_btn - && priv->categories); + && priv->categories + && priv->start_date); } /* Callback used when the categories button is clicked; we must bring up the @@ -584,6 +899,22 @@ widget_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data) return FALSE; } +static void +to_button_clicked_cb (GtkButton *button, gpointer data) +{ + MemoPage *page = data; + MemoPagePrivate *priv = page->priv; + ENameSelectorDialog *name_selector_dialog; + + name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector); + gtk_widget_show (GTK_WIDGET (name_selector_dialog)); +} + +static void +response_cb (ENameSelectorDialog *name_selector_dialog, gint response, gpointer user_data) +{ + gtk_widget_hide (GTK_WIDGET (name_selector_dialog)); +} /* Hooks the widget signals */ static gboolean @@ -621,12 +952,38 @@ init_widgets (MemoPage *mpage) g_signal_connect((priv->categories), "changed", G_CALLBACK (field_changed_cb), mpage); + + g_signal_connect((priv->summary_entry), "changed", + G_CALLBACK (field_changed_cb), mpage); + if (priv->name_selector) { + ENameSelectorDialog *name_selector_dialog; + + name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector); + + g_signal_connect (name_selector_dialog, "response", + G_CALLBACK (response_cb), mpage); + g_signal_connect ((priv->to_button), "clicked", G_CALLBACK (to_button_clicked_cb), mpage); + } + memo_page_set_show_categories (mpage, calendar_config_get_show_categories()); return TRUE; } +static GtkWidget * +get_to_entry (ENameSelector *name_selector) +{ + ENameSelectorModel *name_selector_model; + ENameSelectorEntry *name_selector_entry; + + name_selector_model = e_name_selector_peek_model (name_selector); + e_name_selector_model_add_section (name_selector_model, "To", _("To"), NULL); + name_selector_entry = (ENameSelectorEntry *)e_name_selector_peek_section_list (name_selector, "To"); + + return GTK_WIDGET (name_selector_entry); +} + /** * memo_page_construct: @@ -641,7 +998,13 @@ MemoPage * memo_page_construct (MemoPage *mpage) { MemoPagePrivate *priv; + char *backend_address = NULL; + EIterator *it; char *gladefile; + GList *address_strings = NULL, *l; + EAccount *def_account; + EAccount *a; + CompEditorPageFlags flags = COMP_EDITOR_PAGE (mpage)->flags; priv = mpage->priv; @@ -663,6 +1026,59 @@ memo_page_construct (MemoPage *mpage) return NULL; } + if (flags & COMP_EDITOR_PAGE_IS_SHARED) { + priv->accounts = itip_addresses_get (); + def_account = itip_addresses_get_default(); + for (it = e_list_get_iterator((EList *)priv->accounts); + e_iterator_is_valid(it); + e_iterator_next(it)) { + a = (EAccount *)e_iterator_get(it); + char *full; + + full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); + + address_strings = g_list_append(address_strings, full); + + /* Note that the address specified by the backend gets + * precedence over the default mail address. + */ + if (backend_address && !strcmp (backend_address, a->id->address)) { + if (priv->default_address) + g_free (priv->default_address); + + priv->default_address = g_strdup (full); + } else if (a == def_account && !priv->default_address) { + priv->default_address = g_strdup (full); + } + } + + if (backend_address) + g_free (backend_address); + + g_object_unref(it); + + if (address_strings) + gtk_combo_set_popdown_strings (GTK_COMBO (priv->org_combo), address_strings); + else + g_warning ("No potential organizers!"); + + for (l = address_strings; l != NULL; l = l->next) + g_free (l->data); + g_list_free (address_strings); + + gtk_widget_show (priv->org_label); + gtk_widget_show (priv->org_combo); + + if (flags & COMP_EDITOR_PAGE_NEW_ITEM) { + priv->name_selector = e_name_selector_new (); + priv->to_entry = get_to_entry (priv->name_selector); + gtk_container_add ((GtkContainer *)priv->to_hbox, priv->to_entry); + gtk_widget_show (priv->to_hbox); + gtk_widget_show (priv->to_entry); + gtk_widget_show (priv->to_button); + } + } + if (!init_widgets (mpage)) { g_message ("memo_page_construct(): " "Could not initialize the widgets!"); @@ -681,12 +1097,14 @@ memo_page_construct (MemoPage *mpage) * not be created. **/ MemoPage * -memo_page_new (BonoboUIComponent *uic) +memo_page_new (BonoboUIComponent *uic, CompEditorPageFlags flags) { MemoPage *mpage; mpage = gtk_type_new (TYPE_MEMO_PAGE); mpage->priv->uic = uic; + COMP_EDITOR_PAGE (mpage)->flags = flags; + if (!memo_page_construct (mpage)) { g_object_unref (mpage); return NULL; @@ -695,6 +1113,20 @@ memo_page_new (BonoboUIComponent *uic) return mpage; } +GtkWidget *memo_page_create_date_edit (void); + +GtkWidget * +memo_page_create_date_edit (void) +{ + GtkWidget *dedit; + + dedit = comp_editor_new_date_edit (TRUE, FALSE, TRUE); + e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE); + gtk_widget_show (dedit); + + return dedit; +} + GtkWidget *memo_page_create_source_option_menu (void); GtkWidget * diff --git a/calendar/gui/dialogs/memo-page.glade b/calendar/gui/dialogs/memo-page.glade index b230052fba..5de9142675 100644 --- a/calendar/gui/dialogs/memo-page.glade +++ b/calendar/gui/dialogs/memo-page.glade @@ -33,7 +33,7 @@ True - 3 + 7 2 False 0 @@ -72,8 +72,8 @@ 1 2 - 2 - 3 + 6 + 7 6 3 expand|shrink|fill @@ -93,8 +93,8 @@ 0 1 - 1 - 2 + 5 + 6 6 3 fill @@ -123,8 +123,8 @@ 0 1 - 2 - 3 + 6 + 7 6 3 fill @@ -156,8 +156,8 @@ 1 2 - 0 - 1 + 2 + 3 6 3 fill @@ -180,8 +180,8 @@ 1 2 - 1 - 2 + 5 + 6 6 3 @@ -207,6 +207,36 @@ False 0 + + 0 + 1 + 2 + 3 + 6 + 3 + fill + fill + + + + + + Or_ganizer: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + combo-entry1 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 1 @@ -215,6 +245,189 @@ 6 3 fill + + + + + + + True + T_o: + True + GTK_RELIEF_NORMAL + True + + + 0 + 1 + 1 + 2 + 6 + 3 + fill + + + + + + + True + Sta_rt date: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + 6 + 3 + fill + shrink + + + + + + True + memo_page_create_date_edit + 0 + 0 + Mon, 17 Jul 2006 21:24:48 GMT + + + 1 + 2 + 4 + 5 + 6 + 3 + fill + fill + + + + + + True + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 3 + 4 + 6 + 3 + + + + + + + True + Su_mmary + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + sum-entry + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + 6 + 3 + fill + + + + + + + False + True + False + True + False + + + + True + True + True + True + 0 + + True + ● + False + + + + + + True + GTK_SELECTION_BROWSE + + + + + 1 + 2 + 0 + 1 + + + + + + + False + 0 + + + + + + + 1 + 2 + 1 + 2 + 6 + 3 + fill fill diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h index 45928d96e0..132db6ed22 100644 --- a/calendar/gui/dialogs/memo-page.h +++ b/calendar/gui/dialogs/memo-page.h @@ -52,7 +52,7 @@ typedef struct { GtkType memo_page_get_type (void); MemoPage *memo_page_construct (MemoPage *epage); -MemoPage *memo_page_new (BonoboUIComponent *uic); +MemoPage *memo_page_new (BonoboUIComponent *uic, CompEditorPageFlags flags); G_END_DECLS -- cgit v1.2.3