aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-03-26 18:10:06 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-03-29 16:51:50 +0800
commit0b61248ed66f1993e22441371930f635d254d14c (patch)
tree7eb5c5191713e1ad29db99b7e4361bbba3e9e6d2 /addressbook
parent8d86849064ac285c93e78b87113b40d3d08420b4 (diff)
downloadgsoc2013-evolution-0b61248ed66f1993e22441371930f635d254d14c.tar.gz
gsoc2013-evolution-0b61248ed66f1993e22441371930f635d254d14c.tar.zst
gsoc2013-evolution-0b61248ed66f1993e22441371930f635d254d14c.zip
Add conditionally enabled expanders for 'Other' address and 'Misc'
personal items, to fit on a 600 pixel high screen.
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/contact-editor/contact-editor.ui11
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c25
2 files changed, 24 insertions, 12 deletions
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 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame69">
+ <object class="GtkExpander" id="expander-personal-misc">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
+ <property name="can_focus">True</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<object class="GtkTable" id="table89">
@@ -2960,12 +2959,10 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame78">
+ <object class="GtkExpander" id="expander-address-other">
<property name="border_width">6</property>
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="can_focus">True</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="border_width">6</property>
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
@@ -1794,6 +1794,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)
{
gchar *textview_name;
@@ -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