diff --git a/CMakeLists.txt b/CMakeLists.txt index 962e0465..28031a06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -332,9 +332,9 @@ endif() # Jump to the CMakeLists.txt file in the source folder add_subdirectory(src/TGUI) -# Install the widgets on linux +# Install the themes on linux if (SFML_OS_LINUX) - install( DIRECTORY widgets DESTINATION "${INSTALL_MISC_DIR}" ) + install( DIRECTORY themes DESTINATION "${INSTALL_MISC_DIR}" ) endif() # Build the documentation when requested diff --git a/examples/many_different_widgets/ManyDifferentWidgets.cpp b/examples/many_different_widgets/ManyDifferentWidgets.cpp index cfbae69d..df0c272a 100644 --- a/examples/many_different_widgets/ManyDifferentWidgets.cpp +++ b/examples/many_different_widgets/ManyDifferentWidgets.cpp @@ -36,7 +36,7 @@ int main() try { - tgui::Theme theme{"../../widgets/Black.txt"}; + tgui::Theme theme{"../../themes/Black.txt"}; gui.add(tgui::Picture::create("../RedBackground.jpg")); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cb296c24..b37f486a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -72,9 +72,9 @@ add_custom_command(TARGET tests POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/tests/expected $/expected COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/tests/resources $/resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/widgets/Knob $/resources/Knob - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/widgets/Black.png $/resources - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/widgets/Black.txt $/resources) + COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/themes/Knob $/resources/Knob + COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/themes/Black.png $/resources + COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/themes/Black.txt $/resources) # Add the install rule for the executable install(TARGETS tests @@ -85,6 +85,6 @@ install(TARGETS tests install(DIRECTORY "${CMAKE_SOURCE_DIR}/tests/resources" DESTINATION "${INSTALL_MISC_DIR}/tests" COMPONENT tests) -install(DIRECTORY "${CMAKE_SOURCE_DIR}/widgets/" +install(DIRECTORY "${CMAKE_SOURCE_DIR}/themes/" DESTINATION "${INSTALL_MISC_DIR}/tests/resources" COMPONENT tests) diff --git a/widgets/BabyBlue.png b/themes/BabyBlue.png similarity index 100% rename from widgets/BabyBlue.png rename to themes/BabyBlue.png diff --git a/widgets/BabyBlue.txt b/themes/BabyBlue.txt similarity index 100% rename from widgets/BabyBlue.txt rename to themes/BabyBlue.txt diff --git a/widgets/Black.png b/themes/Black.png similarity index 100% rename from widgets/Black.png rename to themes/Black.png diff --git a/widgets/Black.txt b/themes/Black.txt similarity index 100% rename from widgets/Black.txt rename to themes/Black.txt diff --git a/widgets/Knob/Back.png b/themes/Knob/Back.png similarity index 100% rename from widgets/Knob/Back.png rename to themes/Knob/Back.png diff --git a/widgets/Knob/Black.txt b/themes/Knob/Black.txt similarity index 100% rename from widgets/Knob/Black.txt rename to themes/Knob/Black.txt diff --git a/widgets/Knob/Front.png b/themes/Knob/Front.png similarity index 100% rename from widgets/Knob/Front.png rename to themes/Knob/Front.png diff --git a/widgets/TransparentGrey.txt b/themes/TransparentGrey.txt similarity index 100% rename from widgets/TransparentGrey.txt rename to themes/TransparentGrey.txt