Commit Graph

41 Commits

Author SHA1 Message Date
Michael Tüxen 421dafd2de Get rid of old non-interface specific settings which are now interface
specifc. This finalizes the change of the infrastructure.
This patch is based on work by Irene Ruengeler.

svn path=/trunk/; revision=37794
2011-06-27 00:09:03 +00:00
Michael Tüxen c6c2577bbc Fix the capturing from the GUI. Honor the iface variable.
The next step is to retire the iface variable and use
the ifaces array only. This should simplify things and
fix the cases, where you start wireshark with command
line arguments and also use the GUI.

svn path=/trunk/; revision=37342
2011-05-21 13:22:38 +00:00
Michael Tüxen 8b701e108a In case we have no interface information in the array, use the global value.
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5935.

svn path=/trunk/; revision=37307
2011-05-19 20:20:35 +00:00
Michael Tüxen 79f53d1fdc When capturing from multiple interface, indicate this in the main status bar.
This patch is, as all other patches related to capturing from multiple interfaces,
based on work of Irene Ruengeler.

svn path=/trunk/; revision=37296
2011-05-19 16:11:02 +00:00
Stig Bjørlykke 0220f5d8ee More packets_bar_update improvements.
svn path=/trunk/; revision=37134
2011-05-13 21:49:35 +00:00
Stig Bjørlykke d631023f4f Simplified string handling in packets_bar_update to use GString.
This allows both Dropped and Ignored count, combined with Load time.

svn path=/trunk/; revision=37121
2011-05-13 11:50:33 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option.
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
2011-05-12 10:56:26 +00:00
Chris Maynard adadb7dd0f Use a common function, higher_priority_status_level() to determine whether or
not messages should be pushed onto the statusbar.  Should fix CID 270.

svn path=/trunk/; revision=36421
2011-03-31 16:23:07 +00:00
Guy Harris 186ce16c52 Add GCC-style printf annotation to the routines that now take a format
string and format arguments, and fix issues warned about by that.

svn path=/trunk/; revision=35044
2010-11-28 00:02:39 +00:00
Guy Harris 002a1b75fa Make some other statusbar routines take a format string and format args,
and get rid of an unnecessary string pointer.

Make the argument to welcome_header_push_msg() a const pointer.

svn path=/trunk/; revision=35042
2010-11-27 23:06:14 +00:00
Guy Harris a4cc25f84d Move main_statusbar.h to the top-level directory; none of its routines
use GTK+ data types, so, at least in theory, it could be implemented
atop another toolkit.

Make statusbar_push_temporary_msg() take a format string and format
arguments.  Use it instead of simple_status(), and change one call to
just take a format string and arguments rather than to take the result
of using that format string and arguments with g_strdup_printf() and
passing the result to statusbar_push_temporary_msg().

svn path=/trunk/; revision=35041
2010-11-27 21:50:49 +00:00
Stig Bjørlykke 98f6aa9311 Add a new right-click popup menu for the statusbar profiles for easy functions
to create new, copy, delete and rename configuration profiles.

svn path=/trunk/; revision=34312
2010-10-01 16:29:37 +00:00
Bill Meier 5ff36b1a2a Use correct signature for "button-press-event" callback function;
Whitespace cleanup;
Use gboolean as appropriate; 

svn path=/trunk/; revision=33844
2010-08-19 00:09:56 +00:00
Anders Broman b722b193a6 - Show droped packets counter after stopping a live capture.
- Don't show "Load time" during live capture.
- Fix indentation and minor changes to comments.
Should ignored packets be shown also when drops is known?

svn path=/trunk/; revision=33440
2010-07-05 22:09:10 +00:00
Guy Harris 8d56103f48 Don't include capture-related headers if we don't support capturing
network traffic.

svn path=/trunk/; revision=32802
2010-05-14 01:39:02 +00:00
Gerald Combs d122243892 Another Laura bug: Don't reset the file load time in the status bar when
we apply a display filter. Display the load time as "Load time:
M:SS.SSS" instead of "Time: HH:MM:SS.SSS".

