Commit graph

444 commits

Author SHA1 Message Date
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