diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-07-23 10:53:43 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-07 17:25:02 +0000 |
| commit | 5b3e3ee58748ac1fd9201d2d3facbed1b9b1e800 (patch) | |
| tree | 9b19a5d0f8abb396dd6063fa887892581e286b8a /ui/qt/io_graph_dialog.ui | |
| parent | f63b0241c9eeb1ef3dc1e915820c440119c30526 (diff) | |
Use UAT model for I/O graph
Convert from using TreeWidgetItems to UAT model/delegate. More of the GUI
is "just handled" within the table.
Required to add support for "colors" and "protocol fields" to UAT types.
Also needed to add some hacks for "custom" UAT field handlers for
backwards compatibility with the existing UAT structure used.
Because UAT functionality was switched completely to the model, some
information in the table was "lost in translation" because the UATs
themselves aren't translated to other languages.
TODO:
2. Better "order of operations"? A bunch of NULL/size checks needed to be added to prevent crashing.
Now with model/"view" should events/functions be reordered?
Bug: 13585
Change-Id: I2bbba78182317c4fada07b927c05d0c6f4cdc0fe
Reviewed-on: https://code.wireshark.org/review/22766
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/io_graph_dialog.ui')
| -rw-r--r-- | ui/qt/io_graph_dialog.ui | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/ui/qt/io_graph_dialog.ui b/ui/qt/io_graph_dialog.ui index b2a69235b1..5c4caf16b5 100644 --- a/ui/qt/io_graph_dialog.ui +++ b/ui/qt/io_graph_dialog.ui @@ -64,48 +64,13 @@ </widget> </item> <item> - <widget class="QTreeWidget" name="graphTreeWidget"> + <widget class="TabnavTreeView" name="graphUat"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <column> - <property name="text"> - <string>Name</string> - </property> - </column> - <column> - <property name="text"> - <string>Display filter</string> - </property> - </column> - <column> - <property name="text"> - <string>Color</string> - </property> - </column> - <column> - <property name="text"> - <string>Style</string> - </property> - </column> - <column> - <property name="text"> - <string>Y Axis</string> - </property> - </column> - <column> - <property name="text"> - <string>Y Field</string> - </property> - </column> - <column> - <property name="text"> - <string>Smoothing</string> - </property> - </column> </widget> </item> <item> @@ -513,6 +478,11 @@ <extends>QLabel</extends> <header>widgets/elided_label.h</header> </customwidget> + <customwidget> + <class>TabnavTreeView</class> + <extends>QTreeView</extends> + <header>widgets/tabnav_tree_view.h</header> + </customwidget> </customwidgets> <resources> <include location="../../image/toolbar.qrc"/> |