adjusted addressbook import/export dialog layout.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3588 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 32 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 83a0e812..a3733e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-11-30
 
+	* src/exportcsv.c
+	  src/importcsv.c
+	  src/importldif.c: adjusted dialog layout to match other ones.
+
+2017-11-30
+
 	* libsylph/utils.c: strconcat_csv(): enclose fields in double quotes
 	  if double quotes appear.
 	* src/exportcsv.c: code cleanup. Added header line.
diff --git a/src/exportcsv.c b/src/exportcsv.c
index 882bb4f2..8e51cf99 100644
--- a/src/exportcsv.c
+++ b/src/exportcsv.c
@@ -58,7 +58,7 @@
 #define PAGE_FILE_INFO             0
 #define PAGE_FINISH                1
 
-#define EXPORTCSV_WIDTH           420
+#define EXPORTCSV_WIDTH           480
 #define EXPORTCSV_HEIGHT          320
 
 static struct _ExpCSVDlg {
@@ -491,7 +491,6 @@ static void exp_csv_dialog_create() {
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_size_request(window, EXPORTCSV_WIDTH, EXPORTCSV_HEIGHT );
-	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window), _("Export Address Book into CSV file") );
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
@@ -525,13 +524,9 @@ static void exp_csv_dialog_create() {
 
 	/* Button panel */
 	gtkut_stock_button_set_create(&hbbox, &btnNext, _("Next"),
-				      NULL, NULL,
-				      &btnCancel, GTK_STOCK_CANCEL);
-	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(hbbox), btnCancel,
-					   TRUE);
-	gtkut_box_set_reverse_order(GTK_BOX(hbbox), FALSE);
-	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
+				      &btnCancel, GTK_STOCK_CANCEL,
+				      NULL, NULL);
+	gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
 	gtk_widget_grab_default(btnNext);
 
 	/* Button handlers */
diff --git a/src/importcsv.c b/src/importcsv.c
index 21774096..1a3fafbe 100644
--- a/src/importcsv.c
+++ b/src/importcsv.c
@@ -62,7 +62,7 @@
 #define PAGE_ATTRIBUTES            1
 #define PAGE_FINISH                2
 
-#define IMPORTCSV_WIDTH           420
+#define IMPORTCSV_WIDTH           480
 #define IMPORTCSV_HEIGHT          320
 
 #define FIELDS_N_COLS              3
@@ -883,7 +883,6 @@ static void imp_csv_dialog_create() {
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_size_request(window, IMPORTCSV_WIDTH, IMPORTCSV_HEIGHT );
-	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window), _("Import CSV file into Address Book") );
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
@@ -916,14 +915,16 @@ static void imp_csv_dialog_create() {
 	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
 
 	/* Button panel */
-	gtkut_stock_button_set_create(&hbbox, &btnNext, _("Next"),
-				      &btnPrev, _("Prev"),
-				      &btnCancel, GTK_STOCK_CANCEL);
-	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(hbbox), btnCancel,
-					   TRUE);
-	gtkut_box_set_reverse_order(GTK_BOX(hbbox), FALSE);
-	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4);
+	if (prefs_common.comply_gnome_hig) {
+		gtkut_stock_button_set_create(&hbbox, &btnNext, _("Next"),
+					      &btnPrev, _("Prev"),
+					      &btnCancel, GTK_STOCK_CANCEL);
+	} else {
+		gtkut_stock_button_set_create(&hbbox, &btnPrev, _("Prev"),
+					      &btnNext, _("Next"),
+					      &btnCancel, GTK_STOCK_CANCEL);
+	}
+	gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
 	gtk_widget_grab_default(btnNext);
 
 	/* Button handlers */
diff --git a/src/importldif.c b/src/importldif.c
index 329b253e..e1134380 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -59,7 +59,7 @@
 #define PAGE_ATTRIBUTES            1
 #define PAGE_FINISH                2
 
-#define IMPORTLDIF_WIDTH           380
+#define IMPORTLDIF_WIDTH           480
 #define IMPORTLDIF_HEIGHT          300
 
 #define FIELDS_N_COLS              3
@@ -697,7 +697,6 @@ static void imp_ldif_dialog_create() {
 
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_size_request(window, IMPORTLDIF_WIDTH, IMPORTLDIF_HEIGHT );
-	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window), _("Import LDIF file into Address Book") );
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
@@ -730,14 +729,16 @@ static void imp_ldif_dialog_create() {
 	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
 
 	/* Button panel */
-	gtkut_stock_button_set_create(&hbbox, &btnNext, _("Next"),
-				      &btnPrev, _("Prev"),
-				      &btnCancel, GTK_STOCK_CANCEL);
-	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(hbbox), btnCancel,
-					   TRUE);
-	gtkut_box_set_reverse_order(GTK_BOX(hbbox), FALSE);
-	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
+	if (prefs_common.comply_gnome_hig) {
+		gtkut_stock_button_set_create(&hbbox, &btnNext, _("Next"),
+					      &btnPrev, _("Prev"),
+					      &btnCancel, GTK_STOCK_CANCEL);
+	} else {
+		gtkut_stock_button_set_create(&hbbox, &btnPrev, _("Prev"),
+					      &btnNext, _("Next"),
+					      &btnCancel, GTK_STOCK_CANCEL);
+	}
+	gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
 	gtk_widget_grab_default(btnNext);
 
 	/* Button handlers */