osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
43233 commits 23 branches 0 tags 1.3 GiB
Commit graph

244 commits

Author SHA1 Message Date
Gerald Combs
0ffe19134b Construct a proper directory URL. 
svn path=/trunk/; revision=45245
 2012-10-01 22:55:45 +00:00
Evan Huus
3e5ac249e9 Add new fileset ui file to cmake build. 
svn path=/trunk/; revision=45244
 2012-10-01 22:52:14 +00:00
Gerald Combs
d02a2328ef Implement file sets. 
Replace the original file set code with a UI form. Use more consistent
file names. List the files using a QTreeWidget instead of a grid.
fileset_is_file_in_set is only used in fileset.c so make it static.

In main_window.cpp reduce our usage of the global cfile variable.

svn path=/trunk/; revision=45243
 2012-10-01 22:40:20 +00:00
Jeff Morriss
2dc1b40a20 There is no longer the need to define HAVE_CONFIG_H. 
svn path=/trunk/; revision=45232
 2012-10-01 11:49:15 +00:00
Evan Huus
2a29fee996 Only define a parameter name if we end up using it, to fix the 
qtshark build on GCC.

svn path=/trunk/; revision=45164
 2012-09-27 02:43:09 +00:00
Gerald Combs
b3ced49412 Fix compilation on Windows. 
svn path=/trunk/; revision=45160
 2012-09-26 21:16:59 +00:00
Gerald Combs
068815cc67 Implement "Save" and "Save As". 
svn path=/trunk/; revision=45156
 2012-09-26 19:52:53 +00:00
Alexis La Goutte
74d0df441e Add load of translate QLibraryInfo to have standart button (and other stuff) translated 
svn path=/trunk/; revision=45140
 2012-09-25 20:18:02 +00:00
Alexis La Goutte
3738ed7370 Use "common help_url function" for qtshark 
Add links to Manual Pages...

svn path=/trunk/; revision=45139
 2012-09-25 20:08:11 +00:00
Alexis La Goutte
2af09e863e Add modelines info for qtshark import file 
svn path=/trunk/; revision=45136
 2012-09-25 19:29:04 +00:00
Evan Huus
bebce51b6b Display the "no interfaces" message in qtshark on any type of error, 
as otherwise certain errors result in just a blank box. Also be sure to
free the error string after QT's got its own copy.

svn path=/trunk/; revision=45068
 2012-09-23 14:54:53 +00:00
Jeff Morriss
2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not. 
svn path=/trunk/; revision=45017
 2012-09-20 02:03:38 +00:00
Evan Huus
bf976a10cb Use g_new instead of g_malloc to avoid manual C-style casting in C++ code. 
svn path=/trunk/; revision=44998
 2012-09-19 01:58:24 +00:00
Gerald Combs
4a57360291 Use guilibsdll and htmlhelp.lib in the Qt build. 
svn path=/trunk/; revision=44996
 2012-09-19 00:47:31 +00:00
Gerald Combs
7d8330f50a Remove a debugging mesage. 
svn path=/trunk/; revision=44993
 2012-09-18 23:48:59 +00:00
Gerald Combs
c4d22dbe11 import_text_dialog.cpp: Use the common help URL routines. 
main_window.cpp: QMessageBox::exec returns a StandardButton, not a ButtonRole.
help_dlg.c: Remove extra blank lines.

svn path=/trunk/; revision=44991
 2012-09-18 22:52:34 +00:00
Evan Huus
4b471d0ca6 Add Gerald's recent qt text-import work to CMake build. 
svn path=/trunk/; revision=44963
 2012-09-18 00:40:10 +00:00
Gerald Combs
f6f174ffec Make the help button do something. 
svn path=/trunk/; revision=44960
 2012-09-18 00:17:04 +00:00
Gerald Combs
a7f1c30a57 Adjust the Import Text dialog size policy, although it's still not 
quite right.

svn path=/trunk/; revision=44958
 2012-09-18 00:05:55 +00:00
Gerald Combs
9e338509f5 Restore set_last_open_dir. We need it on Windows. 
svn path=/trunk/; revision=44957
 2012-09-17 23:59:50 +00:00
Gerald Combs
3069f22bd1 Add a text import dialog. Use libui. 
svn path=/trunk/; revision=44956
 2012-09-17 23:40:53 +00:00
