[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-424-g06837ab6d

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  06837ab6d3659ec3202bc6a0b1ea9d23697691ac (commit)
      from  f6918f9d74a0c6cbffd6cd4a4a8be64c23009ba4 (commit)

Summary of changes:
 src/plugins/attachwarner/attachwarner_prefs.c     | 12 +++++-------
 src/plugins/keyword_warner/keyword_warner_prefs.c | 10 ++++------
 2 files changed, 9 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 06837ab6d3659ec3202bc6a0b1ea9d23697691ac
Author: paul <paul at claws-mail.org>
Date:   Mon Mar 14 10:34:27 2022 +0000

    some minor changes to ui

diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index 2d35533b7..578926fd3 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2021 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2022 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,7 +80,7 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
 	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
-	label = gtk_label_new(_("One of the following regular expressions is matched (one per line)"));
+	label = gtk_label_new(_("Warn when one of the following regular expressions is matched (one per line)"));
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_widget_set_margin_start(GTK_WIDGET(label), 2);
 	gtk_widget_set_margin_end(GTK_WIDGET(label), 0);
@@ -108,7 +108,7 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
 	gtk_container_set_border_width(GTK_CONTAINER(scrolledwin), 3);
 
 	gtk_container_add(GTK_CONTAINER(scrolledwin), page->regexp_text);
-	gtk_widget_set_size_request(page->regexp_text, -1, 100);
+	gtk_widget_set_size_request(scrolledwin, -1, 100);
 
 	gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox1), scrolledwin, FALSE, FALSE, 0);
@@ -152,11 +152,9 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
 
-	PACK_FRAME (vbox, frame, _("Warn when"));
-	gtk_container_set_border_width(GTK_CONTAINER(vbox1), 6);
-	gtk_container_add(GTK_CONTAINER(frame), vbox1);
+	gtk_container_add(GTK_CONTAINER(vbox), vbox1);
 
-	PACK_FRAME (vbox, frame, _("Excluding"));
+	PACK_FRAME (vbox, frame, _("Exclude"));
 	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 6);
 	gtk_container_add(GTK_CONTAINER(frame), vbox2);
 
diff --git a/src/plugins/keyword_warner/keyword_warner_prefs.c b/src/plugins/keyword_warner/keyword_warner_prefs.c
index f969d2513..7546884e9 100644
--- a/src/plugins/keyword_warner/keyword_warner_prefs.c
+++ b/src/plugins/keyword_warner/keyword_warner_prefs.c
@@ -80,7 +80,7 @@ static void keyword_warner_prefs_create_widget_func(PrefsPage * _page,
 	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
-	label = gtk_label_new(_("One of the following regular expressions is matched (one per line)"));
+	label = gtk_label_new(_("Warn when one of the following regular expressions is matched (one per line)"));
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_widget_set_margin_start(GTK_WIDGET(label), 2);
 	gtk_widget_set_margin_end(GTK_WIDGET(label), 0);
@@ -108,7 +108,7 @@ static void keyword_warner_prefs_create_widget_func(PrefsPage * _page,
 	gtk_container_set_border_width(GTK_CONTAINER(scrolledwin), 3);
 
 	gtk_container_add(GTK_CONTAINER(scrolledwin), page->regexp_text);
-	gtk_widget_set_size_request(page->regexp_text, -1, 100);
+	gtk_widget_set_size_request(scrolledwin, -1, 100);
 
 	gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox1), scrolledwin, FALSE, FALSE, 0);
@@ -152,11 +152,9 @@ static void keyword_warner_prefs_create_widget_func(PrefsPage * _page,
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VSPACING);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
 
-	PACK_FRAME (vbox, frame, _("Warn when"));
-	gtk_container_set_border_width(GTK_CONTAINER(vbox1), 6);
-	gtk_container_add(GTK_CONTAINER(frame), vbox1);
+	gtk_container_add(GTK_CONTAINER(vbox), vbox1);
 
-	PACK_FRAME (vbox, frame, _("Excluding"));
+	PACK_FRAME (vbox, frame, _("Exclude"));
 	gtk_container_set_border_width(GTK_CONTAINER(vbox2), 6);
 	gtk_container_add(GTK_CONTAINER(frame), vbox2);
 

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


hooks/post-receive
-- 
Claws Mail