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

Translation files are now embedded into the binary, also made the source groups a bit more sane.

Browse source
This commit is contained in:
dfighter1985 2012-03-16 17:35:37 +01:00
parent a2ad31ae87
commit e020106e82
5 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,17 +1,16 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDES} ) ${QT_INCLUDES} )
FILE( GLOB SRC *.cpp *.h ) FILE( GLOB SRC *.cpp *.h )
SET( CLIENT_CONFIG_HDR SET( CLIENT_CONFIG_HDR
client_config_dialog.h client_config_dialog.h
config.h
display_settings_advanced_widget.h display_settings_advanced_widget.h
display_settings_details_widget.h display_settings_details_widget.h
display_settings_widget.h display_settings_widget.h
general_settings_widget.h general_settings_widget.h
sound_settings_widget.h sound_settings_widget.h
system.h
sys_info_d3d_widget.h sys_info_d3d_widget.h
sys_info_opengl_widget.h sys_info_opengl_widget.h
sys_info_widget.h sys_info_widget.h
@ -30,21 +29,29 @@ SET( CLIENT_CONFIG_UIS
sys_info_widget.ui sys_info_widget.ui
) )
SET( CLIENT_CONFIG_RCS resources.qrc ) SET( CLIENT_CONFIG_TRANS
translations/ryzom_configuration_en.ts
translations/ryzom_configuration_hu.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( QT_USE_QTGUI TRUE ) SET( QT_USE_QTGUI TRUE )
SET( QT_USE_QTOPENGL TRUE ) SET( QT_USE_QTOPENGL TRUE )
SET( QT_USE_QTCORE TRUE ) SET( QT_USE_QTCORE TRUE )
QT4_ADD_TRANSLATION( CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS} )
QT4_ADD_RESOURCES( CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS} ) QT4_ADD_RESOURCES( CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS} )
QT4_WRAP_CPP( CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR} ) QT4_WRAP_CPP( CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR} )
QT4_WRAP_UI( CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS} ) QT4_WRAP_UI( CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS} )
SOURCE_GROUP( "Resources" FILES ${CLIENT_CONFIG_UIS} ${CLIENT_CONFIG_RCS} ) SOURCE_GROUP( "Resources" FILES ${CLIENT_CONFIG_RCS} )
SOURCE_GROUP( "Forms" FILES ${CLIENT_CONFIG_UIS} )
SOURCE_GROUP( "Generated Files" FILES ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_MOC_SRC} ) SOURCE_GROUP( "Generated Files" FILES ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_MOC_SRC} )
SOURCE_GROUP( "Sources" FILES ${SRC} ) SOURCE_GROUP( "Translation Files" FILES ${CLIENT_CONFIG_TRANS} )
ADD_DEFINITIONS( ${QT_DEFINITIONS} ) ADD_DEFINITIONS( ${QT_DEFINITIONS} )
ADD_EXECUTABLE( ryzom_configuration_qt ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ) ADD_EXECUTABLE( ryzom_configuration_qt WIN32 MACOSX_BUNDLE ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} )
NL_DEFAULT_PROPS( ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" ) NL_DEFAULT_PROPS( ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" )
NL_ADD_RUNTIME_FLAGS( ryzom_configuration_qt ) NL_ADD_RUNTIME_FLAGS( ryzom_configuration_qt )
NL_ADD_LIB_SUFFIX( ryzom_configuration_qt ) NL_ADD_LIB_SUFFIX( ryzom_configuration_qt )
TARGET_LINK_LIBRARIES( ryzom_configuration_qt nelmisc nel3d ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ) TARGET_LINK_LIBRARIES( ryzom_configuration_qt nelmisc nel3d ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} )
INSTALL( TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications ) INSTALL( TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications )

2
code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp
View file

@ -90,7 +90,7 @@ void CGeneralSettingsWidget::onLanguageChanged()
} }
currentTranslator = new QTranslator(); currentTranslator = new QTranslator();
if( currentTranslator->load( QString( "ryzom_configuration_%1" ).arg( languageCodes[ i ] ) ) ) if( currentTranslator->load( QString( ":/translations/ryzom_configuration_%1" ).arg( languageCodes[ i ] ) ) )
qApp->installTranslator( currentTranslator ); qApp->installTranslator( currentTranslator );
emit changed(); emit changed();

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

0
code/ryzom/tools/client/client_config_qt/ryzom_configuration_hu.ts → code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_hu.ts
View file

6
code/ryzom/tools/client/client_config_qt/translations/translations.qrc Normal file
View file

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