Commit Graph

47 Commits

Author SHA1 Message Date
Martin Kaiser f808eb08f0 add explicit cast to avoid a compiler warning
svn path=/trunk/; revision=48568
2013-03-26 20:33:49 +00:00
Gerald Combs d1b87423df More icon updates.
Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
2013-03-26 19:51:33 +00:00
Bill Meier 8112ecc321 From beroset:
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-21 02:29:09 +00:00
Gerald Combs da1bdffa1b Reverse some logic.
svn path=/trunk/; revision=48446
2013-03-20 22:58:51 +00:00
Gerald Combs a8e0c85548 Add frame_new, which creates a frame that best conforms to the GNOME,
Windows, and OS X HIGs. Use it in the capture options dialog. The
capture options dialog is a bit taller now and could probably use a bit
more tweaking.

In the capture options, conversation, and endpoint dialogs use our
best-guess dialog spacing and pad out some areas.

svn path=/trunk/; revision=48445
2013-03-20 22:41:51 +00:00
Anders Broman ac2515ee6f Use explicit casts.
svn path=/trunk/; revision=48239
2013-03-11 06:47:34 +00:00
Anders Broman 98387d0498 Use explicit casts.
svn path=/trunk/; revision=48232
2013-03-10 16:56:40 +00:00
Bill Meier 96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Bill Meier 162817ad33 it's ==> its & its ==> it's as needed.
In a few cases:
 Fix spelling;
 Clean up whitespace and formatting style.

svn path=/trunk/; revision=47889
2013-02-25 23:35:13 +00:00
Bill Meier 674e37d0a8 From Peter Hatina: test GDK_WINDOW_STATE_MAXIMIZED as a bit flag
(One small part of a suggested patch in Bug #8315).

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315

svn path=/trunk/; revision=47863
2013-02-24 19:35:32 +00:00
Guy Harris 6ebabce7b5 Move the GUI-independent window geometry stuff to ui/recent.c, so we
only have one copy.

svn path=/trunk/; revision=47440
2013-02-02 05:34:31 +00:00
Gerald Combs 6ef1fc5002 GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214
2013-01-22 18:27:18 +00:00
Bill Meier 9e1bf0acef Update comments.
svn path=/trunk/; revision=47021
2013-01-10 20:46:58 +00:00
Bill Meier 93c28b7da1 Rename ws_gtk_grid_attach() to ws_gtk_grid_attach_defaults();
Also: fix a typo in a comment in 'gui_utils.h'

svn path=/trunk/; revision=46951
2013-01-05 15:25:30 +00:00
Anders Broman ad7f545a50 Fix a cut-and-paste error
svn path=/trunk/; revision=46934
2013-01-04 17:44:38 +00:00
Anders Broman d9d58c34f2 Add a wrapper for gdk_cairo_set_source_rgba() in GTK2 and use it in io_stat.c
svn path=/trunk/; revision=46932
2013-01-04 17:07:26 +00:00
Guy Harris d2a22e242d Cast away warnings implicit 64-bit-to-32-bit conversions. (We should
probably have routines that convert strings to numbers and do range
checks, and should also ignore values in the recent and preferences
files that are out of range.)

Cast a string to "char *" to squelch an otherwise-unavoidable warning
about qualifiers being ignored.

The media type for raw binary data is application/octet-stream, not
application octet_stream.

svn path=/trunk/; revision=46727
2012-12-24 23:10:18 +00:00
Bill Meier 43df5e02ac Wrapper functions and macros to be used to replace
Wireshark Gtk2 GtkTable code with code providing
 essentially equivalent funtionality on Gtk2 and Gtk3.

 See gui_utils.h for details.

svn path=/trunk/; revision=46654
2012-12-21 06:27:00 +00:00
Chris Maynard 62169cf312 This is an attempt to improve the default window placement position when there's more than one monitor and Wireshark's main window isn't located on the primary monitor. New windows will now open on the same monitor as Wireshark's main window, at a fixed location slightly offset from the main window. Previously, new windows would always open on the primary monitor regardless of the monitor that Wireshark was on. Note that this is only the default position and future patches will likely cause many windows to change this position. Further usage/feedback will determine if this is a good temporary stategy or not. It *may* help obviate the need to save every window's x,y & size though.
svn path=/trunk/; revision=45370
2012-10-07 17:16:51 +00:00
Chris Maynard b436d64d55 A minor modification to Stephen Fisher's r34265 patch to [attempt to] resolve bug 553. This change takes into account that viewable_area.[x|y] may not be 0,0. Will this finally fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=553 ?Unknown, but I am unable to reproduce it.
svn path=/trunk/; revision=45331
2012-10-05 14:51:31 +00:00
Chris Maynard 5d64bef6e1 Revert most of r45210. We don't use the return value of GetExitCodeProcess(), but it still needs to be called to get childstatus.
svn path=/trunk/; revision=45212
2012-09-29 15:49:06 +00:00
Evan Huus 73e5c4e40f Don't fetch the exit code of our child process, we never use it.
svn path=/trunk/; revision=45210
2012-09-29 14:06:40 +00:00
Jeff Morriss 3729335973 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
2012-09-20 01:48:30 +00:00
Bill Meier a2d442133f Use consistent indentation and formatting.
svn path=/trunk/; revision=44889
2012-09-14 03:24:23 +00:00
Gerald Combs 5f2783de05 Revert r44644 and 44645. g_source_*, g_timeout_, and g_io_* all depend
on the GLib main loop which isn't portable (unless you want to want to
manage the main loop yourself).

