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

Merge capture->interfaces and capture->options 

Change-Id: I0a2976da97bd777abbf4701915551d9d481b0a13
Reviewed-on: https://code.wireshark.org/review/2785
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Evan Huus 2014-07-02 17:50:38 -04:00 committed by Anders Broman
parent 4b5967f683
commit 72e15f22ea
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/main_window.h
View File

@ -339,10 +339,6 @@ private slots:
void on_actionSCTPAnalyseThisAssociation_triggered();
void on_actionSCTPFilterThisAssociation_triggered();
#ifdef HAVE_LIBPCAP
void on_actionCaptureInterfaces_triggered();
#endif
void openStatisticsTreeDialog(const gchar *abbr);
void on_actionStatistics29WestTopics_Advertisements_by_Topic_triggered();
void on_actionStatistics29WestTopics_Advertisements_by_Source_triggered();

1
ui/qt/main_window.ui
View File

@ -164,7 +164,6 @@
<property name="title">
<string>&amp;Capture</string>
</property>
<addaction name="actionCaptureInterfaces"/>
<addaction name="actionCaptureOptions"/>
<addaction name="actionStartCapture"/>
<addaction name="actionStopCapture"/>

20
ui/qt/main_window_slots.cpp
View File

@ -2329,7 +2329,7 @@ void MainWindow::on_actionSummary_triggered()
}
#ifdef HAVE_LIBPCAP
void MainWindow::on_actionCaptureInterfaces_triggered()
void MainWindow::on_actionCaptureOptions_triggered()
{
connect(&capture_interfaces_dialog_, SIGNAL(setFilterValid(bool)), this, SLOT(startInterfaceCapture(bool)));
capture_interfaces_dialog_.SetTab(0);
@ -2347,24 +2347,6 @@ void MainWindow::on_actionCaptureInterfaces_triggered()
capture_interfaces_dialog_.raise();
capture_interfaces_dialog_.activateWindow();
}
void MainWindow::on_actionCaptureOptions_triggered()
{
capture_interfaces_dialog_.SetTab(2);
capture_interfaces_dialog_.UpdateInterfaces();
if (capture_interfaces_dialog_.isMinimized() == true)
{
capture_interfaces_dialog_.showNormal();
}
else
{
capture_interfaces_dialog_.show();
}
capture_interfaces_dialog_.raise();
capture_interfaces_dialog_.activateWindow();
}
#endif