Merge branch 'master' of https://github.com/musescore/MuseScore

uhm
musescore · Nov 28, 2024 · c380adc · c380adc
2 parents f984b77 + 17b7f90
commit c380adc
Show file tree

Hide file tree

Showing 394 changed files with 20,907 additions and 19,954 deletions.
diff --git a/buildscripts/ci/linux/setup-arm.sh b/buildscripts/ci/linux/setup-arm.sh
@@ -67,7 +67,6 @@ apt_packages=(
   libtool
   libssl-dev
   patchelf
-  pkg-config
   software-properties-common # installs `add-apt-repository`
   unzip
   wget

diff --git a/buildscripts/ci/linux/setup.sh b/buildscripts/ci/linux/setup.sh
@@ -58,7 +58,6 @@ apt_packages_basic=(
   desktop-file-utils
   file
   git
-  pkg-config
   software-properties-common # installs `add-apt-repository`
   unzip
   p7zip-full

diff --git a/buildscripts/ci/macos/setup.sh b/buildscripts/ci/macos/setup.sh
@@ -26,10 +26,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.14
 
 # Install build tools
 echo "Install build tools"
-
-rm '/usr/local/bin/2to3' # fixing install python 3.9 error (it is a dependency for ninja)
-brew install ninja pkg-config --quiet
-brew install cmake --formula --quiet
+brew install cmake ninja --formula --quiet
 
 # Download dependencies
 echo "Download dependencies"

diff --git a/buildscripts/ci/withoutqt/setup.sh b/buildscripts/ci/withoutqt/setup.sh
@@ -48,7 +48,6 @@ apt_packages_basic=(
   # Alphabetical order please!
   file
   git
-  pkg-config
   software-properties-common # installs `add-apt-repository`
   unzip
   p7zip-full

diff --git a/buildscripts/cmake/SetupBuildEnvironment.cmake b/buildscripts/cmake/SetupBuildEnvironment.cmake
@@ -66,6 +66,11 @@ endif(OS_IS_MAC)
 
 # MSVC-specific
 if(CC_IS_MSVC)
+    # TODO: remove this
+    # It is necessary because of the following line in src/app/CMakeLists.txt:
+    # `set_target_properties(${QtLibrary} PROPERTIES MAP_IMPORTED_CONFIG_DEBUG "RELEASE")`
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL") # i.e. not MultiThreaded$<$<CONFIG:Debug>:Debug>DLL
+
     add_compile_options("/EHsc")
     add_compile_options("/utf-8")
 

diff --git a/buildscripts/cmake/SetupCompileWarnings.cmake b/buildscripts/cmake/SetupCompileWarnings.cmake
@@ -29,13 +29,11 @@ function(target_no_warning TARGET WNAME)
     elseif(WNAME STREQUAL "-Wno-unused-variable")
         set(MSVC_Warning /wd4101 /wd4189)
     elseif(WNAME STREQUAL "-Wunused-const-variable=0")
-
     elseif(WNAME STREQUAL "-Wno-type-limits")
-
     elseif(WNAME STREQUAL "-Wno-unknown-pragmas")
-
     elseif(WNAME STREQUAL "-Wno-truncate")
         set(MSVC_Warning /wd4310 /wd4311)
+        unset(GCC_Warning)
     elseif(WNAME STREQUAL "-Wno-uninitialized")
         set(MSVC_Warning /wd4701 /wd4703)
     elseif(WNAME STREQUAL "-Wno-float-conversion")
@@ -53,8 +51,16 @@ function(target_no_warning TARGET WNAME)
     elseif(WNAME STREQUAL "-Wno-implicit-fallthrough")
     elseif(WNAME STREQUAL "-Wno-empty-body")
     elseif(WNAME STREQUAL "-Wno-attributes")
-    elseif(WNAME STREQUAL "-Wno-absolute-value")
-    elseif(WNAME STREQUAL "-Wno-tautological-pointer-compare")
+    elseif(WNAME STREQUAL "-Wc-no-absolute-value")
+        set(GCC_Warning $<$<COMPILE_LANGUAGE:C>:-Wno-absolute-value>)
+        set(CLANG_Warning $<$<COMPILE_LANGUAGE:C>:-Wno-absolute-value>)
+    elseif(WNAME STREQUAL "-Wc-no-tautological-pointer-compare")
+        set(GCC_Warning $<$<COMPILE_LANGUAGE:C>:-Wno-tautological-pointer-compare>)
+        set(CLANG_Warning $<$<COMPILE_LANGUAGE:C>:-Wno-tautological-pointer-compare>)
+    elseif(WNAME STREQUAL "-Wc-no-array-parameter")
+        set(GCC_Warning $<$<COMPILE_LANGUAGE:C>:-Wno-array-parameter>)
+        set(CLANG_Warning $<$<COMPILE_LANGUAGE:C>:-Wno-array-parameter>)
+    elseif(WNAME STREQUAL "-Wno-unused-but-set-variable")
     elseif(WNAME STREQUAL "-Wno-sign-compare")
     elseif(WNAME STREQUAL "-Wno-attributes")
     elseif(WNAME STREQUAL "-Wno-restrict")

diff --git a/share/instruments/instruments.xml b/share/instruments/instruments.xml
@@ -7734,6 +7734,33 @@
                   <genre>concertband</genre>
                   <genre>marching</genre>
             </Instrument>
+            <Instrument id="taiko">
+                  <family>drums</family>
+                  <trackName>Taiko</trackName>
+                  <longName>Taiko</longName>
+                  <shortName>Taiko</shortName>
+                  <description>Taiko.</description>
+                  <musicXMLid>drum.taiko</musicXMLid>
+                  <clef>PERC</clef>
+                  <stafftype staffTypePreset="perc1Line">percussion</stafftype>
+                  <barlineSpan>1</barlineSpan>
+                  <drumset>1</drumset>
+                  <singleNoteDynamics>0</singleNoteDynamics>
+                  <Drum pitch="36"> <!--Electric Bass Drum-->
+                        <head>normal</head>
+                        <line>0</line>
+                        <voice>0</voice>
+                        <name>Taiko</name>
+                        <stem>1</stem>
+                        <shortcut>A</shortcut>
+                  </Drum>
+                  <Channel>
+                        <!--MIDI: Bank 128, Prog 0; MS General: Standard-->
+                        <controller ctrl="0" value="1"/> <!--Bank MSB-->
+                        <program value="0"/> <!--Standard Kit-->
+                  </Channel>
+                  <genre>world</genre>
+            </Instrument>
             <Instrument id="anvil">
                   <family>unpitched-metal-percussion</family>
                   <trackName>Anvil</trackName>

diff --git a/share/instruments/instrumentsxml.h b/share/instruments/instrumentsxml.h
@@ -3952,6 +3952,15 @@ QT_TRANSLATE_NOOP3("engraving/instruments", "Timbales", "timbales longName"),
 //: shortName for Timbales; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
 QT_TRANSLATE_NOOP3("engraving/instruments", "Timb.", "timbales shortName"),
 
+//: description for Taiko; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
+QT_TRANSLATE_NOOP3("engraving/instruments", "Taiko.", "taiko description"),
+//: trackName for Taiko; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
+QT_TRANSLATE_NOOP3("engraving/instruments", "Taiko", "taiko trackName"),
+//: longName for Taiko; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
+QT_TRANSLATE_NOOP3("engraving/instruments", "Taiko", "taiko longName"),
+//: shortName for Taiko; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
+QT_TRANSLATE_NOOP3("engraving/instruments", "Taiko", "taiko shortName"),
+
 //: description for Anvil; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names
 QT_TRANSLATE_NOOP3("engraving/instruments", "Anvil.", "anvil description"),
 //: trackName for Anvil; Please see https://github.com/musescore/MuseScore/wiki/Translating-instrument-names

diff --git a/share/locale/instruments_ka.ts b/share/locale/instruments_ka.ts
@@ -19922,7 +19922,7 @@
     <message>
         <location filename="../instruments/instrumentsxml.h" line="24"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>ძირითადი</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="28"/>

diff --git a/share/locale/instruments_uk.ts b/share/locale/instruments_uk.ts
@@ -19644,12 +19644,12 @@
     <message>
         <location filename="../instruments/instrumentsxml.h" line="5049"/>
         <source>Strings - Plucked</source>
-        <translation>Струнні - щипкові</translation>
+        <translation>Струнні — щипкові</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="5923"/>
         <source>Strings - Bowed</source>
-        <translation>Струнні - смичкові</translation>
+        <translation>Струнні — смичкові</translation>
     </message>
 </context>
 <context>
@@ -19800,12 +19800,12 @@
     <message>
         <location filename="../instruments/instrumentsxml.h" line="44"/>
         <source>Saxophone Quartet</source>
-        <translation type="unfinished"/>
+        <translation>Квартет саксофонів</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="45"/>
         <source>Brass Quartet</source>
-        <translation type="unfinished"/>
+        <translation>Квартет мідних духових</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="46"/>
@@ -19905,17 +19905,17 @@
     <message>
         <location filename="../instruments/instrumentsxml.h" line="70"/>
         <source>Classical Orchestra</source>
-        <translation type="unfinished"/>
+        <translation>Класичний оркестр</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="71"/>
         <source>Symphony Orchestra</source>
-        <translation type="unfinished"/>
+        <translation>Симфонічний оркестр</translation>
     </message>
     <message>
         <location filename="../instruments/instrumentsxml.h" line="72"/>
         <source>String Orchestra</source>
-        <translation type="unfinished"/>
+        <translation>Струнний оркестр</translation>
     </message>
 </context>
 <context>