aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/sequence_dialog.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-11-13 22:18:01 +0000
committerGerald Combs <gerald@wireshark.org>2013-11-13 22:18:01 +0000
commitb0063a025bfb68a3bc05a69cadf528116325576f (patch)
tree5b047bb81d7bdf70e4baed7bbe2700a5bc058861 /ui/qt/sequence_dialog.cpp
parent3e41e172db45009124ec19ad859cf9cb82c88200 (diff)
Highlight selected sequence diagram items.
Create a new dialog each time the user follows a stream. A lot of the follow code seems to assume one and only one dialog so there are likely outstanding bugs. Don't use the global cfile (should we deprecate its usage?). We want to move closer to multiple documents, not further away. Clean up after ourselves. Free our payload list and unlink our temp file. Make a bunch of gchar*s QStrings. Make sure our destructor gets called and use it. Make member variable and method names more consistent. svn path=/trunk/; revision=53306
Diffstat (limited to 'ui/qt/sequence_dialog.cpp')
-rw-r--r--ui/qt/sequence_dialog.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index 759b12dcf9..e861b62837 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -46,6 +46,7 @@
// - Incorporate packet comments?
// - Change line_style to seq_type (i.e. draw ACKs dashed)
// - Create WSGraph subclasses with common behavior.
+// - Help button and text
SequenceDialog::SequenceDialog(QWidget *parent, capture_file *cf, SequenceType type) :
QDialog(parent),
@@ -93,13 +94,18 @@ SequenceDialog::SequenceDialog(QWidget *parent, capture_file *cf, SequenceType t
memset (&seq_analysis_, 0, sizeof(seq_analysis_));
+ ui->showComboBox->blockSignals(true);
ui->showComboBox->setCurrentIndex(0);
+ ui->showComboBox->blockSignals(false);
+ ui->addressComboBox->blockSignals(true);
ui->addressComboBox->setCurrentIndex(0);
+ ui->addressComboBox->blockSignals(false);
QComboBox *fcb = ui->flowComboBox;
fcb->addItem(ui->actionFlowAny->text(), SEQ_ANALYSIS_ANY);
fcb->addItem(ui->actionFlowTcp->text(), SEQ_ANALYSIS_TCP);
+ ui->flowComboBox->blockSignals(true);
switch (type) {
case any:
seq_analysis_.type = SEQ_ANALYSIS_ANY;
@@ -115,6 +121,7 @@ SequenceDialog::SequenceDialog(QWidget *parent, capture_file *cf, SequenceType t
ui->flowLabel->hide();
break;
}
+ ui->flowComboBox->blockSignals(false);
seq_analysis_.all_packets = TRUE;
QPushButton *save_bt = ui->buttonBox->button(QDialogButtonBox::Save);
@@ -425,14 +432,14 @@ void SequenceDialog::on_showComboBox_currentIndexChanged(int index)
} else {
seq_analysis_.all_packets = FALSE;
}
- if (isVisible()) fillDiagram();
+ fillDiagram();
}
void SequenceDialog::on_flowComboBox_currentIndexChanged(int index)
{
if (index < 0) return;
seq_analysis_.type = static_cast<seq_analysis_type>(ui->flowComboBox->itemData(index).toInt());
- if (isVisible()) fillDiagram();
+ fillDiagram();
}
void SequenceDialog::on_addressComboBox_currentIndexChanged(int index)
@@ -442,7 +449,7 @@ void SequenceDialog::on_addressComboBox_currentIndexChanged(int index)
} else {
seq_analysis_.any_addr = FALSE;
}
- if (isVisible()) fillDiagram();
+ fillDiagram();
}
void SequenceDialog::on_actionReset_triggered()