summaryrefslogtreecommitdiff
path: root/ui/gtk/color_dlg.c
AgeCommit message (Collapse)AuthorFilesLines
2016-01-12Add some missing curly braces.Guy Harris1-1/+2
Change-Id: Ifcacd1fedd8c71d47ab618d036765b8195d4ccbb Reviewed-on: https://code.wireshark.org/review/13209 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-01No need for toolkit-dependent color initialization.Guy Harris1-1/+1
We're not allocating colors ourselves in GTK+ (and haven't been doing so since at least 1.12), and all color_t values are valid colors, so we don't need any toolkit-specific processing to fill in a color_t. While we're at it, catch read errors when reading color filter files. Change-Id: Ieb520d141cf15e371a31a01459d466c95ba2209b Reviewed-on: https://code.wireshark.org/review/12985 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-28Refactor GUI dependencies out of color_filters.[ch] and move it to epan ↵Michael Mann1-21/+36
directory. This also moved color.h into color_filters.h Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e Reviewed-on: https://code.wireshark.org/review/12831 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-01Remove unneeded includes from ui folderMartin Mathieson1-7/+0
Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a Reviewed-on: https://code.wireshark.org/review/6128 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-25Update the simple dialog code.Gerald Combs1-1/+1
Rename simple_dialog_qt.{cpp,h} to simple_dialog.{cpp,h}. Make it a subclass of QMessageBox. Queue messages at startup similar to GTK+. Move the GTK+-specific simple_dialog declarations to gtk/simple_dialog.h. Don't yell at the user so much. Replace exclamation points with periods. Change-Id: I1cc771106222d5e06f1f52d67ac29d6dc367cce4 Reviewed-on: https://code.wireshark.org/review/4288 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-05Fix whitespace/indentation to match editor modelines.Bill Meier1-14/+14
Change-Id: I3445ae22f10584582d465bf632942e016f5f70ca Reviewed-on: https://code.wireshark.org/review/3452 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-11Migrate GTK icon handling to GTK 3.10 APIBalint Reczey1-10/+10
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-25Remove trailing whitespaceBill Meier1-1/+1
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2013-07-18Try to fix 'old-style function definition' warningPascal Quantin1-1/+1
svn path=/trunk/; revision=50720
2013-07-18From Cal Turney:Anders Broman1-9/+39
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved. If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved. A "Continue without Saving" button is provided so that the user can save the profile under a different name. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 svn path=/trunk/; revision=50716
2013-07-17Backing out r50690 (exept simple_dialog)Anders Broman1-39/+9
struct FILE is different on windows vs *nix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 svn path=/trunk/; revision=50691
2013-07-17From Cal Turney:Anders Broman1-9/+39
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved. If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved. A "Continue without Saving" button is provided so that the user can save the profile under a different name. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 svn path=/trunk/; revision=50690
2013-07-01 Define certain 'const char *...' arrays as static.Bill Meier1-1/+1
(That is: Don't create the array on the stack each time the function is called). Reduces code memory usage and execution time. (See SVN #50271) svn path=/trunk/; revision=50295
2013-05-14Use gtk_dialog_set_alternative_button_order() to set the "alternative"Guy Harris1-7/+4
button order (that order is what's used on Windows). Put the affirmative answer on the right by default. svn path=/trunk/; revision=49284
2013-05-14Make the dialog a child of the color filters dialog, not the top-levelGuy Harris1-1/+1
window. svn path=/trunk/; revision=49283
2013-05-14Use a modal GTK+ message dialog to ask the user whether to nuke theirGuy Harris1-21/+37
personal color settings. svn path=/trunk/; revision=49282
2013-03-08Use explicit casts.Anders Broman1-15/+15
svn path=/trunk/; revision=48186
2013-03-01Fix [-W shadow] issue in SVN #47958 in a slightly different manner than the ↵Bill Meier1-3/+3
fix SVN #47960. svn path=/trunk/; revision=47976
2013-02-28color_edit_dlg update:Bill Meier1-7/+18
- Significantly simplify & rework code; - Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer. - Minor UI cleanup (default buttons & etc) - Fix crash which occurred in the (existing) GTK3 related code. - Fix some other relatively minor bugs (including some minor memory leaks); - Remove some old, commented-out code; - Use a more consistent naming scheme for certain variables. svn path=/trunk/; revision=47958
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-09-04- Replace packet_list_recreate_visible_rows -> ↵Jörg Mayer1-3/+3
packet_list_recreate_visible_rows_list - Replace new_packet_list_ -> packet_list_ svn path=/trunk/; revision=44765
2012-09-04Rename new_packet_list.[ch] to packet_list.[ch]Jörg Mayer1-1/+1
svn path=/trunk/; revision=44764
2012-07-20Fix some clang warnings: implicit conversion from enumeration type ↵Jakub Zawadzki1-2/+2
'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-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-04-20Replace gtk_vbox_new() and gtk_hbox_new() with ws_gtk_box_new().Anders Broman1-7/+7
svn path=/trunk/; revision=42161
2012-01-16Move some headers for UI stuff, and the alert_box.c UI-specific file, toGuy Harris1-1/+2
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-15Move gtk to ui/gtk.Jörg Mayer1-0/+1064
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518