From 0a97476f586055d104f6c8b7e1c5c58c00ca54ce Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Wed, 6 Jan 2016 16:56:14 +0100
Subject: [PATCH] Default color of enharmonic notes/names is set properly and
approved when changed
---
TODO | 4 ++--
changes | 6 ++++++
src/mainwindow.cpp | 2 ++
src/score/tmainscore.cpp | 7 ++++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/TODO b/TODO
index c624a93e4..2a843e031 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,7 @@
Translations:
- remove <br> from some status strings (rangesettings.cpp, accidsettings.cpp)
+============================================================================
ANDROID:
- quick icons:
- disable sniffing/note by note when audio input is off
@@ -29,8 +30,7 @@ ANDROID:
- Help QTextBrowser has QScroller but it works only with two-touch move, but TlevelPreview works good
- HOME button would be switching available menus
- handle BACK button to destroy visible menu and/or prevent to close exam
-- alternate enharmonical names color is white by default in settings (when single note is unlocked)
- its change is not approved to score
+============================================================================
- TexamExecutor has many, many un-wrapped strings, many ""
- remove tanimedtextitem.cpp - probably unused
diff --git a/changes b/changes
index a975954d4..2f69daeb3 100644
--- a/changes
+++ b/changes
@@ -1,3 +1,9 @@
+1.2A.4 beta2
+ ANDROID
+ - added quick icon to clear score with single move
+ BUGS FIXES
+ - fixed crash when re-enabling input/output settings
+
1.2A.3 beta1
- added touch interface, adjusted GUI layout to it
ANDROID
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 831a624ce..a5302b476 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -344,6 +344,8 @@ void MainWindow::createSettingsDialog() {
#endif
pitchView->setVisible(gl->L->soundViewEnabled);
guitar->setVisible(gl->L->guitarEnabled);
+ if (gl->S->isSingleNoteMode) // refresh note name
+ noteName->setNoteName(noteName->getNoteName());
m_isPlayerFree = true;
} else if (lastWord.contains(QLatin1String("Reset"))) {
resetConfig = true;
diff --git a/src/score/tmainscore.cpp b/src/score/tmainscore.cpp
index 9f81ae85f..87a8c7ee9 100644
--- a/src/score/tmainscore.cpp
+++ b/src/score/tmainscore.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013-2015 by Tomasz Bojczuk *
+ * Copyright (C) 2013-2016 by Tomasz Bojczuk *
* tomaszbojczuk@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -115,6 +115,7 @@ void TmainScore::acceptSettings() {
refreshNoteNames = true;
if (Tcore::gl()->S->isSingleNoteMode) {
setInsertMode(e_single);
+ setEnableEnharmNotes(Tcore::gl()->S->showEnharmNotes);
} else
setInsertMode(e_multi);
// Double accidentals
@@ -866,8 +867,8 @@ void TmainScore::createActions() {
void TmainScore::restoreNotesSettings() {
-// if (Tcore::gl()->S->enharmNotesColor == -1)
-// Tcore::gl()->S->enharmNotesColor = palette().highlight().color();
+ if (Tcore::gl()->S->enharmNotesColor == -1)
+ Tcore::gl()->S->enharmNotesColor = QColor(0, 162, 162); // turquoise
// TscoreNote::setNameColor(Tcore::gl()->S->nameColor);
scoreScene()->right()->adjustSize();
if (Tcore::gl()->S->pointerColor == -1) {
--
GitLab