talons

commit 6b9ce4a8fe3639822993ee8709c7cbf0a5d230ab
parent 02fa37f0df87058fb07f2cd8c88c8ff023b87c9c
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Sat, 10 Feb 2018 14:12:34 +0100

GtkBox to GtkGrid in grouplistdialog.c

Diffstat:
M
src/grouplistdialog.c
 | 
51
+++++++++++++++++++++++++++++++--------------------

1 file changed, 31 insertions(+), 20 deletions(-)
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
@@ -141,8 +141,8 @@ GSList *grouplist_dialog(Folder *folder)
 
 static void grouplist_dialog_create(void)
 {
-	GtkWidget *vbox;
-	GtkWidget *hbox;
+	GtkWidget *grid;
+	GtkWidget *hgrid;
 	GtkWidget *msg_label;
 	GtkWidget *search_button;
 	GtkWidget *confirm_area;
@@ -167,36 +167,47 @@ static void grouplist_dialog_create(void)
 			 G_CALLBACK(grouplist_size_allocate), NULL);
 	MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
 
-	vbox = gtk_vbox_new(FALSE, 8);
+	grid = gtk_grid_new();
+	gtk_grid_set_row_spacing(GTK_GRID(grid), 8);
+	gtk_container_set_border_width(GTK_CONTAINER(grid), 8);
+	gtk_orientable_set_orientation(GTK_ORIENTABLE(grid),
+			GTK_ORIENTATION_VERTICAL);
 	gtk_container_add(GTK_CONTAINER(
-				gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
-	gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
-
-	hbox = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+				gtk_dialog_get_content_area(GTK_DIALOG(dialog))), grid);
 
 	msg_label = gtk_label_new(_("Select newsgroups for subscription:"));
-	gtk_box_pack_start(GTK_BOX(hbox), msg_label, FALSE, FALSE, 0);
-
-	hbox = gtk_hbox_new(FALSE, 8);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	gtk_widget_set_hexpand(msg_label, TRUE);
+	gtk_widget_set_vexpand(msg_label, FALSE);
+	gtk_widget_set_halign(msg_label, GTK_ALIGN_START);
+	gtk_container_add(GTK_CONTAINER(grid), msg_label);
+
+	hgrid = gtk_grid_new();
+	gtk_grid_set_column_spacing(GTK_GRID(hgrid), 8);
+	gtk_orientable_set_orientation(GTK_ORIENTABLE(hgrid),
+			GTK_ORIENTATION_HORIZONTAL);
+	gtk_widget_set_hexpand(hgrid, TRUE);
+	gtk_widget_set_vexpand(hgrid, FALSE);
+	gtk_container_add(GTK_CONTAINER(grid), hgrid);
 
 	msg_label = gtk_label_new(_("Find groups:"));
-	gtk_box_pack_start(GTK_BOX(hbox), msg_label, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(hgrid), msg_label);
 
 	entry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+	gtk_widget_set_hexpand(entry, TRUE);
+	gtk_container_add(GTK_CONTAINER(hgrid), entry);
 	g_signal_connect(G_OBJECT(entry), "activate",
 			 G_CALLBACK(entry_activated), NULL);
 
 	search_button = gtk_button_new_with_label(_(" Search "));
-	gtk_box_pack_start(GTK_BOX(hbox), search_button, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(hgrid), search_button);
 
 	g_signal_connect(G_OBJECT(search_button), "clicked",
 			 G_CALLBACK(search_clicked), NULL);
 
 	scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-	gtk_box_pack_start(GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0);
+	gtk_widget_set_hexpand(scrolledwin, TRUE);
+	gtk_widget_set_vexpand(scrolledwin, TRUE);
+	gtk_container_add(GTK_CONTAINER(grid), scrolledwin);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolledwin),
 				       GTK_POLICY_AUTOMATIC,
 				       GTK_POLICY_AUTOMATIC);
@@ -220,11 +231,11 @@ static void grouplist_dialog_create(void)
 	g_signal_connect(G_OBJECT(ctree), "button-press-event",
 			 G_CALLBACK(button_press_cb), NULL);
 
-	hbox = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
 	status_label = gtk_label_new("");
-	gtk_box_pack_start(GTK_BOX(hbox), status_label, FALSE, FALSE, 0);
+	gtk_widget_set_hexpand(status_label, TRUE);
+	gtk_widget_set_vexpand(status_label, FALSE);
+	gtk_widget_set_halign(status_label, GTK_ALIGN_START);
+	gtk_container_add(GTK_CONTAINER(grid), status_label);
 
 	gtkut_stock_button_set_create(&confirm_area,
 				      &refresh_button, GTK_STOCK_REFRESH,