Wireshark-commits: [Wireshark-commits] master-2.6 07946bc: Some fixes.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 06 Jul 2018 00:54:52 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=07946bcef83f3d54b7fb16159d35f4e8bac3a86d
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

07946bc by Guy Harris (guy@xxxxxxxxxxxx):

    Some fixes.
    
    For filePath() and fileName(), just return a null string if we can't
    convert from the native encoding to UTF-8 - those aren't used for
    displaying, those are used for setting the main window's file name and
    for generating names of files to save based on the capture file name.
    
    Have fileDisplayName() just return the display name, without
    "[closing]"/"[closed]" decoration or a special case for no file being
    open (just return a null string if there's no file open), and have
    fileTitle() return the decorated display name.
    
    Change-Id: I244f318d5444dcf58527e5d38c4d073c28b73810
    Reviewed-on: https://code.wireshark.org/review/28594
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 1c6dc6d31f147d1ea7b8694204e81cf5d827de23)
    Reviewed-on: https://code.wireshark.org/review/28630
    

Actions performed:

    from  9cfb825   fileTitle -> fileDisplayName.
    adds  07946bc   Some fixes.


Summary of changes:
 ui/qt/capture_file.cpp     | 25 +++++++++++++++++++------
 ui/qt/capture_file.h       | 40 ++++++++++++++++++++++++++++------------
 ui/qt/wireshark_dialog.cpp |  2 +-
 3 files changed, 48 insertions(+), 19 deletions(-)