Commit Graph

7442 Commits

Author SHA1 Message Date
Guy Harris 34d26e6ee0 Append the trailing ), don't overwrite the string.
svn path=/trunk/; revision=40637
2012-01-21 22:07:49 +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
Michael Tüxen 2e6455f3c7 Get make checkapi working again.
svn path=/trunk/; revision=40625
2012-01-21 11:45:57 +00:00
Guy Harris f478979299 Add missing variable.
svn path=/trunk/; revision=40624
2012-01-21 11:28:02 +00:00
Guy Harris e4a193fe5e Replace wtap_file_extensions_string() with a routine that returns a
GSList of extensions for a file type, including extensions for the
compressed versions of those file types that we can read.

svn path=/trunk/; revision=40623
2012-01-21 08:59:21 +00:00
Chris Maynard 80087898ea Convert forward slashes in URI to backslashes if WIN32. Patch from Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5237
svn path=/trunk/; revision=40615
2012-01-20 21:20:53 +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
Michael Tüxen cb470474ab Add icons for pipe interfaces. This allows for easier
testing the upcoming patch, which improves the
infrastructure to handle interfaces for capturing.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=40583
2012-01-19 13:02:32 +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 fe2d4368d9 New include file needs to be included.
svn path=/trunk/; revision=40567
2012-01-18 20:55:55 +00:00
Guy Harris 9465e9f0fa Another change for the recent changes (in both senses of "recent
changes" :-)).

svn path=/trunk/; revision=40566
2012-01-18 20:38:51 +00:00
Guy Harris 5263048b9b Reflect the move of recent.c from ui/gtk to the top-level directory.
svn path=/trunk/; revision=40565
2012-01-18 20:23:30 +00:00
Guy Harris 7f38dd5903 Another fix for the move of recent.h to the ui directory.
svn path=/trunk/; revision=40564
2012-01-18 20:11:06 +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 b5193096a9 Add some files that didn't get checked in.
svn path=/trunk/; revision=40562
2012-01-18 19:47:44 +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 31badacab3 Move alert_box.c back up to the top-level directory for now, to fix the
Windows build.  We probably want to construct a "ui" (static) library
the same way we construct the libwireshark (dynamic) library, out of
stuff in the ui directory and the relevant subdirectories.

svn path=/trunk/; revision=40541
2012-01-16 03:23:22 +00:00
Guy Harris b423352edf Just include it from the current directory.
svn path=/trunk/; revision=40537
2012-01-16 02:17:03 +00:00
Guy Harris 821166ff8b Another fix for the move of the win32 directory.
svn path=/trunk/; revision=40536
2012-01-16 02:16:30 +00:00
Guy Harris 8b96d4930d Fix up for the move from the top-level directory to the ui directory.
svn path=/trunk/; revision=40534
2012-01-16 01:45:26 +00:00
Guy Harris 375399181c Reflect the move of simple_dialog.h to the ui directory.
svn path=/trunk/; revision=40533
2012-01-16 01:31:08 +00:00
Guy Harris 21ddeed32b Reflect the move of the top-level win32 directory into the ui directory.
svn path=/trunk/; revision=40532
2012-01-16 01:29:08 +00:00
Guy Harris 0db1b9ae17 Make the win32 directory a subdirectory of the ui directory.
svn path=/trunk/; revision=40531
2012-01-16 01:26:46 +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
Guy Harris d7b2aad043 Move some headers for UI stuff, and the alert_box.c UI-specific file, to
the ui directory.  (Perhaps some other files that would be used by all
flavors of Wireshark, for any GUI toolkit or for someting such as
ncurses, and not for any command-line tool such as TShark, should be
moved there as well.)

Shuffle some #includes to put the "ui/XXX.h" includes together.

svn path=/trunk/; revision=40529
2012-01-16 01:07:52 +00:00
Bill Meier a28901b226 Fix a typo in a comment ....
svn path=/trunk/; revision=40527
2012-01-15 23:26:23 +00:00
Jörg Mayer fc9d227e3f Missed another .. -> ../.. case
svn path=/trunk/; revision=40524
2012-01-15 23:07:44 +00:00
Jörg Mayer 89ac6f314f More .. -> ../.. changes after gtk/ move
svn path=/trunk/; revision=40523
2012-01-15 22:40:03 +00:00
Jörg Mayer ef356ef2ef More .. -> ../.. changes after gtk/ move
svn path=/trunk/; revision=40522
2012-01-15 22:22:28 +00:00
Jörg Mayer 308a103931 Clean up after gtk/ move: Makefile.am.inc is now at ../..
svn path=/trunk/; revision=40521
2012-01-15 22:12:28 +00:00
Jörg Mayer 32ea7ecc41 Add back revision 40517 which got lost during gtk/ move
svn path=/trunk/; revision=40520
2012-01-15 22:09:43 +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