Change display filter button tooltip formatting.

Go from <expression>,<comment> to <comment>\n<expression>

Bug: 13814
Change-Id: I842e38798eba7ff87751733ce0b2befdc9c8c27f
Reviewed-on: https://code.wireshark.org/review/22395
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
index 6a40dc30d45b92724eca5f67c39f3e57b900a8df..f02037df90bd090ba7937738b02e88858d7e4c57 100644 (file)
--- a/ui/gtk/filter_expression_save_dlg.c
+++ b/ui/gtk/filter_expression_save_dlg.c
@@ -156,7 +156,7 @@ filter_button_add(const char *label, const char *expr, struct filter_expression
        gtk_widget_set_sensitive(GTK_WIDGET(button), TRUE);
        if (strlen(fe->comment) > 0)
        {
-               tooltip = g_strdup_printf("%s, %s", fe->expression, fe->comment);
+               tooltip = g_strdup_printf("%s\n%s", fe->comment, fe->expression);
                gtk_widget_set_tooltip_text(GTK_WIDGET(button), tooltip);
        }
        else

diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 1b153ce19a91fa0301f199a11b628c4a7cb55d8a..02fbf3a65f9678732ec5b1df00d48fa29468563e 100644 (file)
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -911,7 +911,7 @@ gboolean MainWindow::filter_expression_add_action(const void *key _U_, void *val
     QAction *dfb_action = new QAction(fe->label, data->window->filter_expression_toolbar_);
     if (strlen(fe->comment) > 0)
     {
-        QString tooltip = QString("%1, %2").arg(fe->expression).arg(fe->comment);
+        QString tooltip = QString("%1\n%2").arg(fe->comment).arg(fe->expression);
         dfb_action->setToolTip(tooltip);
     }
     else