Commit Graph

1720 Commits

Author SHA1 Message Date
Gerald Combs 2643a5b02d Update qtshark to match the recent file dialog changes.
svn path=/trunk/; revision=43786
2012-07-18 16:40:34 +00:00
Gerald Combs bc1b0fd21d Try not to print funny characters.
svn path=/trunk/; revision=43685
2012-07-12 23:39:25 +00:00
Gerald Combs 5d4638e95c Fix building (and running) on OS X.
svn path=/trunk/; revision=43684
2012-07-12 22:39:04 +00:00
Gerald Combs bdea70585d Use win32_open_file in qtshark on Windows.
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Anders Broman 3814106d7e From Michael Mann:
generic preferences implementation

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

svn path=/trunk/; revision=43484
2012-06-25 21:05:36 +00:00
Guy Harris 7fbd6ca1f0 Add "simple dialog" routines to pop up modal message boxes.
svn path=/trunk/; revision=43330
2012-06-18 08:30:53 +00:00
Gerald Combs 304654f688 Don't install the Qt resource images. They get converted to C arrays in
qrc_*.cpp so they shouldn't be necessary even when we're building and
installing qtshark.

svn path=/trunk/; revision=43274
2012-06-15 18:17:20 +00:00
Gerald Combs e63f70cfc2 Add the GeoIP DLL.
svn path=/trunk/; revision=43128
2012-06-05 23:43:02 +00:00
Gerald Combs 95e53ff7ab Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNU
toolchain version but that's a separate issue.)

svn path=/trunk/; revision=43124
2012-06-05 18:37:32 +00:00
Guy Harris e6a57c8e93 In Windows, in the Save As and Export Selected Packets dialog, append
the default extension for the file type iff

	the file type we're using has a list of extensions;

	the file has no extension or it has one but it's not one of the
	ones in the list.

*Don't* expect a file extension to be at most 5 characters plus the dot
- the extension for pcap-ng, our default capture file type, is "pcapng",
and that's 6 characters!

svn path=/trunk/; revision=42800
2012-05-23 03:05:17 +00:00
Guy Harris 90c43120ca The GUI's state machine requires that, when reloading a capture after a
save, we post capture file callback events similar to the ones posted
when reading a capture - otherwise, the reload will leave the welcome
screen up.

Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished,
add a cf_cb_file_reload_started callback, have them work similarly to
read_finished and read_started except that the reload uses "Reloading"
in the progress bar and status bar.

Clean up some indentation while we're at it.

svn path=/trunk/; revision=42764
2012-05-22 03:52:12 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Jörg Mayer 6a60fdd5fc gcc 4.7 would complain that the getopt stuff was not declared.
Looks like getopt.h was silently included somewhere in gcc-4.6's
includes. Explicitely include <getopt.h>. No idea whether this
is the correct fix.
Whitespace change: indent includes, if they are inside a conditional.

svn path=/trunk/; revision=41847
2012-03-30 14:55:00 +00:00
Gerald Combs e19fa8063e Give qmake a VERSION it will accept.
svn path=/trunk/; revision=41762
2012-03-25 21:27:49 +00:00
Gerald Combs 6f5273e81e Fix the Qt build for Win64.
svn path=/trunk/; revision=41761
2012-03-25 19:01:58 +00:00
Guy Harris ec2451f8f1 We don't use a GENERATED_H_FILES macro anywhere else, we use
GENERATED_HEADER_FILES; get rid of GENERATED_H_FILES in favor of
GENERATED_HEADER_FILES, and make other changes to make the Makefile.am
and Makefile.common in ui/qt more like those in ui/gtk.

svn path=/trunk/; revision=41669
2012-03-19 09:31:22 +00:00
Guy Harris e0b738f974 Remove the generated-but-not-distributed source files on "make
distclean", as, after all, they're not part of the distribution.

