chore: move ui to device outside

QtScrcpy/CMakeLists.txt

@@ -149,12 +149,6 @@ set(QC_DEVICE_SOURCES
     device/server/videosocket.cpp
     device/stream/stream.h
     device/stream/stream.cpp
-    device/ui/toolform.h
-    device/ui/toolform.cpp
-    device/ui/toolform.ui
-    device/ui/videoform.h
-    device/ui/videoform.cpp
-    device/ui/videoform.ui
 )
 source_group(device FILES ${QC_DEVICE_SOURCES})
 
@@ -181,6 +175,20 @@ set(QC_UIBASE_SOURCES
 )
 source_group(uibase FILES ${QC_UIBASE_SOURCES})
 
+# ui
+set(QC_UI_SOURCES
+    ui/toolform.h
+    ui/toolform.cpp
+    ui/toolform.ui
+    ui/videoform.h
+    ui/videoform.cpp
+    ui/videoform.ui
+    ui/dialog.cpp
+    ui/dialog.h
+    ui/dialog.ui
+)
+source_group(ui FILES ${QC_UI_SOURCES})
+
 # util
 set(QC_UTIL_SOURCES
     util/compat.h
@@ -217,9 +225,6 @@ set(QC_QRC_SOURCES "res/res.qrc")
 # main
 set(QC_MAIN_SOURCES
     main.cpp
-    dialog.cpp
-    dialog.h
-    dialog.ui
     ${QC_QRC_SOURCES}
 )
 
@@ -260,6 +265,7 @@ set(QC_PROJECT_SOURCES
     ${QC_DEVICEMANAGE_SOURCES}
     ${QC_FONTAWESOME_SOURCES}
     ${QC_UIBASE_SOURCES}
+    ${QC_UI_SOURCES}
     ${QC_UTIL_SOURCES}
     ${QC_MAIN_SOURCES}
     ${QC_PLANTFORM_SOURCES}
@@ -298,6 +304,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE devicemanage)
 target_include_directories(${PROJECT_NAME} PRIVATE fontawesome)
 target_include_directories(${PROJECT_NAME} PRIVATE util)
 target_include_directories(${PROJECT_NAME} PRIVATE uibase)
+target_include_directories(${PROJECT_NAME} PRIVATE ui)
 
 #
 # common deps
@@ -431,4 +438,4 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     )
 
     # linux set app icon: https://blog.csdn.net/MrNoboday/article/details/82870853
-endif()
+endif()

QtScrcpy/QtScrcpy.pro

@@ -39,19 +39,13 @@ msvc{
 
 # 源码
 SOURCES += \
-        main.cpp \
+        main.cpp
-        dialog.cpp
-
-HEADERS += \
-        dialog.h
-
-FORMS += \
-        dialog.ui
 
 # 子工程
 include ($$PWD/common/common.pri)
 include ($$PWD/adb/adb.pri)
 include ($$PWD/uibase/uibase.pri)
+include ($$PWD/ui/ui.pri)
 include ($$PWD/fontawesome/fontawesome.pri)
 include ($$PWD/util/util.pri)
 include ($$PWD/device/device.pri)
@@ -61,7 +55,8 @@ include ($$PWD/devicemanage/devicemanage.pri)
 INCLUDEPATH += \
         $$PWD/common \        
         $$PWD/adb \        
-        $$PWD/uibase \        
+        $$PWD/uibase \
+        $$PWD/ui \
         $$PWD/util \
         $$PWD/device \
         $$PWD/devicemanage \

QtScrcpy/device/device.pri

@@ -12,7 +12,6 @@ include ($$PWD/android/android.pri)
 include ($$PWD/controller/controller.pri)
 include ($$PWD/filehandler/filehandler.pri)
 include ($$PWD/recorder/recorder.pri)
-include ($$PWD/ui/ui.pri)
 
 INCLUDEPATH += \
         $$PWD/../../third_party/ffmpeg/include \
@@ -23,5 +22,4 @@ INCLUDEPATH += \
         $$PWD/android \
         $$PWD/controller \
         $$PWD/filehandler \
-        $$PWD/recorder \
+        $$PWD/recorder
-        $$PWD/ui

QtScrcpy/device/ui/ui.pri

@@ -1,11 +0,0 @@
-SOURCES += \
-    $$PWD/videoform.cpp \
-    $$PWD/toolform.cpp
-
-HEADERS += \
-    $$PWD/videoform.h \
-    $$PWD/toolform.h
-
-FORMS += \
-    $$PWD/videoform.ui \
-    $$PWD/toolform.ui

QtScrcpy/ui/ui.pri

@@ -0,0 +1,14 @@
+SOURCES += \
+    $$PWD/videoform.cpp \
+    $$PWD/toolform.cpp \
+    $$PWD/dialog.cpp
+
+HEADERS += \
+    $$PWD/videoform.h \
+    $$PWD/toolform.h \
+    $$PWD/dialog.h
+
+FORMS += \
+    $$PWD/videoform.ui \
+    $$PWD/toolform.ui \
+    $$PWD/dialog.ui