diff --git a/changes b/changes
index a763df2276d194b442e1500bff75626045e4eb12..3e890221e0a46602eef7581a915b74e050e4aaa2 100644
--- a/changes
+++ b/changes
@@ -1,12 +1,12 @@
1.1.5
- - added new tool button with menu for score
+ - 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
BUGS FIXES
- fixing bugs, mistakes and glitches...
Under the hood
- - external executable-s converted to plugins loaded on demand
- - audio device has single instance, the same for settings
+ - external executable-s converted to plugins, loaded on demand
+ - audio device has single instance shared with settings plugin as well
1.1.4 alpha
- exam tips are storing their position when moved by user
diff --git a/picts/score.png b/picts/score.png
index 6dedf25f2cf5789aac29e284d6efc232647271c1..67dca645cce49ca4c8efa0992eac59fa600ba7c8 100644
Binary files a/picts/score.png and b/picts/score.png differ
diff --git a/spare_parts/scalable/score.svg b/spare_parts/scalable/score.svg
index 12fce04db1ee17cb34b747dc1e23f310a057579e..17b44885d75b0a121f2b74e3c7972624bc35e060 100644
--- a/spare_parts/scalable/score.svg
+++ b/spare_parts/scalable/score.svg
@@ -1038,14 +1038,15 @@
</g>
<text
xml:space="preserve"
- style="font-size:5.1712532px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
- x="10.60619"
- y="7.1218686"
+ style="font-size:4.88205099px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="10.931304"
+ y="6.723578"
id="text3212"
sodipodi:linespacing="125%"
- transform="matrix(1,0,-0.37319065,1,0,0)"><tspan
+ transform="matrix(0.94407499,0,-0.35231996,1.0592379,0,0)"><tspan
sodipodi:role="line"
id="tspan3214"
- x="10.60619"
- y="7.1218686">Andante</tspan></text>
+ x="10.931304"
+ y="6.723578"
+ style="font-weight:bold;-inkscape-font-specification:Sans Bold">Andante</tspan></text>
</svg>
diff --git a/src/libs/core/score/tnotecontrol.cpp b/src/libs/core/score/tnotecontrol.cpp
index f5a245a099570691b545c71234edb8254cd2d2ca..353fd9ad8c3312bc2155ee459fdca41707f7f8e1 100644
--- a/src/libs/core/score/tnotecontrol.cpp
+++ b/src/libs/core/score/tnotecontrol.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2014 by Tomasz Bojczuk *
+ * Copyright (C) 2014-2015 by Tomasz Bojczuk *
* tomaszbojczuk@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -207,7 +207,7 @@ void TnoteControl::paint(QPainter* painter, const QStyleOptionGraphicsItem* opti
void TnoteControl::setScoreNote(TscoreNote* sn) {
m_scoreNote = sn;
if (sn) {
- if (parentItem() != sn->parentItem()) {
+ if (sn->parentItem() && parentItem() != sn->parentItem()) {
if (parentItem())
parentItem()->setZValue(10);
setParentItem(sn->parentItem());
diff --git a/src/libs/core/widgets/troundedlabel.cpp b/src/libs/core/widgets/troundedlabel.cpp
index 7a28b5f98f5f5b2ec9ad32ef89c8002665d92378..8016e9070b3a6449071286511c8f3d36c733b7eb 100644
--- a/src/libs/core/widgets/troundedlabel.cpp
+++ b/src/libs/core/widgets/troundedlabel.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 *
@@ -31,34 +31,34 @@ TroundedLabel::TroundedLabel(QWidget* parent) :
TroundedLabel::TroundedLabel(QString txt, QWidget* parent) :
QLabel(txt, parent)
{
- setContentsMargins(5, 5, 5 , 5);
+ setContentsMargins(2, 2, 2 , 2);
initBgColor();
}
void TroundedLabel::setStyleSheet(const QString& styleSheet) {
- QLabel::setStyleSheet(backgroundText() + styleSheet);
- m_styleText = styleSheet;
+ QLabel::setStyleSheet(backgroundText() + styleSheet);
+ m_styleText = styleSheet;
}
void TroundedLabel::setBackroundColor(const QColor &bgColor) {
- m_bgColor = bgColor;
- QLabel::setStyleSheet(backgroundText() + m_styleText);
+ m_bgColor = bgColor;
+ QLabel::setStyleSheet(backgroundText() + m_styleText);
}
void TroundedLabel::setDefaultBackground() {
- QString tmpStyle = m_styleText;
- initBgColor();
- setStyleSheet(tmpStyle);
+ QString tmpStyle = m_styleText;
+ initBgColor();
+ setStyleSheet(tmpStyle);
}
QString TroundedLabel::backgroundText() {
- return QString("background-color: rgba(%1, %2, %3, %4); border-radius: 10px; ")
- .arg(m_bgColor.red()).arg(m_bgColor.green()).arg(m_bgColor.blue()).arg(m_bgColor.alpha());
+ return QString("background-color: rgba(%1, %2, %3, %4); border-radius: 10px; ")
+ .arg(m_bgColor.red()).arg(m_bgColor.green()).arg(m_bgColor.blue()).arg(m_bgColor.alpha());
}
//######################################### PRIVATE ######################################################
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 22075633b8ffd824a33c7b7399806988edfa249a..78c485e33a956b11faa92f0cd12659f0db95f923 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -490,10 +490,14 @@ void MainWindow::restoreMessage() {
void MainWindow::messageSlot(const QString& msg) {
if (msg.isEmpty()) {
+// m_statLab->setDefaultBackground();
+// m_statLab->setStyleSheet("color: palette(text)");
setMessageBg(m_prevBg);
m_statLab->setText("<center>" + m_statusText + "</center>");
m_prevMsg = m_statusText;
} else {
+// m_statLab->setBackroundColor(palette().highlightedText().color());
+// m_statLab->setStyleSheet("color: palette(highlight)");
m_prevBg = m_curBG;
setMessageBg(-1);
m_statLab->setText("<center>" + msg + "</center>");
diff --git a/src/score/tscoreactions.cpp b/src/score/tscoreactions.cpp
index 99d07103b3246b28a01ead73dbe0338e7f8601c5..0b72f8b4de2d5ebbb02333ec0c25b925e8f1bfc5 100644
--- a/src/score/tscoreactions.cpp
+++ b/src/score/tscoreactions.cpp
@@ -49,7 +49,8 @@ TscoreActions::TscoreActions(TmainScore* sc) :
m_menu->addSeparator();
m_outZoom = createAction(tr("Zoom score out"), SLOT(zoomScoreSlot()), QKeySequence::ZoomOut, QIcon(Tpath::img("zoom-out")));
- m_inZoom = createAction(tr("Zoom score in"), SLOT(zoomScoreSlot()), QKeySequence::ZoomIn, QIcon(Tpath::img("zoom-in")));
+ m_inZoom = createAction(tr("Zoom score in"), SLOT(zoomScoreSlot()), QKeySequence(), QIcon(Tpath::img("zoom-in")));
+ m_inZoom->setShortcuts(QKeySequence::keyBindings(QKeySequence::ZoomIn));
m_menu->addSeparator();
m_prevNote = createAction(tr("Previous note"), SLOT(moveSelectedNote()), QKeySequence(Qt::Key_Left),
QIcon(sc->style()->standardIcon(QStyle::SP_ArrowBack)));
@@ -67,7 +68,8 @@ TscoreActions::TscoreActions(TmainScore* sc) :
QIcon(sc->style()->standardIcon(QStyle::SP_LineEditClearButton)));
m_menu->addSeparator();
- m_clear = createAction(tr("Delete all notes"), SLOT(deleteNotes()), QKeySequence("Shift+DEL"), QIcon(Tpath::img("clear-score")));
+ m_clear = createAction(tr("Delete all notes"), SLOT(deleteNotes()), QKeySequence("Shift+DEL"), QIcon(Tpath::img("clear-score")));
+ m_clear->setStatusTip(tr("Delete all notes from the score"));
}