Wireshark-commits: [Wireshark-commits] master-2.0 d003e6d: Restore a preference column type if fiel

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 1 Jun 2016 04:31:45 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d003e6d3ef55246476754c301a10adaee9e72e1d
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

d003e6d by Michael Mann (mmann78@xxxxxxxxxxxx):

    Restore a preference column type if fields are empty.
    
    The column type is automatically changed to Custom if user clicks
    on the "Fields" or "Field Occurrences" column.  This can be
    accidental and cause the user grief if he doesn't realize it.
    If there is no text in the field, restore the type to its
    original value.
    
    # Conflicts:
    #	ui/qt/column_preferences_frame.cpp
    
    Bug: 12465
    Change-Id: I0453f43be13077aba58cca61011eeff9ca9b83b2
    Reviewed-on: https://code.wireshark.org/review/15600
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/15658
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  1a3e001   If we've seen HTTP in this conversation mark the frame as being HTTP.
    adds  d003e6d   Restore a preference column type if fields are empty.


Summary of changes:
 ui/qt/column_preferences_frame.cpp |   50 +++++++++++++++++++++++++-----------
 ui/qt/column_preferences_frame.h   |    1 +
 2 files changed, 36 insertions(+), 15 deletions(-)