gtk_selection_data_set() takes an int, rather than a size_t, as its last
argument, so cast away that bit of "ZOMG ARENT SIZE_T AND INT THE SAME
SIZE!!!!!!!111ONE!!!!!"
svn path=/trunk/; revision=47628
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
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
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
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
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
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
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
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
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
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
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
the same.
Also: Add an XXX comment:
"progess" rendering doesn't seem to work for Gtk3 ??
svn path=/trunk/; revision=47135
when packing into a [v|h]box so that Gtk2 & Gtk3 behavior is
the same.
Also: Add an XXX comment:
"progess" rendering doesn't seem to work for Gtk3 ??
svn path=/trunk/; revision=47134
If we don't get the airpcap_if_list, don't do anything regarding air_pcap.
update_decryption_mode_list() should probably check if a change is taking place before rescaning all packets.
svn path=/trunk/; revision=47131
Specifically: use gtk_box_pack_start() instead
of gtk_container_add() in a number of places.
Also: do some whitespace cleanup.
svn path=/trunk/; revision=47129
Use gtk_box_pack_start() instead of
gtk_container_add() in a few places so that
window resize behavior is the same for
Gtk2 and Gtk3.
Also: do some whitespace cleanup.
svn path=/trunk/; revision=47117
Specifically: use gtk_box_pack_start()
instead of gtk_container_add() in one case
so that (for Gtk3) a window component properly
expands when the window is resized vertically.
svn path=/trunk/; revision=47115
information to crash dumps and the like. (Currently, we only handle OS
X's CrashReporter, but we should do this on other platforms where this
information can be added and would be helpful.)
svn path=/trunk/; revision=47109
Set a default size for the window so that the
initial size of the window in Gtk3 is similar to
that in Gtk2. That is: so that all the columns
(and a number of rows) show.
svn path=/trunk/; revision=47099
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.
Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.
svn path=/trunk/; revision=47083
Use "4 space" indentation.
Add an XXX comment about better formating needed
for the text in the Help window (so the
text columns line up and so the Help text
looks better).
Comment out a "does-noting" for loop;
svn path=/trunk/; revision=47059
Add an XXX comment about trying (and failing)
to change the behavior of the grid when the
column prefs window is horizontally resized.
Also: do whitespace cleanup: indentation & etc.
svn path=/trunk/; revision=47032
Do some minor changes so that the Gtk2 & Gtk3
window resizing behavior is the same.
Also: Clean up whitespace: indentation & etc.
svn path=/trunk/; revision=47024
1. 'File ! Open' changes applied to the 'File ! Merge' window;
2. Small change made so that the GTk2 & Gtk3 behavior are the same (Finally !)
3. window structure picture and notes updated.
svn path=/trunk/; revision=47008
The Gtk2 vs Gtk3 behavior is not precisely the same
when resizing the window hozizontally; IMO it's
"good enough" (after several days of playing around
trying to make the behaviour identical).
svn path=/trunk/; revision=47004
item's name, status, or type resets it to its default value.
Double-clicking the item's value lets you edit it. Implement the
advanced search field. (Clicking OK and Cancel still doesn't yet do
anything.)
Note that we could probably use a
prefs_register_{uint16|port}_preference routine for 16-bit values. Make
reset_pref public. Update some names and descriptions.
svn path=/trunk/; revision=46986
representations, and default status out of write_prefs and into their
own routines. Split the corresponding custom preference write callbacks.
Fix an apparent memory leak in the hidden column callback.
Add an initial preferences dialog to the Qt port. Use the new preference
routines to implement an "Adavanced" page similar to the "about:config"
page available in many web browsers. Standard pages will hopefully follow
soon.
Remove some QDebug includes and make sure our QTreeWidgets have uniform
row heights set.
svn path=/trunk/; revision=46942
Fix minor differences in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in
various places.
Also; Do some whitespace and formatting style cleanup.
svn path=/trunk/; revision=46937
Use gtk_box_pack_start() instead of gtk_container_add() in several places.
Also; Do some whitespace and formatting style cleanup.
svn path=/trunk/; revision=46931
Add an XXX comment as to an apparent limit on the
number of characters in a tooltip (at least in one case).
Do some minor whitespace and long-lines cleanup.
svn path=/trunk/; revision=46921
Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in one case.
Also; Do some whitespace and formatting style cleanup.
svn path=/trunk/; revision=46920
Set the default window size to show the complete window;
Fix a minor difference in window handling between Gtk2 & Gtk3:
Use gtk_box_pack_start() instead of gtk_container_add() in one case.
Also; misc minor cleanup.
svn path=/trunk/; revision=46918
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=46915
"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
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
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
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
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
(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
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
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
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
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
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
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
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
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
when we detect a remote connection). Use it for the "go to" and search
frames. Properly detect remote connections in the splash overlay.
svn path=/trunk/; revision=46591
It's now possible to build qtshark with autotools and QtCreator if you add some
extra symlinks and fiddle with LD_LIBRARY_PATH.
svn path=/trunk/; revision=46546
actually doing and what users are likely to want to do. Rename the
search enum values and functions to reflect what we're actually doing
and add a comment explaining why making searches more correct might make
searching worse. Add a search bar to the Qt main window, thus
continuing the War On Gratuitous Dialogs.
Clear out any previous temporary label stack items before adding a new one.
svn path=/trunk/; revision=46541
follow_tcp.c(323) : warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
follow_tcp.c(327) : warning C4244: '=' : conversion from '__int64' to 'int', possible loss of data
follow_tcp.c(529) : warning C4267: '=' : conversion from 'size_t' to 'uInt', possible loss of data
svn path=/trunk/; revision=46539
follow_tcp.c: In function ‘follow_read_tcp_stream’:
follow_tcp.c:432: error: ‘gunzip’ may be used uninitialized in this function
make[2]: *** [libgtkui_a-follow_tcp.o] Error 1
set default value to 'not gzipped'
svn path=/trunk/; revision=46535
apply/match-related actions. Have matchSelectedFilter figure out our
filter strings, which lets us remove duplicate code in the apply/match
action slots. Remove some leftover code from an experiment.
Adjust the temporary message colors in the status bar and label stack.
Add a NULL check to construct_match_selected_string.
svn path=/trunk/; revision=46449
"Analyze→Prepare a Filter". Add a context menu to the protocol tree and
fill in the items we've implemented so far.
Add an "applyAllPreferences" method and corresponding
"preferencesUpdated" signal to wsApp. Use it to set the maximum display
filter combo count.
Move the packet filtering code from the display filter edit to the main
window (which makes more sense and matches what we're doing in the GTK+
version and gets rid of more global cfile references). Try to center the
display filter edit button images.
Use a different "close" button in the main toolbar. It looks better but
is still wrong (on OS X at least).
svn path=/trunk/; revision=46434
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.
svn path=/trunk/; revision=46413
Michael Mann