Skip to content
Permalink
Browse files

Updates to several tet files; Version Update; Fix for translation bin…

…ary path; Add Dev Install prefix on Release build
  • Loading branch information...
suamor committed May 21, 2017
1 parent ece4ec9 commit 7f11579bb87130c72dcb49df3318785fa4986dc7
Showing with 82 additions and 8 deletions.
  1. +1 −1 AUTHORS
  2. +11 −0 CMakeLists.txt
  3. +1 −1 DEVELOPERS
  4. +62 −0 NEWS
  5. +1 −1 README
  6. +1 −1 VERSION
  7. +5 −4 src/CMakeLists.txt
@@ -3,7 +3,7 @@ Main developers:
Matevž Jekovec <matevz.jekovec@gmail.com>
lead developer, Windows port, Debian/Ubuntu packages, cmake, Wiki site
Reinhard Katzmann <suamor@web.de>
Qt4 GUI maestro, cmake, programming patterns
Qt4, Qt5 senior expert, cmake, developing with patterns, refactorings
Itay Perl <itay.perl@gmail.com>
bughunter, lots of GUI fixes and additions

@@ -3,6 +3,17 @@
# and to the root binary directory of the project as ${CANORUS_BINARY_DIR}.
PROJECT(Canorus)

# Assume that Debug build is only done by developers -> install in build folder
# However be aware that this only works in a separate build folder!
IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
SET(CANORUS_DEV_INSTALL True)
ELSE("${CMAKE_BUILD_TYPE}" MATCHES "Debug") # Release
IF(${CANORUS_DEV_INSTALL} MATCHES True)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
ENDIF(${CANORUS_DEV_INSTALL} MATCHES True)
ENDIF("${CMAKE_BUILD_TYPE}" MATCHES "Debug")

# Don't build anything unless the version of CMake is high enough.
cmake_minimum_required(VERSION 2.6)

@@ -1,4 +1,4 @@
C++ developers for Qt4-based music score editor called Canorus
C++ developers for Qt5-based music score editor called Canorus
==============================================================

This document is intended for developers interested in the project.
62 NEWS
@@ -1,3 +1,65 @@
0.7.3
=====
- Translation Updates
- GPLv3 compatibility
- Official compiler used for builds is gcc/mingw 5.3 / 5.4
- Fixes in offset to measure numberings and pickup measures
- Command Settings updates
- Small updates to View setWorld functions regarding types
- Bindings for page movement (up, down, home, end)
- Fix for Appearence Dialog
- Qt4 no longer supported officially
- Adjustments for Qt4 after API fixes for Qt5
(not removed except for helper dialog due to drop of webkit by Qt5.6)
- Other minor changes Midi/Shortcut
- Load Dialog Fix (shortcut settings)
- No longer differentiate before showing Load Dialog (settings)
- Save Dialog updated to behave same as Load Dialog (settings)
- Various fixes for shortcut settings
- Fix for cloning View
- Support Qt5 for Windows (build), adjusted build instructions
- Fix Windows Qt5 DLL installation
- Integrate Shortcut Settings finally into Settings View
- Support several types of shortcut settings
- Readme now contains several updates to reflect compatibility with
older dependent packages like swig and cmake
- added note checker
- note checker and midi command support for shortcut settings
- fixed some compilation issues on other platforms
- fix issue with new sheet;
- add dynamic keyboard helper for shortcut settings
- Add version information to installer
- Qt4 build settings separated
- Fixed mouse move lagging
- AutoConnect issue fixed for Print Preview
- Pass binary midi data directly to QTextStream, fixes midi export again.
- Add support for C++11 build (and later, depending on recent compiler used)
- Unified Edit mode with Select mode. Default mode now is Edit mode.
- Fixed missing uiSelectMode in CAActionStorage.
- Fixed showing selection area, if a user had a shaky hand
- New more simple help system (HTML) documentation system based on sphinx
- Migrated several guides to sphinx (sorry, the german guide needs still to be done)
- Fix when inserting note on empty bar line when already having edited
some notes on a different bar line
- Add check for alsa on Linux for rtmidi;
- Fixed old GUI bug: On Undo, On New document, Note checker not activated on Undo.
- On first Escape, the selection is cleared. On second Escape, we a context is deselected.
- Fixed console logging: No mode handled.
- Fixed edit text hiding when clicked on an existing music element.
- Fixed Text/Lyrics/Bookmarks saving when clicked outside of the text edit. Only Esc key explicitly cancels the editing.
- Fixed editing bookmarks.
- Fixed Text/Lyrics/Bookmarks lost when switching from Insert mode to Edit mode without confirming text edit content.
- Added panning the view forward when writing lyrics at the end of the screen.
- Added behaviour to text edit: Blank content deletes the text element.
- Lyrics, text and bookmarks: Text edit shows on mouse release to allows multiple selection.
- Fixed insert playable icon to be more meaningful.
- Fixed toolbars: When inserting clefs, time sigs, key sigs etc. the voice toolbar should not be visible.
- Fixed fake text edit, if adding a text illegaly to non-playable element.
- Fixed text edit popping back up, when switching from insert to edit mode.
- Show text edit when exactly one element is selected, otherwise, confirm any opened text edits and hide it.
- fix for pluginmanager when no plugins are available
- Streamline Translation with 5.6 (use official macros)

