Commit Graph

52 Commits

Author SHA1 Message Date
Gerald Combs d9df1abdc9 Use $${INSTALL_DIR} instead of wireshark-gtk2.
svn path=/trunk/; revision=45569
2012-10-16 00:11:42 +00:00
Anders Broman a3f65d3680 Try a experimental gtk3 build
svn path=/trunk/; revision=45551
2012-10-15 06:12:51 +00:00
Gerald Combs cfa22deaae Add a packet format group box, similar to the packet range group box.
Use it in the new "Export Packet Dissections" dialog.

I'm omitting PostScript exports on purpose. If you *really* need that
feature you can probably get better results than we produce using text +
enscript or print-to-PDF + pdf2ps/pdftops or PSML/PDML + XSL + ...

The Windows code is untested. I'll check in any needed fixes shortly.

svn path=/trunk/; revision=45513
2012-10-12 23:40:29 +00:00
Gerald Combs b28da10eec Fix Qt compilation on Windows. Check the user-supplied range syntax
and provide instant feedback in the Win32 file dialog similar to the Qt
code. Tango-ize some colors. Escape a backslash in QtShark.pro.

svn path=/trunk/; revision=45430
2012-10-09 15:34:40 +00:00
Gerald Combs 445148ac0e Add a PacketRangeGroupBox widget. Use it to implement "Export Selected
Packets". Not yet tested on Windows. "Ignore Packet" hasn't been
implemented so we can't test that either.

Create a SyntaxLineEdit widget from the QLineEdit code in
DisplayFilterEdit. Use it in the file import and export dialogs and the
PacketRangeGroupBox widget. This lets us provide instant feedback
instead of popping up an error dialog.

Expand the Tango color list based on
http://emilis.info/other/extended_tango .

Rearrange QtShark.pro to (hopefully) work better with Qt Creator.

svn path=/trunk/; revision=45405
2012-10-08 20:01:59 +00:00
Gerald Combs d808f5c13a Get QMake to build our .qm files.
svn path=/trunk/; revision=45356
2012-10-06 21:36:24 +00:00
Gerald Combs 409b405d7c Move the main window slots to main_window_slots.cpp.
svn path=/trunk/; revision=45259
2012-10-02 18:47:05 +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
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 3069f22bd1 Add a text import dialog. Use libui.
svn path=/trunk/; revision=44956
2012-09-17 23:40:53 +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
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 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 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 0cf96d45db Include console.lua with the build.
svn path=/trunk/; revision=44463
2012-08-13 03:58:52 +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
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
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 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
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
Alexis La Goutte a7ce184f6c Add icon to QtShark.exe for Windows
svn path=/trunk/; revision=44167
2012-07-31 20:42:59 +00:00
Gerald Combs d44f940aaf Add an expert level indicator. Move a bunch of resources to image/.
svn path=/trunk/; revision=44165
2012-07-31 20:00:25 +00:00
Jörg Mayer 0441109c33 Beginnings of a German translation (review/improvements welcome)
svn path=/trunk/; revision=43855
2012-07-20 11:58:16 +00:00
Gerald Combs 0da59a0058 Pass {delayed_}create_progress_dlg a pointer the top level window
so that we can properly associate a widget with create, update, and
destroy events. Only used by Qt so far but it should be easy enough to
add to GTK+.

Rename ui/qt/progress_dialog.{h,cpp} to progress_bar.{h,cpp}. Show a
progress bar in the status bar of the main window instead of creating
a separate dialog. Note that we still need to add a "cancel" mechanism
and display the task and item titles somewhere.

Thus began the War Against Gratuitous Dialogs.

svn path=/trunk/; revision=43833
2012-07-19 21:49:52 +00:00
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 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
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
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
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
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
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 e41766e4bb Rename the binary Wireshark -> qtshark
svn path=/trunk/; revision=40832
2012-02-04 10:02:40 +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 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
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 377322404f Compile PortAudio if it's available.
svn path=/trunk/; revision=40708
2012-01-24 21:26:22 +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
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
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