Wireshark · Wireshark-commits: [Wireshark-commits] master-2.0 ec08682: Fix capture output options.

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ec08682f7e5c491773f8881254e8780ec0672fa1
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

ec08682 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Fix capture output options.
    
    Remove the "permanent file" checkbox. We weren't properly checking its
    value and it was extraneous. Add placeholder text about temporary files.
    
    Move the filename above the other options. That's where it is in the
    GTK+ UI and it's arguably the most important.
    
    When capturing to multiple files the size and duration settings aren't
    mutually exclusive.
    
    # Conflicts:
    #	ui/qt/capture_interfaces_dialog.cpp
    #	ui/qt/capture_interfaces_dialog.ui
    
    Bug: 12388
    Change-Id: I1da1d3524e3c2de2361050913281472a172faa3a
    Reviewed-on: https://code.wireshark.org/review/13269
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/15604
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  de78e5e   If we're "[Saving] the file and [closing] it", actually *close* it.
    adds  ec08682   Fix capture output options.


Summary of changes:
 ui/qt/capture_interfaces_dialog.cpp |   16 ++--
 ui/qt/capture_interfaces_dialog.ui  |  147 ++++++++++++-----------------------
 2 files changed, 56 insertions(+), 107 deletions(-)