diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-08-06 10:07:42 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-09-05 01:06:53 +0000 |
commit | 30f3d524411445c26418c757ac9deb0940afc409 (patch) | |
tree | d60cadae8fdfb0612ee6e00bc5f17b550534af29 /ui/qt/main_window.ui | |
parent | 382815d6bdd9a66421ae2e07c734df4c8a4ac398 (diff) |
Qt: Refactor ConversationDialog for endpoints.
Create a TrafficTableDialog (for lack of a better name) parent class
from the general parts of ConversationDialog. Use it to create
EndpointsDialog.
Move the contents of conversation_tree_widget.{cpp,h} to
conversation_dialog.{cpp,h} to match endpoint_dialog and
traffic_table_dialog.
Fill in GeoIP columns dynamically instead of using a hard-coded limit.
Use "endp_" and "ENDP_" prefixes for a lot of endpoint variables and
defines.
Try to make geoip_db_lookup_ipv4 and geoip_db_lookup_ipv6 more robust.
Clean up some includes. Fix a shadowed variable.
Change-Id: I23054816ac7f8c6edb3b1f01c8536db37ba4122d
Reviewed-on: https://code.wireshark.org/review/3462
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_window.ui')
-rw-r--r-- | ui/qt/main_window.ui | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index fd9c48cc93..5e42d75660 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -109,7 +109,7 @@ <x>0</x> <y>0</y> <width>960</width> - <height>21</height> + <height>22</height> </rect> </property> <widget class="QMenu" name="menuFile"> @@ -370,6 +370,7 @@ <addaction name="actionSummary"/> <addaction name="actionProtocol_Hierarchy"/> <addaction name="actionStatisticsConversations"/> + <addaction name="actionStatisticsEndpoints"/> <addaction name="actionStatisticsPacketLen"/> <addaction name="actionStatisticsIOGraph"/> <addaction name="separator"/> @@ -1739,6 +1740,14 @@ <string>Conversations at different protocol levels</string> </property> </action> + <action name="actionStatisticsEndpoints"> + <property name="text"> + <string>Endpoints</string> + </property> + <property name="toolTip"> + <string>Endpoints at different protocol levels</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <customwidgets> |