osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
43,931 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

22 Commits

Author SHA1 Message Date
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
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 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
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 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
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
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 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
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
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 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
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
Jeff Morriss d1bb5b5860 (Attempt to) reflect the file moves from r44165. 
svn path=/trunk/; revision=44174
 2012-07-31 22:57:04 +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
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
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 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 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
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