Wireshark-commits: [Wireshark-commits] master-2.0 4afc1be: Qt: Freeze+thaw the main window during n
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: Wed, 11 Nov 2015 05:28:48 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4afc1be888e86afd61b2f0229240016a79d31c70
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

4afc1be by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: Freeze+thaw the main window during nested operations.
    
    As noted in main_window.cpp:
    
    // Our event loop becomes nested whenever we call update_progress_dlg, which
    // includes several places in file.c. The GTK+ UI stays out of trouble by
    // showing a modal progress dialog. We attempt to do the equivalent below by
    // disabling parts of the main window. At a minumum the ProgressFrame in the
    // main status bar must remain accessible.
    
    Move the freeze+thaw code from captureFileRetapStarted and
    captureFileRetapFinished to its own set of member functions. Call them
    when we {,un}mark and {,un}ignore packets and note that we should
    probably call them elsewhere. Disable mark and ignore actions when we
    freeze and restore their states when we thaw.
    
    Bug: 11681
    Change-Id: I6f015f7f5f6c98cd48ace2c87f43f48efe51a88b
    Reviewed-on: https://code.wireshark.org/review/11690
    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 757fe65474a37d94e7eba1b6b4bb6df23b69ba56)
    Reviewed-on: https://code.wireshark.org/review/11722
    

Actions performed:

    from  cb81c7a   GTK: Add separate working desktop file for GTK+ Wireshark GUI
    adds  4afc1be   Qt: Freeze+thaw the main window during nested operations.


Summary of changes:
 ui/qt/main_window.cpp       |   55 +++++++++++++++++++++++++++++++++++++++++++
 ui/qt/main_window.h         |    6 +++++
 ui/qt/main_window_slots.cpp |   28 +++++++++++-----------
 3 files changed, 75 insertions(+), 14 deletions(-)