aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2004-04-15 05:30:54 +0800
committerRodney Dawes <dobey@src.gnome.org>2004-04-15 05:30:54 +0800
commit24c56f175744c852ef211207405ea40ae3fba450 (patch)
tree9d4963cade5b3f8976fb459ff59be66188eea349
parentfef953748465f6fdf47384a3b0c50474d418540e (diff)
downloadgsoc2013-evolution-24c56f175744c852ef211207405ea40ae3fba450.tar.gz
gsoc2013-evolution-24c56f175744c852ef211207405ea40ae3fba450.tar.zst
gsoc2013-evolution-24c56f175744c852ef211207405ea40ae3fba450.zip
Set the border widths on the dialog's vbox and action area to be
2004-04-09 Rodney Dawes <dobey@ximian.com> * e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_construct): Set the border widths on the dialog's vbox and action area to be HIG-complaint Get rid of the timezone preview widget in here Point the internal 'table' to the right widget (on_map_motion): Get rid of the extra-hacky code to set the preview widget's label to the timezone, now that that widget is gone (on_map_leave): Update the comment to not reference the preview widget that is now gone Get rid of the code to set the preview widget's label to empty string * e-timezone-dialog/e-timezone-dialog.glade: Update for HIG-compliance 2004-04-09 Rodney Dawes <dobey@ximian.com> * e-charset-picker.c: Include gtkhbox.h in here to avoid the warnings (activate_other): (e_charset_picker_dialog): Make these dialogs be more HIG-compliant * e-filter-bar.c (do_advanced): (menubar_activated): Make these dialogs be more HIG-compliant svn path=/trunk/; revision=25468
-rw-r--r--widgets/ChangeLog14
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.c33
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.glade227
-rw-r--r--widgets/misc/ChangeLog8
-rw-r--r--widgets/misc/e-charset-picker.c55
-rw-r--r--widgets/misc/e-filter-bar.c13
6 files changed, 208 insertions, 142 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 85ab1be87b..765112025a 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,17 @@
+2004-04-09 Rodney Dawes <dobey@ximian.com>
+
+ * e-timezone-dialog/e-timezone-dialog.c
+ (e_timezone_dialog_construct): Set the border widths on the dialog's
+ vbox and action area to be HIG-complaint
+ Get rid of the timezone preview widget in here
+ Point the internal 'table' to the right widget
+ (on_map_motion): Get rid of the extra-hacky code to set the preview
+ widget's label to the timezone, now that that widget is gone
+ (on_map_leave): Update the comment to not reference the preview
+ widget that is now gone
+ Get rid of the code to set the preview widget's label to empty string
+ * e-timezone-dialog/e-timezone-dialog.glade: Update for HIG-compliance
+
2004-02-26 JP Rosevear <jpr@ximian.com>
* e-timezone-dialog/e-timezone-dialog.c
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 3a31bbbf5d..d586fc8a76 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -58,7 +58,6 @@ struct _ETimezoneDialogPrivate {
GtkWidget *app;
GtkWidget *table;
GtkWidget *map_window;
- GtkWidget *timezone_preview;
GtkWidget *timezone_combo;
};
@@ -246,6 +245,9 @@ e_timezone_dialog_construct (ETimezoneDialog *etd)
goto error;
}
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (priv->app)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (priv->app)->action_area), 12);
+
priv->map = e_map_new ();
map = GTK_WIDGET (priv->map);
gtk_widget_set_events (map, gtk_widget_get_events (map)
@@ -293,13 +295,11 @@ get_widgets (ETimezoneDialog *etd)
priv->app = GW ("timezone-dialog");
priv->map_window = GW ("map-window");
priv->timezone_combo = GW ("timezone-combo");
- priv->timezone_preview = GW ("timezone-preview");
- priv->table = GW ("table1");
+ priv->table = GW ("timezone-table");
return (priv->app
&& priv->map_window
&& priv->timezone_combo
- && priv->timezone_preview
&& priv->table);
}
@@ -366,9 +366,6 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
ETimezoneDialog *etd;
ETimezoneDialogPrivate *priv;
double longitude, latitude;
- char *old_zone_name;
- const char *new_zone_name;
- icaltimezone *new_zone;
etd = E_TIMEZONE_DIALOG (data);
priv = etd->priv;
@@ -387,16 +384,6 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
e_map_point_set_color_rgba (priv->map, priv->point_hover,
E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA);
- gtk_label_get (GTK_LABEL (priv->timezone_preview), &old_zone_name);
- new_zone = get_zone_from_point (etd, priv->point_hover);
- if (new_zone) {
- new_zone_name = zone_display_name (new_zone);
- if (strcmp (old_zone_name, new_zone_name)) {
- gtk_label_set_text (GTK_LABEL (priv->timezone_preview),
- new_zone_name);
- }
- }
-
return TRUE;
}
@@ -406,14 +393,13 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
{
ETimezoneDialog *etd;
ETimezoneDialogPrivate *priv;
- char *old_zone;
etd = E_TIMEZONE_DIALOG (data);
priv = etd->priv;
- /* We only want to reset the hover point and the preview text if this
- is a normal leave event. For some reason we are getting leave events
- when the button is pressed in the map, which causes problems. */
+ /* We only want to reset the hover point if this is a normal leave
+ event. For some reason we are getting leave events when the
+ button is pressed in the map, which causes problems. */
if (event->mode != GDK_CROSSING_NORMAL)
return FALSE;
@@ -423,11 +409,6 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
priv->point_hover = NULL;
- /* Clear the timezone preview label, if it isn't already empty. */
- gtk_label_get (GTK_LABEL (priv->timezone_preview), &old_zone);
- if (strcmp (old_zone, ""))
- gtk_label_set_text (GTK_LABEL (priv->timezone_preview), "");
-
return FALSE;
}
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.glade b/widgets/e-timezone-dialog/e-timezone-dialog.glade
index 9e1bbb945b..3bcc8df73c 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.glade
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.glade
@@ -2,9 +2,9 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
+<requires lib="gnome"/>
<widget class="GtkDialog" id="timezone-dialog">
- <property name="border_width">6</property>
<property name="title" translatable="yes">Select a Time Zone</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -13,7 +13,7 @@
<property name="default_height">400</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
@@ -60,22 +60,70 @@
</child>
<child>
- <widget class="GtkTable" id="table1">
- <property name="border_width">6</property>
+ <widget class="GtkVBox" id="timezone-table">
+ <property name="border_width">12</property>
<property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">1</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="label" translatable="yes">Use the left mouse button to zoom in on an area of the map and select a time zone.
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon_size">6</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Use the left mouse button to zoom in on an area of the map and select a time zone.
Use the right mouse button to zoom out.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Time Zones&lt;/b&gt;</property>
<property name="use_underline">False</property>
- <property name="use_markup">False</property>
+ <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -85,89 +133,22 @@ Use the right mouse button to zoom out.</property>
<property name="ypad">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_padding">2</property>
- <property name="x_options">expand</property>
- <property name="y_options"></property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame1">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="map-window">
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="timezone-preview">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes">Time Zones</property>
+ <property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -179,16 +160,58 @@ Use the right mouse button to zoom out.</property>
<property name="ypad">0</property>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="map-window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;_Selection&lt;/b&gt;</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">combo-entry1</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -196,22 +219,21 @@ Use the right mouse button to zoom out.</property>
<widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Selection:</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">combo-entry1</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -280,12 +302,9 @@ Use the right mouse button to zoom out.</property>
</child>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
</widget>
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 7afc41686b..7418952b54 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-09 Rodney Dawes <dobey@ximian.com>
+
+ * e-charset-picker.c: Include gtkhbox.h in here to avoid the warnings
+ (activate_other):
+ (e_charset_picker_dialog): Make these dialogs be more HIG-compliant
+ * e-filter-bar.c (do_advanced):
+ (menubar_activated): Make these dialogs be more HIG-compliant
+
2004-04-08 Not Zed <NotZed@Ximian.com>
* e-info-label.c (e_info_label_set_info): ugh, fix some last
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index c15365da51..15f50b7921 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <iconv.h>
+#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkstock.h>
@@ -202,7 +203,7 @@ activate_entry (GtkWidget *entry, GtkDialog *dialog)
static void
activate_other (GtkWidget *item, gpointer menu)
{
- GtkWidget *window, *entry, *label;
+ GtkWidget *window, *entry, *label, *vbox, *hbox;
char *old_charset, *new_charset;
GtkDialog *dialog;
@@ -219,22 +220,39 @@ activate_other (GtkWidget *item, gpointer menu)
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL));
+ gtk_dialog_set_has_separator (dialog, FALSE);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+ gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, TRUE, TRUE, 0);
+ gtk_widget_show (vbox);
+
label = gtk_label_new (_("Enter the character set to use"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new ("");
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
entry = gtk_entry_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ gtk_widget_show (entry);
+
if (old_charset)
gtk_entry_set_text (GTK_ENTRY (entry), old_charset);
g_signal_connect (entry, "activate",
G_CALLBACK (activate_entry), dialog);
- gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 6);
- gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 6);
- gtk_box_pack_start (GTK_BOX (dialog->vbox), entry, FALSE, FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12);
gtk_widget_show_all (GTK_WIDGET (dialog));
@@ -366,7 +384,7 @@ e_charset_picker_dialog (const char *title, const char *prompt,
const char *default_charset, GtkWindow *parent)
{
GtkDialog *dialog;
- GtkWidget *label, *omenu, *picker;
+ GtkWidget *label, *omenu, *picker, *vbox, *hbox;
char *charset = NULL;
dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (title,
@@ -376,19 +394,36 @@ e_charset_picker_dialog (const char *title, const char *prompt,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL));
+ gtk_dialog_set_has_separator (dialog, FALSE);
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
+ vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+ gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, FALSE, FALSE, 0);
+ gtk_widget_show (vbox);
+
label = gtk_label_new (prompt);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new ("");
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
picker = e_charset_picker_new (default_charset);
omenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), picker);
+ gtk_box_pack_start (GTK_BOX (hbox), omenu, TRUE, TRUE, 0);
+ gtk_widget_show (omenu);
- gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 6);
- gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 6);
- gtk_box_pack_start (GTK_BOX (dialog->vbox), omenu, FALSE, FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12);
gtk_widget_show_all (GTK_WIDGET (dialog));
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index afba3f2e58..f9d4d24ab1 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -150,6 +150,8 @@ do_advanced (ESearchBar *esb)
w = filter_rule_get_widget (rule, efb->context);
filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
+ gtk_container_set_border_width (GTK_CONTAINER (w), 12);
+
/* FIXME: get the toplevel window... */
dialog = gtk_dialog_new_with_buttons (_("Advanced Search"), NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,
@@ -157,12 +159,14 @@ do_advanced (ESearchBar *esb)
GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
efb->save_dialog = dialog;
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300);
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), w, TRUE, TRUE, 3);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), w, TRUE, TRUE, 0);
g_object_ref (rule);
g_object_set_data_full ((GObject *) dialog, "rule", rule, (GDestroyNotify) g_object_unref);
@@ -210,11 +214,16 @@ menubar_activated (ESearchBar *esb, int id, void *data)
w = filter_rule_get_widget (rule, efb->context);
filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
+ gtk_container_set_border_width (GTK_CONTAINER (w), 12);
+
/* FIXME: get the toplevel window... */
dialog = gtk_dialog_new_with_buttons (_("Save Search"), NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
efb->save_dialog = dialog;
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);