From f56b4963c141b91bc6e78947814f2f0cb92c26a1 Mon Sep 17 00:00:00 2001 From: Dominic Clark Date: Wed, 17 Jun 2020 23:05:40 +0100 Subject: [PATCH 1/6] Fix some TCOs not saving properly (#5537) --- src/core/Track.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/Track.cpp b/src/core/Track.cpp index 3f9e04fe6..c377d7b42 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -717,7 +717,7 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me ) setInitialMousePos( me->pos() ); - if( me->x() < width() - RESIZE_GRIP_WIDTH ) + if( m_tco->getAutoResize() || me->x() < width() - RESIZE_GRIP_WIDTH ) { m_action = Move; setCursor( Qt::SizeAllCursor ); @@ -738,7 +738,7 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me ) MidiTime::ticksPerTact() ) ); s_textFloat->moveGlobal( this, QPoint( width() + 2, height() + 2 ) ); } - else if( !m_tco->getAutoResize() ) + else { m_action = Resize; setCursor( Qt::SizeHorCursor ); From c6f8f7b8e77964e396a5b3425ccebeea2fb4f52e Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Tue, 23 Jun 2020 10:41:24 +0900 Subject: [PATCH 2/6] Travis: stop auto-uploading binary releases --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 396217af8..3d03abf20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,20 +45,6 @@ script: - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh after_script: - ccache -s -deploy: - provider: releases - api_key: - secure: d4a+x4Gugpss7JK2DcHjyBZDmEFFh4iVfKDfITSD50T6Mc6At4LMgojvEu+6qT6IyOY2vm3UVT6fhyeuWDTRDwW9tfFlaHVA0h8aTRD+eAXOA7pQ8rEMwQO3+WCKuKTfEqUkpL4wxhww8dpkv54tqeIs0S4TBqz9tk8UhzU7XbE= - file_glob: true - file: - - lmms-${TRAVIS_TAG:1}-$TARGET_OS.exe - - /var/cache/pbuilder/result/lmms_*.tar.xz - skip_cleanup: true - on: - tags: true - all_branches: true - condition: '"$TARGET_DEPLOY" = True' - repo: LMMS/lmms notifications: webhooks: urls: From c28dbd1835196f3c9b10560a5744e06cf4bc15c2 Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Tue, 23 Jun 2020 10:45:39 +0900 Subject: [PATCH 3/6] Update CONTRIBUTORS --- doc/CONTRIBUTORS | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS index 4a791028f..eb030ad71 100644 --- a/doc/CONTRIBUTORS +++ b/doc/CONTRIBUTORS @@ -9,24 +9,26 @@ Colin Wallace Oskar Wallgren Raine M. Ekman Umcaruje -Michael Gregorius +Hyunjin Song Javier Serrano Polo +Michael Gregorius grejppi Javier Serrano Polo -Hyunjin Song Wong Cho Ching Alexandre Almeida Daniel Winzen LMMS Service Account Steffen Baranowsky Danny McRae +Johannes Lorenz Garrett -Hyunin Song liushuyu +Dominic Clark +Hyunin Song Andrew Kelley +Spekular Andreas Brandmaier Fastigium -Spekular Amadeus Folego Jonas Trappenberg M374LX @@ -35,18 +37,17 @@ grindhold Mike Choi Karmo Rosental Christopher L. Simons -Dominic Clark NoiseByNorthwest -falkTX -Johannes Lorenz Rebecca DeField +falkTX Stian Jørgensrud +David Carlier Ryan Roden-Corrent +Shmuel H midi-pascal Augustin Cavalier BaraMGB Csaba Hruska -David Carlier DeRobyJ Hussam Eddin Alhomsi Rüdiger Ranft @@ -66,11 +67,15 @@ Jonathan Aquilina Mohammad Amin Sameti ra wongcc966422 +Cyp David CARLIER +Douglas <34612565+DouglasDGI@users.noreply.github.com> Gurjot Singh Janne Sinisalo Krzysztof Foltman Lou Herard +Noah Brecht +Olivier Humbert Paul Batchelor Paul Wayper Petter Reinholdtsen @@ -86,9 +91,8 @@ Cyrille Bollu Dan Williams Ian Sannar Jaroslav Petrnoušek -Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com> -Johannes Lorenz Kenneth Perry (thothonegan) +Kevin Zander LYF610400210 Lukas W Mark-Agent003 @@ -101,29 +105,37 @@ Rebecca LaVie Roberto Giaconia SecondFlight Steffen Baranowsky +T0NIT0 RMX TheTravelingSpaceman Thomas Clark gnudles liushuyu +makepost miketurn psyomn quadro sarahkeefe +thmueller64 <64359888+thmueller64@users.noreply.github.com> Achim Settelmeier +Alexandra Dutton +Andreas Müller André Hentschel Armin Kazmi +Artur Twardowski <32247490+artur-twardowski@users.noreply.github.com> Attila Herman Bastian Kummer Christopher A. Oliver +Cyp <48363+Cyp@users.noreply.github.com> Devin Venable Diego Ramos Ruggeri -Douglas <34612565+DouglasDGI@users.noreply.github.com> DragonEagle Filip Hron Frank Mather Frederik +Gingka Akiyama <33764485+GingkathFox@users.noreply.github.com> Greg Simpson Hexasoft +Hubert Figuière IvanMaldonado Ivo Wetzel Jens Lang @@ -138,17 +150,17 @@ Lee Avital LocoMatt Léo Andrès Markus Elfring +Martin Pavelek Maurizio Lo Bosco Mehdi Mikobuntu Mingcong Bai Nikos Chantziaras -Noah Brecht Ododo -Olivier Humbert Paul Nasca Peter Nelson Ra +Ron U Ryan Schmidt Shane Ambler Simon Jackson (Netbook) @@ -170,13 +182,15 @@ follower fundamental gandalf3 groboclown +https://gitlab.com/users/CYBERDEViLNL <1148379+CYBERDEViLNL@users.noreply.github.com> irrenhaus3 jasp00 justnope kamnxt +knittl lmmsservice m-xbutterfly -noahb01 +necrashter projectpitchin rgwan xhe From 24eb2304fdce1e52a551fcd31cb8d8915b29ffc0 Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Sat, 4 Jul 2020 20:39:04 +0900 Subject: [PATCH 4/6] Add a CMake option for deploying Qt translations --- .travis.yml | 2 +- CMakeLists.txt | 11 +++++++++++ data/locale/CMakeLists.txt | 6 +++--- src/core/main.cpp | 25 ++++++++++++------------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d03abf20..6ab079296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ before_install: install: - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh before_script: - - export CMAKE_FLAGS="-DWANT_QT5=$QT5 -DUSE_WERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo" + - export CMAKE_FLAGS="-DWANT_QT5=$QT5 -DUSE_WERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUNDLE_QT_TRANSLATIONS=ON" - if [ -z "$TRAVIS_TAG" ]; then export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"; fi script: - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index a84018eac..9a6765440 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ OPTION(WANT_VST "Include VST support" ON) OPTION(WANT_VST_NOWINE "Include partial VST support (without wine)" OFF) OPTION(WANT_WINMM "Include WinMM MIDI support" OFF) OPTION(WANT_QT5 "Build with Qt5" OFF) +OPTION(BUNDLE_QT_TRANSLATIONS "Install Qt translation files for LMMS" OFF) IF(LMMS_BUILD_APPLE) @@ -92,6 +93,7 @@ IF(LMMS_BUILD_WIN32) SET(WANT_SNDIO OFF) SET(WANT_SOUNDIO OFF) SET(WANT_WINMM ON) + SET(BUNDLE_QT_TRANSLATIONS ON) SET(LMMS_HAVE_WINMM TRUE) SET(STATUS_ALSA "") SET(STATUS_JACK "") @@ -165,6 +167,15 @@ IF(WANT_QT5) # Resolve Qt5::qmake to full path for use in packaging scripts GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION) + execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS + OUTPUT_VARIABLE QT_TRANSLATIONS_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + IF(EXISTS "${QT_TRANSLATIONS_DIR}") + MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}") + ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"') + ENDIF() FIND_PACKAGE(Qt5Test) SET(QT_QTTEST_LIBRARY Qt5::Test) diff --git a/data/locale/CMakeLists.txt b/data/locale/CMakeLists.txt index 4de6d5ff7..0eb98f8e3 100644 --- a/data/locale/CMakeLists.txt +++ b/data/locale/CMakeLists.txt @@ -48,9 +48,9 @@ FOREACH(_item ${qm_targets}) ADD_DEPENDENCIES(finalize-locales "${_item}") ENDFOREACH(_item ${qm_targets}) -IF(LMMS_BUILD_WIN32) - FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*[^h].qm") +IF(BUNDLE_QT_TRANSLATIONS) + FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*.qm") LIST(SORT QT_QM_FILES) -ENDIF(LMMS_BUILD_WIN32) +ENDIF() 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 1f400e91a..f04a02b08 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -86,9 +86,10 @@ inline void loadTranslation( const QString & tname, QTranslator * t = new QTranslator( QCoreApplication::instance() ); QString name = tname + ".qm"; - t->load( name, dir ); - - QCoreApplication::instance()->installTranslator( t ); + if (t->load(name, dir)) + { + QCoreApplication::instance()->installTranslator(t); + } } @@ -651,19 +652,17 @@ int main( int argc, char * * argv ) 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, - QString( QT_TRANSLATIONS_DIR ) ); -#endif // load actual translation for LMMS loadTranslation( pos ); + // load translation for Qt-widgets/-dialogs +#ifdef QT_TRANSLATIONS_DIR + // load from the original path first + loadTranslation(QString("qt_") + pos, QT_TRANSLATIONS_DIR); +#endif + // override it with bundled/custom one, if exists + loadTranslation(QString("qt_") + pos, ConfigManager::inst()->localeDir()); + // try to set realtime priority #if defined(LMMS_BUILD_LINUX) || defined(LMMS_BUILD_FREEBSD) From fde11df89b3fbe04409e0ec14f4f6c47f39d64fd Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Sat, 4 Jul 2020 19:18:29 +0900 Subject: [PATCH 5/6] Update PROJECT_YEAR --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a6765440..01b627b03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE(FindPkgConfig) STRING(TOUPPER "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE) -SET(PROJECT_YEAR 2019) +SET(PROJECT_YEAR 2020) SET(PROJECT_AUTHOR "LMMS Developers") SET(PROJECT_URL "https://lmms.io") From 94363be152f526edba4e884264d891f1361cf54b Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Sat, 4 Jul 2020 20:58:46 +0900 Subject: [PATCH 6/6] Bump version to 1.2.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01b627b03..b56a8c07b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software" SET(PROJECT_COPYRIGHT "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}") SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_RELEASE "1") +SET(VERSION_RELEASE "2") SET(VERSION_STAGE "") SET(VERSION_BUILD "0") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")