Commit Graph

611 Commits

Author SHA1 Message Date
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
Guy Harris 78ab71cc9d Rename set_display_filename() to set_titlebar_for_capture_file(), as
it affects more than just the file name, it also affects whatever "you
have unsaved changes" indicator the UI provides.

Put a comment in the Qt code as a reminder of how to set the "you have
unsaved changes" indicator.

svn path=/trunk/; revision=48680
2013-03-31 22:17:43 +00:00
Guy Harris e2eabbc883 Make the menu item for importing a hex dump text file be "Import from
Hex Dump", to clarify that it's not some sort of "generic" import
function, just one that can read a hex dump file.  ("Import from Hex
Dump Text" is another possibility.)  Use that string in the dialog title
as well.

svn path=/trunk/; revision=48665
2013-03-31 04:17:47 +00:00
Gerald Combs d1b87423df More icon updates.
Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
2013-03-26 19:51:33 +00:00
Gerald Combs dcb3a4a8a5 Add support for software updates. Remove qtshark.rc and use
image/wireshark.rc (which contains resources needed by WinSparkle)
instead.

svn path=/trunk/; revision=48147
2013-03-06 22:04:17 +00:00
Jeff Morriss 19214234ae Followup to r48081: use the DEFAULT_CAPTURE_BUFFER_SIZE macro from r47942.
svn path=/trunk/; revision=48085
2013-03-05 15:22:28 +00:00
Chris Maynard 2b93c3b31e Default capture buffer size is now 2MB. (See also r47920 and r47937)
svn path=/trunk/; revision=48081
2013-03-05 02:09:37 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Gerald Combs b5e9e86826 Only call create_app_running_mutex on Windows.
svn path=/trunk/; revision=47766
2013-02-20 05:04:57 +00:00
Gerald Combs bd4cffae58 When any of our executables start on Windows create or open a "Wireshark
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.

svn path=/trunk/; revision=47758
2013-02-20 01:19:42 +00:00
Guy Harris 6532f50bd9 main_window_slots.cpp includes ui_main_window.h, so make sure we build
ui_main_window.h before doing anything with main_window_slots.cpp.

svn path=/trunk/; revision=47659
2013-02-14 19:56:21 +00:00
Gerald Combs a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
Guy Harris a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Gerald Combs 0eb047bcef Fix EXTRA_BINFILES for CMake + OS X.
svn path=/trunk/; revision=47595
2013-02-09 19:56:03 +00:00
Gerald Combs 942650fe0e Try to figure out if we built the rest of the project using Autotools or
CMake automatically.

svn path=/trunk/; revision=47576
2013-02-09 00:25:24 +00:00
Gerald Combs d21f62b73b Add a directory name preference type (PREF_DIRNAME) and registration
routine (prefs_register_directory_preference). Add PREF_FILENAME and
PREF_DIRNAME support to the Qt module preferences. Change a couple of
preferences to directory names.

Clean up some names and default settings.

svn path=/trunk/; revision=47573
2013-02-08 18:07:34 +00:00
Gerald Combs dcd8e9df5a Add module_preferences_scroll_area.*.
svn path=/trunk/; revision=47546
2013-02-08 01:30:31 +00:00
Gerald Combs 24d67b60ab Add a ModulePreferencesScrollArea widget which builds a scrollable frame
for a preferences module. Use it to fill in the remaining preferences.
Don't show the printing preferences since they're not used here.

Change the titles and tooltips for some of the name resolution
preferences.

Disable the capture preferences if we can't capture. This is different
from the GTK+ version which hides it completely.

Thus concludes the preferences dialog (for the time being).

svn path=/trunk/; revision=47545
2013-02-08 01:16:46 +00:00
Gerald Combs 4f59c586d2 Remove some unnecessary definitions.
svn path=/trunk/; revision=47526
2013-02-06 21:55:58 +00:00
Gerald Combs 248310e3a7 Add filter expressions frame entries.
svn path=/trunk/; revision=47523
2013-02-06 19:03:23 +00:00
Gerald Combs 1c0deb0fc8 Add Filter Expressions^WButton^WShortcut^WBookmark preferences.
Add comments noting that

- We might want to do something different when the bookmark button is
  pressed.
- The display filters (dfilters file) and gui.filter_expressions
  preferences should be merged.
- Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the
  main window really wide.

Add a qstring_strdup convenience routine. Add "disabled" display filter
edit icons. Fix up whitespace and descriptions in a couple of places.

svn path=/trunk/; revision=47522
2013-02-06 18:22:54 +00:00
Gerald Combs 7f398a97af Prettify Qt build output.
svn path=/trunk/; revision=47484
2013-02-05 05:17:16 +00:00
Guy Harris 02da11d645 Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic and
moc are called uic-qt4 and moc-qt4.  Look for them by names, plural.

svn path=/trunk/; revision=47457
2013-02-03 21:39:11 +00:00
Guy Harris bf12f288db Reflect recent.c moving from the top-level directory to the ui
directory.

svn path=/trunk/; revision=47441
2013-02-02 06:05:59 +00:00
Guy Harris 6ebabce7b5 Move the GUI-independent window geometry stuff to ui/recent.c, so we
only have one copy.

svn path=/trunk/; revision=47440
2013-02-02 05:34:31 +00:00
Guy Harris e62aba38e6 In Qt 4, C strings are, by default, treated as 7-bit ASCII when
converted to QStrings, and, to get them to be treated as UTF-8, you need
to call the setCodecForCStrings method of the QTextCodec class to set
the codec to a UTF-8 codec.

In Qt 5, C strings are treated always as UTF-8 when converted to
QStrings, and there's no setCodecForCStrings method for the QTextCodec
class.

In addition, there's also no setCodecForTr method for the QTextCodec
class - and QObject isn't documented as even *having* a tr method, so I
don't know what to do there.

svn path=/trunk/; revision=47436
2013-02-02 03:59:57 +00:00
Alexis La Goutte 8afb6106f2 Fix [ 68%] Building CXX object ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
StyleName is not available in Qt < 4.8
disable this line for the moment (maye be add if QTVERSION > 4.8 ?)

svn path=/trunk/; revision=47409
2013-02-01 09:21:38 +00:00
Gerald Combs 89c5066f67 Add interface prefs. Adjust some spacing and resize behavior.
svn path=/trunk/; revision=47403
2013-02-01 00:14:15 +00:00
Gerald Combs 3604d301c2 Use the name "Wireshark" instead of "qtshark" on OS X.
svn path=/trunk/; revision=47393
2013-01-31 18:54:14 +00:00
Gerald Combs 2afe999c21 Copy over r47277 from ui/gtk.
svn path=/trunk/; revision=47364
2013-01-30 00:07:57 +00:00
Gerald Combs 4b99b36fed Add back the X11 substitutes.
svn path=/trunk/; revision=47264
2013-01-24 23:50:01 +00:00
Gerald Combs d6de798226 Clean up font initialization a bit.
svn path=/trunk/; revision=47263
2013-01-24 23:42:34 +00:00
Chris Maynard fae8a2aeb5 Separate Time Shift item from Time Reference items. From Cal Turney via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 with qt change from me.

svn path=/trunk/; revision=47261
2013-01-24 20:06:20 +00:00
Gerald Combs 2dff8d7605 Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.

Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.

svn path=/trunk/; revision=47240
2013-01-24 01:10:12 +00:00
Gerald Combs 469232d062 Update our column information even if we don't have a capture file loaded.
svn path=/trunk/; revision=47232
2013-01-23 19:28:08 +00:00
Gerald Combs 21e66f0c6f Add column preferences.
svn path=/trunk/; revision=47231
2013-01-23 19:04:36 +00:00
Gerald Combs 6ef1fc5002 GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214
2013-01-22 18:27:18 +00:00
Chris Maynard d85feecdd8 For menu consistency and shortcut simplification, change some "Ignore" related shortcuts to match "Mark" and "Time Reference" shortcuts. Specifically:
Ignore All Displayed Packets <alt><shift><control>D ==> <shift><control>D
Unignore All Packets         <shift><control>D      ==> <alt><control>D

svn path=/trunk/; revision=47203
2013-01-22 02:03:41 +00:00
Gerald Combs 8189823b73 Update the ignore shortcuts to match r47194.
svn path=/trunk/; revision=47200
2013-01-21 17:12:07 +00:00
Alexis La Goutte cbdd3ca090 And (Q_)init resources (otherwise the images don't display when build with CMake)
svn path=/trunk/; revision=47199
2013-01-21 16:59:00 +00:00
Alexis La Goutte 980edc7034 Add UI_FILES list (more easy to use when add a new ui files...)
svn path=/trunk/; revision=47198
2013-01-21 16:58:51 +00:00
Alexis La Goutte 1e06850bb3 Add layout.qrc to QRC_FILES (otherwise it is not include to compressed source files)
svn path=/trunk/; revision=47197
2013-01-21 16:58:42 +00:00
Alexis La Goutte 6343c57d21 Add layout.qrc to CMake Build
svn path=/trunk/; revision=47196
2013-01-21 16:58:33 +00:00
Alexis La Goutte ca854d396e Modify name of Preferences window
svn path=/trunk/; revision=47195
2013-01-21 16:58:22 +00:00
Gerald Combs 5143a55a7a Add layout_preferences_frame.ui.
svn path=/trunk/; revision=47191
2013-01-21 06:51:07 +00:00
Gerald Combs 5fcf513161 Add an initial layout preference pane. Set SVN properties.
svn path=/trunk/; revision=47190
2013-01-21 05:29:14 +00:00
Alexis La Goutte b99b912916 Update French translations with last change and update of Qtshark
svn path=/trunk/; revision=47184
2013-01-20 18:33:23 +00:00
Alexis La Goutte 1c68363ba2 tr() not work with #define
svn path=/trunk/; revision=47183
2013-01-20 18:33:15 +00:00
Alexis La Goutte bba1a7a599 Add Some missing text to translate
svn path=/trunk/; revision=47182
2013-01-20 18:33:06 +00:00
Gerald Combs 2c5ce01f33 Add an "Appearance" (aka "User Interface") preference pane. Having an
"Advanced" pane gives us the luxury of omitting some items in favor of
simplicity so do that.

svn path=/trunk/; revision=47158
2013-01-19 00:57:57 +00:00
Gerald Combs a377c7c38d Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.
svn path=/trunk/; revision=47143
2013-01-18 01:37:27 +00:00
Gerald Combs 5efca1b8e1 Add more AirPcap code, disabled for now.
svn path=/trunk/; revision=47142
2013-01-18 01:36:37 +00:00
Gerald Combs 36884ea203 Don't call prefs_airpcap_update() for now. Remove some debugging code.
svn path=/trunk/; revision=47141
2013-01-18 01:08:44 +00:00
Gerald Combs ae7ee61e84 Rename the "saved_val" preference element to "stashed_val" in order to
more clearly indicate that it's a copy of a preference value rather than
something we've saved in the preferences file. Update
prefs_pref_to_str() to handle default, stashed, and current prefs.

Create ui/preference_utils.[ch] and move some common routines there. Use
prefs_pref_type_name() in the GTK+ preferences dialog.

Make the "OK" button in the Qt preferences dialog work. We simply write
the prefs and redissect on "OK" and do nothing on "Cancel". This is
intentionally different from the Apply/OK/Cancel behavior in the GTK+
version.

Add a general "emitAppSignal" method to wsApp and use it for packet
dissection and preference changes.

Suggest that we might want to create a WsString class to make conversion
between QStrings, gchar *s, and GStrings easier.

svn path=/trunk/; revision=47139
2013-01-18 00:50:14 +00:00
Guy Harris 09a4761179 Add some routines to wsutil to, at least on some platforms, add
information to crash dumps and the like.  (Currently, we only handle OS
X's CrashReporter, but we should do this on other platforms where this
information can be added and would be helpful.)

svn path=/trunk/; revision=47109
2013-01-16 00:13:33 +00:00
Gerald Combs b82f42d8cf When the user is editing text or selecting from a combo box, don't
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.

Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.

svn path=/trunk/; revision=47083
2013-01-14 22:21:11 +00:00
Gerald Combs 0fa6a4c421 Allow editing via the advanced preferences tree. Double-clicking an
item's name, status, or type resets it to its default value.
Double-clicking the item's value lets you edit it. Implement the
advanced search field. (Clicking OK and Cancel still doesn't yet do
anything.)

Note that we could probably use a
prefs_register_{uint16|port}_preference routine for 16-bit values. Make
reset_pref public. Update some names and descriptions.

svn path=/trunk/; revision=46986
2013-01-07 19:13:03 +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 b03e7cec00 Make sure moc can find config.h.
svn path=/trunk/; revision=46876
2012-12-31 19:15:33 +00:00
Gerald Combs b6382033e1 It might help for the Qt version of Wireshark to link against the Qt
libraries and to have a main() function. Replace some manual Makefile
rules with an implicit rule.

svn path=/trunk/; revision=46875
2012-12-31 19:07:38 +00:00
Alexis La Goutte c2a63d4c36 Update Makefile to add packet_comment_dialog files
svn path=/trunk/; revision=46874
2012-12-31 15:08:45 +00:00
Gerald Combs 1a5ac2e68d Add a .cpp target for each ui_*.h prerequisite.
svn path=/trunk/; revision=46868
2012-12-31 05:22:47 +00:00
Gerald Combs 4ca47864db Move profile deletion code from profile_dlg.c to profile.c. Add left
mouse and context (right mouse) signals to label stacks and use them to
pop up profile menus in the status bar. Add profile actions (manage,
new, edit, delete) to the profile dialog.

svn path=/trunk/; revision=46863
2012-12-30 19:33:05 +00:00
Gerald Combs f3e41f1b72 Show the current profile name. Fix the packet status.
svn path=/trunk/; revision=46839
2012-12-29 03:56:29 +00:00
Gerald Combs 07571afb77 Fix distcheck.
svn path=/trunk/; revision=46838
2012-12-29 03:31:49 +00:00
Gerald Combs cce0d8451c Add profile_dialog.
svn path=/trunk/; revision=46837
2012-12-29 02:58:56 +00:00
Gerald Combs 94d8ae945b Try to fix compilation on Windows.
svn path=/trunk/; revision=46836
2012-12-29 02:55:16 +00:00
Gerald Combs a562691080 Profile switching works when we have a capture file open so go ahead and
enable it.

svn path=/trunk/; revision=46835
2012-12-29 01:42:01 +00:00
Gerald Combs 5bd252c44f Remove some duplicate code from ui/profile.c and move in more code from
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.

Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.

svn path=/trunk/; revision=46834
2012-12-29 01:39:02 +00:00
Alexis La Goutte c4650d85c6 Fix [76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: In function ‘init_profile_list’: ui/profile.c:195:20: error: variable ‘profile’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors
svn path=/trunk/; revision=46823
2012-12-28 14:37:53 +00:00
Guy Harris 6255cc03f0 Fix another discarded qualifier error.
Remove some redundant declarations/definitions from
ui/gtk/capture_dlg.h.

svn path=/trunk/; revision=46780
2012-12-26 12:24:55 +00:00
Guy Harris 4fc5688f87 simple_dialog_primary_start() and simple_dialog_primary_end() are now
declared as returning const char *s; make it so.

svn path=/trunk/; revision=46767
2012-12-26 10:33:02 +00:00
Guy Harris ce0d04c6d2 Hopefully this case is OK in C++; bit-fields can't be enums in standard
C, so....

svn path=/trunk/; revision=46764
2012-12-26 09:59:18 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Gerald Combs 9a9fd20ece Add ui_packet_comment_dialog.h and ui_time_shift_dialog.h.
svn path=/trunk/; revision=46711
2012-12-23 05:11:49 +00:00
Gerald Combs a5d5162826 Qt: Implement packet comments. Fix packet detail updates.
GTK+: Shorten the packet comment menu item name.  Remove a couple of
unneeded includes.

Both: Add an arbitrary 20 MB limit when fetching all packet comments.
Use a color from the Tango palette for comments.

svn path=/trunk/; revision=46709
2012-12-23 04:37:58 +00:00
Gerald Combs aa347d504f Add the time shift dialog.
svn path=/trunk/; revision=46708
2012-12-23 03:45:35 +00:00
Evan Huus 2f63301d1f Remove one unneeded initializer and add one missing initializer, as found
by CppCheck.

svn path=/trunk/; revision=46700
2012-12-22 20:53:09 +00:00
Gerald Combs 238e30bfaf Don't use so much white space.
svn path=/trunk/; revision=46689
2012-12-21 23:57:51 +00:00
Gerald Combs 092d8f21ef Add time shifting to the packet list context menu.
svn path=/trunk/; revision=46685
2012-12-21 19:21:34 +00:00
Gerald Combs d6d3b1b676 Enable and disable the time shift menu action as needed.
svn path=/trunk/; revision=46683
2012-12-21 18:49:44 +00:00
Gerald Combs 962b4f08f7 Move common time shifting code to ui/time_shift.[ch]. Change the
shifting routines to return an error message on failure or NULL on
success.  Prettify and simplify the layout of the GTK+ time shift
dialog. Make the cancel button work as expected.

Add a time shift dialog to the Qt port. I used a Mad Lib (sentence)
layout. Hopefully that won't make translation too difficult.  For some
reason time shifts aren't immediately shown in the packet detail. This
appears to be a bug in the packet list / packet detail code.

Add warning role color definitions to tango_colors.h and use them.

svn path=/trunk/; revision=46680
2012-12-21 17:37:57 +00:00
Gerald Combs 2ae8b65a39 Reduce the spacer height in the "go to" and search frames. Fix the
search frame class.

svn path=/trunk/; revision=46651
2012-12-21 04:42:05 +00:00
Gerald Combs 1208041a4a Try using the system-supplied zlib on OS X.
svn path=/trunk/; revision=46618
2012-12-19 19:04:57 +00:00
Jeff Morriss f35a7d2ba7 Set SVN properties
svn path=/trunk/; revision=46609
2012-12-19 02:56:01 +00:00
Gerald Combs 7cf5334332 Add an AccordionFrame class which can animate showing and hiding (except
when we detect a remote connection). Use it for the "go to" and search
frames. Properly detect remote connections in the splash overlay.

svn path=/trunk/; revision=46591
2012-12-18 17:21:20 +00:00
Gerald Combs 77e6140ba9 Implement the frame mark, ignore, and time reference actions. Update the
text of a few menu items.

svn path=/trunk/; revision=46576
2012-12-17 23:03:21 +00:00
Evan Huus b2e8a9b188 Link qtshark with libui_dirty on unix.
It's now possible to build qtshark with autotools and QtCreator if you add some
extra symlinks and fiddle with LD_LIBRARY_PATH.

svn path=/trunk/; revision=46546
2012-12-15 17:10:39 +00:00
Gerald Combs 044a0257e6 Add a missing backslash.
svn path=/trunk/; revision=46543
2012-12-15 01:55:28 +00:00
Gerald Combs 81c2fd6cbe Set SVN properties.
svn path=/trunk/; revision=46542
2012-12-15 01:05:17 +00:00
Gerald Combs 5c2c5aed87 Rename the search type menu items to more accurately reflect what we're
actually doing and what users are likely to want to do.  Rename the
search enum values and functions to reflect what we're actually doing
and add a comment explaining why making searches more correct might make
searching worse.  Add a search bar to the Qt main window, thus
continuing the War On Gratuitous Dialogs.

Clear out any previous temporary label stack items before adding a new one.

svn path=/trunk/; revision=46541
2012-12-15 01:04:39 +00:00
Jörg Mayer 65547786c3 Alphabetically sort files
svn path=/trunk/; revision=46502
2012-12-11 21:51:18 +00:00
Gerald Combs f03bd8b441 Use a different border color on OS X.
svn path=/trunk/; revision=46458
2012-12-07 21:53:03 +00:00
Gerald Combs 0b2e3dbd10 Set the height of the resize and apply buttons. Simplify some geometry.
svn path=/trunk/; revision=46453
2012-12-07 21:32:19 +00:00
Gerald Combs 8ed89c12c5 Properly resize the bookmark button so that the image centers properly.
Adjust CSS.

svn path=/trunk/; revision=46451
2012-12-07 21:22:16 +00:00
Gerald Combs c9d4240196 Add a context menu to the packet list and fill in the
apply/match-related actions. Have matchSelectedFilter figure out our
filter strings, which lets us remove duplicate code in the apply/match
action slots. Remove some leftover code from an experiment.

Adjust the temporary message colors in the status bar and label stack.

Add a NULL check to construct_match_selected_string.

svn path=/trunk/; revision=46449
2012-12-07 20:08:00 +00:00
Gerald Combs 59cd52b5ca Implement the items under "Edit→Copy", "Analyze→Apply as Filter" and
"Analyze→Prepare a Filter". Add a context menu to the protocol tree and
fill in the items we've implemented so far.

Add an "applyAllPreferences" method and corresponding
"preferencesUpdated" signal to wsApp. Use it to set the maximum display
filter combo count.

Move the packet filtering code from the display filter edit to the main
window (which makes more sense and matches what we're doing in the GTK+
version and gets rid of more global cfile references). Try to center the
display filter edit button images.

Use a different "close" button in the main toolbar. It looks better but
is still wrong (on OS X at least).

svn path=/trunk/; revision=46434
2012-12-07 01:46:20 +00:00
Gerald Combs 07898cae39 Create 16x16 and 24x24 versions of the document icon with a contrasting
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.

svn path=/trunk/; revision=46413
2012-12-05 22:28:12 +00:00
Gerald Combs 41a8f22c3c Add more missing #includes.
svn path=/trunk/; revision=46410
2012-12-05 20:33:40 +00:00
Gerald Combs 874c87610b Fix some C++ abuses that Guy found via LLVM.
svn path=/trunk/; revision=46408
2012-12-05 19:04:59 +00:00
Jeff Morriss ff8e679df2 Add some generated header files to GENERATED_NODIST_HEADER_FILES (to fix
distcheck).

svn path=/trunk/; revision=46400
2012-12-05 15:14:20 +00:00
Gerald Combs 224666c60e Fix up a comment.
svn path=/trunk/; revision=46375
2012-12-04 18:20:28 +00:00
Gerald Combs c0c7a64d71 Replace GTK_STOCK_SAVE with WIRESHARK_STOCK_FILE in a few places,
including the GTK+ and Qt main toolbars.

svn path=/trunk/; revision=46374
2012-12-04 18:00:50 +00:00
Gerald Combs b2239669e2 Rename utilityToolBar to displayFilterToolbar and move the display
filter widget there. Add a few more items to the main toolbar. Note that
Qt 4.8 doesn't support a unified title+toolbar with multiple toolbar
rows on OS X (at least not easily) but Qt 5 might.

Disable icons-in-menus on OS X.

svn path=/trunk/; revision=46371
2012-12-04 17:16:09 +00:00
Alexis La Goutte cbd6062109 lupdate -no-obsolete QtShark.pro Updating 'qtshark_de.ts'... Found 328 source text(s) (8 new and 320 already existing) Removed 10 obsolete entries Updating 'qtshark_fr.ts'... Found 328 source text(s) (8 new and 320 already existing) Removed 10 obsolete entries Same-text heuristic provided 5 translation(s)
Update the french translation and regenerate qm files.

lrelease QtShark.pro
Updating '/home/prolag/wireshark-ng/ui/qt/qtshark_de.qm'...
    Generated 29 translation(s) (29 finished and 0 unfinished)
    Ignored 299 untranslated source text(s)
Updating '/home/prolag/wireshark-ng/ui/qt/qtshark_fr.qm'...
    Generated 328 translation(s) (328 finished and 0 unfinished)

svn path=/trunk/; revision=46370
2012-12-04 16:43:45 +00:00
Gerald Combs fceea48622 Use more restrictive selectors, otherwise we end up styling things we
shouldn't (such as scroll bars).

svn path=/trunk/; revision=46363
2012-12-04 00:24:25 +00:00
Evan Huus ced8abb125 Reduce the scope of one variable definition slightly.
svn path=/trunk/; revision=46361
2012-12-03 23:15:59 +00:00
Gerald Combs 469c33aff4 Make sure packets_bar_update does something.
svn path=/trunk/; revision=46355
2012-12-03 21:53:53 +00:00
Guy Harris da6f295794 Add some more uic lines.
svn path=/trunk/; revision=46352
2012-12-03 21:33:08 +00:00
Gerald Combs 46a454a94c Automatically size the interface column.
svn path=/trunk/; revision=46351
2012-12-03 20:38:32 +00:00
Gerald Combs 9e67335ea8 Update the interface list to reflect the recent interface name changes.
Allow multiple interface selections. Make sure we update the packet list
properly in a couple of places.

Use the right callback+signal to update capture statistics in the status
bar. Remove the global cfile from the main_statusbar.cpp

Add the version to the main window.

svn path=/trunk/; revision=46350
2012-12-03 19:58:55 +00:00
Gerald Combs 430d616e28 Do a better job of getting the user's attention for temporary messages.
Rename some variables.

svn path=/trunk/; revision=46310
2012-11-30 23:14:53 +00:00
Alexis La Goutte 70a4056c1d From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
make[2]: *** No rule to make target `ui/qt/qtshark_fr.ts', needed by `ui/qt/qtshark_fr.qm'.  Stop.
make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
make: *** [all] Error 2

From me:
Add missing files (*.ts, *.qm) to ui/qt/Makefile.common

svn path=/trunk/; revision=46218
2012-11-27 13:14:37 +00:00
Alexis La Goutte 126c3f8b88 From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
CMake Error at /usr/share/cmake-2.8/Modules/Qt4Macros.cmake:187 (FILE):
  file Internal CMake error when trying to open file:
  /wireshark-1.9.0-SVN/ui/qt/i18n.qrc for reading.
Call Stack (most recent call first):
  ui/qt/CMakeLists.txt:139 (QT4_ADD_RESOURCES)
...

From me:
Add missing files (*.qrc, qtshark.pro...) to ui/qt/Makefile.common

svn path=/trunk/; revision=46217
2012-11-27 09:18:42 +00:00
Gerald Combs 7d27bd0c6e Add cfutils.c + capture_unix_ifnames.c + SystemConfiguration. Sort our
SOURCES.

svn path=/trunk/; revision=46145
2012-11-22 17:29:58 +00:00
Guy Harris 1105a21a8c Fix another reference to the "description" member of an if_info_t (in
commented-out code).

svn path=/trunk/; revision=46134
2012-11-22 07:02:53 +00:00
Guy Harris d415d3d87c On error, have capture_opts_trim_iface() return the exit status that
should be used (on success, have it return 0).  Exit with that exit
status; if the problem is that we couldn't get the interface list or if
there are no interfaces in that list, return 2, as that's not a
command-line syntax error.

svn path=/trunk/; revision=46108
2012-11-21 17:14:54 +00:00
Jeff Morriss e1b2eda268 Attempt to fix the Windows Qt builds.
svn path=/trunk/; revision=46092
2012-11-19 22:16:39 +00:00
Gerald Combs ad4dc9dfcd Add a comment about improving performance.
svn path=/trunk/; revision=45956
2012-11-06 23:49:26 +00:00
Gerald Combs 41354fb06c Connect a signal+slot only once.
svn path=/trunk/; revision=45955
2012-11-06 23:20:07 +00:00
Gerald Combs 8865f925c2 Fix our offset calculation.
svn path=/trunk/; revision=45954
2012-11-06 22:17:06 +00:00
Gerald Combs 32074376ac Show the byte view when we select a packet. Update some method and
variable names.

svn path=/trunk/; revision=45953
2012-11-06 21:49:16 +00:00
Gerald Combs 7646c6beb8 Set our font each time we fill in the tree instead of just once at
construction time. This fixes behavior broken by the recent startup
changes and should help us handle preference changes.

svn path=/trunk/; revision=45942
2012-11-06 00:45:41 +00:00
Gerald Combs 091aabbd6c Check for a remote connection and change our update frequency accordingly,
similar to the GTK version.

svn path=/trunk/; revision=45941
2012-11-05 22:43:15 +00:00
Gerald Combs 4244e4480e Fix a variable name.
svn path=/trunk/; revision=45939
2012-11-05 22:25:06 +00:00
Gerald Combs 6285d3f8c2 Retain readability.
svn path=/trunk/; revision=45938
2012-11-05 21:34:07 +00:00
Gerald Combs 7f146f9c93 Hide all of the messages until startup.
svn path=/trunk/; revision=45937
2012-11-05 20:15:21 +00:00
Gerald Combs 005a9830b7 Don't say we're ready until we're ready. Update some variable names.
svn path=/trunk/; revision=45936
2012-11-05 20:13:06 +00:00
Gerald Combs a2ddc6acc4 Enable the splash screen blur on OSes other than OS X.
svn path=/trunk/; revision=45935
2012-11-05 19:58:06 +00:00
Gerald Combs 64c6710857 Have InterfaceTree wait until the application is initialized to start
gathering statistics. This fixes behavior broken by the recent startup
changes.

Enable and disable the SplashOverlay delay via a #define.

svn path=/trunk/; revision=45934
2012-11-05 19:11:11 +00:00
Gerald Combs dc4ebc3f47 Comment out an include.
svn path=/trunk/; revision=45933
2012-11-05 16:36:34 +00:00
Gerald Combs 56546f1b91 Move the MWOverlay code into its own class, SplashOverlay. Use it to
implement a splash screen.

svn path=/trunk/; revision=45912
2012-11-05 03:54:21 +00:00
Alexis La Goutte 76c976f3e6 Update *.qm (translations file) lrelease QtShark.pro Updating 'ui/qt/qtshark_de.qm'... Generated 32 translation(s) (32 finished and 0 unfinished) Ignored 298 untranslated source text(s) Updating 'ui/qt/qtshark_fr.qm'... Generated 330 translation(s) (330 finished and 0 unfinished)
svn path=/trunk/; revision=45897
2012-11-04 16:01:54 +00:00
Alexis La Goutte f32370b9e6 Update French Translations
svn path=/trunk/; revision=45895
2012-11-04 16:01:38 +00:00
Alexis La Goutte b037ac39d1 lupdate QtShark.pro (update translation file) Updating 'qtshark_de.ts'... Found 330 source text(s) (77 new and 253 already existing) Kept 4 obsolete entries Updating 'qtshark_fr.ts'... Found 330 source text(s) (77 new and 253 already existing) Kept 4 obsolete entries Same-text heuristic provided 3 translation(s)
svn path=/trunk/; revision=45894
2012-11-04 16:01:29 +00:00
Alexis La Goutte 5019d32907 Make new text translatable for Qtshark (print_dialog)
svn path=/trunk/; revision=45893
2012-11-04 16:01:20 +00:00
Alexis La Goutte 686e72c011 Add Modelines infos to new Qtshark file (print_dialog.*)
svn path=/trunk/; revision=45892
2012-11-04 16:01:11 +00:00
Gerald Combs 5b2890e573 Move the main window creation to the top of main() in anticipation of a
splash pane.

Add an "initialized" state to WiresharkApplication and set it when we're
done calling our init routines. Handle FileOpen events. Wait until we're
initialized to try to open the files. On OS X

    open -a /path/to/qtshark.app /path/to/some/file.pcap
    
now works as expected, and

    osascript -e 'tell application "qtshark" to open posix file "'"/path/to/some/file.pcap"'"'
    
works but returns "missing value". 

svn path=/trunk/; revision=45885
2012-11-03 22:48:29 +00:00
Gerald Combs 2e6f4fafd4 Allow a display filter to be specified in openCaptureFile().
svn path=/trunk/; revision=45883
2012-11-03 18:02:01 +00:00
Jörg Mayer 854ae179ef Fix ui/qt/print_dialog.cpp:228:23: error: variable ‘status’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=45864
2012-11-01 23:09:02 +00:00
Gerald Combs 66b13e2961 Enable and disable the File→Print and Go menu items as needed. Have the
print dialog cancel itself if we don't hand it a capture file.

svn path=/trunk/; revision=45863
2012-11-01 22:12:57 +00:00
Gerald Combs e7c47148ea Add a print dialog to the Qt UI. Add support for null page element
callbacks in print.c. Clean up some other issues in print.c.

svn path=/trunk/; revision=45860
2012-11-01 20:57:45 +00:00
Gerald Combs e7c01324d9 Make sure we don't underrun the tree_is_expanded array.
svn path=/trunk/; revision=45859
2012-11-01 17:30:10 +00:00
Gerald Combs 09945d2ac9 Set SVN properties.
svn path=/trunk/; revision=45849
2012-10-31 15:40:55 +00:00
Evan Huus ca3ec2a89e Remove unused variable.
svn path=/trunk/; revision=45842
2012-10-31 01:38:36 +00:00
Gerald Combs 101e9755c7 Try to speed up rendering.
svn path=/trunk/; revision=45841
2012-10-30 22:25:37 +00:00
Gerald Combs 12dfeadbbf Get rid of a couple of unused variables. Other minor cleanup.
svn path=/trunk/; revision=45839
2012-10-30 20:24:08 +00:00
Gerald Combs 0a28fb8f6a Update the Qt byte view widget to reflect the recent changes in the GTK+
byte view.

Move the packet_char_enc enum from packet.h to frame_data.h. Make the
encoding flag a packet_char_enc and make it one bit.

Get rid of the "cfile" global in a few places. C++-ize some of the font
code. Clean up some variable names.

svn path=/trunk/; revision=45838
2012-10-30 19:21:24 +00:00
Gerald Combs d08f111496 Minor cleanup.
svn path=/trunk/; revision=45801
2012-10-26 18:31:00 +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
Alexis La Goutte 4438309f5e Add Modelines info for new Qtshark source file(s)
svn path=/trunk/; revision=45760
2012-10-24 15:51:38 +00:00
Alexis La Goutte f7e6d1a4a2 Disable Auto-generate *.qm file (Need some work...)
svn path=/trunk/; revision=45759
2012-10-24 15:51:28 +00:00
Gerald Combs caf8ed8e0c Try reverting r45351 again. It looks like the recent changes are
confusing SVN:
http://www.wireshark.org/lists/wireshark-dev/201210/msg00190.html

svn path=/trunk/; revision=45714
2012-10-22 15:50:43 +00:00
Guy Harris 30c709777e Include ui/win32/console_win32.c.
svn path=/trunk/; revision=45695
2012-10-21 19:49:40 +00:00
Pascal Quantin b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
2012-10-21 19:12:18 +00:00
Alexis La Goutte 5af3defc46 Try to fix LINK : fatal error LNK1181: cannot open input file 'win32/console_win32.obj'
move ui/win32/console_win32.[ch] to ui/console_win32.[ch]

svn path=/trunk/; revision=45692
2012-10-21 18:10:31 +00:00
Alexis La Goutte b88ff840a3 Add MSWindows console to QtShark
svn path=/trunk/; revision=45678
2012-10-21 14:45:40 +00:00
Jakub Zawadzki b53dbea042 Make data_source opqaue, add getter for tvb.
svn path=/trunk/; revision=45672
2012-10-20 19:54:56 +00:00
Evan Huus 99ddfe913c Remove unused variable.
svn path=/trunk/; revision=45664
2012-10-19 22:04:44 +00:00
Gerald Combs d16be272c9 Fix columns.
svn path=/trunk/; revision=45662
2012-10-19 20:56:22 +00:00
Gerald Combs b369a09cd2 The file set and export object trees are lists. Make them act like
it. Show human-readable sizes in the file set dialog. Move the
format_size_flags_e operator to qt_ui_utils.cpp for lack of a better
place.

svn path=/trunk/; revision=45661
2012-10-19 19:04:21 +00:00
Evan Huus 97f5e101d9 Fix CMake build:
- add some new files to CMakeLists
- we do need _U_ for C++ now that we're sharing some headers between
  C and C++.

svn path=/trunk/; revision=45650
2012-10-18 22:20:36 +00:00
Gerald Combs 97fa2f2a5f Show the object export dialog in accordance with the Qt
documentation. Remove our tap listener and clean up after ourselves.

svn path=/trunk/; revision=45648
2012-10-18 21:51:38 +00:00
Gerald Combs 576b24c96e Move ui-independent object export routines to the common ui directory.
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export
files. C++-ize epan/tap.h. Fix an apparent memory leak in
eo_save_all_clicked_cb.

The Qt dialog has an indeterminate progress bar. I tried adding
something similar to the GTK+ dialog but event processing led down a
rabbit hole.

svn path=/trunk/; revision=45647
2012-10-18 21:14:43 +00:00
Jakub Zawadzki 73b3d42302 Use local variable, local one is also used later by epan_dissect_run().
svn path=/trunk/; revision=45605
2012-10-16 22:44:28 +00:00
Evan Huus 80d377d4f2 Don't try to use a non-existant pseudo_header variable.
svn path=/trunk/; revision=45604
2012-10-16 22:39:30 +00:00
Jakub Zawadzki 78631020b8 Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
2012-10-16 21:50:57 +00:00
Gerald Combs 74df9f0458 Add an include.
svn path=/trunk/; revision=45596
2012-10-16 20:38:22 +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 403e6dc86a Move common SSL key export routines to ui/ssl_key_export.[ch]. Make the
exported keys a gchar *. Implement SSL key exports in the Qt UI. Remove
some no-longer-necessary packet-ssl*.h includes.

Change lastOpenDir().absolutePath() to .canonicalPath(). Get rid of the
"Export As PostScript" action.

svn path=/trunk/; revision=45589
2012-10-16 18:14:16 +00:00
Alexis La Goutte a7763680ac Fix In file included from export_dissection_dialog.cpp:24:0: export_dissection_dialog.h:66:34: error: field 'export_type_map_' has incomplete type export_dissection_dialog.cpp: In constructor 'ExportDissectionDialog::ExportDissectionDialog(QWidget*, capture_file*, export_type_e)': export_dissection_dialog.cpp:80:5: error: 'export_type_map_' was not declared in this scope export_dissection_dialog.cpp: In member function 'void ExportDissectionDialog::exportTypeChanged(QString)': export_dissection_dialog.cpp:214:20: error: 'export_type_map_' was not declared in this scope
Missing <QMap> include in export_disssection_dialog.h (in my Ubuntu Box with Qt 4.7.4 ?)

svn path=/trunk/; revision=45574
2012-10-16 07:46:58 +00:00
Evan Huus 8a10d8ddb5 Include config.h so that the necessary HAVE_HEADER_H macros are defined on the
appropriate platforms.

svn path=/trunk/; revision=45571
2012-10-16 00:42:30 +00:00
Evan Huus 08535a5831 Comment out some more unused code to fix a few gcc errors.
svn path=/trunk/; revision=45570
2012-10-16 00:38:23 +00:00
Gerald Combs d9df1abdc9 Use $${INSTALL_DIR} instead of wireshark-gtk2.
svn path=/trunk/; revision=45569
2012-10-16 00:11:42 +00:00
Gerald Combs 307c002793 Fix includes.
svn path=/trunk/; revision=45568
2012-10-16 00:08:59 +00:00
Gerald Combs 677c913f42 Add "Export Packet Bytes".
svn path=/trunk/; revision=45567
2012-10-16 00:01:23 +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
Anders Broman a3f65d3680 Try a experimental gtk3 build
svn path=/trunk/; revision=45551
2012-10-15 06:12:51 +00:00
Evan Huus 93f4ea8838 Always initiailize member variables in constructors, even if it's just to NULL.
Use C++'s initializer syntax more.

svn path=/trunk/; revision=45519
2012-10-13 01:37:48 +00:00
Evan Huus d11b00d760 Reduce variable scopes where possible.
svn path=/trunk/; revision=45518
2012-10-13 01:29:29 +00:00
Evan Huus 1ed9eb2ece Fix compilation with GCC:
- initialization order
- unused and uninitialized local print_args_t
- missing comment on #endif

svn path=/trunk/; revision=45517
2012-10-13 01:15:35 +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
Alexis La Goutte 85b7bec830 Fix crash when use pcapng with comments (with QtShark)
ERROR:proto_tree.cpp:125:void proto_tree_draw_node(proto_node*, gpointer): code should not be reached

(Missing color information for PI_COMMENT)

svn path=/trunk/; revision=45468
2012-10-11 12:31:39 +00:00
Jörg Mayer 6f5bc4ea12 Revert
------------------------------------------------------------------------
  r45351 | eapache | 2012-10-06 22:18:28 +0200 (Sa, 06 Okt 2012) | 3 lines

  Don't store qm files in svn: they're generated from the ts files and get removed
  on a make clean.

  ------------------------------------------------------------------------

it breaks out of tree builds and I don't have the time to fix that right now.


svn path=/trunk/; revision=45441
2012-10-10 04:42:03 +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
Evan Huus af9da8bf6e Add syntax_line_edit.h to CMakeLists to fix CMake qtshark build.
svn path=/trunk/; revision=45414
2012-10-09 00:54: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 576d1fb8db Update French translations !
svn path=/trunk/; revision=45384
2012-10-08 12:25:23 +00:00
Alexis La Goutte 579eb18a6d Make new text translatable (for QtShark:file_set_dialog.cpp)
and lupdate qtshark.pro (update translation file)
Updating 'qtshark_de.ts'...
    Found 243 source text(s) (45 new and 198 already existing)
Updating 'qtshark_fr.ts'...
    Found 243 source text(s) (45 new and 198 already existing)
    Number heuristic provided 1 translation(s)


svn path=/trunk/; revision=45383
2012-10-08 12:16:54 +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
Evan Huus 5560416f3a Don't store qm files in svn: they're generated from the ts files and get removed
on a make clean.

svn path=/trunk/; revision=45351
2012-10-06 20:18:28 +00:00
Guy Harris 1ef26ea00f Fix tpyo.
svn path=/trunk/; revision=45318
2012-10-04 18:49:35 +00:00
Alexis La Goutte 2d8a0b5158 Update translation files
Updating 'qtshark_de.ts'...
    Found 198 source text(s) (135 new and 63 already existing)
    Kept 9 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 198 source text(s) (135 new and 63 already existing)
    Kept 9 obsolete entries


svn path=/trunk/; revision=45314
2012-10-04 18:26:37 +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
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 e46cf2a726 Don't bother setting a background gradient in the toolbar on Windows.
svn path=/trunk/; revision=45246
2012-10-01 22:57:34 +00:00
Gerald Combs 0ffe19134b Construct a proper directory URL.
svn path=/trunk/; revision=45245
2012-10-01 22:55:45 +00:00
Evan Huus 3e5ac249e9 Add new fileset ui file to cmake build.
svn path=/trunk/; revision=45244
2012-10-01 22:52:14 +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
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
Alexis La Goutte 74d0df441e Add load of translate QLibraryInfo to have standart button (and other stuff) translated
svn path=/trunk/; revision=45140
2012-09-25 20:18:02 +00:00
Alexis La Goutte 3738ed7370 Use "common help_url function" for qtshark
Add links to Manual Pages...

svn path=/trunk/; revision=45139
2012-09-25 20:08:11 +00:00
Alexis La Goutte 2af09e863e Add modelines info for qtshark import file
svn path=/trunk/; revision=45136
2012-09-25 19:29:04 +00:00
Evan Huus bebce51b6b Display the "no interfaces" message in qtshark on any type of error,
as otherwise certain errors result in just a blank box. Also be sure to
free the error string after QT's got its own copy.

svn path=/trunk/; revision=45068
2012-09-23 14:54: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
Evan Huus bf976a10cb Use g_new instead of g_malloc to avoid manual C-style casting in C++ code.
svn path=/trunk/; revision=44998
2012-09-19 01:58:24 +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 7d8330f50a Remove a debugging mesage.
svn path=/trunk/; revision=44993
2012-09-18 23:48:59 +00:00
Gerald Combs c4d22dbe11 import_text_dialog.cpp: Use the common help URL routines.
main_window.cpp: QMessageBox::exec returns a StandardButton, not a ButtonRole.
help_dlg.c: Remove extra blank lines.

svn path=/trunk/; revision=44991
2012-09-18 22:52:34 +00:00
Evan Huus 4b471d0ca6 Add Gerald's recent qt text-import work to CMake build.
svn path=/trunk/; revision=44963
2012-09-18 00:40:10 +00:00
Gerald Combs f6f174ffec Make the help button do something.
svn path=/trunk/; revision=44960
2012-09-18 00:17:04 +00:00
Gerald Combs a7f1c30a57 Adjust the Import Text dialog size policy, although it's still not
quite right.

svn path=/trunk/; revision=44958
2012-09-18 00:05:55 +00:00
Gerald Combs 9e338509f5 Restore set_last_open_dir. We need it on Windows.
svn path=/trunk/; revision=44957
2012-09-17 23:59:50 +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
Guy Harris 5a551d6b63 Nobody uses DIRTY_GENERATED_C_FILES, so get rid of it; we don't want to
encourage people to create source files that get warnings.

svn path=/trunk/; revision=44909
2012-09-15 08:17:53 +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
Gerald Combs b74aa22317 Show our packets after we've loaded a file.
svn path=/trunk/; revision=44863
2012-09-10 23:02:34 +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
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
Evan Huus 471b4d94ef Remove string constants from g_assert() calls, as per thread on wireshark-dev:
http://www.wireshark.org/lists/wireshark-dev/201209/msg00030.html

svn path=/trunk/; revision=44774
2012-09-05 01:44:09 +00:00
Alexis La Goutte 42ace71553 Add modelines for Qtshark file
svn path=/trunk/; revision=44766
2012-09-04 08:18:31 +00:00
Jörg Mayer 12a0aa4849 - Replace packet_list_recreate_visible_rows -> packet_list_recreate_visible_rows_list
- Replace new_packet_list_ -> packet_list_


svn path=/trunk/; revision=44765
2012-09-04 02:35:25 +00:00
Jörg Mayer 380fe63a6d Rename new_packet_list.[ch] to packet_list.[ch]
svn path=/trunk/; revision=44764
2012-09-04 01:57:36 +00:00
Evan Huus fe5173d259 Don't leak memory when given an empty remote host (caught by cppcheck).
svn path=/trunk/; revision=44727
2012-09-01 13:49:42 +00:00