summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2013-02-09Try to figure out if we built the rest of the project using Autotools orGerald Combs1-3/+25
CMake automatically. svn path=/trunk/; revision=47576
2013-02-08Add a directory name preference type (PREF_DIRNAME) and registrationGerald Combs6-26/+135
routine (prefs_register_directory_preference). Add PREF_FILENAME and PREF_DIRNAME support to the Qt module preferences. Change a couple of preferences to directory names. Clean up some names and default settings. svn path=/trunk/; revision=47573
2013-02-08Fix Coverity CID 973548: Dereference null return value.Chris Maynard1-2/+2
#BACKPORT(1.8, 1.6) svn path=/trunk/; revision=47568
2013-02-08Constify the second argument to uat_load(), to squelch some warnings.Guy Harris1-2/+2
svn path=/trunk/; revision=47560
2013-02-08Add module_preferences_scroll_area.*.Gerald Combs3-0/+9
svn path=/trunk/; revision=47546
2013-02-08Add a ModulePreferencesScrollArea widget which builds a scrollable frameGerald Combs6-39/+664
for a preferences module. Use it to fill in the remaining preferences. Don't show the printing preferences since they're not used here. Change the titles and tooltips for some of the name resolution preferences. Disable the capture preferences if we can't capture. This is different from the GTK+ version which hides it completely. Thus concludes the preferences dialog (for the time being). svn path=/trunk/; revision=47545
2013-02-06Remove some unnecessary definitions.Gerald Combs1-3/+0
svn path=/trunk/; revision=47526
2013-02-06Add filter expressions frame entries.Gerald Combs3-0/+9
svn path=/trunk/; revision=47523
2013-02-06Add Filter Expressions^WButton^WShortcut^WBookmark preferences. Gerald Combs21-87/+750
Add comments noting that - We might want to do something different when the bookmark button is pressed. - The display filters (dfilters file) and gui.filter_expressions preferences should be merged. - Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the main window really wide. Add a qstring_strdup convenience routine. Add "disabled" display filter edit icons. Fix up whitespace and descriptions in a couple of places. svn path=/trunk/; revision=47522
2013-02-05Prettify Qt build output.Gerald Combs1-3/+18
svn path=/trunk/; revision=47484
2013-02-03Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic andGuy Harris1-3/+3
moc are called uic-qt4 and moc-qt4. Look for them by names, plural. svn path=/trunk/; revision=47457
2013-02-03Move the get-runtime-version stuff back outside of #ifdef WIN32.Jeff Morriss1-0/+2
svn path=/trunk/; revision=47454
2013-02-03call load_wpcap before collecting the run-time version information.Anders Broman1-15/+16
svn path=/trunk/; revision=47451
2013-02-02Reflect recent.c moving from the top-level directory to the uiGuy Harris1-1/+0
directory. svn path=/trunk/; revision=47441
2013-02-02Move the GUI-independent window geometry stuff to ui/recent.c, so weGuy Harris5-307/+163
only have one copy. svn path=/trunk/; revision=47440
2013-02-02Reflect the move of recent.c to the ui directory.Guy Harris1-0/+1
svn path=/trunk/; revision=47439
2013-02-02Move recent.c to the ui directory, as we did with its header file.Guy Harris2-0/+1097
svn path=/trunk/; revision=47438
2013-02-02In Qt 4, C strings are, by default, treated as 7-bit ASCII whenGuy Harris1-0/+7
converted to QStrings, and, to get them to be treated as UTF-8, you need to call the setCodecForCStrings method of the QTextCodec class to set the codec to a UTF-8 codec. In Qt 5, C strings are treated always as UTF-8 when converted to QStrings, and there's no setCodecForCStrings method for the QTextCodec class. In addition, there's also no setCodecForTr method for the QTextCodec class - and QObject isn't documented as even *having* a tr method, so I don't know what to do there. svn path=/trunk/; revision=47436
2013-02-01Fix [ 68%] Building CXX object ↵Alexis La Goutte1-1/+1
ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2 StyleName is not available in Qt < 4.8 disable this line for the moment (maye be add if QTVERSION > 4.8 ?) svn path=/trunk/; revision=47409
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