From 9b3df1892b8a1b68850f8157d44bc7e96e8a2274 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:50:59 +0200 Subject: [PATCH] Changed: Reorganize Ryzom Configuration structure --- .../client/client_config_qt/CMakeLists.txt | 33 +++---------------- .../client/client_config_qt/resources.qrc | 16 --------- .../client_config_qt/resources/resources.qrc | 16 +++++++++ .../{ => src}/client_config_dialog.cpp | 0 .../{ => src}/client_config_dialog.h | 0 .../client_config_qt/{ => src}/config.cpp | 0 .../client_config_qt/{ => src}/config.h | 0 .../display_settings_advanced_widget.cpp | 0 .../display_settings_advanced_widget.h | 0 .../display_settings_details_widget.cpp | 0 .../display_settings_details_widget.h | 0 .../{ => src}/display_settings_widget.cpp | 0 .../{ => src}/display_settings_widget.h | 0 .../{ => src}/general_settings_widget.cpp | 0 .../{ => src}/general_settings_widget.h | 0 .../client_config_qt/{ => src}/main.cpp | 0 .../{ => src}/sound_settings_widget.cpp | 0 .../{ => src}/sound_settings_widget.h | 0 .../client_config_qt/{ => src}/stdpch.cpp | 0 .../client_config_qt/{ => src}/stdpch.h | 0 .../{ => src}/sys_info_d3d_widget.cpp | 0 .../{ => src}/sys_info_d3d_widget.h | 0 .../{ => src}/sys_info_opengl_widget.cpp | 0 .../{ => src}/sys_info_opengl_widget.h | 0 .../{ => src}/sys_info_widget.cpp | 0 .../{ => src}/sys_info_widget.h | 0 .../client_config_qt/{ => src}/system.cpp | 0 .../client_config_qt/{ => src}/system.h | 0 .../client_config_qt/{ => src}/widget_base.h | 0 .../translations/translations.qrc | 1 - .../{ => ui}/client_config_dialog.ui | 0 .../display_settings_advanced_widget.ui | 0 .../display_settings_details_widget.ui | 0 .../{ => ui}/display_settings_widget.ui | 0 .../{ => ui}/general_settings_widget.ui | 0 .../{ => ui}/sound_settings_widget.ui | 0 .../{ => ui}/sys_info_d3d_widget.ui | 0 .../{ => ui}/sys_info_opengl_widget.ui | 0 .../{ => ui}/sys_info_widget.ui | 0 39 files changed, 21 insertions(+), 45 deletions(-) delete mode 100644 code/ryzom/tools/client/client_config_qt/resources.qrc create mode 100644 code/ryzom/tools/client/client_config_qt/resources/resources.qrc rename code/ryzom/tools/client/client_config_qt/{ => src}/client_config_dialog.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/client_config_dialog.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/config.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/config.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/display_settings_advanced_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/display_settings_advanced_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/display_settings_details_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/display_settings_details_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/display_settings_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/display_settings_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/general_settings_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/general_settings_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/main.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sound_settings_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sound_settings_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/stdpch.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/stdpch.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sys_info_d3d_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sys_info_d3d_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sys_info_opengl_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sys_info_opengl_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sys_info_widget.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/sys_info_widget.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/system.cpp (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/system.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => src}/widget_base.h (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/client_config_dialog.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/display_settings_advanced_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/display_settings_details_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/display_settings_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/general_settings_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/sound_settings_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/sys_info_d3d_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/sys_info_opengl_widget.ui (100%) rename code/ryzom/tools/client/client_config_qt/{ => ui}/sys_info_widget.ui (100%) diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt index 0e85ea97b..518fb7ce8 100644 --- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt +++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt @@ -1,36 +1,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR}) -FILE(GLOB SRC *.cpp *.h resources/*.rc) - -SET(CLIENT_CONFIG_HDR - client_config_dialog.h - display_settings_advanced_widget.h - display_settings_details_widget.h - display_settings_widget.h - general_settings_widget.h - sound_settings_widget.h - sys_info_d3d_widget.h - sys_info_opengl_widget.h - sys_info_widget.h - widget_base.h -) - -SET(CLIENT_CONFIG_UIS - client_config_dialog.ui - display_settings_advanced_widget.ui - display_settings_details_widget.ui - display_settings_widget.ui - general_settings_widget.ui - sound_settings_widget.ui - sys_info_d3d_widget.ui - sys_info_opengl_widget.ui - sys_info_widget.ui -) +FILE(GLOB SRC src/*.cpp src/*.h resources/*.rc) +FILE(GLOB CLIENT_CONFIG_HDR src/*.h) +FILE(GLOB CLIENT_CONFIG_UIS ui/*.ui) FILE(GLOB CLIENT_CONFIG_TRANS translations/*.ts) CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) -SET(CLIENT_CONFIG_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ) +SET(CLIENT_CONFIG_RCS resources/resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ) IF(WITH_QT) INCLUDE_DIRECTORIES(${QT_INCLUDES}) @@ -44,7 +21,7 @@ IF(WITH_QT) ADD_DEFINITIONS(${QT_DEFINITIONS}) ELSE() # uncomment this line if you want to update original translations -# QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS}) +# QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR}) QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS}) QT5_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS}) QT5_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR}) diff --git a/code/ryzom/tools/client/client_config_qt/resources.qrc b/code/ryzom/tools/client/client_config_qt/resources.qrc deleted file mode 100644 index 1d86eaded..000000000 --- a/code/ryzom/tools/client/client_config_qt/resources.qrc +++ /dev/null @@ -1,16 +0,0 @@ - - - resources/card_icon.png - resources/display_config_icon.png - resources/display_icon.png - resources/display_properties_icon.png - resources/general_icon.png - resources/left_bitmap_0.png - resources/network_icon.png - resources/sound_icon.png - resources/splash_screen.png - resources/top_right.png - resources/update_icon.png - resources/welcome_icon.png - - diff --git a/code/ryzom/tools/client/client_config_qt/resources/resources.qrc b/code/ryzom/tools/client/client_config_qt/resources/resources.qrc new file mode 100644 index 000000000..b45ca8b56 --- /dev/null +++ b/code/ryzom/tools/client/client_config_qt/resources/resources.qrc @@ -0,0 +1,16 @@ + + + card_icon.png + display_config_icon.png + display_icon.png + display_properties_icon.png + general_icon.png + left_bitmap_0.png + network_icon.png + sound_icon.png + splash_screen.png + top_right.png + update_icon.png + welcome_icon.png + + diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp rename to code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.h b/code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/client_config_dialog.h rename to code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h diff --git a/code/ryzom/tools/client/client_config_qt/config.cpp b/code/ryzom/tools/client/client_config_qt/src/config.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/config.cpp rename to code/ryzom/tools/client/client_config_qt/src/config.cpp diff --git a/code/ryzom/tools/client/client_config_qt/config.h b/code/ryzom/tools/client/client_config_qt/src/config.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/config.h rename to code/ryzom/tools/client/client_config_qt/src/config.h diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.h b/code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.h rename to code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.h b/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_details_widget.h rename to code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.h b/code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_widget.h rename to code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.h b/code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/general_settings_widget.h rename to code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/main.cpp b/code/ryzom/tools/client/client_config_qt/src/main.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/main.cpp rename to code/ryzom/tools/client/client_config_qt/src/main.cpp diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.h b/code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sound_settings_widget.h rename to code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.cpp b/code/ryzom/tools/client/client_config_qt/src/stdpch.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/stdpch.cpp rename to code/ryzom/tools/client/client_config_qt/src/stdpch.cpp diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.h b/code/ryzom/tools/client/client_config_qt/src/stdpch.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/stdpch.h rename to code/ryzom/tools/client/client_config_qt/src/stdpch.h diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.h b/code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.h rename to code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.h b/code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.h rename to code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp rename to code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.h b/code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_widget.h rename to code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h diff --git a/code/ryzom/tools/client/client_config_qt/system.cpp b/code/ryzom/tools/client/client_config_qt/src/system.cpp similarity index 100% rename from code/ryzom/tools/client/client_config_qt/system.cpp rename to code/ryzom/tools/client/client_config_qt/src/system.cpp diff --git a/code/ryzom/tools/client/client_config_qt/system.h b/code/ryzom/tools/client/client_config_qt/src/system.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/system.h rename to code/ryzom/tools/client/client_config_qt/src/system.h diff --git a/code/ryzom/tools/client/client_config_qt/widget_base.h b/code/ryzom/tools/client/client_config_qt/src/widget_base.h similarity index 100% rename from code/ryzom/tools/client/client_config_qt/widget_base.h rename to code/ryzom/tools/client/client_config_qt/src/widget_base.h diff --git a/code/ryzom/tools/client/client_config_qt/translations/translations.qrc b/code/ryzom/tools/client/client_config_qt/translations/translations.qrc index 15787fde3..e33a0aa44 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/translations.qrc +++ b/code/ryzom/tools/client/client_config_qt/translations/translations.qrc @@ -1,7 +1,6 @@ ryzom_configuration_de.qm - ryzom_configuration_en.qm ryzom_configuration_es.qm ryzom_configuration_fr.qm ryzom_configuration_hu.qm diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui b/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/client_config_dialog.ui rename to code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_details_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/display_settings_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/general_settings_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sound_settings_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui similarity index 100% rename from code/ryzom/tools/client/client_config_qt/sys_info_widget.ui rename to code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui