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
Evan Huus
752c00ea9b
Temporarilly comment out param names while they're unused (basically
...
until the functions are implemented) so qtshark will compile with gcc.
svn path=/trunk/; revision=44726
2012-09-01 13:37:04 +00:00
Evan Huus
2f5b01c68a
Fix part of build on latest GCC.
...
svn path=/trunk/; revision=44719
2012-09-01 02:56:32 +00:00
Gerald Combs
64346553f9
Don't try to read from our input pipe on Windows after we're done capturing.
...
svn path=/trunk/; revision=44718
2012-08-31 23:37:10 +00:00
Gerald Combs
3751353a70
Connect and disconnect our signals correctly.
...
Capture still doesn't work correctly under Windows.
svn path=/trunk/; revision=44717
2012-08-31 23:18:45 +00:00
Gerald Combs
cf4ac2931e
Fix compilation on Windows.
...
The moc man page says "The moc does not expand #include or #define,
it simply skips any preprocessor directives it encounters." This means
our signals and slots have to exist everywhere, even if they're empty
on some platforms.
Remove some duplicate definitions.
svn path=/trunk/; revision=44716
2012-08-31 23:13:43 +00:00
Gerald Combs
d6ce6168bb
Initialize a variable so that we can quit. Remove some debugging
...
statements.
svn path=/trunk/; revision=44715
2012-08-31 22:50:44 +00:00
Gerald Combs
5c715fcc19
It ain't Wireshark unless we can capture.
...
Implement basic capture start and stop. Add a lot of menu items and
enable and disable them when appropriate. Rename a few variables.
Next step: Let the user select an interface (we just use the default for
now).
svn path=/trunk/; revision=44714
2012-08-31 22:25:51 +00:00
Alexis La Goutte
94cbe0ce2c
Add Q&A icon for qtshark
...
svn path=/trunk/; revision=44713
2012-08-31 12:11:44 +00:00
Alexis La Goutte
070ccb3d5a
File => Open (Ctrl+O) on Qtshark (broke with last change...)
...
Use Qt:Autoconnect SLOT/Signal
svn path=/trunk/; revision=44708
2012-08-31 07:56:24 +00:00
Gerald Combs
6b26e33c60
Allow focus in the task list, which in turn allows keyboard navigation.
...
svn path=/trunk/; revision=44643
2012-08-23 17:42:02 +00:00
Gerald Combs
a04d6e4690
Fill in some missing functionality. Rename some variables and rearrange
...
a few things.
svn path=/trunk/; revision=44641
2012-08-23 17:29:05 +00:00
Jörg Mayer
e3d925b1ff
The proper way to set compiler flags in cmake is not by using
...
add_definitions() but the variables CMAKE_C{,XX}_FLAGS. Set these
flags correctly at the toplevel, so no hack in the ui/qt/ subdir
is required anymore.
svn path=/trunk/; revision=44633
2012-08-23 12:30:16 +00:00
Jörg Mayer
b43901043a
Remove commented out rules
...
Whitespace fixes
svn path=/trunk/; revision=44629
2012-08-23 10:34:45 +00:00
Jörg Mayer
11b1de0cdf
Fixes for warnings: unused-but-set-variable
...
svn path=/trunk/; revision=44628
2012-08-23 10:30:37 +00:00
Gerald Combs
fa0a6beb0e
Catch key events where needed and direct them to the display filter
...
QLineEdit. Use Tango colors for syntax highlighting. Rename a few
variables.
svn path=/trunk/; revision=44620
2012-08-23 02:59:31 +00:00
Gerald Combs
4c32e01dfe
Handle return/enter/escape in the Go to Packet QLineEdit.
...
svn path=/trunk/; revision=44616
2012-08-22 20:39:36 +00:00
Gerald Combs
da27acaa27
Fix compilation.
...
svn path=/trunk/; revision=44602
2012-08-21 03:07:39 +00:00
Gerald Combs
16518aff46
Restore the previous focus when we're done going to a packet.
...
svn path=/trunk/; revision=44601
2012-08-20 21:22:01 +00:00
Gerald Combs
3cdf8d6e09
Stylize the "go to packet" bar.
...
svn path=/trunk/; revision=44597
2012-08-20 17:55:43 +00:00
Gerald Combs
2f9b5d31e4
Basic "Go to Packet" implementation.
...
svn path=/trunk/; revision=44594
2012-08-20 04:34:23 +00:00
Gerald Combs
44cb77d8de
Handle double-clicks in the tree.
...
svn path=/trunk/; revision=44592
2012-08-19 23:52:08 +00:00
Gerald Combs
7e924beee9
Be more specific.
...
svn path=/trunk/; revision=44591
2012-08-19 21:52:57 +00:00
Gerald Combs
01d8219f59
Try colors from the Tango palette.
...
svn path=/trunk/; revision=44590
2012-08-19 21:44:22 +00:00
Gerald Combs
2b21eff0d9
Add automatic tree expansion. Get rid of some unnecessary void * casts.
...
Fix a couple of compilation warnings.
svn path=/trunk/; revision=44587
2012-08-19 20:47:11 +00:00
Guy Harris
5e17f4606f
ui_main_welcome.h is another file generated by uic, so list it in
...
GENERATED_NODIST_HEADER_FILES.
svn path=/trunk/; revision=44569
2012-08-18 22:25:50 +00:00
Jörg Mayer
3b15b97e88
Make qtshark build again with autotools - possibly. Completely untested.
...
svn path=/trunk/; revision=44567
2012-08-18 19:45:09 +00:00
Jörg Mayer
2fdb1aca60
Make cmake build qtshark again
...
svn path=/trunk/; revision=44566
2012-08-18 19:40:12 +00:00
Gerald Combs
29d4ead8ad
Fix a focus artifact on Windows and adjust colors for not-so-stellar
...
monitors.
svn path=/trunk/; revision=44556
2012-08-17 22:04:20 +00:00
Gerald Combs
c12c712d9c
More welcome screen layout updates. Instantiate the welcome screen
...
automatically. Try to make the sparklines resolution independent.
svn path=/trunk/; revision=44555
2012-08-17 19:37:18 +00:00
Gerald Combs
a63c89d004
Auto-expand the welcome screen layout. Get rid of or comment out
...
debugging items.
svn path=/trunk/; revision=44549
2012-08-17 02:37:58 +00:00
Gerald Combs
2fe5163ec3
Lay out the welcome screen using Qt Designer.
...
svn path=/trunk/; revision=44547
2012-08-17 00:58:50 +00:00
Gerald Combs
f2789cbb34
Copy over the C runtime DLLs if MSVCR_DLL is defined.
...
svn path=/trunk/; revision=44544
2012-08-16 19:37:01 +00:00
Gerald Combs
ac909fa890
Only apply the QWindowsVistaStyle hack when it's the current style.
...
svn path=/trunk/; revision=44499
2012-08-14 18:36:50 +00:00
Gerald Combs
0d3a203d3e
Copy the QtCore and QtGui DLLs to the Qt staging directory.
...
svn path=/trunk/; revision=44497
2012-08-14 18:16:57 +00:00
Gerald Combs
c8a4832050
Fix compilation with gcc. Remove an unused variable.
...
svn path=/trunk/; revision=44495
2012-08-14 17:35:50 +00:00
Gerald Combs
fab29eea8d
Properly enable and disable "View/Expand Subtrees". Get rid
...
of ProtoTree::protoItemUnselected and use an empty string in
protoItemSelected to indicate that nothing is selected.
svn path=/trunk/; revision=44492
2012-08-14 16:35:52 +00:00
Gerald Combs
6f55c03852
Fix compilation warnings.
...
svn path=/trunk/; revision=44489
2012-08-14 16:01:47 +00:00
Gerald Combs
e0fcd7c21f
Add a "View" menu along with actions+slots for expanding and collapsing
...
packet details. Connect the "Go" menu actions directly to their
corresponding packet list slots.
svn path=/trunk/; revision=44483
2012-08-14 04:12:56 +00:00
Gerald Combs
5a84802a21
Don't copy over the entire contents of the GnuTLS bin directory. Move
...
wireshark-qt to the top source directory alongside wireshark-gtk2. We
may want to merge them at some point.
svn path=/trunk/; revision=44482
2012-08-14 00:43:10 +00:00
Gerald Combs
09242a83bf
Minor cleanup: Get rid of unnecessary signal+slot customization and mark
...
functions protected.
svn path=/trunk/; revision=44481
2012-08-14 00:25:42 +00:00
Gerald Combs
f532cd3064
Use the right color on Windows when selected.
...
svn path=/trunk/; revision=44479
2012-08-13 23:37:15 +00:00
Gerald Combs
0cf96d45db
Include console.lua with the build.
...
svn path=/trunk/; revision=44463
2012-08-13 03:58:52 +00:00
Gerald Combs
603787f0ad
Add keyboard shortcuts for the packet list.
...
svn path=/trunk/; revision=44462
2012-08-13 01:50:14 +00:00
Jörg Mayer
bf92ff4a3e
Remove an empty line
...
svn path=/trunk/; revision=44334
2012-08-08 12:33:13 +00:00
Alexis La Goutte
b245c46c50
lupdate QtShark.pro
...
Updating 'qtshark_de.ts'...
Found 72 source text(s) (16 new and 56 already existing)
Kept 13 obsolete entries
Updating 'qtshark_fr.ts'...
Found 72 source text(s) (16 new and 56 already existing)
Kept 10 obsolete entries
Similar-text heuristic provided 3 translation(s)
Also remove $Id$, it is xml file (auto)generated by Qt (lupdate)
svn path=/trunk/; revision=44305
2012-08-07 16:08:23 +00:00
Alexis La Goutte
43e031bf86
Apply the change of revision 44103 to QtShark
...
( It is link Tshark Help not Wireshark (already in bottom !))
Also remove $Id$, it is Xml file (auto)generated by Qt Design
svn path=/trunk/; revision=44303
2012-08-07 15:42:43 +00:00
Jörg Mayer
5bf74638a3
Set svn properties
...
svn path=/trunk/; revision=44286
2012-08-06 20:58:19 +00:00
Jörg Mayer
78be49a3d0
Add Id header (and the standard copyright headers) to some files.
...
svn path=/trunk/; revision=44285
2012-08-06 20:50:30 +00:00
Gerald Combs
704c2e0355
Apparently QPointFs draw on center. Offset them in order to avoid
...
gratuitous antialiasing.
svn path=/trunk/; revision=44284
2012-08-06 20:44:33 +00:00
Alexis La Goutte
16821fe43c
Fix Unknown test function: packagesExist when launch qmake QtShark.pro
...
packagesExist is only present in Qt >= 4.8 ( https://bugreports.qt-project.org/browse/QTBUG-11418 )
Add packagesExist function if Qt < 4.8 ( from http://qt.gitorious.org/qt/qt/merge_requests/1022 )
svn path=/trunk/; revision=44282
2012-08-06 16:17:16 +00:00
Jörg Mayer
74a3a6e405
Don't call "Q_OBJECT" if there are no signals or slots defined.
...
Fix cmake (and possibly autotools) build for:
lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'
This would not show up using qtcreator due to the magic of qmake.
I must admit that I don't fully understand what I am doing here, but
I read the following thread to the bottom and one of the last posts
contained the solution:
http://stackoverflow.com/questions/1095298/gcc-c-linker-errors-undefined-reference-to-vtable-for-xxx-undefined-refere
svn path=/trunk/; revision=44280
2012-08-06 10:59:00 +00:00
Gerald Combs
6766420142
Take out a debugging statement.
...
svn path=/trunk/; revision=44260
2012-08-04 04:35:34 +00:00
Gerald Combs
215d89c890
Draw selected items properly.
...
svn path=/trunk/; revision=44259
2012-08-04 02:02:40 +00:00
Gerald Combs
1500f3bd42
Fix sparlines on Windows. Unfortunately this means listing device IDs
...
(for now at least).
svn path=/trunk/; revision=44258
2012-08-04 00:37:04 +00:00
Jörg Mayer
ed6e29eac6
Try to copy over the changes to QtShark.pro to automake and cmake.
...
Note: It still fails with
Linking CXX executable qtshark
lib/libqtui.a(interface_tree.cpp.o): In function `SparkLineDelegate':
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sparkline_delegate.h:10: undefined reference to `vtable for SparkLineDelegate'
collect2: error: ld returned 1 exit status
svn path=/trunk/; revision=44257
2012-08-04 00:31:31 +00:00
Gerald Combs
51e75f3bb3
Qt Creator put sparkline_delegate.{cpp,h} in their own special sections.
...
Don't do that.
svn path=/trunk/; revision=44256
2012-08-04 00:21:21 +00:00
Gerald Combs
b82eedf94a
Make sure global_capture_opts is properly declared.
...
svn path=/trunk/; revision=44254
2012-08-04 00:01:59 +00:00
Gerald Combs
a234d1215c
Move capture_globals.h from ui/gtk/ to ui/. Show interface activity
...
using sparklines in the qtshark main window.
svn path=/trunk/; revision=44253
2012-08-03 23:30:47 +00:00
Gerald Combs
523ce7d8b5
Pick up PortAudio dynamically.
...
svn path=/trunk/; revision=44208
2012-08-02 14:29:33 +00:00
Gerald Combs
02894a0be8
Move utf8_entities.h to the "ui" directory. Separate packet information
...
items with MIDDLE DOTs.
svn path=/trunk/; revision=44194
2012-08-01 19:18:49 +00:00
Jörg Mayer
0e5b323ace
spelling fix (hopefully)
...
svn path=/trunk/; revision=44191
2012-08-01 18:42:10 +00:00
Jörg Mayer
ffb4be37a6
Make the changes of r44165 build with autofoo and cmake as well
...
svn path=/trunk/; revision=44190
2012-08-01 18:27:57 +00:00
Gerald Combs
005ac60289
More style tweaks.
...
svn path=/trunk/; revision=44189
2012-08-01 16:17:47 +00:00
Gerald Combs
0c3fd84ef5
Adjust the text size on OS X. This introduces an artifact that affects
...
the expert indicator. Maybe we should use SVG icons instead of PNGs.
svn path=/trunk/; revision=44176
2012-08-01 00:06:21 +00:00
Jeff Morriss
d1bb5b5860
(Attempt to) reflect the file moves from r44165.
...
svn path=/trunk/; revision=44174
2012-07-31 22:57:04 +00:00
Alexis La Goutte
0120281417
Add icon to QtShark.exe for Windows
...
Fix the patch to the icon..
svn path=/trunk/; revision=44171
2012-07-31 20:50:24 +00:00
Alexis La Goutte
bc77426c97
Add icon to QtShark.exe for Windows
...
qstshark.rc => qtshark.rc
svn path=/trunk/; revision=44170
2012-07-31 20:47:07 +00:00
Gerald Combs
3c17d11e7a
Make sure splitter handles are visible on Windows.
...
svn path=/trunk/; revision=44169
2012-07-31 20:46:14 +00:00
Alexis La Goutte
a7ce184f6c
Add icon to QtShark.exe for Windows
...
svn path=/trunk/; revision=44167
2012-07-31 20:42:59 +00:00
Alexis La Goutte
ca5f417aa0
Add icon to Help Menu (Help, Wiki, About)
...
(Not found a Home icon for Website in Qt framework...)
Add also F1 shortcut for contents and access key
svn path=/trunk/; revision=44166
2012-07-31 20:34:14 +00:00
Gerald Combs
d44f940aaf
Add an expert level indicator. Move a bunch of resources to image/.
...
svn path=/trunk/; revision=44165
2012-07-31 20:00:25 +00:00
Gerald Combs
57110f6e61
Fixup the progress bar spacing.
...
svn path=/trunk/; revision=44159
2012-07-31 16:57:33 +00:00
Gerald Combs
231acd1399
Font size + hint updates for Windows.
...
svn path=/trunk/; revision=44148
2012-07-31 00:13:34 +00:00
Gerald Combs
0161f2aa88
Try to choose a better default font. Fix a runtime warning in the status
...
bar.
svn path=/trunk/; revision=44147
2012-07-31 00:00:35 +00:00
Gerald Combs
fc1e1a9d4c
Get rid of a couple of focus halos.
...
svn path=/trunk/; revision=44145
2012-07-30 21:46:38 +00:00
Gerald Combs
1475a7a704
Rename "Files" to "Recent Files". Add space between each recent item.
...
Elide text instead of scrolling horizontally. Add a hover indication.
svn path=/trunk/; revision=44143
2012-07-30 21:36:23 +00:00
Gerald Combs
3392211002
Grow the dialog to account for our added widgets.
...
svn path=/trunk/; revision=44142
2012-07-30 21:22:53 +00:00
Gerald Combs
5fc656ee46
Add a preview to the common file dialog. Adjust the win32 file dialog
...
preview logic slightly.
svn path=/trunk/; revision=44080
2012-07-27 21:43:02 +00:00
Alexis La Goutte
f4f8e88ae9
lupdate QtShark.pro (with the last change in translation and help menu)
...
Updating 'qtshark_de.ts'...
Found 69 source text(s) (23 new and 46 already existing)
Updating 'qtshark_fr.ts'...
Found 69 source text(s) (25 new and 44 already existing) Kept 1 obsolete entries
There is new string to translate....
svn path=/trunk/; revision=43989
2012-07-25 12:00:38 +00:00
Alexis La Goutte
e9c6f329c0
Add some link (URL) to Help Menu in QtShark
...
* Use QtAutoconnect feature
* no (yet ?) use help_dlg.* function (topic_action, topic_online_url...)
svn path=/trunk/; revision=43988
2012-07-25 11:57:05 +00:00
Alexis La Goutte
dece67951b
Add some link (URL) to Help Menu in QtShark
...
* Use QtAutoconnect feature
* no (yet ?) use help_dlg.* function (topic_action, topic_online_url...)
svn path=/trunk/; revision=43987
2012-07-25 11:53:44 +00:00
Alexis La Goutte
d31651c42c
Add Help Menu to QtShark
...
* with new "item" Ask A&Q (not yet available in GTK Gui)
* No yet link (next step)
* No icon...
svn path=/trunk/; revision=43986
2012-07-25 11:49:03 +00:00
Gerald Combs
d6533eb467
Add display filter and name resolution controls to the standard Qt open
...
file dialog. We still need to add a preview.
svn path=/trunk/; revision=43879
2012-07-21 01:21:41 +00:00
Jörg Mayer
6ac0c92fb4
Order alphabetically
...
svn path=/trunk/; revision=43858
2012-07-20 12:00:37 +00:00
Jörg Mayer
964008c959
Add qtshark_de.ts
...
svn path=/trunk/; revision=43857
2012-07-20 11:59:25 +00:00
Jörg Mayer
0441109c33
Beginnings of a German translation (review/improvements welcome)
...
svn path=/trunk/; revision=43855
2012-07-20 11:58:16 +00:00
Jörg Mayer
0062536fa8
progress_dialog.* -> progress_bar.*
...
svn path=/trunk/; revision=43852
2012-07-20 10:35:51 +00:00
Gerald Combs
c71e796349
Try to fix compilation on non-Windows systems.
...
svn path=/trunk/; revision=43837
2012-07-19 23:07:17 +00:00
Guy Harris
7031122dc4
Reflect the name change of progress_dialog.{cpp,h} to progress_bar.{cpp,h}.
...
svn path=/trunk/; revision=43836
2012-07-19 23:04:46 +00:00
Gerald Combs
cbb9966466
Remove some debugging statements. Fix the fade-in animation.
...
svn path=/trunk/; revision=43835
2012-07-19 22:33:47 +00:00
Gerald Combs
0da59a0058
Pass {delayed_}create_progress_dlg a pointer the top level window
...
so that we can properly associate a widget with create, update, and
destroy events. Only used by Qt so far but it should be easy enough to
add to GTK+.
Rename ui/qt/progress_dialog.{h,cpp} to progress_bar.{h,cpp}. Show a
progress bar in the status bar of the main window instead of creating
a separate dialog. Note that we still need to add a "cancel" mechanism
and display the task and item titles somewhere.
Thus began the War Against Gratuitous Dialogs.
svn path=/trunk/; revision=43833
2012-07-19 21:49:52 +00:00
Gerald Combs
2643a5b02d
Update qtshark to match the recent file dialog changes.
...
svn path=/trunk/; revision=43786
2012-07-18 16:40:34 +00:00
Gerald Combs
bc1b0fd21d
Try not to print funny characters.
...
svn path=/trunk/; revision=43685
2012-07-12 23:39:25 +00:00
Gerald Combs
5d4638e95c
Fix building (and running) on OS X.
...
svn path=/trunk/; revision=43684
2012-07-12 22:39:04 +00:00
Gerald Combs
bdea70585d
Use win32_open_file in qtshark on Windows.
...
svn path=/trunk/; revision=43677
2012-07-12 00:04:53 +00:00
Jakub Zawadzki
bf81b42e1e
Update Free Software Foundation address.
...
(COPYING will be updated in next commit)
svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Anders Broman
3814106d7e
From Michael Mann:
...
generic preferences implementation
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7402
svn path=/trunk/; revision=43484
2012-06-25 21:05:36 +00:00
Guy Harris
7fbd6ca1f0
Add "simple dialog" routines to pop up modal message boxes.
...
svn path=/trunk/; revision=43330
2012-06-18 08:30:53 +00:00
Gerald Combs
304654f688
Don't install the Qt resource images. They get converted to C arrays in
...
qrc_*.cpp so they shouldn't be necessary even when we're building and
installing qtshark.
svn path=/trunk/; revision=43274
2012-06-15 18:17:20 +00:00
Gerald Combs
e63f70cfc2
Add the GeoIP DLL.
...
svn path=/trunk/; revision=43128
2012-06-05 23:43:02 +00:00
Gerald Combs
95e53ff7ab
Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNU
...
toolchain version but that's a separate issue.)
svn path=/trunk/; revision=43124
2012-06-05 18:37:32 +00:00
Guy Harris
e6a57c8e93
In Windows, in the Save As and Export Selected Packets dialog, append
...
the default extension for the file type iff
the file type we're using has a list of extensions;
the file has no extension or it has one but it's not one of the
ones in the list.
*Don't* expect a file extension to be at most 5 characters plus the dot
- the extension for pcap-ng, our default capture file type, is "pcapng",
and that's 6 characters!
svn path=/trunk/; revision=42800
2012-05-23 03:05:17 +00:00
Guy Harris
90c43120ca
The GUI's state machine requires that, when reloading a capture after a
...
save, we post capture file callback events similar to the ones posted
when reading a capture - otherwise, the reload will leave the welcome
screen up.
Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished,
add a cf_cb_file_reload_started callback, have them work similarly to
read_finished and read_started except that the reload uses "Reloading"
in the progress bar and status bar.
Clean up some indentation while we're at it.
svn path=/trunk/; revision=42764
2012-05-22 03:52:12 +00:00
Jeff Morriss
75c3c92f19
Add a "-build" argument to checkAPIs.pl. Use that argument when building
...
from makefiles (and thus from the buildbot).
The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.
As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.
svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Jörg Mayer
6a60fdd5fc
gcc 4.7 would complain that the getopt stuff was not declared.
...
Looks like getopt.h was silently included somewhere in gcc-4.6's
includes. Explicitely include <getopt.h>. No idea whether this
is the correct fix.
Whitespace change: indent includes, if they are inside a conditional.
svn path=/trunk/; revision=41847
2012-03-30 14:55:00 +00:00
Gerald Combs
e19fa8063e
Give qmake a VERSION it will accept.
...
svn path=/trunk/; revision=41762
2012-03-25 21:27:49 +00:00
Gerald Combs
6f5273e81e
Fix the Qt build for Win64.
...
svn path=/trunk/; revision=41761
2012-03-25 19:01:58 +00:00
Guy Harris
ec2451f8f1
We don't use a GENERATED_H_FILES macro anywhere else, we use
...
GENERATED_HEADER_FILES; get rid of GENERATED_H_FILES in favor of
GENERATED_HEADER_FILES, and make other changes to make the Makefile.am
and Makefile.common in ui/qt more like those in ui/gtk.
svn path=/trunk/; revision=41669
2012-03-19 09:31:22 +00:00
Guy Harris
e0b738f974
Remove the generated-but-not-distributed source files on "make
...
distclean", as, after all, they're not part of the distribution.
svn path=/trunk/; revision=41668
2012-03-19 09:12:17 +00:00
Guy Harris
28ad4501ee
Add main.cpp as an EXTRA_DIST file; for now, we don't build it as part
...
of the library, because, in order to do the top-level link of Wireshark
with a C++ compiler rather than a C compiler, at least one C++ source
file must be an input file - for now, we don't do that, as adding it as
a top-level source file for Wireshark causes other problems, but this at
least lets somebody do so as a temporary hack to build with auto*.
svn path=/trunk/; revision=41667
2012-03-19 07:32:45 +00:00
Guy Harris
c2f03d39f3
Don't distribute the output of various Qt preprocessing tools. We don't
...
want to require the machines used to build the distribution tarballs to
have those tools installed or to require the build process to run them,
and I think if you have enough stuff installed to build Qt applications
at all you'll have those tools installed (the reason why the result of
{F}lex and YACC/BYACC/Bison are distributed with tarballs is to let
somebody who wants to or needs to build from unmodified source do so
with as few tools required as possible).
svn path=/trunk/; revision=41666
2012-03-19 07:30:38 +00:00
Guy Harris
df5f0bd622
Another generated file.
...
svn path=/trunk/; revision=41662
2012-03-19 07:08:15 +00:00
Guy Harris
813ba676a4
Get rid of blank line at the end.
...
svn path=/trunk/; revision=41660
2012-03-19 06:31:37 +00:00
Guy Harris
1ff3d8477f
Call the UI library in the Qt directory libqtui, not libui, to match the
...
UI library in the GTK+ directory.
List the moc-generated and rcc-generated files as generated files.
Add main_window.ui as an EXTRA_DIST file. Sort the EXTRA_DIST list.
svn path=/trunk/; revision=41658
2012-03-19 06:29:41 +00:00
Jeff Morriss
13e113bd44
Until someone creates a .vcproj file for QT, don't try to distribute it.
...
svn path=/trunk/; revision=41655
2012-03-19 01:47:53 +00:00
Jeff Morriss
38d8b62758
Add ui/qt/doxygen.cfg.in (copied from ui/gtk, replacing gtk strings with qt). The doxygen stuff doesn't work, but at least we'll be able to build the source tarball.
...
svn path=/trunk/; revision=41653
2012-03-19 01:15:26 +00:00
Guy Harris
2605c887ca
Add in the Makefile_custom.common file.
...
svn path=/trunk/; revision=41648
2012-03-18 23:39:23 +00:00
Guy Harris
994d2b544e
Add automake support for Qt - use --with-qt as a configure script
...
argument.
svn path=/trunk/; revision=41647
2012-03-18 23:35:53 +00:00
Alexis La Goutte
7d66c568b2
Fix some Gui Text not translate and update french translation
...
svn path=/trunk/; revision=41623
2012-03-16 18:54:01 +00:00
Alexis La Goutte
d14a0dad80
Fix QtShark build after the move of alert_box.c in ui folder
...
svn path=/trunk/; revision=41475
2012-03-10 19:00:34 +00:00
Jörg Mayer
d8d208027c
Comment fix: i10n -> i18n
...
svn path=/trunk/; revision=41392
2012-03-07 11:58:05 +00:00
Alexis La Goutte
e17397b721
From Joerg Mayer
...
Add i18n to Cmake
svn path=/trunk/; revision=41390
2012-03-07 10:23:50 +00:00
Alexis La Goutte
fe840481ec
Add i18n to QtShark
...
The goal is only to translate the Gui (Not dissector)
Actually, there is only a french translation.
To try, (if you are not French) launch qtshark with LANG=fr ./qtshark (in ui/qt folder)
Missing some feature :
* Add preference to select (force) your language
* Some Gui Text, it no available for translation
* Documentation about how to translate (Coming soon...)
* Your translation !
svn path=/trunk/; revision=41389
2012-03-07 10:16:33 +00:00
Alexis La Goutte
a1d847ed16
Fix compile for QtShark (../../util.c => ../../ui/util.c)
...
svn path=/trunk/; revision=41243
2012-02-29 16:54:29 +00:00
Jörg Mayer
35508464b2
Start moving files to ui/ and ui/cli/
...
svn path=/trunk/; revision=41047
2012-02-17 12:30:27 +00:00
Bill Meier
b28fe4d079
When building QtShark on Windows: Don't (re)compile Wireshark .c files
...
svn path=/trunk/; revision=40933
2012-02-08 18:51:01 +00:00
Jörg Mayer
84f869cb2e
Add the magic incantation to get icons into the cmake build.
...
No idea why the qtcreate build worked without this.
See http://developer.qt.nokia.com/doc/qt-4.8/resources.html
@Gerald: I've most likely put this into the wrong place, please
verify/fix.
Thanks to Alexander Neundorf for spotting this and proposing a
fix.
svn path=/trunk/; revision=40841
2012-02-04 14:27:14 +00:00
Jörg Mayer
e41766e4bb
Rename the binary Wireshark -> qtshark
...
svn path=/trunk/; revision=40832
2012-02-04 10:02:40 +00:00
Jörg Mayer
0d0b51e56b
Don't forget about the .qrc files.
...
There is nothing to install for the qt gui right now.
svn path=/trunk/; revision=40826
2012-02-03 17:40:55 +00:00
Jörg Mayer
d987442264
Add a comment about automoc (but don't use it as this would
...
force everyone to use a rather recent cmake).
svn path=/trunk/; revision=40815
2012-02-02 21:33:37 +00:00
Jörg Mayer
33b8433336
Fix make install for qtshark.
...
svn path=/trunk/; revision=40814
2012-02-02 21:21:04 +00:00
Jörg Mayer
c3dea73ade
Make out-of-tree builds work.
...
svn path=/trunk/; revision=40809
2012-02-02 12:38:04 +00:00
Jörg Mayer
137f3fc455
- Move setting _U_ into config.h, because
...
a) C++ has a standardized way of marking parameters as unused
b) cmakes autoquoting magic failed when the compiler wasn't gcc
but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project
svn path=/trunk/; revision=40807
2012-02-02 12:04:22 +00:00
Jörg Mayer
f628ed7aec
Update svn:ignore for existing qtshark build process
...
svn path=/trunk/; revision=40805
2012-02-02 08:55:00 +00:00
Bill Meier
781d224ada
Fix some Windows qmake and Qt Wireshark build issues:
...
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.
svn path=/trunk/; revision=40797
2012-02-01 21:47:31 +00:00
Bill Meier
60eca2a2eb
Fix a typo
...
svn path=/trunk/; revision=40795
2012-02-01 21:24:08 +00:00
Bill Meier
cf24e97617
Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.
...
svn path=/trunk/; revision=40781
2012-01-30 23:55:34 +00:00
Bill Meier
4308ba7dc5
Rework Windows Wireshark Qt build configuration a bit:
...
1. Compile and link with (almost exactly) the same options as used
when building Windows Wireshark Gtk.
The options used allow debugging of the exe using Visual Studio exactly
as is done for Wireshark Gtk.
Essentially: configure the "release" version to compile and link with
symbols. (See ui\qt\QtShark for the details).
2. Update QtShark.pro to create a Makefile only for 1 version of Wireshark Qt
which is linked against the "release" Qt libraries.
(IOW: don't create a "debug" Makefile).
3. Remove unused variable assignments from config.pri.
(They can be added back if needed in the future).
svn path=/trunk/; revision=40768
2012-01-30 04:37:12 +00:00
Alexis La Goutte
d307494e07
Fix
...
main_window.cpp: In function ‘QStringList build_file_open_type_list()’:
main_window.cpp:249:50: error: cannot call constructor ‘QString::QString’ directly [-fpermissive]
main_window.cpp:249:50: error: for a function-style cast, remove the redundant ‘::QString’ [-fpermissive]
svn path=/trunk/; revision=40741
2012-01-27 16:49:54 +00:00
Gerald Combs
b58510cc31
The proper scope / spec name for OS X is "macx".
...
svn path=/trunk/; revision=40724
2012-01-25 18:06:25 +00:00
Gerald Combs
84151d4737
Put back an "explicit" for now. I'm not sure it's necessary but Qt
...
Creator put it there as I recall.
svn path=/trunk/; revision=40710
2012-01-25 01:16:36 +00:00
Gerald Combs
9a14284b5b
Add a comment discussing what it will take to have native file dialogs
...
on Windows and OS X.
svn path=/trunk/; revision=40709
2012-01-25 01:13:04 +00:00
Gerald Combs
377322404f
Compile PortAudio if it's available.
...
svn path=/trunk/; revision=40708
2012-01-24 21:26:22 +00:00
Guy Harris
3caea2d5ca
Use wtap_get_file_extensions_list(), and prepare to use
...
wtap_get_savable_file_types(), in the Qt file dialogs.
svn path=/trunk/; revision=40698
2012-01-24 19:04:05 +00:00
Alexis La Goutte
94e4fa3e76
Fix -v for QtShark
...
./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)
Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.
Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.
Built using gcc 4.6.1.
get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c
the function is common to GTK and Qt need to put in version_info.[ch] ?
svn path=/trunk/; revision=40633
2012-01-21 18:56:01 +00:00
Gerald Combs
463b3178e8
Add more configuration information to config.pri which lets us remove
...
more hard-coded definitions from QtShark.pro. Quote an error message to
fix a Qt Creator complaint.
Add ui\qt\config.pri to the top-level "all" nmake target.
Update README.qt.
svn path=/trunk/; revision=40607
2012-01-20 18:30:44 +00:00
Gerald Combs
0829150550
Try copying our plugins to an accessible directory. This assumes you've set
...
WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment.
On Windows, generate a QMake include file (config.pri) from config.nmake.
svn path=/trunk/; revision=40600
2012-01-20 01:10:40 +00:00
Gerald Combs
41c54f9e5d
Remove or mark unused variables.
...
svn path=/trunk/; revision=40599
2012-01-20 00:01:53 +00:00
Guy Harris
3dbb23f826
Get rid of no-longer-applicable comments.
...
svn path=/trunk/; revision=40579
2012-01-18 23:41:07 +00:00
Guy Harris
9f7e8bdb0d
Get rid of some redeclarations, include "ui/recent_utils.h" to get those
...
declarations.
svn path=/trunk/; revision=40578
2012-01-18 23:40:04 +00:00
Guy Harris
78fb9ffd6c
Another fix for the move of recent.h.
...
svn path=/trunk/; revision=40577
2012-01-18 23:37:50 +00:00
Alexis La Goutte
5b2eb869c9
Following the move of recent.*
...
Fix : No rule to make target « ../gtk/recent.c », needed for « recent.c ». Stop.
Not need to copy recent.c in qt working directory and use the common recent.c file.
svn path=/trunk/; revision=40574
2012-01-18 22:00:18 +00:00
Guy Harris
ee0089dfe7
Reflect the changes to make the recent-file code GUI-independent.
...
svn path=/trunk/; revision=40563
2012-01-18 19:59:13 +00:00
Guy Harris
dacb4133e8
Restructure the recent file code so that recent.c is GUI-independent;
...
move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.
svn path=/trunk/; revision=40561
2012-01-18 19:38:34 +00:00
Guy Harris
ee1e0a0368
Reflect the move of some header files to the ui directory.
...
svn path=/trunk/; revision=40530
2012-01-16 01:18:56 +00:00
Jörg Mayer
be706c6380
Move gtk to ui/gtk.
...
This looses the last checkin to gtk, will add this manually back.
svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00
Gerald Combs
bc957229f8
Initial status bar functionality. Promote the main window's status bar
...
to a MainStatusBar. Add a "LabelStack" widget, which MainStatusBar uses
to duplicate features in GtkStatusbar. Make the protocol tree a
full-blown ProtoTree widget. Move main_cf_callback from main to
WiresharkApplication. Duplicate a lot of the cf callbacks as signals and
slots. Use Q_UNUSED in a few places.
svn path=/trunk/; revision=40488
2012-01-14 00:16:16 +00:00
Gerald Combs
17fb65a364
Remove some debug logging.
...
svn path=/trunk/; revision=40421
2012-01-09 19:31:31 +00:00
Gerald Combs
458de08ce9
Remove a generated file (pointed out by Gisle Vanem).
...
svn path=/trunk/; revision=40409
2012-01-09 06:21:19 +00:00
Gerald Combs
307416d5a6
Fix compilation on Windows.
...
svn path=/trunk/; revision=40379
2012-01-04 22:59:17 +00:00
Gerald Combs
23a520237b
Add initial support for Qt along with a "ui" subdirectory.
...
svn path=/trunk/; revision=40378
2012-01-04 22:13:01 +00:00