diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 430a5d8..fdaf26a 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -76,17 +76,8 @@ Item{ property int rasterization: no_rasterization - ListModel{ - 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 var frames_list: framelist - + property alias profiles_list: profileslist + property int profiles_index: 0 // FONTS ////////////////////////////////////////////////////////////////// @@ -121,7 +112,7 @@ Item{ if (name === fontlist.get(i).name) return i; } - return undefined; + return 0; // If the font is not available returns the first one. } function incrementScaling(){ @@ -158,8 +149,16 @@ Item{ property bool reflectionsAllowed: framelist.get(frames_index).reflections property bool frameReflections: _frameReflections && reflectionsAllowed - property alias profiles_list: profileslist - property int profiles_index: 0 + ListModel{ + 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 ///////////////////////////////////////////////////////////// diff --git a/app/qml/frames/NoFrame.qml b/app/qml/frames/NoFrame.qml deleted file mode 100644 index e594158..0000000 --- a/app/qml/frames/NoFrame.qml +++ /dev/null @@ -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 -} diff --git a/app/qml/resources.qrc b/app/qml/resources.qrc index 1ed86d2..ad780c5 100644 --- a/app/qml/resources.qrc +++ b/app/qml/resources.qrc @@ -1,7 +1,6 @@ frames/BlackRoughFrame.qml - frames/NoFrame.qml frames/images/black-frame.png frames/images/screen-frame-normals.png frames/images/black-frame-normals.png