diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-06 22:58:39 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-06 22:58:39 +0000 |
| commit | 2bda67e82e64510bb254999a90404009b19a3ce4 (patch) | |
| tree | 262bfefa5e13ffddcfe0480877d0ce2e53af4be5 /ui/qt/main_window.h | |
| parent | 4333dd03f4e3a669bf93e3d0fbcd1905493cb3c9 (diff) | |
| download | wireshark-2bda67e82e64510bb254999a90404009b19a3ce4.tar.gz | |
Implement File→Merge.
The GTK+ and native Win32 versions are slightly different. The GTK+
version lets you select an output file type and the Win32 version uses
the existing capture filetype. We do the latter for now.
Start documenting significant UI changes in README.qt. This might be
better handled on the wiki.
svn path=/trunk/; revision=44797
Diffstat (limited to 'ui/qt/main_window.h')
| -rw-r--r-- | ui/qt/main_window.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 1bac66cdcb..da2a829605 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -94,7 +94,8 @@ private: QSocketNotifier *pipe_notifier_; #endif - void openCaptureFile(QString& cfPath = *new QString()); + void openCaptureFile(QString& cf_path = *new QString()); + void mergeCaptureFile(); void saveCapture(capture_file *cf, bool close_capture); bool testCaptureFileClose(capture_file *cf, bool from_quit = false, QString& before_what = *new QString()); void captureStop(capture_file *cf); @@ -138,6 +139,7 @@ private slots: void openRecentCaptureFile(QString& cfPath = *new QString()); void on_actionFileOpen_triggered(); + void on_actionFileMerge_triggered(); void on_actionFileClose_triggered(); void on_actionGoGoToPacket_triggered(); void resetPreviousFocus(); |