From 0478e01708ab2460901f7a2fb8cae749a4e85c45 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 3 Feb 2011 10:45:03 +0100 Subject: Bug #641011 - Ugly appointment editing windows --- calendar/gui/dialogs/comp-editor.c | 8 ++++++-- e-util/e-config.c | 1 + mail/em-account-editor.c | 5 +++++ mail/em-subscription-editor.c | 1 + plugins/imap-features/imap-headers.c | 1 + widgets/misc/e-preferences-window.c | 1 + widgets/misc/e-send-options.c | 2 ++ 7 files changed, 17 insertions(+), 2 deletions(-) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 7628f7f1bb..eaecd1b8e8 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -2644,8 +2644,10 @@ comp_editor_append_widget (CompEditor *editor, priv->pages = g_list_append (priv->pages, page); - if (add) + if (add) { gtk_notebook_append_page (priv->notebook, page, label_widget); + gtk_container_child_set (GTK_CONTAINER (priv->notebook), page, "tab-fill", FALSE, "tab-expand", FALSE, NULL); + } /* Listen for when the page is mapped/unmapped so we can install/uninstall the appropriate GtkAccelGroup. @@ -2706,8 +2708,10 @@ comp_editor_append_page (CompEditor *editor, priv->pages = g_list_append (priv->pages, page); - if (add) + if (add) { gtk_notebook_append_page (priv->notebook, page_widget, label_widget); + gtk_container_child_set (GTK_CONTAINER (priv->notebook), page_widget, "tab-fill", FALSE, "tab-expand", FALSE, NULL); + } /* Listen for things happening on the page */ g_signal_connect_swapped ( diff --git a/e-util/e-config.c b/e-util/e-config.c index 99597e2b05..3c1aeb4c21 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -790,6 +790,7 @@ ec_rebuild (EConfig *emp) gtk_container_set_border_width ((GtkContainer *)page, 12); gtk_widget_show (page); gtk_notebook_insert_page ((GtkNotebook *)book, page, w, pageno); + gtk_container_child_set (GTK_CONTAINER (book), page, "tab-fill", FALSE, "tab-expand", FALSE, NULL); wn->frame = page; } } else diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 54c298a3e9..0a74e6b3b8 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2214,6 +2214,7 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget w = page; } else { gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity"))); + gtk_container_child_set (GTK_CONTAINER (parent), w, "tab-fill", FALSE, "tab-expand", FALSE, NULL); } emae_queue_widgets ( @@ -2258,6 +2259,7 @@ emae_receive_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget w = page; } else { gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Receiving Email"))); + gtk_container_child_set (GTK_CONTAINER (parent), w, "tab-fill", FALSE, "tab-expand", FALSE, NULL); } emae_queue_widgets ( @@ -2757,6 +2759,7 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol w = page; } else { gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Sending Email"))); + gtk_container_child_set (GTK_CONTAINER (parent), w, "tab-fill", FALSE, "tab-expand", FALSE, NULL); } emae_queue_widgets ( @@ -3042,6 +3045,7 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget gtk_widget_show (widget); }else { gtk_notebook_append_page ((GtkNotebook *)parent, widget, gtk_label_new (_("Defaults"))); + gtk_container_child_set (GTK_CONTAINER (parent), widget, "tab-fill", FALSE, "tab-expand", FALSE, NULL); } emae_queue_widgets ( @@ -3170,6 +3174,7 @@ emae_security_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget w = e_builder_get_widget (builder, item->label); gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Security"))); + gtk_container_child_set (GTK_CONTAINER (parent), w, "tab-fill", FALSE, "tab-expand", FALSE, NULL); g_object_unref (builder); diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index f84486a4dc..baaf3eac53 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -842,6 +842,7 @@ subscription_editor_add_account (EMSubscriptionEditor *editor, gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); gtk_notebook_append_page (GTK_NOTEBOOK (container), widget, NULL); + gtk_container_child_set (GTK_CONTAINER (container), widget, "tab-fill", FALSE, "tab-expand", FALSE, NULL); gtk_widget_show (widget); container = widget; diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index 9ec5fb923e..dd4032ed6d 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -340,6 +340,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) g_signal_connect (selection, "changed", G_CALLBACK (epif_tv_selection_changed), ui->remove_header); gtk_notebook_append_page ((GtkNotebook *)(data->parent), vbox, gtk_label_new(_("IMAP Headers"))); + gtk_container_child_set (GTK_CONTAINER (data->parent), vbox, "tab-fill", FALSE, "tab-expand", FALSE, NULL); gtk_widget_show_all (vbox); return GTK_WIDGET (vbox); diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c index 023c3e058f..48b1d3e92b 100644 --- a/widgets/misc/e-preferences-window.c +++ b/widgets/misc/e-preferences-window.c @@ -434,6 +434,7 @@ e_preferences_window_add_page (EPreferencesWindow *window, gtk_widget_show (GTK_WIDGET (align)); g_object_set_data (G_OBJECT (align), "create_fn", create_fn); gtk_notebook_append_page (notebook, align, NULL); + gtk_container_child_set (GTK_CONTAINER (notebook), align, "tab-fill", FALSE, "tab-expand", FALSE, NULL); /* Force GtkIconView to recalculate the text wrap width, * otherwise we get a really narrow icon list on the left diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 48eda2dced..f42830b258 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -499,10 +499,12 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) GtkWidget *widget = gtk_label_new (_("Calendar")); gtk_label_set_text (GTK_LABEL (priv->sopts_label), _("Mail")); gtk_notebook_append_page (priv->notebook, priv->status, widget); + gtk_container_child_set (GTK_CONTAINER (priv->notebook), priv->status, "tab-fill", FALSE, "tab-expand", FALSE, NULL); gtk_widget_show (widget); widget = gtk_label_new (_("Task")); gtk_widget_show (widget); gtk_notebook_append_page (priv->notebook, priv->status,widget); + gtk_container_child_set (GTK_CONTAINER (priv->notebook), priv->status, "tab-fill", FALSE, "tab-expand", FALSE, NULL); gtk_notebook_set_show_tabs (priv->notebook, TRUE); } -- cgit