From 6f34995901dcfc999c675e5a4bc095eaf52a2d6f Mon Sep 17 00:00:00 2001
From: Christian Stimming <christian@cstimming.de>
Date: Fri, 18 Jan 2019 23:32:31 +0100
Subject: [PATCH] Usability improvements for Bayes editor window

Remove the "Are you sure" question as it is simply annoying but does
not help. Fix some string wordings to be more understandable.
---
 gnucash/gnome/dialog-imap-editor.c          | 31 ---------------------
 gnucash/gtkbuilder/dialog-imap-editor.glade |  4 +--
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/gnucash/gnome/dialog-imap-editor.c b/gnucash/gnome/dialog-imap-editor.c
index e140f62ac4..611866a3ce 100644
--- a/gnucash/gnome/dialog-imap-editor.c
+++ b/gnucash/gnome/dialog-imap-editor.c
@@ -111,33 +111,6 @@ gnc_imap_dialog_close_cb (GtkDialog *dialog, gpointer user_data)
     LEAVE(" ");
 }
 
-static gboolean
-are_you_sure (ImapDialog *imap_dialog)
-{
-    GtkWidget   *dialog;
-    gint         response;
-    const char  *title = _("Are you sure you want to delete the entries ?");
-
-    dialog = gtk_message_dialog_new (GTK_WINDOW (imap_dialog->dialog),
-                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-                                     GTK_MESSAGE_QUESTION,
-                                     GTK_BUTTONS_CANCEL,
-                                     "%s", title);
-
-    gtk_dialog_add_button (GTK_DIALOG(dialog), _("_Delete"), GTK_RESPONSE_ACCEPT);
-
-    gtk_widget_grab_focus (gtk_dialog_get_widget_for_response (GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT));
-
-    response = gtk_dialog_run (GTK_DIALOG(dialog));
-
-    gtk_widget_destroy (dialog);
-
-    if (response == GTK_RESPONSE_ACCEPT)
-        return TRUE;
-    else
-        return FALSE;
-}
-
 static void
 delete_info_bayes (Account *source_account, gchar *head, gint depth)
 {
@@ -223,10 +196,6 @@ gnc_imap_dialog_delete (ImapDialog *imap_dialog)
     if (g_list_length (list) == 0)
         return;
 
-    // Are we sure we want to delete the entries
-    if (are_you_sure (imap_dialog) == FALSE)
-        return;
-
     // reverse list
     list = g_list_reverse (list);
 
diff --git a/gnucash/gtkbuilder/dialog-imap-editor.glade b/gnucash/gtkbuilder/dialog-imap-editor.glade
index d9465e0f19..8ee76c486f 100644
--- a/gnucash/gtkbuilder/dialog-imap-editor.glade
+++ b/gnucash/gtkbuilder/dialog-imap-editor.glade
@@ -257,7 +257,7 @@
             <property name="can_focus">False</property>
             <property name="margin_top">5</property>
             <property name="margin_bottom">5</property>
-            <property name="label" translatable="yes">Case sensitive filtering is available on 'Match String' and 'Mapped to Account Name'.</property>
+            <property name="label" translatable="yes">Filter will be applied to 'Match String' and 'Mapped to Account Name' fields, case sensitive.</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -360,7 +360,7 @@
             <property name="can_focus">False</property>
             <property name="margin_top">5</property>
             <property name="margin_bottom">5</property>
-            <property name="label" translatable="yes">Multiple rows can be selected and then deleted by pressing the delete button...</property>
+            <property name="label" translatable="yes">Multiple rows can be selected and then deleted by pressing the delete button.</property>
           </object>
           <packing>
             <property name="expand">False</property>