[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-86-gcc2837f79

[wwp at claws-mail.org]

The branch, gtk3 has been updated
       via  cc2837f7930bab6f564de6bf13ef3e3350c4a12d (commit)
      from  76e9a5af67914f92ec26c6223d3b2a5413a97fad (commit)

Summary of changes:
 src/prefs_folder_item.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit cc2837f7930bab6f564de6bf13ef3e3350c4a12d
Author: wwp <subscript at free.fr>
Date:   Wed Sep 1 08:42:08 2021 +0200

    Use gtk grid instead of table,
    fix tooltip (attached to wrong widget and missing a space),
    and fix code spacing.

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 021fbfd47..b3de24d04 100644
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -468,7 +468,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 
 	page->folder_color = item->prefs->color;
 
-
 	gtk_grid_attach(GTK_GRID(table), box1, 0, rowcount, 1, 1);
 	folder_color_rec_checkbtn = gtk_check_button_new();
 	gtk_grid_attach(GTK_GRID(table), folder_color_rec_checkbtn, 2, rowcount, 1, 1);
@@ -517,7 +516,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 	rowcount++;
 
 	/* Select HTML part by default? */
-	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VSPACING_NARROW_2);
 	gtk_grid_attach(GTK_GRID(table), hbox, 0, rowcount, 1, 1);
 
 	label = gtk_label_new(_("Select the HTML part of multipart messages"));
@@ -540,26 +539,23 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 
 	promote_html_part_rec_checkbtn = gtk_check_button_new();
 	gtk_grid_attach(GTK_GRID(table), promote_html_part_rec_checkbtn, 2, rowcount, 1, 1);
-	rowcount++;
 
+	rowcount++;
 
 	/* Skip folder on 'goto unread (or new) message' */
 	checkbtn_skip_on_goto_unread_or_new = gtk_check_button_new_with_label(_("Skip folder when searching for unread or new messages"));
-	CLAWS_SET_TIP(checkbtn_newmailcheck,
-			     _("Turn this option on if you want this folder to be ignored"
+	CLAWS_SET_TIP(checkbtn_skip_on_goto_unread_or_new,
+			     _("Turn this option on if you want this folder to be ignored "
 			       "when searching for unread or new messages"));
-	gtk_table_attach(GTK_TABLE(table), checkbtn_skip_on_goto_unread_or_new, 0, 2,
-			 rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	
+	gtk_grid_attach(GTK_GRID(table), checkbtn_skip_on_goto_unread_or_new, 0, rowcount, 1, 1);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_skip_on_goto_unread_or_new),
 								 item->prefs->skip_on_goto_unread_or_new);
+
 	skip_on_goto_unread_or_new_rec_checkbtn = gtk_check_button_new();
-	gtk_table_attach(GTK_TABLE(table), skip_on_goto_unread_or_new_rec_checkbtn, 2, 3, 
-			 rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+	gtk_grid_attach(GTK_GRID(table), skip_on_goto_unread_or_new_rec_checkbtn, 2, rowcount, 1, 1);
 
 	rowcount++;
 
-
 	/* Synchronise folder for offline use */
 	checkbtn_offlinesync = gtk_check_button_new_with_label(_("Synchronise for offline use"));
 	gtk_grid_attach(GTK_GRID(table), checkbtn_offlinesync, 0, rowcount, 1, 1);
@@ -573,6 +569,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 	gtk_grid_attach(GTK_GRID(table), hbox, 0, rowcount, 1, 1);
 	gtk_widget_set_hexpand(hbox, TRUE);
 	gtk_widget_set_halign(hbox, GTK_ALIGN_FILL);
+
 	rowcount++;
 
 	hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -597,6 +594,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 	gtk_grid_attach(GTK_GRID(table), hbox2, 0, rowcount, 1, 1);
 	gtk_widget_set_hexpand(hbox2, TRUE);
 	gtk_widget_set_halign(hbox2, GTK_ALIGN_FILL);
+
 	rowcount++;
 
 	hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -669,7 +667,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 	page->checkbtn_remove_old_offlinesync = checkbtn_remove_old_offlinesync;
 	page->promote_html_part = promote_html_part;
 
-
 	page->simplify_subject_rec_checkbtn  = simplify_subject_rec_checkbtn;
 
 	page->folder_chmod_rec_checkbtn	     = folder_chmod_rec_checkbtn;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail