From 13377ba4e782843f76e8c6ba1066dd45de68a5c3 Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Thu, 20 Mar 2014 15:31:23 +0100
Subject: [PATCH] Fix: fonts are now working

---
 app/ShaderSettings.qml |  8 ++++----
 app/TerminalWindow.qml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/ShaderSettings.qml b/app/ShaderSettings.qml
index 0840ad2..a15a156 100644
--- a/app/ShaderSettings.qml
+++ b/app/ShaderSettings.qml
@@ -39,7 +39,7 @@ Item{
     property int frames_index: 2
     property var frames_list: framelist
 
-    property real font_scaling: 1.0
+    property real font_scaling: 0.7
     property var font: currentfont
     property real fontSize: currentfont.pixelSize * font_scaling
     property int font_index: 0
@@ -79,17 +79,17 @@ Item{
         }
         ListElement{
             text: "Atari 8bit (1979)"
-            source: "./fonts/Atari8bit/ATARI400800_original.TTF"
+            source: "fonts/Atari8bit/ATARI400800_original.TTF"
             pixelSize: 20
         }
         ListElement{
             text: "Commodore 64 (1982)"
-            source: "./fonts/Commodore64/C64_User_Mono_v1.0-STYLE.ttf"
+            source: "fonts/Commodore64/C64_User_Mono_v1.0-STYLE.ttf"
             pixelSize: 20
         }
         ListElement{
             text: "IBM DOS (1985)"
-            source: "./fonts/Dos/Perfect DOS VGA 437.ttf"
+            source: "fonts/Dos/Perfect DOS VGA 437.ttf"
             pixelSize: 32
         }
     }
diff --git a/app/TerminalWindow.qml b/app/TerminalWindow.qml
index 8b5db42..4492332 100644
--- a/app/TerminalWindow.qml
+++ b/app/TerminalWindow.qml
@@ -99,8 +99,8 @@ ApplicationWindow{
         KTerminal {
             id: terminal
 
-            font.pointSize: 15
-            font.family: "Pet Me"
+            font.pointSize: shadersettings.fontSize
+            font.family: shadersettings.font.name
 
             colorScheme: "WhiteOnBlack"
             width:  parent.width
@@ -116,9 +116,9 @@ ApplicationWindow{
             }
 
             Component.onCompleted: {
-                font.pointSize = 15;
-                font.family = "Pet Me";
-
+                font.pointSize = shadersettings.fontSize;
+                font.family = shadersettings.font.name;
+                console.log(shadersettings.font.name);
             }
         }