diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-26 20:31:12 +0100 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2015-11-28 11:40:01 +0000 |
commit | 04942404c2c2cea24367ca1ad1e3de0be282b4af (patch) | |
tree | b312ca35036a29493293700147829899ce5a3fdb | |
parent | bf1fa88dee15366037f1caeb71ffe70ee870ea35 (diff) | |
download | wireshark-04942404c2c2cea24367ca1ad1e3de0be282b4af.tar.gz |
Qt: Make About->Plugins scrollable
Bug: 11427
Change-Id: Iebc693bc2a035bad3bc2491af4b5a12c9e7d2fa5
Reviewed-on: https://code.wireshark.org/review/12201
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 15086a808ecc5627cdfbfedae23d2a910f059532)
Reviewed-on: https://code.wireshark.org/review/12249
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
-rw-r--r-- | ui/qt/about_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/about_dialog.ui | 17 |
2 files changed, 5 insertions, 14 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 6f6b1b036a..c0899a0723 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -266,7 +266,7 @@ AboutDialog::AboutDialog(QWidget *parent) : message += plugins_scan(); message += "</table>"; - ui->label_plugins->setText(message); + ui->te_plugins->setHtml(message); /* Shortcuts */ bool have_shortcuts = false; diff --git a/ui/qt/about_dialog.ui b/ui/qt/about_dialog.ui index bc8e8c3609..acc0353b1b 100644 --- a/ui/qt/about_dialog.ui +++ b/ui/qt/about_dialog.ui @@ -194,21 +194,12 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <widget class="QLabel" name="label_plugins"> - <property name="text"> - <string/> - </property> - <property name="textFormat"> - <enum>Qt::RichText</enum> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - <property name="openExternalLinks"> + <widget class="QTextEdit" name="te_plugins"> + <property name="tabChangesFocus"> <bool>true</bool> </property> - <property name="textInteractionFlags"> - <set>Qt::TextBrowserInteraction</set> + <property name="readOnly"> + <bool>true</bool> </property> </widget> </item> |