sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-03-20 17:48:46 +00:00
Code Issues Releases Wiki Activity

Fix: issue when changing rasterization. Small cleanups.

Browse Source
This commit is contained in:
Filippo Scognamiglio 2014-12-20 18:05:30 +01:00
parent df76d83d4b
commit ebc2246901
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/qml/ApplicationSettings.qml
View File

@ -76,17 +76,8 @@ Item{
property int rasterization: no_rasterization property int rasterization: no_rasterization
ListModel{ property alias profiles_list: profileslist
id: framelist property int profiles_index: 0
ListElement{text: "No frame"; source: ""; reflections: false}
ListElement{text: "Simple white frame"; source: "./frames/WhiteSimpleFrame.qml"; reflections: true}
ListElement{text: "Rough black frame"; source: "./frames/BlackRoughFrame.qml"; reflections: true}
}
property string frame_source: frames_list.get(frames_index).source
property int frames_index: 1
property var frames_list: framelist
// FONTS ////////////////////////////////////////////////////////////////// // FONTS //////////////////////////////////////////////////////////////////
@ -121,7 +112,7 @@ Item{
if (name === fontlist.get(i).name) if (name === fontlist.get(i).name)
return i; return i;
} }
return undefined; return 0; // If the font is not available returns the first one.
} }
function incrementScaling(){ function incrementScaling(){
@ -158,8 +149,16 @@ Item{
property bool reflectionsAllowed: framelist.get(frames_index).reflections property bool reflectionsAllowed: framelist.get(frames_index).reflections
property bool frameReflections: _frameReflections && reflectionsAllowed property bool frameReflections: _frameReflections && reflectionsAllowed
property alias profiles_list: profileslist ListModel{
property int profiles_index: 0 id: framelist
ListElement{text: "No frame"; source: ""; reflections: false}
ListElement{text: "Simple white frame"; source: "./frames/WhiteSimpleFrame.qml"; reflections: true}
ListElement{text: "Rough black frame"; source: "./frames/BlackRoughFrame.qml"; reflections: true}
}
property string frame_source: frames_list.get(frames_index).source
property int frames_index: 1
property alias frames_list: framelist
// DB STORAGE ///////////////////////////////////////////////////////////// // DB STORAGE /////////////////////////////////////////////////////////////

19
app/qml/frames/NoFrame.qml
View File

@ -1,19 +0,0 @@
import QtQuick 2.2
import "utils"
TerminalFrame{
id: frame
z: 2.1
anchors.fill: parent
addedWidth: 0
addedHeight: 0
borderLeft: 0
borderRight: 0
borderTop: 0
borderBottom: 0
displacementLeft: 0
displacementTop: 0
displacementRight: 0
displacementBottom: 0
}

1
app/qml/resources.qrc
View File

@ -1,7 +1,6 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>frames/BlackRoughFrame.qml</file> <file>frames/BlackRoughFrame.qml</file>
<file>frames/NoFrame.qml</file>
<file>frames/images/black-frame.png</file> <file>frames/images/black-frame.png</file>
<file>frames/images/screen-frame-normals.png</file> <file>frames/images/screen-frame-normals.png</file>
<file>frames/images/black-frame-normals.png</file> <file>frames/images/black-frame-normals.png</file>