svn path=/trunk/; revision=44655
2012-08-24 15:25:42 +00:00
Gerald Combs 5adc43f597 Move the pipe input routines to the common UI directory.
svn path=/trunk/; revision=44644
2012-08-23 18:42:48 +00:00
Jakub Zawadzki c2764ba5f3 Fix reference counting of GdkPixbuf, unref after creating GtkImage (aka fix memleaks)
Valgrind log:
  = 47,616 bytes in 1 blocks are possibly lost in loss record 41,578 of 41,608
  =    at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  =    by 0xAA2BA53: gdk_pixbuf_new (in /usr/lib64/libgdk_pixbuf-2.0.so.0.2200.1)
  =    by 0x10379F2F: ??? (in /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so)
  =    by 0x1037A4FD: ??? (in /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so)
  =    by 0xAA3132E: gdk_pixbuf_new_from_xpm_data (in /usr/lib64/libgdk_pixbuf-2.0.so.0.2200.1)
  =    by 0x4589B5: xpm_to_widget (gui_utils.c:572)
  =    by 0x4E3FC4: about_wireshark (about_dlg.c:86)

svn path=/trunk/; revision=44066
2012-07-27 08:49:41 +00:00
Jakub Zawadzki 80721f5498 Fix memleak in window_icon_realize_cb()
gtk_window_set_icon_list() duplicates list so after setting we need
to free generated one.

svn path=/trunk/; revision=44052
2012-07-26 17:23:35 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Guy Harris 00de07144d Use the modal version of the bad display filter alert box in the I/O
statistics window.

Get rid of the non-modal version (it's not being used any more), and
remove the now-redundant _modal from the modal version.

svn path=/trunk/; revision=43081
2012-06-04 20:08:59 +00:00
Guy Harris 1899e6ee34 Do with the open dialog what we've done with the save and "export
selected packets" dialog.

svn path=/trunk/; revision=43074
2012-06-04 18:40:45 +00:00
Guy Harris dbfb305368 g_filename_display_basename() returns a g_mallocated string, so its
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-03 22:03:05 +00:00
Guy Harris 742b22dd43 Move routines that handle the main window title bar out of
ui/gtk/gui_utils.c into ui/gtk/main_titlebar.c, and the declaration of
one of them out of ui/ui_util.h into ui/gtk/main_titlebar.h, and rename
them to clarify that they work on the window name and titlebar.

svn path=/trunk/; revision=43041
2012-06-03 18:35:34 +00:00
Guy Harris 6f1d74b9b1 Another cut-and-pasteo.
svn path=/trunk/; revision=42188
2012-04-21 21:16:54 +00:00
Anders Broman c483317006 port gtk_scrollbar_new() gtk_paned_new() gtk_separator_new() to GTK2
svn path=/trunk/; revision=42186
2012-04-21 20:45:35 +00:00
Guy Harris 780061ed74 Fix probable cut-and-pasteo.
svn path=/trunk/; revision=42185
2012-04-21 20:38:18 +00:00
Guy Harris b8087943a1 Clean up indentation (get rid of 4-space tabs).
svn path=/trunk/; revision=42184
2012-04-21 20:13:38 +00:00
Anders Broman 60cb4652e4 gtk_button_box_new() for pre GTK 3.0
svn path=/trunk/; revision=42183
2012-04-21 20:06:51 +00:00
Guy Harris 63040040d2 Clean up indentation - don't use 4-space tabs.
svn path=/trunk/; revision=42182
2012-04-21 19:12:50 +00:00
Guy Harris f16eb8cf14 GTK+ 1.x is no longer supported, and there's no toggle_tree to move any
more; remove a comment.

svn path=/trunk/; revision=42181
2012-04-21 19:07:23 +00:00
Guy Harris 051263c85d "homogeneous" is a Boolean; we can just pass it on to gtk_hbox_new() and
gtk_vbox_new().

svn path=/trunk/; revision=42180
2012-04-21 18:48:49 +00:00
Anders Broman a24133d747 Fix a couple of typos and missing return for GTK 3.
svn path=/trunk/; revision=41894
2012-04-02 12:23:33 +00:00
Anders Broman 0c481e3e96 Introduce utility function to ease GTK3 depcrecated funktion removal.
svn path=/trunk/; revision=41893
2012-04-02 11:35:53 +00:00
Balint Reczey 104bab54f1 Use 'wireshark' icon from theme
This makes Wireshark able to use SVG icon when it is installed

svn path=/trunk/; revision=41329
2012-03-03 15:40:38 +00:00
Guy Harris dacb4133e8 Restructure the recent file code so that recent.c is GUI-independent;
move it to the top-level source directory for now, and move
ui/gtk/recent.h to the ui directory.

svn path=/trunk/; revision=40561
2012-01-18 19:38:34 +00:00
Guy Harris d7b2aad043 Move some headers for UI stuff, and the alert_box.c UI-specific file, to
the ui directory.  (Perhaps some other files that would be used by all
flavors of Wireshark, for any GUI toolkit or for someting such as
ncurses, and not for any command-line tool such as TShark, should be
moved there as well.)

Shuffle some #includes to put the "ui/XXX.h" includes together.

svn path=/trunk/; revision=40529
2012-01-16 01:07:52 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00