Skip to content
Snippets Groups Projects
Commit 4da87b56 authored by SeeLook's avatar SeeLook
Browse files

Minor, hide scordature for non guitar, missing color dialog titles

parent 65a61f12
No related branches found
No related tags found
No related merge requests found
/** This file is part of Nootka (http://nootka.sf.net) * /** This file is part of Nootka (http://nootka.sf.net) *
* Copyright (C) 2017 by Tomasz Bojczuk (seelook@gmail.com) * * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */ * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9 import QtQuick 2.9
...@@ -118,7 +118,7 @@ Score { ...@@ -118,7 +118,7 @@ Score {
scordature.destroy() scordature.destroy()
scordature = null scordature = null
} }
if (GLOB.tuning.scordature && GLOB.instrument.type !== Tinstrument.BassGuitar) { if (GLOB.tuning.scordature && GLOB.instrument.isGuitar && GLOB.instrument.type !== Tinstrument.BassGuitar) {
var c = Qt.createComponent("qrc:/score/Scordature.qml") var c = Qt.createComponent("qrc:/score/Scordature.qml")
scordature = c.createObject(firstStaff) scordature = c.createObject(firstStaff)
firstStaff.scordSpace = scordature.height firstStaff.scordSpace = scordature.height
......
...@@ -177,7 +177,7 @@ Flickable { ...@@ -177,7 +177,7 @@ Flickable {
spacing: Noo.fontSize() spacing: Noo.fontSize()
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
Text { color: activPal.text; text: qsTr("color of a pointer on an instrument"); anchors.verticalCenter: parent.verticalCenter } Text { color: activPal.text; text: qsTr("color of a pointer on an instrument"); anchors.verticalCenter: parent.verticalCenter }
ColorButton { id: fingerColorButt; color: GLOB.fingerColor } ColorButton { id: fingerColorButt; color: GLOB.fingerColor; title: qsTr("color of a pointer on an instrument") }
} }
} }
Tile { Tile {
...@@ -185,7 +185,7 @@ Flickable { ...@@ -185,7 +185,7 @@ Flickable {
spacing: Noo.fontSize() spacing: Noo.fontSize()
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
Text { color: activPal.text; text: qsTr("color of a selection"); anchors.verticalCenter: parent.verticalCenter } Text { color: activPal.text; text: qsTr("color of a selection"); anchors.verticalCenter: parent.verticalCenter }
ColorButton { id: selectedColorButt; color: GLOB.selectedColor } ColorButton { id: selectedColorButt; color: GLOB.selectedColor; title: qsTr("color of a selection") }
} }
} }
Component.onCompleted: { // to avoid declaring every property signal in Tglobals.h Component.onCompleted: { // to avoid declaring every property signal in Tglobals.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment