Use vertical layout for ctkFlowLayout in ctkModalityWidget

Libs/DICOM/Widgets/Resources/UI/ctkDICOMQueryRetrieveWidget.ui

@@ -22,7 +22,7 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
       <item>
        <widget class="QGroupBox" name="groupBox">
         <property name="title">

Libs/DICOM/Widgets/Resources/UI/ctkDICOMQueryWidget.ui

@@ -6,88 +6,87 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>326</width>
-    <height>236</height>
+    <width>279</width>
+    <height>121</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QTabWidget" name="QueryOptions">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="currentIndex">
-        <number>0</number>
-       </property>
-       <widget class="QWidget" name="Name">
-        <attribute name="title">
-         <string>Name</string>
-        </attribute>
-        <attribute name="toolTip">
-         <string>Search by Person Name</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_7">
-         <item>
-          <widget class="QLineEdit" name="NameSearch"/>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="Study">
-        <attribute name="title">
-         <string>Study</string>
-        </attribute>
-        <attribute name="toolTip">
-         <string>Search in Study Description</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_8">
-         <item>
-          <widget class="QLineEdit" name="StudySearch"/>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="Series">
-        <attribute name="title">
-         <string>Series</string>
-        </attribute>
-        <attribute name="toolTip">
-         <string>Search in Series Description</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_9">
-         <item>
-          <widget class="QLineEdit" name="SeriesSearch"/>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="ID">
-        <attribute name="title">
-         <string>ID</string>
-        </attribute>
-        <attribute name="toolTip">
-         <string>Search by Person ID</string>
-        </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_10">
-         <item>
-          <widget class="QLineEdit" name="IdSearch"/>
-         </item>
-        </layout>
-       </widget>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QTabWidget" name="QueryOptions">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="Name">
+      <attribute name="title">
+       <string>Name</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Search by Person Name</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <item>
+        <widget class="QLineEdit" name="NameSearch"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Study">
+      <attribute name="title">
+       <string>Study</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Search in Study Description</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_8">
+       <item>
+        <widget class="QLineEdit" name="StudySearch"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="Series">
+      <attribute name="title">
+       <string>Series</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Search in Series Description</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_9">
+       <item>
+        <widget class="QLineEdit" name="SeriesSearch"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="ID">
+      <attribute name="title">
+       <string>ID</string>
+      </attribute>
+      <attribute name="toolTip">
+       <string>Search by Person ID</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_10">
+       <item>
+        <widget class="QLineEdit" name="IdSearch"/>
+       </item>
+      </layout>
+     </widget>
+    </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame">
@@ -106,10 +105,23 @@
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="ctkDateRangeWidget" name="DateRangeWidget" native="true"/>
          </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </item>

Libs/Widgets/ctkModalityWidget.cpp

@@ -85,7 +85,7 @@ void ctkModalityWidgetPrivate::init()
 
   // reparent items into a flow layout
   QLayout* layout = q->layout();
-  ctkFlowLayout* flowLayout = new ctkFlowLayout(Qt::Horizontal);
+  ctkFlowLayout* flowLayout = new ctkFlowLayout(Qt::Vertical);
   flowLayout->setContentsMargins(layout->contentsMargins());
   flowLayout->setPreferredExpandingDirections(Qt::Vertical);
   QLayoutItem* item;