From 3790fa413e3d7bbb287f6681b8311a6a157bd9ad Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:50:59 +0200 Subject: [PATCH 1/6] Changed: Reorganize Ryzom Configuration structure --HG-- branch : develop --- .../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 From 933bda5fbbbeb43b64a5f96b216d7c7b462fdefa Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:51:25 +0200 Subject: [PATCH 2/6] Removed: Useless files --HG-- branch : develop --- .../tools/client/client_config_qt/.hgignore | 19 - .../client_config_qt/ryzom_configuration.pro | 64 --- .../translations/ryzom_configuration_en.ts | 500 ------------------ 3 files changed, 583 deletions(-) delete mode 100644 code/ryzom/tools/client/client_config_qt/.hgignore delete mode 100644 code/ryzom/tools/client/client_config_qt/ryzom_configuration.pro delete mode 100644 code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_en.ts diff --git a/code/ryzom/tools/client/client_config_qt/.hgignore b/code/ryzom/tools/client/client_config_qt/.hgignore deleted file mode 100644 index 2311283fc..000000000 --- a/code/ryzom/tools/client/client_config_qt/.hgignore +++ /dev/null @@ -1,19 +0,0 @@ -syntax: glob - -*.user -*.sln -*.ncb -*.vcproj -*.suo -debug -release -Win32 -GeneratedFiles -*.dll -*.log -*.cfg -*.pdb -*.qm - - - diff --git a/code/ryzom/tools/client/client_config_qt/ryzom_configuration.pro b/code/ryzom/tools/client/client_config_qt/ryzom_configuration.pro deleted file mode 100644 index 216bcad13..000000000 --- a/code/ryzom/tools/client/client_config_qt/ryzom_configuration.pro +++ /dev/null @@ -1,64 +0,0 @@ -QT += core -QT += gui -QT += opengl - -INCLUDEPATH += E:/projects/ryzom/bin/include - -win32:LIBS += E:/projects/ryzom/bin/lib/nel3d_d.lib -win32:LIBS += E:/projects/ryzom/bin/lib/nelmisc_d.lib -win32:LIBS += E:/projects/ryzom/src/external_stlport/lib/libjpeg.lib -win32:LIBS += E:/projects/ryzom/src/external_stlport/lib/libpng.lib -win32:LIBS += user32.lib -win32:LIBS += gdi32.lib -win32:LIBS += advapi32.lib -win32:LIBS += shell32.lib -win32:LIBS += ole32.lib -win32:LIBS += opengl32.lib - -SOURCES += \ - client_config_dialog.cpp \ - config.cpp \ - display_settings_advanced_widget.cpp \ - display_settings_details_widget.cpp \ - display_settings_widget.cpp \ - general_settings_widget.cpp \ - main.cpp \ - sound_settings_widget.cpp \ - system.cpp \ - sys_info_d3d_widget.cpp \ - sys_info_opengl_widget.cpp \ - sys_info_widget.cpp \ - - -FORMS += \ - 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 \ - -RESOURCES += \ - resources.qrc - -HEADERS += \ - client_config_dialog.h \ - config.h \ - display_settings_advanced_widget.h \ - display_settings_details_widget.h \ - display_settings_widget.h \ - general_settings_widget.h \ - sound_settings_widget.h \ - system.h \ - sys_info_d3d_widget.h \ - sys_info_opengl_widget.h \ - sys_info_widget.h \ - widget_base.h \ - -TRANSLATIONS = \ - ryzom_configuration_en.ts \ - ryzom_configuration_hu.ts - diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_en.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_en.ts deleted file mode 100644 index 4bf3d8126..000000000 --- a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_en.ts +++ /dev/null @@ -1,500 +0,0 @@ - - - - - CClientConfigDialog - - - Ryzom configuration - Ryzom configuration - - - - Are you sure you want to quit without saving the configuration? - Are you sure you want to quit without saving the configuration? - - - - CDisplaySettingsDetailsWidget - - - Low - Low - - - - Medium - Medium - - - - Normal - Normal - - - - High - High - - - - Low (32 MB) - Low (32 MB) - - - - Normal (64 MB) - Normal (64 MB) - - - - High (128 MB) - High (128 MB) - - - - CDisplaySettingsWidget - - - Auto - Auto - - - - CSoundSettingsWidget - - - %1 tracks - %1 tracks - - - - CSysInfoWidget - - - %1 MiB - %1 MiB - - - - client_config_dialog - - - Ryzom Configuration - Ryzom Configuration - - - - - General - General - - - - Category - Category - - - - Display - Display - - - - Display details - Display details - - - - Display advanced - Display advanced - - - - Sound - Sound - - - - System information - System information - - - - OpenGL information - OpenGL information - - - - Direct3D information - Direct3D information - - - - Apply - Apply - - - - Default - Default - - - - Play Ryzom - Play Ryzom - - - - display_settings_advanced_widget - - - Display advanced - Display advanced - - - - Modify these settings only if you have trouble launching the game - Modify these settings only if you have trouble launching the game - - - - Force texture compression - Force texture compression - - - - Disable vertex shaders - Disable vertex shaders - - - - Disable AGP for vertices - Disable AGP for vertices - - - - Disable pixel shaders - Disable pixel shaders - - - - display_settings_details_widget - - - Display details - Display details - - - - Landscape - Landscape - - - - - - - Level of detail - Level of detail - - - - - - - Low - Low - - - - Characters - Characters - - - - FX - FX - - - - Textures - Textures - - - - display_settings_widget - - - Display - Display - - - - Driver - Driver - - - Specify if Ryzom is to be run in OpenGL or Direct3D. - Specify if Ryzom is to be run in OpenGL or Direct3D. - - - - Specify if Ryzom is to be run in OpenGL or Direct3D: - Specify if Ryzom is to be run in OpenGL or Direct3D: - - - - Auto - Auto - - - - OpenGL - OpenGL - - - - Direct3D - Direct3D - - - - Parameters - Parameters - - - - Specify if Ryzom is to be run in full screen or window mode: - Specify if Ryzom is to be run in full screen or window mode: - - - - Full screen - Full screen - - - - Specify a video mode: - Specify a video mode: - - - Specify a video mode - Specify a video mode - - - - Windowed - Windowed - - - - Width - Width - - - - Height - Height - - - - X position - X position - - - - Y position - Y position - - - - general_settings_widget - - - Form - Form - - - - Language - Language - - - - English - English - - - - French - French - - - - German - German - - - - Hungarian - Hungarian - - - - Save config file when quitting the game - Save config file when quitting the game - - - - Advanced - Advanced - - - - Slow down the game (process low priority) - Slow down the game (process low priority) - - - Slow down the game ( process low priority ) - Slow down the game ( process low priority ) - - - - sound_settings_widget - - - Sound - Sound - - - - Enable sound - Enable sound - - - - Enable EAX - Enable EAX - - - - Enable FMod - Enable FMod - - - - Software sound buffer (may increase FPS) - Software sound buffer (may increase FPS) - - - Software sound buffer ( may increase FPS ) - Software sound buffer ( may increase FPS ) - - - - Sound tracks - Sound tracks - - - - 8 tracks - 8 tracks - - - - sys_info_d3d_widget - - - Direct3D information - Direct3D information - - - - Direct3D - Direct3D - - - - Description - Description - - - - Driver - Driver - - - - Driver version - Driver version - - - - sys_info_opengl_widget - - - OpenGL information - OpenGL information - - - - OpenGL - OpenGL - - - - Vendor - Vendor - - - - Renderer - Renderer - - - - Version - Version - - - - Extensions - Extensions - - - - sys_info_widget - - - - System information - System information - - - - Operating system - Operating system - - - - CPU - CPU - - - - Physical memory - Physical memory - - - - Video device - Video device - - - - Video driver version - Video driver version - - - From cd20d2e486389b8d489972b128a5dd06ef579071 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:54:31 +0200 Subject: [PATCH 3/6] Fixed: Conflicts with member variables, see #279 --HG-- branch : develop --- .../tools/client/ryzom_installer/src/profile.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp index ec0a95696..b80c368df 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp @@ -65,19 +65,19 @@ void CProfile::createShortcuts() const { const CServer &s = CConfigFile::getInstance()->getServer(server); - QString executable = getClientFullPath(); + QString exe = getClientFullPath(); QString workingDir = s.getDirectory(); - QString arguments = QString("--profile %1").arg(id); + QString profileArguments = QString("--profile %1").arg(id); // append custom arguments - if (!arguments.isEmpty()) arguments += QString(" %1").arg(arguments); + if (!arguments.isEmpty()) profileArguments += QString(" %1").arg(arguments); QString icon; #ifdef Q_OS_WIN32 // under Windows, icon is included in executable - icon = executable; + icon = exe; #else // icon is in the same directory as client icon = s.getDirectory() + "/ryzom_client.png"; @@ -88,7 +88,7 @@ void CProfile::createShortcuts() const QString shortcut = getClientDesktopShortcutFullPath(); // create desktop shortcut - createLink(shortcut, name, executable, arguments, icon, workingDir); + createLink(shortcut, name, exe, profileArguments, icon, workingDir); } if (menuShortcut) @@ -96,7 +96,7 @@ void CProfile::createShortcuts() const QString shortcut = getClientMenuShortcutFullPath(); // create menu shortcut - createLink(shortcut, name, executable, arguments, icon, workingDir); + createLink(shortcut, name, exe, profileArguments, icon, workingDir); } } From af26339d00b6a593c89bd06aa0e344693164e5e0 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:55:04 +0200 Subject: [PATCH 4/6] Fixed: Minor problems in French translations, see #279 --HG-- branch : develop --- .../client/ryzom_installer/translations/ryzom_installer_fr.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts index b05f797da..705b70452 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts @@ -170,7 +170,7 @@ Are you sure to abort download? %p% (%v/%m KiB) - %p% (%v/%m KiO) + %p% (%v/%m Kio) @@ -405,7 +405,9 @@ This program will allow you to download, install, configure and manage Ryzom on Just follow the different steps and make your choice between the options presented. Bienvenue dans l'Installateur de Ryzom ! + Ce programme vous permettra de télécharger, installer, configurer et gérer Ryzom sur votre ordinateur. + Vous n'avez qu'à suivre les différentes étapes et faire un choix entre les différentes options proposées. From 4acc2afd3acb48080b90bab2f6af44bc948bd05a Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:55:49 +0200 Subject: [PATCH 5/6] Changed: Move windows and dialog to foreground, see #279 --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp | 2 ++ code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp | 2 ++ code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp | 2 ++ code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp index ca24277fd..fad255622 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp @@ -79,6 +79,8 @@ CInstallDialog::CInstallDialog():QDialog() onShowAdvancedParameters(Qt::Unchecked); connect(advancedCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowAdvancedParameters(int))); + + raise(); } CInstallDialog::~CInstallDialog() diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp index daab29bb8..04c665197 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp @@ -68,6 +68,8 @@ CMainWindow::CMainWindow():QMainWindow() updateProfiles(); updateButtons(); + + raise(); } CMainWindow::~CMainWindow() diff --git a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp index 5eb15eb4b..5f455c938 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp @@ -76,6 +76,8 @@ CMigrateDialog::CMigrateDialog():QDialog() onShowAdvancedParameters(Qt::Unchecked); connect(advancedCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowAdvancedParameters(int))); + + raise(); } CMigrateDialog::~CMigrateDialog() diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 36ea6d6f2..81351736b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -72,6 +72,8 @@ COperationDialog::COperationDialog(QWidget *parent):QDialog(parent), m_aborting( connect(this, SIGNAL(done()), SLOT(onDone())); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + raise(); } COperationDialog::~COperationDialog() From dc8f74ba39a2bb5a5ef2fc70efede7ec1475054f Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 09:56:16 +0200 Subject: [PATCH 6/6] Fixed: Update client.cfg after it's copied, see #279 --HG-- branch : develop --- .../tools/client/ryzom_installer/src/operationdialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 81351736b..07b85ff20 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -638,6 +638,9 @@ void COperationDialog::copyProfileFiles() { } + // correct path to client_default.cfg + profile.createClientConfig(); + emit done(); } @@ -900,8 +903,6 @@ bool COperationDialog::createDefaultProfile() config->addProfile(profile); config->save(); - profile.createClientConfig(); - emit done(); return true;