diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-06-19 16:28:10 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-20 13:49:01 +0000 |
| commit | 4d90f2e092802775e5e3e457768d1c1f4760a1f0 (patch) | |
| tree | bf9013fd357111694c1bfc8c3e697a627f1c6803 /ui/qt/main_window.ui | |
| parent | 3978462fd31665f30432689634812a15c476406b (diff) | |
| download | wireshark-4d90f2e092802775e5e3e457768d1c1f4760a1f0.tar.gz | |
Qt: make Wireless Timeline a separate item
Do not put the wireless timeline in the main view with splitters, it has
a fixed size anyway and is not taken into account for layout and size
calculations for the panes.
Bug: 13776
Change-Id: I71da962950c3f1b215908674f4852afa76744343
Reviewed-on: https://code.wireshark.org/review/22242
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/qt/main_window.ui')
| -rw-r--r-- | ui/qt/main_window.ui | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui index 83f45517c9..b275de8ffb 100644 --- a/ui/qt/main_window.ui +++ b/ui/qt/main_window.ui @@ -126,6 +126,9 @@ <widget class="FilterExpressionFrame" name="filterExpressionFrame"/> </item> <item> + <widget class="WirelessTimeline" name="wirelessTimelineWidget"/> + </item> + <item> <widget class="QStackedWidget" name="mainStack"> <property name="enabled"> <bool>true</bool> @@ -3068,6 +3071,12 @@ <header>filter_expression_frame.h</header> <container>1</container> </customwidget> + <customwidget> + <class>WirelessTimeline</class> + <extends>QWidget</extends> + <header>wireless_timeline.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources> <include location="../../image/toolbar.qrc"/> |