Commit Graph

444 Commits

Author SHA1 Message Date
Jeff Morriss 500d399393 Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions.
svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
Jeff Morriss bbf6a3766e Move tempfile.{h,c} into wsutil.
svn path=/trunk/; revision=50163
2013-06-26 01:14:35 +00:00
Jeff Morriss 2259c5c47d There's no need to compile timestats.c any more--it's now in libwsutil.
svn path=/trunk/; revision=50157
2013-06-25 23:34:07 +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
Gerald Combs 879d865039 Sort the encapsulation type combo box similar to the GTK change in r50077.
svn path=/trunk/; revision=50081
2013-06-20 18:07:54 +00:00
Gerald Combs ba951e1a4d Try to make it more obvious that you can select unselected task list
items.

svn path=/trunk/; revision=50052
2013-06-19 18:48:20 +00:00
Alexis La Goutte b381ca4f58 Fix qt make buildbot step
Qt make don't like cp ../../lib/lib{wireshark,wiretap,wsutil}.* .
cp: cannot stat `../../lib/lib{wireshark,wiretap,wsutil}.*': No such file or directory

svn path=/trunk/; revision=49994
2013-06-17 22:56:35 +00:00
Guy Harris ca0f8ee6da Make the libwiretap Buffer routines usable from C++, and fix the C++ UI
code to handle the API changes for the seek-read routines.

svn path=/trunk/; revision=49950
2013-06-16 01:40:04 +00:00
Gerald Combs af02ac36ac On OS X set the toolbar icon size to match our current icons.
svn path=/trunk/; revision=49919
2013-06-13 18:58:29 +00:00
Gerald Combs f5e892cbac Check for QtMacExtras, and if we have it use it to switch to a native
title + toolbar on OS X.

svn path=/trunk/; revision=49873
2013-06-10 21:21:51 +00:00
Gerald Combs 3d59df0ed6 Removing libui_dirty.a in r48976 broke CMake + Qt Creator builds. Fix
it.

svn path=/trunk/; revision=49872
2013-06-10 19:04:13 +00:00
Alexis La Goutte 66c859e765 Object::connect: No such signal WiresharkApplication::captureCaptureUpdateContinue(capture_options*) Object::connect: (sender name: 'qtshark')
An omission with latest change in capture_session...

svn path=/trunk/; revision=49579
2013-05-25 15:20:42 +00:00
Alexis La Goutte e9a6053b71 Apply change of Bug 8706 ( "Stream" should be changed to "Follow Stream" in the 'Font and Colors' dialog ) / revision 49488 to Qtshark
svn path=/trunk/; revision=49577
2013-05-25 15:20:23 +00:00
Guy Harris 70bb111bab Turn "packet_is_ssl()" into a general "does the packet whose dissection
is in this epan_dissect_t contain the field whose name is passed as an
argument" routine in libwireshark, and use it where we used
packet_is_ssl().  (We should check to see if anything *else* could use
it.)

svn path=/trunk/; revision=49530
2013-05-22 23:02:19 +00:00
Guy Harris 5a56506cf5 Include "ui/recent_utils.h" so that the functions we define are checked
against the declarations for them.

svn path=/trunk/; revision=49528
2013-05-22 22:39:05 +00:00
Guy Harris a2f6822fea And a few more fixes. Put wrappers in capture_session.h to make it work
from C++.

svn path=/trunk/; revision=49511
2013-05-22 11:53:36 +00:00
Guy Harris 5bc8bdc40e More capture_options -> capture_session fixes.
svn path=/trunk/; revision=49510
2013-05-22 11:49:36 +00:00
Guy Harris 8af092c98f More capture_options -> capture_session fixes.
svn path=/trunk/; revision=49509
2013-05-22 11:09:00 +00:00
Guy Harris 1b7fc5422d And handle the no-libpcap case here as well.
svn path=/trunk/; revision=49508
2013-05-22 10:26:07 +00:00
Guy Harris d78bbae6a7 More capture_options -> capture_session fixes.
svn path=/trunk/; revision=49506
2013-05-22 10:09:07 +00:00
Guy Harris 367c22a42e Include "capture_session.h" to define capture_session.
svn path=/trunk/; revision=49504
2013-05-22 09:31:42 +00:00
Guy Harris fb7ae678e4 More capture_options -> capture_session changes.
svn path=/trunk/; revision=49499
2013-05-22 08:47:17 +00:00
Guy Harris dd3dcc7a01 And reflect the new capture_options structure here.
svn path=/trunk/; revision=49494
2013-05-22 07:45:11 +00:00
Guy Harris 8596d17d7f Pull the capture-session state information out of capture_opts and put
it into a separate capture_session structure.  capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag).

svn path=/trunk/; revision=49493
2013-05-22 07:44:28 +00:00
Guy Harris 54ca6dae29 There are clearly not enough different sets of build tools out there, so
it's always nice when there's a new one, especially one that can't share
file lists with others.

Remove capture_unix_ifnames.c from YET ANOTHER build tool file.

svn path=/trunk/; revision=49492
2013-05-22 05:48:11 +00:00
Guy Harris 1ca63098ac Rename capture_opts_trim_iface() to
capture_opts_default_iface_if_necessary(), to reflect what it actually
does.

svn path=/trunk/; revision=49491
2013-05-22 04:49:31 +00:00
Alexis La Goutte 1ceed4fc38 Fix Typo about filename
svn path=/trunk/; revision=49455
2013-05-20 18:56:56 +00:00
Alexis La Goutte 022ce2dea9 From Richard Turner via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8630 QtShark doesn't quit properly after closing the main window during initialization
When trying to close the QtShark application during its initialization process
(by hitting the "close" button), the processes "qtshark.exe" and "dumpcap.exe" don't terminate properly

The patch contains fix to:

1. QtShark doesn't quit properly after closing the main window during initialization

2. User is not prompted to save the capture to file when user chooses to exit
the program during capturing.

3. Bug exists in function MainWindow::testCaptureFileClose(bool from_quit, QString &before_what),
which prevent it from behaving correctly when from_quit == true.

svn path=/trunk/; revision=49454
2013-05-20 18:56:47 +00:00
Alexis La Goutte 36495e5e98 From report of mot990-8omk7tp8mio8ro via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8469 QtShark (wireshark-qt) doesn't use the saved preferences
Detail about this issue :
Bug is reproduced when accessing Preferences Dialog before QtShark start-up is finished,
specifically before preferences loading is completed which comes very late in the initialization process.

Fix from Richard Turner :
Patch to fix problems arising from users interacting with main interface before initialization is complete

Introduced a new slot function in main window for the locking of features before
init complete and for the unlocking of features after all systems good to go.

svn path=/trunk/; revision=49453
2013-05-20 18:56:33 +00:00
Alexis La Goutte 98ac861268 lupdate/lrelease ui/qt/QtShark.pro Sync with last change in Qt Files
svn path=/trunk/; revision=49272
2013-05-13 20:23:55 +00:00
Alexis La Goutte a80ad2f9f2 Add Some missing text to translate
svn path=/trunk/; revision=49271
2013-05-13 20:23:46 +00:00
Alexis La Goutte 91c482d3d6 Add Some missing text to translate
svn path=/trunk/; revision=49270
2013-05-13 20:23:35 +00:00
Jörg Mayer c3d7f57f58 Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
svn path=/trunk/; revision=49042
2013-04-25 23:04:19 +00:00
Jörg Mayer 9b87dc0afc Fix a warning: sparkline_delegate.h does not contain a Q_OBJECT
svn path=/trunk/; revision=49039
2013-04-25 22:11:40 +00:00
Gerald Combs d83d4accb0 Update QtShark.pro for Qt5, hopefully without breaking Qt4. Enable the
startup blur on OS X for Qt >= 5.

svn path=/trunk/; revision=49036
2013-04-25 21:08:56 +00:00
Guy Harris 39779a7bee Send the output of the -D and -L options to the standard output rather
than the standard error.

In Wireshark on Windows, create a console before doing so and destroy it
before exiting.  Don't do that in TShark or dumpcap, as those are
console-mode programs on Windows.

This should fix bug 8609 and still allow "wireshark -D" and "wireshark
-L" to work when the standard output isn't redirected.

svn path=/trunk/; revision=49025
2013-04-25 05:47:11 +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
Irene Rüngeler 7eda94d5b0 QT: Select default interface if none else is selected
svn path=/trunk/; revision=48816
2013-04-11 13:35:28 +00:00
Gerald Combs a45b92e202 Add a license header.
svn path=/trunk/; revision=48811
2013-04-10 21:20:33 +00:00
Jeff Morriss c2ced4a2ab Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written to
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702.  I think it's now safe
to remove that backwards compatibility.

This eliminates the last argument of get_persconffile_path().

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

svn path=/trunk/; revision=48797
2013-04-09 02:48:03 +00:00
Irene Rüngeler 616fb80a01 Fix bug in "Import Hex Dump" where data was overwritten in the buffer.
svn path=/trunk/; revision=48787
2013-04-08 07:15:50 +00:00
Irene Rüngeler b34e4d5fee Add checkbox for the direction indication to the "Import from Hex Dump" dialog.
svn path=/trunk/; revision=48745
2013-04-05 06:43:38 +00:00
Guy Harris e4271a94fc OK, if we're setting the file path for the window - which we want to do,
at least on OS X, to set the "proxy icon" - we need to clear the window
title *and* the file path before we set it, otherwise the set doesn't
happen.

While we're at it, clear the file path whenever we're *not* using a
path.  For temporary files, don't set the file path.

The file path is, in fact, the *full path*, not just the last component.

svn path=/trunk/; revision=48715
2013-04-02 22:10:16 +00:00
Guy Harris 432e914dbd Rename cf_not_saved() to cf_has_unsaved_data() to clarify what it
indicates.  (Note: "unsaved data" is more than just "unsaved changes";
it could also mean "temporary file that hasn't been saved anywhere".)

svn path=/trunk/; revision=48709
2013-04-02 20:35:46 +00:00
Guy Harris 3fd4767110 Only enable Edit->Packet Comment... if we can save the file without
losing the packet comments, just as we now do in the GTK+ version.

svn path=/trunk/; revision=48699
2013-04-02 16:05:25 +00:00
Guy Harris d942759401 Add routines to file.c to indicate whether:
a save can be done ("can" in the sense of "there's something to
	save" and in the sense of "we can write that something out");

	a "save as" can be done (in the sense of "we can write what we
	have out");

	there's unsaved data to save (which might be unsaved changes or
	might be a temporary file full of packets);

and use them as appropriate.  This means that the "unsaved data"
indicator in the UI will be turned on for temporary files full of
packets as well as for files with unsaved changes; that's what we want.

svn path=/trunk/; revision=48693
2013-04-01 23:44:29 +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
Guy Harris 2deedfb1e1 Add a setTitlebarForCaptureInProgress() method to MainWindow, and use it
to set the title when we have a capture in progress.

svn path=/trunk/; revision=48688
2013-04-01 17:57:47 +00:00
Guy Harris 6c5c65b486 Add a setTitlebarForCaptureFile() and have it set the titlebar and the
"modified" indicator.  For some reason, it's not getting called in all
the right places.

svn path=/trunk/; revision=48682
2013-03-31 22:59:56 +00:00