diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-12 10:17:05 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-13 00:50:20 +0000 |
| commit | a5652c7257835db3f6fce01926d53b236be53405 (patch) | |
| tree | f33f7f13771217a6c2743590eabd855bd4260906 /ui/qt/packet_dialog.cpp | |
| parent | f1d1354b838fbbeb7349189178e81a6a83d08e78 (diff) | |
Qt: ElidedLabel doesn't support rich text / HTML.
Change-Id: Ia5ca9784c60325c01ba5e6378997008f8ef1dd6e
Reviewed-on: https://code.wireshark.org/review/7091
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/packet_dialog.cpp')
| -rw-r--r-- | ui/qt/packet_dialog.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp index c9b9c1176a..99c1e5d000 100644 --- a/ui/qt/packet_dialog.cpp +++ b/ui/qt/packet_dialog.cpp @@ -27,6 +27,8 @@ #include "frame_tvbuff.h" +#include "ui/utf8_entities.h" + #include "byte_view_tab.h" #include "proto_tree.h" #include "wireshark_application.h" @@ -44,6 +46,7 @@ PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, bool from_reference packet_data_(NULL) { ui->setupUi(this); + ui->hintLabel->setSmallText(); // XXX Use recent settings instead resize(parent.width() * 4 / 5, parent.height() * 4 / 5); @@ -98,10 +101,12 @@ PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, bool from_reference QStringList col_parts; for (int i = 0; i < cap_file_.capFile()->cinfo.num_cols; ++i) { - col_parts << QString("<b>%1</b>").arg(get_column_title(i)); - col_parts << cap_file_.capFile()->cinfo.col_data[i]; + // ElidedLabel doesn't support rich text / HTML + col_parts << QString("%1: %2") + .arg(get_column_title(i)) + .arg(cap_file_.capFile()->cinfo.col_data[i]); } - col_info_ = col_parts.join(" "); + col_info_ = col_parts.join(" " UTF8_MIDDLE_DOT " "); setHintText(); connect(this, SIGNAL(monospaceFontChanged(QFont)), @@ -140,8 +145,7 @@ void PacketDialog::captureFileClosing() void PacketDialog::setHintText(QString &hint) { - ui->hintLabel->setText(QString("<small><i>%1</i></small>") - .arg(hint.isEmpty() ? col_info_ : hint)); + ui->hintLabel->setText(hint.isEmpty() ? col_info_ : hint); } void PacketDialog::on_buttonBox_helpRequested() |