diff --git a/code/nel/src/misc/system_info.cpp b/code/nel/src/misc/system_info.cpp index a5b78c08b..0aa559e89 100644 --- a/code/nel/src/misc/system_info.cpp +++ b/code/nel/src/misc/system_info.cpp @@ -1442,6 +1442,7 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion) DWORD valueType; char value[512]; DWORD size = 512; + string driverName; if (RegQueryValueExA(baseKey, keyName.c_str(), NULL, &valueType, (unsigned char *)value, &size) == ERROR_SUCCESS) { // Null ? @@ -1459,6 +1460,15 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion) { if (value[0] != 0) { + static const std::string s_systemRoot = "\\SystemRoot\\"; + + driverName = value; + + if (driverName.substr(0, s_systemRoot.length()) == s_systemRoot) + { + driverName = driverName.substr(s_systemRoot.length()); + } + ok = true; } else @@ -1484,7 +1494,6 @@ bool CSystemInfo::getVideoInfo (std::string &deviceName, uint64 &driverVersion) if (_VerQueryValue && _GetFileVersionInfoSize && _GetFileVersionInfo) { // value got the path to the driver - string driverName = value; if (atleastNT4) { nlverify (GetWindowsDirectoryA(value, 512) != 0); diff --git a/code/ryzom/tools/client/CMakeLists.txt b/code/ryzom/tools/client/CMakeLists.txt index 0c42233cb..c76d21a9b 100644 --- a/code/ryzom/tools/client/CMakeLists.txt +++ b/code/ryzom/tools/client/CMakeLists.txt @@ -1,7 +1,7 @@ IF(WITH_RYZOM_CLIENT) ADD_SUBDIRECTORY(client_patcher) - IF(WITH_QT) + IF(WITH_QT OR WITH_QT5) ADD_SUBDIRECTORY(client_config_qt) ENDIF() ENDIF() diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt index 82c1f6e3d..580dc681d 100644 --- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt +++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt @@ -1,58 +1,74 @@ -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES}) -INCLUDE( ${QT_USE_FILE} ) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR}) -FILE( GLOB SRC *.cpp *.h ) +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_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 +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 ) -SET( CLIENT_CONFIG_TRANS - translations/ryzom_configuration_en.ts - translations/ryzom_configuration_hu.ts +SET(CLIENT_CONFIG_TRANS + ${CMAKE_CURRENT_SOURCE_DIR}/translations/ryzom_configuration_en.ts + ${CMAKE_CURRENT_SOURCE_DIR}/translations/ryzom_configuration_fr.ts + ${CMAKE_CURRENT_SOURCE_DIR}/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 ) -QT4_ADD_TRANSLATION( CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS} ) -QT4_ADD_RESOURCES( CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS} ) -QT4_WRAP_CPP( CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR} ) -QT4_WRAP_UI( CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS} ) -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( "Translation Files" FILES ${CLIENT_CONFIG_TRANS} ) -ADD_DEFINITIONS( ${QT_DEFINITIONS} ) -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" ) +CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) +SET(CLIENT_CONFIG_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ) + +IF(WITH_QT) + INCLUDE_DIRECTORIES(${QT_INCLUDES}) + INCLUDE(${QT_USE_FILE}) + + QT4_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS}) + QT4_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS}) + QT4_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR}) + QT4_WRAP_UI(CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS}) + + ADD_DEFINITIONS(${QT_DEFINITIONS}) +ELSE() + 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}) + QT5_WRAP_UI(CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS}) + + SET(QT_LIBRARIES Qt5::Widgets Qt5::Core Qt5::Gui Qt5::OpenGL) +ENDIF() + +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("Translation Files" FILES ${CLIENT_CONFIG_TRANS} ) + +ADD_EXECUTABLE(ryzom_configuration_qt WIN32 MACOSX_BUNDLE ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_QM}) +NL_DEFAULT_PROPS(ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" ) NL_ADD_RUNTIME_FLAGS( ryzom_configuration_qt ) NL_ADD_LIB_SUFFIX( ryzom_configuration_qt ) TARGET_LINK_LIBRARIES( ryzom_configuration_qt nelmisc nel3d ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY}) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_configuration_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) -ENDIF(WITH_PCH) +ENDIF() INSTALL(TARGETS ryzom_configuration_qt RUNTIME DESTINATION games COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp index df3596980..4d1fc2060 100644 --- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp +++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp @@ -29,6 +29,7 @@ #include "system.h" #include +#include CClientConfigDialog::CClientConfigDialog( QWidget *parent ) : QDialog( parent ) @@ -156,18 +157,16 @@ void CClientConfigDialog::onClickPlay() { bool started = false; -#ifdef WIN32 +#ifdef Q_OS_WIN32 started = QProcess::startDetached( "ryzom_client_r.exe" ); if( !started ) QProcess::startDetached( "ryzom_client_rd.exe" ); if( !started ) QProcess::startDetached( "ryzom_client_d.exe" ); +#elif defined(Q_OS_MAC) + started = QProcess::startDetached( "./Ryzom" ); #else - started = QProcess::startDetached( "./ryzom_client_r" ); - if( !started ) - QProcess::startDetached( "./ryzom_client_rd" ); - if( !started ) - QProcess::startDetached( "./ryzom_client_d" ); + started = QProcess::startDetached( "./ryzom_client" ); #endif onClickOK(); @@ -180,14 +179,14 @@ void CClientConfigDialog::onClickCategory( QTreeWidgetItem *item ) static const char *iconNames[] = { - ":/resources/general_icon.bmp", - ":/resources/display_icon.bmp", - ":/resources/display_properties_icon.bmp", - ":/resources/display_config_icon.bmp", - ":/resources/sound_icon.bmp", - ":/resources/general_icon.bmp", - ":/resources/card_icon.bmp", - ":/resources/card_icon.bmp" + ":/resources/general_icon.png", + ":/resources/display_icon.png", + ":/resources/display_properties_icon.png", + ":/resources/display_config_icon.png", + ":/resources/sound_icon.png", + ":/resources/general_icon.png", + ":/resources/card_icon.png", + ":/resources/card_icon.png" }; sint32 index = item->data( 0, Qt::UserRole ).toInt(); diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui b/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui index d8fde7665..03f4234a6 100644 --- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui +++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui @@ -31,7 +31,7 @@ - :/resources/left_bitmap_0.bmp + :/resources/left_bitmap_0.png @@ -60,7 +60,7 @@ - :/resources/general_icon.bmp + :/resources/general_icon.png @@ -101,7 +101,7 @@ - background-image: url(:/resources/top_right.bmp); + background-image: url(:/resources/top_right.png); General diff --git a/code/ryzom/tools/client/client_config_qt/main.cpp b/code/ryzom/tools/client/client_config_qt/main.cpp index 0f41c508b..2ee5e11bc 100644 --- a/code/ryzom/tools/client/client_config_qt/main.cpp +++ b/code/ryzom/tools/client/client_config_qt/main.cpp @@ -19,14 +19,26 @@ #include "client_config_dialog.h" #include "system.h" +#include + int main( sint32 argc, char **argv ) { QApplication app( argc, argv ); - QPixmap pixmap( ":/resources/splash_screen.bmp" ); + + QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png")); + QPixmap pixmap(":/resources/splash_screen.png" ); QSplashScreen splash( pixmap ); splash.show(); + QString locale = QLocale::system().name().left(2); + + QTranslator localTranslator; + if (localTranslator.load(QString(":/translations/ryzom_configuration_%1.qm").arg(locale))) + { + app.installTranslator(&localTranslator); + } + CSystem::GetInstance().config.load( "client.cfg" ); CClientConfigDialog d; diff --git a/code/ryzom/tools/client/client_config_qt/resources.qrc b/code/ryzom/tools/client/client_config_qt/resources.qrc index d2e13bcdc..1d86eaded 100644 --- a/code/ryzom/tools/client/client_config_qt/resources.qrc +++ b/code/ryzom/tools/client/client_config_qt/resources.qrc @@ -1,16 +1,16 @@ - resources/card_icon.bmp - resources/display_config_icon.bmp - resources/display_icon.bmp - resources/display_properties_icon.bmp - resources/general_icon.bmp - resources/left_bitmap_0.bmp - resources/network_icon.bmp - resources/sound_icon.bmp - resources/splash_screen.bmp - resources/top_right.bmp - resources/update_icon.bmp - resources/welcome_icon.bmp + 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/card_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/card_icon.bmp deleted file mode 100644 index 705d913ab..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/card_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/card_icon.png b/code/ryzom/tools/client/client_config_qt/resources/card_icon.png new file mode 100644 index 000000000..dafcacc1e Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/card_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc b/code/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc new file mode 100644 index 000000000..5be048b3e --- /dev/null +++ b/code/ryzom/tools/client/client_config_qt/resources/client_config_qt.rc @@ -0,0 +1,39 @@ +#include +#include "config.h" + +IDI_MAIN_ICON ICON DISCARDABLE "client_config.ico" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION NL_VERSION_RC +PRODUCTVERSION NL_VERSION_RC +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS__WINDOWS32 +FILETYPE VFT_APP +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Client Config Qt" + VALUE "FileVersion", NL_VERSION + VALUE "LegalCopyright", COPYRIGHT +#ifdef _DEBUG + VALUE "OriginalFilename", "client_config_qt_d.exe" +#else + VALUE "OriginalFilename", "client_config_qt_r.exe" +#endif + VALUE "ProductName", "Ryzom Core" + VALUE "ProductVersion", NL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.bmp deleted file mode 100644 index 4b76430f1..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.png b/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.png new file mode 100644 index 000000000..12bf801ce Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/display_config_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/display_icon.bmp deleted file mode 100644 index 46e101004..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/display_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_icon.png b/code/ryzom/tools/client/client_config_qt/resources/display_icon.png new file mode 100644 index 000000000..66150272c Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/display_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.bmp deleted file mode 100644 index db8dcb10d..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.png b/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.png new file mode 100644 index 000000000..034fab147 Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/display_properties_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/general_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/general_icon.bmp deleted file mode 100644 index 37bd9e722..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/general_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/general_icon.png b/code/ryzom/tools/client/client_config_qt/resources/general_icon.png new file mode 100644 index 000000000..96b6fc3af Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/general_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.bmp b/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.bmp deleted file mode 100644 index 5c1f762d4..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png b/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png new file mode 100644 index 000000000..2443d16bd Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/left_bitmap_0.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/network_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/network_icon.bmp deleted file mode 100644 index 664b5f207..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/network_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/network_icon.png b/code/ryzom/tools/client/client_config_qt/resources/network_icon.png new file mode 100644 index 000000000..d3433550b Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/network_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/sound_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/sound_icon.bmp deleted file mode 100644 index 54d7c5a91..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/sound_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/sound_icon.png b/code/ryzom/tools/client/client_config_qt/resources/sound_icon.png new file mode 100644 index 000000000..1e3df1b8d Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/sound_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/splash_screen.bmp b/code/ryzom/tools/client/client_config_qt/resources/splash_screen.bmp deleted file mode 100644 index 1360556ed..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/splash_screen.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/splash_screen.png b/code/ryzom/tools/client/client_config_qt/resources/splash_screen.png new file mode 100644 index 000000000..8a47bd986 Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/splash_screen.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/top_right.bmp b/code/ryzom/tools/client/client_config_qt/resources/top_right.bmp deleted file mode 100644 index 70ccdb556..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/top_right.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/top_right.png b/code/ryzom/tools/client/client_config_qt/resources/top_right.png new file mode 100644 index 000000000..60fbce418 Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/top_right.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/update_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/update_icon.bmp deleted file mode 100644 index 138bec0d9..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/update_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/update_icon.png b/code/ryzom/tools/client/client_config_qt/resources/update_icon.png new file mode 100644 index 000000000..1e4631d2c Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/update_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.bmp b/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.bmp deleted file mode 100644 index c1b281023..000000000 Binary files a/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.png b/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.png new file mode 100644 index 000000000..95df78ed0 Binary files /dev/null and b/code/ryzom/tools/client/client_config_qt/resources/welcome_icon.png differ diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.h b/code/ryzom/tools/client/client_config_qt/stdpch.h index 6f6655761..744899ecd 100644 --- a/code/ryzom/tools/client/client_config_qt/stdpch.h +++ b/code/ryzom/tools/client/client_config_qt/stdpch.h @@ -17,6 +17,12 @@ #ifndef STDPCH_H #define STDPCH_H +#include + +#ifdef Q_COMPILER_RVALUE_REFS +#undef Q_COMPILER_RVALUE_REFS +#endif + #include #include diff --git a/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts new file mode 100644 index 000000000..9e3b9929d --- /dev/null +++ b/code/ryzom/tools/client/client_config_qt/translations/ryzom_configuration_fr.ts @@ -0,0 +1,468 @@ + + + + + CClientConfigDialog + + + Ryzom configuration + Configuration de Ryzom + + + + Are you sure you want to quit without saving the configuration? + Êtes-vous sûr de vouloir quitter sans enregistrer la configuration ? + + + + CDisplaySettingsDetailsWidget + + + Low + Bas + + + + Medium + Moyen + + + + Normal + Normal + + + + High + Haut + + + + Low (32 MB) + Bas (32 Mo) + + + + Normal (64 MB) + Normal (64 Mo) + + + + High (128 MB) + Haut (128 Mo) + + + + CSoundSettingsWidget + + + %1 tracks + %1 pistes + + + + client_config_dialog + + + Ryzom Configuration + Configuration de Ryzom + + + + + General + Général + + + + Category + Catégorie + + + + Display + Affichage + + + + Display details + Détails d'affichage + + + + Display advanced + Affichage avancé + + + + Sound + Son + + + + System information + Informations systèmes + + + + OpenGL information + Informations OpenGL + + + + Direct3D information + Informations Direct3D + + + + Apply + Appliquer + + + + Default + Défaut + + + + Play Ryzom + Jouer à Ryzom + + + + display_settings_advanced_widget + + + Display advanced + Affichage avancé + + + + Modify these settings only if you have trouble launching the game + Modifiez ces paramètres uniquement si vous avez des problèmes pour lancer le jeu + + + + Disable texture compression + Désactiver la compression des textures + + + + Disable vertex shaders + Désactiver les vertex shaders + + + + Disable AGP for vertices + Désactiver l'AGP pour les vertices + + + + Disable pixel shaders + Désactiver les pixel shaders + + + + display_settings_details_widget + + + Display details + Détails d'affichage + + + + Landscape + Paysage + + + + + + + Level of detail + Niveau de détail + + + + + + + Low + Bas + + + + Characters + Personnages + + + + FX + Effets spéciaux + + + + Textures + Textures + + + + display_settings_widget + + + Display + Affichage + + + + Driver + Pilote + + + + Specify if Ryzom is to be run in OpenGL or Direct3D. + Spécifier si Ryzom doit utiliser OpenGL ou Direct3D. + + + + Auto + Auto + + + + OpenGL + OpenGL + + + + Direct3D + Direct3D + + + + Parameters + Paramètres + + + + Specify if Ryzom is to be run in full screen or window mode: + Spécifier si Ryzom doit être lancé en mode plein écran ou fenêtré : + + + + Full screen + Plein écran + + + + Specify a video mode + Spécifier une résolution + + + + Windowed + Fenêtré + + + + Width + Largeur + + + + Height + Hauteur + + + + X position + Position X + + + + Y position + Position Y + + + + general_settings_widget + + + Form + Formulaire + + + + Language + Langue + + + + English + Anglais + + + + French + Français + + + + German + Allemand + + + + Hungarian + Hongrois + + + + Save config file when quitting the game + Enregistrer le fichier de configuration quand on quitte le jeu + + + + Advanced + Avancé + + + + Slow down the game ( process low priority ) + Ralentir le jeu (priorité basse au processus) + + + + sound_settings_widget + + + Sound + Son + + + + Enable sound + Activer le son + + + + Enable EAX + Activer EAX + + + + Enable FMod + Activer FMod + + + + Software sound buffer ( may increase FPS ) + Tampons sonores logiciels (peut accroître la fluidité) + + + + Sound tracks + Pistes audio + + + + 8 tracks + 8 pistes + + + + sys_info_d3d_widget + + + Direct3D information + Informations Direct3D + + + + Direct3D + Direct3D + + + + Description + Description + + + + Driver + Pilote + + + + Driver version + Version du pilote + + + + sys_info_opengl_widget + + + OpenGL information + Informations OpenGL + + + + OpenGL + OpenGL + + + + Vendor + Vendeur + + + + Renderer + Moteur de rendu + + + + Version + Version + + + + Extensions + Extensions + + + + sys_info_widget + + + + System information + Informations systèmes + + + + Operating system + Système d'exploitation + + + + CPU + Processeur + + + + Physical memory + Mémoire physique + + + + Video device + Carte graphique + + + + Video driver version + Version du driver de la carte graphique + + + 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 07411f16d..49f9aa0a6 100644 --- a/code/ryzom/tools/client/client_config_qt/translations/translations.qrc +++ b/code/ryzom/tools/client/client_config_qt/translations/translations.qrc @@ -1,6 +1,7 @@ ryzom_configuration_en.qm + ryzom_configuration_fr.qm ryzom_configuration_hu.qm