Commit Graph

611 Commits

Author SHA1 Message Date
Gerald Combs ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Gerald Combs 4e94bdcb85 Fix scroll bar ranges.
svn path=/trunk/; revision=52937
2013-10-28 23:57:57 +00:00
Jeff Morriss d07f872c90 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9341 :
SVN rev 50525 tried to fix out-of-source-tree builds, but did so by
writing the .rcc.cpp files to the source tree. This was noticed when
running `make distcheck`. This patch reverts that behavior, and creates
the image/ directory to fix out-of-tree builds.

In other words, fix things so "make distcheck" with Qt works in out-of-tree
builds too.

svn path=/trunk/; revision=52926
2013-10-28 18:01:09 +00:00
Gerald Combs 3b7c0fffe4 More size and position tweaks.
svn path=/trunk/; revision=52913
2013-10-28 01:39:20 +00:00
Gerald Combs 5c65e00ca7 Try to improve the appearance of the sequence diagram.
Use integer coordinates for the arrows and text. Add smooth_font_size()
to qt_ui_utils which will hopefully adjust the size on Windows to
something more readable.

svn path=/trunk/; revision=52906
2013-10-27 22:23:27 +00:00
Gerald Combs 69741d086b Remove U3 code and packaging.
svn path=/trunk/; revision=52896
2013-10-27 17:15:39 +00:00
Alexis La Goutte 5b28dba199 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52876
2013-10-26 17:20:18 +00:00
Gerald Combs 7a2de9f471 More sequence dialog updates.
Draw item labels and port numbers.  Update the hint text. Make items
selectable.  Resize fonts similar to the GTK+ version.  Add scrollbars.
Update the cursor.  Use pango_layout_set_ellipsize() in the GTK+ code.
Fixup comments.

svn path=/trunk/; revision=52855
2013-10-25 23:16:56 +00:00
Jeff Morriss 0cc2c88c2e Fix more SVN properties.
svn path=/trunk/; revision=52834
2013-10-25 01:25:23 +00:00
Jeff Morriss 787bca8ea0 Add SVN properties.
svn path=/trunk/; revision=52832
2013-10-25 00:56:17 +00:00
Gerald Combs 6131c00358 Add sequence_dialog.ui.
svn path=/trunk/; revision=52826
2013-10-24 23:11:09 +00:00
Gerald Combs cb3cfd1cf9 Add a missing dependency.
svn path=/trunk/; revision=52825
2013-10-24 23:01:30 +00:00
Gerald Combs 1a4033b63b Initial and woefully incomplete flow graph support.
Copy common code from ui/gtk/flow_graph.c and ui/gtk/graph_analysis.[ch]
to ui/tap-sequence-analysis.[ch]. Start using the name "sequence" in
places.

svn path=/trunk/; revision=52824
2013-10-24 22:52:30 +00:00
Jeff Morriss 7ab98fb047 Get it actually building when we don't HAVE_LIBPCAP.
It would seem moc doesn't know about or pay attention to #ifdefs so take them
out of wireshark_application.h .

svn path=/trunk/; revision=52681
2013-10-18 21:47:05 +00:00
Jeff Morriss 3b1463d6b3 Clean up warnings when we don't HAVE_LIBPCAP.
svn path=/trunk/; revision=52680
2013-10-18 21:32:59 +00:00
Jeff Morriss d69a93f70e Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS.
svn path=/trunk/; revision=52676
2013-10-18 18:28:57 +00:00
Jeff Morriss 2ac63d7a44 Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI.
svn path=/trunk/; revision=52674
2013-10-18 17:42:32 +00:00
Jeff Morriss db68b808dd Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in
the C++ stuff.

ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it
doesn't seem necessary on Fedora 18 (64-bit).  Leaving it out for now--let's
see what others say...

svn path=/trunk/; revision=52673
2013-10-18 16:56:27 +00:00
Jörg Mayer 662c7704f8 After looking for something in the column-*.h files and
not finding it, I finally found it in column_info.h
Renamed column_info.h to column-info.h to have consistency
with the column*h files.

svn path=/trunk/; revision=52667
2013-10-18 13:06:05 +00:00
Gerald Combs fb9d4296be Adjust parenthesis to make gcc happy.
svn path=/trunk/; revision=52632
2013-10-15 21:31:32 +00:00
Gerald Combs 720de303c7 Add some missing parenthesis. Make sure we set our font in the right place.
Make the ColorUtils::fromColorT() convenience function a little more
convenient. Use it.

svn path=/trunk/; revision=52620
2013-10-15 15:22:03 +00:00
Gerald Combs 2b0c8b1c71 Fill in the help links. Make sure they do something when they're clicked.
Try to make the task list width match its contents.

svn path=/trunk/; revision=52611
2013-10-15 00:48:34 +00:00
Gerald Combs 4520cc08e1 Remove some commented code.
svn path=/trunk/; revision=52610
2013-10-15 00:17:23 +00:00
Gerald Combs 0efe942aab Let Qt lay out and size elements in FollowStreamDialog. Make it
resizable. Get rid of the group box -- the OS X and Windows HIGs
discourage its use and I'm not sure if it fits the GNOME HIG in this
case either. Make the stream contents monospace. Set the cursor to the
beginning of the text when we follow a stream.

Continue the War On Unnecessary Dialogs. Move "Find"ing from a pop-up
window to the main Follow dialog. Wrap back to the beginning as needed.

Add a "Cancel" button. Make sure it and the escape key work as expected.

svn path=/trunk/; revision=52607
2013-10-14 21:17:38 +00:00
Gerald Combs 13c1c9daf7 PacketList and ProtoTree need access to MainWindow at initialization
time in order to fill in their respective context menus. R52386 broke
that. Fix it and add comments about handling reparenting. Fixes bug
9265.

