diff options
Diffstat (limited to 'src')
41 files changed, 374 insertions, 277 deletions
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index cf1353f63..cccd176ea 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,4 +1,4 @@ -project(ui) +project(app) cmake_minimum_required(VERSION 2.4.7) @@ -28,31 +28,33 @@ link_directories(${CMAKE_INSTALL_PREFIX}/${LIB_DIR}) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmpui) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp) -SET(ui_SRCS +SET(app_SRCS builtincommandlineoption.cpp main.cpp qmmpstarter.cpp lxdesupport.cpp ) -SET(ui_MOC_HDRS +SET(app_HDRS lxdesupport.h) + +SET(app_MOC_HDRS builtincommandlineoption.h qmmpstarter.h - lxdesupport.h + ) -SET(ui_RCCS images/images.qrc translations/qmmp_locales.qrc) +SET(app_RCCS images/images.qrc translations/qmmp_locales.qrc) -QT4_ADD_RESOURCES(ui_RCC_SRCS ${ui_RCCS}) +QT4_ADD_RESOURCES(app_RCC_SRCS ${app_RCCS}) -QT4_AUTOMOC(${ui_MOC_SRC}) -QT4_WRAP_CPP(ui_MOC_SRCS ${ui_MOC_HDRS}) +QT4_AUTOMOC(${app_MOC_SRC}) +QT4_WRAP_CPP(app_MOC_SRCS ${app_MOC_HDRS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_RCC_SRCS}) +ADD_EXECUTABLE(qmmp ${app_SRCS} ${app_MOC_SRCS} ${app_RCC_SRCS} ${app_HDRS}) target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui) add_dependencies(qmmp qmmpui libqmmp) install(TARGETS qmmp DESTINATION bin) diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt index 3c9daf6c0..18cf7bc3d 100644 --- a/src/plugins/Effect/bs2b/CMakeLists.txt +++ b/src/plugins/Effect/bs2b/CMakeLists.txt @@ -31,8 +31,11 @@ SET(libbs2b_SRCS effectbs2bfactory.cpp ) -SET(libbs2b_MOC_HDRS +SET(libbs2b_HDRS bs2bplugin.h +) + +SET(libbs2b_MOC_HDRS settingsdialog.h effectbs2bfactory.h ) @@ -61,7 +64,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(BS2B_FOUND) ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_MOC_SRCS} ${libbs2b_UIS_H} - ${libbs2b_RCC_SRCS}) + ${libbs2b_RCC_SRCS} ${libbs2b_HDRS}) add_dependencies(bs2b qmmp) target_link_libraries(bs2b ${QT_LIBRARIES} -lqmmp ${BS2B_LDFLAGS} ${BS2B_CFLAGS}) install(TARGETS bs2b DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/crossfade/CMakeLists.txt b/src/plugins/Effect/crossfade/CMakeLists.txt index ab63220df..7775e3f11 100644 --- a/src/plugins/Effect/crossfade/CMakeLists.txt +++ b/src/plugins/Effect/crossfade/CMakeLists.txt @@ -31,8 +31,11 @@ SET(libcrossfade_SRCS effectcrossfadefactory.cpp ) -SET(libcrossfade_MOC_HDRS +SET(libcrossfade_HDRS crossfadeplugin.h +) + +SET(libcrossfade_MOC_HDRS settingsdialog.h effectcrossfadefactory.h ) @@ -55,7 +58,8 @@ QT4_WRAP_UI(libcrossfade_UIS_H ${libcrossfade_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_MOC_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS}) +ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_MOC_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS} +${libcrossfade_HDRS}) add_dependencies(crossfade qmmp) target_link_libraries(crossfade ${QT_LIBRARIES} -lqmmp) install(TARGETS crossfade DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/ladspa/CMakeLists.txt b/src/plugins/Effect/ladspa/CMakeLists.txt index e46729558..f06a97ead 100644 --- a/src/plugins/Effect/ladspa/CMakeLists.txt +++ b/src/plugins/Effect/ladspa/CMakeLists.txt @@ -34,9 +34,12 @@ SET(libladspa_SRCS effectladspafactory.cpp ) +SET(libladspa_HDRS + ladspahelper.h +) + SET(libladspa_MOC_HDRS ladspahost.h - ladspahelper.h ladspaslider.h ladspabutton.h settingsdialog.h @@ -61,7 +64,7 @@ QT4_WRAP_UI(libladspa_UIS_H ${libladspa_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_MOC_SRCS} ${libladspa_UIS_H} - ${libladspa_RCC_SRCS}) + ${libladspa_RCC_SRCS} ${libladspa_HDRS}) add_dependencies(ladspa qmmp) target_link_libraries(ladspa ${QT_LIBRARIES} -lqmmp -ldl) install(TARGETS ladspa DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/srconverter/CMakeLists.txt b/src/plugins/Effect/srconverter/CMakeLists.txt index d135d8791..651c87dbc 100644 --- a/src/plugins/Effect/srconverter/CMakeLists.txt +++ b/src/plugins/Effect/srconverter/CMakeLists.txt @@ -36,8 +36,12 @@ SET(libsrconverter_SRCS effectsrconverterfactory.cpp ) -SET(libsrconverter_MOC_HDRS +SET(libsrconverter_HDRS srconverter.h +) + +SET(libsrconverter_MOC_HDRS + settingsdialog.h effectsrconverterfactory.h ) @@ -62,7 +66,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SAMPLERATE_FOUND) ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_MOC_SRCS} ${libsrconverter_UIS_H} - ${libsrconverter_RCC_SRCS}) + ${libsrconverter_RCC_SRCS} ${libsrconverter_HDRS}) add_dependencies(srconverter qmmp) target_link_libraries(srconverter ${QT_LIBRARIES} -lqmmp ${SAMPLERATE_LDFLAGS} ${SAMPLERATE_CFLAGS}) install(TARGETS srconverter DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt index 76c223b66..7717d5302 100644 --- a/src/plugins/Effect/stereo/CMakeLists.txt +++ b/src/plugins/Effect/stereo/CMakeLists.txt @@ -31,8 +31,11 @@ SET(libstereo_SRCS effectstereofactory.cpp ) -SET(libstereo_MOC_HDRS +SET(libstereo_HDRS stereoplugin.h +) + +SET(libstereo_MOC_HDRS settingsdialog.h effectstereofactory.h ) @@ -55,7 +58,7 @@ QT4_WRAP_UI(libstereo_UIS_H ${libstereo_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_MOC_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS}) +ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_MOC_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS}) add_dependencies(stereo qmmp) target_link_libraries(stereo ${QT_LIBRARIES} -lqmmp) install(TARGETS stereo DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt index 2284ef36a..226d38b48 100644 --- a/src/plugins/Input/aac/CMakeLists.txt +++ b/src/plugins/Input/aac/CMakeLists.txt @@ -68,11 +68,14 @@ SET(libaac_SRCS aacfile.cpp ) +SET(libaac_HDRS + decoder_aac.h + aacfile.h +) + SET(libaac_MOC_HDRS decoderaacfactory.h - decoder_aac.h aacmetadatamodel.h - aacfile.h ) SET(libaac_RCCS translations/translations.qrc) @@ -86,7 +89,7 @@ QT4_WRAP_CPP(libaac_MOC_SRCS ${libaac_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FAAD_FOUND) -ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_RCC_SRCS}) +ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS}) add_dependencies(aac qmmp) target_link_libraries(aac ${QT_LIBRARIES} -lqmmp -lfaad ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt index b05617e1c..a21cbe706 100644 --- a/src/plugins/Input/cdaudio/CMakeLists.txt +++ b/src/plugins/Input/cdaudio/CMakeLists.txt @@ -33,10 +33,13 @@ SET(libcdaudio_SRCS settingsdialog.cpp ) +SET(libcdaudio_HDRS + decoder_cdaudio.h +) + SET(libcdaudio_MOC_HDRS settingsdialog.h decodercdaudiofactory.h - decoder_cdaudio.h ) SET(libcdaudio_RCCS translations/translations.qrc) @@ -57,7 +60,8 @@ QT4_WRAP_UI(libcdaudio_UIS_H ${libcdaudio_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(CDIO_FOUND) -ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_MOC_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS}) +ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_MOC_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS} +${libcdaudio_HDRS}) add_dependencies(cdaudio qmmp) target_link_libraries(cdaudio ${QT_LIBRARIES} -lqmmp ${CDIO_LDFLAGS} ${CDIO_CFLAGS}) install(TARGETS cdaudio DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt index f1ae8a4cc..279a99eee 100644 --- a/src/plugins/Input/cue/CMakeLists.txt +++ b/src/plugins/Input/cue/CMakeLists.txt @@ -40,11 +40,14 @@ SET(libcue_SRCS cuemetadatamodel.cpp ) +SET(libcue_HDRS + decoder_cue.h + cueparser.h +) + SET(libcue_MOC_HDRS decodercuefactory.h - decoder_cue.h settingsdialog.h - cueparser.h cuemetadatamodel.h ) @@ -66,7 +69,7 @@ QT4_WRAP_UI(libcue_UIS_H ${libcue_UIS}) # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_MOC_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H}) +ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_MOC_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS}) add_dependencies(cue qmmp) IF(USE_ENCA AND ENCA_FOUND) target_link_libraries(cue ${QT_LIBRARIES} -lqmmp ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 86a41c4a4..dfad4a427 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -43,9 +43,12 @@ SET(libffmpeg_SRCS settingsdialog.cpp ) +SET(libffmpeg_HDRS + decoder_ffmpeg.h +) + SET(libffmpeg_MOC_HDRS decoderffmpegfactory.h - decoder_ffmpeg.h ffmpegmetadatamodel.h settingsdialog.h ) @@ -70,7 +73,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H} - ${libffmpeg_RCC_SRCS}) + ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg qmmp) target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS} ${FFMPEG_CFLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts index 6b304abb3..2c65dd8bd 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="uk"> -<defaultcodec></defaultcodec> +<!DOCTYPE TS> +<TS version="2.0" language="uk"> <context> <name>DecoderFFmpegFactory</name> <message> diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt index bb5d09175..9b1aa7a56 100644 --- a/src/plugins/Input/flac/CMakeLists.txt +++ b/src/plugins/Input/flac/CMakeLists.txt @@ -44,14 +44,17 @@ SET(libflac_SRCS replaygainreader.cpp ) -SET(libflac_MOC_HDRS - decoderflacfactory.h +SET(libflac_HDRS decoder_flac.h - flacmetadatamodel.h cueparser.h replaygainreader.h ) +SET(libflac_MOC_HDRS + decoderflacfactory.h + flacmetadatamodel.h +) + SET(libflac_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS}) @@ -63,7 +66,7 @@ QT4_WRAP_CPP(libflac_MOC_SRCS ${libflac_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FLAC_FOUND) -ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_RCC_SRCS}) +ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS}) add_dependencies(flac qmmp) target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LDFLAGS} ${FLAC_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt index c960f489c..d1e698e0d 100644 --- a/src/plugins/Input/gme/CMakeLists.txt +++ b/src/plugins/Input/gme/CMakeLists.txt @@ -43,12 +43,15 @@ SET(libgme_SRCS gmehelper.cpp ) -SET(libgme_MOC_HDRS - decodergmefactory.h +SET(libgme_HDRS decoder_gme.h gmehelper.h ) +SET(libgme_MOC_HDRS + decodergmefactory.h +) + SET(libgme_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libgme_RCC_SRCS ${libgme_RCCS}) @@ -60,7 +63,7 @@ QT4_WRAP_CPP(libgme_MOC_SRCS ${libgme_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(GME_FOUND) -ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_MOC_SRCS} ${libgme_RCC_SRCS}) +ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_MOC_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS}) add_dependencies(gme qmmp) target_link_libraries(gme ${QT_LIBRARIES} -lqmmp -lgme ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS gme DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt index e4e0d8130..b5d04d932 100644 --- a/src/plugins/Input/mad/CMakeLists.txt +++ b/src/plugins/Input/mad/CMakeLists.txt @@ -41,13 +41,16 @@ SET(libmad_SRCS replaygainreader.cpp ) +SET(libmad_HDRS + decoder_mad.h + tagextractor.h + replaygainreader.h +) + SET(libmad_MOC_HDRS settingsdialog.h decodermadfactory.h - decoder_mad.h - tagextractor.h mpegmetadatamodel.h - replaygainreader.h ) SET(libmad_RCCS translations/translations.qrc) @@ -69,7 +72,7 @@ QT4_WRAP_UI(libmad_UIS_H ${libmad_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MAD_FOUND) -ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS}) +ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS}) add_dependencies(mad qmmp) target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LDFLAGS} ${MAD_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt index fad0d66ac..d745e4c03 100644 --- a/src/plugins/Input/modplug/CMakeLists.txt +++ b/src/plugins/Input/modplug/CMakeLists.txt @@ -53,9 +53,13 @@ SET(libmodplug_SRCS archivereader.cpp ) +SET(libmodplug_HDRS + decoder_modplug.h +) + SET(libmodplug_MOC_HDRS decodermodplugfactory.h - decoder_modplug.h + modplugmetadatamodel.h settingsdialog.h archivereader.h @@ -80,7 +84,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MODPLUG_FOUND) ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_MOC_SRCS} ${libmodplug_UIS_H} - ${libmodplug_RCC_SRCS}) + ${libmodplug_RCC_SRCS} ${libmodplug_HDRS}) add_dependencies(modplug qmmp) target_link_libraries(modplug ${QT_LIBRARIES} -lqmmp ${MODPLUG_LDFLAGS} ${MODPLUG_CFLAGS}) install(TARGETS modplug DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt index 825daf9b9..72f1eb2ff 100644 --- a/src/plugins/Input/mpc/CMakeLists.txt +++ b/src/plugins/Input/mpc/CMakeLists.txt @@ -48,9 +48,13 @@ SET(libmpc_SRCS mpcmetadatamodel.cpp ) +SET(libmpc_HDRS + decoder_mpc.h +) + SET(libmpc_MOC_HDRS decodermpcfactory.h - decoder_mpc.h + mpcmetadatamodel.h ) @@ -63,7 +67,7 @@ QT4_WRAP_CPP(libmpc_MOC_SRCS ${libmpc_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MPC_FOUND) -ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_RCC_SRCS}) +ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS}) add_dependencies(mpc qmmp) target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp -lmpcdec ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt index 0634b03b0..1beb8b476 100644 --- a/src/plugins/Input/sndfile/CMakeLists.txt +++ b/src/plugins/Input/sndfile/CMakeLists.txt @@ -36,9 +36,12 @@ SET(libsndfile_SRCS decodersndfilefactory.cpp ) +SET(libsndfile_HDRS + decoder_sndfile.h +) + SET(libsndfile_MOC_HDRS decodersndfilefactory.h - decoder_sndfile.h ) SET(libsndfile_RCCS translations/translations.qrc) @@ -54,7 +57,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SNDFILE_FOUND) ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_MOC_SRCS} ${libsndfile_UIS_H} - ${libsndfile_RCC_SRCS}) + ${libsndfile_RCC_SRCS} ${libsndfile_HDRS}) add_dependencies(sndfile qmmp) target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS} ${SNDFILE_CFLAGS}) install(TARGETS sndfile DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index 3b8356c04..c9d3cd5c6 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/CMakeLists.txt @@ -38,11 +38,14 @@ SET(libvorbis_SRCS replaygainreader.cpp ) +SET(libvorbis_HDRS + decoder_vorbis.h + replaygainreader.h +) + SET(libvorbis_MOC_HDRS decodervorbisfactory.h - decoder_vorbis.h vorbismetadatamodel.h - replaygainreader.h ) SET(libvorbis_RCCS translations/translations.qrc) @@ -59,7 +62,7 @@ QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBIS_FOUND) -ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_RCC_SRCS}) +ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS}) add_dependencies(vorbis qmmp) target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${VORBIS_CFLAGS} ${TAGLIB_LDFLAGS} ${TAGLIB_CFLAGS}) install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index cce3ec3e5..114ba4290 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/CMakeLists.txt @@ -39,14 +39,17 @@ SET(libwavpack_SRCS replaygainreader.cpp ) -SET(libwavpack_MOC_HDRS - decoderwavpackfactory.h +SET(libwavpack_HDRS decoder_wavpack.h - wavpackmetadatamodel.h cueparser.h replaygainreader.h ) +SET(libwavpack_MOC_HDRS + decoderwavpackfactory.h + wavpackmetadatamodel.h +) + SET(libwavpack_RCCS translations/translations.qrc) QT4_ADD_RESOURCES(libwavpack_RCC_SRCS ${libwavpack_RCCS}) @@ -56,7 +59,7 @@ QT4_WRAP_CPP(libwavpack_MOC_SRCS ${libwavpack_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WAVPACK_FOUND) -ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_RCC_SRCS}) +ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS}) add_dependencies(wavpack qmmp) target_link_libraries(wavpack ${QT_LIBRARIES} -lqmmp ${WAVPACK_LDFLAGS} ${WAVPACK_CLAGS}) install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt index e417cde9a..66ff4b495 100644 --- a/src/plugins/Input/wildmidi/CMakeLists.txt +++ b/src/plugins/Input/wildmidi/CMakeLists.txt @@ -36,8 +36,12 @@ SET(libwildmidi_SRCS wildmidihelper.cpp ) -SET(libwildmidi_MOC_HDRS +SET(libwildmidi_HDRS decoder_wildmidi.h +) + +SET(libwildmidi_MOC_HDRS + decoderwildmidifactory.h settingsdialog.h wildmidihelper.h @@ -70,7 +74,8 @@ QT4_WRAP_UI(libwildmidi_UIS_H ${libwildmidi_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WILDMIDI_FOUND) -ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_MOC_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS}) +ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_MOC_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS} +${libwildmidi_HDRS}) add_dependencies(wildmidi qmmp) target_link_libraries(wildmidi ${QT_LIBRARIES} -lqmmp -lWildMidi) install(TARGETS wildmidi DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 943632036..4ba6f6535 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -37,10 +37,13 @@ SET(libjack_SRCS bio2jack.c ) +SET(libjack_HDRS + bio2jack.h +) + SET(libjack_MOC_HDRS outputjackfactory.h outputjack.h - bio2jack.h ) SET(libjack_RCCS translations/translations.qrc) @@ -51,7 +54,7 @@ QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS}) IF(JACK_FOUND) -ADD_LIBRARY(jack MODULE ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS}) +ADD_LIBRARY(jack MODULE ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS} ${libjack_HDRS}) add_dependencies(jack qmmp) set_target_properties(jack PROPERTIES COMPILE_FLAGS -pthread diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index 5b940fa1b..2e6bcac35 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -1,4 +1,4 @@ -project(ui) +project(skinned) cmake_minimum_required(VERSION 2.4.7) @@ -37,7 +37,7 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) -SET(ui_SRCS +SET(skinned_SRCS fft.c addurldialog.cpp balancebar.cpp @@ -89,7 +89,17 @@ SET(ui_SRCS hotkeyeditor.cpp ) -SET(ui_MOC_HDRS +SET(skinned_HDRS + eqpreset.h + fft.h + inlines.h + keyboardmanager.h + cursorimage.h + windowsystem.h + shortcutitem.h +) + +SET(skinned_MOC_HDRS addurldialog.h balancebar.h button.h @@ -97,13 +107,9 @@ SET(ui_MOC_HDRS display.h dock.h eqgraph.h - eqpreset.h eqslider.h eqtitlebar.h eqwidget.h - fft.h - inlines.h - keyboardmanager.h listwidget.h mainvisual.h mainwindow.h @@ -129,30 +135,26 @@ SET(ui_MOC_HDRS togglebutton.h visualmenu.h volumebar.h - cursorimage.h playlistbrowser.h playlistselector.h popupwidget.h popupsettings.h - windowsystem.h - shortcutitem.h actionmanager.h shortcutdialog.h skinnedfactory.h hotkeyeditor.h ) -SET(ui_RCCS images/skinned_images.qrc stuff.qrc translations/translations.qrc) +SET(skinned_RCCS images/skinned_images.qrc stuff.qrc translations/translations.qrc) -QT4_ADD_RESOURCES(ui_RCC_SRCS ${ui_RCCS}) +QT4_ADD_RESOURCES(skinned_RCC_SRCS ${skinned_RCCS}) -QT4_AUTOMOC(${ui_MOC_SRC}) -QT4_WRAP_CPP(ui_MOC_SRCS ${ui_MOC_HDRS}) +QT4_AUTOMOC(${skinned_MOC_SRC}) +QT4_WRAP_CPP(skinned_MOC_SRCS ${skinned_MOC_HDRS}) # user interface - -SET(ui_UIS +SET(skinned_UIS forms/addurldialog.ui forms/skinnedsettings.ui forms/preseteditor.ui @@ -162,13 +164,13 @@ SET(ui_UIS forms/hotkeyeditor.ui ) -QT4_WRAP_UI(ui_UIS_H ${ui_UIS}) +QT4_WRAP_UI(skinned_UIS_H ${skinned_UIS}) # Don't forget to include output directory, otherwise # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) -ADD_LIBRARY(skinned MODULE ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H} ${ui_RCC_SRCS}) +ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_MOC_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS}) target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS}) add_dependencies(skinned qmmpui libqmmp) target_link_libraries(skinned ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS}) diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts index bd7f3aed8..1963f7bf0 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_cs.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Načíst</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>Uložit j&ako...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Přejmenovat</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>O&dstranit</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Přejmenovat seznam skladeb</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Název seznamu skladeb:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Vybrat soubory s tématy</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Soubory s tématy</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Rozbalené téma</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Sbalené téma</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts index d7321f4ce..9b12255c6 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_de.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Laden</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Speichern unter …</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>L&öschen</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Wiedergabeliste umbenennen</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Name der Wiedergabeliste:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished">Stücknummern ausrichten</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Design-Dateien auswählen</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Design-Dateien</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Nicht archiviertes Design</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Archiviertes Design</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts index b67488012..5037ddef1 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_es.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Cargar</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Guardar como...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Renombrar</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Borrar</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Renombrar lista</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Nombre de la lista:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished">Alinear los números de canción</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Seleccionar archivos de pieles</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Archivos de pieles</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Piel no archivada</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Piel archivada</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts index 9c5ee9676..953629ae6 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_hu.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Betölt</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Mentés másként...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Átnevez</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Törlés</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Lista átnevezése</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Lista neve:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Skin fájl kiválasztása</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Skin fájlok</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Tömörítettlen skin</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Tömörített skin</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts index 9ca8adb01..625e77b3a 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_it.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Carica</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Salva come</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Elimina</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Rinomina lista brani</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Nome della lista brani:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Seleziona aspetto</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Aspetto</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Tema non archiviato</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Tema archiviato</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts index 14a746c5f..ec4298617 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ja.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>読込(&L)</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>名前を付けて保存(&A)...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>名前を変更</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>削除(&D)</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>プレイリスト名を変更</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>プレイリスト名:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished">曲番号のみを表示</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">スキンファイルを選択</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">スキンファイル</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">非書庫化スキン</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">書庫化スキン</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts index 23bc7218c..df0b4b52f 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_lt.ts @@ -872,32 +872,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Įkelti</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Įrašyti kaip...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Pervadinti</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Ištrinti</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Pervadinti grojaraštį</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Grojaraščio pavadinimas</translation> </message> @@ -1250,22 +1250,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished">Lygiuoti dainų numerius</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Pasirinkti temų bylas</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Temų bylos</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Išskleista tema</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Suspausta tema</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts index b3d8b364c..0fe2595ee 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_nl.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Laad</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Bewaar Als...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Hernoem</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Verwijder</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Hernoem Afspeellijst</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Afspeellijst:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Selecteer themabestanden</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Thema bestanden</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Niet gearchiveerd thema</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Gearchiveerd thema</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts index 95370d6b1..48c03ce12 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pl_PL.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>Załaduj</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>Zapi&sz jako...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>Usuń</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Zmień nazwę listy</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Nazwa listy odtwarzania:</translation> </message> @@ -1252,22 +1252,22 @@ Andrey Adreev <andreev00@gmail.com></translation> <translation>Wyrównaj w pionie numery utworów</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation>Wybierz skórę</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation>Pliki skór</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation>Niekompresowana skórka</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation>Skompresowana skórka</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts index 0876fb4bb..d02a3c1bb 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_pt_BR.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished"></translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts index 114453e80..72cc7df95 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_ru.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Загрузить</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Сохранить как...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Переименовать</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Переименовать список</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Имя списка:</translation> </message> @@ -1252,22 +1252,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Выравнивать номера фрагментов</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation>Выберите файлы обложек</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation>Файлы обложек</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation>Распакованная тема</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation>Упакованная тема</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts index 05c8d1f24..098113bc7 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_sk.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Načítať</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Uložiť ako...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Premenovať</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Vymazať</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Premenovať playlist</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Název playlistu:</translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished">Zarovnať čísla piesní</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Vybrať súbory skinov</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Súbory skinov</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Nearchivovaný skin</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Archivovaný skin</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts index 3d0b58c15..596394263 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_tr.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">Kabuk Dosyası Seç</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">Kabuk dosyaları</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">Arşivlenmemiş kabuk</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">Arşivlenmiş kabuk</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts index b5f745582..b4e04bc8c 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_uk_UA.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="uk"> -<defaultcodec></defaultcodec> +<!DOCTYPE TS> +<TS version="2.0" language="uk"> <context> <name>ActionManager</name> <message> @@ -400,6 +400,7 @@ <context> <name>EqWidget</name> <message> + <location filename="../eqwidget.cpp" line="154"/> <location filename="../eqwidget.cpp" line="177"/> <source>preset</source> <translation>предвстановлення</translation> @@ -669,26 +670,31 @@ <translation>Падіння аналізатора</translation> </message> <message> + <location filename="../mainvisual.cpp" line="333"/> <location filename="../mainvisual.cpp" line="347"/> <source>Slowest</source> <translation>Найповільніше</translation> </message> <message> + <location filename="../mainvisual.cpp" line="334"/> <location filename="../mainvisual.cpp" line="348"/> <source>Slow</source> <translation>Повільне</translation> </message> <message> + <location filename="../mainvisual.cpp" line="335"/> <location filename="../mainvisual.cpp" line="349"/> <source>Medium</source> <translation>Середнє</translation> </message> <message> + <location filename="../mainvisual.cpp" line="336"/> <location filename="../mainvisual.cpp" line="350"/> <source>Fast</source> <translation>Швидке</translation> </message> <message> + <location filename="../mainvisual.cpp" line="337"/> <location filename="../mainvisual.cpp" line="351"/> <source>Fastest</source> <translation>Найшвидше</translation> @@ -760,31 +766,37 @@ <translation>Сортувати</translation> </message> <message> + <location filename="../playlist.cpp" line="207"/> <location filename="../playlist.cpp" line="242"/> <source>By Title</source> <translation>За назвою</translation> </message> <message> + <location filename="../playlist.cpp" line="211"/> <location filename="../playlist.cpp" line="246"/> <source>By Album</source> <translation>За альбомом</translation> </message> <message> + <location filename="../playlist.cpp" line="215"/> <location filename="../playlist.cpp" line="250"/> <source>By Artist</source> <translation>За артистом</translation> </message> <message> + <location filename="../playlist.cpp" line="219"/> <location filename="../playlist.cpp" line="254"/> <source>By Filename</source> <translation>За ім'ям файлу</translation> </message> <message> + <location filename="../playlist.cpp" line="223"/> <location filename="../playlist.cpp" line="258"/> <source>By Path + Filename</source> <translation>За шляхом та файлом</translation> </message> <message> + <location filename="../playlist.cpp" line="227"/> <location filename="../playlist.cpp" line="262"/> <source>By Date</source> <translation>За датою</translation> @@ -810,6 +822,7 @@ <translation>&Новий список</translation> </message> <message> + <location filename="../playlist.cpp" line="231"/> <location filename="../playlist.cpp" line="266"/> <source>By Track Number</source> <translation></translation> @@ -838,11 +851,13 @@ <translation>Новий</translation> </message> <message> + <location filename="../forms/playlistbrowser.ui" line="52"/> <location filename="../playlistbrowser.cpp" line="39"/> <source>Delete</source> <translation>Видалити</translation> </message> <message> + <location filename="../forms/playlistbrowser.ui" line="69"/> <location filename="../forms/playlistbrowser.ui" line="79"/> <source>...</source> <translation>...</translation> @@ -856,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation>&Завантажити</translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation>&Зберегти як...</translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation>Переіменувати</translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation>&Видалити</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation>Переіменувати список</translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation>Ім'я списка:</translation> </message> @@ -1107,6 +1122,7 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Поновити</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="89"/> <location filename="../forms/skinnedsettings.ui" line="95"/> <source>View</source> <translation>Вигляд</translation> @@ -1137,11 +1153,13 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Програвач:</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="171"/> <location filename="../forms/skinnedsettings.ui" line="219"/> <source>???</source> <translation>???</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="178"/> <location filename="../forms/skinnedsettings.ui" line="226"/> <source>...</source> <translation>...</translation> @@ -1167,6 +1185,8 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Головне вікно</translation> </message> <message> + <location filename="../forms/skinnedsettings.ui" line="272"/> + <location filename="../forms/skinnedsettings.ui" line="296"/> <location filename="../forms/skinnedsettings.ui" line="320"/> <source>0</source> <translation></translation> @@ -1232,22 +1252,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation>Вирівнювати номери фрагментів</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation>Вибрати файли скінів</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation>Файли скінів</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation>Розпакована тема</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation>Упакована тема</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts index b0c1e14cf..e08216566 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_CN.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">选择皮肤文件</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">皮肤文件</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">未压缩皮肤</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">压缩皮肤</translation> </message> diff --git a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts index 5a4de9870..453f83060 100644 --- a/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts +++ b/src/plugins/Ui/skinned/translations/skinned_plugin_zh_TW.ts @@ -871,32 +871,32 @@ <context> <name>PlayListSelector</name> <message> - <location filename="../playlistselector.cpp" line="51"/> + <location filename="../playlistselector.cpp" line="52"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="52"/> + <location filename="../playlistselector.cpp" line="53"/> <source>&Save As...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="54"/> + <location filename="../playlistselector.cpp" line="55"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="55"/> + <location filename="../playlistselector.cpp" line="56"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Rename Playlist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../playlistselector.cpp" line="113"/> + <location filename="../playlistselector.cpp" line="114"/> <source>Playlist name:</source> <translation type="unfinished"></translation> </message> @@ -1249,22 +1249,22 @@ Andrey Adreev <andreev00@gmail.com></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="100"/> + <location filename="../skinnedsettings.cpp" line="101"/> <source>Select Skin Files</source> <translation type="unfinished">選取皮膚檔案</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="101"/> + <location filename="../skinnedsettings.cpp" line="102"/> <source>Skin files</source> <translation type="unfinished">皮膚檔案</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="143"/> + <location filename="../skinnedsettings.cpp" line="150"/> <source>Unarchived skin</source> <translation type="unfinished">未封包皮膚</translation> </message> <message> - <location filename="../skinnedsettings.cpp" line="174"/> + <location filename="../skinnedsettings.cpp" line="181"/> <source>Archived skin</source> <translation type="unfinished">封包皮膚</translation> </message> diff --git a/src/plugins/Visual/analyzer/CMakeLists.txt b/src/plugins/Visual/analyzer/CMakeLists.txt index 293f2b9d8..5a363b2fc 100644 --- a/src/plugins/Visual/analyzer/CMakeLists.txt +++ b/src/plugins/Visual/analyzer/CMakeLists.txt @@ -33,11 +33,14 @@ SET(libanalyzer_SRCS fft.c ) +SET(libanalyzer_HDRS + inlines.h + fft.h +) + SET(libanalyzer_MOC_HDRS analyzer.h colorwidget.h - fft.h - inlines.h settingsdialog.h visualanalyzerfactory.h ) @@ -61,7 +64,7 @@ QT4_WRAP_UI(libanalyzer_UIS_H ${libanalyzer_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(analyzer MODULE ${libanalyzer_SRCS} ${libanalyzer_MOC_SRCS} ${libanalyzer_UIS_H} - ${libanalyzer_RCC_SRCS}) + ${libanalyzer_RCC_SRCS} ${libanalyzer_HDRS}) add_dependencies(analyzer qmmp) target_link_libraries(analyzer ${QT_LIBRARIES} -lqmmp) install(TARGETS analyzer DESTINATION ${LIB_DIR}/qmmp/Visual) diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 1254fa4f1..de9971ca8 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -60,41 +60,44 @@ SET(libqmmp_SRCS qmmpevents.cpp ) -SET(libqmmp_MOC_HDRS - visual.h - visualfactory.h - recycler.h - buffer.h - decoder.h - output.h - fileinfo.h +SET(libqmmp_HDRS + qmmpevents_p.h outputfactory.h + decoderfactory.h + effectfactory.h equ/iir_cfs.h equ/iir_fpu.h equ/iir.h - decoderfactory.h - soundcore.h - effectfactory.h + visualfactory.h + recycler.h + buffer.h effect.h qmmp.h + replaygain_p.h + fileinfo.h + audioconverter_p.h + eqsettings.h + decoder.h + tagmodel.h + audioparameters.h + inputsourcefactory.h + enginefactory.h + metadatamanager.h +) + +SET(libqmmp_MOC_HDRS + visual.h + output.h + soundcore.h statehandler.h volumecontrol.h metadatamodel.h - tagmodel.h qmmpaudioengine_p.h abstractengine.h - audioparameters.h inputsource.h - inputsourcefactory.h fileinputsource_p.h emptyinputsource_p.h - enginefactory.h - metadatamanager.h - replaygain_p.h - qmmpsettings.h - audioconverter_p.h - eqsettings.h - qmmpevents_p.h + qmmpsettings.h ) SET(libqmmp_DEVEL_HDRS @@ -131,7 +134,7 @@ QT4_WRAP_CPP(libqmmp_MOC_SRCS ${libqmmp_MOC_HDRS}) # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(libqmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS}) +ADD_LIBRARY(libqmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS} ${libqmmp_HDRS}) target_link_libraries(libqmmp ${QT_LIBRARIES}) SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmp) install(TARGETS libqmmp LIBRARY DESTINATION ${LIB_DIR} diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index bd3fb9120..b4a312cde 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -47,33 +47,36 @@ SET(libqmmpui_SRCS aboutdialog.cpp ) -SET(libqmmpui_MOC_HDRS +SET(libqmmpui_HDRS generalfactory.h - general.h - uihelper.h - playlistparser.h playlistformat.h commandlinemanager.h commandlineoption.h - filedialog.h filedialogfactory.h + playstate_p.h + playlistitem.h + playlistsettings_p.h + metadataformatter.h + uiloader.h + uifactory.h + pluginitem_p.h +) + +SET(libqmmpui_MOC_HDRS + general.h + uihelper.h + playlistparser.h + filedialog.h qtfiledialog_p.h fileloader_p.h - playstate_p.h playlistmodel.h - playlistitem.h mediaplayer.h - playlistsettings_p.h detailsdialog.h tageditor_p.h playlistmanager.h - metadataformatter.h templateeditor.h - uiloader.h - uifactory.h jumptotrackdialog_p.h configdialog.h - pluginitem_p.h aboutdialog_p.h ) @@ -117,7 +120,7 @@ QT4_WRAP_CPP(libqmmpui_MOC_SRCS ${libqmmpui_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_MOC_SRCS} ${libqmmpui_RCC_SRCS} ${libqmmpui_UIS_H}) +ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_MOC_SRCS} ${libqmmpui_RCC_SRCS} ${libqmmpui_UIS_H} ${libqmmpui_HDRS}) target_link_libraries(qmmpui ${QT_LIBRARIES} -lqmmp) add_dependencies(qmmpui libqmmp) SET_TARGET_PROPERTIES(qmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION}) |