Use signal to close packet dialogs
Change-Id: I312f8de8de933e576b60d2b158e4c4f2d1147ef1 Reviewed-on: https://code.wireshark.org/review/10238 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
parent
fbadcdd36b
commit
99dab8214a
|
@ -138,7 +138,6 @@ private:
|
||||||
QActionGroup *time_display_actions_;
|
QActionGroup *time_display_actions_;
|
||||||
QActionGroup *time_precision_actions_;
|
QActionGroup *time_precision_actions_;
|
||||||
FunnelStatistics *funnel_statistics_;
|
FunnelStatistics *funnel_statistics_;
|
||||||
QList<QDialog *> packet_dialogs_;
|
|
||||||
|
|
||||||
bool capture_stopping_;
|
bool capture_stopping_;
|
||||||
bool capture_filter_valid_;
|
bool capture_filter_valid_;
|
||||||
|
@ -202,6 +201,7 @@ signals:
|
||||||
void setDissectedCaptureFile(capture_file *cf);
|
void setDissectedCaptureFile(capture_file *cf);
|
||||||
void displayFilterSuccess(bool success);
|
void displayFilterSuccess(bool success);
|
||||||
void monospaceFontChanged(const QFont &mono_font);
|
void monospaceFontChanged(const QFont &mono_font);
|
||||||
|
void closePacketDialogs();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
// in main_window_slots.cpp
|
// in main_window_slots.cpp
|
||||||
|
@ -240,7 +240,6 @@ public slots:
|
||||||
void captureFileSaveStarted(const QString &file_path);
|
void captureFileSaveStarted(const QString &file_path);
|
||||||
|
|
||||||
void filterExpressionsChanged();
|
void filterExpressionsChanged();
|
||||||
void packetDialogClosed(QDialog *);
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
// Manually connected slots (no "on_<object>_<signal>").
|
// Manually connected slots (no "on_<object>_<signal>").
|
||||||
|
@ -389,7 +388,6 @@ private slots:
|
||||||
void on_actionViewResizeColumns_triggered();
|
void on_actionViewResizeColumns_triggered();
|
||||||
|
|
||||||
void openPacketDialog(bool from_reference = false);
|
void openPacketDialog(bool from_reference = false);
|
||||||
void closePacketDialogs();
|
|
||||||
void on_actionViewShowPacketInNewWindow_triggered();
|
void on_actionViewShowPacketInNewWindow_triggered();
|
||||||
void on_actionContextShowLinkedPacketInNewWindow_triggered();
|
void on_actionContextShowLinkedPacketInNewWindow_triggered();
|
||||||
void on_actionViewReload_triggered();
|
void on_actionViewReload_triggered();
|
||||||
|
|
|
@ -2294,28 +2294,14 @@ void MainWindow::openPacketDialog(bool from_reference)
|
||||||
|
|
||||||
connect(this, SIGNAL(monospaceFontChanged(QFont)),
|
connect(this, SIGNAL(monospaceFontChanged(QFont)),
|
||||||
packet_dialog, SIGNAL(monospaceFontChanged(QFont)));
|
packet_dialog, SIGNAL(monospaceFontChanged(QFont)));
|
||||||
connect(packet_dialog, SIGNAL(packetDialogClosed(QDialog *)),
|
connect(this, SIGNAL(closePacketDialogs()),
|
||||||
this, SLOT(packetDialogClosed(QDialog *)));
|
packet_dialog, SLOT(close()));
|
||||||
zoomText(); // Emits monospaceFontChanged
|
zoomText(); // Emits monospaceFontChanged
|
||||||
|
|
||||||
packet_dialogs_.append(packet_dialog);
|
|
||||||
packet_dialog->show();
|
packet_dialog->show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::closePacketDialogs()
|
|
||||||
{
|
|
||||||
QList<QDialog *> packet_dialogs_copy(packet_dialogs_);
|
|
||||||
foreach(QDialog *packet_dialog, packet_dialogs_copy) {
|
|
||||||
packet_dialog->close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::packetDialogClosed(QDialog *packet_dialog)
|
|
||||||
{
|
|
||||||
packet_dialogs_.removeOne(packet_dialog);
|
|
||||||
}
|
|
||||||
|
|
||||||
void MainWindow::on_actionViewShowPacketInNewWindow_triggered()
|
void MainWindow::on_actionViewShowPacketInNewWindow_triggered()
|
||||||
{
|
{
|
||||||
openPacketDialog();
|
openPacketDialog();
|
||||||
|
|
Loading…
Reference in New Issue