svn path=/trunk/; revision=31909
2010-02-17 23:03:41 +00:00
Anders Broman eef24f0765 From Jim Young:
Wireshark GUI not reporting filename after save of new capture file.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4406

svn path=/trunk/; revision=31587
2010-01-20 06:44:03 +00:00
Stig Bjørlykke 47be3577a7 Introduce "Ignore Packet" in the packet list.
This will remove the package from the dissection functions without
removing it from the capture file.

svn path=/trunk/; revision=31287
2009-12-17 01:18:14 +00:00
Jaap Keuter 81b585cf8e From Valerio Messina:
As now, when Wireshark save capture files, it show "Loading" in status bar and
in the dialog box, warning many users of lost them packets. Saving work as expected.
Is simply a GUI use interaction problem.

svn path=/trunk/; revision=31269
2009-12-14 22:05:29 +00:00
Gerald Combs 3d40778d1b Move the contents of image/expert_*.h to gtk/expert_indicators.h. Add
pixbuf versions of the wired, wireless, and bluetooth interface icons to
gtk/network_icons.h. In the interface list use the new icons in all
their alpha-channel-infested glory. Add Makefile targets for rebuilding
the pixbuf files.

svn path=/trunk/; revision=30922
2009-11-10 18:02:05 +00:00
Gerald Combs ca04ab9979 Instead of trying to change the background color of the info bar when we
push a temporary message, make it "throb" using gtk_drag_highlight and
gtk_drag_unhighlight.

svn path=/trunk/; revision=30912
2009-11-09 21:52:41 +00:00
Gerald Combs d54eea534e Add a convenience routine to convert pixbuf data generated by
gdk-pixbuf-csource to a GtkImage. Use it to load the expert indicator
images. Add prettier indicator images. The "chat" indicator is more blue
in order to differentiate it from the "none" indicator; make the chat
text background more blue to match.

svn path=/trunk/; revision=30825
2009-11-04 21:16:38 +00:00
Gerald Combs 5e34f21076 Add the ability to push temporary (and highlighted) messages onto the
statusbar. This lets us notify the user about something significant
without having to pop up an annoying window. Replace a few dialogs with
statusbar messages.

svn path=/trunk/; revision=30810
2009-11-04 00:02:52 +00:00
Kovarththanan Rajaratnam c6f96e4ec9 Make sure that reset the elapsed time to load a file before we reload/rescan the file
svn path=/trunk/; revision=29783
2009-09-07 21:07:51 +00:00
Anders Broman 2cd2eecd0a Compute the loading time and show it in the main status bar.
(Modified code from Didier Gautheron).

svn path=/trunk/; revision=29592
2009-08-28 05:19:52 +00:00
Stig Bjørlykke f40bd67713 Pop the welcome header when we are finished capture without updating packet
list in real time, so we get back to the welcome screen when closing the file.

svn path=/trunk/; revision=29034
2009-07-09 09:28:05 +00:00
Gerald Combs 4ea71f1095 Add the ability to push and pop messages in to and out of the welcome
screen header, similar to the status bar. Hide the welcome body if the
message stack length is > 0.  Use this to display the "Waiting for
capture input data..." message when we're capturing from a pipe. This
lets the user know what's going on and keeps them from clicking on a
welcome screen item while we're waiting for data to arrive.  You can see
this in action by running

   (sleep 5; cat /path/to/a/capture) | wireshark -k -i -

svn path=/trunk/; revision=28196
2009-04-29 22:42:33 +00:00
Bill Meier f7bcdea0e5 gtk_widget_ref() --> g_object_ref()
svn path=/trunk/; revision=28027
2009-04-10 14:10:49 +00:00
Jaap Keuter 3278bafd5b From Jim Young:
Confine status bar widgets to module.

