Merge branch 'move_files' into 'master'

Move *.ui files for different applications to different folders

See merge request OpenMW/openmw!3659

apps/launcher/CMakeLists.txt

@@ -35,13 +35,13 @@ set(LAUNCHER_HEADER
 
 # Headers that must be pre-processed
 set(LAUNCHER_UI
-    ${CMAKE_SOURCE_DIR}/files/ui/datafilespage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/graphicspage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/mainwindow.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/importpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/settingspage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/directorypicker.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/datafilespage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/graphicspage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/mainwindow.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/importpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/settingspage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/directorypicker.ui
+    ${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui
 )
 
 source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER})

apps/opencs/CMakeLists.txt

@@ -139,8 +139,8 @@ set (OPENCS_RES ${CMAKE_SOURCE_DIR}/files/opencs/resources.qrc
     )
 
 set (OPENCS_UI
-    ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/filedialog.ui
+    ${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/filedialog.ui
     )
 
 source_group (openmw-cs FILES main.cpp ${OPENCS_SRC} ${OPENCS_HDR})

apps/wizard/CMakeLists.txt

@@ -34,20 +34,20 @@ set(WIZARD_HEADER
 )
 
 set(WIZARD_UI
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/componentselectionpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/conclusionpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/existinginstallationpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/importpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationtargetpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/intropage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/languageselectionpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/methodselectionpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/componentselectionpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/conclusionpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/existinginstallationpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/importpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/installationtargetpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/intropage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/languageselectionpage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/ui/methodselectionpage.ui
 )
 
 if (OPENMW_USE_UNSHIELD)
     set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp)
     set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp)
-    set (WIZARD_UI ${WIZARD_UI} ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationpage.ui)
+    set (WIZARD_UI ${WIZARD_UI} ${CMAKE_CURRENT_SOURCE_DIR}/ui/installationpage.ui)
     add_definitions(-DOPENMW_USE_UNSHIELD)
 endif (OPENMW_USE_UNSHIELD)
 

components/CMakeLists.txt

@@ -490,7 +490,7 @@ else ()
         )
 endif()
 
-set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
+set (ESM_UI ${CMAKE_CURRENT_SOURCE_DIR}/contentselector/contentselector.ui
     )
 
 if (USE_QT)