svn path=/trunk/; revision=41668
2012-03-19 09:12:17 +00:00
Guy Harris 28ad4501ee Add main.cpp as an EXTRA_DIST file; for now, we don't build it as part
of the library, because, in order to do the top-level link of Wireshark
with a C++ compiler rather than a C compiler, at least one C++ source
file must be an input file - for now, we don't do that, as adding it as
a top-level source file for Wireshark causes other problems, but this at
least lets somebody do so as a temporary hack to build with auto*.

svn path=/trunk/; revision=41667
2012-03-19 07:32:45 +00:00
Guy Harris c2f03d39f3 Don't distribute the output of various Qt preprocessing tools. We don't
want to require the machines used to build the distribution tarballs to
have those tools installed or to require the build process to run them,
and I think if you have enough stuff installed to build Qt applications
at all you'll have those tools installed (the reason why the result of
{F}lex and YACC/BYACC/Bison are distributed with tarballs is to let
somebody who wants to or needs to build from unmodified source do so
with as few tools required as possible).

svn path=/trunk/; revision=41666
2012-03-19 07:30:38 +00:00
Guy Harris df5f0bd622 Another generated file.
svn path=/trunk/; revision=41662
2012-03-19 07:08:15 +00:00
Guy Harris 813ba676a4 Get rid of blank line at the end.
svn path=/trunk/; revision=41660
2012-03-19 06:31:37 +00:00
Guy Harris 1ff3d8477f Call the UI library in the Qt directory libqtui, not libui, to match the
UI library in the GTK+ directory.

List the moc-generated and rcc-generated files as generated files.

Add main_window.ui as an EXTRA_DIST file.  Sort the EXTRA_DIST list.

svn path=/trunk/; revision=41658
2012-03-19 06:29:41 +00:00
Jeff Morriss 13e113bd44 Until someone creates a .vcproj file for QT, don't try to distribute it.
svn path=/trunk/; revision=41655
2012-03-19 01:47:53 +00:00
Jeff Morriss 38d8b62758 Add ui/qt/doxygen.cfg.in (copied from ui/gtk, replacing gtk strings with qt). The doxygen stuff doesn't work, but at least we'll be able to build the source tarball.
svn path=/trunk/; revision=41653
2012-03-19 01:15:26 +00:00
Guy Harris 2605c887ca Add in the Makefile_custom.common file.
svn path=/trunk/; revision=41648
2012-03-18 23:39:23 +00:00
Guy Harris 994d2b544e Add automake support for Qt - use --with-qt as a configure script
argument.

svn path=/trunk/; revision=41647
2012-03-18 23:35:53 +00:00
Alexis La Goutte 7d66c568b2 Fix some Gui Text not translate and update french translation
svn path=/trunk/; revision=41623
2012-03-16 18:54:01 +00:00
Alexis La Goutte d14a0dad80 Fix QtShark build after the move of alert_box.c in ui folder
svn path=/trunk/; revision=41475
2012-03-10 19:00:34 +00:00
Jörg Mayer d8d208027c Comment fix: i10n -> i18n
svn path=/trunk/; revision=41392
2012-03-07 11:58:05 +00:00
Alexis La Goutte e17397b721 From Joerg Mayer
Add i18n to Cmake

svn path=/trunk/; revision=41390
2012-03-07 10:23:50 +00:00
Alexis La Goutte fe840481ec Add i18n to QtShark
The goal is only to translate the Gui (Not dissector)
Actually, there is only a french translation.

To try, (if you are not French) launch qtshark with LANG=fr ./qtshark (in ui/qt folder)

Missing some feature :
* Add preference to select (force) your language
* Some Gui Text, it no available for translation
* Documentation about how to translate (Coming soon...)
* Your translation !

