1 From 96ceffdfdcedd3ae33c46b11357aa2518e0a6152 Mon Sep 17 00:00:00 2001
2 From: Petter <petter@mykolab.ch>
3 Date: Thu, 27 Apr 2017 18:55:10 +0200
4 Subject: [PATCH] Remove non-free fonts from settings menu
6 --- a/app/qml/ApplicationSettings.qml
7 +++ b/app/qml/ApplicationSettings.qml
9 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,"useCustomCommand":false,"customCommand":""}'
14 text: "Default Scanlines"
15 obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"COMMODORE_PET","fontColor":"#00ff5b","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.14,"jitter":0.11,"burnIn":0.4,"staticNoise":0.05,"rasterization":1,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
19 obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.07,"contrast":0.85,"fontName":"IBM_DOS","fontColor":"#ffffff","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.13,"horizontalSync":0,"jitter":0.16,"burnIn":0.3,"staticNoise":0.03,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":1,"saturationColor":0,"rbgShift":0.35,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
25 obj_string: '{"ambientLight":0.1,"backgroundColor":"#000000","bloom":0.15,"brightness":0.5,"flickering":0,"contrast":0.85,"fontName":"IBM_3278","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0,"horizontalSync":0,"jitter":0,"burnIn":0.6,"staticNoise":0,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
26 diff --git a/app/qml/FontPixels.qml b/app/qml/FontPixels.qml
27 index 6ff85da..6f0d0ba 100644
28 --- a/app/qml/FontPixels.qml
29 +++ b/app/qml/FontPixels.qml
30 @@ -32,7 +32,7 @@ QtObject{
31 property bool lowResolutionFont: true
33 property ListModel fontlist: ListModel{
37 text: "Commodore PET (1977)"
38 source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
39 @@ -40,7 +40,7 @@ QtObject{
47 text: "Proggy Tiny (Modern)"
48 @@ -68,7 +68,7 @@ QtObject{
55 text: "Apple ][ (1977)"
56 source: "fonts/1977-apple2/PrintChar21.ttf"
57 @@ -76,8 +76,8 @@ QtObject{
66 text: "Atari 400-800 (1979)"
67 source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
68 @@ -85,8 +85,8 @@ QtObject{
77 text: "Commodore 64 (1982)"
78 source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf"
79 @@ -94,6 +94,6 @@ QtObject{
87 diff --git a/app/qml/FontScanlines.qml b/app/qml/FontScanlines.qml
88 index eebf00b..410d7b6 100644
89 --- a/app/qml/FontScanlines.qml
90 +++ b/app/qml/FontScanlines.qml
91 @@ -32,7 +32,7 @@ QtObject{
92 property bool lowResolutionFont: true
94 property ListModel fontlist: ListModel{
98 text: "Commodore PET (1977)"
99 source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
100 @@ -40,7 +40,7 @@ QtObject{
108 text: "Proggy Tiny (Modern)"
109 @@ -68,7 +68,7 @@ QtObject{
116 text: "Apple ][ (1977)"
117 source: "fonts/1977-apple2/PrintChar21.ttf"
118 @@ -76,8 +76,8 @@ QtObject{
127 text: "Atari 400-800 (1979)"
128 source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
129 @@ -85,8 +85,8 @@ QtObject{
138 text: "Commodore 64 (1982)"
139 source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf"
140 @@ -94,6 +94,6 @@ QtObject{
148 diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml
149 index ad20844..882808a 100644
150 --- a/app/qml/Fonts.qml
151 +++ b/app/qml/Fonts.qml
154 lowResolutionFont: true
158 name: "COMMODORE_PET_SCALED"
159 text: "Commodore PET (1977)"
160 source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
164 lowResolutionFont: true
168 name: "PROGGY_TINY_SCALED"
169 text: "Proggy Tiny (Modern)"
172 lowResolutionFont: true
176 name: "APPLE_II_SCALED"
177 text: "Apple ][ (1977)"
178 source: "fonts/1977-apple2/PrintChar21.ttf"
182 lowResolutionFont: true
187 text: "HD: Hermit (Modern)"
190 lowResolutionFont: false
195 text: "HD: Monaco (Modern)"
196 source: "fonts/modern-monaco/monaco.ttf"
200 lowResolutionFont: false
205 text: "HD: Inconsolata (Modern)"