aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/main_statusbar.c
AgeCommit message (Collapse)AuthorFilesLines
2018-04-15Gtk: Remove source codeRoland Knall1-1138/+0
Removing all gtk source code, except for main.? which will remain for the official removal during SFUS18 Change-Id: I4273baf207df1eaaa4b94623cfd10bf74b1fc4a4 Reviewed-on: https://code.wireshark.org/review/26937 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-01-05Qt: Move sized toolbar images to stock_icons.Gerald Combs1-6/+6
The sized (WWxHH) icons in the toolbar directory aren't limited to toolbars. Create a "stock_icons" directory and move them and their related SVGs there. Change-Id: I2c1852499594aa738371c79542f24bd3351653bb Reviewed-on: https://code.wireshark.org/review/25133 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-08Have the frame_tvbuff.c routines not use the global cfile.Guy Harris1-0/+2
Have the routines that create them take a pointer to a struct packet_provider_data, store that in the tvbuff data, and use it to get the wtap from which packets are being read. While we're at it, don't include globals.h in any header files, and include it in source files iff the source file actually uses cfile. Add whatever includes that requires. Change-Id: I9f1ee391f951dc427ff62c80f67aa4877a37c229 Reviewed-on: https://code.wireshark.org/review/24733 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-17Rename section comment get/set routines.Guy Harris1-1/+1
Rename cf_read_shb_comment() to cf_read_section_comment(); an SHB is a record type in a particular capture file format (pcapng), and not all files that have per-file or per-file-section comments have something called a Section Header Block. Rename cf_update_capture_comment() to cf_update_section_comment(); pcapng, at least, supports multiple sections, although we don't curently support that. This also gives them matching names. Change-Id: Idd8cb0f0fd9125b9626411274aebfb1ec0097665 Reviewed-on: https://code.wireshark.org/review/22659 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-21Qt: Show merge progress.Gerald Combs1-0/+4
Add "file merge" callback plumbing. Use it to display "Merging files" in the main statusbar. Make sure we have a usable window pointer when we merge files. Change-Id: I236b6edb30685f0b06703ab8304bc88ae592f83c Reviewed-on: https://code.wireshark.org/review/19716 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-25Add GResource message to configure scriptJoão Valverde1-1/+1
Use more descriptive naming while at it. Change-Id: Ic89562cb9fa2cd5e315992f12ad9e46f2361da0b Reviewed-on: https://code.wireshark.org/review/14057 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-3/+3
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-19Add menu item for capture comment dialog in GTK+Dirk1-1/+1
Qt already has a menu item for this in Statistics -> Capture File Properties Bug: 9628 Change-Id: I85dd6f85d43fbfb60c2f4db82d9a02d91866127c Reviewed-on: https://code.wireshark.org/review/12725 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-12/+13
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: 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>
2015-10-05Move utf8_entities.h to wsutilJoão Valverde1-1/+1
Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 Reviewed-on: https://code.wireshark.org/review/10786 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>
2015-08-26Add missing callback support.Gerald Combs1-0/+4
Change-Id: I90838ccb701c93b11b216d0eb9973cbac8627129 Reviewed-on: https://code.wireshark.org/review/10270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-06Keep a captured-packet count in a capture_session and use that.Guy Harris1-3/+1
Have the count in a cfile_t structure always reflect the actual number of packets that have been read from the file, rather than, when doing a non-update-list-of-packets-in-real-time capture, falsely increasing the count in the cfile_t to reflect the number of packets captured but not yet read. Have the status bar base its captured-packet count on the count in the capture_session structure, and base the "sorry, no packets were captured" message on the count in the capture_session structure, as we're no longer using the count in the cfile_t structure to count anything in the process of a non-update-list-of-packets-in-real-time capture. That way, we preserve the invariant that the "frames" member of a cfile_t will be non-null if the "count" member is non-zero, fixing bug 6217. It also means we can get rid of cf_set_packet_count(), as we only set the count in the capture-file-reading code. Bug: 6217 Change-Id: I72c0e2c07c30782bad777995370b7c19e1460cc2 Reviewed-on: https://code.wireshark.org/review/7950 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-05Have a common routine for constructing strings listing interfaces.Guy Harris1-17/+1
We have a bunch of duplicated code to make those lists; make a common routine for that. (dumpcap currently doesn't use it, as the routine in question uses a routine in libui, which dumpcap doesn't use. We should probably fix that.) Change-Id: I9058bf3320d420b8713e90743618972da1d1c6ed Reviewed-on: https://code.wireshark.org/review/7934 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-05Give the welcome screen its own set of callbacks.Guy Harris1-5/+0
Don't have the status bar code know about the welcome screen; instead, give the welcome screen its own callbacks, so that it can modify the welcome screen as appropriate. Change-Id: Id38d66edeaea085f114b47d6361312450435b58a Reviewed-on: https://code.wireshark.org/review/7927 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-15ui/gtk/*.c: Add editor modelines; As needed: Fix indentationBill Meier1-0/+13
Change-Id: I8cd9d9fe5f12c284f46b8f725766f681faccd753 Reviewed-on: https://code.wireshark.org/review/7138 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-22Fix problem where the profile bar moves further left every time Wireshark isJeff Morriss1-16/+46
run. For the saved/restored geometry to be consistently correct we need to always show the expert info and capture file comment icons. Disable them if no capture file is open. Bug: 10518 Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c Reviewed-on: https://code.wireshark.org/review/5404 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-30Move capture.[ch] to libui.Guy Harris1-1/+1
Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0 Reviewed-on: https://code.wireshark.org/review/2711 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_session.h to capchild; what it declares is defined there.Guy Harris1-1/+1
Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002 Reviewed-on: https://code.wireshark.org/review/2709 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Move capture_ui_utils.[ch] to libui.Guy Harris1-1/+3
Change-Id: Id0f3d4d60a1acc7aa64fd3737b8f16df5bca4e5a Reviewed-on: https://code.wireshark.org/review/2708 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-11Migrate GTK icon handling to GTK 3.10 APIBalint Reczey1-1/+2
GtkStockItem usage is deprecated with all the GTK_STOCK_.* stock ids. We keep a stock id based approach but without relying on GTK's GtkStockItem system. We create our own internal stock ids for {icon, label} tuples and keep the original GTK stock id #define-s and values to preserve backward compatibility. Change-Id: Ia0b35a5903f079e92c8026e3df21bbf0be2d06b0 Reviewed-on: https://code.wireshark.org/review/302 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+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>
2013-11-17Move the epan/filesystem.c routines to wsutil; they're not specific toGuy Harris1-1/+1
packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-08-14Global variables considered harmful.Guy Harris1-1/+1
svn path=/trunk/; revision=51352
2013-05-22Pull the capture-session state information out of capture_opts and putGuy Harris1-22/+26
it into a separate capture_session structure. capture_opts should contain only user-specified option information (and stuff directly derived from it, such as the "capturing from a pipe" flag). svn path=/trunk/; revision=49493
2013-03-21From beroset:Bill Meier1-15/+15
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404 Note: The following parts of the patch had been previously done: asn1/snmp/packet-snmp-template.c epan/dissectors/packet-snmp.c epan/dissectors/packet-x11.c Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP' didn't compile and needed a few additional patches. svn path=/trunk/; revision=48447
2013-02-25it's ==> its & its ==> it's as needed.Bill Meier1-1/+1
In a few cases: Fix spelling; Clean up whitespace and formatting style. svn path=/trunk/; revision=47889
2013-02-20make function names consistentMartin Kaiser1-1/+1
edit_capture_dlg_launch() -> edit_capture_comment_dlg_launch() svn path=/trunk/; revision=47780
2013-02-20kill an "edit capture comment" popup if the underlying file is closedMartin Kaiser1-0/+2
(at the moment, the edit window remains open even if the file is closed or changed, this allows effectively to overwrite a file's capture commment with the capture comment of a previously used file) svn path=/trunk/; revision=47779
2012-10-10Add a format_size function similar to g_format_size that renders a sizeGerald Combs1-9/+4
value in a human-readable format. Use it in the welcome screen, status bar, and Win32 interface details. Note that in the welcome screen and status bar we've switched from customary binary prefixes to strict SI. svn path=/trunk/; revision=45453
2012-09-30use the correct status bar icon for the capture commentMartin Kaiser1-1/+2
if we have an empty capture comment (an existing comment was deleted), we should use the same icon as if no comment was present svn path=/trunk/; revision=45227
2012-09-30Add displayed and marked percent columns and percent calculations for ↵Chris Maynard1-5/+14
dropped and ignored packets in summary dialog. Also display percent calculations for displayed, marked, ignored and dropped packets in statusbar. Like ignored packets, only display marked packet count and percent in the statusbar if there are any. Fixes enhancement bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2377 svn path=/trunk/; revision=45226
2012-09-26Add a cf_cb_file_opened callback and use it instead of callingGerald Combs1-0/+2
fileset_file_opened directly from file.c. This makes the code a bit more consistenent and makes it easier to port the File Set dialog to Qt. svn path=/trunk/; revision=45162
2012-09-24allow setting a capture comment from the statusbar when a capture was startedMartin Kaiser1-0/+2
for the decision to allow input of a capture comment, we should make no difference between the statusbar icon and Statistics / Summary menu item svn path=/trunk/; revision=45108
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45016
2012-09-12Also disable the resize grip on the profile bar (as it is on the info andJeff Morriss1-0/+3
packets bars; this is for GTK < 3.0). This fixes the problem I had that the profile bar normally took up way too much (horizontal) room when I start Wireshark (causing the contents of the much more interesting packets bar to be truncated). svn path=/trunk/; revision=44885
2012-08-01Move utf8_entities.h to the "ui" directory. Separate packet informationGerald Combs1-4/+5
items with MIDDLE DOTs. svn path=/trunk/; revision=44194
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-05If we do a Save or Save As with a move, don't reread the capture file,Guy Harris1-0/+8
just tweak the elements in the capture_file structure as necessary and poke the UI to update stuff such as the windows title. If we do a Save or Save As with a copy, don't reread the capture file, just close the old wtap, open a wtap for the copy, and tweak the elements in the capture_file structure as necessary and poke the UI to update stuff such as the windows title. Otherwise, don't do a full read-and-dissect pass on the capture file, just close the old wtap, open a wtap for the new file, tweak the elements in the capture_file structure as necessary and poke the UI to update stuff such as the windows title, and rescan the file to update the packet offsets (and cause Wiretap to regenerate, for a gzipped file, the information needed to support fast random access to the gzipped file). This should speed up Save and Save As a bit, as well as removing some glitches in the UI (e.g., you won't see the packet list disappear and reappear). svn path=/trunk/; revision=43101
2012-06-05Distinguish between "failed" and "user stopped it" for "save as" andGuy Harris1-0/+50
"export specified packets". For "failed", let the user try again with a different file, in case it failed due to, for example, running out of space or quota (probably the most likely failure mode for writing, and trying to a different volume might be the best workaround). For "user stopped it", presumably they don't want to try again (the most likely reason is "it was taking too damn long"). Put "Exporting to: ...", not "Saving: ..." in the statusbar if we're doing "export specified packets". In process_specified_packets(), allow a null range pointer to be specified, meaning "save 'em all"; that avoids the possibly-expensive (with a large capture) operation of initializing the range. If a "safe save" atop an existing file fails or is stopped, get rid of the temporary file we created. svn path=/trunk/; revision=43095
2012-06-03g_filename_display_basename() returns a g_mallocated string, so itsGuy Harris1-2/+2
callers either need to free it or their callers need to free it or.... This means that cf_get_display_name() must always return a g_mallocated string and its callers or... must free it. For some of those callers, create a new set_window_title() routine to do the work - they're all using the same pattern. svn path=/trunk/; revision=43047
2012-06-03Use g_filename_display_basename() rather than get_basename() when we'reGuy Harris1-2/+2
getting the basename for display purposes, so it's converted from the GLib/GTK+ locale filename encoding to UTF-8. (For Windows, the locale filename encoding is UTF-8, and the internal encoding is UTF-16, so the file names should *probably* all be valid UTF-8 - Windows may not support invalid UTF-16 in file names. For Qt, I'm not sure whether the file dialogs ever return file names in some non-UTF-8 encoding.) svn path=/trunk/; revision=43044
2012-05-22The GUI's state machine requires that, when reloading a capture after aGuy Harris1-14/+9
save, we post capture file callback events similar to the ones posted when reading a capture - otherwise, the reload will leave the welcome screen up. Rename cf_cb_file_save_reload_finished to cf_cb_file_reload_finished, add a cf_cb_file_reload_started callback, have them work similarly to read_finished and read_started except that the reload uses "Reloading" in the progress bar and status bar. Clean up some indentation while we're at it. svn path=/trunk/; revision=42764
2012-04-21port gtk_scrollbar_new() gtk_paned_new() gtk_separator_new() to GTK2Anders Broman1-2/+2
svn path=/trunk/; revision=42186
2012-04-21Replace gtk_vbox_new() and gtk_hbox_new() with ws_gtk_box_new().Anders Broman1-1/+1
svn path=/trunk/; revision=42176
2012-03-13Add an explicit capture_cb_capture_failed indication for the case whereGuy Harris1-0/+17
we weren't even able to start a capture, rather than delivering a fake "capture start" indication and relying on a later "capture file closed" indication - for a capture that was never opened in the first place - to handle GUI cleanups. Don't deliver any GUI indications in cf_close() if we didn't have a capture file open in the first place. Clear the status bar and welcome header if that indication is delivered. If we start a capture from the command line with the -k flag, don't show the captured packet information unless the capture actually starts. svn path=/trunk/; revision=41521
2012-03-11Add a comments LEDAnders Broman1-1/+14
svn path=/trunk/; revision=41487
2012-03-10Replace 4-space tabs (and one 8-space tab, the only remaining tab in theGuy Harris1-8/+8
file after replacing the 4-space tabs) with spaces. svn path=/trunk/; revision=41457
2012-03-08Update the comment icons and tooltips.Gerald Combs1-3/+3
svn path=/trunk/; revision=41440
2012-03-08Don't show expert info or comments icons unless we have a file loadedAnders Broman1-3/+5
svn path=/trunk/; revision=41423
2012-03-07Update and add icons for capture comments / annotations.Gerald Combs1-15/+16
svn path=/trunk/; revision=41406
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 01:44:27 +0000