Unstable #213

Merged
Swordfish90 merged 3 commits from unstable into master 2015-01-24 19:16:52 +01:00
Showing only changes of commit 54c52b230a - Show all commits

View File

@ -36,22 +36,25 @@ Tab{
anchors.fill: parent anchors.fill: parent
rows: 2 rows: 2
columns: 3 columns: 3
CheckBox{ Label{text: qsTr("Effects FPS")}
property int fps: checked ? slider.value : 0
onFpsChanged: appSettings.fps = fps
checked: appSettings.fps !== 0
text: qsTr("Effects FPS")
}
Slider{ Slider{
id: slider
Layout.fillWidth: true Layout.fillWidth: true
id: fpsSlider
onValueChanged: {
if (enabled) {
appSettings.fps = value !== 60 ? value + 1 : 0;
}
}
stepSize: 1 stepSize: 1
maximumValue: 60 enabled: false
minimumValue: 1 Component.onCompleted: {
enabled: appSettings.fps !== 0 minimumValue = 0;
value: appSettings.fps !== 0 ? appSettings.fps : 24 maximumValue = 60;
value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60;
enabled = true;
}
} }
SizedLabel { text: slider.value } SizedLabel{text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")}
Label{text: qsTr("Texture Quality")} Label{text: qsTr("Texture Quality")}
Slider{ Slider{
Layout.fillWidth: true Layout.fillWidth: true