diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-27 01:09:33 +0800 |
| commit | c9ec8c3f4dce2b02c91268529977770364ef87fe (patch) | |
| tree | d574f2be1b5438407e59e2fead1321766c9bbc83 /addressbook | |
| parent | 6fec6bf39467dd32625847be1b021a7e5bc94d76 (diff) | |
| parent | 96538878911586a9e9ca26b81e1916c04e538980 (diff) | |
| download | gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.gz gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.tar.zst gsoc2013-evolution-c9ec8c3f4dce2b02c91268529977770364ef87fe.zip | |
Merge branch 'express2'
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/contact-editor/contact-editor.ui | 43 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 29 |
2 files changed, 71 insertions, 1 deletions
diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui index 17aad19f0f..3701557062 100644 --- a/addressbook/gui/contact-editor/contact-editor.ui +++ b/addressbook/gui/contact-editor/contact-editor.ui @@ -1586,6 +1586,13 @@ </object> </child> <child type="label"> + <object class="GtkHBox" id="hbox5617"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">4</property> + <child> + + <object class="GtkLabel" id="label410"> <property name="visible">True</property> <property name="label" translatable="yes">Web Addresses</property> @@ -1605,7 +1612,40 @@ <attribute name="weight" value="bold"/> </attributes> </object> - </child> + </child> + <child> + <object class="GtkButton" id="button-web-expand"> + <property name="width_request">20</property> + <property name="height_request">20</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="focus_on_click">True</property> + <child> + <object class="GtkArrow" id="arrow-web-expand"> + <property name="visible">True</property> + <property name="arrow_type">GTK_ARROW_RIGHT</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="a11y-button-web-expand1"> + <property name="AtkObject::accessible_name" translatable="yes">Web addresses</property> + </object> + </child> + </object> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </object> + </child> </object> <packing> <property name="padding">0</property> @@ -1962,6 +2002,7 @@ <object class="GtkExpander" id="expander-personal-misc"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> <child> <object class="GtkTable" id="table89"> <property name="border_width">12</property> diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 197ce2bdf5..2f885e4721 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1161,6 +1161,18 @@ expand_widget_list (EContactEditor *editor, } static void +expand_web (EContactEditor *editor, gboolean expanded) +{ + const gchar *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) { const gchar *names[] = { @@ -1803,6 +1815,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 @@ -3455,6 +3469,19 @@ setup_tab_order(GtkBuilder *builder) } 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) { GtkWidget *phone_ext_table; @@ -3533,6 +3560,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"); |