Commit graph

16 commits

Author SHA1 Message Date
Dario Lombardo
b4ad8c9002 Qt: remove default value from call (CID 1311959).
Change-Id: Ibefdf91269081ab11c7dd62b1b72e0e9a41502ff
Reviewed-on: https://code.wireshark.org/review/16947
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-08 15:35:35 +00:00
Gerald Combs
422c0f45d4 Qt: Make the packet map work with Qt 5.7.
It's not safe to assume that the overlay scroll bar range is equal(ish)
to the number of packets. Adjust our arithmetic accordingly.

Change-Id: Ic8cc8a746bdd2bdc6771794303e95a810bc3d1d2
Reviewed-on: https://code.wireshark.org/review/16186
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-28 19:12:32 +00:00
Gerald Combs
7a7d790e7b Qt: Add a bottom border to the packet map.
Draw a bottom border so it looks a bit less odd on OS X. This could use
some further tweaking.

Change-Id: Id76d0a0cece672b927d6217c7a9f970c1ba212bc
Reviewed-on: https://code.wireshark.org/review/15391
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-20 11:44:28 +00:00
Gerald Combs
fb7cd193ab Qt: Keep the OverlayScrollBar from disappearing.
Make sure we disable transience in both the parent and child scroll bar.
This keeps the child from disappearing on Yosemite when "System
Preferences → General → Show scroll bars: When scrolling" is enabled.

Add some comments about what will be required to properly handle
transience.

Change-Id: I6fc37ef1783b6c8dea179f08ad6c4343c7cf8095
Reviewed-on: https://code.wireshark.org/review/15336
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-10 20:19:25 +00:00
Gerald Combs
0eff7256ec Qt: Fix the packet map background color.
Qt's item view widgets use QPalette::Base as a background color. Fill
the packet map accordingly.

Change-Id: I5e00c9c7dab554efa674b91296e75863d335dea4
Reviewed-on: https://code.wireshark.org/review/15264
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-04 18:38:43 +00:00
Dario Lombardo
0a5210f340 qt: fix initializer (CID 1358957).
Change-Id: Ic950368ede5dca36eb671165f3409770492c5b52
Reviewed-on: https://code.wireshark.org/review/15243
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-03 06:16:22 +00:00
Gerald Combs
b274bddbc0 Qt: Make the overlay scroll bar work with Qt 4.
In Qt 4, QScrollBar::setRange isn't a slot. Add a setChildRange
slot and connect to it instead. Add a QT_VERSION_CHECK breadcrumb in
a comment.

Change-Id: Ie28bbb6bd8249c31154a2fe236667adf1d53df61
Reviewed-on: https://code.wireshark.org/review/15215
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-02 15:19:44 +00:00
Martin Kaiser
7c79da8c30 qt: SH_ScrollBar_Transient is not available for Qt <= 5.2
add a version check in order to fix compilation with older Qt versions

(I couldn't figure out when exactly SH_ScrollBar_Transient was
introduced. It appears in the Qt 5.6 documentation, it's unavailable in
Qt 5.2)

Change-Id: Idf7ea1302e4a40e290a6750cbe077d9d2b7b56a8
Reviewed-on: https://code.wireshark.org/review/15196
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-01 16:26:22 +00:00
Martin Kaiser
90eea14044 qt: don't declare dp_ratio for Qt < 5.1
this avoids warnings about unused variables

Change-Id: I0ee033f90c1387615ffc167161e53f4293d89763
Reviewed-on: https://code.wireshark.org/review/15195
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01 14:16:54 +00:00
Martin Kaiser
80e554659e qt: use NULL instead of Q_NULLPTR
Q_NULLPTR is not defined in Qt4

Change-Id: I0dd5444c6c019b7e8f1a346d9e12432d9b306d8a
Reviewed-on: https://code.wireshark.org/review/15197
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-30 15:24:50 +00:00
Gerald Combs
b3e70f9a7e Qt: Refactor the packet list scroll bar.
Split OverlayScrollBar into parent and child scroll bar widgets. This
gives us two packet list scroll bars: a packet map, which draws and
operates on nearby packets and a normal scroll bar.

The packet map is drawn to the left of the child scroll bar. This gives
us more room to draw and doesn't obscure the scroll bar itself (which is
a problem on newer versions of Windows). When the user clicks on a
portion of the map, scroll to that part of the packet list.

Draw marked packet ticks over the normal scroll bar. Marked & ignored
are on the left, time references are on the right.

To do:

- Borrow more from packet fence and graph something (packet size? time
  delta?)

Change-Id: Ie952fcbd98fd0e047200f2279cb63227feabf5b1
Reviewed-on: https://code.wireshark.org/review/15046
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-28 17:18:41 +00:00
Gerald Combs
2227b6fa70 Add a comment about improvements for the OverlayScrollBar.
Change-Id: I2953deaa29691a2d12cb158456a650202dfeec77
Reviewed-on: https://code.wireshark.org/review/13171
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-10 18:43:12 +00:00
Gerald Combs
d51d83bea5 Fix the selected packet indicator width.
Change-Id: Ic792c232524b4124bb4607cbe1979cdce8fd7e23
Reviewed-on: https://code.wireshark.org/review/9866
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04 17:01:13 +00:00
Gerald Combs
4d6ef27b52 Qt < 5.1 doesn't have devicePixelRatio().
Change-Id: I490617db6b645c0129c565eb4b6efceeece9d535
Reviewed-on: https://code.wireshark.org/review/9751
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-23 03:21:06 +00:00
Gerald Combs
1514fe06cd Show the current selection in the overlay scrollbar.
Change-Id: Ie92b7ae170938eac71ede751d9067e1d47293092
Reviewed-on: https://code.wireshark.org/review/9750
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-23 00:24:08 +00:00
Gerald Combs
255d53dfc1 Draw packet colors in the packet list scrollbar.
Inspired by (but not as fancy as) Packet Fence, an enhancement written
for Ethereal a loooong time ago by Martin Visser:

https://www.wireshark.org/lists/ethereal-dev/200011/msg00122.html

Several text editors call this a "minimap".

Color each scrollbar raster line to match the color of up to 7 packets.
Note in the comments why this number was chosen.

If we have any flagged frames (marked, ignored, time ref) indicate them
on either side of the scrolbar.

Handle HiDPI (retina) displays. This means that your window size depends
on the height of your scrollbar *and* your monitor resolution.

Qt's idea of the slider rect doesn't match up with the slider on OS X.
This might be local to my build -- I can replicate it Qt Creator.

Change-Id: Ia089d2d766ce37bab11e22d1a5721b4908935304
Reviewed-on: https://code.wireshark.org/review/8982
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2015-07-16 22:57:31 +00:00