aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
AgeCommit message (Collapse)AuthorFilesLines
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte140-280/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-01Fix some scan-build warnings.Gerald Combs3-2/+3
Fix a modeline while we're at it. Change-Id: Ief6d5edbe33456170059cfab4f436f0844de32a1 Reviewed-on: https://code.wireshark.org/review/440 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25Get Windows build working again.Gerald Combs2-2/+3
Change 16 / g579e7e1 introduced a breaking change in capture_file_dialog.cpp on Windows. This works around the problem temporarily until we come up with a proper fix. Fix a Q_OS_WIN check while we're at it. Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb Reviewed-on: https://code.wireshark.org/review/396 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25Remove trailing whitespaceBill Meier23-36/+36
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki5-7/+25
The best heuristic can fail, so add possibility to manually choose capture file format type, so not correctly recognize file format can be loaded in Wireshark. On the other side now it is possible to open capture file as file format to be dissected. Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a Reviewed-on: https://code.wireshark.org/review/16 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-24Fix Called C++ object pointer is null found by ClangAlexis La Goutte1-1/+1
Change-Id: I2263b4ac16945be6d87eaa8c963f7b03e437d724 Reviewed-on: https://code.wireshark.org/review/319 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-20Limit the range to the TSNs provided.Irene Rüngeler1-4/+6
Change-Id: Ibf72fb60d06baa7a9590a303f2e10e5a86c61093 Reviewed-on: https://code.wireshark.org/review/254 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-02-17<Ctrl>R to restart does not work [Wireshark Qt]Alexis La Goutte2-9/+11
From me : Add reload action Change-Id: Ic47e3ff1ae0c1cc0ae8c40e5019dea9906612f90 Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/238 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17On 'You have unsaved packets' dialog, expected D or <Alt>D to use as ↵Alexis La Goutte1-2/+4
accelerator to discard and S or <Alt>S of save [Wireshark Qt]. From me : Add window title and fix missing text (Do you want to ....) Change-Id: I1448d7b85ad9490a92dac7e89d9fd2fdb51a145e Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/239 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17Menu cannot be reached using accelerators, for example <Alt-F> does not open ↵Alexis La Goutte1-0/+5
File [Wireshark Qt]. Change-Id: I8a67d435510d5604bb501872f264cce4ba23595d Partial-Bug: 9003 Reviewed-on: https://code.wireshark.org/review/237 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Stack overflow after selecting data when filter is applied that has no ↵Alexis La Goutte1-1/+1
results (Wireshark Qt) Fix 0x00000000004a480e in PacketList::contextMenuEvent (this=0xbbb460, event=0x7fffffffd270) at ui/qt/packet_list.cpp:485 485 if (cap_file_->edt->pi.ipproto == IP_PROTO_SCTP) Closed-bug : 9769 Change-Id: I1a657d7208a10c829b2dfe90abb168eff93cd268 Reviewed-on: https://code.wireshark.org/review/224 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-13About box: make sure we read AUTHORS-SHORT as UTF-8.Gerald Combs1-0/+5
Use the application monospace font for the "Authors" and "License" tabs similar to the GTK+ UI. Change-Id: Ibca481562d7a9957ce603441c1e98b564e5bf389 Reviewed-on: https://code.wireshark.org/review/194 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-11Fix a Qt version comparison.Gerald Combs1-2/+2
Change-Id: I7df90d53a2d8f29042994bd0c2bc7bf4450fab10 Reviewed-on: https://code.wireshark.org/review/177 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-11Statistics->Flow Graph in qtshark crashes with a segfaultDavid Ameiss1-5/+10
What appears to be happening is SequenceDiagram::draw() is iterating over the stored seq_analysis_item_t elements - but at the same time SequenceDialog::fillDiagram() is running - which destroys the old seq_analysis_info_t (which SequenceDiagram has stored a copy of and is referencing items in the list) then reloads it. I'll attach a patch to SequenceDialog::fillDiagram() which fixes the problem - essentially calling sequence_analysis_list_get() with a new seq_analysis_info_t, calling SequenceDialog::setData() with the new one, then destroying the current seq_analysis_info_t and replacing it with the new on Change-Id: I14f7b5dc64018ba5b81fe8d874a701e021401859 Closed-bug:9506 Reviewed-on: https://code.wireshark.org/review/175 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10Qt 5.2.1 for Mac has QtMacExtras but not QMacNativeToolBar.Gerald Combs1-2/+2
Change-Id: I55e68a7fd84d36b50e6084cd82b51df7c91c6476 Reviewed-on: https://code.wireshark.org/review/159 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs3-6/+6
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-29Merge "Apply layouts in Qt Creator. Fix a tooltip."Alexis La Goutte1-229/+211
2014-01-26lupdate / lrelease ui/qt/Qtshark.proAlexis La Goutte7-843/+16790
svn path=/trunk/; revision=54968
2014-01-26Fix indent (Use 4 spaces) and add modelinesAlexis La Goutte2-70/+96
svn path=/trunk/; revision=54964
2014-01-20Fix typo (only need one comma)Alexis La Goutte1-1/+1
svn path=/trunk/; revision=54852
2014-01-17Apply layouts in Qt Creator. Fix a tooltip.Gerald Combs1-229/+211
Change-Id: I02759cb83ef970395a80acaafb9a28c630000000
2014-01-14Fix typo (Direcly => Directly)Alexis La Goutte1-2/+2
svn path=/trunk/; revision=54804
2014-01-14Make a routine not used outside this file static.Guy Harris1-3/+3
svn path=/trunk/; revision=54746
2014-01-14In a source file that defines external functions, the header file thatGuy Harris1-0/+2
declares the functions must be included, in order to make sure the declarations match the function signature. Make it so. svn path=/trunk/; revision=54745
2014-01-14Include ui/progress_dlg.h to get the declaration ofGuy Harris1-0/+2
delayed_create_progress_dlg(). svn path=/trunk/; revision=54744
2014-01-14#if 0 out an unused routine.Guy Harris1-0/+2
svn path=/trunk/; revision=54743
2014-01-11Remove (ugly) hack in about_dialog.cpp (include main.cpp to have function to ↵Alexis La Goutte2-13/+5
set comp_info_str and runtime_info_str variable) Now About Dialog is start after main() and variables is set by main(), only extern variable in wireshark_applicatin.h svn path=/trunk/; revision=54696
2014-01-08Don't create About window when Wireshark Qt startAlexis La Goutte2-7/+6
svn path=/trunk/; revision=54662
2014-01-07Remove svn:executable attribute.Jakub Zawadzki2-0/+0
svn path=/trunk/; revision=54637
2014-01-07include config.h at the top of the file.Jörg Mayer2-2/+5
A used parameter was marked unused. svn path=/trunk/; revision=54629
2014-01-05Fix indent (use 4 spaces)Alexis La Goutte1-22/+22
svn path=/trunk/; revision=54612
2014-01-04Add tooltips for the total number of streams.Gerald Combs3-8/+21
svn path=/trunk/; revision=54585
2014-01-03Update NEWS and Release noteAlexis La Goutte1-10/+6
Revert part of last commit about AUTHORS-SHORT in Windows.... svn path=/trunk/; revision=54577
2014-01-02It is AUTHORS-SHORT.txt in WindowsAlexis La Goutte2-18/+24
Kept comment about dev release (and change logo) Use the some order like Wireshark GTK (Authors before Folders) svn path=/trunk/; revision=54569
2014-01-02Fix wireshark-qt startup coredump under autofoo and Windows: make cmake'sJeff Morriss1-8/+2
VERSION_* macros integers instead of numbers (and treat them as such in ui/qt/about_dialog.cpp). svn path=/trunk/; revision=54563
2014-01-02Add About window for Wireshark QtAlexis La Goutte10-6/+680
svn path=/trunk/; revision=54557
2014-01-02Fix icon in top of Wireshark Qt main windowAlexis La Goutte1-14/+5
svn path=/trunk/; revision=54556
2014-01-02Fix indent always use tabAlexis La Goutte1-215/+215
svn path=/trunk/; revision=54553
2013-12-24add ssl detection to proto_get_frame_protocols()Martin Kaiser4-4/+4
svn path=/trunk/; revision=54439
2013-12-23From Ville Skyttä: Spelling FixesBill Meier6-11/+11
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 svn path=/trunk/; revision=54387
2013-12-21Argh, fix include.Jakub Zawadzki1-1/+1
I start thinking about compiling (read: installing) Qt... svn path=/trunk/; revision=54339
2013-12-21fix warnings.Jakub Zawadzki4-1/+5
svn path=/trunk/; revision=54338
2013-12-21missing includeJakub Zawadzki1-0/+1
svn path=/trunk/; revision=54336
2013-12-19Rename a couple of to_str functions to have ep_ in the name. This makes itEvan Huus1-1/+1
obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249
2013-12-18Add 'Filter Association' to context menu in packet list.Irene Rüngeler10-10/+48
svn path=/trunk/; revision=54219
2013-12-18Ignore the first line of the chunk statistics file.Irene Rüngeler2-21/+8
svn path=/trunk/; revision=54210
2013-12-18Translate a little leftover German to English.Jeff Morriss1-3/+3
svn path=/trunk/; revision=54208
2013-12-17Make Ubuntu Buildbot happyAlexis La Goutte1-1/+1
Fix following error: ../../../ui/qt/sctp_chunk_statistics_dialog.cpp: In member function ‘void SCTPChunkStatisticsDialog::fillTable(bool)’: ../../../ui/qt/sctp_chunk_statistics_dialog.cpp:145:29: error: ignoring return value of ‘char* fgets(char*, int, FILE*)’, declared with attribute warn_unused_result [-Werror=unused-result] svn path=/trunk/; revision=54188
2013-12-17Make translatable ready SCTP Graph for QtAlexis La Goutte5-50/+50
svn path=/trunk/; revision=54170
2013-12-17Find the right frame when plottable was clicked.Irene Rüngeler4-35/+59
svn path=/trunk/; revision=54167