Wireshark-commits: [Wireshark-commits] master-2.0 5be01b6: Add a Busy status to SyntaxLineEdit.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5be01b63602b897d2c4f637d89d2d58c1cce497b
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
5be01b6 by Gerald Combs (gerald@xxxxxxxxxxxxx):
Add a Busy status to SyntaxLineEdit.
For CaptureFilterEdit it's possible to have an indeterminate state while
we're waiting on name resolution. Add a Busy status to SyntaxLineEdit
and set the text color to a mix of the normal foreground and background
colors (gray on most platforms).
Make the Busy state valid so that we don't have to wait on an
annoyingly-long name resolution to start capturing.
Update the global capture option filters using the main welcome capture
filter when we start a capture instead of when we've finished checking
the filter syntax.
Connect the CaptureFilterEdit returnPressed signal no matter what so
that we can start a capture by pressing return in the welcome screen
CaptureFilterEdit.
Add a fake resolution timeout to the CaptureFilterSyntaxWorker debug
code to make testing the different states easier.
Conflicts:
ui/qt/capture_filter_edit.cpp
Bug: 11950
Change-Id: I0cf01c0fbc0dd8065cdf5a91f1d6b224291b1ce6
Reviewed-on: https://code.wireshark.org/review/13110
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
(cherry picked from commit 0ce9ac4137429ce4d632c1cddd48ef6f36d9d4c2)
Reviewed-on: https://code.wireshark.org/review/13137
Actions performed:
from 4986af0 debian: Fix setting -Wl,-Bsymbolic on Wheezy only
adds 5be01b6 Add a Busy status to SyntaxLineEdit.
Summary of changes:
ui/qt/capture_filter_edit.cpp | 46 +++++++-------------------------
ui/qt/capture_filter_edit.h | 2 +-
ui/qt/capture_filter_syntax_worker.cpp | 6 +++++
ui/qt/main_welcome.cpp | 5 ++++
ui/qt/main_welcome.h | 1 +
ui/qt/main_window_slots.cpp | 30 +++++++++++++++++++++
ui/qt/syntax_line_edit.cpp | 45 ++++++++++++++++++++++++-------
ui/qt/syntax_line_edit.h | 3 ++-
8 files changed, 89 insertions(+), 49 deletions(-)
