aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-09-21 09:57:47 +02:00
commit 6b2c4a44b1
48 changed files with 41 additions and 637 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
code/ryzom/tools/client/client_config_qt/.hgignore
View file

@ -1,19 +0,0 @@
syntax: glob
*.user
*.sln
*.ncb
*.vcproj
*.suo
debug
release
Win32
GeneratedFiles
*.dll
*.log
*.cfg
*.pdb
*.qm

33
code/ryzom/tools/client/client_config_qt/CMakeLists.txt
View file

@ -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})

16
code/ryzom/tools/client/client_config_qt/resources.qrc
View file

@ -1,16 +0,0 @@
<RCC>
<qresource prefix="/">
<file>resources/card_icon.png</file>
<file>resources/display_config_icon.png</file>
<file>resources/display_icon.png</file>
<file>resources/display_properties_icon.png</file>
<file>resources/general_icon.png</file>
<file>resources/left_bitmap_0.png</file>
<file>resources/network_icon.png</file>
<file>resources/sound_icon.png</file>
<file>resources/splash_screen.png</file>
<file>resources/top_right.png</file>
<file>resources/update_icon.png</file>
<file>resources/welcome_icon.png</file>
</qresource>
</RCC>

16
code/ryzom/tools/client/client_config_qt/resources/resources.qrc Normal file
View file

@ -0,0 +1,16 @@
<RCC>
<qresource prefix="/resources">
<file>card_icon.png</file>
<file>display_config_icon.png</file>
<file>display_icon.png</file>
<file>display_properties_icon.png</file>
<file>general_icon.png</file>
<file>left_bitmap_0.png</file>
<file>network_icon.png</file>
<file>sound_icon.png</file>
<file>splash_screen.png</file>
<file>top_right.png</file>
<file>update_icon.png</file>
<file>welcome_icon.png</file>
</qresource>
</RCC>

64
code/ryzom/tools/client/client_config_qt/ryzom_configuration.pro
View file

@ -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

0
code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp → code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
View file

0
code/ryzom/tools/client/client_config_qt/client_config_dialog.h → code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h
View file

0
code/ryzom/tools/client/client_config_qt/config.cpp → code/ryzom/tools/client/client_config_qt/src/config.cpp
View file

0
code/ryzom/tools/client/client_config_qt/config.h → code/ryzom/tools/client/client_config_qt/src/config.h
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp → code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.h → code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp → code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_details_widget.h → code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp → code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_widget.h → code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp → code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/general_settings_widget.h → code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/main.cpp → code/ryzom/tools/client/client_config_qt/src/main.cpp
View file

0
code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp → code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/sound_settings_widget.h → code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/stdpch.cpp → code/ryzom/tools/client/client_config_qt/src/stdpch.cpp
View file

0
code/ryzom/tools/client/client_config_qt/stdpch.h → code/ryzom/tools/client/client_config_qt/src/stdpch.h
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp → code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.h → code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp → code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.h → code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp → code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_widget.h → code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h
View file

0
code/ryzom/tools/client/client_config_qt/system.cpp → code/ryzom/tools/client/client_config_qt/src/system.cpp
View file

0
code/ryzom/tools/client/client_config_qt/system.h → code/ryzom/tools/client/client_config_qt/src/system.h
View file

0
code/ryzom/tools/client/client_config_qt/widget_base.h → code/ryzom/tools/client/client_config_qt/src/widget_base.h
View file

500
code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_en.ts
View file