Guy Harris
5a551d6b63 Nobody uses DIRTY_GENERATED_C_FILES, so get rid of it; we don't want to 
encourage people to create source files that get warnings.

svn path=/trunk/; revision=44909
 2012-09-15 08:17:53 +00:00
Gerald Combs
dc60423e87 Use the native merge dialog on Windows. This may break non-Windows builds. 
svn path=/trunk/; revision=44864
 2012-09-10 23:03:22 +00:00
Gerald Combs
b74aa22317 Show our packets after we've loaded a file. 
svn path=/trunk/; revision=44863
 2012-09-10 23:02:34 +00:00
Guy Harris
b50bf64b3b I presume the mergeType method is supposed to be provided regardless of 
whether this is Windows or not.

svn path=/trunk/; revision=44799
 2012-09-07 00:29:32 +00:00
Gerald Combs
ed08b5fd5b Fix compilation on Windows. 
svn path=/trunk/; revision=44798
 2012-09-06 23:41:34 +00:00
Gerald Combs
2bda67e82e Implement File→Merge. 
The GTK+ and native Win32 versions are slightly different. The GTK+
version lets you select an output file type and the Win32 version uses
the existing capture filetype. We do the latter for now.

Start documenting significant UI changes in README.qt. This might be
better handled on the wiki.

svn path=/trunk/; revision=44797
 2012-09-06 22:58:39 +00:00
Gerald Combs
42c506132e The Qt documentation is mysteriously silent about where qmake can find 
Qt DLLs on Windows. %QTDIR%? $$QMAKE_LIBDIR_QT? "qmkake -query" says
$$[QT_INSTALL_BINS] so we'll try that.

svn path=/trunk/; revision=44780
 2012-09-05 19:00:41 +00:00
Evan Huus
471b4d94ef Remove string constants from g_assert() calls, as per thread on wireshark-dev: 
http://www.wireshark.org/lists/wireshark-dev/201209/msg00030.html

svn path=/trunk/; revision=44774
 2012-09-05 01:44:09 +00:00
Alexis La Goutte
42ace71553 Add modelines for Qtshark file 
svn path=/trunk/; revision=44766
 2012-09-04 08:18:31 +00:00
Jörg Mayer
12a0aa4849 - Replace packet_list_recreate_visible_rows -> packet_list_recreate_visible_rows_list 
- Replace new_packet_list_ -> packet_list_


svn path=/trunk/; revision=44765
 2012-09-04 02:35:25 +00:00
Jörg Mayer
380fe63a6d Rename new_packet_list.[ch] to packet_list.[ch] 
svn path=/trunk/; revision=44764
 2012-09-04 01:57:36 +00:00
Evan Huus
fe5173d259 Don't leak memory when given an empty remote host (caught by cppcheck). 
svn path=/trunk/; revision=44727
 2012-09-01 13:49:42 +00:00
Evan Huus
752c00ea9b Temporarilly comment out param names while they're unused (basically 
until the functions are implemented) so qtshark will compile with gcc.

svn path=/trunk/; revision=44726
 2012-09-01 13:37:04 +00:00
Evan Huus
2f5b01c68a Fix part of build on latest GCC. 
svn path=/trunk/; revision=44719
 2012-09-01 02:56:32 +00:00
Gerald Combs
64346553f9 Don't try to read from our input pipe on Windows after we're done capturing. 
svn path=/trunk/; revision=44718
 2012-08-31 23:37:10 +00:00
Gerald Combs
3751353a70 Connect and disconnect our signals correctly. 
Capture still doesn't work correctly under Windows.

svn path=/trunk/; revision=44717
 2012-08-31 23:18:45 +00:00
Gerald Combs
cf4ac2931e Fix compilation on Windows. 
The moc man page says "The moc does not expand #include or #define,
it simply skips any preprocessor directives it encounters." This means
our signals and slots have to exist everywhere, even if they're empty
on some platforms.

Remove some duplicate definitions.

svn path=/trunk/; revision=44716
 2012-08-31 23:13:43 +00:00
Gerald Combs
d6ce6168bb Initialize a variable so that we can quit. Remove some debugging 
statements.

svn path=/trunk/; revision=44715
 2012-08-31 22:50:44 +00:00
Gerald Combs
5c715fcc19 It ain't Wireshark unless we can capture. 
Implement basic capture start and stop. Add a lot of menu items and
enable and disable them when appropriate. Rename a few variables.

