Commit Graph

101 Commits

Author SHA1 Message Date
Jörg Mayer 84f869cb2e Add the magic incantation to get icons into the cmake build.
No idea why the qtcreate build worked without this.
See http://developer.qt.nokia.com/doc/qt-4.8/resources.html

@Gerald: I've most likely put this into the wrong place, please
  verify/fix.

Thanks to Alexander Neundorf for spotting this and proposing a
fix.

svn path=/trunk/; revision=40841
2012-02-04 14:27:14 +00:00
Anders Broman 5f891470ac From Cristian Constantin:
Dissable sorting while storing the data.

svn path=/trunk/; revision=40836
2012-02-04 12:22:06 +00:00
Jörg Mayer e41766e4bb Rename the binary Wireshark -> qtshark
svn path=/trunk/; revision=40832
2012-02-04 10:02:40 +00:00
Jörg Mayer 0d0b51e56b Don't forget about the .qrc files.
There is nothing to install for the qt gui right now.

svn path=/trunk/; revision=40826
2012-02-03 17:40:55 +00:00
Martin Mathieson 1b42caf3b3 Add a link back to previous frame for UM sequence number analysis.
Change a couple of filter names to use "-" rather than "_".  Update
stats window to use changed filter name.

svn path=/trunk/; revision=40822
2012-02-03 10:42:01 +00:00
Jörg Mayer 6a9a596745 Update the list of problems with gtk3 and where to find
win32 builds of gtk3

svn path=/trunk/; revision=40821
2012-02-03 10:27:26 +00:00
Jörg Mayer d987442264 Add a comment about automoc (but don't use it as this would
force everyone to use a rather recent cmake).

svn path=/trunk/; revision=40815
2012-02-02 21:33:37 +00:00
Jörg Mayer 33b8433336 Fix make install for qtshark.
svn path=/trunk/; revision=40814
2012-02-02 21:21:04 +00:00
Jörg Mayer c3dea73ade Make out-of-tree builds work.
svn path=/trunk/; revision=40809
2012-02-02 12:38:04 +00:00
Jörg Mayer 137f3fc455 - Move setting _U_ into config.h, because
a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

svn path=/trunk/; revision=40807
2012-02-02 12:04:22 +00:00
Jörg Mayer f628ed7aec Update svn:ignore for existing qtshark build process
svn path=/trunk/; revision=40805
2012-02-02 08:55:00 +00:00
Jörg Mayer 0e3ac2fdf0 Prepare the cmake infrastucture for eventually building
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)

svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
Bill Meier 781d224ada Fix some Windows qmake and Qt Wireshark build issues:
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.


svn path=/trunk/; revision=40797
2012-02-01 21:47:31 +00:00
Bill Meier 60eca2a2eb Fix a typo
svn path=/trunk/; revision=40795
2012-02-01 21:24:08 +00:00
Bill Meier cf24e97617 Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.
svn path=/trunk/; revision=40781
2012-01-30 23:55:34 +00:00
Stig Bjørlykke 44a9db54e1 No need to set new save icon if equal to previous icon.
svn path=/trunk/; revision=40770
2012-01-30 13:51:04 +00:00
Stig Bjørlykke d86b90ce04 Disable the save-as button in the toolbar if we cannot save-as,
because this will assert.

svn path=/trunk/; revision=40769
2012-01-30 13:05:27 +00:00
Bill Meier 4308ba7dc5 Rework Windows Wireshark Qt build configuration a bit:
1. Compile and link with (almost exactly) the same options as used
   when building Windows Wireshark Gtk.
   The options used allow debugging of the exe using Visual Studio exactly
   as is done for Wireshark Gtk.
   Essentially: configure the "release" version to compile and link with
   symbols.  (See ui\qt\QtShark for the details).

