aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrene Ruengeler <ruengeler@wireshark.org>2014-11-17 08:51:12 +0100
committerEvan Huus <eapache@gmail.com>2014-11-21 21:52:22 +0000
commitc07e9fe4509cb487be71dda7878fbc516870b875 (patch)
tree81dd26f64b8f5fdfceefb0ff90cf9079653ce188
parentd7e277aa0811bf22a68b162e490b80c970591698 (diff)
Add minimize and maximize buttons to the SCTP analysis windows.
As suggested by Jeff Morriss. Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64 Reviewed-on: https://code.wireshark.org/review/5361 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
-rw-r--r--ui/qt/sctp_all_assocs_dialog.cpp5
-rw-r--r--ui/qt/sctp_assoc_analyse_dialog.cpp4
-rw-r--r--ui/qt/sctp_chunk_statistics_dialog.cpp5
-rw-r--r--ui/qt/sctp_graph_arwnd_dialog.cpp5
-rw-r--r--ui/qt/sctp_graph_byte_dialog.cpp5
-rw-r--r--ui/qt/sctp_graph_dialog.cpp5
6 files changed, 29 insertions, 0 deletions
diff --git a/ui/qt/sctp_all_assocs_dialog.cpp b/ui/qt/sctp_all_assocs_dialog.cpp
index 8cbf3f43d7..c6c511ae67 100644
--- a/ui/qt/sctp_all_assocs_dialog.cpp
+++ b/ui/qt/sctp_all_assocs_dialog.cpp
@@ -41,6 +41,11 @@ SCTPAllAssocsDialog::SCTPAllAssocsDialog(QWidget *parent, capture_file *cf) :
cap_file_(cf)
{
ui->setupUi(this);
+ Qt::WindowFlags flags = Qt::Window | Qt::WindowSystemMenuHint
+ | Qt::WindowMinimizeButtonHint
+ | Qt::WindowMaximizeButtonHint
+ | Qt::WindowCloseButtonHint;
+ this->setWindowFlags(flags);
sctp_assocs = (sctp_allassocs_info_t *)g_malloc(sizeof(sctp_allassocs_info_t));
fillTable();
}
diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp
index 6b2230701b..49b4f19e51 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.cpp
+++ b/ui/qt/sctp_assoc_analyse_dialog.cpp
@@ -46,6 +46,10 @@ SCTPAssocAnalyseDialog::SCTPAssocAnalyseDialog(QWidget *parent, sctp_assoc_info_
cf_retap_packets(cap_file_);
selected_assoc = findAssocForPacket(cap_file_);
}
+ Qt::WindowFlags flags = Qt::Window | Qt::WindowSystemMenuHint
+ | Qt::WindowMinimizeButtonHint
+ | Qt::WindowCloseButtonHint;
+ this->setWindowFlags(flags);
this->setWindowTitle(QString(tr("SCTP Analyse Association: %1 Port1 %2 Port2 %3")).arg(cf_get_display_name(cap_file_)).arg(selected_assoc->port1).arg(selected_assoc->port2));
fillTabs();
}
diff --git a/ui/qt/sctp_chunk_statistics_dialog.cpp b/ui/qt/sctp_chunk_statistics_dialog.cpp
index 0d0e675ca7..e9b58ed888 100644
--- a/ui/qt/sctp_chunk_statistics_dialog.cpp
+++ b/ui/qt/sctp_chunk_statistics_dialog.cpp
@@ -33,6 +33,11 @@ SCTPChunkStatisticsDialog::SCTPChunkStatisticsDialog(QWidget *parent, sctp_assoc
cap_file_(cf)
{
ui->setupUi(this);
+ Qt::WindowFlags flags = Qt::Window | Qt::WindowSystemMenuHint
+ | Qt::WindowMinimizeButtonHint
+ | Qt::WindowMaximizeButtonHint
+ | Qt::WindowCloseButtonHint;
+ this->setWindowFlags(flags);
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
ui->tableWidget->verticalHeader()->setClickable(true);
ui->tableWidget->verticalHeader()->setMovable(true);
diff --git a/ui/qt/sctp_graph_arwnd_dialog.cpp b/ui/qt/sctp_graph_arwnd_dialog.cpp
index bb1ced67ed..dc7b359ce6 100644
--- a/ui/qt/sctp_graph_arwnd_dialog.cpp
+++ b/ui/qt/sctp_graph_arwnd_dialog.cpp
@@ -36,6 +36,11 @@ SCTPGraphArwndDialog::SCTPGraphArwndDialog(QWidget *parent, sctp_assoc_info_t *a
if (!selected_assoc) {
selected_assoc = SCTPAssocAnalyseDialog::findAssocForPacket(cap_file_);
}
+ Qt::WindowFlags flags = Qt::Window | Qt::WindowSystemMenuHint
+ | Qt::WindowMinimizeButtonHint
+ | Qt::WindowMaximizeButtonHint
+ | Qt::WindowCloseButtonHint;
+ this->setWindowFlags(flags);
this->setWindowTitle(QString(tr("SCTP Data and Adv. Rec. Window over Time: %1 Port1 %2 Port2 %3")).arg(cf_get_display_name(cap_file_)).arg(selected_assoc->port1).arg(selected_assoc->port2));
if ((direction == 1 && selected_assoc->n_array_tsn1 == 0) || (direction == 2 && selected_assoc->n_array_tsn2 == 0)) {
QMessageBox msgBox;
diff --git a/ui/qt/sctp_graph_byte_dialog.cpp b/ui/qt/sctp_graph_byte_dialog.cpp
index 5d37b10721..38bee209bd 100644
--- a/ui/qt/sctp_graph_byte_dialog.cpp
+++ b/ui/qt/sctp_graph_byte_dialog.cpp
@@ -36,6 +36,11 @@ SCTPGraphByteDialog::SCTPGraphByteDialog(QWidget *parent, sctp_assoc_info_t *ass
if (!selected_assoc) {
selected_assoc = SCTPAssocAnalyseDialog::findAssocForPacket(cap_file_);
}
+ Qt::WindowFlags flags = Qt::Window | Qt::WindowSystemMenuHint
+ | Qt::WindowMinimizeButtonHint
+ | Qt::WindowMaximizeButtonHint
+ | Qt::WindowCloseButtonHint;
+ this->setWindowFlags(flags);
this->setWindowTitle(QString(tr("SCTP Data and Adv. Rec. Window over Time: %1 Port1 %2 Port2 %3")).arg(cf_get_display_name(cap_file_)).arg(selected_assoc->port1).arg(selected_assoc->port2));
if ((direction == 1 && selected_assoc->n_array_tsn1 == 0) || (direction == 2 && selected_assoc->n_array_tsn2 == 0)) {
QMessageBox msgBox;
diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp
index 94bb0dd6ea..b2e90f0d9b 100644
--- a/ui/qt/sctp_graph_dialog.cpp
+++ b/ui/qt/sctp_graph_dialog.cpp
@@ -36,6 +36,11 @@ SCTPGraphDialog::SCTPGraphDialog(QWidget *parent, sctp_assoc_info_t *assoc, capt
if (!selected_assoc) {
selected_assoc = SCTPAssocAnalyseDialog::findAssocForPacket(cap_file_);
}
+ Qt::WindowFlags flags = Qt::Window | Qt::WindowSystemMenuHint
+ | Qt::WindowMinimizeButtonHint
+ | Qt::WindowMaximizeButtonHint
+ | Qt::WindowCloseButtonHint;
+ this->setWindowFlags(flags);
this->setWindowTitle(QString(tr("SCTP TSNs and SACKs over Time: %1 Port1 %2 Port2 %3")).arg(cf_get_display_name(cap_file_)).arg(selected_assoc->port1).arg(selected_assoc->port2));
if ((direction == 1 && selected_assoc->n_array_tsn1 == 0) || (direction == 2 && selected_assoc->n_array_tsn2 == 0)) {
QMessageBox msgBox;