@ -1,500 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en" sourcelanguage="en">
<context>
<name>CClientConfigDialog</name>
<message>
<location filename="../client_config_dialog.cpp" line="251"/>
<source>Ryzom configuration</source>
<translation>Ryzom configuration</translation>
</message>
<message>
<location filename="../client_config_dialog.cpp" line="252"/>
<source>Are you sure you want to quit without saving the configuration?</source>
<translation>Are you sure you want to quit without saving the configuration?</translation>
</message>
</context>
<context>
<name>CDisplaySettingsDetailsWidget</name>
<message>
<location filename="../display_settings_details_widget.cpp" line="218"/>
<source>Low</source>
<translation>Low</translation>
</message>
<message>
<location filename="../display_settings_details_widget.cpp" line="221"/>
<source>Medium</source>
<translation>Medium</translation>
</message>
<message>
<location filename="../display_settings_details_widget.cpp" line="224"/>
<source>Normal</source>
<translation>Normal</translation>
</message>
<message>
<location filename="../display_settings_details_widget.cpp" line="227"/>
<source>High</source>
<translation>High</translation>
</message>
<message>
<location filename="../display_settings_details_widget.cpp" line="240"/>
<source>Low (32 MB)</source>
<translation>Low (32 MB)</translation>
</message>
<message>
<location filename="../display_settings_details_widget.cpp" line="244"/>
<source>Normal (64 MB)</source>
<translation>Normal (64 MB)</translation>
</message>
<message>
<location filename="../display_settings_details_widget.cpp" line="248"/>
<source>High (128 MB)</source>
<translation>High (128 MB)</translation>
</message>
</context>
<context>
<name>CDisplaySettingsWidget</name>
<message>
<location filename="../display_settings_widget.cpp" line="179"/>
<source>Auto</source>
<translation>Auto</translation>
</message>
</context>
<context>
<name>CSoundSettingsWidget</name>
<message>
<location filename="../sound_settings_widget.cpp" line="92"/>
<source>%1 tracks</source>
<translation>%1 tracks</translation>
</message>
</context>
<context>
<name>CSysInfoWidget</name>
<message>
<location filename="../sys_info_widget.cpp" line="30"/>
<source>%1 MiB</source>
<translation>%1 MiB</translation>
</message>
</context>
<context>
<name>client_config_dialog</name>
<message>
<location filename="../client_config_dialog.ui" line="20"/>
<source>Ryzom Configuration</source>
<translation>Ryzom Configuration</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="107"/>
<location filename="../client_config_dialog.ui" line="135"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="130"/>
<source>Category</source>
<translation>Category</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="146"/>
<source>Display</source>
<translation>Display</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="156"/>
<source>Display details</source>
<translation>Display details</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="161"/>
<source>Display advanced</source>
<translation>Display advanced</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="167"/>
<source>Sound</source>
<translation>Sound</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="178"/>
<source>System information</source>
<translation>System information</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="188"/>
<source>OpenGL information</source>
<translation>OpenGL information</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="193"/>
<source>Direct3D information</source>
<translation>Direct3D information</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="245"/>
<source>Apply</source>
<translation>Apply</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="252"/>
<source>Default</source>
<translation>Default</translation>
</message>
<message>
<location filename="../client_config_dialog.ui" line="259"/>
<source>Play Ryzom</source>
<translation>Play Ryzom</translation>
</message>
</context>
<context>
<name>display_settings_advanced_widget</name>
<message>
<location filename="../display_settings_advanced_widget.ui" line="14"/>
<source>Display advanced</source>
<translation>Display advanced</translation>
</message>
<message>
<location filename="../display_settings_advanced_widget.ui" line="22"/>
<source>Modify these settings only if you have trouble launching the game</source>
<translation>Modify these settings only if you have trouble launching the game</translation>
</message>
<message>
<location filename="../display_settings_advanced_widget.ui" line="31"/>
<source>Force texture compression</source>
<translation>Force texture compression</translation>
</message>
<message>
<location filename="../display_settings_advanced_widget.ui" line="38"/>
<source>Disable vertex shaders</source>
<translation>Disable vertex shaders</translation>
</message>
<message>
<location filename="../display_settings_advanced_widget.ui" line="45"/>
<source>Disable AGP for vertices</source>
<translation>Disable AGP for vertices</translation>
</message>
<message>
<location filename="../display_settings_advanced_widget.ui" line="52"/>
<source>Disable pixel shaders</source>
<translation>Disable pixel shaders</translation>
</message>
</context>
<context>
<name>display_settings_details_widget</name>
<message>
<location filename="../display_settings_details_widget.ui" line="14"/>
<source>Display details</source>
<translation>Display details</translation>
</message>
<message>
<location filename="../display_settings_details_widget.ui" line="20"/>
<source>Landscape</source>
<translation>Landscape</translation>
</message>
<message>
<location filename="../display_settings_details_widget.ui" line="30"/>
<location filename="../display_settings_details_widget.ui" line="116"/>
<location filename="../display_settings_details_widget.ui" line="196"/>
<location filename="../display_settings_details_widget.ui" line="276"/>
<source>Level of detail</source>
<translation>Level of detail</translation>
</message>
<message>
<location filename="../display_settings_details_widget.ui" line="94"/>
<location filename="../display_settings_details_widget.ui" line="174"/>
<location filename="../display_settings_details_widget.ui" line="254"/>
<location filename="../display_settings_details_widget.ui" line="334"/>
<source>Low</source>
<translation>Low</translation>
</message>
<message>
<location filename="../display_settings_details_widget.ui" line="106"/>
<source>Characters</source>
<translation>Characters</translation>
</message>
<message>
<location filename="../display_settings_details_widget.ui" line="186"/>
<source>FX</source>
<translation>FX</translation>
</message>
<message>
<location filename="../display_settings_details_widget.ui" line="266"/>
<source>Textures</source>
<translation>Textures</translation>
</message>
</context>
<context>
<name>display_settings_widget</name>
<message>
<location filename="../display_settings_widget.ui" line="14"/>
<source>Display</source>
<translation>Display</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="20"/>
<source>Driver</source>
<translation>Driver</translation>
</message>
<message>
<source>Specify if Ryzom is to be run in OpenGL or Direct3D.</source>
<translation type="vanished">Specify if Ryzom is to be run in OpenGL or Direct3D.</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="28"/>
<source>Specify if Ryzom is to be run in OpenGL or Direct3D:</source>
<translation>Specify if Ryzom is to be run in OpenGL or Direct3D:</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="35"/>
<source>Auto</source>
<translation>Auto</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="42"/>
<source>OpenGL</source>
<translation>OpenGL</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="49"/>
<source>Direct3D</source>
<translation>Direct3D</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="61"/>
<source>Parameters</source>
<translation>Parameters</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="67"/>
<source>Specify if Ryzom is to be run in full screen or window mode:</source>
<translation>Specify if Ryzom is to be run in full screen or window mode:</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="74"/>
<source>Full screen</source>
<translation>Full screen</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="81"/>
<source>Specify a video mode:</source>
<translation>Specify a video mode:</translation>
</message>
<message>
<source>Specify a video mode</source>
<translation type="vanished">Specify a video mode</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="104"/>
<source>Windowed</source>
<translation>Windowed</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="115"/>
<source>Width</source>
<translation>Width</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="122"/>
<source>Height</source>
<translation>Height</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="129"/>
<source>X position</source>
<translation>X position</translation>
</message>
<message>
<location filename="../display_settings_widget.ui" line="136"/>
<source>Y position</source>
<translation>Y position</translation>
</message>
</context>
<context>
<name>general_settings_widget</name>
<message>
<location filename="../general_settings_widget.ui" line="14"/>
<source>Form</source>
<translation>Form</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="25"/>
<source>Language</source>
<translation>Language</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="33"/>
<source>English</source>
<translation>English</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="38"/>
<source>French</source>
<translation>French</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="43"/>
<source>German</source>
<translation>German</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="48"/>
<source>Hungarian</source>
<translation>Hungarian</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="72"/>
<source>Save config file when quitting the game</source>
<translation>Save config file when quitting the game</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="92"/>
<source>Advanced</source>
<translation>Advanced</translation>
</message>
<message>
<location filename="../general_settings_widget.ui" line="100"/>
<source>Slow down the game (process low priority)</source>
<translation>Slow down the game (process low priority)</translation>
</message>
<message>
<source>Slow down the game ( process low priority )</source>
<translation type="vanished">Slow down the game ( process low priority )</translation>
</message>
</context>
<context>
<name>sound_settings_widget</name>
<message>
<location filename="../sound_settings_widget.ui" line="14"/>
<source>Sound</source>
<translation>Sound</translation>
</message>
<message>
<location filename="../sound_settings_widget.ui" line="24"/>
<source>Enable sound</source>
<translation>Enable sound</translation>
</message>
<message>
<location filename="../sound_settings_widget.ui" line="31"/>
<source>Enable EAX</source>
<translation>Enable EAX</translation>
</message>
<message>
<location filename="../sound_settings_widget.ui" line="38"/>
<source>Enable FMod</source>
<translation>Enable FMod</translation>
</message>
<message>
<location filename="../sound_settings_widget.ui" line="45"/>
<source>Software sound buffer (may increase FPS)</source>
<translation>Software sound buffer (may increase FPS)</translation>
</message>
<message>
<source>Software sound buffer ( may increase FPS )</source>
<translation type="vanished">Software sound buffer ( may increase FPS )</translation>
</message>
<message>
<location filename="../sound_settings_widget.ui" line="68"/>
<source>Sound tracks</source>
<translation>Sound tracks</translation>
</message>
<message>
<location filename="../sound_settings_widget.ui" line="117"/>
<source>8 tracks</source>
<translation>8 tracks</translation>
</message>
</context>
<context>
<name>sys_info_d3d_widget</name>
<message>
<location filename="../sys_info_d3d_widget.ui" line="14"/>
<source>Direct3D information</source>
<translation>Direct3D information</translation>
</message>
<message>
<location filename="../sys_info_d3d_widget.ui" line="20"/>
<source>Direct3D</source>
<translation>Direct3D</translation>
</message>
<message>
<location filename="../sys_info_d3d_widget.ui" line="30"/>
<source>Description</source>
<translation>Description</translation>
</message>
<message>
<location filename="../sys_info_d3d_widget.ui" line="65"/>
<source>Driver</source>
<translation>Driver</translation>
</message>
<message>
<location filename="../sys_info_d3d_widget.ui" line="100"/>
<source>Driver version</source>
<translation>Driver version</translation>
</message>
</context>
<context>
<name>sys_info_opengl_widget</name>
<message>
<location filename="../sys_info_opengl_widget.ui" line="14"/>
<source>OpenGL information</source>
<translation>OpenGL information</translation>
</message>
<message>
<location filename="../sys_info_opengl_widget.ui" line="20"/>
<source>OpenGL</source>
<translation>OpenGL</translation>
</message>
<message>
<location filename="../sys_info_opengl_widget.ui" line="28"/>
<source>Vendor</source>
<translation>Vendor</translation>
</message>
<message>
<location filename="../sys_info_opengl_widget.ui" line="63"/>
<source>Renderer</source>
<translation>Renderer</translation>
</message>
<message>
<location filename="../sys_info_opengl_widget.ui" line="98"/>
<source>Version</source>
<translation>Version</translation>
</message>
<message>
<location filename="../sys_info_opengl_widget.ui" line="148"/>
<source>Extensions</source>
<translation>Extensions</translation>
</message>
</context>
<context>
<name>sys_info_widget</name>
<message>
<location filename="../sys_info_widget.ui" line="14"/>
<location filename="../sys_info_widget.ui" line="20"/>
<source>System information</source>
<translation>System information</translation>
</message>
<message>
<location filename="../sys_info_widget.ui" line="30"/>
<source>Operating system</source>
<translation>Operating system</translation>
</message>
<message>
<location filename="../sys_info_widget.ui" line="68"/>
<source>CPU</source>
<translation>CPU</translation>
</message>
<message>
<location filename="../sys_info_widget.ui" line="106"/>
<source>Physical memory</source>
<translation>Physical memory</translation>
</message>
<message>
<location filename="../sys_info_widget.ui" line="135"/>
<source>Video device</source>
<translation>Video device</translation>
</message>
<message>
<location filename="../sys_info_widget.ui" line="173"/>
<source>Video driver version</source>
<translation>Video driver version</translation>
</message>
</context>
</TS>

