Commit Graph

50 Commits

Author SHA1 Message Date
Gerald Combs cb3cfd1cf9 Add a missing dependency.
svn path=/trunk/; revision=52825
2013-10-24 23:01:30 +00:00
Jeff Morriss d69a93f70e Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS.
svn path=/trunk/; revision=52676
2013-10-18 18:28:57 +00:00
Jeff Morriss 2ac63d7a44 Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI.
svn path=/trunk/; revision=52674
2013-10-18 17:42:32 +00:00
Jeff Morriss db68b808dd Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in
the C++ stuff.

ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it
doesn't seem necessary on Fedora 18 (64-bit).  Leaving it out for now--let's
see what others say...

svn path=/trunk/; revision=52673
2013-10-18 16:56:27 +00:00
Gerald Combs a6f406ac5a Strip out references to PortAudio. Qt has its own audio module (Phonon).
We'll presumably use that.

svn path=/trunk/; revision=52282
2013-09-30 07:55:11 +00:00
Guy Harris 0f849713dc Another "this depends on a ui_XXX.h" required to force the ui_XXX.h to
be built.

svn path=/trunk/; revision=51897
2013-09-09 21:09:03 +00:00
Guy Harris abfc95ba40 QCustomPlot is C++, not C.
Additional changes needed for the TCP stream UI code.

svn path=/trunk/; revision=51544
2013-08-27 20:31:22 +00:00
Evan Huus a934ff953f Add missing ui_uat_dialog.h dependency.
The fact that we're listing these manually is kind of ugly...

svn path=/trunk/; revision=50898
2013-07-26 00:23:09 +00:00
Evan Huus 1c50729f9f Use PIE_CFLAGS when building qt-shark, since otherwise I get errors like:
/usr/include/qt5/QtCore/qglobal.h:1079:4: error: #error "You must build your
code with position independent code if Qt was built with -reduce-relocations. "
"Compile your code with -fPIC or -fPIE."

There is almost certainly a better way to do this: I'm cheating here because I
don't know enough about autofoo, and it seems to work. I suspect we should be
checking PIE for the C++ compiler separately (since presumably they're not
guaranteed to be related like gcc/g++ are). I also suspect we should only be
building with it in the first place if Qt really needs it, though I have no idea
how to check that. The qt docs I've found suggest that qt5's cmake module has a
flag for it, but autofoo is never mentioned...


svn path=/trunk/; revision=50645
2013-07-15 23:50:43 +00:00
Alexis La Goutte 43c3cb4884 From Thomas ERSFELD (GSOC13) via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8710 QtShark doesn't have a statistics summary window
Add Summary Statistics to qtshark (Statistics => Summary)
Now, use tabs to split summary display (File Capture details, Capture Statistics)

Add also Comment Summary tab (to replace Statistics => Comments Summary)

From me :
Fix order of summary files in Qtshark.pro

svn path=/trunk/; revision=50470
2013-07-09 18:08:40 +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
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 dcd8e9df5a Add module_preferences_scroll_area.*.
svn path=/trunk/; revision=47546
2013-02-08 01:30:31 +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 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
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 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 21e66f0c6f Add column preferences.
svn path=/trunk/; revision=47231
2013-01-23 19:04:36 +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
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
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 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 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 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
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
Guy Harris da6f295794 Add some more uic lines.
svn path=/trunk/; revision=46352
2012-12-03 21:33:08 +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
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
Jeff Morriss d1bb5b5860 (Attempt to) reflect the file moves from r44165.
svn path=/trunk/; revision=44174
2012-07-31 22:57:04 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs 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
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
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 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
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