svn path=/trunk/; revision=27259
2009-01-18 13:51:00 +00:00
Bill Meier 56206e0002 Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width()          ==> gtk_container_set_border_width()
  gtk_container_children()              ==> gtk_container_get_children()
  gtk_entry_new_with_max_length()       ==> gtk_entry_new(); gtk_entry_set_max_length()
  gtk_menu_append()                     ==> gtk_menu_shell_append()
  gtk_menu_prepend()                    ==> gtk_menu_shell_prepend()
  gtk_notebook_set_page()               ==> gtk_notebook_set_current_page()
  gtk_paned_gutter_size()               ==> gtk_paned_set_gutter_size()
  gtk_radio_button_group()              ==> gtk_radio_button_get_group()
  gtk_signal_connect()                  ==> g_signal_connect()
  gtk_signal_disconnect()               ==> g_signal_handler_disconnect()
  gtk_signal_emit_by_name()             ==> g_signal_emit_by_name()
  gtk_signal_handler_block_by_data()    ==> g_signal_handlers_block_matched()
  gtk_signal_handler_block_by_func()    ==> g_signal_handlers_block_by_func()
  gtk_signal_handler_unblock_by_data()  ==> g_signal-handlers_unblock_matched()
  gtk_signal_handler_unblock_by_func()  ==> g_signal-handlers_unblock_by_func()
  gtk_spin_button_get_value_as_float()  ==> gtk_spin_button_get_value()
  gtk_toggle_button_set_state()         ==> gtk_toggle_button_set_active()

svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
Guy Harris c4932893e3 Have separate callback mechanisms in file.c and capture.c; pass the
capture callbacks the capture_options * as its second argument in all
cases.  This makes it a bit clearer what arguments callbacks take, and
means we can get rid of all global_capture_opts references in
gtk/main_statusbar.c.

Put the interface between gtk/main.c and gtk/main_statusbar.c into a
private header.

svn path=/trunk/; revision=25576
2008-06-24 08:05:45 +00:00
Guy Harris f441b8941e Add gtk/capture_globals.h, to declare global_capture_opts, so files that
don't need global_capture_opts don't need to have it declared and thus
don't need capture_options defined.

Include gtk/capture_globals in the files in question.

Change some more capture_opts references to refer to
global_capture_opts.

Change some global_capture_opts references in routines with a
capture_opts argument to refer to capture_opts.

The structure type is capture_options, not capture_opts; fix some
references.

Include <sys/types.h>, if it's present, in capture_opts.h, so we get
gid_t defined.

Clean up indentation.

svn path=/trunk/; revision=25574
2008-06-24 03:38:15 +00:00
Guy Harris 881a38f96e For now, just refer to global_capture_opts, replacing references to the
now-defult global capture_opts pointer; we eventually should try to
minimize the use of global variables.

svn path=/trunk/; revision=25572
2008-06-24 02:24:17 +00:00
Stig Bjørlykke 01de1202bc Update the statusbar expert info icon when changing profile.
svn path=/trunk/; revision=25491
2008-06-19 21:56:25 +00:00
Stig Bjørlykke 4cd3667832 Popup a menu with configuration profiles instead of the profile dlg
when clicking the profile in the statusbar.  Much easier to use.

svn path=/trunk/; revision=25468
2008-06-17 19:50:22 +00:00
Stig Bjørlykke 2198a435da Cleanup return values from info_bar_new() and packets_bar_new().
svn path=/trunk/; revision=25456
2008-06-15 20:50:10 +00:00
Stig Bjørlykke 15963a143b Click on the profile in the statusbar will open Configuration Profiles dialog.
svn path=/trunk/; revision=25455
2008-06-15 20:47:06 +00:00
Ulf Lamping 0b97c4211e sort #includes by directories
svn path=/trunk/; revision=24967
2008-04-13 00:55:59 +00:00
Ulf Lamping 1f8e6c08be various code cleanup
svn path=/trunk/; revision=24964
2008-04-12 23:34:44 +00:00
Stig Bjørlykke b651a49252 Include unistd.h, fix prototyping of static functions and mark some
unused arguments.

svn path=/trunk/; revision=24941
2008-04-12 16:47:46 +00:00
Ulf Lamping 72faa680b8 move statusbar related code from main.c into it's own main_statusbar.c
svn path=/trunk/; revision=24937
2008-04-12 15:55:27 +00:00