1
code/ryzom/tools/client/client_config_qt/translations/translations.qrc
View file

@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/translations">
<file>ryzom_configuration_de.qm</file>
<file>ryzom_configuration_en.qm</file>
<file>ryzom_configuration_es.qm</file>
<file>ryzom_configuration_fr.qm</file>
<file>ryzom_configuration_hu.qm</file>

0
code/ryzom/tools/client/client_config_qt/client_config_dialog.ui → code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.ui → code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_details_widget.ui → code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/display_settings_widget.ui → code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/general_settings_widget.ui → code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/sound_settings_widget.ui → code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.ui → code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.ui → code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
View file

0
code/ryzom/tools/client/client_config_qt/sys_info_widget.ui → code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui
View file

2
code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
View file

@ -79,6 +79,8 @@ CInstallDialog::CInstallDialog():QDialog()
onShowAdvancedParameters(Qt::Unchecked);
connect(advancedCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowAdvancedParameters(int)));
raise();
}
CInstallDialog::~CInstallDialog()

2
code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp
View file

@ -68,6 +68,8 @@ CMainWindow::CMainWindow():QMainWindow()
updateProfiles();
updateButtons();
raise();
}
CMainWindow::~CMainWindow()

2
code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
View file

@ -76,6 +76,8 @@ CMigrateDialog::CMigrateDialog():QDialog()
onShowAdvancedParameters(Qt::Unchecked);
connect(advancedCheckBox, SIGNAL(stateChanged(int)), SLOT(onShowAdvancedParameters(int)));
raise();
}
CMigrateDialog::~CMigrateDialog()

7
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -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()
@ -636,6 +638,9 @@ void COperationDialog::copyProfileFiles()
{
}
// correct path to client_default.cfg
profile.createClientConfig();
emit done();
}
@ -898,8 +903,6 @@ bool COperationDialog::createDefaultProfile()
config->addProfile(profile);
config->save();
profile.createClientConfig();
emit done();
return true;

12
code/ryzom/tools/client/ryzom_installer/src/profile.cpp
View file

@ -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);
}
}

4
code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_fr.ts
View file

@ -170,7 +170,7 @@ Are you sure to abort download?</source>
<message>
<location filename="../src/operationdialog.cpp" line="432"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m KiO)</translation>
<translation>%p% (%v/%m Kio)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="492"/>
@ -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.</source>
<translation>Bienvenue dans l&apos;Installateur de Ryzom !
Ce programme vous permettra de télécharger, installer, configurer et gérer Ryzom sur votre ordinateur.
Vous n&apos;avez qu&apos;à suivre les différentes étapes et faire un choix entre les différentes options proposées. </translation>
</message>
<message>