aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/main_welcome.c
AgeCommit message (Collapse)AuthorFilesLines
2014-06-22Add a routine to return a version string including VCS information.Guy Harris1-3/+3
Add a routine get_ws_vcs_version_info() that, for builds from a tree checked out from Wireshark's version control system, returns a string that includes both the Wireshark version number and an indication of what particular VCS version was checked out, and just returns Wireshark's version number for other builds. Use that routine rather than manually gluing VERSION and the Git version number together. ("vcs", not "git", just in case we do something bizarre or mercurial some day. :-)) Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d Reviewed-on: https://code.wireshark.org/review/2529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-11Migrate GTK icon handling to GTK 3.10 APIBalint Reczey1-1/+1
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>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-1/+1
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>
2013-11-26Note why refresh_local_interface_lists() is being called in variousGuy Harris1-0/+3
cases. svn path=/trunk/; revision=53597
2013-11-15From Dirk Jagdmann: Make sure err_str is initialized.Gerald Combs1-1/+1
svn path=/trunk/; revision=53347
2013-10-11Fix some formatting.Jeff Morriss1-11/+17
svn path=/trunk/; revision=52551
2013-06-27get main_window_update out of the way... pass an update_cb to the ↵Luis Ontanon1-2/+3
capture_sync stuff ... as per the XXX comment removed from tshark.c this was a mess to keep the linker happy... I couldn't! I did this without even understanding whether calling main_window_update was realy necessary in most cases. I guess nothing or more specific update cbs would be best. svn path=/trunk/; revision=50188
2013-05-22Make a routine not used outside this file static.Guy Harris1-5/+6
svn path=/trunk/; revision=49533
2013-04-12Ifdef LibPcapIrene Rüngeler1-0/+2
svn path=/trunk/; revision=48830
2013-04-12The function takes no arguments...Michael Tüxen1-1/+1
svn path=/trunk/; revision=48828
2013-04-12Change the sensitivity of the start button depending on the number of ↵Irene Rüngeler1-0/+11
interfaces selected. svn path=/trunk/; revision=48827
2013-04-11Don't select the 'any' device (in Linux), when 'capture all' is selected.Irene Rüngeler1-1/+9
svn path=/trunk/; revision=48815
2013-04-09The default interface should now be selected also on Windows.Irene Rüngeler1-5/+0
svn path=/trunk/; revision=48799
2013-04-08Set the default interface as selected.Irene Rüngeler1-0/+5
svn path=/trunk/; revision=48788
2013-03-27Add the new splash image. Designed by Elliott Aldrich. Switch the splashGerald Combs1-3/+2
image from XPM to PNG+pixbuf. Remove old XPMs. svn path=/trunk/; revision=48600
2013-03-21From beroset:Bill Meier1-20/+20
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-03-13Add interface options preferences.Irene Rüngeler1-2/+1
svn path=/trunk/; revision=48275
2013-03-04Fir Gtk 3.8 & newer: gtk_scrolled_window_add_with_viewport() ==> ↵Bill Meier1-4/+10
gtk_container_add(). svn path=/trunk/; revision=48065
2012-12-22Remove unneeded initializations, and one redundant if condition.Evan Huus1-1/+1
svn path=/trunk/; revision=46702
2012-12-05Make it more obvious that we're locking and unlocking.Gerald Combs1-2/+1
svn path=/trunk/; revision=46412
2012-12-05Fix numerous instances of a variable/parameter name "shadowing" a library ↵Bill Meier1-4/+4
function name; (At least some (gcc ?) compilers give a "shadow" warning for these). svn path=/trunk/; revision=46402
2012-11-29select_ifaces and select_current_ifaces haven't been used since r40715.Gerald Combs1-50/+6
Presumably it's OK to remove them. svn path=/trunk/; revision=46299
2012-11-19From Mike Garratt:Anders Broman1-14/+47
Friendly Names for interfaces on Windows Notes on the changes the patch covers: * if_info_t struct: addition of friendly_name * Dumpcap Interface list format changes: + Win32: "dumpcap -D" shows friendly_name in place of descript if known + All: machine interface "dumpcap -D -Z none" includes friendly_name in the list in addition to the existing parameters * interface_options struct: addition of console_display_name + When an interface name is displayed in a console, it will typically be the console_display_name (instead of name). + console_display_name is used as the basis of the autogenerated temp filenames + console_display_name is typically set to the friendly_name if known, otherwise it is set to the interface name * Enhancements to capture_opts_add_iface_opt() (the function which process -i options). + Can now specify the interface using its name and friendly_name + Interface name matching is case insenstive + Name matching first attempts exact matching, then falls back to prefix matching (e.g. dumpcap -i local) + Validates interface names, instead of blindly sending them off to winpcap/libpcap + Interface specification by number is still supported. * capture_opts_trim_iface() has been refactored: + Instead of repeating a decent chunk of the cost in capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the interface. * introduction of capture_win_ifnames.[ch] (windows only code) + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a windows version independant function to convert an interface guid into its friendly name. Uses published api functions on windows vista and higher, but falls back to unpublished API functions on older windows releases. + void get_windows_interface_friendlyname(/* IN */ char *interface_devicename, /* OUT */char **interface_friendlyname); - extracts the GUID from the interface_devicename, then uses GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution * Auto temp filename generation: + Now uses wireshark_pcapng_* or wireshark_pcap_* depending on file format + Basis temp filename format on console_display_name + Win32: if console_display_name is a windows interface guid, extracts numbers from GUID here (instead of in interface option processing) GUI CHANGES: * Dialog that displays when you click the "Manage Interfaces" button (within Capture Options dialog) has been renamed from "Add new interfaces" to "Interface Management" * ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to interface_management_w * Win32: Local Interfaces tab on Interface Management dialog, shows includes friendly name as far left column * Interface Management dialog defaults to larger size on win32 - so it fits without resizing local interfaces tab * Interface Management dialog now saves preferences when you click the apply button (local hidden interfaces was not persisting across restarts) * Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces -> Details): + "Friendly Name" renamed to "NDIS Friendly Name" + Added "OS Friendly Name" to the top of the list * Win32: The "Capture Interfaces" dialog now shows the friendly name instead of device guid * Welcome screen: + The height of the interface list scrollbox dynamically adjusts & updates to the number visible interfaces. Up to 10 interfaces can be listed without a scroll bar, the minimum height is for 2 interfaces. + Win32: now shows just the Friendly Name if known - in place of "Interfacename_Guid:(Description)" svn path=/trunk/; revision=46083
2012-10-10Add a format_size function similar to g_format_size that renders a sizeGerald Combs1-12/+6
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-29More unused variables caught by cppcheck.Evan Huus1-8/+5
svn path=/trunk/; revision=45211
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45016
2012-08-08Add refresh button, if interfaces are not found.Irene Rüngeler1-1/+27
svn path=/trunk/; revision=44328
2012-08-03Move capture_globals.h from ui/gtk/ to ui/. Show interface activityGerald Combs1-1/+3
using sparklines in the qtshark main window. svn path=/trunk/; revision=44253
2012-08-01Move the common parts of iface_lists.[ch] from ui/gtk/ to ui/. Leave theGerald Combs1-2/+2
GTK+-specific parts behind in capture_dlg.c. svn path=/trunk/; revision=44196
2012-08-01Move utf8_entities.h to the "ui" directory. Separate packet informationGerald Combs1-1/+1
items with MIDDLE DOTs. svn path=/trunk/; revision=44194
2012-07-31From Michael Mann:Anders Broman1-1/+2
Expand show version preference. implementation of Steven's suggestion of a radio button (actually dropdown) of the 4 possibilities. I changed the default to have the version on both in the welcome screen and on the window as that's how it was and people tend not to change the preferences I think. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6437 svn path=/trunk/; revision=44153
2012-07-22Two little cleanups from cppcheck:Evan Huus1-3/+1
- unused variable = don't trust GTK_IS_PROGRESS_BAR to provide the necessary parentheses svn path=/trunk/; revision=43915
2012-07-20Fix some clang warnings: implicit conversion from enumeration type ↵Jakub Zawadzki1-9/+9
'GtkStateType' to different enumeration type 'GtkStateFlags' [-Werror,-Wconversion] GTK_STATE_NORMAL and GTK_STATE_FLAG_NORMAL are both 0. svn path=/trunk/; revision=43854
2012-07-09From Evan Huus:Anders Broman1-1/+0
Grab-bag of unused variables. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7452 svn path=/trunk/; revision=43616
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-28Move the stuff to manage the global interface list and to updateGuy Harris1-0/+1
displays of that list into a separate iface_lists.c file. svn path=/trunk/; revision=43523
2012-06-28Make scan_local_interfaces() local to ui/gtk/main.c; widgets/windowsGuy Harris1-4/+1
that want a list of interfaces should either call fill_in_local_interfaces() to make sure the list has been populated at least once or refresh_local_interface_lists() if they want the list to be rescanned. Also make get_interface_type() local to ui/gtk/main.c, as it's not called from outside ui/gtk/main.c. Don't declare fill_in_local_interfaces() or hide_interface() unless we have pcap - we don't define them unless we have pcap. svn path=/trunk/; revision=43518
2012-06-28Detangle the code that manages the interface list on the welcome screen:Guy Harris1-51/+40
fill_capture_box(): if there are interfaces on which to capture, constructs the interface list, otherwise destroys the interface list and puts up a message. update_capture_box(): updates the interface list to reflect current reality. welcome_if_panel_reload(): if there is an interface list, and if there are interfaces on which to capture (so that we still want that list), updates the list by calling update_capture_box(), otherwise creates or destroys it by calling fill_capture_box() (as either it doesn't exist but now needs to or does exist but needs to go away). Have refresh_local_interface_lists(), which re-fetches the list of local interfaces and updates every interface list that includes local interfaces, and refresh_non_local_interface_lists(), which only updates interface lists that (also) include interfaces other than local interfaces (such as pipes and remote interfaces). Call them in the apprpriate places (if we know the list of local interfaces has been updated, call refresh_local_interface_lists(), otherwise, if we know interfaces other than local interfaces have been added or removed, call refresh_non_local_interface_lists()). Don't have any routine that updates the interface list for one widget update the interface list for any other widget; leave the global updating of interface lists up to refresh_local_interface_lists() and refresh_non_local_interface_lists() - only call one of them if any interface lists are to be updated. svn path=/trunk/; revision=43517
2012-06-28From Pontus Fuchs:Guy Harris1-2/+2
add a capture_dlg_refresh_if() routine to redraw the list of interfaces in the Capture -> Interfaces dialog if the lsit of known interfaces is updated, and have it do that not by destroying and reconstructing the entire dialog box, but just by destroying and reconstructing the table containing the interfaces and their statistics. From me: have a refresh_interfaces_cb() routine in ui/gtk/main.c that scans the local interfaces and refreshes *all* the widgets that have interface lists; add a "Refresh Interfaces" item to the Capture menu that calls that; have the "Refresh" button in the "Manage Interfaces" window also call that; rename the Capture Options window routine dlg_window_present() to capture_dlg_window_present() to make it clearer *which* dialog it checks for; fix Pontus' patch to call capture_stat_stop() *before* nulling out the global pointer for the statistics cache - if it's called *after* nulling it out, the argument passed to capture_stat_stop() is null, and it doesn't kill off the dumpcap gathering the statistics so they just pile up (and, at least on OS X, chewing up BPF devices until you run out of BPF devices that have the right ownership and permissions for dumpcap to use as a normal user); if refreshing the interfaces fails to get an interface list, close the Capture Interfaces dialog. svn path=/trunk/; revision=43515
2012-06-02From Evan Huus Convert a bunch more GTK-2 calls to their cross-version ws_ ↵Anders Broman1-12/+12
equivalent svn path=/trunk/; revision=43009
2012-05-05AFAICT '#include sys/types.h' is not needed for these files.Bill Meier1-3/+0
svn path=/trunk/; revision=42443
2012-04-15Get rid of the error code argument to scan_local_interfaces(); nobodyGuy Harris1-10/+10
uses it once it's filled in. From Evan Huus: in scan_local_interfaces(), pass NULL to capture_interface_list(), as we don't use the error string (and don't free it, either). In fill_capture_box(), for CANT_GET_INTERFACE_LIST, include the error string in the report, and free it, in all cases, when we're done with it. svn path=/trunk/; revision=42089
2012-04-02From Irene Ruengeler: Fix a warning when capturing.Michael Tüxen1-1/+2
svn path=/trunk/; revision=41897
2012-03-27Get things compiling if we HAVE_AIRPCAP.Jeff Morriss1-3/+0
svn path=/trunk/; revision=41789
2012-03-21From Irene Ruengeler: Restore functinality of last patch.Michael Tüxen1-1/+2
svn path=/trunk/; revision=41719
2012-03-21Handle bogus values of the error that *should* be coming fromGuy Harris1-32/+41
scan_local_interfaces() (but, currently, isn't, as the code wasn't correctly restructured). svn path=/trunk/; revision=41710
2012-03-21activate_link_cb() is only defined and used if we have GTK 2.18 or higher; ↵Jeff Morriss1-0/+2
only prototype it when we have GTK 2.18 or higher. svn path=/trunk/; revision=41701
2012-03-21welcome_if_tree_load() is static and only called (and prototyped) if we ↵Jeff Morriss1-5/+5
HAVE_LIBPCAP, so don't define the function unless we HAVE_LIBPCAP. svn path=/trunk/; revision=41698
2012-03-21Well, it doesn't recurse with that code there, but it doesn't fill inGuy Harris1-2/+0
the interface list box, either. Remove the #if 0 for now. svn path=/trunk/; revision=41696
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 02:47:29 +0000