diff --git a/ChangeLog b/ChangeLog index bfb1301f5..2d10a2e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-09-22 Tobias Doerffel + * src/core/main.cpp: + * data/locale/CMakeLists.txt: + install and load Qt translation files on win32 + * src/core/song.cpp: fixed file-dialog for choosing export filename diff --git a/data/locale/CMakeLists.txt b/data/locale/CMakeLists.txt index 5d4bba807..e227db795 100644 --- a/data/locale/CMakeLists.txt +++ b/data/locale/CMakeLists.txt @@ -1,3 +1,6 @@ FILE(GLOB QM_FILES *.qm) -INSTALL(FILES ${QM_FILES} DESTINATION ${LMMS_DATA_DIR}/locale) +IF(LMMS_BUILD_WIN32) + FILE(GLOB QT_QM_FILES ${QT_TRANSLATIONS_DIR}/qt*[^h].qm) +ENDIF(LMMS_BUILD_WIN32) +INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION ${LMMS_DATA_DIR}/locale) diff --git a/src/core/main.cpp b/src/core/main.cpp index dde519f0a..7523266d0 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -313,6 +313,12 @@ int main( int argc, char * * argv ) QString pos = QLocale::system().name().left( 2 ); + +#ifdef LMMS_BUILD_WIN32 +#undef QT_TRANSLATIONS_DIR +#define QT_TRANSLATIONS_DIR configManager::inst()->localeDir() +#endif + #ifdef QT_TRANSLATIONS_DIR // load translation for Qt-widgets/-dialogs loadTranslation( QString( "qt_" ) + pos,