URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a5fe96e50a2e9602855f1b7f7507edff8aa381e6
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
a5fe96e by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Fixup drag and drop merging.
Make the behavior of MainWindow::dropEvent match the documentation and
dnd_open_file_cmd. If we've been passed a single file, open it. If we've
been passed multiple files, merge them first. Add an is_tempfile
parameter to openCaptureFile.
Add a note about setting the drop description on Windows.
Bug: 12129
Change-Id: I325a4da5a29e940b4efa7654627d8bcafba15b57
Reviewed-on: https://code.wireshark.org/review/19717
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 05fbb48 Qt: Show merge progress.
adds a5fe96e Qt: Fixup drag and drop merging.
Summary of changes:
ui/qt/main_window.cpp | 43 ++++++++++++++++++++++++++++++++++++++-----
ui/qt/main_window.h | 2 +-
ui/qt/main_window_slots.cpp | 4 ++--
3 files changed, 41 insertions(+), 8 deletions(-)