From b25a3f6a4fe984793e1d5577d68ac89710000927 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Wed, 25 Dec 2013 19:08:03 +0100 Subject: [PATCH] Addeded the possibility to remove the frame --- cool-old-term.pro | 3 ++- qml/cool-old-term/ShaderSettings.qml | 2 +- qml/cool-old-term/frames/NoFrame.qml | 18 ++++++++++++++++++ qml/cool-old-term/main.qml | 5 ++--- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 qml/cool-old-term/frames/NoFrame.qml diff --git a/cool-old-term.pro b/cool-old-term.pro index f1dbee1..289a9ff 100644 --- a/cool-old-term.pro +++ b/cool-old-term.pro @@ -45,4 +45,5 @@ OTHER_FILES += \ qml/cool-old-term/frames/images/screen-frame.png \ qml/cool-old-term/frames/images/screen-frame-normals.png \ qml/cool-old-term/frames/images/black-frame.png \ - qml/cool-old-term/frames/images/black-frame-normals.png + qml/cool-old-term/frames/images/black-frame-normals.png \ + qml/cool-old-term/frames/NoFrame.qml diff --git a/qml/cool-old-term/ShaderSettings.qml b/qml/cool-old-term/ShaderSettings.qml index a08893b..28aa6b5 100644 --- a/qml/cool-old-term/ShaderSettings.qml +++ b/qml/cool-old-term/ShaderSettings.qml @@ -8,7 +8,7 @@ Item{ property real brightness_flickering: 0.2 property real noise_strength: 0.1 - property real screen_distortion: 0.15 + property real screen_distortion: 0.0 property real glowing_line_strength: 0.4 //property real faulty_screen_prob: 1.0 diff --git a/qml/cool-old-term/frames/NoFrame.qml b/qml/cool-old-term/frames/NoFrame.qml new file mode 100644 index 0000000..de48a1c --- /dev/null +++ b/qml/cool-old-term/frames/NoFrame.qml @@ -0,0 +1,18 @@ +import QtQuick 2.0 +import "utils" + +TerminalFrame{ + id: frame + z: 2.1 + anchors.fill: parent + addedWidth: 190 + addedHeight: 190 + borderLeft: 116 + borderRight: 116 + borderTop: 116 + borderBottom: 116 + imageSource: "../images/screen-frame.png" + sourceRect: Qt.rect(-65, -75, terminal.width + 130, terminal.height + 150) + + shaderString: "NoFrameShader.qml" +} diff --git a/qml/cool-old-term/main.qml b/qml/cool-old-term/main.qml index 792442c..d2791e0 100644 --- a/qml/cool-old-term/main.qml +++ b/qml/cool-old-term/main.qml @@ -191,13 +191,12 @@ ApplicationWindow{ } Loader{ - property rect sourceRect + property rect sourceRect: item.sourceRect id: frame anchors.fill: parent z: 2.1 - source: "./frames/WhiteSimpleFrame.qml" - onLoaded: sourceRect = item.sourceRect; + source: "./frames/NoFrame.qml" } TerminalScreen {