aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/e-shell-settings-dialog.c21
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-multi-config-dialog.c8
4 files changed, 23 insertions, 22 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 86e6cca3ec..b36a4950c3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-26 Rodney Dawes <dobey@ximian.com>
+
+ * e-shell-settings-dialog.c (impl_realize): We don't need this really
+ (class_init): We don't need to have our own realize impl for setting
+ the default window size of the dialog, especially since we are setting
+ the size before we actually get realized, anyway
+ (init): Set the dialog size here, and don't set the border width of the
+ dialog
+
2004-03-18 Not Zed <NotZed@Ximian.com>
* e-shell-about-box.c: added (c) symbol and 2004 and changed to
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index f0476bf0d5..0fda959b97 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -272,21 +272,6 @@ load_pages (EShellSettingsDialog *dialog)
}
-/* GtkWidget methods. */
-
-static void
-impl_realize (GtkWidget *widget)
-{
- EShellSettingsDialog *dialog;
-
- dialog = E_SHELL_SETTINGS_DIALOG (widget);
-
- set_dialog_size (dialog);
-
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-}
-
-
/* GtkObject methods. */
static gboolean
@@ -319,14 +304,10 @@ static void
class_init (EShellSettingsDialog *class)
{
GObjectClass *object_class;
- GtkWidgetClass *widget_class;
object_class = G_OBJECT_CLASS (class);
object_class->finalize = impl_finalize;
- widget_class = GTK_WIDGET_CLASS (class);
- widget_class->realize = impl_realize;
-
parent_class = g_type_class_ref(PARENT_TYPE);
}
@@ -341,8 +322,8 @@ init (EShellSettingsDialog *dialog)
dialog->priv = priv;
load_pages (dialog);
+ set_dialog_size (dialog);
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings"));
}
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 3ce77d0ec1..a24c1f66f7 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-26 Rodney Dawes <dobey@ximian.com>
+
+ * e-multi-config-dialog.c (init): Remove the dialog separator
+ Set the border widths of the dialog's vbox and action area to be more
+ HIG-compliant
+ Set the border width of the dialog's child to 12 for HIG-compliance
+
2004-03-15 JP Rosevear <jpr@ximian.com>
* e-calendar-item.c (e_calendar_item_class_init): change arg name
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 97b4e7ab3d..dbd8cc4a15 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -377,10 +377,14 @@ init (EMultiConfigDialog *multi_config_dialog)
ECell *text;
ECell *vbox;
+ gtk_dialog_set_has_separator (GTK_DIALOG (multi_config_dialog), FALSE);
+ gtk_widget_realize (GTK_WIDGET (multi_config_dialog));
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (multi_config_dialog)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (multi_config_dialog)->action_area), 12);
+
hbox = gtk_hbox_new (FALSE, 6);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
dialog_vbox = GTK_DIALOG (multi_config_dialog)->vbox;
- gtk_box_set_spacing (GTK_BOX (dialog_vbox), 6);
gtk_container_add (GTK_CONTAINER (dialog_vbox), hbox);