2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
   which is linked against the "release" Qt libraries.
   (IOW: don't create a "debug" Makefile).

3. Remove unused variable assignments from config.pri.
   (They can be added back if needed in the future).


svn path=/trunk/; revision=40768
2012-01-30 04:37:12 +00:00
Anders Broman 6be62cd753 From Martin Kaiser:
Unused variable in rtp_analysis.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6776

svn path=/trunk/; revision=40747
2012-01-28 15:13:28 +00:00
Alexis La Goutte d307494e07 Fix
main_window.cpp: In function ‘QStringList build_file_open_type_list()’:
main_window.cpp:249:50: error: cannot call constructor ‘QString::QString’ directly [-fpermissive]
main_window.cpp:249:50: error:   for a function-style cast, remove the redundant ‘::QString’ [-fpermissive]


svn path=/trunk/; revision=40741
2012-01-27 16:49:54 +00:00
Chris Maynard 9f8003f490 Fix Coverity CID 1371: UNINIT.
svn path=/trunk/; revision=40728
2012-01-26 15:11:20 +00:00
Michael Tüxen 3d3346bc7e Try to make the buildbots happy.
svn path=/trunk/; revision=40726
2012-01-25 20:26:34 +00:00
Gerald Combs b58510cc31 The proper scope / spec name for OS X is "macx".
svn path=/trunk/; revision=40724
2012-01-25 18:06:25 +00:00
Bill Meier 36209e8773 Fix error when building QtShark:
...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters


svn path=/trunk/; revision=40723
2012-01-25 18:03:50 +00:00
Michael Tüxen eca83b8a0c Address warnings reported by Bill.
svn path=/trunk/; revision=40718
2012-01-25 16:32:51 +00:00
Jeff Morriss a122d4616e 'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.
svn path=/trunk/; revision=40716
2012-01-25 14:26:09 +00:00
Michael Tüxen 14b1a44c0f Third try. This time pipes and stdin are supported and the
test scripts are passed.

Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.

svn path=/trunk/; revision=40715
2012-01-25 13:04:32 +00:00
Martin Mathieson 93ac5f499e Use sizeof(buff) as length argument when calling g_snprintf().
svn path=/trunk/; revision=40714
2012-01-25 04:01:33 +00:00
Martin Mathieson cf60b35576 Delete a TODO comment (now that there is an equivalent tshark tap).
svn path=/trunk/; revision=40713
2012-01-25 04:00:25 +00:00
Gerald Combs 84151d4737 Put back an "explicit" for now. I'm not sure it's necessary but Qt
Creator put it there as I recall.

svn path=/trunk/; revision=40710
2012-01-25 01:16:36 +00:00
Gerald Combs 9a14284b5b Add a comment discussing what it will take to have native file dialogs
on Windows and OS X.

svn path=/trunk/; revision=40709
2012-01-25 01:13:04 +00:00
Gerald Combs 377322404f Compile PortAudio if it's available.
svn path=/trunk/; revision=40708
2012-01-24 21:26:22 +00:00
Guy Harris 13bd3bfbaa Note that INIT_DELAY is .1 second.
svn path=/trunk/; revision=40705
2012-01-24 20:32:01 +00:00
Guy Harris 3caea2d5ca Use wtap_get_file_extensions_list(), and prepare to use
wtap_get_savable_file_types(), in the Qt file dialogs.

svn path=/trunk/; revision=40698
2012-01-24 19:04:05 +00:00
Michael Tüxen 4fece25e7f We need a 3rd try. (After learning how to run the testuite on Windows locally).
svn path=/trunk/; revision=40695
2012-01-24 17:12:56 +00:00
Michael Tüxen b0819f5a80 (Try to) make the buildbot happy.
svn path=/trunk/; revision=40694
2012-01-24 16:40:16 +00:00
Michael Tüxen 08d6785412 Second try. This time pipes and stdin are supported.
Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.


svn path=/trunk/; revision=40693
2012-01-24 16:05:26 +00:00
Guy Harris a127e69037 build_file_save_type_list() isn't called if there are no savable file
types.

svn path=/trunk/; revision=40690
2012-01-24 09:29:02 +00:00
Guy Harris c3d2108e32 Only free the file extensions list if there is one to free.
svn path=/trunk/; revision=40689
2012-01-24 09:18:06 +00:00
Guy Harris 313d2c583a Don't free the list of savable file types in build_file_save_type_list()
- we use it later, and we're freeing it later.

svn path=/trunk/; revision=40688
2012-01-24 08:20:37 +00:00
Guy Harris cbd9a418f1 Fix warnings.
svn path=/trunk/; revision=40687
2012-01-24 08:09:33 +00:00
Guy Harris e21727258c Use wtap_get_savable_file_types() for the Win32 file save dialog.
svn path=/trunk/; revision=40686
2012-01-24 05:55:00 +00:00
Guy Harris c8854a7a5f Add a routine to Wiretap that takes a file type value and an
encapsulation value and returns a GArray containing all the file types
that could be used to save a file of that file type and that
encapsulation value (which could be WTAP_ENCAP_PER_PACKET), with the
input file type first if that can be used and pcap or pcap-ng first if
not and if one of them can be used, and with pcap and pcap-ng clustered
together if they're among the file types that can be used.

Use that routine for the GTK+ file save dialog.

svn path=/trunk/; revision=40685
2012-01-24 04:33:23 +00:00
Guy Harris 7a3653b9c8 Don't treate WTAP_FILE_UNKNOWN as a real file type.
svn path=/trunk/; revision=40679
2012-01-24 00:48:48 +00:00
Guy Harris 3b1f82d063 In the table of capture file types, have:
a field that gives the default extension for the file type,
	*without* a leading "." (i.e., just the extension, not the "."
	that separates it from the rest of the file name), which is NULL
	if there are no known extensions;

	a field that gives a semicolon-separated list of *other*
	extensions, without "*." or ".", which is NULL if there are no
	known extensions or there are no known extensions other than the
	default.

Rename wtap_file_extension_default_string() to
wtap_default_file_extension() (matches the name of the field).

svn path=/trunk/; revision=40678
2012-01-23 23:17:03 +00:00
Guy Harris e33f160de6 g_string_append_printf() returns nothing.
svn path=/trunk/; revision=40676
2012-01-23 22:23:37 +00:00
Guy Harris bb98263aa4 Have wtap_file_extension_default_string() return the extension in the
sense of "what follows the last . in the file name", i.e. not including
the ".".

svn path=/trunk/; revision=40674
2012-01-23 21:57:45 +00:00
Jeff Morriss c5be5ec99c Finish wrapping heuristic dissector functions in #if conditionals; change the condition to check if HEUR_DISSECTOR_LIST is defined.
svn path=/trunk/; revision=40671
2012-01-23 20:40:16 +00:00
Guy Harris 77005f2a8c Put back the #include changes from a previous commit.
svn path=/trunk/; revision=40670
2012-01-23 20:31:42 +00:00
Anders Broman 008dd26ff5 Remove a debug statement.
svn path=/trunk/; revision=40668
2012-01-23 19:48:05 +00:00