Qt: Add a WiresharkDialog convenience class.

Add WiresharkDialog, a common base class for dialogs centered around
capture files. Make it a parent of Capture File Properties, Traffic
Table, Conversations, and Endpoints.

Rename CaptureFile::read_only_ to file_closed_. Add methods to
WiresharkApplication for generating consistent window titles.

Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257
Reviewed-on: https://code.wireshark.org/review/6097
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 7 insertions, 25 deletions

diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index 37c1348bc7..29d1d19fa8 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -49,24 +49,22 @@
 // - Columns don't resize correctly.
 // - Closing the capture file clears conversation data.
 
-TrafficTableDialog::TrafficTableDialog(QWidget *parent, CaptureFile &cf, const char *filter, const QString &table_name) :
-    QDialog(parent),
+TrafficTableDialog::TrafficTableDialog(QWidget &parent, CaptureFile &cf, const char *filter, const QString &table_name) :
+    WiresharkDialog(parent, cf),
     ui(new Ui::TrafficTableDialog),
     cap_file_(cf),
-    read_only_(false),
+    file_closed_(false),
     filter_(filter)
 {
     ui->setupUi(this);
 //    setAttribute(Qt::WA_DeleteOnClose, true);
 
-    window_name_ = QString("%1s").arg(table_name);
-    setWindowTitle();
-    ui->enabledTypesPushButton->setText(tr("%1 Types").arg(window_name_));
+    QString window_name = QString("%1s").arg(table_name);
+    setWindowSubtitle(window_name);
+    ui->enabledTypesPushButton->setText(tr("%1 Types").arg(window_name));
 
     // XXX Use recent settings instead
-    if (parent) {
-        resize(parent->width(), parent->height() * 3 / 4);
-    }
+    resize(parent.width(), parent.height() * 3 / 4);
 
     QMenu *copy_menu = new QMenu();
     QAction *ca;
@@ -93,12 +91,6 @@ TrafficTableDialog::~TrafficTableDialog()
     delete ui;
 }
 
-void TrafficTableDialog::captureFileClosing()
-{
-    setWindowTitle();
-    read_only_ = true;
-}
-
 const QList<int> TrafficTableDialog::defaultProtos() const
 {
     // Reasonable defaults?
@@ -226,16 +218,6 @@ void TrafficTableDialog::updateWidgets()
     ui->trafficTableTabWidget->setUpdatesEnabled(true);
 }
 
-void TrafficTableDialog::setWindowTitle()
-{
-    QDialog::setWindowTitle(tr("%1 %2 %3 %4")
-                   .arg(wsApp->windowTitlePrefix())
-                   .arg(window_name_)
-                   .arg(wsApp->windowTitleSeparator())
-                   .arg(cap_file_.fileTitle())
-                   );
-}
-
 QList<QVariant> TrafficTableDialog::curTreeRowData(int row) const
 {
     TrafficTableTreeWidget *cur_tree = qobject_cast<TrafficTableTreeWidget *>(ui->trafficTableTabWidget->currentWidget());