From c7d7a2cb2347e0d5af90c1d51b95557da6f504eb Mon Sep 17 00:00:00 2001 From: Barry <870709864@qq.com> Date: Sat, 9 Apr 2022 20:03:26 +0800 Subject: [PATCH] chore: move ui to device outside --- QtScrcpy/CMakeLists.txt | 27 ++++++++++++++++---------- QtScrcpy/QtScrcpy.pro | 13 ++++--------- QtScrcpy/device/device.pri | 4 +--- QtScrcpy/device/ui/ui.pri | 11 ----------- QtScrcpy/{ => ui}/dialog.cpp | 0 QtScrcpy/{ => ui}/dialog.h | 0 QtScrcpy/{ => ui}/dialog.ui | 0 QtScrcpy/{device => }/ui/toolform.cpp | 0 QtScrcpy/{device => }/ui/toolform.h | 0 QtScrcpy/{device => }/ui/toolform.ui | 0 QtScrcpy/ui/ui.pri | 14 +++++++++++++ QtScrcpy/{device => }/ui/videoform.cpp | 0 QtScrcpy/{device => }/ui/videoform.h | 0 QtScrcpy/{device => }/ui/videoform.ui | 0 14 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 QtScrcpy/device/ui/ui.pri rename QtScrcpy/{ => ui}/dialog.cpp (100%) rename QtScrcpy/{ => ui}/dialog.h (100%) rename QtScrcpy/{ => ui}/dialog.ui (100%) rename QtScrcpy/{device => }/ui/toolform.cpp (100%) rename QtScrcpy/{device => }/ui/toolform.h (100%) rename QtScrcpy/{device => }/ui/toolform.ui (100%) create mode 100644 QtScrcpy/ui/ui.pri rename QtScrcpy/{device => }/ui/videoform.cpp (100%) rename QtScrcpy/{device => }/ui/videoform.h (100%) rename QtScrcpy/{device => }/ui/videoform.ui (100%) diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt index fac6269..22aeb5d 100755 --- a/QtScrcpy/CMakeLists.txt +++ b/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() \ No newline at end of file +endif() diff --git a/QtScrcpy/QtScrcpy.pro b/QtScrcpy/QtScrcpy.pro index 720f018..9edbb44 100644 --- a/QtScrcpy/QtScrcpy.pro +++ b/QtScrcpy/QtScrcpy.pro @@ -39,19 +39,13 @@ msvc{ # 源码 SOURCES += \ - main.cpp \ - dialog.cpp - -HEADERS += \ - dialog.h - -FORMS += \ - dialog.ui + main.cpp # 子工程 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 \ diff --git a/QtScrcpy/device/device.pri b/QtScrcpy/device/device.pri index e31bd3c..197e72e 100644 --- a/QtScrcpy/device/device.pri +++ b/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/ui + $$PWD/recorder diff --git a/QtScrcpy/device/ui/ui.pri b/QtScrcpy/device/ui/ui.pri deleted file mode 100644 index b9854b3..0000000 --- a/QtScrcpy/device/ui/ui.pri +++ /dev/null @@ -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 diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/ui/dialog.cpp similarity index 100% rename from QtScrcpy/dialog.cpp rename to QtScrcpy/ui/dialog.cpp diff --git a/QtScrcpy/dialog.h b/QtScrcpy/ui/dialog.h similarity index 100% rename from QtScrcpy/dialog.h rename to QtScrcpy/ui/dialog.h diff --git a/QtScrcpy/dialog.ui b/QtScrcpy/ui/dialog.ui similarity index 100% rename from QtScrcpy/dialog.ui rename to QtScrcpy/ui/dialog.ui diff --git a/QtScrcpy/device/ui/toolform.cpp b/QtScrcpy/ui/toolform.cpp similarity index 100% rename from QtScrcpy/device/ui/toolform.cpp rename to QtScrcpy/ui/toolform.cpp diff --git a/QtScrcpy/device/ui/toolform.h b/QtScrcpy/ui/toolform.h similarity index 100% rename from QtScrcpy/device/ui/toolform.h rename to QtScrcpy/ui/toolform.h diff --git a/QtScrcpy/device/ui/toolform.ui b/QtScrcpy/ui/toolform.ui similarity index 100% rename from QtScrcpy/device/ui/toolform.ui rename to QtScrcpy/ui/toolform.ui diff --git a/QtScrcpy/ui/ui.pri b/QtScrcpy/ui/ui.pri new file mode 100644 index 0000000..6d1f1a2 --- /dev/null +++ b/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 diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/ui/videoform.cpp similarity index 100% rename from QtScrcpy/device/ui/videoform.cpp rename to QtScrcpy/ui/videoform.cpp diff --git a/QtScrcpy/device/ui/videoform.h b/QtScrcpy/ui/videoform.h similarity index 100% rename from QtScrcpy/device/ui/videoform.h rename to QtScrcpy/ui/videoform.h diff --git a/QtScrcpy/device/ui/videoform.ui b/QtScrcpy/ui/videoform.ui similarity index 100% rename from QtScrcpy/device/ui/videoform.ui rename to QtScrcpy/ui/videoform.ui