diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-01-20 12:26:32 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-21 06:50:56 +0000 |
| commit | a5fe96e50a2e9602855f1b7f7507edff8aa381e6 (patch) | |
| tree | ae40db6c6ee0efed77c2e63bafa7812d5679cb6b /ui/qt/main_window.h | |
| parent | 05fbb4826bcb182cc3895874a15585a96703ce1f (diff) | |
| download | wireshark-a5fe96e50a2e9602855f1b7f7507edff8aa381e6.tar.gz | |
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@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index ffbd8a3cf9..987da8e6f6 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -254,7 +254,7 @@ public slots: * @return True on success, false on failure. */ // XXX We might want to return a cf_read_status_t or a CaptureFile. - bool openCaptureFile(QString cf_path, QString display_filter, unsigned int type); + bool openCaptureFile(QString cf_path, QString display_filter, unsigned int type, gboolean is_tempfile = FALSE); bool openCaptureFile(QString cf_path = QString(), QString display_filter = QString()) { return openCaptureFile(cf_path, display_filter, WTAP_TYPE_AUTO); } void filterPackets(QString new_filter = QString(), bool force = false); void updateForUnsavedChanges(); |