Next step: Let the user select an interface (we just use the default for
now).

svn path=/trunk/; revision=44714
 2012-08-31 22:25:51 +00:00
Alexis La Goutte
94cbe0ce2c Add Q&A icon for qtshark 
svn path=/trunk/; revision=44713
 2012-08-31 12:11:44 +00:00
Alexis La Goutte
070ccb3d5a File => Open (Ctrl+O) on Qtshark (broke with last change...) 
Use Qt:Autoconnect SLOT/Signal

svn path=/trunk/; revision=44708
 2012-08-31 07:56:24 +00:00
Gerald Combs
6b26e33c60 Allow focus in the task list, which in turn allows keyboard navigation. 
svn path=/trunk/; revision=44643
 2012-08-23 17:42:02 +00:00
Gerald Combs
a04d6e4690 Fill in some missing functionality. Rename some variables and rearrange 
a few things.

svn path=/trunk/; revision=44641
 2012-08-23 17:29:05 +00:00
Jörg Mayer
e3d925b1ff The proper way to set compiler flags in cmake is not by using 
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these
flags correctly at the toplevel, so no hack in the ui/qt/ subdir
is required anymore.

svn path=/trunk/; revision=44633
 2012-08-23 12:30:16 +00:00
Jörg Mayer
b43901043a Remove commented out rules 
Whitespace fixes

svn path=/trunk/; revision=44629
 2012-08-23 10:34:45 +00:00
Jörg Mayer
11b1de0cdf Fixes for warnings: unused-but-set-variable 
svn path=/trunk/; revision=44628
 2012-08-23 10:30:37 +00:00
Gerald Combs
fa0a6beb0e Catch key events where needed and direct them to the display filter 
QLineEdit. Use Tango colors for syntax highlighting. Rename a few
variables.

svn path=/trunk/; revision=44620
 2012-08-23 02:59:31 +00:00
Gerald Combs
4c32e01dfe Handle return/enter/escape in the Go to Packet QLineEdit. 
svn path=/trunk/; revision=44616
 2012-08-22 20:39:36 +00:00
Gerald Combs
da27acaa27 Fix compilation. 
svn path=/trunk/; revision=44602
 2012-08-21 03:07:39 +00:00
Gerald Combs
16518aff46 Restore the previous focus when we're done going to a packet. 
svn path=/trunk/; revision=44601
 2012-08-20 21:22:01 +00:00
Gerald Combs
3cdf8d6e09 Stylize the "go to packet" bar. 
svn path=/trunk/; revision=44597
 2012-08-20 17:55:43 +00:00
Gerald Combs
2f9b5d31e4 Basic "Go to Packet" implementation. 
svn path=/trunk/; revision=44594
 2012-08-20 04:34:23 +00:00
Gerald Combs
44cb77d8de Handle double-clicks in the tree. 
svn path=/trunk/; revision=44592
 2012-08-19 23:52:08 +00:00
Gerald Combs
7e924beee9 Be more specific. 
svn path=/trunk/; revision=44591
 2012-08-19 21:52:57 +00:00
Gerald Combs
01d8219f59 Try colors from the Tango palette. 
svn path=/trunk/; revision=44590
 2012-08-19 21:44:22 +00:00
Gerald Combs
2b21eff0d9 Add automatic tree expansion. Get rid of some unnecessary void * casts. 
Fix a couple of compilation warnings.

svn path=/trunk/; revision=44587
 2012-08-19 20:47:11 +00:00
Guy Harris
5e17f4606f ui_main_welcome.h is another file generated by uic, so list it in 
GENERATED_NODIST_HEADER_FILES.

svn path=/trunk/; revision=44569
 2012-08-18 22:25:50 +00:00
Jörg Mayer
3b15b97e88 Make qtshark build again with autotools - possibly. Completely untested. 
svn path=/trunk/; revision=44567
 2012-08-18 19:45:09 +00:00
Jörg Mayer
2fdb1aca60 Make cmake build qtshark again 
svn path=/trunk/; revision=44566
 2012-08-18 19:40:12 +00:00
Gerald Combs
29d4ead8ad Fix a focus artifact on Windows and adjust colors for not-so-stellar 
monitors.

svn path=/trunk/; revision=44556
 2012-08-17 22:04:20 +00:00
Gerald Combs
c12c712d9c More welcome screen layout updates. Instantiate the welcome screen 
automatically. Try to make the sparklines resolution independent.

