Merge branch 'stable-1.2'

# Conflicts: # cmake/nsis/CMakeLists.txt # src/core/ProjectRenderer.cpp # src/tracks/Pattern.cpp
LMMS · Oct 29, 2018 · 4252f75 · 4252f75
2 parents 4babbe2 + d8fb07f
commit 4252f75
Show file tree

Hide file tree

Showing 76 changed files with 989 additions and 3,528 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,5 +1,5 @@
 Alexandre Almeida <wilsalx@gmail.com> <meta.lx@hotmail.com>
-Tobias Doerffel <tobias.doerffel@gmail.com>
+Tobias Junghans <tobias.doerffel@gmail.com>
 Dave French <dave.french3@googlemail.com>
 Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
 Paul Giblock <drfaygo@gmail.com> <p@pgiblock.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(PROJECT_COPYRIGHT   "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
 SET(VERSION_MAJOR       "1")
 SET(VERSION_MINOR       "2")
 SET(VERSION_RELEASE     "0")
-SET(VERSION_STAGE       "rc6")
+SET(VERSION_STAGE       "rc7")
 SET(VERSION_BUILD       "0")
 SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
 IF(VERSION_STAGE)

diff --git a/cmake/apple/CMakeLists.txt b/cmake/apple/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(MACOSX_BUNDLE_ICON_FILE             "lmms.icns")
+SET(MACOSX_BUNDLE_ICON_FILE             "icon.icns")
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER        "${PROJECT_NAME_UCASE}")
 SET(MACOSX_BUNDLE_LONG_VERSION_STRING   "${VERSION}")
 SET(MACOSX_BUNDLE_BUNDLE_NAME           "${PROJECT_NAME_UCASE}")

diff --git a/cmake/apple/icon.icns b/cmake/apple/icon.icns
diff --git a/cmake/apple/lmms.icns b/cmake/apple/lmms.icns
diff --git a/cmake/apple/project.icns b/cmake/apple/project.icns
diff --git a/cmake/linux/CMakeLists.txt b/cmake/linux/CMakeLists.txt
@@ -1,5 +1,4 @@
-INSTALL(FILES lmms.svg                  DESTINATION "${DATA_DIR}/icons/hicolor/scalable/apps")
-INSTALL(FILES project.svg               DESTINATION "${DATA_DIR}/icons/hicolor/scalable/mimetypes/" RENAME "application-x-lmms-project.svg")
+INSTALL(DIRECTORY icons/                DESTINATION "${DATA_DIR}/icons/hicolor")
 INSTALL(FILES lmms.desktop              DESTINATION "${DATA_DIR}/applications")
 INSTALL(FILES lmms.xml                  DESTINATION "${DATA_DIR}/mime/packages")
 

diff --git a/cmake/linux/icons/128x128/apps/lmms.png b/cmake/linux/icons/128x128/apps/lmms.png
diff --git a/cmake/linux/icons/128x128/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/128x128/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/128x128@2/apps/lmms.png b/cmake/linux/icons/128x128@2/apps/lmms.png
diff --git a/cmake/linux/icons/128x128@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/128x128@2/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/16x16/apps/lmms.png b/cmake/linux/icons/16x16/apps/lmms.png
diff --git a/cmake/linux/icons/16x16/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/16x16/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/16x16@2/apps/lmms.png b/cmake/linux/icons/16x16@2/apps/lmms.png
diff --git a/cmake/linux/icons/16x16@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/16x16@2/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/24x24/apps/lmms.png b/cmake/linux/icons/24x24/apps/lmms.png
diff --git a/cmake/linux/icons/24x24/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/24x24/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/24x24@2/apps/lmms.png b/cmake/linux/icons/24x24@2/apps/lmms.png
diff --git a/cmake/linux/icons/24x24@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/24x24@2/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/32x32/apps/lmms.png b/cmake/linux/icons/32x32/apps/lmms.png
diff --git a/cmake/linux/icons/32x32/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/32x32/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/32x32@2/apps/lmms.png b/cmake/linux/icons/32x32@2/apps/lmms.png
diff --git a/cmake/linux/icons/32x32@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/32x32@2/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/48x48/apps/lmms.png b/cmake/linux/icons/48x48/apps/lmms.png
diff --git a/cmake/linux/icons/48x48/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/48x48/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/48x48@2/apps/lmms.png b/cmake/linux/icons/48x48@2/apps/lmms.png
diff --git a/cmake/linux/icons/48x48@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/48x48@2/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/64x64/apps/lmms.png b/cmake/linux/icons/64x64/apps/lmms.png
diff --git a/cmake/linux/icons/64x64/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/64x64/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/64x64@2/apps/lmms.png b/cmake/linux/icons/64x64@2/apps/lmms.png
diff --git a/cmake/linux/icons/64x64@2/mimetypes/application-x-lmms-project.png b/cmake/linux/icons/64x64@2/mimetypes/application-x-lmms-project.png
diff --git a/cmake/linux/icons/scalable/apps/lmms.svg b/cmake/linux/icons/scalable/apps/lmms.svg
diff --git a/cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg b/cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg
diff --git a/cmake/linux/lmms.png b/cmake/linux/lmms.png