diff options
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 21 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 16 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-search.c | 92 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-search.h | 6 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 13 |
6 files changed, 150 insertions, 7 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 8a0d03cd05..1645dd849b 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -532,6 +532,25 @@ addressbook_query_changed (EAddressbookSearch *eas, AddressbookView *view) g_free (search_word); } +static void +addressbook_menu_activated (EAddressbookSearch *eas, int id, AddressbookView *view) +{ + EBook *book; + switch (id) { + case 0: + e_addressbook_view_show_all(view->view); + break; + case 1: + gtk_object_get(GTK_OBJECT(view->view), + "book", &book, + NULL); + g_assert (E_IS_BOOK (book)); + + gtk_widget_show(e_addressbook_search_dialog_new(book)); + break; + } +} + BonoboControl * addressbook_factory_new_control (void) { @@ -555,6 +574,8 @@ addressbook_factory_new_control (void) FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (view->search), "query_changed", GTK_SIGNAL_FUNC (addressbook_query_changed), view); + gtk_signal_connect (GTK_OBJECT (view->search), "menu_activated", + GTK_SIGNAL_FUNC (addressbook_menu_activated), view); view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new()); gtk_box_pack_start(GTK_BOX(view->vbox), GTK_WIDGET(view->view), diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index aa2f4cffc2..c4e8ed8640 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -33,6 +33,7 @@ #include <gal/widgets/e-unicode.h> #include <e-contact-save-as.h> #include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" /* Signal IDs */ enum { @@ -713,6 +714,20 @@ print_cb (BonoboUIComponent *uih, void *data, const char *path) gtk_widget_show(e_contact_print_card_dialog_new(ce->card)); } +/* Emits the signal to request printing a card */ +static void +print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path) +{ + EContactEditor *ce; + + ce = E_CONTACT_EDITOR (data); + + extract_info (ce); + e_card_simple_sync_card (ce->simple); + + gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card)); +} + /* Toolbar/Save and Close callback */ static void tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path) @@ -731,6 +746,7 @@ BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb), BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb), BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb), + BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb), /* BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */ BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb), diff --git a/addressbook/gui/widgets/e-addressbook-search.c b/addressbook/gui/widgets/e-addressbook-search.c index c03b8fc096..e58e72d560 100644 --- a/addressbook/gui/widgets/e-addressbook-search.c +++ b/addressbook/gui/widgets/e-addressbook-search.c @@ -34,6 +34,7 @@ static void e_addressbook_search_destroy (GtkObject *object); enum { QUERY_CHANGED, + MENU_ACTIVATED, LAST_SIGNAL }; @@ -99,6 +100,14 @@ e_addressbook_search_class_init (EAddressbookSearchClass *klass) gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); + eas_signals [MENU_ACTIVATED] = + gtk_signal_new ("menu_activated", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (EAddressbookSearchClass, menu_activated), + gtk_marshal_NONE__INT, + GTK_TYPE_NONE, 1, GTK_TYPE_INT); + gtk_object_class_add_signals (object_class, eas_signals, LAST_SIGNAL); } @@ -109,6 +118,70 @@ eas_query_changed(EAddressbookSearch *eas) eas_signals [QUERY_CHANGED]); } +static void +eas_menu_activated(EAddressbookSearch *eas, int item) +{ + gtk_signal_emit(GTK_OBJECT (eas), + eas_signals [MENU_ACTIVATED], + item); +} + +static void +eas_menubar_activated(GtkWidget *widget, EAddressbookSearch *eas) +{ + int id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EasMenuId")); + + eas_menu_activated(eas, id); +} + +typedef enum { + EAS_CLEAR = 0, +} EasMenuId; + + +typedef struct { + char *text; + char *name; + int id; +} EasMenuItem; + +static EasMenuItem eas_menu_items[] = { + { N_("Show All"), "all", 0 }, + { NULL, "sep", -1 }, + { N_("Advanced"), "advanced", 1}, + { NULL, NULL, 0 } +}; + +static void +eas_pack_menubar(EAddressbookSearch *eas) +{ + GtkWidget *menu, *menuitem; + int i; + + menu = gtk_menu_new (); + for (i = 0; eas_menu_items[i].name; i++) { + GtkWidget *item; + + item = gtk_menu_item_new_with_label (_(eas_menu_items[i].text)); + + gtk_menu_append (GTK_MENU (menu), item); + + gtk_object_set_data (GTK_OBJECT (item), "EasMenuId", GINT_TO_POINTER(eas_menu_items[i].id)); + + gtk_signal_connect (GTK_OBJECT (item), "activate", + GTK_SIGNAL_FUNC (eas_menubar_activated), + eas); + } + gtk_widget_show_all (menu); + + menuitem = gtk_menu_item_new_with_label(_("Search")); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); + + gtk_widget_show (menuitem); + + gtk_menu_bar_append (GTK_MENU_BAR(eas->menubar), menuitem); + gtk_widget_set_sensitive (eas->menubar, TRUE); +} typedef enum { EAS_ANY = 0, @@ -148,19 +221,18 @@ eas_entry_activated(GtkWidget *widget, EAddressbookSearch *eas) static void eas_pack_option_menu(EAddressbookSearch *eas) { - GtkWidget *menu, *item, *firstitem = NULL; + GtkWidget *menu; int i; menu = gtk_menu_new (); for (i = 0; eas_choices[i].name; i++) { + GtkWidget *item; item = gtk_menu_item_new_with_label (_(eas_choices[i].text)); - if (!firstitem) - firstitem = item; gtk_menu_append (GTK_MENU (menu), item); - gtk_object_set_data (GTK_OBJECT (item), "EasChoiceId", GINT_TO_POINTER(i)); + gtk_object_set_data (GTK_OBJECT (item), "EasChoiceId", GINT_TO_POINTER(eas_choices[i].id)); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (eas_option_activated), @@ -177,8 +249,15 @@ eas_pack_option_menu(EAddressbookSearch *eas) static void e_addressbook_search_init (EAddressbookSearch *eas) { + GtkWidget *spacer; + gtk_box_set_spacing(GTK_BOX(eas), GNOME_PAD); + eas->menubar = gtk_menu_bar_new(); + eas_pack_menubar(eas); + gtk_widget_show(eas->menubar); + gtk_box_pack_start(GTK_BOX(eas), eas->menubar, FALSE, FALSE, 0); + eas->option = gtk_option_menu_new(); eas_pack_option_menu(eas); gtk_widget_show(eas->option); @@ -190,6 +269,11 @@ e_addressbook_search_init (EAddressbookSearch *eas) gtk_widget_show(eas->entry); gtk_box_pack_start(GTK_BOX(eas), eas->entry, TRUE, TRUE, 0); eas->option_choice = 0; + + spacer = gtk_drawing_area_new(); + gtk_widget_show(spacer); + gtk_box_pack_start(GTK_BOX(eas), spacer, FALSE, FALSE, 0); + gtk_widget_set_usize(spacer, 100, 1); } static void diff --git a/addressbook/gui/widgets/e-addressbook-search.h b/addressbook/gui/widgets/e-addressbook-search.h index 5216aa7ee5..5b229ee03e 100644 --- a/addressbook/gui/widgets/e-addressbook-search.h +++ b/addressbook/gui/widgets/e-addressbook-search.h @@ -58,8 +58,9 @@ struct _EAddressbookSearch GtkHBox parent; /* item specific fields */ - GtkWidget *entry; + GtkWidget *menubar; GtkWidget *option; + GtkWidget *entry; int option_choice; }; @@ -67,7 +68,8 @@ struct _EAddressbookSearchClass { GtkHBoxClass parent_class; - void (*query_changed) (EAddressbookSearch *search); + void (*query_changed) (EAddressbookSearch *search); + void (*menu_activated) (EAddressbookSearch *search, int item); }; GtkWidget *e_addressbook_search_new (void); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 186cd7ce31..3d081ab14c 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -37,6 +37,7 @@ #include "e-contact-editor.h" #include "e-contact-save-as.h" #include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" #include "e-card-simple.h" #include "e-card.h" #include "e-book.h" @@ -423,6 +424,13 @@ print (GtkWidget *widget, CardAndBook *card_and_book) } static void +print_envelope (GtkWidget *widget, CardAndBook *card_and_book) +{ + gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book->card)); + card_and_book_free(card_and_book); +} + +static void delete (GtkWidget *widget, CardAndBook *card_and_book) { if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) { @@ -445,6 +453,7 @@ table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EA EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, {"Print", NULL, GTK_SIGNAL_FUNC(print), 0}, + {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0}, {"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0}, {NULL, NULL, NULL, 0} }; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index c57e7adde7..4dda2cee1d 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -31,6 +31,7 @@ #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-popup-menu.h> #include "addressbook/printing/e-contact-print.h" +#include "addressbook/printing/e-contact-print-envelope.h" #include "e-contact-editor.h" #include "e-contact-save-as.h" #include "e-minicard-view.h" @@ -361,10 +362,18 @@ static void print (GtkWidget *widget, EMinicard *minicard) { e_card_simple_sync_card(minicard->simple); - + gtk_widget_show(e_contact_print_card_dialog_new(minicard->card)); } +static void +print_envelope (GtkWidget *widget, EMinicard *minicard) +{ + e_card_simple_sync_card(minicard->simple); + + gtk_widget_show(e_contact_print_envelope_dialog_new(minicard->card)); +} + /* Callback for the add_card signal from the contact editor */ static void add_card_cb (EContactEditor *ce, ECard *card, gpointer data) @@ -477,11 +486,13 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) if (E_IS_MINICARD_VIEW(item->parent)) { EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, {"Print", NULL, GTK_SIGNAL_FUNC(print), 0}, + {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0}, {"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0}, {NULL, NULL, NULL, 0}}; e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard); } else { EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, + {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0}, {"Print", NULL, GTK_SIGNAL_FUNC(print), 0}, {NULL, NULL, NULL, 0}}; e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard); |