diff --git a/changes b/changes index 3e890221e0a46602eef7581a915b74e050e4aaa2..24c235f66c2a9f8a8d0523d18059a9560c9a1a2f 100644 --- a/changes +++ b/changes @@ -1,4 +1,5 @@ 1.1.5 + - detailed preview of melodies in charts - added new tool button with menu for a score - A note from played exam melody can be selected to start playing from it - First run wizard comes back improved - it is a plugin now diff --git a/src/libs/core/score/tsimplescore.cpp b/src/libs/core/score/tsimplescore.cpp index bb2dcdc10fcea37cc51f719bd376131958ffc138..a0615bd3c1d0819a38069bbd51a5ca9501cb9e5d 100644 --- a/src/libs/core/score/tsimplescore.cpp +++ b/src/libs/core/score/tsimplescore.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2014 by Tomasz Bojczuk * + * Copyright (C) 2013-2015 by Tomasz Bojczuk * * tomaszbojczuk@gmail.com * * * * This program is free software; you can redistribute it and/or modify * @@ -305,8 +305,12 @@ bool TsimpleScore::isPianoStaff() { void TsimpleScore::setBGcolor(QColor bgColor) { - bgColor.setAlpha(230); - viewport()->setStyleSheet(QString("border: 1px solid palette(Text); border-radius: 10px; %1;").arg(Tcolor::bgTag(bgColor))); + if (bgColor == -1) + viewport()->setStyleSheet(Tcolor::bgTag(bgColor)); + else { + bgColor.setAlpha(230); + viewport()->setStyleSheet(QString("border: 1px solid palette(Text); border-radius: 10px; %1;").arg(Tcolor::bgTag(bgColor))); + } } //########################################################################################################## diff --git a/src/score/tscoreactions.cpp b/src/score/tscoreactions.cpp index 0b72f8b4de2d5ebbb02333ec0c25b925e8f1bfc5..8bdd2993236d53e67ec1ff0f4f5176a663493c3e 100644 --- a/src/score/tscoreactions.cpp +++ b/src/score/tscoreactions.cpp @@ -28,7 +28,7 @@ TscoreActions::TscoreActions(TmainScore* sc) : QObject(sc), m_score(sc) { - m_menu = new Tmenu(sc); + m_menu = new Tmenu(sc->mainWindow()); m_button = new QToolButton(sc); m_button->setIcon(QIcon(Tpath::img("score"))); m_button->setText(tr("Score", "it could be 'notation', 'staff' or whatever is associated with that 'place to display musical notes' and this the name is quite short and looks well."));