aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-10-09 17:58:39 +0000
committerGerald Combs <gerald@wireshark.org>2013-10-09 17:58:39 +0000
commit576a16004b914ac66fc122814723451cf1431a0c (patch)
tree3f8893b6e8d75cb3656f8614f57e94bcf82c2ec6
parentde733af3312056697c49044a84d0c4be70de4eb8 (diff)
When we display an error message in the interface list make sure it's
word-wrapped. svn path=/trunk/; revision=52473
-rw-r--r--ui/qt/interface_tree.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp
index a630f8657a..6674ad2ddb 100644
--- a/ui/qt/interface_tree.cpp
+++ b/ui/qt/interface_tree.cpp
@@ -28,6 +28,7 @@
#include "ui/utf8_entities.h"
#include "ui/ui_util.h"
+#include "qt_ui_utils.h"
#include "sparkline_delegate.h"
#include "wireshark_application.h"
@@ -122,9 +123,12 @@ void InterfaceTree::getInterfaceList()
if (if_list == NULL) {
QTreeWidgetItem *ti = new QTreeWidgetItem();
- ti->setText(0, QString(tr("%1")).arg(QString().fromUtf8(err_str)));
- g_free(err_str);
+ QLabel *err_label = new QLabel(gchar_free_to_qstring(err_str));
+ err_label->setWordWrap(true);
+
+ setColumnCount(1);
addTopLevelItem(ti);
+ setItemWidget(ti, 0, err_label);
resizeColumnToContents(0);
return;
} else if (err_str) {