[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=60cebb721e3827f220036f1afb0365e24d019e56
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

60cebb7 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Qt: fixes to 'Edit Column' dialog
    
    - set field name and occurrence when editing a custom column
    - convert occurrence number to a QString
    - disable OK button when syntax is incorrect or empty for a custom column
    - update syntax state when opening the edit dialog or when switching between custom and normal column
    
    Bug: 11433
    Change-Id: Ia8424474dd250c78a0b503e0e9d89c322f4f86a9
    Reviewed-on: https://code.wireshark.org/review/11705
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit a4981a279a616c7dfc9a0887ba8511851cc8ec22)
    Reviewed-on: https://code.wireshark.org/review/11724
    

Actions performed:

    from  c156a64   Make routines used only within wiretap/merge.c static.
    adds  60cebb7   Qt: fixes to 'Edit Column' dialog


Summary of changes:
 ui/qt/column_editor_frame.cpp |   43 +++++++++++++++++++++++++++++++----------
 ui/qt/column_editor_frame.h   |    2 +-
 2 files changed, 34 insertions(+), 11 deletions(-)