From ebc2246901eafbdf521585ba6ad59fb095f85599 Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Sat, 20 Dec 2014 18:05:30 +0100
Subject: [PATCH] Fix: issue when changing rasterization. Small cleanups.
---
app/qml/ApplicationSettings.qml | 27 +++++++++++++--------------
app/qml/frames/NoFrame.qml | 19 -------------------
app/qml/resources.qrc | 1 -
3 files changed, 13 insertions(+), 34 deletions(-)
delete mode 100644 app/qml/frames/NoFrame.qml
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 @@
<RCC>
<qresource prefix="/">
<file>frames/BlackRoughFrame.qml</file>
- <file>frames/NoFrame.qml</file>
<file>frames/images/black-frame.png</file>
<file>frames/images/screen-frame-normals.png</file>
<file>frames/images/black-frame-normals.png</file>