svn path=/trunk/; revision=41389
2012-03-07 10:16:33 +00:00
Alexis La Goutte a1d847ed16 Fix compile for QtShark (../../util.c => ../../ui/util.c)
svn path=/trunk/; revision=41243
2012-02-29 16:54:29 +00:00
Jörg Mayer 35508464b2 Start moving files to ui/ and ui/cli/
svn path=/trunk/; revision=41047
2012-02-17 12:30:27 +00:00
Bill Meier b28fe4d079 When building QtShark on Windows: Don't (re)compile Wireshark .c files
svn path=/trunk/; revision=40933
2012-02-08 18:51:01 +00:00
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
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
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
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
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
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
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
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 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
Alexis La Goutte 94e4fa3e76 Fix -v for QtShark
./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)

Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.

Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.

Built using gcc 4.6.1.

get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c 
the function is common to GTK and Qt need to put in version_info.[ch] ?

svn path=/trunk/; revision=40633
2012-01-21 18:56:01 +00:00
Gerald Combs 463b3178e8 Add more configuration information to config.pri which lets us remove
more hard-coded definitions from QtShark.pro. Quote an error message to
fix a Qt Creator complaint.

Add ui\qt\config.pri to the top-level "all" nmake target.

Update README.qt.

svn path=/trunk/; revision=40607
2012-01-20 18:30:44 +00:00
Gerald Combs 0829150550 Try copying our plugins to an accessible directory. This assumes you've set
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment.

On Windows, generate a QMake include file (config.pri) from config.nmake.

svn path=/trunk/; revision=40600
2012-01-20 01:10:40 +00:00
Gerald Combs 41c54f9e5d Remove or mark unused variables.
svn path=/trunk/; revision=40599
2012-01-20 00:01:53 +00:00
Guy Harris 3dbb23f826 Get rid of no-longer-applicable comments.
svn path=/trunk/; revision=40579
2012-01-18 23:41:07 +00:00
Guy Harris 9f7e8bdb0d Get rid of some redeclarations, include "ui/recent_utils.h" to get those
declarations.

svn path=/trunk/; revision=40578
2012-01-18 23:40:04 +00:00
Guy Harris 78fb9ffd6c Another fix for the move of recent.h.
svn path=/trunk/; revision=40577
2012-01-18 23:37:50 +00:00
Alexis La Goutte 5b2eb869c9 Following the move of recent.*
Fix : No rule to make target « ../gtk/recent.c », needed for « recent.c ». Stop.

Not need to copy recent.c in qt working directory and use the common recent.c file.

svn path=/trunk/; revision=40574
2012-01-18 22:00:18 +00:00
Guy Harris ee0089dfe7 Reflect the changes to make the recent-file code GUI-independent.
svn path=/trunk/; revision=40563
2012-01-18 19:59:13 +00:00
Guy Harris dacb4133e8 Restructure the recent file code so that recent.c is GUI-independent;
move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.

svn path=/trunk/; revision=40561
2012-01-18 19:38:34 +00:00
Guy Harris ee1e0a0368 Reflect the move of some header files to the ui directory.
svn path=/trunk/; revision=40530
2012-01-16 01:18:56 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
Gerald Combs bc957229f8 Initial status bar functionality. Promote the main window's status bar
to a MainStatusBar. Add a "LabelStack" widget, which MainStatusBar uses
to duplicate features in GtkStatusbar. Make the protocol tree a
full-blown ProtoTree widget. Move main_cf_callback from main to
WiresharkApplication. Duplicate a lot of the cf callbacks as signals and
slots. Use Q_UNUSED in a few places.

svn path=/trunk/; revision=40488
2012-01-14 00:16:16 +00:00
Gerald Combs 17fb65a364 Remove some debug logging.
svn path=/trunk/; revision=40421
2012-01-09 19:31:31 +00:00
Gerald Combs 458de08ce9 Remove a generated file (pointed out by Gisle Vanem).
svn path=/trunk/; revision=40409
2012-01-09 06:21:19 +00:00
Gerald Combs 307416d5a6 Fix compilation on Windows.
svn path=/trunk/; revision=40379
2012-01-04 22:59:17 +00:00
Gerald Combs 23a520237b Add initial support for Qt along with a "ui" subdirectory.
svn path=/trunk/; revision=40378
2012-01-04 22:13:01 +00:00