From ced5bef58a54e80ea522ca05d50a7831c7baff12 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 17 Mar 2010 21:49:15 +0000 Subject: Compress new contact dialog (first page) a little; more to come. --- addressbook/gui/contact-editor/contact-editor.ui | 10 +++++----- addressbook/gui/contact-editor/e-contact-editor.c | 23 +++++++++++++++++++++++ addressbook/gui/contact-editor/e-contact-editor.h | 3 +++ 3 files changed, 31 insertions(+), 5 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index 964ce434c2..a603c13cc7 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -424,7 +424,7 @@ 0.5 GTK_SHADOW_NONE - + 12 True 3 @@ -1080,7 +1080,7 @@ - + True True True @@ -1099,7 +1099,7 @@ - + True True True @@ -1152,7 +1152,7 @@ - + True False True @@ -1167,7 +1167,7 @@ - + True False True diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 2807b9e149..7019e91dcd 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -748,6 +748,23 @@ init_email (EContactEditor *editor) for (i = 1; i <= EMAIL_SLOTS; i++) init_email_record_location (editor, i); + + if (editor->compress_ui) { + GtkTable *table; + GtkWidget *check; + + gtk_widget_hide (e_builder_get_widget (editor->builder, "entry-email-4")); + gtk_widget_hide (e_builder_get_widget (editor->builder, "combobox-email-4")); + + table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); + check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); + if (check != NULL && table != NULL) { + g_object_ref (G_OBJECT (check)); + gtk_container_remove (GTK_CONTAINER (check->parent), check); + gtk_table_attach_defaults (table, check, 2, 4, 1, 2); + g_object_unref (G_OBJECT (check)); + } + } } static void @@ -1458,6 +1475,11 @@ init_im_record_service (EContactEditor *editor, gint record) service_combo_box = e_builder_get_widget (editor->builder, widget_name); g_free (widget_name); + if (editor->compress_ui && record > 2) { + gtk_widget_hide (name_entry); + gtk_widget_hide (service_combo_box); + } + init_item_sensitiveable_combo_box (GTK_COMBO_BOX (service_combo_box)); store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (service_combo_box))); @@ -3402,6 +3424,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) e_contact_editor->target_editable = TRUE; e_contact_editor->fullname_dialog = NULL; e_contact_editor->categories_dialog = NULL; + e_contact_editor->compress_ui = e_shell_get_express_mode (e_shell_get_default ()); e_contact_editor->load_source_id = 0; e_contact_editor->load_book = NULL; diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 5079f1a0ee..b41324c270 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -84,6 +84,9 @@ struct _EContactEditor /* Whether an image is changed */ guint image_changed : 1; + /* Whether to try to reduce space used */ + guint compress_ui : 1; + EList *writable_fields; EList *required_fields; -- cgit From 6823af7d0b96a72a27159836b533e5d22130b7f2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Mar 2010 16:19:54 -0400 Subject: Refresh contact-editor.ui. Just letting Glade have its way with the file. No manual changes other than setting GtkVBox orientations to "vertical". --- addressbook/gui/contact-editor/contact-editor.ui | 2019 +++++----------------- 1 file changed, 461 insertions(+), 1558 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index a603c13cc7..468708d8fa 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1,13 +1,17 @@ - + + + + + @@ -21,6 +25,7 @@ + @@ -34,6 +39,7 @@ + @@ -47,6 +53,7 @@ + @@ -60,112 +67,47 @@ Contact Editor - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False + center + dialog False True - False - 0 - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - True - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - GTK_PACK_END - - + vertical - 12 True True - True - True - GTK_POS_TOP - False - False + 12 - 12 True - False + 12 + vertical 1 True - False 6 True True - GTK_RELIEF_NORMAL - True + False + + + Image + + True - - - Image - - - 0 False - True + 0 @@ -173,144 +115,89 @@ True 3 4 - False - 6 6 + 6 True + 1 Nic_kname: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-nickname - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 - 0 - 1 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + 1 2 - 0 - 1 - + True + 1 _File under: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 combo-file-as - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 1 2 - fill - + GTK_FILL + True + 1 _Where: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 1 2 - fill - + GTK_FILL + + Ca_tegories... True True - Ca_tegories... + False True - GTK_RELIEF_NORMAL - True - 0 - 1 2 3 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + @@ -318,26 +205,18 @@ 4 2 3 - + True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + @@ -349,34 +228,26 @@ 4 1 2 - fill - fill + GTK_FILL + GTK_FILL + Full _Name... True True - Full _Name... + False True - GTK_RELIEF_NORMAL - True - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True - False - True - True model1 @@ -384,22 +255,20 @@ 2 1 2 - fill - fill + GTK_FILL + GTK_FILL - 0 - True - True + 1 - 0 False False + 0 @@ -407,133 +276,98 @@ True - 6 False False + 6 + 1 True - False + vertical 10 True 0 - 0.5 - GTK_SHADOW_NONE + none - 12 True + 12 3 4 - False - 6 6 + 6 True True - True - True - 0 - - True - False 1 2 1 2 - + True True - True - True - 0 - - True - False 1 2 - 0 - 1 - + True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True True - True - True - 0 - - True - False 3 4 1 2 - + + _Wants to receive HTML mail True True - _Wants to receive HTML mail + False True - GTK_RELIEF_NORMAL - True - False - False True - 0 4 2 3 - fill - + GTK_FILL + True - False - True model2 @@ -543,19 +377,13 @@ - 0 - 1 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True model3 @@ -565,19 +393,15 @@ - 0 - 1 1 2 - fill - fill + GTK_FILL + GTK_FILL True - False - True model4 @@ -589,17 +413,13 @@ 2 3 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True model5 @@ -613,8 +433,8 @@ 3 1 2 - fill - fill + GTK_FILL + GTK_FILL @@ -623,18 +443,6 @@ True Email - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -642,327 +450,233 @@ - 0 False False + 0 True - False - 0 + vertical True 0 - 0.5 - GTK_SHADOW_NONE + none - 12 True - False + 12 + vertical 6 True 2 4 - False - 6 6 + 6 True True - True - True - 0 - - True - False 1 2 - 0 - 1 - + True True - True - True - 0 - - True - False 1 2 1 2 - + True True - True - True - 0 - - True - False 3 4 1 2 - + True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True - False - True - 0 - 1 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True - 0 - 1 1 2 - fill - fill + GTK_FILL + GTK_FILL True - False - True 2 3 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True 2 3 1 2 - fill - fill + GTK_FILL + GTK_FILL - 0 False - True + 0 2 4 - False - 6 6 + 6 True True - True - True - 0 - - True - False 1 2 - 0 - 1 - + True True - True - True - 0 - - True - False 1 2 1 2 - + True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True True - True - True - 0 - - True - False 3 4 1 2 - + True - False - True - 0 - 1 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True - 0 - 1 1 2 - fill - fill + GTK_FILL + GTK_FILL True - False - True 2 3 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True 2 3 1 2 - fill - fill + GTK_FILL + GTK_FILL - 0 False - True + 1 @@ -970,32 +684,19 @@ True - False 4 True Telephone - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 0 @@ -1004,196 +705,141 @@ 20 True True - GTK_RELIEF_NONE - True + False + none + + + Telephone + + True - GTK_ARROW_RIGHT - GTK_SHADOW_NONE - 0.5 - 0.5 - 0 - 0 - - - - - Telephone + none - 0 - True - True + 1 - 0 False - True + 0 - 0 False - True + 1 True 0 - 0.5 - GTK_SHADOW_NONE + none - 12 True + 12 2 4 - False - 6 6 + 6 True True - True - True - 0 - - True - False 1 2 - 0 - 1 - + True True - True - True - 0 - - True - False 1 2 1 2 - + True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True True - True - True - 0 - - True - False 3 4 1 2 - + True - False - True - 0 - 1 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True - 0 - 1 1 2 - fill - fill + GTK_FILL + GTK_FILL True - False - True 2 3 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL True - False - True 2 3 1 2 - fill - fill + GTK_FILL + GTK_FILL @@ -1202,18 +848,6 @@ True Instant Messaging - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -1221,199 +855,124 @@ - 0 False - True + 2 - 0 - True - True + 2 - - False - True - True Contact - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + False + - 12 True - False + 12 + vertical 12 True 0 - 0.5 - GTK_SHADOW_NONE + none - 12 True + 12 5 2 - False - 6 6 + 6 True + 0 _Home Page: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-homepage - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True + 0 _Calendar: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-caluri - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 2 3 - fill - + GTK_FILL + True + 0 _Free/Busy: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-fburl - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 3 4 - fill - + GTK_FILL + True + 0 _Video Chat: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-videourl - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 4 5 - fill - + GTK_FILL + True - - Home Page: + + Home Page: 1 2 - 0 - 1 - fill + GTK_FILL True - - Calendar: + + Calendar: @@ -1422,15 +981,15 @@ 2 2 3 - fill + GTK_FILL True - - Free/Busy: + + Free/Busy: @@ -1439,15 +998,15 @@ 2 3 4 - fill + GTK_FILL True - - Video Chat: + + Video Chat: @@ -1456,43 +1015,30 @@ 2 4 5 - fill + GTK_FILL True + 0 _Web Log: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-weblog - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 1 2 - fill - + GTK_FILL + True - - Web Log: + + Web Log: @@ -1501,8 +1047,8 @@ 2 1 2 - fill - fill + GTK_FILL + GTK_FILL @@ -1511,18 +1057,6 @@ True Web Addresses - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -1530,166 +1064,100 @@ - 0 False - True + 0 True 0 - 0.5 - GTK_SHADOW_NONE + none - 12 True + 12 3 4 - False - 6 6 + 6 True + 0 _Profession: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-profession - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + 1 2 - 0 - 1 - + True + 0 _Title: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-jobtitle - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 - 0 - 1 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + 3 4 - 0 - 1 - + True + 0 _Company: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-company - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 1 2 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + @@ -1697,49 +1165,32 @@ 2 1 2 - + True + 0 _Department: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-department - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 1 2 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + @@ -1747,49 +1198,30 @@ 4 1 2 - + True + 0 _Manager: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-manager - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 2 3 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + @@ -1797,49 +1229,32 @@ 2 2 3 - + True + 0 _Assistant: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-assistant - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 2 3 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + @@ -1847,7 +1262,7 @@ 4 2 3 - + @@ -1856,18 +1271,6 @@ True Job - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -1875,116 +1278,71 @@ - 0 False - True + 1 True 0 - 0.5 - GTK_SHADOW_NONE + none - 12 True + 12 2 4 - False - 6 6 + 6 True + 0 _Office: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-office - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True + 0 _Spouse: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 entry-spouse - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 1 2 - fill - + GTK_FILL + True True - True - True - 0 - - True - False - + 1 2 - 0 - 1 - + True True - True - True - 0 - - True - False - + @@ -1992,75 +1350,51 @@ 2 1 2 - + True + 0 _Birthday: True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 dateedit-birthday - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 - 0 - 1 - fill - + GTK_FILL + True + 1 _Anniversary: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 dateedit-anniversary - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 1 2 - fill - + GTK_FILL + True - True - False - True - False + True + False + False + True - - Anniversary + + Anniversary @@ -2069,30 +1403,28 @@ 4 1 2 - fill - fill + GTK_FILL + GTK_FILL True - True - False - True - False + True + False + False + True - - Birthday + + Birthday 3 4 - 0 - 1 - fill - fill + GTK_FILL + GTK_FILL @@ -2101,18 +1433,6 @@ True Miscellaneous - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -2120,205 +1440,134 @@ - 0 - True - True + 2 - False - True + 1 True Personal Information - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + 1 + False + True - False - 0 + vertical - 6 True + 6 0 - 0.5 - GTK_SHADOW_NONE + none - 6 True - 0.5 - 0.15000000596 - 1 - 0.699999988079 - 0 - 0 + 6 + 0.15000000596046448 + 0.69999998807907104 19 10 50 True - False - 0 True 4 4 - False - 6 6 + 6 193 69 True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + automatic + automatic + in 25 True True - True - False False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 1 2 - 0 3 - fill - fill + GTK_FILL + GTK_FILL True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True + 1 _City: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-home-city - PANGO_ELLIPSIZE_NONE - -1 True - 0 2 3 - 0 - 1 - fill - + GTK_FILL + True True - True - True - 0 - - True - False 3 4 1 2 - + True + 1 _Zip/Postal Code: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-home-zip - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 1 2 - fill - + GTK_FILL + @@ -2326,47 +1575,30 @@ 256 True True - True - True - 0 - - True - False 3 4 2 3 - + True + 1 _State/Province: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-home-state - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 2 3 - fill - + GTK_FILL + @@ -2374,47 +1606,31 @@ 163 True True - True - True - 0 - - True - False 3 4 3 4 - + True - _Country: - True - False - GTK_JUSTIFY_LEFT - False - False 1 - 0.5 - 0 4 + _Country: + True entry-home-country - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 3 4 - fill - + GTK_FILL + @@ -2422,82 +1638,52 @@ 100 True True - True - True - 0 - - True - False 1 2 3 4 - + True + 1 _PO Box: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-home-pobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 3 4 - fill - + GTK_FILL + True + 1 _Address: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 textview-home-address - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + + + + + + + - 0 - True - True + 0 @@ -2507,19 +1693,8 @@ True + 0.41999998688697815 Home - False - GTK_JUSTIFY_LEFT - False - False - 0.419999986887 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -2527,203 +1702,128 @@ - 0 - True - True + 0 - 6 True + 6 0 - 0.5 - GTK_SHADOW_NONE + none - 6 True - 0.5 - 0.15000000596 - 1 - 0.699999988079 - 0 - 0 + 6 + 0.15000000596046448 + 0.69999998807907104 19 10 50 True - False - 0 True 4 4 - False - 6 6 + 6 193 69 True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + automatic + automatic + in 25 True True - True - False False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 1 2 - 0 3 - fill - fill + GTK_FILL + GTK_FILL True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True + 1 _City: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-work-city - PANGO_ELLIPSIZE_NONE - -1 True - 0 2 3 - 0 - 1 - fill - + GTK_FILL + True + 1 _Address: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 textview-work-address - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True True - True - True - 0 - - True - False 3 4 1 2 - + True + 1 _Zip/Postal Code: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-work-zip - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 1 2 - fill - + GTK_FILL + @@ -2731,47 +1831,30 @@ 256 True True - True - True - 0 - - True - False 3 4 2 3 - + True + 1 _State/Province: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-work-state - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 2 3 - fill - + GTK_FILL + @@ -2779,47 +1862,31 @@ 163 True True - True - True - 0 - - True - False 3 4 3 4 - + True - _Country: - True - False - GTK_JUSTIFY_LEFT - False - False 1 - 0.5 - 0 4 + _Country: + True entry-home-country - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 3 4 - fill - + GTK_FILL + @@ -2827,54 +1894,39 @@ 100 True True - True - True - 0 - - True - False 1 2 3 4 - + True + 1 _PO Box: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-work-pobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 3 4 - fill - + GTK_FILL + + + + + + + - 0 - True - True + 0 @@ -2884,19 +1936,8 @@ True + 0.41999998688697815 Work - False - GTK_JUSTIFY_LEFT - False - False - 0.419999986887 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -2904,164 +1945,102 @@ - 0 - True - True + 1 - 6 True + 6 0 - 0.5 - GTK_SHADOW_NONE + none - 6 True - 0.5 - 0.15000000596 - 1 - 0.699999988079 - 0 - 0 + 6 + 0.15000000596046448 + 0.69999998807907104 19 10 50 True - False - 0 True 4 4 - False - 6 6 + 6 True True - True - True - 0 - - True - False 3 4 - 0 - 1 - + True + 1 _City: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-other-city - PANGO_ELLIPSIZE_NONE - -1 True - 0 2 3 - 0 - 1 - fill - + GTK_FILL + True + 1 _Address: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 textview-other-address - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 - 0 - 1 - fill - + GTK_FILL + True True - True - True - 0 - - True - False 3 4 1 2 - + True + 1 _Zip/Postal Code: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-other-zip - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 1 2 - fill - + GTK_FILL + @@ -3069,47 +2048,30 @@ 256 True True - True - True - 0 - - True - False 3 4 2 3 - + True + 1 _State/Province: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-other-state - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 2 3 - fill - + GTK_FILL + @@ -3117,47 +2079,31 @@ 163 True True - True - True - 0 - - True - False 3 4 3 4 - + True - _Country: - True - False - GTK_JUSTIFY_LEFT - False - False 1 - 0.5 - 0 4 + _Country: + True entry-other-country - PANGO_ELLIPSIZE_NONE - -1 - False - 0 2 3 3 4 - fill - + GTK_FILL + @@ -3165,47 +2111,28 @@ 100 True True - True - True - 0 - - True - False 1 2 3 4 - + True + 1 _PO Box: True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 entry-other-pobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 - 1 3 4 - fill - + GTK_FILL + @@ -3214,44 +2141,35 @@ 69 True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + automatic + automatic + in 25 True True - True - False False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 1 2 - 0 3 - fill - fill + GTK_FILL + GTK_FILL + + + + + + - 0 - True - True + 0 @@ -3261,19 +2179,8 @@ True + 0.41999998688697815 Other - False - GTK_JUSTIFY_LEFT - False - False - 0.419999986887 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -3281,98 +2188,62 @@ - 0 - True - True + 2 - False - True + 2 True Mailing Address - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + 2 + False + True - False - 0 + vertical - 6 True + 6 0 - 0.5 - GTK_SHADOW_NONE + none - 6 True - 0.5 - 0.15000000596 - 1 - 1 - 0 - 0 + 6 + 0.15000000596046448 19 10 50 True - False - 0 38 True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + automatic + automatic + in True True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - 0 - True - True + 0 @@ -3382,19 +2253,8 @@ True + 0.41999998688697815 Notes - False - GTK_JUSTIFY_LEFT - False - False - 0.419999986887 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -3402,41 +2262,84 @@ - 0 - True - True + 0 - False - True + 3 True Notes - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + 3 + False + - 0 - True - True + 1 + + + + + True + end + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + True + + + False + False + 1 + + + + + gtk-ok + True + True + True + True + False + True + + + False + False + 2 + + + + + False + end + 0 -- cgit From 5b02ef61a3eb49431f3f9f07affbb2bbf7a65d77 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 25 Mar 2010 19:11:46 +0000 Subject: Add vertical orientation properties to make glade-3 happy. --- addressbook/gui/contact-editor/contact-editor.ui | 62 ++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index 468708d8fa..a574ef89a7 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -74,6 +74,55 @@ True vertical + False + 0 + vertical + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + True @@ -85,6 +134,7 @@ 12 vertical 1 + vertical True @@ -287,6 +337,7 @@ True vertical 10 + vertical True @@ -459,6 +510,9 @@ True vertical + False + 0 + vertical True @@ -470,6 +524,7 @@ 12 vertical 6 + vertical True @@ -881,6 +936,7 @@ 12 vertical 12 + vertical True @@ -1462,6 +1518,9 @@ True vertical + False + 0 + vertical True @@ -2210,6 +2269,9 @@ True vertical + False + 0 + vertical True -- cgit From ee8b65f1ce4b45087b994f607770cd8c2656416e Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 25 Mar 2010 19:28:37 +0000 Subject: Add expander button to E-mail pieces. --- addressbook/gui/contact-editor/contact-editor.ui | 66 ++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index a574ef89a7..94a919c381 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -501,6 +501,72 @@ + + True + False + 4 + + + True + Email + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + 20 + 20 + True + True + GTK_RELIEF_NONE + True + + + True + GTK_ARROW_RIGHT + GTK_SHADOW_NONE + 0.5 + 0.5 + 0 + 0 + + + + + Telephone + + + + + 0 + True + True + + + + + + + 0 False False 0 -- cgit From 218abbffb814214ffecfcf8b76c7135e41066b9c Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 25 Mar 2010 19:51:31 +0000 Subject: Adapt and further compact the UI with new expander-alike --- addressbook/gui/contact-editor/e-contact-editor.c | 126 +++++++++++++++------- 1 file changed, 87 insertions(+), 39 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 7019e91dcd..61302854a8 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -741,32 +741,6 @@ init_email_record_location (EContactEditor *editor, gint record) g_signal_connect_swapped (email_entry, "activate", G_CALLBACK (entry_activated), editor); } -static void -init_email (EContactEditor *editor) -{ - gint i; - - for (i = 1; i <= EMAIL_SLOTS; i++) - init_email_record_location (editor, i); - - if (editor->compress_ui) { - GtkTable *table; - GtkWidget *check; - - gtk_widget_hide (e_builder_get_widget (editor->builder, "entry-email-4")); - gtk_widget_hide (e_builder_get_widget (editor->builder, "combobox-email-4")); - - table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); - check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); - if (check != NULL && table != NULL) { - g_object_ref (G_OBJECT (check)); - gtk_container_remove (GTK_CONTAINER (check->parent), check); - gtk_table_attach_defaults (table, check, 2, 4, 1, 2); - g_object_unref (G_OBJECT (check)); - } - } -} - static void fill_in_email_record (EContactEditor *editor, gint record, const gchar *address, gint location) { @@ -1161,23 +1135,82 @@ set_attributes_named (EVCard *vcard, const gchar *attr_name, GList *attr_list) } static void -expand_phone (EContactEditor *editor, gboolean expanded) +set_arrow_image (EContactEditor *editor, + const char *arrow_widget, + gboolean expanded) { - GtkWidget *phone_ext_table; - GtkWidget *phone_ext_arrow; + GtkWidget *arrow; - phone_ext_table = e_builder_get_widget (editor->builder, "table-phone-extended"); - phone_ext_arrow = e_builder_get_widget (editor->builder, "arrow-phone-expand"); + arrow = e_builder_get_widget (editor->builder, arrow_widget); + if (expanded) + gtk_arrow_set (GTK_ARROW (arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); + else + gtk_arrow_set (GTK_ARROW (arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); +} - if (expanded) { - gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); - gtk_widget_show (phone_ext_table); - } else { - gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); - gtk_widget_hide (phone_ext_table); +static void +expand_widget_list (EContactEditor *editor, + const char **widget_names, + gboolean expanded) +{ + int i; + for (i = 0; widget_names[i]; i++) + gtk_widget_set_visible ( + e_builder_get_widget (editor->builder, widget_names[i]), + expanded); +} + +static void +expand_phone (EContactEditor *editor, gboolean expanded) +{ + const char *names[] = { + "entry-phone-2", "combobox-phone-2", + "entry-phone-4", "combobox-phone-4", + "table-phone-extended", NULL + }; + set_arrow_image (editor, "arrow-phone-expand", expanded); + expand_widget_list (editor, names, expanded); +} + +static void +expand_mail (EContactEditor *editor, gboolean expanded) +{ + GtkTable *table; + GtkWidget *check; + const char *names[] = { + "entry-email-2", "combobox-email-2", + "entry-email-3", "combobox-email-3", + "entry-email-4", "combobox-email-4", + NULL + }; + set_arrow_image (editor, "arrow-mail-expand", expanded); + expand_widget_list (editor, names, expanded); + + /* move 'use html mail' into position */ + check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); + table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); + if (check != NULL && table != NULL) { + g_object_ref (G_OBJECT (check)); + gtk_container_remove (GTK_CONTAINER (check->parent), check); + if (expanded) + gtk_table_attach_defaults (table, check, 0, 4, 2, 3); + else + gtk_table_attach_defaults (table, check, 2, 4, 0, 1); + g_object_unref (G_OBJECT (check)); } } +static void +init_email (EContactEditor *editor) +{ + gint i; + + for (i = 1; i <= EMAIL_SLOTS; i++) + init_email_record_location (editor, i); + + expand_mail (editor, !editor->compress_ui); +} + static void fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, gint phone_type) { @@ -3400,9 +3433,22 @@ expand_phone_toggle (EContactEditor *ce) phone_ext_table = e_builder_get_widget (ce->builder, "table-phone-extended"); #if GTK_CHECK_VERSION(2,19,7) - expand_phone (ce, gtk_widget_get_visible (phone_ext_table) ? FALSE : TRUE); + expand_phone (ce, !gtk_widget_get_visible (phone_ext_table)); +#else + expand_phone (ce, !GTK_WIDGET_VISIBLE (phone_ext_table)); +#endif +} + +static void +expand_mail_toggle (EContactEditor *ce) +{ + GtkWidget *mail; + + mail = e_builder_get_widget (ce->builder, "entry-email-4"); +#if GTK_CHECK_VERSION(2,19,7) + expand_mail (ce, !gtk_widget_get_visible (mail)); #else - expand_phone (ce, GTK_WIDGET_VISIBLE (phone_ext_table) ? FALSE : TRUE); + expand_mail (ce, !GTK_WIDGET_VISIBLE (mail)); #endif } @@ -3466,6 +3512,8 @@ e_contact_editor_init (EContactEditor *e_contact_editor) g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); widget = e_builder_get_widget (e_contact_editor->builder, "button-phone-expand"); g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor); + widget = e_builder_get_widget (e_contact_editor->builder, "button-mail-expand"); + g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_mail_toggle), e_contact_editor); widget = e_builder_get_widget (e_contact_editor->builder, "entry-fullname"); if (widget) -- cgit From 52e458fcfc493c4058ee1ab988da550a53ef4137 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 25 Mar 2010 20:03:05 +0000 Subject: Switch back to an older version with my changes. --- addressbook/gui/contact-editor/contact-editor.ui | 1962 ++++++++++++++++------ 1 file changed, 1491 insertions(+), 471 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index 94a919c381..fe53b703a4 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1,17 +1,13 @@ + - - - - - @@ -25,7 +21,6 @@ - @@ -39,7 +34,6 @@ - @@ -53,7 +47,6 @@ - @@ -67,13 +60,22 @@ Contact Editor - center - dialog + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False False True - vertical False 0 vertical @@ -125,39 +127,47 @@ + 12 True True - 12 + True + True + GTK_POS_TOP + False + False - True 12 - vertical + True + False 1 vertical True + False 6 True True - False - - - Image - - + GTK_RELIEF_NORMAL + True True + + + Image + + + 0 False - 0 + True @@ -165,89 +175,144 @@ True 3 4 - 6 + False 6 + 6 True - 1 Nic_kname: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-nickname + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 - GTK_FILL - + 0 + 1 + fill + True True + True + True + 0 + + True + False - + 1 2 - + 0 + 1 + True - 1 _File under: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 combo-file-as + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 1 2 - GTK_FILL - + fill + True - 1 _Where: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 1 2 - GTK_FILL - + fill + - Ca_tegories... True True - False + Ca_tegories... True + GTK_RELIEF_NORMAL + True + 0 + 1 2 3 - GTK_FILL - + fill + True True + True + True + 0 + + True + False - + @@ -255,18 +320,26 @@ 4 2 3 - + True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + @@ -278,26 +351,34 @@ 4 1 2 - GTK_FILL - GTK_FILL + fill + fill - Full _Name... True True - False + Full _Name... True + GTK_RELIEF_NORMAL + True - GTK_FILL - + 0 + 1 + 0 + 1 + fill + True + False + True + True model1 @@ -305,20 +386,22 @@ 2 1 2 - GTK_FILL - GTK_FILL + fill + fill - 1 + 0 + True + True + 0 False False - 0 @@ -326,99 +409,134 @@ True + 6 False False - 6 - 1 True - vertical + False 10 vertical True 0 - none + 0.5 + GTK_SHADOW_NONE - True 12 + True 3 4 - 6 + False 6 + 6 True True + True + True + 0 + + True + False 1 2 1 2 - + True True + True + True + 0 + + True + False 1 2 - + 0 + 1 + True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True True + True + True + 0 + + True + False 3 4 1 2 - + - _Wants to receive HTML mail True True - False + _Wants to receive HTML mail True + GTK_RELIEF_NORMAL + True + False + False True + 0 4 2 3 - GTK_FILL - + fill + True + False + True model2 @@ -428,13 +546,19 @@ - GTK_FILL - GTK_FILL + 0 + 1 + 0 + 1 + fill + fill True + False + True model3 @@ -444,15 +568,19 @@ + 0 + 1 1 2 - GTK_FILL - GTK_FILL + fill + fill True + False + True model4 @@ -464,13 +592,17 @@ 2 3 - GTK_FILL - GTK_FILL + 0 + 1 + fill + fill True + False + True model5 @@ -484,23 +616,13 @@ 3 1 2 - GTK_FILL - GTK_FILL + fill + fill - - True - Email - - - - - - - True False @@ -569,13 +691,11 @@ 0 False False - 0 True - vertical False 0 vertical @@ -583,12 +703,13 @@ True 0 - none + 0.5 + GTK_SHADOW_NONE - True 12 - vertical + True + False 6 vertical @@ -596,208 +717,300 @@ True 2 4 - 6 + False 6 + 6 True True + True + True + 0 + + True + False 1 2 - + 0 + 1 + True True + True + True + 0 + + True + False 1 2 1 2 - + True True + True + True + 0 + + True + False 3 4 1 2 - + True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True + False + True - GTK_FILL - GTK_FILL + 0 + 1 + 0 + 1 + fill + fill True + False + True + 0 + 1 1 2 - GTK_FILL - GTK_FILL + fill + fill True + False + True 2 3 - GTK_FILL - GTK_FILL + 0 + 1 + fill + fill True + False + True 2 3 1 2 - GTK_FILL - GTK_FILL + fill + fill + 0 False - 0 + True 2 4 - 6 + False 6 + 6 True True + True + True + 0 + + True + False 1 2 - + 0 + 1 + True True + True + True + 0 + + True + False 1 2 1 2 - + True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True True + True + True + 0 + + True + False 3 4 1 2 - + True + False + True - GTK_FILL - GTK_FILL + 0 + 1 + 0 + 1 + fill + fill True + False + True + 0 + 1 1 2 - GTK_FILL - GTK_FILL + fill + fill True + False + True 2 3 - GTK_FILL - GTK_FILL + 0 + 1 + fill + fill True + False + True 2 3 1 2 - GTK_FILL - GTK_FILL + fill + fill + 0 False - 1 + True @@ -805,19 +1018,32 @@ True + False 4 True Telephone + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 False False - 0 @@ -826,141 +1052,196 @@ 20 True True - False - none - - - Telephone - - + GTK_RELIEF_NONE + True True - none + GTK_ARROW_RIGHT + GTK_SHADOW_NONE + 0.5 + 0.5 + 0 + 0 + + + + + Telephone - 1 + 0 + True + True + 0 False - 0 + True + 0 False - 1 + True True 0 - none + 0.5 + GTK_SHADOW_NONE - True 12 + True 2 4 - 6 + False 6 + 6 True True + True + True + 0 + + True + False 1 2 - + 0 + 1 + True True + True + True + 0 + + True + False 1 2 1 2 - + True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True True + True + True + 0 + + True + False 3 4 1 2 - + True + False + True - GTK_FILL - GTK_FILL + 0 + 1 + 0 + 1 + fill + fill True + False + True + 0 + 1 1 2 - GTK_FILL - GTK_FILL + fill + fill True + False + True 2 3 - GTK_FILL - GTK_FILL + 0 + 1 + fill + fill True + False + True 2 3 1 2 - GTK_FILL - GTK_FILL + fill + fill @@ -969,6 +1250,18 @@ True Instant Messaging + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -976,125 +1269,200 @@ + 0 False - 2 + True - 2 + 0 + True + True + + False + True + True Contact + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - - False - - True 12 - vertical + True + False 12 vertical True 0 - none + 0.5 + GTK_SHADOW_NONE - True 12 + True 5 2 - 6 + False 6 + 6 True - 0 _Home Page: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-homepage + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - GTK_FILL - + 0 + 1 + 0 + 1 + fill + True - 0 _Calendar: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-caluri + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 2 3 - GTK_FILL - + fill + True - 0 _Free/Busy: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-fburl + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 3 4 - GTK_FILL - + fill + True - 0 _Video Chat: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-videourl + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 4 5 - GTK_FILL - + fill + True - - Home Page: + + Home Page: 1 2 - GTK_FILL + 0 + 1 + fill True - - Calendar: + + Calendar: @@ -1103,15 +1471,15 @@ 2 2 3 - GTK_FILL + fill True - - Free/Busy: + + Free/Busy: @@ -1120,15 +1488,15 @@ 2 3 4 - GTK_FILL + fill True - - Video Chat: + + Video Chat: @@ -1137,30 +1505,43 @@ 2 4 5 - GTK_FILL + fill True - 0 _Web Log: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-weblog + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 1 2 - GTK_FILL - + fill + True - - Web Log: + + Web Log: @@ -1169,8 +1550,8 @@ 2 1 2 - GTK_FILL - GTK_FILL + fill + fill @@ -1179,6 +1560,18 @@ True Web Addresses + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -1186,100 +1579,166 @@ + 0 False - 0 + True True 0 - none + 0.5 + GTK_SHADOW_NONE - True 12 + True 3 4 - 6 + False 6 + 6 True - 0 _Profession: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-profession + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - GTK_FILL - + 0 + 1 + 0 + 1 + fill + True True + True + True + 0 + + True + False - + 1 2 - + 0 + 1 + True - 0 _Title: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-jobtitle + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 - GTK_FILL - + 0 + 1 + fill + True True + True + True + 0 + + True + False - + 3 4 - + 0 + 1 + True - 0 _Company: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-company + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 1 2 - GTK_FILL - + fill + True True + True + True + 0 + + True + False - + @@ -1287,32 +1746,49 @@ 2 1 2 - + True - 0 _Department: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-department + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 1 2 - GTK_FILL - + fill + True True + True + True + 0 + + True + False - + @@ -1320,30 +1796,49 @@ 4 1 2 - + True - 0 _Manager: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-manager + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 2 3 - GTK_FILL - + fill + True True + True + True + 0 + + True + False - + @@ -1351,32 +1846,49 @@ 2 2 3 - + True - 0 _Assistant: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-assistant + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 2 3 - GTK_FILL - + fill + True True + True + True + 0 + + True + False - + @@ -1384,7 +1896,7 @@ 4 2 3 - + @@ -1393,6 +1905,18 @@ True Job + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -1400,71 +1924,116 @@ + 0 False - 1 + True True 0 - none + 0.5 + GTK_SHADOW_NONE - True 12 + True 2 4 - 6 + False 6 + 6 True - 0 _Office: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-office + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - GTK_FILL - + 0 + 1 + 0 + 1 + fill + True - 0 _Spouse: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 entry-spouse + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 1 2 - GTK_FILL - + fill + True True + True + True + 0 + + True + False - + 1 2 - + 0 + 1 + True True + True + True + 0 + + True + False - + @@ -1472,51 +2041,75 @@ 2 1 2 - + True - 0 _Birthday: True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 dateedit-birthday + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 - GTK_FILL - + 0 + 1 + fill + True - 1 _Anniversary: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 dateedit-anniversary + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 1 2 - GTK_FILL - + fill + True - True - False - False - True + True + False + True + False - - Anniversary + + Anniversary @@ -1525,28 +2118,30 @@ 4 1 2 - GTK_FILL - GTK_FILL + fill + fill True - True - False - False - True + True + False + True + False - - Birthday + + Birthday 3 4 - GTK_FILL - GTK_FILL + 0 + 1 + fill + fill @@ -1555,6 +2150,18 @@ True Miscellaneous + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -1562,137 +2169,206 @@ - 2 + 0 + True + True - 1 + False + True True Personal Information + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - - 1 - False - True - vertical False 0 vertical - True 6 + True 0 - none + 0.5 + GTK_SHADOW_NONE - True 6 - 0.15000000596046448 - 0.69999998807907104 + True + 0.5 + 0.15000000596 + 1 + 0.699999988079 + 0 + 0 19 10 50 True + False + 0 True 4 4 - 6 + False 6 + 6 193 69 True True - automatic - automatic - in + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT 25 True True + True + False False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 1 2 + 0 3 - GTK_FILL - GTK_FILL + fill + fill True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True - 1 _City: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-home-city + PANGO_ELLIPSIZE_NONE + -1 True + 0 2 3 - GTK_FILL - + 0 + 1 + fill + True True + True + True + 0 + + True + False 3 4 1 2 - + True - 1 _Zip/Postal Code: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-home-zip + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 1 2 - GTK_FILL - + fill + @@ -1700,30 +2376,47 @@ 256 True True + True + True + 0 + + True + False 3 4 2 3 - + True - 1 _State/Province: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-home-state + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 2 3 - GTK_FILL - + fill + @@ -1731,31 +2424,47 @@ 163 True True + True + True + 0 + + True + False 3 4 3 4 - + True - 1 - 4 _Country: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 4 entry-home-country + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 3 4 - GTK_FILL - + fill + @@ -1763,52 +2472,82 @@ 100 True True + True + True + 0 + + True + False 1 2 3 4 - + True - 1 _PO Box: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-home-pobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 3 4 - GTK_FILL - + fill + True - 1 _Address: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 textview-home-address + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - GTK_FILL - + 0 + 1 + 0 + 1 + fill + - - - - - - - 0 + 0 + True + True @@ -1818,8 +2557,19 @@ True - 0.41999998688697815 Home + False + GTK_JUSTIFY_LEFT + False + False + 0.419999986887 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -1827,128 +2577,203 @@ - 0 + 0 + True + True - True 6 + True 0 - none + 0.5 + GTK_SHADOW_NONE - True 6 - 0.15000000596046448 - 0.69999998807907104 + True + 0.5 + 0.15000000596 + 1 + 0.699999988079 + 0 + 0 19 10 50 True + False + 0 True 4 4 - 6 + False 6 + 6 193 69 True True - automatic - automatic - in + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT 25 True True + True + False False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 1 2 + 0 3 - GTK_FILL - GTK_FILL + fill + fill True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True - 1 _City: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-work-city + PANGO_ELLIPSIZE_NONE + -1 True + 0 2 3 - GTK_FILL - + 0 + 1 + fill + True - 1 _Address: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 textview-work-address + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - GTK_FILL - + 0 + 1 + 0 + 1 + fill + True True + True + True + 0 + + True + False 3 4 1 2 - + True - 1 _Zip/Postal Code: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-work-zip + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 1 2 - GTK_FILL - + fill + @@ -1956,30 +2781,47 @@ 256 True True + True + True + 0 + + True + False 3 4 2 3 - + True - 1 _State/Province: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-work-state + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 2 3 - GTK_FILL - + fill + @@ -1987,31 +2829,47 @@ 163 True True + True + True + 0 + + True + False 3 4 3 4 - + True - 1 - 4 _Country: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 4 entry-home-country + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 3 4 - GTK_FILL - + fill + @@ -2019,39 +2877,54 @@ 100 True True + True + True + 0 + + True + False 1 2 3 4 - + True - 1 _PO Box: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-work-pobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 3 4 - GTK_FILL - + fill + - - - - - - - 0 + 0 + True + True @@ -2061,8 +2934,19 @@ True - 0.41999998688697815 Work + False + GTK_JUSTIFY_LEFT + False + False + 0.419999986887 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -2070,102 +2954,164 @@ - 1 + 0 + True + True - True 6 + True 0 - none + 0.5 + GTK_SHADOW_NONE - True 6 - 0.15000000596046448 - 0.69999998807907104 + True + 0.5 + 0.15000000596 + 1 + 0.699999988079 + 0 + 0 19 10 50 True + False + 0 True 4 4 - 6 + False 6 + 6 True True + True + True + 0 + + True + False 3 4 - + 0 + 1 + True - 1 _City: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-other-city + PANGO_ELLIPSIZE_NONE + -1 True + 0 2 3 - GTK_FILL - + 0 + 1 + fill + True - 1 _Address: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 textview-other-address + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - GTK_FILL - + 0 + 1 + 0 + 1 + fill + True True + True + True + 0 + + True + False 3 4 1 2 - + True - 1 _Zip/Postal Code: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-other-zip + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 1 2 - GTK_FILL - + fill + @@ -2173,30 +3119,47 @@ 256 True True + True + True + 0 + + True + False 3 4 2 3 - + True - 1 _State/Province: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-other-state + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 2 3 - GTK_FILL - + fill + @@ -2204,31 +3167,47 @@ 163 True True + True + True + 0 + + True + False 3 4 3 4 - + True - 1 - 4 _Country: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 4 entry-other-country + PANGO_ELLIPSIZE_NONE + -1 + False + 0 2 3 3 4 - GTK_FILL - + fill + @@ -2236,28 +3215,47 @@ 100 True True + True + True + 0 + + True + False 1 2 3 4 - + True - 1 _PO Box: True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 entry-other-pobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + 0 + 1 3 4 - GTK_FILL - + fill + @@ -2266,35 +3264,44 @@ 69 True True - automatic - automatic - in + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT 25 True True + True + False False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 1 2 + 0 3 - GTK_FILL - GTK_FILL + fill + fill - - - - - - - 0 + 0 + True + True @@ -2304,8 +3311,19 @@ True - 0.41999998688697815 Other + False + GTK_JUSTIFY_LEFT + False + False + 0.419999986887 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -2313,65 +3331,99 @@ - 2 + 0 + True + True - 2 + False + True True Mailing Address + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - - 2 - False - True - vertical False 0 vertical - True 6 + True 0 - none + 0.5 + GTK_SHADOW_NONE - True 6 - 0.15000000596046448 + True + 0.5 + 0.15000000596 + 1 + 1 + 0 + 0 19 10 50 True + False + 0 38 True True - automatic - automatic - in + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT True True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 - 0 + 0 + True + True @@ -2381,8 +3433,19 @@ True - 0.41999998688697815 Notes + False + GTK_JUSTIFY_LEFT + False + False + 0.419999986887 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 @@ -2390,84 +3453,41 @@ - 0 + 0 + True + True - 3 + False + True True Notes + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - - 3 - False - - 1 - - - - - True - end - - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 2 - - - - - False - end - 0 + 0 + True + True -- cgit From b2e4cb4ae9248fd4f192d0e3bf41a23ede05451d Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 26 Mar 2010 10:10:06 +0000 Subject: Add conditionally enabled expanders for 'Other' address and 'Misc' personal items, to fit on a 600 pixel high screen. --- addressbook/gui/contact-editor/contact-editor.ui | 11 ++++------ addressbook/gui/contact-editor/e-contact-editor.c | 25 ++++++++++++++++++----- 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index fe53b703a4..e753e70267 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1930,10 +1930,9 @@ - + True - 0 - 0.5 + True GTK_SHADOW_NONE @@ -2960,12 +2959,10 @@ - + 6 True - 0 - 0.5 - GTK_SHADOW_NONE + True 6 diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 61302854a8..a1c14c2ab2 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1793,6 +1793,15 @@ sensitize_im (EContactEditor *editor) } } +static void +init_personal (EContactEditor *editor) +{ + gtk_expander_set_expanded ( + GTK_EXPANDER (e_builder_get_widget (editor->builder, + "expander-personal-misc")), + !editor->compress_ui); +} + static void init_address_textview (EContactEditor *editor, gint record) { @@ -1840,6 +1849,11 @@ init_address (EContactEditor *editor) for (i = 0; i < ADDRESS_SLOTS; i++) init_address_record (editor, i); + + gtk_expander_set_expanded ( + GTK_EXPANDER (e_builder_get_widget (editor->builder, + "expander-address-other")), + !editor->compress_ui); } static void @@ -2641,11 +2655,12 @@ sensitize_all (EContactEditor *editor) static void init_all (EContactEditor *editor) { - init_simple (editor); - init_email (editor); - init_phone (editor); - init_im (editor); - init_address (editor); + init_simple (editor); + init_email (editor); + init_phone (editor); + init_im (editor); + init_personal (editor); + init_address (editor); } static void -- cgit From 4146e452f1c3c72ae350bca6791c9fe0511774a6 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 26 Mar 2010 10:34:41 +0000 Subject: Add a scrolled area to cope if we want to expand mail settigns --- addressbook/gui/contact-editor/contact-editor.ui | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index e753e70267..b0531047ca 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -136,6 +136,18 @@ False False + + + True + True + never + automatic + + + True + queue + + 12 True @@ -1282,6 +1294,12 @@ + + + + + + False True -- cgit From 9a7b0ca48f415bb64e46ed4e3f16076e3efef228 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 26 Mar 2010 10:41:02 +0000 Subject: Scrolled window for personal bits ... --- addressbook/gui/contact-editor/contact-editor.ui | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index b0531047ca..adc7d466e4 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1324,8 +1324,19 @@ 0 + + + True + True + never + automatic + + + True + queue + - + 12 True False @@ -2192,11 +2203,18 @@ + + + + + + False True + True -- cgit From 28bf4aa38a9a1e7796caf6fa6ebc1f5a1c470848 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Fri, 26 Mar 2010 22:55:12 +0000 Subject: Get the new contact sizing right despite the scrolled regions. Add Claire's calendar popup feedback wrt. express mode --- addressbook/gui/contact-editor/contact-editor.ui | 2 +- addressbook/gui/contact-editor/e-contact-editor.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index adc7d466e4..8f64ddb07d 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1325,7 +1325,7 @@ - + True True never diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index a1c14c2ab2..d540ecd96b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2655,12 +2655,22 @@ sensitize_all (EContactEditor *editor) static void init_all (EContactEditor *editor) { + GtkRequisition tab_req; + init_simple (editor); init_email (editor); init_phone (editor); init_im (editor); init_personal (editor); init_address (editor); + + /* with so many scrolled windows, we need to + do some manual sizing */ + gtk_widget_size_request ( + e_builder_get_widget (editor->builder, "vbox-size-leader"), &tab_req); + gtk_widget_set_size_request ( + e_builder_get_widget (editor->builder, "scrolledwindow-size-leader"), + tab_req.width, tab_req.height); } static void -- cgit From d8a5849ed2a969263aacf460e9c67f702bfdb09b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 29 Mar 2010 09:49:53 +0100 Subject: Last scroll-pane, and manual sizing tweak --- addressbook/gui/contact-editor/contact-editor.ui | 20 ++++++++++++++++++++ addressbook/gui/contact-editor/e-contact-editor.c | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index 8f64ddb07d..c56f96f35a 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -2235,6 +2235,19 @@ + + + True + True + never + automatic + + + True + queue + + + True False @@ -3370,6 +3383,13 @@ + + + + + + + False True diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index d540ecd96b..b251552b35 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2670,7 +2670,7 @@ init_all (EContactEditor *editor) e_builder_get_widget (editor->builder, "vbox-size-leader"), &tab_req); gtk_widget_set_size_request ( e_builder_get_widget (editor->builder, "scrolledwindow-size-leader"), - tab_req.width, tab_req.height); + tab_req.width, tab_req.height + 8); } static void -- cgit From f0a09020d6824e86e13e1ee64c23a4a0a0200f40 Mon Sep 17 00:00:00 2001 From: Jeff Cai Date: Thu, 8 Apr 2010 10:18:37 +0800 Subject: Fix for bug #613564 If no <> in the email address, addr should be the full email address. --- addressbook/gui/contact-editor/e-contact-quick-add.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 36bd4ed948..d10ceeac6f 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -605,6 +605,8 @@ e_contact_quick_add_email (const gchar *email, EContactQuickAddCallback cb, gpoi if (lt != NULL && gt != NULL && (gt - lt) > 0) { name = g_strndup (email, lt - email); addr = g_strndup (lt + 1, gt - lt - 1); + } else { + addr = email; } e_contact_quick_add (name, addr, cb, closure); -- cgit From 92fd12e03fce0aa2569212fa5fb47ca39ec3c6df Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 15 Apr 2010 15:40:22 +0100 Subject: Compress the contact viewer even more so it still fits. --- addressbook/gui/contact-editor/contact-editor.ui | 42 ++++++++++++++++++++++- addressbook/gui/contact-editor/e-contact-editor.c | 29 ++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index c56f96f35a..51fc9c9e29 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1586,6 +1586,13 @@ + + True + False + 4 + + + True Web Addresses @@ -1605,7 +1612,40 @@ - + + + + 20 + 20 + True + True + GTK_RELIEF_NONE + True + + + True + GTK_ARROW_RIGHT + GTK_SHADOW_NONE + 0.5 + 0.5 + 0 + 0 + + + + + Web addresses + + + + + 0 + True + True + + + + 0 diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index b251552b35..f8cae86762 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1160,6 +1160,18 @@ expand_widget_list (EContactEditor *editor, expanded); } +static void +expand_web (EContactEditor *editor, gboolean expanded) +{ + const char *names[] = { + "label-videourl", "label-fburl", + "entry-videourl", "entry-fburl", + NULL + }; + set_arrow_image (editor, "arrow-phone-expand", expanded); + expand_widget_list (editor, names, expanded); +} + static void expand_phone (EContactEditor *editor, gboolean expanded) { @@ -1800,6 +1812,8 @@ init_personal (EContactEditor *editor) GTK_EXPANDER (e_builder_get_widget (editor->builder, "expander-personal-misc")), !editor->compress_ui); + + expand_web (editor, !editor->compress_ui); } static void @@ -3451,6 +3465,19 @@ setup_tab_order(GtkBuilder *builder) g_list_free (list); } +static void +expand_web_toggle (EContactEditor *ce) +{ + GtkWidget *widget; + + widget = e_builder_get_widget (ce->builder, "label-videourl"); +#if GTK_CHECK_VERSION(2,19,7) + expand_web (ce, !gtk_widget_get_visible (widget)); +#else + expand_web (ce, !GTK_WIDGET_VISIBLE (widget)); +#endif +} + static void expand_phone_toggle (EContactEditor *ce) { @@ -3535,6 +3562,8 @@ e_contact_editor_init (EContactEditor *e_contact_editor) g_signal_connect (widget, "clicked", G_CALLBACK (file_cancel_cb), e_contact_editor); widget = e_builder_get_widget (e_contact_editor->builder, "button-help"); g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); + widget = e_builder_get_widget (e_contact_editor->builder, "button-web-expand"); + g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_web_toggle), e_contact_editor); widget = e_builder_get_widget (e_contact_editor->builder, "button-phone-expand"); g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor); widget = e_builder_get_widget (e_contact_editor->builder, "button-mail-expand"); -- cgit From d1a03a7d97f934a1f4cb8f23940403a4c9415ecd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 25 Apr 2010 23:45:44 -0400 Subject: Fix a potential crasher in e_contact_quick_add_email(). --- addressbook/gui/contact-editor/e-contact-quick-add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index d10ceeac6f..6a8a5fd19d 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -606,7 +606,7 @@ e_contact_quick_add_email (const gchar *email, EContactQuickAddCallback cb, gpoi name = g_strndup (email, lt - email); addr = g_strndup (lt + 1, gt - lt - 1); } else { - addr = email; + addr = g_strdup (email); } e_contact_quick_add (name, addr, cb, closure); -- cgit From a8801c8c87269d0d98b9915f0268097c8117f297 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Thu, 29 Apr 2010 14:10:25 +0530 Subject: Bug #617150 - Crash printing contacts in List View The returned widget does not have a reference added, so you do not need to unref it. --- addressbook/gui/widgets/e-addressbook-view.c | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 6ffeee56a0..d3538899ba 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1237,7 +1237,6 @@ e_addressbook_view_print (EAddressbookView *view, widget = gtk_bin_get_child (GTK_BIN (view)); printable = e_table_get_printable (E_TABLE (widget)); g_object_ref_sink (printable); - g_object_unref (widget); e_contact_print_button (printable, action); -- cgit From 14be589bba72db8a649a88f34234bf8af9170de2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 25 Apr 2010 23:45:44 -0400 Subject: Fix a potential crasher in e_contact_quick_add_email(). --- addressbook/gui/contact-editor/e-contact-quick-add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index d10ceeac6f..6a8a5fd19d 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -606,7 +606,7 @@ e_contact_quick_add_email (const gchar *email, EContactQuickAddCallback cb, gpoi name = g_strndup (email, lt - email); addr = g_strndup (lt + 1, gt - lt - 1); } else { - addr = email; + addr = g_strdup (email); } e_contact_quick_add (name, addr, cb, closure); -- cgit From a7f1c9d0f86bd6ec035c151969216656af4f8bae Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 May 2010 12:12:06 +0200 Subject: Bug #618177 - Mobile Phone of imported contacts not shown in preview --- addressbook/importers/evolution-vcard-importer.c | 31 +++++++++++++++--------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'addressbook') diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 1222566387..080ef940f2 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -138,6 +138,7 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) EVCardAttribute *a = attr->data; gboolean location_only = TRUE; gboolean no_location = TRUE; + gboolean is_work_home = FALSE; GList *params, *param; if (g_ascii_strcasecmp (e_vcard_attribute_get_name (a), @@ -155,6 +156,10 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) vs = e_vcard_attribute_param_get_values (p); for (v = vs; v; v = v->next) { + is_work_home = is_work_home || + !g_ascii_strcasecmp ((gchar *)v->data, "WORK") || + !g_ascii_strcasecmp ((gchar *)v->data, "HOME"); + if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") || !g_ascii_strcasecmp ((gchar *)v->data, "HOME") || !g_ascii_strcasecmp ((gchar *)v->data, "OTHER")) @@ -164,17 +169,21 @@ vcard_import_contact(VCardImporter *gci, EContact *contact) } } - if (location_only) { - /* add VOICE */ - e_vcard_attribute_add_param_with_value (a, - e_vcard_attribute_param_new (EVC_TYPE), - "VOICE"); - } - if (no_location) { - /* add OTHER */ - e_vcard_attribute_add_param_with_value (a, - e_vcard_attribute_param_new (EVC_TYPE), - "OTHER"); + if (is_work_home) { + /* only WORK and HOME phone numbers require locations, + the rest should be kept as is */ + if (location_only) { + /* add VOICE */ + e_vcard_attribute_add_param_with_value (a, + e_vcard_attribute_param_new (EVC_TYPE), + "VOICE"); + } + if (no_location) { + /* add OTHER */ + e_vcard_attribute_add_param_with_value (a, + e_vcard_attribute_param_new (EVC_TYPE), + "OTHER"); + } } } -- cgit From 40fb13f6a3200ade9449090ef84278ee06f76fc0 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 20 May 2010 14:36:41 +0200 Subject: On Windows, some LDIF files can have .ldi extension --- addressbook/importers/evolution-ldif-importer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook') diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 41dda05a40..cfc363756d 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -565,8 +565,8 @@ ldif_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) return vbox; } -static const gchar *supported_extensions[2] = { - ".ldif", NULL +static const gchar *supported_extensions[3] = { + ".ldif", ".ldi", NULL }; static gboolean -- cgit From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- addressbook/gui/contact-editor/e-contact-editor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index f8cae86762..0f8eb07b15 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1136,7 +1136,7 @@ set_attributes_named (EVCard *vcard, const gchar *attr_name, GList *attr_list) static void set_arrow_image (EContactEditor *editor, - const char *arrow_widget, + const gchar *arrow_widget, gboolean expanded) { GtkWidget *arrow; @@ -1150,10 +1150,10 @@ set_arrow_image (EContactEditor *editor, static void expand_widget_list (EContactEditor *editor, - const char **widget_names, + const gchar **widget_names, gboolean expanded) { - int i; + gint i; for (i = 0; widget_names[i]; i++) gtk_widget_set_visible ( e_builder_get_widget (editor->builder, widget_names[i]), @@ -1163,7 +1163,7 @@ expand_widget_list (EContactEditor *editor, static void expand_web (EContactEditor *editor, gboolean expanded) { - const char *names[] = { + const gchar *names[] = { "label-videourl", "label-fburl", "entry-videourl", "entry-fburl", NULL @@ -1175,7 +1175,7 @@ expand_web (EContactEditor *editor, gboolean expanded) static void expand_phone (EContactEditor *editor, gboolean expanded) { - const char *names[] = { + const gchar *names[] = { "entry-phone-2", "combobox-phone-2", "entry-phone-4", "combobox-phone-4", "table-phone-extended", NULL @@ -1189,7 +1189,7 @@ expand_mail (EContactEditor *editor, gboolean expanded) { GtkTable *table; GtkWidget *check; - const char *names[] = { + const gchar *names[] = { "entry-email-2", "combobox-email-2", "entry-email-3", "combobox-email-3", "entry-email-4", "combobox-email-4", -- cgit