summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2013-02-01Update some tooltips.Gerald Combs1-2/+3
svn path=/trunk/; revision=47404
2013-02-01Add interface prefs. Adjust some spacing and resize behavior.Gerald Combs10-11/+376
svn path=/trunk/; revision=47403
2013-01-31for an interface that does not support monitor mode, make sure thatMartin Kaiser1-1/+4
monitor mode is not enabled (this fixes the gui part but there's probably more to do) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8283 svn path=/trunk/; revision=47399
2013-01-31Use the name "Wireshark" instead of "qtshark" on OS X.Gerald Combs1-1/+6
svn path=/trunk/; revision=47393
2013-01-30GPOINTER_TO_INT() is the inverse of GINT_TO_POINTER().Guy Harris1-1/+1
svn path=/trunk/; revision=47374
2013-01-30Use optargp, not optarg, in followSsl(), as in other routines; thisGuy Harris1-6/+6
squelches a shadowing warning. svn path=/trunk/; revision=47373
2013-01-30Add support in TShark to follow SSL streams Michael Mann1-5/+130
From QA Cafe, bug 8280 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8280) svn path=/trunk/; revision=47372
2013-01-30Copy over r47277 from ui/gtk.Gerald Combs1-1/+7
svn path=/trunk/; revision=47364
2013-01-28Try to detect duplicated packets due to mirroring/span ports by comparing ↵Anders Broman2-9/+20
src MAC addresses. svn path=/trunk/; revision=47324
2013-01-28Whitespace and doxygen comment changes.Anders Broman1-45/+45
svn path=/trunk/; revision=47322
2013-01-25When searching for hex bytes from the "Find Packet" dialog, highlight the ↵Chris Maynard1-6/+13
correct number of bytes. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8085 #BACKPORT 1.8: ui/gtk/main_proto_draw.c:packet_hex_print() 1.6: gtk/main_proto_draw.c:packet_hex_print() svn path=/trunk/; revision=47277
2013-01-24Add back the X11 substitutes.Gerald Combs1-3/+3
svn path=/trunk/; revision=47264
2013-01-24Clean up font initialization a bit.Gerald Combs1-20/+18
svn path=/trunk/; revision=47263
2013-01-24Use ws_gtk_grid...() in place of gtk_table...().Bill Meier5-198/+184
This completes the process of replacing Wireshark gtk_table...() usage !! (However: the prefs dialogs still have a few Gtk3 related Expand/Fill issues which need to be fixed). svn path=/trunk/; revision=47262
2013-01-24Separate Time Shift item from Time Reference items. From Cal Turney viaChris Maynard2-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 with qt change from me. svn path=/trunk/; revision=47261
2013-01-24Use ws_gtk_grid...() in place of gtk_table...();Bill Meier1-205/+207
Also: minor cleanup: - use gtk_window_set_default_size() iso gtk_window_resize(); - change grid row numbers to start at 0 (not 1); - fix some formatting/whitespace. svn path=/trunk/; revision=47260
2013-01-24Add font and color preferences. Unfortunately Qt doesn't have a colorGerald Combs20-332/+687
picker widget so we're back to popping up dialogs. Move the contents of monospace_font.{cpp,h} to wireshark_application.{cpp,h}. Pango and Qt use completely different string representations for fonts. Add a separate gui.qt.font_name preference so that they don't clobber each other. svn path=/trunk/; revision=47240
2013-01-23Update our column information even if we don't have a capture file loaded.Gerald Combs1-5/+3
svn path=/trunk/; revision=47232
2013-01-23Add column preferences.Gerald Combs19-81/+747
svn path=/trunk/; revision=47231
2013-01-22GTK+:Gerald Combs16-2973/+2960
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-22Fix VS Studio Analysis warning C6244: Local declaration of 'iftype' hides ↵Chris Maynard1-5/+5
previous declaration at line '1046' svn path=/trunk/; revision=47213
2013-01-22For menu consistency and shortcut simplification, change some "Ignore" ↵Chris Maynard2-4/+4
related shortcuts to match "Mark" and "Time Reference" shortcuts. Specifically: Ignore All Displayed Packets <alt><shift><control>D ==> <shift><control>D Unignore All Packets <shift><control>D ==> <alt><control>D svn path=/trunk/; revision=47203
2013-01-21Update the ignore shortcuts to match r47194.Gerald Combs1-3/+3
svn path=/trunk/; revision=47200
2013-01-21And (Q_)init resources (otherwise the images don't display when build with ↵Alexis La Goutte1-0/+1
CMake) svn path=/trunk/; revision=47199
2013-01-21Add UI_FILES list (more easy to use when add a new ui files...)Alexis La Goutte2-16/+23
svn path=/trunk/; revision=47198
2013-01-21Add layout.qrc to QRC_FILES (otherwise it is not include to compressed ↵Alexis La Goutte1-0/+1
source files) svn path=/trunk/; revision=47197
2013-01-21Add layout.qrc to CMake BuildAlexis La Goutte1-0/+1
svn path=/trunk/; revision=47196
2013-01-21Modify name of Preferences windowAlexis La Goutte1-1/+1
svn path=/trunk/; revision=47195
2013-01-21Avoid using *<control>X shortcuts. In this case, using *<control>D instead.Chris Maynard1-3/+3
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 svn path=/trunk/; revision=47194
2013-01-21Add layout_preferences_frame.ui.Gerald Combs1-0/+1
svn path=/trunk/; revision=47191
2013-01-21Add an initial layout preference pane. Set SVN properties.Gerald Combs11-10/+728
svn path=/trunk/; revision=47190
2013-01-21Increase the background opacity.Gerald Combs1-2270/+2753
svn path=/trunk/; revision=47189
2013-01-20Fix for CID 715142.Jaap Keuter1-1/+1
Be aware that the short-circuit evaluation only applies to the first operand of a logical AND expression. svn path=/trunk/; revision=47188
2013-01-20Use the correct image sequence.Gerald Combs1-3/+3
svn path=/trunk/; revision=47185
2013-01-20Update French translations with last change and update of QtsharkAlexis La Goutte3-193/+2108
svn path=/trunk/; revision=47184
2013-01-20tr() not work with #defineAlexis La Goutte1-6/+5
svn path=/trunk/; revision=47183
2013-01-20Add Some missing text to translateAlexis La Goutte4-21/+21
svn path=/trunk/; revision=47182
2013-01-19Add layouts.hGerald Combs1-0/+2472
svn path=/trunk/; revision=47166
2013-01-19Add a rule to create layouts.h (using gdk-pixbuf-csourceBill Meier1-0/+8
in a similar manner as done in Makefile.am) (On my Windows 7 system gdk-pixbuf-csource gives an error message about "...Couldn't recognize the image file format...". Let's see what happens in the Windows buildbots). svn path=/trunk/; revision=47165
2013-01-19There is no wireless layout.Jaap Keuter1-1/+1
svn path=/trunk/; revision=47161
2013-01-19Replace more XPMs with PNGs.Gerald Combs3-11/+18
svn path=/trunk/; revision=47159
2013-01-19Add an "Appearance" (aka "User Interface") preference pane. Having anGerald Combs11-15/+530
"Advanced" pane gives us the luxury of omitting some items in favor of simplicity so do that. svn path=/trunk/; revision=47158
2013-01-18Fix two issues related to conversion to use ws_gtk_grid...() [svn #47002].Bill Meier1-2/+2
svn path=/trunk/; revision=47154
2013-01-18Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.Gerald Combs1-2/+1
svn path=/trunk/; revision=47143
2013-01-18Add more AirPcap code, disabled for now.Gerald Combs1-0/+8
svn path=/trunk/; revision=47142
2013-01-18Don't call prefs_airpcap_update() for now. Remove some debugging code.Gerald Combs2-4/+2
svn path=/trunk/; revision=47141
2013-01-18Fix compilation on Windows.Gerald Combs2-8/+8
svn path=/trunk/; revision=47140
2013-01-18Rename the "saved_val" preference element to "stashed_val" in order toGerald Combs24-312/+635
more clearly indicate that it's a copy of a preference value rather than something we've saved in the preferences file. Update prefs_pref_to_str() to handle default, stashed, and current prefs. Create ui/preference_utils.[ch] and move some common routines there. Use prefs_pref_type_name() in the GTK+ preferences dialog. Make the "OK" button in the Qt preferences dialog work. We simply write the prefs and redissect on "OK" and do nothing on "Cancel". This is intentionally different from the Apply/OK/Cancel behavior in the GTK+ version. Add a general "emitAppSignal" method to wsApp and use it for packet dissection and preference changes. Suggest that we might want to create a WsString class to make conversion between QStrings, gchar *s, and GStrings easier. svn path=/trunk/; revision=47139
2013-01-17Minor cleanup:Bill Meier1-97/+98
- Whitespace; - Long lines. svn path=/trunk/; revision=47138
2013-01-17General cleanup:Bill Meier1-1129/+1130
Indentation: Use 4 spaces; parens; unneeded initializers; whitespace. svn path=/trunk/; revision=47137