svn path=/trunk/; revision=52600
2013-10-14 16:54:41 +00:00
Graham Bloice 9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Gerald Combs 1f2043d69c Solaris Studio C++ won't let us pass the address of main() to
init_progfile_dir(). Try using QCoreApplication::applicationFilePath()
instead.

svn path=/trunk/; revision=52559
2013-10-12 02:29:17 +00:00
Gerald Combs 90b20ab830 One more HAVE_LIBPCAP.
svn path=/trunk/; revision=52554
2013-10-11 21:42:49 +00:00
Gerald Combs 564ca2d5e9 Try to fix Qt compilation when libpcap is disabled.
svn path=/trunk/; revision=52552
2013-10-11 21:26:26 +00:00
Gerald Combs 3623167b81 Include ui/util.h.
svn path=/trunk/; revision=52544
2013-10-11 17:47:43 +00:00
Gerald Combs 259768dc1a Remove GTK+ and global cfile dependencies from file_dlg_win32.c.
Move the declaration of set_last_open_dir() to ui/util.h. It still
has separate GTK+ and Qt implemenations. We might want to move it to
ui/util.c at some point. Remove a lot of unnecessary GTK+ includes.
Remove most of the references to the global cfile while we're at it.

svn path=/trunk/; revision=52542
2013-10-11 17:20:50 +00:00
Gerald Combs 576a16004b When we display an error message in the interface list make sure it's
word-wrapped.

svn path=/trunk/; revision=52473
2013-10-09 17:58:39 +00:00
Michael Mann 9ccefb0ecd Prefix all "Wireshark application specific" display filters with a "_ws." to distinguish them from dissector filters.
This was committed now to get it into the 1.11 release so users can start getting used to the changed filter names.

svn path=/trunk/; revision=52462
2013-10-09 12:56:19 +00:00
Evan Huus 0faf9a0840 Rewrite the layout case statement as two separate ones, grouping and using
fallthrough to reduce the amount of duplication.

svn path=/trunk/; revision=52398
2013-10-06 13:22:12 +00:00
Gerald Combs 0db37a0d2e Make the task list colors more consistent.
svn path=/trunk/; revision=52388
2013-10-05 22:47:43 +00:00
Gerald Combs c37cd6b66f Fix the white-rectangle-at-startup artifact with the help of GammaRay[1].
Make extra_split_ a member variable again. Make it and master_split_
full-on values. Set various parent/child relationships at startup
so that each widget is associated with a layout (which appears to be
the actual fix).

Make the throttled startup delay huge so that it's easier to browse
using GammaRay.

[1] https://github.com/KDAB/GammaRay

svn path=/trunk/; revision=52386
2013-10-05 22:39:49 +00:00
Gerald Combs a6f406ac5a Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

svn path=/trunk/; revision=52282
2013-09-30 07:55:11 +00:00
Gerald Combs 80d1fde12a Delete extra_split if we're not using it. This keeps its handle from
showing up in the main window. Make it local to layoutPanes().

svn path=/trunk/; revision=52211
2013-09-25 00:26:36 +00:00
Gerald Combs 945901af70 address_equal → addresses_equal. Switch from address macros to functions
in the Qt code.

svn path=/trunk/; revision=52108
2013-09-16 21:33:26 +00:00
Gerald Combs f36c727fb0 Add stream information to the hint label. Update our hint more often.
Add a "to do" list.

svn path=/trunk/; revision=52102
2013-09-16 17:28:42 +00:00
Gerald Combs 29b63a71e6 Make sure we don't tap our packets twice. Give the graph has focus after
we redraw it.

svn path=/trunk/; revision=52095
2013-09-16 02:04:52 +00:00
Gerald Combs 0f6baaa805 Fix graph type selection.
svn path=/trunk/; revision=52094
2013-09-16 01:19:14 +00:00
Gerald Combs 6b251c7219 Another attempt at axis scaling. Tweak the appearance a little.
svn path=/trunk/; revision=52093
2013-09-16 00:50:23 +00:00
Gerald Combs 98479b0b17 When caclulating throughput, only subtract what we've added. Try to fix
axis scaling.

svn path=/trunk/; revision=52092
2013-09-15 23:55:51 +00:00
Gerald Combs dd88e1ab26 Make sure the RTT behavior matches the GTK+ port. Make sure we properly
select a graph type.

svn path=/trunk/; revision=52083
2013-09-15 20:44:57 +00:00
Gerald Combs 7b03b59598 Mis-use error bars to draw segments.
svn path=/trunk/; revision=52029
2013-09-13 23:34:34 +00:00
Gerald Combs 7f92257af8 More TCP stream graph updates.
Scan our segment list (and the capture file) once per stream. Switch the
stream selection control to a QSpinBox. Add graph type selection
actions. The context menu + shortcuts should now be complete. Add the
intitial tcptrace graph. Only ACKs and RWINs so far. A bunch of other
updates and fixes.

svn path=/trunk/; revision=52027
2013-09-13 22:29:05 +00:00
Gerald Combs 1ad683594d Add a context menu to the TCP stream graph which includes all of our
keyboard shortcuts.

svn path=/trunk/; revision=51996
2013-09-12 23:46:56 +00:00
Gerald Combs c1e9555ad3 Try different arrow glyphs.
svn path=/trunk/; revision=51992
2013-09-12 22:04:37 +00:00
Jörg Mayer 2e9cd19c9c == has higher precedence than &
http://en.wikipedia.org/wiki/Operators_in_C_and_C++

svn path=/trunk/; revision=51990
2013-09-12 21:53:53 +00:00