refactor: move all apps to one src/apps folder

sonar-project.properties

@@ -1,9 +1,9 @@
 sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
-sonar.sources=scripts,src/cmd,src/gui,src/lib
+sonar.sources=scripts,src/apps,src/lib
 sonar.tests=src/test
 sonar.exclusions=subprojects/**,build/**
-sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**,src/gui/**
+sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**,src/apps/deskflow-gui/**,src/apps/res/**
 sonar.cpd.exclusions=**/*Test*.cpp
 sonar.host.url=https://sonarcloud.io
 sonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}

src/CMakeLists.txt

@@ -18,12 +18,7 @@ include_directories(./lib)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
-add_subdirectory(cmd)
+add_subdirectory(apps)
-
-option(BUILD_GUI "Build GUI" ON)
-if(BUILD_GUI)
-  add_subdirectory(gui)
-endif(BUILD_GUI)
 
 option(BUILD_TESTS "Build tests" ON)
 if(BUILD_TESTS)

src/apps/CMakeLists.txt

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 option(BUILD_UNIFIED "Build unified binary" OFF)
-
 if(BUILD_UNIFIED)
   add_subdirectory(deskflow-core)
 else()
@@ -25,3 +24,8 @@ endif(BUILD_UNIFIED)
 
 ## Only used on windows
 add_subdirectory(deskflowd)
+
+option(BUILD_GUI "Build GUI" ON)
+if(BUILD_GUI)
+  add_subdirectory(deskflow-gui)
+endif(BUILD_GUI)

src/apps/deskflow-gui/CMakeLists.txt

@@ -27,25 +27,22 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 file(
   GLOB
   sources
-  res/deskflow.qrc
+  ../res/deskflow.qrc
-  src/*.cpp
+  *.cpp
-  src/*.h
+  *.h
-  src/dialogs/*.h
+  dialogs/*.h
-  src/dialogs/*.cpp
+  dialogs/*.cpp
-  src/validators/*
+  validators/*
-  src/widgets/*)
+  widgets/*)
-file(GLOB ui_files src/*.ui src/dialogs/*.ui)
+file(GLOB ui_files *.ui dialogs/*.ui)
 
 if(WIN32)
-  set(platform_extra src/deskflow.rc ${PROJECT_BINARY_DIR}/src/version.rc)
+  set(platform_extra deskflow.rc ${PROJECT_BINARY_DIR}/src/version.rc)
 elseif(APPLE)
-  set(platform_extra src/Deskflow.icns ${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION)
+  set(platform_extra Deskflow.icns ${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION)
   set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
-# regular exe headers
-include_directories(./src)
-
 # gui library autogen headers:
 # qt doesn't seem to auto include the autogen headers for libraries.
 include_directories(${PROJECT_BINARY_DIR}/src/lib/gui/gui_autogen/include)