aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-11-03 19:31:45 +0100
committerAnders Broman <a.broman58@gmail.com>2015-11-04 11:34:30 +0000
commitccca843a57d6f23c7da682f4b7d3286a69590eee (patch)
tree80c06fd6542a6690376b7320e8667635f133bdb6
parentc7c33b0c85cf853cb03053a043b088ca16a33def (diff)
Activate word wrap for hintLabel defined as QLabel
Without this, a long hint string (like a wrong protocol name in the SSL UAT preference) will resize the window to match the string. With this change, instead the hintLabel string is continuing on a new line to match currently configured window size Change-Id: Ib8fcc7bd96585717f122b0921165c4d916442cb0 Reviewed-on: https://code.wireshark.org/review/11529 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> 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>
-rw-r--r--ui/qt/coloring_rules_dialog.ui3
-rw-r--r--ui/qt/display_filter_expression_dialog.ui3
-rw-r--r--ui/qt/follow_stream_dialog.ui4
-rw-r--r--ui/qt/iax2_analysis_dialog.ui3
-rw-r--r--ui/qt/lbm_uimflow_dialog.ui4
-rw-r--r--ui/qt/lte_rlc_graph_dialog.ui3
-rw-r--r--ui/qt/manage_interfaces_dialog.ui3
-rw-r--r--ui/qt/protocol_hierarchy_dialog.ui3
-rw-r--r--ui/qt/rtp_analysis_dialog.ui3
-rw-r--r--ui/qt/rtp_player_dialog.ui3
-rw-r--r--ui/qt/rtp_stream_dialog.ui3
-rw-r--r--ui/qt/sctp_graph_arwnd_dialog.ui4
-rw-r--r--ui/qt/sctp_graph_byte_dialog.ui4
-rw-r--r--ui/qt/sctp_graph_dialog.ui4
-rw-r--r--ui/qt/supported_protocols_dialog.ui3
-rw-r--r--ui/qt/tap_parameter_dialog.ui3
-rw-r--r--ui/qt/tcp_stream_dialog.ui3
-rw-r--r--ui/qt/uat_dialog.ui3
18 files changed, 59 insertions, 0 deletions
diff --git a/ui/qt/coloring_rules_dialog.ui b/ui/qt/coloring_rules_dialog.ui
index 6c613c0ed0..e2c338ffeb 100644
--- a/ui/qt/coloring_rules_dialog.ui
+++ b/ui/qt/coloring_rules_dialog.ui
@@ -51,6 +51,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/display_filter_expression_dialog.ui b/ui/qt/display_filter_expression_dialog.ui
index cc9ccbb8d8..8651dd4409 100644
--- a/ui/qt/display_filter_expression_dialog.ui
+++ b/ui/qt/display_filter_expression_dialog.ui
@@ -183,6 +183,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/follow_stream_dialog.ui b/ui/qt/follow_stream_dialog.ui
index 533ab88aa7..56a9320829 100644
--- a/ui/qt/follow_stream_dialog.ui
+++ b/ui/qt/follow_stream_dialog.ui
@@ -35,6 +35,9 @@
<property name="text">
<string>Hint.</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -131,5 +134,6 @@
<header>follow_stream_text.h</header>
</customwidget>
</customwidgets>
+ <resources/>
<connections/>
</ui>
diff --git a/ui/qt/iax2_analysis_dialog.ui b/ui/qt/iax2_analysis_dialog.ui
index 0c0ecbe283..27ece5c31c 100644
--- a/ui/qt/iax2_analysis_dialog.ui
+++ b/ui/qt/iax2_analysis_dialog.ui
@@ -232,6 +232,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/lbm_uimflow_dialog.ui b/ui/qt/lbm_uimflow_dialog.ui
index 8ac3f17484..66b378bdb6 100644
--- a/ui/qt/lbm_uimflow_dialog.ui
+++ b/ui/qt/lbm_uimflow_dialog.ui
@@ -72,6 +72,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -288,6 +291,7 @@
<container>1</container>
</customwidget>
</customwidgets>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/ui/qt/lte_rlc_graph_dialog.ui b/ui/qt/lte_rlc_graph_dialog.ui
index 1224933a39..9599916a65 100644
--- a/ui/qt/lte_rlc_graph_dialog.ui
+++ b/ui/qt/lte_rlc_graph_dialog.ui
@@ -50,6 +50,9 @@
<property name="text">
<string/>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/manage_interfaces_dialog.ui b/ui/qt/manage_interfaces_dialog.ui
index e03530c1e7..80b21c6981 100644
--- a/ui/qt/manage_interfaces_dialog.ui
+++ b/ui/qt/manage_interfaces_dialog.ui
@@ -248,6 +248,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/protocol_hierarchy_dialog.ui b/ui/qt/protocol_hierarchy_dialog.ui
index 2ae192f7ed..69de20982f 100644
--- a/ui/qt/protocol_hierarchy_dialog.ui
+++ b/ui/qt/protocol_hierarchy_dialog.ui
@@ -74,6 +74,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/rtp_analysis_dialog.ui b/ui/qt/rtp_analysis_dialog.ui
index 6611089996..31c3b3cab1 100644
--- a/ui/qt/rtp_analysis_dialog.ui
+++ b/ui/qt/rtp_analysis_dialog.ui
@@ -288,6 +288,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/rtp_player_dialog.ui b/ui/qt/rtp_player_dialog.ui
index 0a56a90e2d..489cc6198b 100644
--- a/ui/qt/rtp_player_dialog.ui
+++ b/ui/qt/rtp_player_dialog.ui
@@ -109,6 +109,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;No audio&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/rtp_stream_dialog.ui b/ui/qt/rtp_stream_dialog.ui
index 03573aa0a0..29959aa93e 100644
--- a/ui/qt/rtp_stream_dialog.ui
+++ b/ui/qt/rtp_stream_dialog.ui
@@ -107,6 +107,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/sctp_graph_arwnd_dialog.ui b/ui/qt/sctp_graph_arwnd_dialog.ui
index 99d7cac73d..e7a2ef0392 100644
--- a/ui/qt/sctp_graph_arwnd_dialog.ui
+++ b/ui/qt/sctp_graph_arwnd_dialog.ui
@@ -31,6 +31,9 @@
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -100,6 +103,7 @@
<container>1</container>
</customwidget>
</customwidgets>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/ui/qt/sctp_graph_byte_dialog.ui b/ui/qt/sctp_graph_byte_dialog.ui
index 6724d4007d..4e0b78e087 100644
--- a/ui/qt/sctp_graph_byte_dialog.ui
+++ b/ui/qt/sctp_graph_byte_dialog.ui
@@ -31,6 +31,9 @@
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -100,6 +103,7 @@
<container>1</container>
</customwidget>
</customwidgets>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/ui/qt/sctp_graph_dialog.ui b/ui/qt/sctp_graph_dialog.ui
index 35f99a0216..2c2bd0dbbe 100644
--- a/ui/qt/sctp_graph_dialog.ui
+++ b/ui/qt/sctp_graph_dialog.ui
@@ -31,6 +31,9 @@
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
@@ -130,6 +133,7 @@
<container>1</container>
</customwidget>
</customwidgets>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/ui/qt/supported_protocols_dialog.ui b/ui/qt/supported_protocols_dialog.ui
index fd1c6a2eb1..7883665a9b 100644
--- a/ui/qt/supported_protocols_dialog.ui
+++ b/ui/qt/supported_protocols_dialog.ui
@@ -73,6 +73,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;Gathering protocol information…&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/tap_parameter_dialog.ui b/ui/qt/tap_parameter_dialog.ui
index bf0943ddba..ea9dd8bb6d 100644
--- a/ui/qt/tap_parameter_dialog.ui
+++ b/ui/qt/tap_parameter_dialog.ui
@@ -31,6 +31,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;A hint.&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/tcp_stream_dialog.ui b/ui/qt/tcp_stream_dialog.ui
index d8dc4cd8b6..c64cb847a1 100644
--- a/ui/qt/tcp_stream_dialog.ui
+++ b/ui/qt/tcp_stream_dialog.ui
@@ -74,6 +74,9 @@
<property name="text">
<string>&lt;small&gt;&lt;i&gt;Mouse over for shortcuts&lt;/i&gt;&lt;/small&gt;</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
diff --git a/ui/qt/uat_dialog.ui b/ui/qt/uat_dialog.ui
index 6e5e4575a7..7804d0462e 100644
--- a/ui/qt/uat_dialog.ui
+++ b/ui/qt/uat_dialog.ui
@@ -100,6 +100,9 @@
<property name="text">
<string/>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>