[evolution] Get the new contact sizing right despite the scrolled regions. Add Claire's calendar popup feedback
- From: Michael Meeks <michael src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Get the new contact sizing right despite the scrolled regions. Add Claire's calendar popup feedback
- Date: Mon, 29 Mar 2010 08:53:55 +0000 (UTC)
commit 4df23d489b8542ecb942e29289d2c28686d9dc9d
Author: Michael Meeks <michael meeks novell com>
Date: Fri Mar 26 22:55:12 2010 +0000
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 ++++++++++
ui/evolution-calendars.ui | 16 ++++++++++++++++
ui/evolution-contacts.ui | 4 +++-
4 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index adc7d46..8f64ddb 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -1325,7 +1325,7 @@
</object>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow-size-leader">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index a1c14c2..d540ecd 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
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index bf49103..f38fa2e 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -5,8 +5,10 @@
<menuitem action='event-open'/>
</placeholder>
<placeholder name='print-actions'>
+#if !EXPRESS
<menuitem action='calendar-print-preview'/>
<menuitem action='calendar-print'/>
+#endif
</placeholder>
</menu>
<menu action='edit-menu'>
@@ -75,12 +77,15 @@
<menuitem action='event-new'/>
<menuitem action='event-all-day-new'/>
<menuitem action='event-meeting-new'/>
+#if !EXPRESS
<menuitem action='task-new'/>
<separator/>
<menuitem action='event-popup-print'/>
<separator/>
+#endif
<menuitem action='popup-paste-clipboard'/>
<separator/>
+#if !EXPRESS
<menu action='gal-view-menu'>
<menuitem action='calendar-view-day'/>
<menuitem action='calendar-view-workweek'/>
@@ -92,24 +97,31 @@
</menu>
<menuitem action='calendar-popup-go-today'/>
<menuitem action='calendar-popup-jump-to'/>
+#endif
</popup>
<popup name='calendar-event-popup'>
<menuitem action='event-popup-open'/>
<menuitem action='event-popup-save-as'/>
+#if !EXPRESS
<menuitem action='event-popup-print'/>
+#endif
<separator/>
<menuitem action='popup-cut-clipboard'/>
<menuitem action='popup-copy-clipboard'/>
<menuitem action='popup-paste-clipboard'/>
+#if !EXPRESS
<separator/>
<menuitem action='event-popup-copy'/>
<menuitem action='event-popup-move'/>
+#endif
<menuitem action='event-popup-delegate'/>
<menuitem action='event-popup-schedule'/>
<menuitem action='event-popup-schedule-appointment'/>
+#if !EXPRESS
<menuitem action='event-popup-forward'/>
<menuitem action='event-popup-reply'/>
<menuitem action='event-popup-reply-all'/>
+#endif
<separator/>
<menuitem action='event-popup-occurrence-movable'/>
<menuitem action='event-popup-delete'/>
@@ -124,7 +136,9 @@
<menuitem action='calendar-memopad-open'/>
<menuitem action='calendar-memopad-open-url'/>
<menuitem action='calendar-memopad-save-as'/>
+#if !EXPRESS
<menuitem action='calendar-memopad-print'/>
+#endif
<separator/>
<menuitem action='popup-cut-clipboard'/>
<menuitem action='popup-copy-clipboard'/>
@@ -140,7 +154,9 @@
<menuitem action='calendar-taskpad-open'/>
<menuitem action='calendar-taskpad-open-url'/>
<menuitem action='calendar-taskpad-save-as'/>
+#if !EXPRESS
<menuitem action='calendar-taskpad-print'/>
+#endif
<separator/>
<menuitem action='popup-cut-clipboard'/>
<menuitem action='popup-copy-clipboard'/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index aeb6c79..77061bb 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -7,8 +7,10 @@
<menuitem action='address-book-save-as'/>
</placeholder>
<placeholder name='print-actions'>
+#if !EXPRESS
<menuitem action='address-book-print-preview'/>
<menuitem action='address-book-print'/>
+#endif
</placeholder>
</menu>
<menu action='edit-menu'>
@@ -49,8 +51,8 @@
#if !EXPRESS
<toolitem action='send-receive'/>
<separator/>
-#endif
<toolitem action='address-book-print'/>
+#endif
<toolitem action='delete-selection'/>
<toolitem action='address-book-stop'/>
</toolbar>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]