aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2013-01-03Move the font preferences to the colors pane and change its name toGerald Combs8-206/+247
"Font and Colors". Use a GtkFontButton to select the font and update the sample text accordingly. Instead of attempting to resize the sample color text (which didn't appear to work) scroll to the text that matches the current combo box selection. svn path=/trunk/; revision=46909
2013-01-02Use ws_gtk_grid...() in place of gtk_table...();Bill Meier1-29/+30
Also: Fix a minor difference in window handling between Gtk2 & Gtk3: Use gtk_box_pack_start() instead of gtk_container_add(0 in one case. svn path=/trunk/; revision=46908
2013-01-02Fix a minor window handling difference between GTK2 & GTK3:Bill Meier1-203/+204
Use gtk_box_pack_start() instead of gtk_container_add() in several places. svn path=/trunk/; revision=46906
2013-01-02Fix a GTK3 issue:Bill Meier1-1/+1
Use gtk_box_pack_start() instead of gtk_container_add(). svn path=/trunk/; revision=46904
2013-01-02Fix some GTK3 issues:Bill Meier1-504/+572
Use gtk_box_pack_start() instead of gtk_container_add() in several places. Also: Remove several no-effect calls to gtk_box_set_child_packing(); Use consistent whitespace & formatting style; Fix some long lines. svn path=/trunk/; revision=46903
2013-01-01Use scrolled-windows to enclose "custom" prefs pages (User Interface, ↵Bill Meier1-2/+11
Layout, etc) in the same manner as to "protocol prefs" pages. This ensures that the bottom row buttons won't disappear off the bottom of the prefs window if one (or more) of the custom prefs pages is too large to fit vertically within the available screen space. In Wireshark 1.8, more items were added to the "User Interface" prefs page thus leading to an increased possibility of this issue occurring. I believe this fixes Bug #8078. #Backport Wireshark 1.8 svn path=/trunk/; revision=46885
2012-12-31Make sure moc can find config.h.Gerald Combs1-1/+1
svn path=/trunk/; revision=46876
2012-12-31It might help for the Qt version of Wireshark to link against the QtGerald Combs2-31/+36
libraries and to have a main() function. Replace some manual Makefile rules with an implicit rule. svn path=/trunk/; revision=46875
2012-12-31Update Makefile to add packet_comment_dialog filesAlexis La Goutte2-0/+3
svn path=/trunk/; revision=46874
2012-12-31Add a .cpp target for each ui_*.h prerequisite.Gerald Combs1-13/+13
svn path=/trunk/; revision=46868
2012-12-30Move profile deletion code from profile_dlg.c to profile.c. Add leftGerald Combs11-44/+216
mouse and context (right mouse) signals to label stacks and use them to pop up profile menus in the status bar. Add profile actions (manage, new, edit, delete) to the profile dialog. svn path=/trunk/; revision=46863
2012-12-29Add a few consts to fix some compiler (GCC) errors.Bill Meier1-1/+2
svn path=/trunk/; revision=46849
2012-12-29Add a vertical scrollbar to the summary dialog window.Bill Meier1-2/+8
(The window has gotten pretty tall; Creating a multiline 'Capture File Comments'" entry may make the buttons inaccessible w/o a scrollbar). ##backport 1.8 svn path=/trunk/; revision=46844
2012-12-29Show the current profile name. Fix the packet status.Gerald Combs3-5/+16
svn path=/trunk/; revision=46839
2012-12-29Fix distcheck.Gerald Combs1-0/+1
svn path=/trunk/; revision=46838
2012-12-29Add profile_dialog.Gerald Combs3-0/+11
svn path=/trunk/; revision=46837
2012-12-29Try to fix compilation on Windows.Gerald Combs1-0/+4
svn path=/trunk/; revision=46836
2012-12-29Profile switching works when we have a capture file open so go ahead andGerald Combs1-12/+12
enable it. svn path=/trunk/; revision=46835
2012-12-29Remove some duplicate code from ui/profile.c and move in more code fromGerald Combs19-284/+988
ui/gtk/profile_dialog.c. Use the correct profile list in profile_dialog.c so that deletion works. Add a profile dialog to the Qt port. For some reason it crashes when changing configuration profiles, which might be related to bug 7722. Move the Qt configuration profile initialization from main.cpp to wireshark_application.cpp. Make sure QMenuBar doesn't grab the configuration profiles action on OS X. Add more role color names to tango_colors.h. svn path=/trunk/; revision=46834
2012-12-28Fix [ 76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: ↵Alexis La Goutte1-4/+4
In function ‘init_profile_list’: ui/profile.c:194:20: error: variable ‘fl_entry’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors svn path=/trunk/; revision=46824
2012-12-28Fix [76%] Building C object ui/CMakeFiles/ui.dir/profile.c.o ui/profile.c: ↵Alexis La Goutte2-2/+2
In function ‘init_profile_list’: ui/profile.c:195:20: error: variable ‘profile’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors svn path=/trunk/; revision=46823
2012-12-27Remove an unused variable.Gerald Combs1-2/+1
svn path=/trunk/; revision=46811
2012-12-27Make sure our loops terminate.Gerald Combs1-1/+5
svn path=/trunk/; revision=46810
2012-12-27Move common profile code to ui/profile.[ch].Gerald Combs5-335/+494
svn path=/trunk/; revision=46808
2012-12-26Cast away another const warning that only shows up under really recent GCCs.Evan Huus1-10/+16
svn path=/trunk/; revision=46785
2012-12-26if 0 out debug codeAnders Broman1-0/+2
svn path=/trunk/; revision=46784
2012-12-26if 0 out debug codeAnders Broman1-2/+2
svn path=/trunk/; revision=46783
2012-12-26Move summary related stuff to summary_dlgAnders Broman5-80/+92
svn path=/trunk/; revision=46782
2012-12-26Fix another discarded qualifier error.Guy Harris4-20/+3
Remove some redundant declarations/definitions from ui/gtk/capture_dlg.h. svn path=/trunk/; revision=46780
2012-12-26Squelch some more discarding-qualifiers warnings.Guy Harris2-5/+5
svn path=/trunk/; revision=46771
2012-12-26simple_dialog_primary_start() and simple_dialog_primary_end() are nowGuy Harris1-4/+4
declared as returning const char *s; make it so. svn path=/trunk/; revision=46767
2012-12-26Hopefully this case is OK in C++; bit-fields can't be enums in standardGuy Harris1-1/+1
C, so.... svn path=/trunk/; revision=46764
2012-12-26Fix a bunch of warnings.Guy Harris57-293/+295
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-24The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it. ThatGuy Harris1-5/+5
squelches some warnings. svn path=/trunk/; revision=46729
2012-12-24The inverse of GINT_TO_POINTER() is GPOINTER_TO_INT(); use it (thisGuy Harris1-1/+1
squelches some warnings). svn path=/trunk/; revision=46728
2012-12-24Cast away warnings implicit 64-bit-to-32-bit conversions. (We shouldGuy Harris2-9/+10
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-23Use the types that PortAudio specifies for values passed to or returnedGuy Harris1-14/+11
from PortAudio; that squelches some implicit 64-bit-to-32-bit conversion warnings. Mark unused arguments with _U_ rather than adding fake usages for them. svn path=/trunk/; revision=46717
2012-12-23Add ui_packet_comment_dialog.h and ui_time_shift_dialog.h.Gerald Combs1-1/+3
svn path=/trunk/; revision=46711
2012-12-23Qt: Implement packet comments. Fix packet detail updates.Gerald Combs17-17/+305
GTK+: Shorten the packet comment menu item name. Remove a couple of unneeded includes. Both: Add an arbitrary 20 MB limit when fetching all packet comments. Use a color from the Tango palette for comments. svn path=/trunk/; revision=46709
2012-12-23Add the time shift dialog.Gerald Combs3-0/+11
svn path=/trunk/; revision=46708
2012-12-22Remove unneeded initializations, and one redundant if condition.Evan Huus17-31/+31
svn path=/trunk/; revision=46702
2012-12-22Remove one unneeded initializer and add one missing initializer, as foundEvan Huus2-2/+2
by CppCheck. svn path=/trunk/; revision=46700
2012-12-22The Wireshark file icon makes more sense than a floppy disk[1]. SwitchGerald Combs6-12/+12
back to it and name it "Save" instead of "File". [1] http://www.hanselman.com/blog/TheFloppyDiskMeansSaveAnd14OtherOldPeopleIconsThatDontMakeSenseAnymore.aspx svn path=/trunk/; revision=46696
2012-12-22R46374 replaced too many GTK_STOCK_SAVEs. Put them back.Gerald Combs2-5/+5
svn path=/trunk/; revision=46690
2012-12-21Don't use so much white space.Gerald Combs1-23/+4
svn path=/trunk/; revision=46689
2012-12-21Add time shifting to the packet list context menu.Gerald Combs1-2/+1
svn path=/trunk/; revision=46685
2012-12-21Enable and disable the time shift menu action as needed.Gerald Combs1-2/+1
svn path=/trunk/; revision=46683
2012-12-21Move common time shifting code to ui/time_shift.[ch]. Change theGerald Combs18-619/+1458
shifting routines to return an error message on failure or NULL on success. Prettify and simplify the layout of the GTK+ time shift dialog. Make the cancel button work as expected. Add a time shift dialog to the Qt port. I used a Mad Lib (sentence) layout. Hopefully that won't make translation too difficult. For some reason time shifts aren't immediately shown in the packet detail. This appears to be a bug in the packet list / packet detail code. Add warning role color definitions to tango_colors.h and use them. svn path=/trunk/; revision=46680
2012-12-21trivial: clean up ui/gtk/prefs_filter_expressions.cMartin Kaiser1-54/+61
replace TABs with spaces add editor modelines svn path=/trunk/; revision=46679
2012-12-21Convert to use new ws_gtk_grid...() wrappers to replaceBill Meier1-7/+7
direct use of Gtktable. (The first of many conversions ...) Essentially: the wrappers use GtkTable on Gtk2 and GtkGrid on Gtk3. svn path=/trunk/; revision=46655