From 58fb37341c05271b2ad332851a22cc19f7a3f21a Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Sat, 17 Jan 2015 11:15:25 +0100
Subject: [PATCH] Fixed score menu parent, cleaned TmultiScore
---
changes | 1 +
src/libs/core/score/tsimplescore.cpp | 10 +++++++---
src/score/tscoreactions.cpp | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/changes b/changes
index 3e890221e..24c235f66 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 bb2dcdc10..a0615bd3c 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 0b72f8b4d..8bdd29932 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."));
--
GitLab