[Commits] [SCM] claws branch, master, updated. 3.18.0-343-gecf710cea

[paul at claws-mail.org]

The branch, master has been updated
       via  ecf710cea83967a0871903f4517b83cd73dbfb1f (commit)
      from  7bd4827a90965441cd598b2788ea4224ec96fe10 (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 ecf710cea83967a0871903f4517b83cd73dbfb1f
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 ed4a0fe97..2cb14bc42 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_vbox_new(FALSE, 6);
 	vbox2 = gtk_vbox_new(FALSE, 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_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_misc_set_padding(GTK_MISC(label), 2, 0);
 
@@ -107,7 +107,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);
@@ -151,11 +151,9 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
 	vbox = gtk_vbox_new(FALSE, 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 83e62f9b4..b774cb738 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_vbox_new(FALSE, 6);
 	vbox2 = gtk_vbox_new(FALSE, 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_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_misc_set_padding(GTK_MISC(label), 2, 0);
 
@@ -107,7 +107,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);
@@ -151,11 +151,9 @@ static void keyword_warner_prefs_create_widget_func(PrefsPage * _page,
 	vbox = gtk_vbox_new(FALSE, 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