0.7.2
=====
- Set SelectMode instead of NoDocumentMode when a new document.was created
2 README
@@ -39,7 +39,7 @@ disable the local installation of Canorus when calling cmake:
- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCANORUS_DEV_INSTALL=False

Set it to true to do a test installation for a Release version, f.e.
- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCANORUS_DEV_INSTALL=False
- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCANORUS_DEV_INSTALL=True

Testing Canorus
===============
@@ -1 +1 @@
0.7.2rc1
0.7.3rc1
@@ -483,7 +483,8 @@ set_source_files_properties(${CANORUS_PYTHON_WRAP_CXX} PROPERTIES COMPILE_FLAGS

# Set translation files
FILE(GLOB Canorus_Translation_Srcs "lang/*.ts") # lang/*.ts -> Canorus_Translation_Srcs
STRING(REGEX REPLACE "\\.ts" ".qm" Canorus_Translation_Bins "${Canorus_Translation_Srcs}") # Set Canorus_Translation_Bins to same values as Canorus_Translation_Srcs with different extensions
#STRING(REGEX REPLACE "\\.ts" ".qm" Canorus_Translation_Bins "${Canorus_Translation_Srcs}") # Set Canorus_Translation_Bins to same values as Canorus_Translation_Srcs with different extensions
FILE(GLOB Canorus_Translation_Bins ${CMAKE_BINARY_DIR}"/*.qm") # lang/*.ts -> Canorus_Translation_Srcs

SET(Canorus_Fonts # Music fonts needed by Canorus
fonts/CenturySchL-BoldItal.ttf # Century family needed for numbers and signs
@@ -717,7 +718,7 @@ ADD_DEPENDENCIES(canorus canorus_qm)
###############
# Dev Install #
###############
message("CANORUS_DEV_INSTALL " ${CANORUS_DEV_INSTALL})
message("CANORUS_DEV_INSTALL " ${CANORUS_DEV_INSTALL} " CANORUS_INSTALL_PREFIX " ${CANORUS_INSTALL_PREFIX})
IF(${CANORUS_DEV_INSTALL} MATCHES True)
ADD_CUSTOM_COMMAND(
TARGET canorus
@@ -734,8 +735,8 @@ INSTALL(TARGETS canorus
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR}
)
IF(USE_RUBY)
INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})
INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR})
ENDIF(USE_RUBY)
IF(USE_PYTHON)
INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR})

0 comments on commit 7f11579

Please sign in to comment.
You can’t perform that action at this time.