Use ctkModalityWidget into ctkDICOMQueryWidget

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

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -62,7 +62,7 @@
      </layout>
     </item>
     <item>
-     <layout class="QHBoxLayout" name="queryLayout">
+     <layout class="QHBoxLayout" name="queryLayout" stretch="1,0">
       <item>
        <widget class="QTreeView" name="treeView">
         <property name="alternatingRowColors">
@@ -73,20 +73,7 @@
       <item>
        <layout class="QVBoxLayout" name="searchOptionLayout">
         <item>
-         <widget class="ctkDICOMQueryWidget" name="searchOption" native="true">
-          <property name="minimumSize">
-           <size>
-            <width>200</width>
-            <height>200</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>400</width>
-            <height>16777215</height>
-           </size>
-          </property>
-         </widget>
+         <widget class="ctkDICOMQueryWidget" name="searchOption" native="true"/>
         </item>
         <item>
          <spacer name="verticalSpacer">
@@ -137,7 +124,7 @@
      <x>0</x>
      <y>0</y>
      <width>739</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

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

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>566</width>
-    <height>294</height>
+    <width>147</width>
+    <height>141</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -108,7 +108,7 @@
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
-          <widget class="ctkDateRangeWidget" name="widget" native="true"/>
+          <widget class="ctkDateRangeWidget" name="DateRangeWidget" native="true"/>
          </item>
         </layout>
        </widget>
@@ -123,29 +123,12 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
          <item>
-          <widget class="QCheckBox" name="CT">
-           <property name="text">
-            <string>CT</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="MR">
-           <property name="text">
-            <string>MR</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pushButton_2">
-           <property name="text">
-            <string>Any</string>
+          <widget class="ctkModalityWidget" name="ModalityWidget" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
            </property>
           </widget>
          </item>
@@ -164,6 +147,12 @@
    <header>ctkDateRangeWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ctkModalityWidget</class>
+   <extends>QWidget</extends>
+   <header>ctkModalityWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>