From 4ce7b0cadf29d6513d533d6e18e1b05e8af35d67 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Sun, 14 Dec 2014 19:13:19 +0100 Subject: [PATCH] Removed scanline quality settings. Was quite useless and confusing. --- app/qml/ApplicationSettings.qml | 5 ---- app/qml/PreprocessedTerminal.qml | 2 +- app/qml/SettingsPerformanceTab.qml | 41 ------------------------------ 3 files changed, 1 insertion(+), 47 deletions(-) diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 1bf23da..620836e 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -75,9 +75,6 @@ Item{ property int rasterization: no_rasterization - property int scanline_quality: 2 - onScanline_qualityChanged: handleFontChanged(); - ListModel{ id: framelist ListElement{text: "No frame"; source: "./frames/NoFrame.qml"; reflections: false} @@ -171,7 +168,6 @@ Item{ fontIndexes: fontIndexes, frameReflections: _frameReflections, showMenubar: showMenubar, - scanline_quality: scanline_quality, bloom_quality: bloom_quality } return stringify(settings); @@ -246,7 +242,6 @@ Item{ showMenubar = settings.showMenubar !== undefined ? settings.showMenubar : showMenubar; - scanline_quality = settings.scanline_quality !== undefined ? settings.scanline_quality : scanline_quality; bloom_quality = settings.bloom_quality !== undefined ? settings.bloom_quality : bloom_quality; } diff --git a/app/qml/PreprocessedTerminal.qml b/app/qml/PreprocessedTerminal.qml index 75f1925..ef8acf7 100644 --- a/app/qml/PreprocessedTerminal.qml +++ b/app/qml/PreprocessedTerminal.qml @@ -115,7 +115,7 @@ Item{ width = Qt.binding(function() {return Math.floor(terminalContainer.width / (screenScaling * fontWidth));}); height = Qt.binding(function() {return Math.floor(terminalContainer.height / screenScaling);}); - scaleTexture = Math.max(Math.round(screenScaling / appSettings.scanline_quality), 1.0); + scaleTexture = Math.max(1.0, Math.round(screenScaling / 2)); kterminal.lineSpacing = lineSpacing; } diff --git a/app/qml/SettingsPerformanceTab.qml b/app/qml/SettingsPerformanceTab.qml index 1d5b995..84b5748 100644 --- a/app/qml/SettingsPerformanceTab.qml +++ b/app/qml/SettingsPerformanceTab.qml @@ -62,47 +62,6 @@ Tab{ Text{text: Math.round(txtslider.value * 100) + "%"} } } - GroupBox{ - title: qsTr("Rasterization") - Layout.fillWidth: true - anchors.left: parent.left - anchors.right: parent.right - GridLayout{ - id: scanlineQualityContainer - anchors.fill: parent - columns: 3 - property alias valsIndex: scanlineQualitySlider.value - property var vals: [4,3,2] - property var valsStrings: [ - qsTr("Low"), - qsTr("Medium"), - qsTr("High") - ] - - onValsIndexChanged: appSettings.scanline_quality = vals[valsIndex]; - - Text{text: qsTr("Scanlines Quality")} - Slider{ - id: scanlineQualitySlider - Layout.fillWidth: true - onValueChanged: parent.valsIndex = value; - stepSize: 1 - Component.onCompleted: { - minimumValue = 0; - maximumValue = 2; - value = parent.vals.indexOf(appSettings.scanline_quality); - } - Connections{ - target: appSettings - onScanline_qualityChanged: - scanlineQualityContainer.valsIndex = scanlineQualityContainer.vals.indexOf(appSettings.scanline_quality); - } - } - Text{ - text: parent.valsStrings[parent.valsIndex]; - } - } - } GroupBox{ title: qsTr("Bloom") Layout.fillWidth: true