aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss1-2/+2
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-03-30gcc 4.7 would complain that the getopt stuff was not declared.Jörg Mayer1-17/+19
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-25Give qmake a VERSION it will accept.Gerald Combs1-2/+2
svn path=/trunk/; revision=41762
2012-03-25Fix the Qt build for Win64.Gerald Combs1-2/+6
svn path=/trunk/; revision=41761
2012-03-19We don't use a GENERATED_H_FILES macro anywhere else, we useGuy Harris2-9/+4
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-19Remove the generated-but-not-distributed source files on "makeGuy Harris1-0/+3
distclean", as, after all, they're not part of the distribution. svn path=/trunk/; revision=41668
2012-03-19Add main.cpp as an EXTRA_DIST file; for now, we don't build it as partGuy Harris1-0/+1
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-19Don't distribute the output of various Qt preprocessing tools. We don'tGuy Harris2-3/+27
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-19Another generated file.Guy Harris1-1/+2
svn path=/trunk/; revision=41662
2012-03-19Get rid of blank line at the end.Guy Harris1-1/+0
svn path=/trunk/; revision=41660
2012-03-19Call the UI library in the Qt directory libqtui, not libui, to match theGuy Harris2-13/+19
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-19Until someone creates a .vcproj file for QT, don't try to distribute it.Jeff Morriss1-2/+3
svn path=/trunk/; revision=41655
2012-03-19Add ui/qt/doxygen.cfg.in (copied from ui/gtk, replacing gtk strings with ↵Jeff Morriss1-0/+68
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-18Add in the Makefile_custom.common file.Guy Harris1-0/+13
svn path=/trunk/; revision=41648
2012-03-18Add automake support for Qt - use --with-qt as a configure scriptGuy Harris2-0/+255
argument. svn path=/trunk/; revision=41647
2012-03-16Fix some Gui Text not translate and update french translationAlexis La Goutte5-13/+33
svn path=/trunk/; revision=41623
2012-03-10Fix QtShark build after the move of alert_box.c in ui folderAlexis La Goutte1-1/+1
svn path=/trunk/; revision=41475
2012-03-07Comment fix: i10n -> i18nJörg Mayer1-1/+1
svn path=/trunk/; revision=41392
2012-03-07From Joerg MayerAlexis La Goutte2-0/+9
Add i18n to Cmake svn path=/trunk/; revision=41390
2012-03-07Add i18n to QtSharkAlexis La Goutte13-23/+284
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-02-29Fix compile for QtShark (../../util.c => ../../ui/util.c)Alexis La Goutte1-1/+1
svn path=/trunk/; revision=41243
2012-02-17Start moving files to ui/ and ui/cli/Jörg Mayer1-1/+1
svn path=/trunk/; revision=41047
2012-02-08When building QtShark on Windows: Don't (re)compile Wireshark .c filesBill Meier1-45/+56
svn path=/trunk/; revision=40933
2012-02-04Add the magic incantation to get icons into the cmake build.Jörg Mayer1-0/+4
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-04Rename the binary Wireshark -> qtsharkJörg Mayer1-1/+1
svn path=/trunk/; revision=40832
2012-02-03Don't forget about the .qrc files.Jörg Mayer1-16/+19
There is nothing to install for the qt gui right now. svn path=/trunk/; revision=40826
2012-02-02Add a comment about automoc (but don't use it as this wouldJörg Mayer1-0/+5
force everyone to use a rather recent cmake). svn path=/trunk/; revision=40815
2012-02-02Fix make install for qtshark.Jörg Mayer1-2/+7
svn path=/trunk/; revision=40814
2012-02-02Make out-of-tree builds work.Jörg Mayer1-0/+5
svn path=/trunk/; revision=40809
2012-02-02- Move setting _U_ into config.h, becauseJörg Mayer1-41/+6
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-02Update svn:ignore for existing qtshark build processJörg Mayer1-0/+171
svn path=/trunk/; revision=40805
2012-02-01Fix some Windows qmake and Qt Wireshark build issues:Bill Meier1-44/+16
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-01Fix a typoBill Meier1-1/+1
svn path=/trunk/; revision=40795
2012-01-30Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.Bill Meier1-2/+13
svn path=/trunk/; revision=40781
2012-01-30Rework Windows Wireshark Qt build configuration a bit:Bill Meier1-1/+67
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-27FixAlexis La Goutte1-1/+1
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-25The proper scope / spec name for OS X is "macx".Gerald Combs1-2/+2
svn path=/trunk/; revision=40724
2012-01-25Put back an "explicit" for now. I'm not sure it's necessary but QtGerald Combs1-3/+3
Creator put it there as I recall. svn path=/trunk/; revision=40710
2012-01-25Add a comment discussing what it will take to have native file dialogsGerald Combs1-1/+25
on Windows and OS X. svn path=/trunk/; revision=40709
2012-01-24Compile PortAudio if it's available.Gerald Combs1-12/+35
svn path=/trunk/; revision=40708
2012-01-24Use wtap_get_file_extensions_list(), and prepare to useGuy Harris1-1/+83
wtap_get_savable_file_types(), in the Qt file dialogs. svn path=/trunk/; revision=40698
2012-01-21Fix -v for QtSharkAlexis La Goutte2-3/+64
./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-20Add more configuration information to config.pri which lets us removeGerald Combs1-14/+1
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-20Try copying our plugins to an accessible directory. This assumes you've setGerald Combs1-15/+23
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-20Remove or mark unused variables.Gerald Combs3-9/+14
svn path=/trunk/; revision=40599
2012-01-18Get rid of no-longer-applicable comments.Guy Harris1-8/+0
svn path=/trunk/; revision=40579
2012-01-18Get rid of some redeclarations, include "ui/recent_utils.h" to get thoseGuy Harris2-17/+1
declarations. svn path=/trunk/; revision=40578
2012-01-18Another fix for the move of recent.h.Guy Harris1-1/+1
svn path=/trunk/; revision=40577
2012-01-18Following the move of recent.*Alexis La Goutte1-6/+6
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-18Reflect the changes to make the recent-file code GUI-independent.Guy Harris5-16/+15
svn path=/trunk/; revision=40563
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 12:28:22 +0000