summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2015-11-12Qt: save preferences after creating a filter from expression framePascal Quantin1-0/+2
Bug: 11690 Change-Id: Ice6a2341d3f39c107a3c9d6a0e23fd98312b48a8 Reviewed-on: https://code.wireshark.org/review/11748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c712d65e919cea6fde7b95ffd4a821c137d84703) Reviewed-on: https://code.wireshark.org/review/11760
2015-11-12Qt: Added IO Graph save to clipboard button.Stig Bjørlykke2-5/+72
Also added save as CSV file. Do not add double quotes for values as we do in GTK. Change-Id: I8576a73e10b71cdba0c8c80db8b21927d19528da Reviewed-on: https://code.wireshark.org/review/11732 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 864872ed618e3c2853728f872cce6cf6282c617d) Reviewed-on: https://code.wireshark.org/review/11759
2015-11-12Add wtap_dump_open_tempfile routines, to write to a temporary file.Guy Harris3-25/+18
It includes the temporary-file generation, so you don't have to do it yourself. Change-Id: I0798df95a5c5646224ec49612f50b423ed78547a Reviewed-on: https://code.wireshark.org/review/11751 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 75dc2051e861294a0e75955e896de7494f086b42) Reviewed-on: https://code.wireshark.org/review/11752
2015-11-11Qt: fix cursor position when editing coloring rules names or filtersPascal Quantin2-12/+0
A call to setText will set the cursor to the end of the box. As far as I can tell, this call is useless so let's remove it. Bug: 11689 Change-Id: I40aee48745a9107331a017070a715a075106974a Reviewed-on: https://code.wireshark.org/review/11727 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit ca2ecc124144dfd7273213232b585808dc8a06a5) Reviewed-on: https://code.wireshark.org/review/11746
2015-11-11Update translations for 2.0.0rc3.Gerald Combs9-1617/+1831
Change-Id: I23979f8e4c214679c6c3f610445c932d977121cf Reviewed-on: https://code.wireshark.org/review/11742 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-11Qt: fix profile renamePascal Quantin1-0/+1
Bug: 11658 Change-Id: I271863557d13137d168e12d3c393de49823f288a Reviewed-on: https://code.wireshark.org/review/11708 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 328fbc001e89d2daaca343c378744e75e0a107fb) Reviewed-on: https://code.wireshark.org/review/11725
2015-11-11Qt: fixes to 'Edit Column' dialogPascal Quantin2-11/+34
- set field name and occurrence when editing a custom column - convert occurrence number to a QString - disable OK button when syntax is incorrect or empty for a custom column - update syntax state when opening the edit dialog or when switching between custom and normal column Bug: 11433 Change-Id: Ia8424474dd250c78a0b503e0e9d89c322f4f86a9 Reviewed-on: https://code.wireshark.org/review/11705 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit a4981a279a616c7dfc9a0887ba8511851cc8ec22) Reviewed-on: https://code.wireshark.org/review/11724
2015-11-11Qt: Freeze+thaw the main window during nested operations.Gerald Combs3-14/+75
As noted in main_window.cpp: // Our event loop becomes nested whenever we call update_progress_dlg, which // includes several places in file.c. The GTK+ UI stays out of trouble by // showing a modal progress dialog. We attempt to do the equivalent below by // disabling parts of the main window. At a minumum the ProgressFrame in the // main status bar must remain accessible. Move the freeze+thaw code from captureFileRetapStarted and captureFileRetapFinished to its own set of member functions. Call them when we {,un}mark and {,un}ignore packets and note that we should probably call them elsewhere. Disable mark and ignore actions when we freeze and restore their states when we thaw. Bug: 11681 Change-Id: I6f015f7f5f6c98cd48ace2c87f43f48efe51a88b Reviewed-on: https://code.wireshark.org/review/11690 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 757fe65474a37d94e7eba1b6b4bb6df23b69ba56) Reviewed-on: https://code.wireshark.org/review/11722
2015-11-10Apple calls it just "OS X" these days.Guy Harris1-2/+2
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 0b05086754ad977d639ed7715a34b57b5e0ee28e) Reviewed-on: https://code.wireshark.org/review/11704
2015-11-08Qt: Start adjusting icon sizes dynamically.Gerald Combs1-5/+7
In the main toolbar get our initial icon size using the PM_SmallIconSize pixel metric. On Windows this varies directly with the system text magnification setting. Pinging bug 11675 since we still need to adjust the icon sizes in the filter edits, progress frame, status bar, and likely other places. Ping-Bug: 11675 Change-Id: I53a78627ce850bd6dbd4628da481badee63a1208 Reviewed-on: https://code.wireshark.org/review/11605 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 47172e7d51c858de60b65f8793be5a087eeff1f8) Reviewed-on: https://code.wireshark.org/review/11646
2015-11-08[Automatic update for 2015-11-08]Gerald Combs13-3138/+3140
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id8f2e56faef5aed977402549e038344fce8780b0 Reviewed-on: https://code.wireshark.org/review/11644 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-06Make rect_on_screen Qt4-compatible.Gerald Combs2-5/+6
Use QDesktopWidget instead of QGuiApplication + QScreen. The former exists in the Qt 4 API. Ping-Bug: 11568 Change-Id: Icfbe9f78659b28efbc86061f94d946f70ab6dc41 Reviewed-on: https://code.wireshark.org/review/11604 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 3b125e7aefee18a4d07bfc2fd76a3524c169bf3c) Reviewed-on: https://code.wireshark.org/review/11613
2015-11-05Qt: Check for a sane window geometry.Gerald Combs3-5/+33
On Windows (and probably X11) it's possible to set an offscreen window geometry. Add a rect_on_screen function to qt_ui_utils and use it as a sanity check in MainWindow::loadWindowGeometry. If this doesn't work well (e.g. if we end up with dueling Qt and GTK+ geometries) we might want to create separate Qt and GTK+ preferences. Bug: 11568 Change-Id: Icde1181671770356e87f07d584894ec3148e1bd2 Reviewed-on: https://code.wireshark.org/review/11584 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit d02104c9a61c353ce6ed54c6ca6207ed3a1fcdf0) Reviewed-on: https://code.wireshark.org/review/11588
2015-11-04Activate word wrap for hintLabel defined as QLabelPascal Quantin18-0/+59
Without this, a long hint string (like a wrong protocol name in the SSL UAT preference) will resize the window to match the string. With this change, instead the hintLabel string is continuing on a new line to match currently configured window size Change-Id: Ib8fcc7bd96585717f122b0921165c4d916442cb0 Reviewed-on: https://code.wireshark.org/review/11529 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit ccca843a57d6f23c7da682f4b7d3286a69590eee) Reviewed-on: https://code.wireshark.org/review/11550
2015-11-03Qt: Turn off WindowModified when closing a file.Stig Bjørlykke1-0/+1
When closing a capture file the main window will never be modified, so ensure we turn this off when the file is closed. Change-Id: I3e6a62c931330a75d32f46fc32524d8de8734485 Reviewed-on: https://code.wireshark.org/review/11497 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> (cherry picked from commit 86320fdee663243060b8d0416fe630ad1f3d9078) Reviewed-on: https://code.wireshark.org/review/11532
2015-11-03[Qt recent files menu] make sure that the "Clear Menu" item is retranslatedMartin Kaiser1-0/+2
this item is created along with the list of recent files it looks like our only option to update its translation is to rebuild the list of recent files Change-Id: If740571fb9c939d65ca4f1f432aadf22c38dcb27 Reviewed-on: https://code.wireshark.org/review/11462 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit eafc94c9acf7dadd1a10f3effdae8249dfd53109) Reviewed-on: https://code.wireshark.org/review/11518
2015-11-01Disable RTP player debug logs that were presumably left activated by mistakePascal Quantin1-1/+1
Change-Id: Ieeca052bba14735447cdd6e53de8ed7cda69a27f Reviewed-on: https://code.wireshark.org/review/11480 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit a4a5f2d0f0e993d4352e7db39a53407ab8985265) Reviewed-on: https://code.wireshark.org/review/11482
2015-11-01[Automatic update for 2015-11-01]Gerald Combs13-5845/+6414
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I7dfeccd0a771b477e42b7bc37e25d3660ad2cf74 Reviewed-on: https://code.wireshark.org/review/11478 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-01Qt: do not draw sequence analysis items with a display status set to falsePascal Quantin1-8/+10
Change-Id: Ieff9d6838fcf5329c16df8b7d6367a4c6c3a5ee5 Reviewed-on: https://code.wireshark.org/review/11467 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 16f5b1138941b8f52bfff1eeffcf3e94059599ff) Reviewed-on: https://code.wireshark.org/review/11475
2015-11-01VoIP Calls: fix SIP calls statePascal Quantin1-2/+0
A request other than INVITE (like ACK for example) is not a call setup Change-Id: I2e78ed0163822a278b82e250e78aa91e673404cf Reviewed-on: https://code.wireshark.org/review/11466 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 9df0b8f52567b825f2d07d2f872ba8f5ff812602) Reviewed-on: https://code.wireshark.org/review/11474
2015-11-01voip_calls.c: add missing tap_draw callback to taps asking for a redrawPascal Quantin1-22/+200
Otherwise the GUI does not get populated properly Change-Id: I5e24ac5ab2909f3200c588405dbdc9c6bbb82a73 Reviewed-on: https://code.wireshark.org/review/11465 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit adc7bfe71d3b783301b3e86f86ecb096e7be2af9) Reviewed-on: https://code.wireshark.org/review/11473
2015-10-29Qt: Allow Expert Information retapping.Gerald Combs2-21/+39
The Expert Information dialog is open-ended. It adds a tap listener but doesn't remove it, which is useful during live captures. Make sure we add our second-level tree items each time taps are drawn and when tapping is finished. Change-Id: Ie06d60512644e540172f1b330b631db4e4e86897 Bug: 11644 Reviewed-on: https://code.wireshark.org/review/11407 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit db760bf52eafe728ab9be0e40760cda5e536572b) Reviewed-on: https://code.wireshark.org/review/11416
2015-10-29Update the taskbar icon when we start a capture.Gerald Combs2-0/+6
Call both QMainWindow::setWindowIcon and QGuiApplication::setWindowIcon when we switch between normal and capture icons. The former sets the window title bar icon and the latter (depending on your OS and Qt version) sets the taskbar or dock icon. Change-Id: Ida523d423bef4df44696f6cd75208986c8787d0f Reviewed-on: https://code.wireshark.org/review/11414 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 81bf8edc52f1c8df557bbf4102182bcae93e0a4d) Reviewed-on: https://code.wireshark.org/review/11417
2015-10-29Qt: Add the ability to add filter expressions.Gerald Combs11-9/+397
Add a "+" icon to the display filter toolbar which allows the addition of a new filter expression button. (Hopefully this will be the last main window UI change before 2.0.) Change-Id: I52bf56bf699dddb7b387b9f4de1bf8b35eb3c4ce Reviewed-on: https://code.wireshark.org/review/11375 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit f449dcd8a590416aa33e5314f3db2bfc00134e9c) Reviewed-on: https://code.wireshark.org/review/11415
2015-10-29Move the definition of MAX_NUM_COLOR_CONVERSATION_COLORS.Guy Harris1-0/+2
It's only used by the GTK+ main menubar code, so put it there. I guess the Qt UI either doesn't have such a limit or defines it itself. Change-Id: I221be506ac40eee33514301db737ef7e22deb7a6 Reviewed-on: https://code.wireshark.org/review/11385 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 2e24cb77242e4cedbbf340d2920969a646bdeaca) Reviewed-on: https://code.wireshark.org/review/11386
2015-10-29"Color dissector filters" are just filters.Guy Harris2-86/+72
Rename the color_dissector_filters.[ch] files to just dissector_filters.[ch], and rename the routines not to include the string "color_", as those filters can be used as color filters *or* display filters. Remove "color_" from other places where we're not doing colorization. In the GTK+ code, combine the two loops that add menu items for filters in the dissector-provided filters list into one. Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c Reviewed-on: https://code.wireshark.org/review/11379 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit a8a4098e12b1b60548ce1a1887b2a18a54ef790f) Reviewed-on: https://code.wireshark.org/review/11380
2015-10-28Qt: initialize all UAT fields when creating a new linePascal Quantin1-1/+8
Otherwise it can trigger a crash when calling the callback while some fields have a NULL pointer (SSL post_update_cb for example) Change-Id: I25ac97d8e0bbf47e737f74029715358cb29cfb3d Reviewed-on: https://code.wireshark.org/review/11334 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit 4c69f10aa42070616b92886f104f5a16eb88f00c) Reviewed-on: https://code.wireshark.org/review/11357
2015-10-28Qt: Protect against unintentional "no capture file" window statusMichal Labedzki19-6/+45
If capture file was closed and we have some WiresharkDialogs opened, then we still need to know filename of capture file related to specific dialog. Change-Id: I15f0e5176b87713bf747eead64021619d0bdf039 Reviewed-on: https://code.wireshark.org/review/11025 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 78978ec63fc09c644131ce2472eec5fcf405b588) Reviewed-on: https://code.wireshark.org/review/11350 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28Qt: Add another missing #include <algorithm>Michal Labedzki1-0/+1
It seems that sme (for example: my...) configurations need it to build Wireshark. Change-Id: I3d4c8c84d705fd0b99b100b1e2173819f62936d9 Reviewed-on: https://code.wireshark.org/review/11024 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> (cherry picked from commit db687365c5da83612d75d727750e5697a947c59b) Reviewed-on: https://code.wireshark.org/review/11328 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28Qt/Bluetooth: Disable go to packet for closed filesMichal Labedzki3-3/+12
Go to packet on close files is not valid (for currently open one). Disable it. Change-Id: Ib7b65c9ea7e94857692c8ac5ddd3971c52ac717f Reviewed-on: https://code.wireshark.org/review/11023 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit cd5706cb56b30b3c38f2a986732b0bd0f9d47ce8) Reviewed-on: https://code.wireshark.org/review/11327 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28Qt: Add "Bluetooth" prefix for Bluetooth item in Wireless menuMichal Labedzki3-14/+14
Now Bluetooth menu is named Wireless, so add Bluetooth prefix to distinguish them. Change-Id: I7a3d1b73e0e5fd5e3cc9b1b13d0cb9a32868a8be Reviewed-on: https://code.wireshark.org/review/10525 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit dae1286270af8cc9f6839e82102fa7433ac7acb4) Reviewed-on: https://code.wireshark.org/review/11326 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-27Add preferences for related packets and the scroll bar minimap.Gerald Combs3-12/+35
Add gui.packet_list_show_related and gui.packet_list_show_minimap. Show_related enables and disables the related packet delegate. Show_minimap enables and disables the minimap. Start calling it the "intelligent scroll bar" since that's the best suggestion for a name I've seen so far. Leave them out of the Appearance preference pane for now. Change-Id: I5869c446fda5c8e62d6b1e49a74d63ba3b117b0f Reviewed-on: https://code.wireshark.org/review/11332 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 9f8d00c1741604ae6ad53e2f27e2686e1df10cc3) Reviewed-on: https://code.wireshark.org/review/11337
2015-10-27Qt: Add a filter expression item to the display filter edit menu.Gerald Combs6-4/+17
Add an item to the display filter bookmark menu which opens the filter expression preferences. We also need an expression editor frame similar to the column editor frame, but hopefully this will suffice until that exists. Change-Id: If4c159bb769f0f8e7f89db55f1c6fd7c0bf65c87 Reviewed-on: https://code.wireshark.org/review/11315 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit e70a23f49d79ec2c6a9db25409de052d64c2ed36) Reviewed-on: https://code.wireshark.org/review/11322
2015-10-27Add jitter logic to RtpAudioStream.Gerald Combs6-45/+354
Copy the jitter logic from rtp_player.c to rtp_audio_stream.cpp. This still isn't correct but the RTP player should now be complete enough to start looking at the bug list at the top of rtp_player_dialog.cpp. Disable timing and jitter controls while we're playing while we're here. Fixes bug 11635. Bug: 11635 Change-Id: Ie583ade522702cbe1bbcea4475a535caa1d74fa2 Reviewed-on: https://code.wireshark.org/review/11295 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 2ccb9d2d957a6c118c00a193d0fbe19712153208) Reviewed-on: https://code.wireshark.org/review/11320
2015-10-27qt: add missing initializers (CID 1325722)Dario Lombardo1-1/+3
Change-Id: Ie1ed72fe2efe31db1ce5b73ac6e659ba305f4001 Reviewed-on: https://code.wireshark.org/review/10961 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit f6d61ebfe8bd4c384366512bb05f33279a6f03d9) Reviewed-on: https://code.wireshark.org/review/11319 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-27Convert SIP statistics to the stat tap API.Gerald Combs5-708/+1
It looks like this one fell through the cracks because it dynamically registered itself via register_tap_listener_gtksipstat and wasn't listed in the "/Telephony/" path in main_menubar.c. Ping-Bug: 11638 Change-Id: I4c82b36d204207c81e82a19efce98b6a091351ca Reviewed-on: https://code.wireshark.org/review/11293 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 08e44b8b43ad4234a93b8feaa8e8174373188080) Reviewed-on: https://code.wireshark.org/review/11311
2015-10-27Replace all "dissector filter" registrations with "dissector color filter" ↵Michael Mann1-12/+13
registration. In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}). Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt. Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483 Reviewed-on: https://code.wireshark.org/review/11263 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 616dbd78d6afc4f8825ce159de23b19752859605) Reviewed-on: https://code.wireshark.org/review/11304
2015-10-27Only store frame number and not a pointer to frame_data structure in ↵Pascal Quantin12-42/+45
seq_analysis_item_t Qt GUI allows to keep windows open after closing the capture file. Let's not access to freed memory. Bug: 11573 Change-Id: I9e70d818a4b228af319961ec512b6b9725792477 Reviewed-on: https://code.wireshark.org/review/11270 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 1ea43c26e68d92838a7d91dce4fe9686b09f12c7) Conflicts: ui/gtk/lbm_uimflow_dlg.c ui/qt/lbm_uimflow_dialog.cpp ui/voip_calls.c Reviewed-on: https://code.wireshark.org/review/11303 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-26Qt: fix memory leaks in VoIP calls windowPascal Quantin2-8/+10
- Add free of h245_labels to voip_calls_remove_all_tap_listeners() so that memory is not leaked with Qt GUI - Call voip_calls_reset_all_taps() from VoipCallsDialog destructor so as to free allocated memory Change-Id: I46945b5d475d8c1267819021a4ed2782c531a0c6 Reviewed-on: https://code.wireshark.org/review/11268 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit e2203f5aed1eef900c7568b6d14f3e303e271b7c) Reviewed-on: https://code.wireshark.org/review/11281
2015-10-26Don't use the non-existent decoded data if decode_rtp_packet() returns 0.Guy Harris1-3/+4
Just skip that packet. Otherwise, it crashes. Fix file name in the introductory comment while we're at it. Change-Id: I286f4303a4ec152c0d00c5135395c1608bf2121a Reviewed-on: https://code.wireshark.org/review/11279 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 4ce9655658d9546ba7459aa80ff9a6be1381708e) Reviewed-on: https://code.wireshark.org/review/11280
2015-10-26Allocate h245_labels when we initialize the h245dg tap.Guy Harris1-0/+6
Otherwise, it might not exist at the time we try to use it. (Yes, reproducible if you download https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=h223-over-rtp.pcap.gz load it into Wireshark and, at least in the Qt UI, select Telephony -> VoIP Calls - crashes every time on my Mac running Yosemite.) Change-Id: Iacf5b8ef7fb5749dabeb5fc33d3494b5fc073c03 Reviewed-on: https://code.wireshark.org/review/11277 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit fb72cad4e87e1ed37c6e0624a5c7c75bba6ee394) Reviewed-on: https://code.wireshark.org/review/11278
2015-10-25[Automatic update for 2015-10-25]Gerald Combs13-1522/+1592
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I162b33e3b9a616376b1893d008b07194a5c55676 Reviewed-on: https://code.wireshark.org/review/11265 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-23Qt: Explicitly set the byte view painter font.Gerald Combs1-2/+1
Set the painter font at the beginning of each paintEvent. It looks like we either aren't calling setFont at the right time or the QAbstractScrollArea viewport sometimes ignores its parent font. Bug: 11594 Change-Id: Id4484f6b990be112bbc5728d5ad0e31a74a60201 Reviewed-on: https://code.wireshark.org/review/11231 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 8e8db9b917e1ad9cdfeca0fd92bc864fbd94fd1e) Reviewed-on: https://code.wireshark.org/review/11233
2015-10-23Fix some copy+pasted tooltip text.Gerald Combs2-6/+6
Change-Id: I782cc60b33639ad8b8b403db7094d9568e6cfc59 Reviewed-on: https://code.wireshark.org/review/11227 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 2d065bcd52de7e4fa8616e4ad719c585073111d0) Reviewed-on: https://code.wireshark.org/review/11228
2015-10-21RtpAudioStream: Add a cast.Gerald Combs1-1/+1
Change-Id: I45d353ad900dee062775408f12d58ebb43793219 Reviewed-on: https://code.wireshark.org/review/11203 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit b7de996684891c4d0584f78241d814de26509f44) Reviewed-on: https://code.wireshark.org/review/11204
2015-10-21Qt: Wire up the RTP Streams "Analyze" button.Gerald Combs4-177/+271
Change-Id: I0ad5d689b6c05fd3f98ba3304a5d99297db2bd6c Reviewed-on: https://code.wireshark.org/review/11198 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 18bec424fb1c1404370f2fbe35bebcf5ab2eb2af) Reviewed-on: https://code.wireshark.org/review/11202
2015-10-21Split RTP player tapping, decoding, and plotting.Gerald Combs7-123/+165
In RtpAudioStream split tapping+decoding into separate member functions. Store RTP payloads in memory. In RtpPlayerDialog split tapping+plotting. This more closely resembles what we're doing in the GTK+ UI and paves the way for jitter support and other changes. Change-Id: I244c225cec8930545622e6582b7be35ebe45b237 Reviewed-on: https://code.wireshark.org/review/11195 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 8682eb49ef9e865be114ac57525628527bad1bd6) Reviewed-on: https://code.wireshark.org/review/11197
2015-10-19Qt: fix time shiftGerald Combs7-7/+37
Add a timeShifted signal to TimeShiftDialog and use it to update the packet list and model. Add drawCurrentPacket to PacketList so that we can do a more thorough job of redrawing the current packet and tree. Bug: 11575 Change-Id: I960d8cdbf6872e3f71007cb4d2bbd5457f268257 Reviewed-on: https://code.wireshark.org/review/11068 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit a0113a5eb3329b815e1790f8dc42c48fa6ffbcd7) Reviewed-on: https://code.wireshark.org/review/11153
2015-10-19Add a margin to the main statusbar layout.Gerald Combs1-3/+4
Add a margin between the left edge of the window and the expert icon. This makes it easier to distinguish between clicking on the expert icon and resizing the window, at least on OS X. Change-Id: Ibe20f3112862dc72f3be5d31f50656d081bbc110 Reviewed-on: https://code.wireshark.org/review/11151 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 6f9801a6279f01ec004f1796bc2fd9d8f1110a99) Reviewed-on: https://code.wireshark.org/review/11152
2015-10-18[Automatic update for 2015-10-18]Gerald Combs13-1586/+3907
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I967c18b647cc1aed29a90ee80f9a83d0bb4935a3 Reviewed-on: https://code.wireshark.org/review/11130 Reviewed-by: Gerald Combs <gerald@wireshark.org>