소스 검색

ENH: remove dock widget from main window

Marco Nolden 14 년 전
부모
커밋
bf88ad649b
2개의 변경된 파일10개의 추가작업 그리고 19개의 파일을 삭제
  1. 1 5
      Applications/ctkExampleHost/ctkExampleHostMain.cpp
  2. 9 14
      Applications/ctkExampleHost/ctkExampleHostMainWindow.ui

+ 1 - 5
Applications/ctkExampleHost/ctkExampleHostMain.cpp

@@ -87,15 +87,11 @@ int main(int argv, char** argc)
 
   framework->start();
 
-
-  ctkDicomExampleHost* host = new ctkDicomExampleHost();
-
-
   QMainWindow mainWindow;
   Ui::MainWindow ui;
   ui.setupUi(&mainWindow);
 
-  mainWindow.addDockWidget(static_cast<Qt::DockWidgetArea>(4),new ctkHostAppExampleWidget());
+ // mainWindow.addDockWidget(static_cast<Qt::DockWidgetArea>(4),new ctkHostAppExampleWidget());
 
 //  QVBoxLayout* layout = new QVBoxLayout(&mainWindow);
 

+ 9 - 14
Applications/ctkExampleHost/ctkExampleHostMainWindow.ui

@@ -16,20 +16,7 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
-     <widget class="QFrame" name="placeHolderFrame">
-      <property name="frameShape">
-       <enum>QFrame::Box</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-      <property name="lineWidth">
-       <number>3</number>
-      </property>
-      <property name="midLineWidth">
-       <number>0</number>
-      </property>
-     </widget>
+     <widget class="ctkHostAppExampleWidget" name="controlWidget" native="true"/>
     </item>
    </layout>
   </widget>
@@ -54,6 +41,14 @@
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ctkHostAppExampleWidget</class>
+   <extends>QWidget</extends>
+   <header>ctkHostAppExampleWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>