osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Capture options dialog: Fix start of capture by double click

This commit is contained in:
j.novak@netsystem.cz 2022-10-31 14:07:49 +00:00 committed by AndersBroman
parent 460d4c85c2
commit dd5f86c674
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/qt/capture_options_dialog.cpp
View File

@ -233,7 +233,7 @@ CaptureOptionsDialog::CaptureOptionsDialog(QWidget *parent) :
connect(mainApp, SIGNAL(localInterfaceListChanged()), this, SLOT(updateLocalInterfaces()));
connect(ui->browseButton, SIGNAL(clicked()), this, SLOT(browseButtonClicked()));
connect(ui->interfaceTree, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(itemClicked(QTreeWidgetItem*,int)));
connect(ui->interfaceTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*)));
connect(ui->interfaceTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem*,int)));
connect(ui->tempDirBrowseButton, SIGNAL(clicked()), this, SLOT(tempDirBrowseButtonClicked()));
ui->tabWidget->setCurrentIndex(0);
@ -518,11 +518,17 @@ void CaptureOptionsDialog::itemClicked(QTreeWidgetItem *item, int column)
#endif /* HAVE_LIBPCAP */
}
void CaptureOptionsDialog::itemDoubleClicked(QTreeWidgetItem *item)
void CaptureOptionsDialog::itemDoubleClicked(QTreeWidgetItem *item, int column)
{
InterfaceTreeWidgetItem *ti = dynamic_cast<InterfaceTreeWidgetItem *>(item);
if (!ti) return;
switch(column) {
// Double click starts capture just on columns which are not editable
case col_interface_:
case col_traffic_:
{
#ifdef HAVE_LIBPCAP
interface_t *device;
QString interface_name = ti->text(col_interface_);
@ -541,6 +547,12 @@ void CaptureOptionsDialog::itemDoubleClicked(QTreeWidgetItem *item)
#endif /* HAVE_LIBPCAP */
emit startCapture();
close();
break;
}
default:
break;
}
}
void CaptureOptionsDialog::on_gbStopCaptureAuto_toggled(bool checked)

2
ui/qt/capture_options_dialog.h
View File

@ -91,7 +91,7 @@ private slots:
void browseButtonClicked();
void interfaceItemChanged(QTreeWidgetItem *item, int column);
void itemClicked(QTreeWidgetItem *item, int column);
void itemDoubleClicked(QTreeWidgetItem *item);
void itemDoubleClicked(QTreeWidgetItem *item, int column);
void changeEvent(QEvent* event);
void tempDirBrowseButtonClicked();

3
ui/qt/interface_frame.cpp
View File

@ -434,8 +434,11 @@ void InterfaceFrame::on_interfaceTree_doubleClicked(const QModelIndex &index)
}
#endif
// Start capture for all columns except the first one with extcap
if (IFTREE_COL_EXTCAP != realIndex.column()) {
startCapture(interfaces);
}
}
#ifdef HAVE_LIBPCAP
void InterfaceFrame::on_interfaceTree_clicked(const QModelIndex &index)