Change the print preview if "include column headings" changes.

While we're at it, sort some method declarations and definitions, to
group the top-level summary/details/bytes yes/no options together, with
two groups of suboptions for summary and details below.

Bug: 14945
Change-Id: Id06dd64e44b18b13e2131482edef46aee3efbd63
Reviewed-on: https://code.wireshark.org/review/28620
Reviewed-by: Guy Harris <guy@alum.mit.edu>

2 files changed, 14 insertions, 6 deletions

diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
index 0fd78461e3..1fae8c43e2 100644
--- a/ui/qt/packet_format_group_box.cpp
+++ b/ui/qt/packet_format_group_box.cpp
@@ -58,11 +58,6 @@ bool PacketFormatGroupBox::summaryEnabled()
     return pf_ui_->summaryCheckBox->isChecked();
 }
 
-bool PacketFormatGroupBox::includeColumnHeadingsEnabled()
-{
-    return pf_ui_->includeColumnHeadingsCheckBox->isChecked();
-}
-
 bool PacketFormatGroupBox::detailsEnabled()
 {
     return pf_ui_->detailsCheckBox->isChecked();
@@ -73,6 +68,11 @@ bool PacketFormatGroupBox::bytesEnabled()
     return pf_ui_->bytesCheckBox->isChecked();
 }
 
+bool PacketFormatGroupBox::includeColumnHeadingsEnabled()
+{
+    return pf_ui_->includeColumnHeadingsCheckBox->isChecked();
+}
+
 bool PacketFormatGroupBox::allCollapsedEnabled()
 {
     return pf_ui_->allCollapsedButton->isChecked();
@@ -107,6 +107,11 @@ void PacketFormatGroupBox::on_bytesCheckBox_toggled(bool)
     emit formatChanged();
 }
 
+void PacketFormatGroupBox::on_includeColumnHeadingsCheckBox_toggled(bool)
+{
+    emit formatChanged();
+}
+
 void PacketFormatGroupBox::on_allCollapsedButton_toggled(bool checked)
 {
     if (checked) emit formatChanged();
diff --git a/ui/qt/packet_format_group_box.h b/ui/qt/packet_format_group_box.h
index 7ca9dfe66b..943faf5363 100644
--- a/ui/qt/packet_format_group_box.h
+++ b/ui/qt/packet_format_group_box.h
@@ -39,9 +39,12 @@ signals:
     void formatChanged();
 
 private slots:
-    void on_detailsCheckBox_toggled(bool checked);
     void on_summaryCheckBox_toggled(bool checked);
+    void on_detailsCheckBox_toggled(bool checked);
     void on_bytesCheckBox_toggled(bool checked);
+
+    void on_includeColumnHeadingsCheckBox_toggled(bool checked);
+
     void on_allCollapsedButton_toggled(bool checked);
     void on_asDisplayedButton_toggled(bool checked);
     void on_allExpandedButton_toggled(bool checked);