From 4934d78cea21925856d01a10f88398cf55fb0c6a Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Fri, 2 Jan 2015 21:46:59 +0100
Subject: [PATCH] Fix font names and default profiles.

---
 app/qml/ApplicationSettings.qml |  6 +++---
 app/qml/Fonts.qml               | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
index 5840d21..b7a3b67 100644
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -371,12 +371,12 @@ QtObject{
     property ListModel profilesList: ListModel{
         ListElement{
             text: "Default Amber"
-            obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.65,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"HERMIT","fontColor":"#ff8100","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.16,"jitter":0.18,"burnIn":0.4,"staticNoise":0.1,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0}'
+            obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.65,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"TERMINUS_SCALED","fontColor":"#ff8100","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.16,"jitter":0.18,"burnIn":0.4,"staticNoise":0.1,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0}'
             builtin: true
         }
         ListElement{
             text: "Default Green"
-            obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"HERMIT","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.16,"jitter":0.18,"burnIn":0.45,"staticNoise":0.1,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0}'
+            obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"TERMINUS_SCALED","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.16,"jitter":0.18,"burnIn":0.45,"staticNoise":0.1,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0}'
             builtin: true
         }
         ListElement{
@@ -411,7 +411,7 @@ QtObject{
         }
         ListElement{
             text: "Transparent Green"
-            obj_string: '{"ambientLight":0.2,"backgroundColor":"#000000","bloom":0.45,"brightness":0.5,"flickering":0.20,"contrast":0.85,"fontName":"HERMIT","fontColor":"#0ccc68","frameName":"NO_FRAME","glowingLine":0.16,"horizontalSync":0.1,"jitter":0.20,"burnIn":0.25,"staticNoise":0.20,"rasterization":0,"screenCurvature":0.05,"windowOpacity":0.60,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0}'
+            obj_string: '{"ambientLight":0.2,"backgroundColor":"#000000","bloom":0.45,"brightness":0.5,"flickering":0.20,"contrast":0.85,"fontName":"TERMINUS_SCALED","fontColor":"#0ccc68","frameName":"NO_FRAME","glowingLine":0.16,"horizontalSync":0.1,"jitter":0.20,"burnIn":0.25,"staticNoise":0.20,"rasterization":0,"screenCurvature":0.05,"windowOpacity":0.60,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0}'
             builtin: true
         }
     }
diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml
index 73fc095..a50ad57 100644
--- a/app/qml/Fonts.qml
+++ b/app/qml/Fonts.qml
@@ -142,7 +142,7 @@ QtObject{
         }
         ListElement{
             name: "HERMIT"
-            text: "Hermit (Modern) (HD)"
+            text: "HD: Hermit (Modern)"
             source: "fonts/modern-hermit/Hermit-medium.otf"
             lineSpacing: 0.05
             pixelSize: 28
@@ -151,7 +151,7 @@ QtObject{
         }
         ListElement{
             name: "TERMINUS"
-            text: "Terminus (Modern) (HD)"
+            text: "HD: Terminus (Modern)"
             source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf"
             lineSpacing: 0.1
             pixelSize: 35
@@ -160,7 +160,7 @@ QtObject{
         }
         ListElement{
             name: "PRO_FONT"
-            text: "Pro Font (Modern) (HD)"
+            text: "HD: Pro Font (Modern)"
             source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
             lineSpacing: 0.1
             pixelSize: 35
@@ -169,7 +169,7 @@ QtObject{
         }
         ListElement{
             name: "ENVY_CODE_R"
-            text: "Envy Code R (Modern) (HD)"
+            text: "HD: Envy Code R (Modern)"
             source: "fonts/modern-envy-code-r/Envy Code R.ttf"
             lineSpacing: 0.1
             pixelSize: 30
@@ -178,7 +178,7 @@ QtObject{
         }
         ListElement{
             name: "MONACO"
-            text: "Monaco (Modern) (HD)"
+            text: "HD: Monaco (Modern)"
             source: "fonts/modern-monaco/monaco.ttf"
             lineSpacing: 0.1
             pixelSize: 30
@@ -187,7 +187,7 @@ QtObject{
         }
         ListElement{
             name: "INCONSOLATA"
-            text: "Inconsolata (Modern) (HD)"
+            text: "HD: Inconsolata (Modern)"
             source: "fonts/modern-inconsolata/Inconsolata.otf"
             lineSpacing: 0.1
             pixelSize: 35
@@ -196,7 +196,7 @@ QtObject{
         }
         ListElement{
             name: "IBM_3278"
-            text: "IBM 3278 (1971) (HD)"
+            text: "HD: IBM 3278 (1971)"
             source: "fonts/1971-ibm-3278/3270Medium.ttf"
             lineSpacing: 0.2
             pixelSize: 32