osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: fix file set menus when stopping a capture or opening a capture after startup 

Create file_set_dialog_ window at program start so that file set menu entries
are properly populated

Bug: 12904
Change-Id: I597067da51808000683b15a19df646857082a867
Reviewed-on: https://code.wireshark.org/review/17785
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Pascal Quantin 2016-09-18 21:54:50 +02:00 committed by Alexis La Goutte
parent d7a07deb19
commit 7a7f020285
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/main_window.cpp
View File

@ -377,6 +377,10 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(openCaptureFile(QString,QString)));
connect(this, SIGNAL(displayFilterSuccess(bool)), df_edit, SLOT(displayFilterSuccess(bool)));
file_set_dialog_ = new FileSetDialog(this);
connect(file_set_dialog_, SIGNAL(fileSetOpenCaptureFile(QString)),
this, SLOT(openCaptureFile(QString)));
initMainToolbarIcons();
main_ui_->displayFilterToolBar->insertWidget(main_ui_->actionDisplayFilterExpression, df_combo_box_);

14
ui/qt/main_window_slots.cpp
View File

@ -693,9 +693,7 @@ void MainWindow::captureCaptureFailed(capture_session *) {
void MainWindow::captureFileOpened() {
if (capture_file_.window() != this) return;
if (file_set_dialog_) {
file_set_dialog_->fileOpened(capture_file_.capFile());
}
file_set_dialog_->fileOpened(capture_file_.capFile());
setMenusForFileSet(true);
emit setCaptureFile(capture_file_.capFile());
}
@ -775,9 +773,7 @@ void MainWindow::captureFileClosing() {
void MainWindow::captureFileClosed() {
packets_bar_update();
if (file_set_dialog_) {
file_set_dialog_->fileClosed();
}
file_set_dialog_->fileClosed();
setMenusForFileSet(false);
setWindowModified(false);
@ -1685,12 +1681,6 @@ void MainWindow::on_actionFileSaveAs_triggered()
void MainWindow::on_actionFileSetListFiles_triggered()
{
if (!file_set_dialog_) {
file_set_dialog_ = new FileSetDialog(this);
connect(file_set_dialog_, SIGNAL(fileSetOpenCaptureFile(QString)),
this, SLOT(openCaptureFile(QString)));
}
file_set_dialog_->show();
}