Skip to content

Commit

Permalink
Merge e632754 into 8ec9c9b
Browse files Browse the repository at this point in the history
  • Loading branch information
lyrra committed Aug 10, 2023
2 parents 8ec9c9b + e632754 commit 36f1e93
Show file tree
Hide file tree
Showing 82 changed files with 9,166 additions and 576 deletions.
40 changes: 40 additions & 0 deletions albums_readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Notes:

Today:
- preferences (almost done, only got to load them)
- tests (almost done, maybe combine the tests?)
- undo teleporting!!! (fixed?)
- contents pages broken, because when I addClicked an existing score it adds the exact same masterscore twice in the album
- repositioning an album and being unable to open a score should give a prompt to select the score in the filesystem
- Add the new members of MasterScore/Score to clone functions and save/write?
- Git cleanup.

Tests:
- compressed album file Test (almost done)

Week 4:
Mass changes:
- Mass changes, Actions menu, used by both albums and groups of normal scores (multible tabs selected or opened scores)
- Easy way to select multiple scores.
- Actions:
- Add - Replace instruments.
- Change style.
- Change footers/headers.

Week 5+ (further improvements):
Mixer for album-mode (with all the instruments).
Parts with different instrumentation.
Timeline for the entire Temporary Album Score.
Albums inside an Album.
Tools to split a score into multiple scores (an album).
Improved composer/lyricist handling. Give the user an option in the inspector to include (or not) that string in the front cover.
Add new movement with the same instrumentation as the last one in the album


Refactor and Code Quality:
- Decouple albums and multi movement scores.

Bugs:
- Fix all the places where inActiveAlbum should be inActiveAlbum and the dominantScore is the one in the scoreview (e.g. the teleporting stuff, sequencer setScoreView)
- Crash when editing title of part
- crashes related to text (are this all on master?)
6 changes: 6 additions & 0 deletions global/settings/types/preferencekeys.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
#define PREF_EXPORT_PNG_USETRANSPARENCY "export/png/useTransparency"
#define PREF_EXPORT_BG_STYLE "export/bg/style"
#define PREF_EXPORT_BG_CUSTOM_COLOR "export/bg/customcolor"
#define PREF_EXPORT_INCLUDE_ABSOLUTE_PATHS "export/album/includeAbsolutePaths"
#define PREF_IMPORT_GUITARPRO_CHARSET "import/guitarpro/charset"
#define PREF_IMPORT_MUSICXML_IMPORTBREAKS "import/musicXML/importBreaks"
#define PREF_IMPORT_MUSICXML_IMPORTLAYOUT "import/musicXML/importLayout"
Expand Down Expand Up @@ -196,6 +197,11 @@
#define PREF_UI_BUTTON_HIGHLIGHT_COLOR_ENABLED_LIGHT_OFF "ui/button/highlight/color/enabled/light/off"
#define PREF_UI_INSPECTOR_STYLED_TEXT_COLOR_LIGHT "ui/inspector/styledtext/color/light"
#define PREF_UI_INSPECTOR_STYLED_TEXT_COLOR_DARK "ui/inspector/styledtext/color/dark"
#define PREF_ALBUM_TITLE_AT_BOTTOM_ALLOWED "album/titleAtTheBottomAllowed"
#define PREF_ALBUM_DRAW_FRONT_COVER "album/drawFrontCover"
#define PREF_ALBUM_GENERATE_CONTENTS "album/generateContents"
#define PREF_ALBUM_PAGE_BREAKS_ENABLED "album/pageBreaks"
#define PREF_ALBUM_DEFAULT_PAUSE_DURATION "album/defaultPauseDuration"
#define PREF_PAN_SMOOTHLY_ENABLED "smoothPan/enabled"
#define PREF_PAN_MODIFIER_BASE "smoothPan/modifier/baseSpeed"
#define PREF_PAN_MODIFIER_STEP "smoothPan/modifier/step"
Expand Down
3 changes: 2 additions & 1 deletion libmscore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ add_library (
${_all_h_file}
${INCS}

types.h accidental.h ambitus.h arpeggio.h articulation.h audio.h bagpembell.h barline.h beam.h bend.h
types.h accidental.h album.h ambitus.h arpeggio.h articulation.h audio.h bagpembell.h barline.h beam.h bend.h
box.h bracket.h bracketItem.h breath.h bsp.h bsymbol.h changeMap.h chord.h chordline.h chordlist.h chordrest.h clef.h
cleflist.h connector.h drumset.h dsp.h duration.h durationtype.h dynamic.h easeInOut.h element.h
elementmap.h excerpt.h fermata.h fifo.h figuredbass.h fingering.h fraction.h fret.h glissando.h groups.h hairpin.h
Expand Down Expand Up @@ -102,6 +102,7 @@ add_library (
connector.cpp location.cpp skyline.cpp
scorediff.cpp
unrollrepeats.cpp
album.cpp
)

if (AVSOMR)
Expand Down
Loading

0 comments on commit 36f1e93

Please sign in to comment.