Skip to content
Snippets Groups Projects
Commit 338feb7d authored by SeeLook's avatar SeeLook
Browse files

Locking unused options in accid settings of level creator

parent fee60cc5
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
Nootka plays melodies
- updated on-line help
- unlocked help button(s) to opening related help sites
- improved displaying accidentals and neutrals in melodies
BUGS FIXES
- fixed melody chart tip - correctly displays every attempt summary
- fixed and improved animations of accidentals from note to key signature
......
/***************************************************************************
* Copyright (C) 2012-2014 by Tomasz Bojczuk *
* Copyright (C) 2012-2015 by Tomasz Bojczuk *
* tomaszbojczuk@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -29,7 +29,6 @@ accidSettings::accidSettings(TlevelCreatorDlg* creator) :
QVBoxLayout *mainLay = new QVBoxLayout;
mainLay->setAlignment(Qt::AlignHCenter);
QVBoxLayout *accLay = new QVBoxLayout;
m_sharpsChB = new QCheckBox(tr("# - sharps"),this);
m_sharpsChB->setStatusTip(tr("Sharps will be used in questions and answers.<br>It has to be checked, if keys with sharps are used."));
......@@ -118,7 +117,6 @@ accidSettings::accidSettings(TlevelCreatorDlg* creator) :
connect(m_toKeyCombo, SIGNAL(activated(int)), this, SLOT(whenParamsChanged()));
connect(m_keyInAnswerChB, SIGNAL(clicked()), this, SLOT(whenParamsChanged()));
connect(m_currKeySignChBox, SIGNAL(clicked()), this, SLOT(whenParamsChanged()));
}
......@@ -141,6 +139,7 @@ void accidSettings::loadLevel (Tlevel* level) {
m_keyInAnswerChB->setChecked(level->manualKey);
m_currKeySignChBox->setChecked(level->onlyCurrKey);
keyRangeChanged();
changed();
saveLevel(wLevel());
blockSignals(false);
}
......@@ -156,7 +155,7 @@ void accidSettings::saveLevel (Tlevel* level) {
level->withFlats = false;
level->withDblAcc = false;
}
level->forceAccids = m_forceAccChB->isChecked();
level->forceAccids = m_forceAccChB->isEnabled() && m_forceAccChB->isChecked();
if (m_keySignGr->isEnabled()) {
level->useKeySign = m_keySignGr->isChecked();
if (m_singleKeyRadio->isChecked()) {
......@@ -179,7 +178,7 @@ void accidSettings::saveLevel (Tlevel* level) {
level->hiKey = m_toKeyCombo->getKeySignature();
}
}
level->manualKey = m_keyInAnswerChB->isChecked();
level->manualKey = m_keyInAnswerChB->isEnabled() && m_keyInAnswerChB->isChecked();
} else {
level->useKeySign = false;
level->manualKey = false;
......@@ -191,16 +190,16 @@ void accidSettings::saveLevel (Tlevel* level) {
void accidSettings::changed() {
blockSignals(true);
// TODO: Is disabling whole accidentals box really necessary?
if (wLevel()->canBeScore())
enableKeys(true);
else
enableKeys(false);
if ((wLevel()->canBeScore() || wLevel()->canBeName()) &&
if ((wLevel()->answerIsNote() || wLevel()->answerIsName()) &&
(wLevel()->withDblAcc || wLevel()->withFlats || wLevel()->withSharps))
m_forceAccChB->setDisabled(false);
else
m_forceAccChB->setDisabled(true);
m_keyInAnswerChB->setDisabled(!wLevel()->answerIsNote()); // disable manual key check box if no score as an answer
blockSignals(false);
}
......@@ -324,13 +323,14 @@ void accidSettings::keySignChanged() {
blockSignals(false);
}
void accidSettings::whenParamsChanged() {
changedLocal();
}
void accidSettings::updateStatusTip() {
setStatusTip("<b>" + tr("Elements are disabled because appropriate types of questions or answers are not selected.")
+ "</b>");
setStatusTip("<b>" + tr("Elements are disabled because appropriate types of questions or answers are not selected.") + "</b>");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment