From ed5aa83d1f786ed68a97d50911b9a955ce4f825c Mon Sep 17 00:00:00 2001 From: JosepMaJAZ Date: Sat, 25 Apr 2020 15:33:55 +0200 Subject: Corrections to the doc installation path (CMake) Inclusion of the current QT 5 translation files (CMake and Scons) Corrected one resource path in glslwaveformrenderersignal.cpp Cleaned mixxx.qrc --- CMakeLists.txt | 20 +++++- SConscript | 9 ++- res/mixxx.qrc | 83 +--------------------- .../renderers/glslwaveformrenderersignal.cpp | 2 +- 4 files changed, 29 insertions(+), 85 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06cffe6620..78296859f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1021,8 +1021,8 @@ target_link_libraries(mixxx PUBLIC mixxx-lib) # set(MIXXX_INSTALL_BINDIR ".") set(MIXXX_INSTALL_DATADIR ".") -set(MIXXX_INSTALL_DOCDIR ".") -set(MIXXX_INSTALL_LICENSEDIR ".") +set(MIXXX_INSTALL_DOCDIR "./doc") +set(MIXXX_INSTALL_LICENSEDIR "./doc") if (UNIX) include(GNUInstallDirs) set(MIXXX_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}") @@ -1063,6 +1063,22 @@ install( FILES_MATCHING PATTERN "*.qm" ) +if(WIN32) +install( + DIRECTORY + # I haven't seen a way to determine where the translations dir is, so I am making + # some assumptions here, and assuming that Qt5_DIR points to Qt-5.14.2/lib/cmake/Qt5 + # which is what my configuration tells me. + "${Qt5_DIR}/../../../translations" + DESTINATION + "${MIXXX_INSTALL_DATADIR}" + FILES_MATCHING REGEX + # QT 5 translations have been separated into several files, and most of the qt_xx.qm files + # contain just shortcuts to load the qtbase, qtmultimedia etc files. + "qt_.+\.qm|qtbase_.*\.qm|qtmultimedia_.*\.qm|qtscript_.*\.qm|qtxmlpatterns_.*\.qm" +) +endif() + # Font files install( DIRECTORY diff --git a/SConscript b/SConscript index 0eb8785093..6e96367bfa 100644 --- a/SConscript +++ b/SConscript @@ -267,7 +267,14 @@ skin_files = Glob('#res/skins/*') controllermappings_files = Glob('#res/controllers/*') # Translation files -translation_files = Glob('#res/translations/*.qm') + Glob(os.path.join(build.env['QTDIR'], 'translations/qt_*.qm')) +# QT 5 translations have been separated into several files, and most of the qt_xx.qm files contain just shortcuts to load the qtbase, qtmultimedia etc files. +translation_files = Glob('#res/translations/*.qm') ++ Glob(os.path.join(build.env['QTDIR'], 'translations/qt_*.qm')) ++ Glob(os.path.join(build.env['QTDIR'], 'translations/qtbase_*.qm')) ++ Glob(os.path.join(build.env['QTDIR'], 'translations/qtmultimedia_*.qm')) ++ Glob(os.path.join(build.env['QTDIR'], 'translations/qtscript_*.qm')) ++ Glob(os.path.join(build.env['QTDIR'], 'translations/qtxmlpatterns_*.qm')) + # Font files font_files = Glob('#res/fonts/*') diff --git a/res/mixxx.qrc b/res/mixxx.qrc index af79f9b598..e2cef8820d 100644 --- a/res/mixxx.qrc +++ b/res/mixxx.qrc @@ -1,4 +1,5 @@ - + + ../LICENSE images/library/ic_library_drag_and_drop.svg @@ -22,7 +23,6 @@ images/library/ic_library_prepare.svg images/library/ic_library_preview_pause.svg images/library/ic_library_preview_play.svg - images/library/ic_library_promotracks.svg images/library/ic_library_recordings.svg images/library/ic_library_rhythmbox.svg images/library/ic_library_traktor.svg @@ -50,11 +50,9 @@ images/preferences/ic_preferences_keydetect.svg images/preferences/ic_preferences_library.svg images/preferences/ic_preferences_lv2.svg - images/preferences/ic_preferences_midicontrollers.svg images/preferences/ic_preferences_modplug.svg images/preferences/ic_preferences_recording.svg images/preferences/ic_preferences_replaygain.svg - images/preferences/ic_preferences_sampler.svg images/preferences/ic_preferences_soundhardware.svg images/preferences/ic_preferences_vinyl.svg images/preferences/ic_preferences_warning.svg @@ -64,82 +62,5 @@ shaders/passthrough.vert shaders/rgbsignal.frag skins/default.qss - translations/mixxx_ar.qm - translations/mixxx_ast.qm - translations/mixxx_bg.qm - translations/mixxx_br.qm - translations/mixxx_bs.qm - translations/mixxx_ca-ES.qm - translations/mixxx_ca.qm - translations/mixxx_ceb.qm - translations/mixxx_cs.qm - translations/mixxx_da.qm - translations/mixxx_de.qm - translations/mixxx_el.qm - translations/mixxx_el-GR.qm - translations/mixxx_en.qm - translations/mixxx_en_GB.qm - translations/mixxx_eo.qm - translations/mixxx_es-ES.qm - translations/mixxx_es-MX.qm - translations/mixxx_es.qm - translations/mixxx_et.qm - translations/mixxx_eu.qm - translations/mixxx_fa.qm - translations/mixxx_fi.qm - translations/mixxx_fr.qm - translations/mixxx_fr-FR.qm - translations/mixxx_ga.qm - translations/mixxx_gl.qm - translations/mixxx_he.qm - translations/mixxx_he-IL.qm - translations/mixxx_hr.qm - translations/mixxx_hu.qm - translations/mixxx_hy.qm - translations/mixxx_ia.qm - translations/mixxx_id.qm - translations/mixxx_is.qm - translations/mixxx_it.qm - translations/mixxx_ja.qm - translations/mixxx_ko.qm - translations/mixxx_ky.qm - translations/mixxx_lb.qm - translations/mixxx_lt.qm - translations/mixxx_lv.qm - translations/mixxx_mi-NZ.qm - translations/mixxx_mk.qm - translations/mixxx_ml.qm - translations/mixxx_mn.qm - translations/mixxx_mr.qm - translations/mixxx_ms.qm - translations/mixxx_my.qm - translations/mixxx_nb.qm - translations/mixxx_nl.qm - translations/mixxx_nl-BE.qm - translations/mixxx_nl-NL.qm - translations/mixxx_nn.qm - translations/mixxx_oc.qm - translations/mixxx_pl.qm - translations/mixxx_pt-PT.qm - translations/mixxx_pt.qm - translations/mixxx_pt_BR.qm - translations/mixxx_ro.qm - translations/mixxx_ru.qm - translations/mixxx_si.qm - translations/mixxx_sk.qm - translations/mixxx_sl.qm - translations/mixxx_sn.qm - translations/mixxx_sq-AL.qm - translations/mixxx_sr.qm - translations/mixxx_sv.qm - translations/mixxx_te.qm - translations/mixxx_tr.qm - translations/mixxx_uk.qm - translations/mixxx_uz.qm - translations/mixxx_vi.qm - translations/mixxx_zh_CN.qm - translations/mixxx_zh-HK.qm - translations/mixxx_zh_TW.qm - translations/mixxx_zh_TW.Big5.qm diff --git a/src/waveform/renderers/glslwaveformrenderersignal.cpp b/src/waveform/renderers/glslwaveformrenderersignal.cpp index 709ee46ff1..347ad2156e 100644 --- a/src/waveform/renderers/glslwaveformrenderersignal.cpp +++ b/src/waveform/renderers/glslwaveformrenderersignal.cpp @@ -45,7 +45,7 @@ bool GLSLWaveformRendererSignal::loadShaders() { m_frameShaderProgram->removeAllShaders(); if (!m_frameShaderProgram->addShaderFromSourceFile( - QGLShader::Vertex, ":shaders/passthrough.vert")) { + QGLShader::Vertex, ":/shaders/passthrough.vert")) { qDebug() << "GLWaveformRendererSignalShader::loadShaders - " << m_frameShaderProgram->log(); return false; -- cgit v1.2.3 From 171e2d5ff91ee20475fee3c17e3c044d9bc4469b Mon Sep 17 00:00:00 2001 From: JosepMaJAZ Date: Sun, 26 Apr 2020 12:56:31 +0200 Subject: Fixed SConscript syntax. --- CMakeLists.txt | 2 +- SConscript | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78296859f1..b4f156704a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1073,7 +1073,7 @@ install( DESTINATION "${MIXXX_INSTALL_DATADIR}" FILES_MATCHING REGEX - # QT 5 translations have been separated into several files, and most of the qt_xx.qm files + # QT 5 translations have been separated into several files, and most of the qt_xx.qm files # contain just shortcuts to load the qtbase, qtmultimedia etc files. "qt_.+\.qm|qtbase_.*\.qm|qtmultimedia_.*\.qm|qtscript_.*\.qm|qtxmlpatterns_.*\.qm" ) diff --git a/SConscript b/SConscript index 6e96367bfa..5b04051cbc 100644 --- a/SConscript +++ b/SConscript @@ -268,12 +268,7 @@ controllermappings_files = Glob('#res/controllers/*') # Translation files # QT 5 translations have been separated into several files, and most of the qt_xx.qm files contain just shortcuts to load the qtbase, qtmultimedia etc files. -translation_files = Glob('#res/translations/*.qm') -+ Glob(os.path.join(build.env['QTDIR'], 'translations/qt_*.qm')) -+ Glob(os.path.join(build.env['QTDIR'], 'translations/qtbase_*.qm')) -+ Glob(os.path.join(build.env['QTDIR'], 'translations/qtmultimedia_*.qm')) -+ Glob(os.path.join(build.env['QTDIR'], 'translations/qtscript_*.qm')) -+ Glob(os.path.join(build.env['QTDIR'], 'translations/qtxmlpatterns_*.qm')) +translation_files = Glob('#res/translations/*.qm') + Glob(os.path.join(build.env['QTDIR'], 'translations/qt_*.qm')) + Glob(os.path.join(build.env['QTDIR'], 'translations/qtbase_*.qm')) + Glob(os.path.join(build.env['QTDIR'], 'translations/qtmultimedia_*.qm')) + Glob(os.path.join(build.env['QTDIR'], 'translations/qtscript_*.qm')) + Glob(os.path.join(build.env['QTDIR'], 'translations/qtxmlpatterns_*.qm')) # Font files -- cgit v1.2.3 From 44ed1c30e9e2da00adce152990db1b3104cd168c Mon Sep 17 00:00:00 2001 From: JosepMaJAZ Date: Sun, 26 Apr 2020 19:40:08 +0200 Subject: The comments broke this --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4f156704a..13e2ad3e98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1065,16 +1065,16 @@ install( ) if(WIN32) install( + # I haven't seen a way to determine where the translations dir is, so I am making + # some assumptions here, and assuming that Qt5_DIR points to Qt-5.14.2/lib/cmake/Qt5 + # which is what my configuration tells me. DIRECTORY - # I haven't seen a way to determine where the translations dir is, so I am making - # some assumptions here, and assuming that Qt5_DIR points to Qt-5.14.2/lib/cmake/Qt5 - # which is what my configuration tells me. "${Qt5_DIR}/../../../translations" DESTINATION "${MIXXX_INSTALL_DATADIR}" + # QT 5 translations have been separated into several files, and most of the qt_xx.qm files + # contain just shortcuts to load the qtbase, qtmultimedia etc files. FILES_MATCHING REGEX - # QT 5 translations have been separated into several files, and most of the qt_xx.qm files - # contain just shortcuts to load the qtbase, qtmultimedia etc files. "qt_.+\.qm|qtbase_.*\.qm|qtmultimedia_.*\.qm|qtscript_.*\.qm|qtxmlpatterns_.*\.qm" ) endif() -- cgit v1.2.3