Commit Graph

42 Commits

Author SHA1 Message Date
Guy Harris 853da2eb9b The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.

Rename various functions, #defines, and variables appropriately.

svn path=/trunk/; revision=53166
2013-11-08 09:53:01 +00:00
Guy Harris bf4e84aba6 For open dialogs, offer a list of sets of extensions, not of file types;
.cap, for example, doesn't refer to a particular file type - a whole
bunch of file types use .cap.

Also offer, in addition to "All Files", "All Capture Files", which
matches all the extensions we know about.

svn path=/trunk/; revision=53156
2013-11-08 01:08:42 +00:00
Gerald Combs 259768dc1a Remove GTK+ and global cfile dependencies from file_dlg_win32.c.
Move the declaration of set_last_open_dir() to ui/util.h. It still
has separate GTK+ and Qt implemenations. We might want to move it to
ui/util.c at some point. Remove a lot of unnecessary GTK+ includes.
Remove most of the references to the global cfile while we're at it.

svn path=/trunk/; revision=52542
2013-10-11 17:20:50 +00:00
Gerald Combs f1ceee4a2c Add support for Qt5 (tested with 5.1.1).
svn path=/trunk/; revision=51580
2013-08-29 22:15:40 +00:00
Guy Harris 5f26818162 packet-range.h moved to the epan directory.
svn path=/trunk/; revision=50518
2013-07-12 00:41:22 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Jörg Mayer 9db6d700cd The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html

svn path=/trunk/; revision=49013
2013-04-24 11:07:25 +00:00
Guy Harris b1ecd8d217 Add a wtap_dump_can_write() routine that indicates whether Wiretap
supports writing files with a given set of encapsulations and comment
types.  Use it, rather than asking for a list of file formats that
support the given set of encapsulation and comment types and checking
whether we got back such a list, or duplicating its logic.

Having file.c use it means that nobody's using
wtap_dump_can_write_encaps() any more; get rid of it.  Instead, have a
private routine that checks whether a given file format supports a given
set of encapsulations *and* comment types, and use that internally.

svn path=/trunk/; revision=48690
2013-04-01 21:17:50 +00:00
Guy Harris 82a602d697 Define a collection of bits for different types of capture file comments.
For each capture file type, have a bitset of comment types supported by
that capture file type.

Add a Wiretap routine that, for a given file type, returns the bitset of
comment types it supports.

Have wtap_get_savable_file_types() take a bitset of comment types that
need to be supported by the file types it returns.

Replace cf_has_comments() with a routine that returns a bitset of
capture file comment types in the capture file.

Use those routines in the capture file dialogs; don't wire in the notion
that pcap-NG supports all comment types and no other file formats
support any comment types.  (That's currently true, but we don't want to
wire that in as being forever true.)

svn path=/trunk/; revision=48689
2013-04-01 20:36:42 +00:00
Gerald Combs 4a3342e4ba Break out preference type names, type descriptions, string
representations, and default status out of write_prefs and into their
own routines. Split the corresponding custom preference write callbacks.
Fix an apparent memory leak in the hidden column callback.

Add an initial preferences dialog to the Qt port. Use the new preference
routines to implement an "Adavanced" page similar to the "about:config"
page available in many web browsers. Standard pages will hopefully follow
soon.

Remove some QDebug includes and make sure our QTreeWidgets have uniform
row heights set.

svn path=/trunk/; revision=46942
2013-01-05 02:30:58 +00:00
Gerald Combs 41a8f22c3c Add more missing #includes.
svn path=/trunk/; revision=46410
2012-12-05 20:33:40 +00:00
Alexis La Goutte 936082acb5 Make new text translatable for Qtshark * export_dissection_dialog.cpp * file_set_dialog.ui * export_object_dialog.cpp * capture_file_dialog.cpp
svn path=/trunk/; revision=45761
2012-10-24 15:51:50 +00:00
Gerald Combs 9f1fd13e9a Use topic_action instead of topic_cb for the Windows file dialogs. Move
the common Qt help code to wireshark_application.cpp.

svn path=/trunk/; revision=45594
2012-10-16 19:47:43 +00:00
Gerald Combs 8fa7cdad65 Remove some no-longer-needed SSL dummy routines.
svn path=/trunk/; revision=45590
2012-10-16 18:49:43 +00:00
Gerald Combs 9051385deb Add help buttons. Ifdef out some code on Windows.
svn path=/trunk/; revision=45564
2012-10-15 18:32:51 +00:00
Evan Huus d11b00d760 Reduce variable scopes where possible.
svn path=/trunk/; revision=45518
2012-10-13 01:29:29 +00:00
Gerald Combs 86797e9c0a Fix initialization order.
svn path=/trunk/; revision=45515
2012-10-13 00:21:25 +00:00
Gerald Combs 419f851e34 Fix Windows compilation problems from r45513. #ifdef out some non-Windows
code.  Get rid of a few uses of the global cfile.

svn path=/trunk/; revision=45514
2012-10-13 00:18:46 +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
Alexis La Goutte 9392d98978 Make new text translatable (a
And lupdate QtShark.pro (update translation file)
Updating 'qtshark_de.ts'...
    Found 257 source text(s) (15 new and 242 already existing)
    Kept 1 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 257 source text(s) (15 new and 242 already existing)
    Kept 1 obsolete entries
    Same-text heuristic provided 1 translation(s)


svn path=/trunk/; revision=45492
2012-10-11 21:45:05 +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
Alexis La Goutte 79d7ae18aa Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45312
2012-10-04 18:16:08 +00:00
Guy Harris 96bc499fd8 Include packet-range.h on Windows - file_dlg_win32.h uses
packet_range_t, which is defined in packet-range.h.

svn path=/trunk/; revision=45300
2012-10-03 20:48:27 +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
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
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
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
Alexis La Goutte 42ace71553 Add modelines for Qtshark file
svn path=/trunk/; revision=44766
2012-09-04 08:18:31 +00:00
Gerald Combs 3392211002 Grow the dialog to account for our added widgets.
svn path=/trunk/; revision=44142
2012-07-30 21:22:53 +00:00
Gerald Combs 5fc656ee46 Add a preview to the common file dialog. Adjust the win32 file dialog
preview logic slightly.

svn path=/trunk/; revision=44080
2012-07-27 21:43:02 +00:00
Alexis La Goutte e9c6f329c0 Add some link (URL) to Help Menu in QtShark
* Use QtAutoconnect feature
* no (yet ?) use help_dlg.* function (topic_action, topic_online_url...)


svn path=/trunk/; revision=43988
2012-07-25 11:57:05 +00:00
Gerald Combs d6533eb467 Add display filter and name resolution controls to the standard Qt open
file dialog. We still need to add a preview.

svn path=/trunk/; revision=43879
2012-07-21 01:21:41 +00:00
Gerald Combs c71e796349 Try to fix compilation on non-Windows systems.
svn path=/trunk/; revision=43837
2012-07-19 23:07:17 +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 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
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