[gedit] io-error-info-bar: invalid_character: TeplInfoBar + other improvements

[Sébastien Wilmet <swilmet src gnome org>]

commit bf60cc1af83c3a75638ea28fa1abc74cb7367820
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Mar 24 12:04:59 2020 +0100

    io-error-info-bar: invalid_character: TeplInfoBar + other improvements
    
    Use TeplInfoBar to simplify the code. Calling
    tepl_utils_str_middle_truncate() on the uri is not needed because
    TeplInfoBar better handles text wrapping.
    
    Change the mnemonic for "Don't Save" because it conflicted with the Open
    button in the headerbar.
    
    Improve message, "chars" -> "characters".

 gedit/gedit-io-error-info-bar.c | 82 +++++++++--------------------------------
 1 file changed, 18 insertions(+), 64 deletions(-)
---
diff --git a/gedit/gedit-io-error-info-bar.c b/gedit/gedit-io-error-info-bar.c
index 53cc15fcc..92cb27c95 100644
--- a/gedit/gedit-io-error-info-bar.c
+++ b/gedit/gedit-io-error-info-bar.c
@@ -917,83 +917,37 @@ gedit_externally_modified_info_bar_new (GFile    *location,
 GtkWidget *
 gedit_invalid_character_info_bar_new (GFile *location)
 {
-       GtkWidget *info_bar;
-       GtkWidget *hbox_content;
-       GtkWidget *vbox;
-       GtkWidget *primary_label;
-       GtkWidget *secondary_label;
-       gchar *primary_markup;
-       gchar *secondary_markup;
-       gchar *primary_text;
-       gchar *full_formatted_uri;
-       gchar *uri_for_display;
-       gchar *temp_uri_for_display;
-       const gchar *secondary_text;
+       TeplInfoBar *info_bar;
+       gchar *uri;
+       gchar *primary_msg;
+       const gchar *secondary_msg;
 
        g_return_val_if_fail (G_IS_FILE (location), NULL);
 
-       full_formatted_uri = g_file_get_parse_name (location);
-
-       /* Truncate the URI so it doesn't get insanely wide. Note that even
-        * though the dialog uses wrapped text, if the URI doesn't contain
-        * white space then the text-wrapping code is too stupid to wrap it.
-        */
-       temp_uri_for_display = tepl_utils_str_middle_truncate (full_formatted_uri,
-                                                              MAX_URI_IN_DIALOG_LENGTH);
-       g_free (full_formatted_uri);
-
-       uri_for_display = g_markup_escape_text (temp_uri_for_display, -1);
-       g_free (temp_uri_for_display);
-
-       info_bar = gtk_info_bar_new ();
+       info_bar = tepl_info_bar_new ();
+       tepl_info_bar_set_buttons_orientation (info_bar, GTK_ORIENTATION_HORIZONTAL);
 
        gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
                                 _("S_ave Anyway"),
                                 GTK_RESPONSE_YES);
+
        gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
-                                _("D_on’t Save"),
+                                _("_Don’t Save"),
                                 GTK_RESPONSE_CANCEL);
-       gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar),
-                                      GTK_MESSAGE_WARNING);
-
-       hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 
-       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-       gtk_box_pack_start (GTK_BOX (hbox_content), vbox, TRUE, TRUE, 0);
-
-       primary_text = g_strdup_printf (_("Some invalid chars have been detected while saving “%s”"),
-                                       uri_for_display);
-
-       g_free (uri_for_display);
-
-       primary_markup = g_strdup_printf ("<b>%s</b>", primary_text);
-       g_free (primary_text);
-       primary_label = gtk_label_new (primary_markup);
-       g_free (primary_markup);
-       gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
-       gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
-       gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-       gtk_widget_set_halign (primary_label, GTK_ALIGN_START);
-       gtk_widget_set_can_focus (primary_label, TRUE);
-       gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
+       gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_WARNING);
 
-       secondary_text = _("If you continue saving this file you can corrupt the document. "
-                          " Save anyway?");
-       secondary_markup = g_strdup_printf ("<small>%s</small>",
-                                           secondary_text);
-       secondary_label = gtk_label_new (secondary_markup);
-       g_free (secondary_markup);
-       gtk_box_pack_start (GTK_BOX (vbox), secondary_label, TRUE, TRUE, 0);
-       gtk_widget_set_can_focus (secondary_label, TRUE);
-       gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
-       gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
-       gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
-       gtk_widget_set_halign (secondary_label, GTK_ALIGN_START);
+       uri = g_file_get_parse_name (location);
+       primary_msg = g_strdup_printf (_("Some invalid characters have been detected while saving “%s”."), 
uri);
+       tepl_info_bar_add_primary_message (info_bar, primary_msg);
+       g_free (uri);
+       g_free (primary_msg);
 
-       gtk_widget_show_all (hbox_content);
-       set_contents (info_bar, hbox_content);
+       secondary_msg = _("If you continue saving this file you can corrupt the document. "
+                         "Save anyway?");
+       tepl_info_bar_add_secondary_message (info_bar, secondary_msg);
 
-       return info_bar;
+       return GTK_WIDGET (info_bar);
 }
 
 /* ex:set ts=8 noet: */