callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compress the contact viewer even more so it still fits.

Browse Source
This commit is contained in:
Michael Meeks
2010-04-15 15:40:22 +01:00
parent bdca2cc885
commit 92fd12e03f
2 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
addressbook/gui/contact-editor/contact-editor.ui
View File

@ -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>

29
addressbook/gui/contact-editor/e-contact-editor.c
View File

@ -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");