Merge branch 'dicom-queries' of github.com:commontk/CTK into dicom-queries

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

@@ -136,37 +136,7 @@
     </widget>
    </item>
    <item>
-    <widget class="ctkDICOMQueryResultsTabWidget" name="results">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <property name="tabsClosable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="tab">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>Results</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QTreeView" name="treeView">
-         <property name="alternatingRowColors">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
+    <widget class="QTreeView" name="results"/>
    </item>
   </layout>
  </widget>

Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp

@@ -2,16 +2,16 @@
 #include <QTreeView>
 #include <QTabBar>
 #include <QSettings>
+#include <QAction>
 
 // ctkDICOMWidgets includes
 #include "ctkDICOM.h"
 #include "ctkDICOMModel.h"
 #include "ctkDICOMAppWidget.h"
 #include "ctkDICOMQueryResultsTabWidget.h"
-#include "Ui_ctkDICOMAppWidget.h"
+#include "ui_ctkDICOMAppWidget.h"
 #include "ctkDirectoryButton.h"
 #include "ctkDICOMQueryRetrieveWidget.h"
-#include "QAction.h"
 
 //logger
 #include <ctkLogger.h>