svn path=/trunk/; revision=44555
 2012-08-17 19:37:18 +00:00
Gerald Combs
a63c89d004 Auto-expand the welcome screen layout. Get rid of or comment out 
debugging items.

svn path=/trunk/; revision=44549
 2012-08-17 02:37:58 +00:00
Gerald Combs
2fe5163ec3 Lay out the welcome screen using Qt Designer. 
svn path=/trunk/; revision=44547
 2012-08-17 00:58:50 +00:00
Gerald Combs
f2789cbb34 Copy over the C runtime DLLs if MSVCR_DLL is defined. 
svn path=/trunk/; revision=44544
 2012-08-16 19:37:01 +00:00
Gerald Combs
ac909fa890 Only apply the QWindowsVistaStyle hack when it's the current style. 
svn path=/trunk/; revision=44499
 2012-08-14 18:36:50 +00:00
Gerald Combs
0d3a203d3e Copy the QtCore and QtGui DLLs to the Qt staging directory. 
svn path=/trunk/; revision=44497
 2012-08-14 18:16:57 +00:00
Gerald Combs
c8a4832050 Fix compilation with gcc. Remove an unused variable. 
svn path=/trunk/; revision=44495
 2012-08-14 17:35:50 +00:00
Gerald Combs
fab29eea8d Properly enable and disable "View/Expand Subtrees". Get rid 
of ProtoTree::protoItemUnselected and use an empty string in
protoItemSelected to indicate that nothing is selected.

svn path=/trunk/; revision=44492
 2012-08-14 16:35:52 +00:00
Gerald Combs
6f55c03852 Fix compilation warnings. 
svn path=/trunk/; revision=44489
 2012-08-14 16:01:47 +00:00
Gerald Combs
e0fcd7c21f Add a "View" menu along with actions+slots for expanding and collapsing 
packet details. Connect the "Go" menu actions directly to their
corresponding packet list slots.

svn path=/trunk/; revision=44483
 2012-08-14 04:12:56 +00:00
Gerald Combs
5a84802a21 Don't copy over the entire contents of the GnuTLS bin directory. Move 
wireshark-qt to the top source directory alongside wireshark-gtk2. We
may want to merge them at some point.

svn path=/trunk/; revision=44482
 2012-08-14 00:43:10 +00:00
Gerald Combs
09242a83bf Minor cleanup: Get rid of unnecessary signal+slot customization and mark 
functions protected.

svn path=/trunk/; revision=44481
 2012-08-14 00:25:42 +00:00
Gerald Combs
f532cd3064 Use the right color on Windows when selected. 
svn path=/trunk/; revision=44479
 2012-08-13 23:37:15 +00:00
Gerald Combs
0cf96d45db Include console.lua with the build. 
svn path=/trunk/; revision=44463
 2012-08-13 03:58:52 +00:00
Gerald Combs
603787f0ad Add keyboard shortcuts for the packet list. 
svn path=/trunk/; revision=44462
 2012-08-13 01:50:14 +00:00
Jörg Mayer
bf92ff4a3e Remove an empty line 
svn path=/trunk/; revision=44334
 2012-08-08 12:33:13 +00:00
Alexis La Goutte
b245c46c50 lupdate QtShark.pro 
Updating 'qtshark_de.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 13 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 72 source text(s) (16 new and 56 already existing)
    Kept 10 obsolete entries
    Similar-text heuristic provided 3 translation(s)

Also remove $Id$, it is xml file (auto)generated by Qt (lupdate)

svn path=/trunk/; revision=44305
 2012-08-07 16:08:23 +00:00
Alexis La Goutte
43e031bf86 Apply the change of revision 44103 to QtShark 
( It is link Tshark Help not Wireshark (already in bottom !))

Also remove $Id$, it is Xml file (auto)generated by Qt Design

svn path=/trunk/; revision=44303
 2012-08-07 15:42:43 +00:00
Jörg Mayer
5bf74638a3 Set svn properties 
svn path=/trunk/; revision=44286
 2012-08-06 20:58:19 +00:00
Jörg Mayer
78be49a3d0 Add Id header (and the standard copyright headers) to some files. 
svn path=/trunk/; revision=44285
 2012-08-06 20:50:30 +00:00
Gerald Combs
704c2e0355 Apparently QPointFs draw on center. Offset them in order to avoid 
gratuitous antialiasing.

