From d65fb37051402d1df0d125540546f63cc6b46ea6 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 11 Sep 2000 09:59:30 +0000 Subject: Removed a bunch of redundant code. Made it so that when you set an address 2000-09-11 Christopher James Lahey * backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h: Removed a bunch of redundant code. Made it so that when you set an address label, it sets the delivery address as well. Added functions to set and get the delivery address. * backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to convert and address label to a delivery address. * contact-editor/Makefile.am: Added e-contact-editor-address.[ch], fulladdr.glade, fulladdr.glade.h. * contact-editor/contact-editor.glade, contact-editor/e-contact-editor-strings.h: Switched from a label to a button to show the parsed address. * contact-editor/e-contact-editor-address.c, contact-editor/e-contact-editor-address.h: New class to implement the parsed address dialog. * contact-editor/e-contact-editor-fullname.c, contact-editor/e-contact-editor-fullname.h: Added const to the _new function. * contact-editor/e-contact-editor.c: Implemented clicking on the address button. * contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h: New glade files for the parsed address dialog. * contact-editor/fullname-strings.h, fullname.glade: Changed these accellabels to labels. * ename/Makefile.am: Added e-address-western.c. * ename/e-address-western.c: Fixed some warnings. svn path=/trunk/; revision=5317 --- addressbook/gui/contact-editor/Makefile.am | 4 + .../gui/contact-editor/contact-editor.glade | 48 +- .../gui/contact-editor/e-contact-editor-address.c | 217 ++++++++++ .../gui/contact-editor/e-contact-editor-address.h | 75 ++++ .../gui/contact-editor/e-contact-editor-fullname.c | 2 +- .../gui/contact-editor/e-contact-editor-fullname.h | 2 +- .../gui/contact-editor/e-contact-editor-strings.h | 2 +- addressbook/gui/contact-editor/e-contact-editor.c | 41 ++ addressbook/gui/contact-editor/fulladdr.glade | 481 +++++++++++++++++++++ addressbook/gui/contact-editor/fulladdr.glade.h | 18 + addressbook/gui/contact-editor/fullname-strings.h | 10 +- addressbook/gui/contact-editor/fullname.glade | 326 +++++++------- 12 files changed, 1027 insertions(+), 199 deletions(-) create mode 100644 addressbook/gui/contact-editor/e-contact-editor-address.c create mode 100644 addressbook/gui/contact-editor/e-contact-editor-address.h create mode 100644 addressbook/gui/contact-editor/fulladdr.glade create mode 100644 addressbook/gui/contact-editor/fulladdr.glade.h (limited to 'addressbook/gui/contact-editor') diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index f51a0109ac..21363e849f 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -15,6 +15,8 @@ noinst_LIBRARIES = \ libecontacteditor.a libecontacteditor_a_SOURCES = \ + e-contact-editor-address.c \ + e-contact-editor-address.h \ e-contact-editor-categories.c \ e-contact-editor-categories.h \ e-contact-editor-fullname.c \ @@ -53,6 +55,7 @@ gladedir = $(datadir)/evolution/glade glade_DATA = \ contact-editor.glade \ + fulladdr.glade \ fullname.glade \ categories.glade \ e-contact-editor-confirm-delete.glade @@ -60,6 +63,7 @@ glade_DATA = \ EXTRA_DIST = $(evolution_DATA) \ $(glade_DATA) \ e-contact-editor-strings.h \ + fulladdr.glade.h \ fullname-strings.h \ categories-strings.h \ e-contact-editor-confirm-delete.glade.h diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade index 7c328a72ce..4e2ff11d69 100644 --- a/addressbook/gui/contact-editor/contact-editor.glade +++ b/addressbook/gui/contact-editor/contact-editor.glade @@ -1000,33 +1000,6 @@ - - GtkLabel - address-label - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - text-address - - 5 - 7 - 6 - 7 - 0 - 0 - False - False - False - False - True - True - - - GtkEventBox eventbox1 @@ -1647,6 +1620,27 @@ True + + + GtkButton + button-fulladdr + True + + + 5 + 7 + 6 + 7 + 0 + 0 + False + False + False + False + True + True + + diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c new file mode 100644 index 0000000000..cf6cc382cd --- /dev/null +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -0,0 +1,217 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * e-contact-editor-address.c + * Copyright (C) 2000 Helix Code, Inc. + * Author: Chris Lahey + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include +#include +#include + +static void e_contact_editor_address_init (EContactEditorAddress *card); +static void e_contact_editor_address_class_init (EContactEditorAddressClass *klass); +static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); +static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); +static void e_contact_editor_address_destroy (GtkObject *object); + +static void fill_in_info(EContactEditorAddress *editor); +static void extract_info(EContactEditorAddress *editor); + +static GnomeDialogClass *parent_class = NULL; + +/* The arguments we take */ +enum { + ARG_0, + ARG_ADDRESS +}; + +GtkType +e_contact_editor_address_get_type (void) +{ + static GtkType contact_editor_address_type = 0; + + if (!contact_editor_address_type) + { + static const GtkTypeInfo contact_editor_address_info = + { + "EContactEditorAddress", + sizeof (EContactEditorAddress), + sizeof (EContactEditorAddressClass), + (GtkClassInitFunc) e_contact_editor_address_class_init, + (GtkObjectInitFunc) e_contact_editor_address_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_address_info); + } + + return contact_editor_address_type; +} + +static void +e_contact_editor_address_class_init (EContactEditorAddressClass *klass) +{ + GtkObjectClass *object_class; + GnomeDialogClass *dialog_class; + + object_class = (GtkObjectClass*) klass; + dialog_class = (GnomeDialogClass *) klass; + + parent_class = gtk_type_class (gnome_dialog_get_type ()); + + gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, + GTK_ARG_READWRITE, ARG_ADDRESS); + + object_class->set_arg = e_contact_editor_address_set_arg; + object_class->get_arg = e_contact_editor_address_get_arg; + object_class->destroy = e_contact_editor_address_destroy; +} + +static void +e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) +{ + GladeXML *gui; + GtkWidget *widget; + + gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address), + GNOME_STOCK_BUTTON_OK); + + gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address), + GNOME_STOCK_BUTTON_CANCEL); + + gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE); + + e_contact_editor_address->address = NULL; + + gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL); + e_contact_editor_address->gui = gui; + + widget = glade_xml_get_widget(gui, "table-checkaddress"); + gtk_widget_ref(widget); + gtk_container_remove(GTK_CONTAINER(widget->parent), widget); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); + gtk_widget_unref(widget); +} + +void +e_contact_editor_address_destroy (GtkObject *object) +{ + EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object); + + if (e_contact_editor_address->gui) + gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui)); + e_card_delivery_address_free(e_contact_editor_address->address); +} + +GtkWidget* +e_contact_editor_address_new (const ECardDeliveryAddress *address) +{ + GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ())); + gtk_object_set (GTK_OBJECT(widget), + "address", address, + NULL); + return widget; +} + +static void +e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) +{ + EContactEditorAddress *e_contact_editor_address; + + e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o); + + switch (arg_id){ + case ARG_ADDRESS: + if (e_contact_editor_address->address) + e_card_delivery_address_free(e_contact_editor_address->address); + e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg)); + fill_in_info(e_contact_editor_address); + break; + } +} + +static void +e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) +{ + EContactEditorAddress *e_contact_editor_address; + + e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object); + + switch (arg_id) { + case ARG_ADDRESS: + extract_info(e_contact_editor_address); + GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address); + break; + default: + arg->type = GTK_TYPE_INVALID; + break; + } +} + +static void +fill_in_field(EContactEditorAddress *editor, char *field, char *string) +{ + GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field)); + if (editable) { + e_utf8_gtk_editable_set_text(editable, string); + } +} + +static void +fill_in_info(EContactEditorAddress *editor) +{ + ECardDeliveryAddress *address = editor->address; + if (address) { + fill_in_field(editor, "text-street" , address->street ); + fill_in_field(editor, "entry-po" , address->po ); + fill_in_field(editor, "entry-ext" , address->ext ); + fill_in_field(editor, "entry-city" , address->city ); + fill_in_field(editor, "entry-region" , address->region ); + fill_in_field(editor, "entry-code" , address->code ); + fill_in_field(editor, "entry-country", address->country); + } +} + +static char * +extract_field(EContactEditorAddress *editor, char *field) +{ + GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field)); + if (editable) + return e_utf8_gtk_editable_get_text(editable); + else + return NULL; +} + +static void +extract_info(EContactEditorAddress *editor) +{ + ECardDeliveryAddress *address = editor->address; + if (!address) + address = e_card_delivery_address_new(); + address->street = extract_field(editor, "text-street" ); + address->po = extract_field(editor, "entry-po" ); + address->ext = extract_field(editor, "entry-ext" ); + address->city = extract_field(editor, "entry-city" ); + address->region = extract_field(editor, "entry-region" ); + address->code = extract_field(editor, "entry-code" ); + address->country = extract_field(editor, "entry-country"); +} diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h new file mode 100644 index 0000000000..a74e1bd967 --- /dev/null +++ b/addressbook/gui/contact-editor/e-contact-editor-address.h @@ -0,0 +1,75 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* e-contact-editor-address.h + * Copyright (C) 2000 Helix Code, Inc. + * Author: Chris Lahey + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#ifndef __E_CONTACT_EDITOR_ADDRESS_H__ +#define __E_CONTACT_EDITOR_ADDRESS_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#pragma } +#endif /* __cplusplus */ + +/* EContactEditorAddress - A dialog displaying information about a contact. + * + * The following arguments are available: + * + * name type read/write description + * -------------------------------------------------------------------------------- + * name ECardName * RW The card currently being edited. Returns a copy. + */ + +#define E_CONTACT_EDITOR_ADDRESS_TYPE (e_contact_editor_address_get_type ()) +#define E_CONTACT_EDITOR_ADDRESS(obj) (GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress)) +#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass)) +#define E_IS_CONTACT_EDITOR_ADDRESS(obj) (GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE)) +#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE)) + + +typedef struct _EContactEditorAddress EContactEditorAddress; +typedef struct _EContactEditorAddressClass EContactEditorAddressClass; + +struct _EContactEditorAddress +{ + GnomeDialog parent; + + /* item specific fields */ + ECardDeliveryAddress *address; + GladeXML *gui; +}; + +struct _EContactEditorAddressClass +{ + GnomeDialogClass parent_class; +}; + + +GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name); +GtkType e_contact_editor_address_get_type (void); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */ diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index d455640164..d3f8f399bb 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -122,7 +122,7 @@ e_contact_editor_fullname_destroy (GtkObject *object) } GtkWidget* -e_contact_editor_fullname_new (ECardName *name) +e_contact_editor_fullname_new (const ECardName *name) { GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ())); gtk_object_set (GTK_OBJECT(widget), diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 409ffc72d0..bde6733976 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -64,7 +64,7 @@ struct _EContactEditorFullnameClass }; -GtkWidget *e_contact_editor_fullname_new(ECardName *name); +GtkWidget *e_contact_editor_fullname_new(const ECardName *name); GtkType e_contact_editor_fullname_get_type (void); #ifdef __cplusplus diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h index d5ac9daf24..bb9c0b5b30 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-strings.h +++ b/addressbook/gui/contact-editor/e-contact-editor-strings.h @@ -15,7 +15,6 @@ gchar *s = N_("_Full Name..."); gchar *s = N_("File As:"); gchar *s = N_("Web page address:"); gchar *s = N_("Wants to receive _HTML mail"); -gchar *s = N_("Address:"); gchar *s = N_("_Business"); gchar *s = N_("_Home"); gchar *s = N_("Business _Fax"); @@ -27,6 +26,7 @@ gchar *s = N_("C_ontacts..."); gchar *s = N_("Ca_tegories..."); gchar *s = N_("_Job title:"); gchar *s = N_("_Company:"); +gchar *s = N_("_Address..."); gchar *s = N_("General"); gchar *s = N_("_Department:"); gchar *s = N_("_Office:"); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c2d4450a7b..16c14bf585 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -24,6 +24,7 @@ #include #include "e-contact-editor.h" #include +#include #include #include #include @@ -500,6 +501,41 @@ full_name_clicked(GtkWidget *button, EContactEditor *editor) gtk_object_unref(GTK_OBJECT(dialog)); } +static void +full_addr_clicked(GtkWidget *button, EContactEditor *editor) +{ + GnomeDialog *dialog; + int result; + const ECardDeliveryAddress *address; + + address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice); + + dialog = GNOME_DIALOG(e_contact_editor_address_new(address)); + gtk_widget_show(GTK_WIDGET(dialog)); + + result = gnome_dialog_run (dialog); + if (result == 0) { + ECardDeliveryAddress *new_address; + + gtk_object_get(GTK_OBJECT(dialog), + "address", &new_address, + NULL); + e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address); + e_card_delivery_address_free(new_address); + +#if 0 + GtkWidget *fname_widget; + fname_widget = glade_xml_get_widget(editor->gui, "text-address"); + if (fname_widget && GTK_IS_ENTRY(fname_widget)) { + char *full_name = e_card_delivery_address_to_string(address); + e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name); + g_free(full_name); + } +#endif + } + gtk_object_unref(GTK_OBJECT(dialog)); +} + static void categories_clicked(GtkWidget *button, EContactEditor *editor) { @@ -1014,6 +1050,11 @@ e_contact_editor_init (EContactEditor *e_contact_editor) gtk_signal_connect(GTK_OBJECT(widget), "clicked", full_name_clicked, e_contact_editor); + widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr"); + if (widget && GTK_IS_BUTTON(widget)) + gtk_signal_connect(GTK_OBJECT(widget), "clicked", + full_addr_clicked, e_contact_editor); + widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); if (widget && GTK_IS_BUTTON(widget)) gtk_signal_connect(GTK_OBJECT(widget), "clicked", diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade new file mode 100644 index 0000000000..e1ba71bebd --- /dev/null +++ b/addressbook/gui/contact-editor/fulladdr.glade @@ -0,0 +1,481 @@ + + + + + fulladdr + fulladdr + + src + pixmaps + C + True + True + True + False + False + False + True + fulladdr.glade.h + + + + GnomeDialog + dialog-checkaddress + False + Check Address + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + False + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + vbox-container + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox1 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button1 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button2 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkTable + table-checkaddress + 8 + 5 + 4 + False + 6 + 21 + + 0 + True + True + + + + GtkEntry + entry-city + True + True + True + 0 + + + 1 + 4 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + label2 + + GTK_JUSTIFY_LEFT + False + 0 + 0 + 0 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label7 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + True + + + + + GtkEntry + entry-region + True + True + True + 0 + + + 1 + 2 + 3 + 4 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + label6 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 2 + 3 + 3 + 4 + 0 + 0 + False + False + False + False + True + True + + + + + GtkEntry + entry-code + True + True + True + 0 + + + 3 + 4 + 3 + 4 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0 + 0 + 0 + entry-ext + + 2 + 3 + 0 + 1 + 0 + 0 + False + False + False + False + True + True + + + + + GtkAlignment + alignment1 + 0.5 + 0 + 1 + 0 + + 3 + 4 + 0 + 1 + 0 + 0 + False + False + False + False + True + True + + + + GtkEntry + entry-ext + True + True + True + 0 + + + + + + GtkScrolledWindow + scrolledwindow1 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 1 + 2 + 0 + 1 + 0 + 0 + True + True + False + False + True + True + + + + GtkText + text-street + True + True + + + + + + GtkCombo + combo-country + False + True + False + True + False + USA +Canada +Finland + + + 1 + 4 + 4 + 5 + 0 + 0 + True + False + False + False + True + False + + + + GtkEntry + GtkCombo:entry + entry-country + True + True + True + 0 + + + + + + GtkLabel + label8 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + + + + GtkEntry + entry-po + True + True + True + 0 + + + 1 + 4 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + + + diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h new file mode 100644 index 0000000000..2a76706d6e --- /dev/null +++ b/addressbook/gui/contact-editor/fulladdr.glade.h @@ -0,0 +1,18 @@ +/* + * Translatable strings file generated by Glade. + * Add this file to your project's POTFILES.in. + * DO NOT compile it as part of your application. + */ + +gchar *s = N_("Check Address"); +gchar *s = N_("_Street Address:"); +gchar *s = N_("City:"); +gchar *s = N_("State/Province:"); +gchar *s = N_("Country:"); +gchar *s = N_("ZIP/Postal Code:"); +gchar *s = N_("E_xt:"); +gchar *s = N_("USA\n" + "Canada\n" + "Finland\n" + ""); +gchar *s = N_("PO Box:"); diff --git a/addressbook/gui/contact-editor/fullname-strings.h b/addressbook/gui/contact-editor/fullname-strings.h index 0c84dfdc8f..4d4303270a 100644 --- a/addressbook/gui/contact-editor/fullname-strings.h +++ b/addressbook/gui/contact-editor/fullname-strings.h @@ -5,11 +5,6 @@ */ gchar *s = N_("Check Full Name"); -gchar *s = N_("_Title:"); -gchar *s = N_("_First:"); -gchar *s = N_("_Middle:"); -gchar *s = N_("_Last:"); -gchar *s = N_("_Suffix:"); gchar *s = N_("\n" "Mr.\n" "Mrs.\n" @@ -23,3 +18,8 @@ gchar *s = N_("\n" "III\n" "Esq.\n" ""); +gchar *s = N_("_First:"); +gchar *s = N_("_Title:"); +gchar *s = N_("_Middle:"); +gchar *s = N_("_Last:"); +gchar *s = N_("_Suffix:"); diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade index 8f811c5616..f2dfa23834 100644 --- a/addressbook/gui/contact-editor/fullname.glade +++ b/addressbook/gui/contact-editor/fullname.glade @@ -14,13 +14,6 @@ False False False - True - interface.c - interface.h - callbacks.c - callbacks.h - support.c - support.h True fullname-strings.h @@ -51,6 +44,40 @@ True + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox1 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button1 + True + True + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button2 + True + True + GNOME_STOCK_BUTTON_CANCEL + + + GtkTable table-checkfullname @@ -66,136 +93,6 @@ True - - GtkAccelLabel - accellabel1 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - - GtkAccelLabel - accellabel2 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - - GtkAccelLabel - accellabel3 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - True - - - - - GtkAccelLabel - accellabel4 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - True - - - - - GtkAccelLabel - accellabel5 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - True - - - GtkCombo combo-title @@ -350,39 +247,140 @@ Esq. False - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - + + GtkLabel + label2 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-first + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + True + + - GtkButton - button1 - True - True - GNOME_STOCK_BUTTON_OK + GtkLabel + label1 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-title + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + True + - GtkButton - button2 - True - True - GNOME_STOCK_BUTTON_CANCEL + GtkLabel + label3 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-middle + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label5 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-last + + 0 + 1 + 3 + 4 + 0 + 0 + False + False + False + False + True + True + + + + + GtkLabel + label4 + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 0 + 0 + entry-suffix + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + True + -- cgit v1.2.3