diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dcbee8..7a696db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,15 @@ cmake_minimum_required(VERSION 3.5)
 
 project(PowerDesigner LANGUAGES CXX VERSION 1.0)
 
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
 set(ADS_VERSION 4.3.1)
 add_subdirectory(QtADS)
 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets REQUIRED)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #默认ui文件要和.h头文件在一个目录，若不在一个目录，需要指定其所在目录
@@ -29,14 +33,41 @@ else()
 endif()
 
 set(H_HEADER_FILES
+    include/global.h
     include/mainwindow.h
+    include/graphicElementsPanel.h
+    include/drawingPanel.h
+    include/designerScene.h
+    include/designerView.h
+
+    include/util/baseSelector.h
+    include/util/creatingSelector.h
+    include/util/selectorManager.h
+
+    include/graphicsItem/itemControlHandle.h
+    include/graphicsItem/graphicsBaseItem.h
+    include/graphicsItem/graphicsRectItem.h
 )
 set(CPP_SOURCE_FILES
     source/main.cpp
     source/mainwindow.cpp
+    source/graphicElementsPanel.cpp
+    source/drawingPanel.cpp
+    source/designerScene.cpp
+    source/designerView.cpp
+
+    source/util/baseSelector.cpp
+    source/util/creatingSelector.cpp
+    source/util/selectorManager.cpp
+
+    source/graphicsItem/itemControlHandle.cpp
+    source/graphicsItem/graphicsBaseItem.cpp
+    source/graphicsItem/graphicsRectItem.cpp
 )
 set(UI_FILES
     ui/mainwindow.ui
+    ui/graphicElementsPanel.ui
+    ui/drawingPanel.ui
 )
 
 # 包含源文件目录
@@ -70,7 +101,7 @@ endif()
 
 include_directories(include)
 
-target_include_directories(PowerDesigner PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
+target_include_directories(PowerDesigner PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 target_link_libraries(PowerDesigner PRIVATE qt${QT_VERSION_MAJOR}advanceddocking)
 target_link_libraries(PowerDesigner PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                   Qt${QT_VERSION_MAJOR}::Gui