svn path=/trunk/; revision=44284
 2012-08-06 20:44:33 +00:00
Alexis La Goutte
16821fe43c Fix Unknown test function: packagesExist when launch qmake QtShark.pro 
packagesExist is only present in Qt >= 4.8 ( https://bugreports.qt-project.org/browse/QTBUG-11418 )
Add packagesExist function if Qt < 4.8 ( from http://qt.gitorious.org/qt/qt/merge_requests/1022 )

svn path=/trunk/; revision=44282
 2012-08-06 16:17:16 +00:00
Jörg Mayer
74a3a6e405 Don't call "Q_OBJECT" if there are no signals or slots defined. 
Fix cmake (and possibly autotools) build for:

lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'

This would not show up using qtcreator due to the magic of qmake.

I must admit that I don't fully understand what I am doing here, but
I read the following thread to the bottom and one of the last posts
contained the solution:
http://stackoverflow.com/questions/1095298/gcc-c-linker-errors-undefined-reference-to-vtable-for-xxx-undefined-refere


svn path=/trunk/; revision=44280
 2012-08-06 10:59:00 +00:00
Gerald Combs
6766420142 Take out a debugging statement. 
svn path=/trunk/; revision=44260
 2012-08-04 04:35:34 +00:00
Gerald Combs
215d89c890 Draw selected items properly. 
svn path=/trunk/; revision=44259
 2012-08-04 02:02:40 +00:00
Gerald Combs
1500f3bd42 Fix sparlines on Windows. Unfortunately this means listing device IDs 
(for now at least).

svn path=/trunk/; revision=44258
 2012-08-04 00:37:04 +00:00
Jörg Mayer
ed6e29eac6 Try to copy over the changes to QtShark.pro to automake and cmake. 
Note: It still fails with
Linking CXX executable qtshark
lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'
collect2: error: ld returned 1 exit status


svn path=/trunk/; revision=44257
 2012-08-04 00:31:31 +00:00
Gerald Combs
51e75f3bb3 Qt Creator put sparkline_delegate.{cpp,h} in their own special sections. 
Don't do that.

svn path=/trunk/; revision=44256
 2012-08-04 00:21:21 +00:00
Gerald Combs
b82eedf94a Make sure global_capture_opts is properly declared. 
svn path=/trunk/; revision=44254
 2012-08-04 00:01:59 +00:00
Gerald Combs
a234d1215c Move capture_globals.h from ui/gtk/ to ui/. Show interface activity 
using sparklines in the qtshark main window.

svn path=/trunk/; revision=44253
 2012-08-03 23:30:47 +00:00
Gerald Combs
523ce7d8b5 Pick up PortAudio dynamically. 
svn path=/trunk/; revision=44208
 2012-08-02 14:29:33 +00:00
Gerald Combs
02894a0be8 Move utf8_entities.h to the "ui" directory. Separate packet information 
items with MIDDLE DOTs.

svn path=/trunk/; revision=44194
 2012-08-01 19:18:49 +00:00
Jörg Mayer
0e5b323ace spelling fix (hopefully) 
svn path=/trunk/; revision=44191
 2012-08-01 18:42:10 +00:00
Jörg Mayer
ffb4be37a6 Make the changes of r44165 build with autofoo and cmake as well 
svn path=/trunk/; revision=44190
 2012-08-01 18:27:57 +00:00
Gerald Combs
005ac60289 More style tweaks. 
svn path=/trunk/; revision=44189
 2012-08-01 16:17:47 +00:00
Gerald Combs
0c3fd84ef5 Adjust the text size on OS X. This introduces an artifact that affects 
the expert indicator. Maybe we should use SVG icons instead of PNGs.

svn path=/trunk/; revision=44176
 2012-08-01 00:06:21 +00:00
Jeff Morriss
d1bb5b5860 (Attempt to) reflect the file moves from r44165. 
svn path=/trunk/; revision=44174
 2012-07-31 22:57:04 +00:00
Alexis La Goutte
0120281417 Add icon to QtShark.exe for Windows 
Fix the patch to the icon..

svn path=/trunk/; revision=44171
 2012-07-31 20:50:24 +00:00
Alexis La Goutte
bc77426c97 Add icon to QtShark.exe for Windows 
qstshark.rc => qtshark.rc 

svn path=/trunk/; revision=44170
 2012-07-31 20:47:07 +00:00