Qt: Flatten group boxes.

As discussed in change 5185, the "big 3" HIGs discourage the use of
traditional group boxes. Flatten our existing ones.

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

6 files changed, 31 insertions, 20 deletions

diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui
index be18c877a7..5a13c2f27b 100644
--- a/ui/qt/capture_interfaces_dialog.ui
+++ b/ui/qt/capture_interfaces_dialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="inputTab">
       <attribute name="title">
@@ -250,14 +250,11 @@
           <string>Capture to a permanent file</string>
          </property>
          <property name="flat">
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
          <layout class="QGridLayout" name="gridLayout_3">
           <item row="0" column="2">
            <widget class="QPushButton" name="browseButton">
@@ -301,14 +298,11 @@
           <string>Create a new file automatically after...</string>
          </property>
          <property name="flat">
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
          <property name="checkable">
           <bool>true</bool>
          </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="1" column="1">
            <widget class="QSpinBox" name="MBSpinBox">
@@ -518,10 +512,7 @@ PLEASE NOTE: One option MUST be selected.</string>
             <string>Display Options</string>
            </property>
            <property name="flat">
-            <bool>false</bool>
-           </property>
-           <property name="checkable">
-            <bool>false</bool>
+            <bool>true</bool>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout">
             <item>
@@ -576,7 +567,7 @@ PLEASE NOTE: One option MUST be selected.</string>
             <string>Name Resolution</string>
            </property>
            <property name="flat">
-            <bool>false</bool>
+            <bool>true</bool>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_3">
             <item>
@@ -636,10 +627,7 @@ PLEASE NOTE: One option MUST be selected.</string>
           <string>Stop capture automatically after...</string>
          </property>
          <property name="flat">
-          <bool>false</bool>
-         </property>
-         <property name="checkable">
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="1">
diff --git a/ui/qt/import_text_dialog.ui b/ui/qt/import_text_dialog.ui
index 6ab8661754..523685f4de 100644
--- a/ui/qt/import_text_dialog.ui
+++ b/ui/qt/import_text_dialog.ui
@@ -40,6 +40,9 @@
      <property name="title">
       <string>Import From</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="1" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -226,6 +229,9 @@
      <property name="title">
       <string>Encapsulation</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::FieldsStayAtSizeHint</enum>
diff --git a/ui/qt/packet_format_group_box.cpp b/ui/qt/packet_format_group_box.cpp
index bccab41398..1b56c14261 100644
--- a/ui/qt/packet_format_group_box.cpp
+++ b/ui/qt/packet_format_group_box.cpp
@@ -29,6 +29,7 @@ PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) :
     pf_ui_(new Ui::PacketFormatGroupBox)
 {
     pf_ui_->setupUi(this);
+    setFlat(true);
 
     QStyleOption style_opt;
     int cb_label_offset =  pf_ui_->detailsCheckBox->style()->subElementRect(QStyle::SE_CheckBoxContents, &style_opt).left();
diff --git a/ui/qt/packet_range_group_box.cpp b/ui/qt/packet_range_group_box.cpp
index 41a99c2e53..4d4bf948bc 100644
--- a/ui/qt/packet_range_group_box.cpp
+++ b/ui/qt/packet_range_group_box.cpp
@@ -29,6 +29,7 @@ PacketRangeGroupBox::PacketRangeGroupBox(QWidget *parent) :
     syntax_state_(SyntaxLineEdit::Empty)
 {
     pr_ui_->setupUi(this);
+    setFlat(true);
 
     pr_ui_->displayedButton->setChecked(true);
     pr_ui_->allButton->setChecked(true);
diff --git a/ui/qt/print_dialog.ui b/ui/qt/print_dialog.ui
index 92565f51f8..d053a081d0 100644
--- a/ui/qt/print_dialog.ui
+++ b/ui/qt/print_dialog.ui
@@ -26,6 +26,9 @@
          <property name="alignment">
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
          </property>
+         <property name="flat">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -70,6 +73,9 @@
      <property name="title">
       <string>Packet Range</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
diff --git a/ui/qt/summary_dialog.ui b/ui/qt/summary_dialog.ui
index 3501da003d..9a91f101b0 100644
--- a/ui/qt/summary_dialog.ui
+++ b/ui/qt/summary_dialog.ui
@@ -54,13 +54,16 @@
      <property name="title">
       <string>File</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <widget class="QWidget" name="layoutWidget_1">
       <property name="geometry">
        <rect>
         <x>21</x>
         <y>21</y>
         <width>731</width>
-        <height>88</height>
+        <height>90</height>
        </rect>
       </property>
       <layout class="QFormLayout" name="formLayout">
@@ -135,6 +138,9 @@
      <property name="title">
       <string>Time</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <widget class="QWidget" name="layoutWidget_2">
       <property name="geometry">
        <rect>
@@ -205,6 +211,9 @@
      <property name="title">
       <string>Capture</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
      <widget class="QTextEdit" name="teCFComments">
       <property name="geometry">
        <rect>
@@ -274,7 +283,7 @@
        </item>
       </layout>
      </widget>
-     <zorder>layoutWidget_1</zorder>
+     <zorder>layoutWidget_3</zorder>
      <zorder>teCFComments</zorder>
      <zorder>label_17</zorder>
     </widget>