diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 24911fdef94..852bc3a8b72 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -64,7 +64,7 @@ repos: "\\W(?:m_p*(?=[A-Z])|m_(?=\\w)|pp*(?=[A-Z])|k(?=[A-Z])|s_(?=\\w))", --write-changes, ] - exclude: ^(packaging/wix/LICENSE.rtf|src/dialog/dlgabout\.cpp|.*\.(?:pot?|(?") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Digital DJ Application") @@ -3857,7 +3858,7 @@ set(CPACK_DEBIAN_UPLOAD_PPA_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackD set(CPACK_DEBIAN_INSTALL_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/packaging/CPackDebInstall.cmake") set(CPACK_WIX_UPGRADE_GUID "921DC99C-4DCF-478D-B950-50685CB9E6BE") -set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/LICENSE.rtf") +set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_BINARY_DIR}/packaging/wix/LICENSE.rtf") set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/res/images/icons/ic_mixxx.ico") set(CPACK_WIX_PROPERTY_ARPHELPLINK "${CPACK_PACKAGE_HOMEPAGE_URL}") set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix/images/banner.bmp") @@ -3868,6 +3869,8 @@ set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/packaging/CPackConfig.cmake" if(WIN32) # override not working default NSIS set(CPACK_GENERATOR WIX) + # uses CMAKE_PROJECT_VERSION + configure_file(packaging/wix/LICENSE.rtf.in packaging/wix/LICENSE.rtf @ONLY) endif() include(CPack) diff --git a/packaging/wix/LICENSE.rtf b/packaging/wix/LICENSE.rtf.in similarity index 98% rename from packaging/wix/LICENSE.rtf rename to packaging/wix/LICENSE.rtf.in index 2493d2964f9..e7cbf4b8125 100644 --- a/packaging/wix/LICENSE.rtf +++ b/packaging/wix/LICENSE.rtf.in @@ -1,7 +1,7 @@ {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Courier New;}} {\colortbl ;\red0\green0\blue255;} {\*\generator Riched20 10.0.14393}\viewkind4\uc1 -\pard\qj\ul\b\f0\fs22\lang1036 Mixxx version 2.4, Digital DJ'ing software.\ulnone\b0\fs24\par +\pard\qj\ul\b\f0\fs22\lang1036 Mixxx @CMAKE_PROJECT_VERSION@, Digital DJ'ing software.\ulnone\b0\fs24\par \fs22 Copyright (C) 2001-2024 Mixxx Development Team\par \par Promotional tracks are copyright their respective owners and\par @@ -2073,4 +2073,3 @@ Moreover, you may apply this exception to a modified version of the Library, pro Furthermore, you are not required to apply this additional permission to a modified version of the Library.\par \par } - diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp index 990b7e9a15b..8ebf5b8f98f 100644 --- a/src/widget/wcoverart.cpp +++ b/src/widget/wcoverart.cpp @@ -259,7 +259,8 @@ void WCoverArt::mouseReleaseEvent(QMouseEvent* pEvent) { return; } - if (pEvent->buttons() == Qt::LeftButton && m_loadedTrack && + if (pEvent->button() == Qt::LeftButton && + m_loadedTrack && m_clickTimer.isActive()) { // init/close fullsize cover if (m_pDlgFullSize->isVisible()) { m_pDlgFullSize->close();