Ooops... Forgot to add one file to git..

This commit is contained in:
Filippo Scognamiglio 2014-06-24 11:34:33 +02:00
parent b0aad13ba7
commit 9795b5d9d2
3 changed files with 106 additions and 6 deletions

100
app/SettingsTerminalTab.qml Normal file
View File

@ -0,0 +1,100 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
Tab{
ColumnLayout{
anchors.fill: parent
GroupBox{
title: qsTr("Rasterization Mode")
Layout.fillWidth: true
ComboBox {
id: rasterizationBox
anchors.fill: parent
model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")]
currentIndex: shadersettings.rasterization
onCurrentIndexChanged: shadersettings.rasterization = currentIndex
}
}
GroupBox{
title: qsTr("Font")
Layout.fillWidth: true
GridLayout{
anchors.fill: parent
columns: 2
Text{ text: qsTr("Name") }
ComboBox{
id: fontChanged
Layout.fillWidth: true
model: shadersettings.fontlist
currentIndex: shadersettings.fontIndexes[shadersettings.rasterization]
onCurrentIndexChanged: {
shadersettings.fontIndexes[shadersettings.rasterization] = currentIndex;
shadersettings.handleFontChanged();
}
}
Text{ text: qsTr("Scaling") }
RowLayout{
Layout.fillWidth: true
Slider{
id: scalingChanger
Layout.fillWidth: true
minimumValue: 0
maximumValue: shadersettings.fontScalingList.length - 1
stepSize: 1
value: shadersettings.fontScalingIndexes[shadersettings.rasterization]
onValueChanged: {
shadersettings.fontScalingIndexes[shadersettings.rasterization] = value;
console.log(shadersettings.fontScalingIndexes);
shadersettings.handleFontChanged();
}
}
Text{
text: shadersettings.fontScalingList[scalingChanger.value].toFixed(2)
}
}
}
}
GroupBox{
title: qsTr("Colors")
Layout.fillWidth: true
RowLayout{
anchors.fill: parent
ColorButton{
name: qsTr("Font")
height: 50
Layout.fillWidth: true
onButton_colorChanged: shadersettings._font_color = button_color
button_color: shadersettings._font_color
}
ColorButton{
name: qsTr("Background")
height: 50
Layout.fillWidth: true
onButton_colorChanged: shadersettings._background_color = button_color
button_color: shadersettings._background_color
}
}
}
GroupBox{
title: qsTr("Frame")
Layout.fillWidth: true
RowLayout{
anchors.fill: parent
ComboBox{
id: framescombobox
Layout.fillWidth: true
model: shadersettings.frames_list
currentIndex: shadersettings.frames_index
onCurrentIndexChanged: shadersettings.frames_index = currentIndex
}
CheckBox{
checked: shadersettings.frame_reflections
text: qsTr("Reflections")
onCheckedChanged: shadersettings.frame_reflections = checked
enabled: framescombobox.model.get(framescombobox.currentIndex).reflections
}
}
}
}
}

View File

@ -102,19 +102,19 @@ Item{
property size paintedSize
property size virtualCharSize
id: currentfont
source: fontlist.get(fontIndex).source
}
property var fontlist: fontManager.item.fontlist
property var fontScalingList: fontManager.item.fontScalingList
property alias font: currentfont
property int fontIndex: 0
property int fontScalingIndex: 0
onFontIndexChanged: {fontManager.item.selectedFontIndex = fontIndex; handleFontChanged()}
onFontScalingIndexChanged: {fontManager.item.selectedScalingIndex = fontScalingIndex; handleFontChanged()}
property var fontIndexes: [0,1,1]
property var fontScalingIndexes: [5,1,1]
function handleFontChanged(){
if(!fontManager.item) return;
fontManager.item.selectedFontIndex = fontIndexes[rasterization];
fontManager.item.selectedScalingIndex = fontScalingIndexes[rasterization];
currentfont.source = fontManager.item.source;
currentfont.pixelSize = fontManager.item.pixelSize;
currentfont.lineSpacing = fontManager.item.lineSpacing;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.0.1, 2014-06-23T18:33:18. -->
<!-- Written by QtCreator 3.0.1, 2014-06-24T10:46:32. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>