diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index fdaf26a..24f8214 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -22,7 +22,7 @@ import QtQuick 2.2 import "utils.js" as Utils -Item{ +QtObject{ property string version: "0.9" // GENERAL SETTINGS /////////////////////////////////////////////////// @@ -76,7 +76,6 @@ Item{ property int rasterization: no_rasterization - property alias profiles_list: profileslist property int profiles_index: 0 // FONTS ////////////////////////////////////////////////////////////////// @@ -89,9 +88,7 @@ Item{ signal terminalFontChanged(string fontSource, int pixelSize, int lineSpacing, real screenScaling, real fontWidth) - Loader{ - id: fontManager - + property Loader fontManager: Loader{ states: [ State { when: rasterization == no_rasterization PropertyChanges {target: fontManager; source: "Fonts.qml" } }, @@ -146,11 +143,10 @@ Item{ // FRAMES ///////////////////////////////////////////////////////////////// property bool _frameReflections: false - property bool reflectionsAllowed: framelist.get(frames_index).reflections + property bool reflectionsAllowed: frames_list.get(frames_index).reflections property bool frameReflections: _frameReflections && reflectionsAllowed - ListModel{ - id: framelist + property ListModel frames_list: ListModel{ 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} @@ -158,11 +154,10 @@ Item{ property string frame_source: frames_list.get(frames_index).source property int frames_index: 1 - property alias frames_list: framelist // DB STORAGE ///////////////////////////////////////////////////////////// - Storage{id: storage} + property Storage storage: Storage{ } function stringify(obj) { var replacer = function(key, val) { @@ -314,8 +309,8 @@ Item{ function composeCustomProfilesString(){ var customProfiles = [] - for(var i=0; i