diff --git a/changes b/changes index 12dbb33d3348695c9bd2005c91547763bd789a46..aa5867727c0ccda0642d5fd99dd6ba0ca78dcf59 100644 --- a/changes +++ b/changes @@ -1,6 +1,7 @@ 1.5.2 alpha3 - extended grand staff, beaming notes on every staff separately - score supports bowing symbols, read them from XML + - all playing routines moved to separate thread - improved level creator 1.5.1 alpha2 diff --git a/src/qml/MainWindow.qml b/src/qml/MainWindow.qml index c26c133492d19e9f46597bb0005241d279b27353..01d058dfc77d7f1ab8b96a9c4d18ef076f7eed38 100644 --- a/src/qml/MainWindow.qml +++ b/src/qml/MainWindow.qml @@ -4,7 +4,6 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 -import QtQuick.Window 2.2 import Nootka 1.0 diff --git a/src/qml/shared/TpopupDialog.qml b/src/qml/shared/TpopupDialog.qml index 2e6e2b038668a4b0f12b1caf6266117fb32d4822..33ffe405b3d5ca6140ec62292d6e1d1c7c495c04 100644 --- a/src/qml/shared/TpopupDialog.qml +++ b/src/qml/shared/TpopupDialog.qml @@ -16,9 +16,9 @@ Dialog { width: parent.width * 0.8; height: parent.height * 0.8 x: (parent.width - width) / 2; y: (parent.height - height) / 2 background: TipRect { id: rect; color: activPal.window; shadowRadius: Noo.fontSize(); shadowColor: activPal.shadow } - scale: GLOB.useAnimations ? 0.1 : 1.0 + scale: GLOB.useAnimations ? 0 : 1.0 enter: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 1.0 }} - exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0.1 }} + exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0 }} // TdialogObject { id: dialogObj } diff --git a/src/qml/sound/TempoMenu.qml b/src/qml/sound/TempoMenu.qml index 716d1b2ff9a77405680f19fe94cb48068c615428..bdf2b0a27a3cfc337094e1aca5fb057d6463f555 100644 --- a/src/qml/sound/TempoMenu.qml +++ b/src/qml/sound/TempoMenu.qml @@ -16,6 +16,10 @@ Popup { background: TipRect { color: activPal.window; shadowRadius: Noo.fontSize() } + scale: GLOB.useAnimations ? 0 : 1.0 + enter: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 1.0 }} + exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0.0 }} + signal accepted() Column {