Remove dialog separators Change the border with of the dialog's vbox and

2004-03-31  Rodney Dawes  <dobey@ximian.com>

	* e-shell-importer.c (choose_importer_from_list):
	(start_import):
	(prepare_intelligent_page): Remove dialog separators
	* e-shell-offline-handler.c (pop_up_confirmation_dialog): Change the
	border with of the dialog's vbox and action area to be HIG-compliant
	* e-shell-settings-dialog.c (init): Remove the dialog separator
	* e-shell-startup-wizard.c (prepare_importer_page): Remove the dialog
	separator to be more HIG-compliant
	(key_press_event_callback): Fix compile warnings and cast to the
	correct widget types for calling various gtk api
	Remove the dialog separator to be more HIG-compliant
	* main.c (show_development_warning): Make the devel warning dialog
	that pops up for unstable versions be HIG-compliant
	* glade/e-active-connection-dialog.glade: Make the active connection
	dialog for going off-line be HIG-compliant
	* importer/intelligent.c (create_gui): Remove the dialog separator
	and set the dialog's vbox and action area border widths to be more
	compliant with the HIG

svn path=/trunk/; revision=25267

8 files changed, 149 insertions, 55 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index b36a4950c3..4fe778ac9a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,4 +1,25 @@
-2004-03-26  Rodney Dawes <dobey@ximian.com>
+2004-03-31  Rodney Dawes  <dobey@ximian.com>
+
+	* e-shell-importer.c (choose_importer_from_list):
+	(start_import):
+	(prepare_intelligent_page): Remove dialog separators
+	* e-shell-offline-handler.c (pop_up_confirmation_dialog): Change the
+	border with of the dialog's vbox and action area to be HIG-compliant
+	* e-shell-settings-dialog.c (init): Remove the dialog separator
+	* e-shell-startup-wizard.c (prepare_importer_page): Remove the dialog
+	separator to be more HIG-compliant
+	(key_press_event_callback): Fix compile warnings and cast to the
+	correct widget types for calling various gtk api
+	Remove the dialog separator to be more HIG-compliant
+	* main.c (show_development_warning): Make the devel warning dialog
+	that pops up for unstable versions be HIG-compliant
+	* glade/e-active-connection-dialog.glade: Make the active connection
+	dialog for going off-line be HIG-compliant
+	* importer/intelligent.c (create_gui): Remove the dialog separator
+	and set the dialog's vbox and action area border widths to be more
+	compliant with the HIG
+
+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
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 0eba8d593d..d81bd0a456 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -333,6 +333,7 @@ choose_importer_from_list (GList *importer_list)
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     GTK_STOCK_OK, GTK_RESPONSE_OK,
 					     NULL);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
 	clist = gtk_clist_new (1);
@@ -456,6 +457,7 @@ start_import (gpointer parent, const char *filename, EvolutionImporterClient *cl
 	icd->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Importing"), NULL, 0,
 							      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							      NULL));
+	gtk_dialog_set_has_separator (icd->dialog, FALSE);
 	g_signal_connect (icd->dialog, "response", G_CALLBACK (dialog_response_cb), icd);
 
 	g_object_weak_ref (G_OBJECT(icd->dialog), dialog_destroy_notify, icd);
@@ -717,6 +719,7 @@ prepare_intelligent_page (GnomeDruidPage *page,
 	dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s",
 					_("Please wait...\nScanning for existing setups"));
 	e_make_widget_backing_stored (dialog);
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers"));
 	gtk_widget_show_all (dialog);
diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c
index 3a0b9f8d40..52ff90d473 100644
--- a/shell/e-shell-offline-handler.c
+++ b/shell/e-shell-offline-handler.c
@@ -656,6 +656,8 @@ pop_up_confirmation_dialog (EShellOfflineHandler *offline_handler)
 	}
 
 	dialog = glade_xml_get_widget (priv->dialog_gui, "active_connection_dialog");
+	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);
 
 	/* FIXME: do we really want this?  */
 	/* gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->parent_shell_view)); */
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 0fda959b97..c96049e10d 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -325,6 +325,7 @@ init (EShellSettingsDialog *dialog)
 	set_dialog_size (dialog);
 	
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings"));
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 }
 
 
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 47f91d0f5f..0bd93acddb 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -564,6 +564,7 @@ prepare_importer_page (GnomeDruidPage *page,
 	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
 					 GTK_BUTTONS_NONE,
 					 _("Please wait...\nScanning for existing setups"));
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	e_make_widget_backing_stored (dialog);
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Starting import"));
@@ -785,20 +786,22 @@ key_press_event_callback (GtkWidget   *widget,
 				  "you have entered will be forgotten. You will need to run this assistant again "
 				  "before using Evolution.\n\nDo you want to quit using the Assistant now?");
  
-		confirm_dialog = gtk_message_dialog_new (data->dialog,
+		confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (data->dialog),
 							 GTK_DIALOG_MODAL,
 							 GTK_MESSAGE_WARNING,
 							 GTK_BUTTONS_NONE,
 							 confirmations);
 
-		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_QUIT, GTK_RESPONSE_OK);
+		gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+		gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), GTK_STOCK_QUIT, GTK_RESPONSE_OK);
+		gtk_dialog_set_has_separator (GTK_DIALOG (confirm_dialog),
+					      FALSE);
 
 		returnvalue = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
 		gtk_widget_destroy (confirm_dialog);
  
 		if (returnvalue == GTK_RESPONSE_OK) {
-			startup_wizard_cancel (data->druid, data);
+		        startup_wizard_cancel ((GnomeDruid *)data->druid, data);
 			return TRUE;
 		}
 	}
diff --git a/shell/glade/e-active-connection-dialog.glade b/shell/glade/e-active-connection-dialog.glade
index 8e904da0b3..aab9ad6577 100644
--- a/shell/glade/e-active-connection-dialog.glade
+++ b/shell/glade/e-active-connection-dialog.glade
@@ -4,21 +4,22 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="active_connection_dialog">
-  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Active Connections</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
+  <property name="default_width">256</property>
+  <property name="default_height">192</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-vbox2">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">6</property>
+      <property name="spacing">0</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area2">
@@ -41,6 +42,7 @@
 	    <widget class="GtkButton" id="okbutton1">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
@@ -58,17 +60,18 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox1">
+	<widget class="GtkVBox" id="vbox2">
+	  <property name="border_width">12</property>
 	  <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="label1">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">The following connections are currently active:</property>
+	      <property name="label" translatable="yes">&lt;b&gt;Active Connections&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>
@@ -78,29 +81,96 @@
 	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
-	      <property name="padding">10</property>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+	    <widget class="GtkHBox" id="hbox1">
 	      <property name="visible">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">12</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label2">
+		  <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_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>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
 
 	      <child>
-		<widget class="GtkTreeView" id="active_connection_treeview">
+		<widget class="GtkVBox" id="vbox3">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">12</property>
+
+		  <child>
+		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+		      <property name="visible">True</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="shadow_type">GTK_SHADOW_IN</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		      <child>
+			<widget class="GtkTreeView" id="active_connection_treeview">
+			  <property name="visible">True</property>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">False</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="instruction_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Click OK to close these connections and go offline</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</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">True</property>
+		  <property name="fill">True</property>
+		</packing>
 	      </child>
 	    </widget>
 	    <packing>
@@ -109,27 +179,6 @@
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="instruction_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Click OK to close these connections and go offline</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">10</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 7a91e4fc04..16cfad30ff 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -186,6 +186,10 @@ create_gui (GList *importers)
 
 	d = g_new (IntelligentImporterDialog, 1);
 	d->dialog = dialog = gtk_dialog_new();
+	gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
+	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)dialog)->vbox, 0);
+	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)dialog)->action_area, 12);
+
 	gtk_window_set_title((GtkWindow *)dialog, _("Importers"));
 	dummy = gtk_button_new_from_stock(GTK_STOCK_CONVERT);
 	gtk_button_set_label((GtkButton *)dummy, _("Import"));
diff --git a/shell/main.c b/shell/main.c
index 18762df621..1fee5219bf 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -192,6 +192,7 @@ warning_dialog_response_callback (GtkDialog *dialog,
 static void
 show_development_warning (GtkWindow *parent)
 {
+	GtkWidget *vbox;
 	GtkWidget *label;
 	GtkWidget *warning_dialog;
 	GtkWidget *dont_bother_me_again_checkbox;
@@ -208,9 +209,22 @@ show_development_warning (GtkWindow *parent)
 
 	g_object_unref (client);
 
-	warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent,
-						     GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-						     GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+	warning_dialog = gtk_dialog_new ();
+	gtk_window_set_title (GTK_WINDOW (warning_dialog), "Ximian Evolution " VERSION);
+	gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE);
+	gtk_dialog_add_button (GTK_DIALOG (warning_dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
+	e_dialog_set_transient_for (GTK_WINDOW (warning_dialog), GTK_WIDGET (parent));
+
+	gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE);
+
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->vbox), 0);
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->action_area), 12);
+
+	vbox = gtk_vbox_new (FALSE, 12);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), vbox,
+			    TRUE, TRUE, 0);
+
 	text = g_strdup_printf(
 		/* xgettext:no-c-format */
 		/* Preview/Alpha/Beta version warning message */
@@ -234,26 +248,23 @@ show_development_warning (GtkWindow *parent)
 	g_free(text);
 
 	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
 
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), 
-			    label, TRUE, TRUE, 4);
+	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
 	label = gtk_label_new (_("Thanks\n"
 				 "The Ximian Evolution Team\n"));
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
 	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
 
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), 
-			    label, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
 	dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Don't tell me again"));
 
-	/* GTK sucks.  (Just so you know.)  */
 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
 
 	gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox),
-			    alignment, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0);
 
 	gtk_widget_show_all (warning_dialog);