Merge pull request #213 from Swordfish90/unstable

Mege latest changes for final version.

README.md

@@ -4,14 +4,14 @@
 cool-retro-term is a terminal emulator which mimics the look and feel of the old cathode tube screens.
 It has been designed to be eye-candy, customizable, and reasonably lightweight.
 
-It uses the QML port of qtermwidget (Konsole) developed by me: https://github.com/Swordfish90/qmltermwidget
+It uses the QML port of qtermwidget (Konsole) developed by me: https://github.com/Swordfish90/qmltermwidget .
 
-This terminal emulator requires Qt 5.2 or higher to run.
+This terminal emulator works under Linux and OSX and requires Qt 5.2 or higher.
 
 ##Screenshots
-![Image](<http://i.imgur.com/NUfvnlu.png>)
-![Image](<http://i.imgur.com/4LpfLF8.png>)
-![Image](<http://i.imgur.com/MMmM6Ht.png>)
+![Image](<http://i.imgur.com/I6wq1cC.png>)
+![Image](<http://i.imgur.com/12EqlpL.png>)
+![Image](<http://i.imgur.com/Lx0acQz.jpg>)
 
 ##Get cool-retro-term
 You can either build cool-retro-term yourself (see below) or walk the easy way and install one of these packages:
@@ -31,6 +31,10 @@ Gentoo users can install from a 3rd-party repository preferably via layman:
 
 A word of warning: USE flags and keywords are to be added to portage's configuration files and every emerge operation should be executed with '-p' (short option for --pretend) appended to the command line first as per best practice!
 
+Ubuntu users of 14.04 LTS (Trusty) can use [this PPA](https://launchpad.net/~bugs-launchpad-net-falkensweb)
+
+OSX users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases
+
 ##Build instructions (Linux)
 
 ##Dependencies

app/app.pro

@@ -20,3 +20,17 @@ RESOURCES += qml/resources.qrc
 target.path += /usr/bin/
 
 INSTALLS += target
+
+# Install icons
+unix {
+    icon32.files = icons/32x32/cool-retro-term.png
+    icon32.path = /usr/share/icons/hicolor/32x32/apps
+    icon64.files = icons/64x64/cool-retro-term.png
+    icon64.path = /usr/share/icons/hicolor/64x64/apps
+    icon128.files = icons/128x128/cool-retro-term.png
+    icon128.path = /usr/share/icons/hicolor/128x128/apps
+    icon256.files = icons/256x256/cool-retro-term.png
+    icon256.path = /usr/share/icons/hicolor/256x256/apps
+
+    INSTALLS += icon32 icon64 icon128 icon256
+}

app/main.cpp

@@ -5,6 +5,7 @@
 #include <QStringList>
 
 #include <QtWidgets/QApplication>
+#include <QIcon>
 
 #include <QDebug>
 #include <stdlib.h>
@@ -24,11 +25,26 @@ QString getNamedArgument(QStringList args, QString name)
 
 int main(int argc, char *argv[])
 {
+    // Some environmental variable are necessary on certain platforms.
+
+    // This disables QT appmenu under Ubuntu, which is not working with QML apps.
     setenv("QT_QPA_PLATFORMTHEME", "", 1);
+
+#if defined(Q_OS_MAC)
+    // This allows UTF-8 characters usage in OSX.
+    setenv("LC_CTYPE", "UTF-8", 1);
+#endif
+
     QApplication app(argc, argv);
     QQmlApplicationEngine engine;
     FileIO fileIO;
 
+#if !defined(Q_OS_MAC)
+    app.setWindowIcon(QIcon::fromTheme("cool-retro-term", QIcon(":../icons/32x32/cool-retro-term.png")));
+#else
+    app.setWindowIcon(QIcon(":../icons/32x32/cool-retro-term.png"));
+#endif
+
     // Manage command line arguments from the cpp side
     QStringList args = app.arguments();
     if (args.contains("-h") || args.contains("--help")) {
@@ -56,10 +72,13 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("workdir", getNamedArgument(args, "--workdir", "$HOME"));
     engine.rootContext()->setContextProperty("fileIO", &fileIO);
 
+    engine.rootContext()->setContextProperty("devicePixelRatio", app.devicePixelRatio());
+
     // Manage import paths for Linux and OSX.
     QStringList importPathList = engine.importPathList();
     importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget");
     importPathList.prepend(QCoreApplication::applicationDirPath() + "/../PlugIns");
+    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../../../qmltermwidget");
     engine.setImportPathList(importPathList);
 
     engine.load(QUrl("qrc:/main.qml"));

app/qml/ApplicationSettings.qml

@@ -19,13 +19,19 @@
 *******************************************************************************/
 
 import QtQuick 2.2
+import QtQuick.Controls 1.0
 
 import "utils.js" as Utils
 
 QtObject{
-    property string version: "1.0.0 RC1"
+    property string version: "1.0.0"
 
-    // GENERAL SETTINGS ///////////////////////////////////////////////////
+    // STATIC CONSTANTS ////////////////////////////////////////////////////////
+
+    readonly property real minimumFontScaling: 0.25
+    readonly property real maximumFontScaling: 2.50
+
+    // GENERAL SETTINGS ///////////////////////////////////////////////////////
 
     property bool fullscreen: false
     property bool showMenubar: true
@@ -81,7 +87,9 @@ QtObject{
     property real fontScaling: 1.0
     property real fontWidth: 1.0
 
-    property var fontNames: ["HERMIT", "COMMODORE_PET", "COMMODORE_PET"]
+    property bool lowResolutionFont: false
+
+    property var fontNames: ["TERMINUS_SCALED", "COMMODORE_PET", "COMMODORE_PET"]
     property var fontlist: fontManager.item.fontlist
 
     signal terminalFontChanged(string fontSource, int pixelSize, int lineSpacing, real screenScaling, real fontWidth)
@@ -111,12 +119,12 @@ QtObject{
     }
 
     function incrementScaling(){
-        fontScaling = Math.min(fontScaling + 0.05, 2.50);
+        fontScaling = Math.min(fontScaling + 0.05, maximumFontScaling);
         handleFontChanged();
     }
 
     function decrementScaling(){
-        fontScaling = Math.max(fontScaling - 0.05, 0.50);
+        fontScaling = Math.max(fontScaling - 0.05, minimumFontScaling);
         handleFontChanged();
     }
 
@@ -135,6 +143,8 @@ QtObject{
         var screenScaling = fontManager.item.screenScaling;
         var fontWidth = fontManager.item.defaultFontWidth * appSettings.fontWidth;
 
+        lowResolutionFont = fontManager.item.lowResolutionFont;
+
         terminalFontChanged(fontSource, pixelSize, lineSpacing, screenScaling, fontWidth);
     }
 
@@ -367,12 +377,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{
@@ -407,7 +417,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
         }
     }
@@ -451,4 +461,11 @@ QtObject{
         storeCustomProfiles();
         //storage.dropSettings(); //DROPS THE SETTINGS!.. REMEMBER TO DISABLE ONCE ENABLED!!
     }
+
+    // VARS ///////////////////////////////////////////////////////////////////
+
+    property Label _sampleLabel: Label {
+        text: "100%"
+    }
+    property real labelWidth: _sampleLabel.width
 }

app/qml/CheckableSlider.qml

@@ -22,6 +22,8 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
+import "Components"
+
 RowLayout {
     property alias name: check.text
 
@@ -35,7 +37,6 @@ RowLayout {
     id: setting_component
     anchors.left: parent.left
     anchors.right: parent.right
-    spacing: 25
 
     onValueChanged: {
         check.checked = !(value == 0);
@@ -45,7 +46,7 @@ RowLayout {
 
     CheckBox{
         id: check
-        implicitWidth: 150
+        implicitWidth: 160
         onClicked: {
             if(!checked){
                 checked = false;
@@ -66,16 +67,8 @@ RowLayout {
             newValue(value);
         }
     }
-    Text{
-        id: textfield
-        property string unformattedText: Math.round(((value - min_value) / (max_value - min_value)) * 100)
-        text: formatNumber(unformattedText)
-    }
-    function formatNumber(num) {
-        var n = "" + num;
-        while (n.length < 3) {
-            n = " " + n;
-        }
-        return n + "%";
+    SizedLabel {
+        anchors { top: parent.top; bottom: parent.bottom }
+        text: Math.round(((value - min_value) / (max_value - min_value)) * 100) + "%"
     }
 }

app/qml/ColorButton.qml

@@ -22,8 +22,10 @@ import QtQuick 2.2
 import QtQuick.Dialogs 1.1
 
 Item {
+    id: rootItem
+
     signal colorSelected (color color)
-    property color button_color
+    property color color
     property string name
 
     ColorDialog {
@@ -33,13 +35,13 @@ Item {
         visible: false
 
         //This is a workaround to a Qt 5.2 bug.
-        onCurrentColorChanged: colorDialog.color = colorDialog.currentColor;
-        onAccepted: colorSelected(color)
+        onColorChanged: if (Qt.platform.os !== "osx") colorSelected(color)
+        onAccepted: if (Qt.platform.os === "osx") colorSelected(color)
     }
     Rectangle{
         anchors.fill: parent
         radius: 10
-        color: button_color
+        color: rootItem.color
         border.color: "black"
         Glossy {}
         Rectangle {
@@ -52,7 +54,7 @@ Item {
         Text{
             anchors.centerIn: parent
             z: parent.z + 1
-            text: name + ":  " + button_color
+            text: name + ":  " + rootItem.color
         }
     }
     MouseArea{

app/qml/Components/SizedLabel.qml

@@ -0,0 +1,35 @@
+/*******************************************************************************
+* Copyright (c) 2013 "Filippo Scognamiglio"
+* https://github.com/Swordfish90/cool-retro-term
+*
+* This file is part of cool-retro-term.
+*
+* cool-retro-term is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+
+import QtQuick 2.0
+import QtQuick.Controls 1.0
+
+// This component is simply a label with a predifined size.
+// Used to improve alignment.
+
+Item {
+    property alias text: textfield.text
+    width: appSettings.labelWidth
+    Label{
+        id: textfield
+        anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+    }
+}

app/qml/FontPixels.qml

@@ -29,6 +29,7 @@ QtObject{
     property int lineSpacing: _font.lineSpacing
     property real screenScaling: scaling * _font.baseScaling
     property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
+    property bool lowResolutionFont: true
 
     property ListModel fontlist: ListModel{
         ListElement{
@@ -49,6 +50,24 @@ QtObject{
             baseScaling: 4.0
             fontWidth: 0.9
         }
+        ListElement{
+            name: "TERMINUS_SCALED"
+            text: "Terminus (Modern)"
+            source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf"
+            lineSpacing: 1
+            pixelSize: 12
+            baseScaling: 3.0
+            fontWidth: 1.0
+        }
+        ListElement{
+            name: "PRO_FONT_SCALED"
+            text: "Pro Font (Modern)"
+            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
+            lineSpacing: 1
+            pixelSize: 12
+            baseScaling: 3.0
+            fontWidth: 1.0
+        }
         ListElement{
             name: "APPLE_II"
             text: "Apple ][ (1977)"

app/qml/FontScanlines.qml

@@ -29,6 +29,7 @@ QtObject{
     property int lineSpacing: _font.lineSpacing
     property real screenScaling: scaling * _font.baseScaling
     property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
+    property bool lowResolutionFont: true
 
     property ListModel fontlist: ListModel{
         ListElement{
@@ -49,6 +50,24 @@ QtObject{
             baseScaling: 4.0
             fontWidth: 0.9
         }
+        ListElement{
+            name: "TERMINUS_SCALED"
+            text: "Terminus (Modern)"
+            source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf"
+            lineSpacing: 1
+            pixelSize: 12
+            baseScaling: 3.0
+            fontWidth: 1.0
+        }
+        ListElement{
+            name: "PRO_FONT_SCALED"
+            text: "Pro Font (Modern)"
+            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
+            lineSpacing: 1
+            pixelSize: 12
+            baseScaling: 3.0
+            fontWidth: 1.0
+        }
         ListElement{
             name: "APPLE_II"
             text: "Apple ][ (1977)"

app/qml/Fonts.qml

@@ -25,117 +25,193 @@ QtObject{
     property real scaling
     property var source: fontlist.get(selectedFontIndex).source
     property var _font: fontlist.get(selectedFontIndex)
-    property int pixelSize: _font.pixelSize * scaling
-    property int lineSpacing: pixelSize * _font.lineSpacing
-    property real screenScaling: 1.0
+    property bool lowResolutionFont: _font.lowResolutionFont
+
+    property int pixelSize: lowResolutionFont
+                                 ? _font.pixelSize
+                                 : _font.pixelSize * scaling
+
+    property int lineSpacing: lowResolutionFont
+                                  ? _font.lineSpacing
+                                  : pixelSize * _font.lineSpacing
+
+    property real screenScaling: lowResolutionFont
+                                     ? _font.baseScaling * scaling
+                                     : 1.0
+
     property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
 
-    //In this configuration lineSpacing is proportional to pixelSize.
+    // There are two kind of fonts: low resolution and high resolution.
+    // Low resolution font sets the lowResolutionFont property to true.
+    // They are rendered at a fixed pixel size and the texture is upscaled
+    // to fill the screen (they are much faster to render).
+    // High resolution fonts are instead drawn on a texture which has the
+    // size of the screen, and the scaling directly controls their pixels size.
+    // Those are slower to render but are not pixelated.
 
     property ListModel fontlist: ListModel{
         ListElement{
-            name: "HERMIT"
-            text: "Hermit (Modern)"
-            source: "fonts/modern-hermit/Hermit-medium.otf"
-            lineSpacing: 0.05
-            pixelSize: 28
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "TERMINUS"
+            name: "TERMINUS_SCALED"
             text: "Terminus (Modern)"
             source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf"
-            lineSpacing: 0.1
-            pixelSize: 35
+            lineSpacing: 1
+            pixelSize: 12
+            baseScaling: 3.0
             fontWidth: 1.0
+            lowResolutionFont: true
         }
         ListElement{
-            name: "ENVY_CODE_R"
-            text: "Envy Code R (Modern)"
-            source: "fonts/modern-envy-code-r/Envy Code R.ttf"
-            lineSpacing: 0.1
-            pixelSize: 30
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "PRO_FONT"
+            name: "PRO_FONT_SCALED"
             text: "Pro Font (Modern)"
             source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 0.1
-            pixelSize: 35
+            lineSpacing: 1
+            pixelSize: 12
+            baseScaling: 3.0
             fontWidth: 1.0
+            lowResolutionFont: true
         }
         ListElement{
-            name: "MONACO"
-            text: "Monaco (Modern)"
-            source: "fonts/modern-monaco/monaco.ttf"
-            lineSpacing: 0.1
-            pixelSize: 30
+            name: "EXCELSIOR_SCALED"
+            text: "Fixedsys Excelsior (Modern)"
+            source: "fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf"
+            lineSpacing: 0
+            pixelSize: 16
+            baseScaling: 2.4
             fontWidth: 1.0
+            lowResolutionFont: true
         }
         ListElement{
-            name: "INCONSOLATA"
-            text: "Inconsolata (Modern)"
-            source: "fonts/modern-inconsolata/Inconsolata.otf"
-            lineSpacing: 0.1
-            pixelSize: 35
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "COMMODORE_PET"
+            name: "COMMODORE_PET_SCALED"
             text: "Commodore PET (1977)"
             source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
-            lineSpacing: 0.2
-            pixelSize: 26
+            lineSpacing: 2
+            pixelSize: 8
+            baseScaling: 3.5
             fontWidth: 0.7
+            lowResolutionFont: true
         }
         ListElement{
-            name: "APPLE_II"
+            name: "PROGGY_TINY_SCALED"
+            text: "Proggy Tiny (Modern)"
+            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
+            lineSpacing: 1
+            pixelSize: 16
+            baseScaling: 3.0
+            fontWidth: 0.9
+            lowResolutionFont: true
+        }
+        ListElement{
+            name: "APPLE_II_SCALED"
             text: "Apple ][ (1977)"
             source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 0.2
-            pixelSize: 26
+            lineSpacing: 2
+            pixelSize: 8
+            baseScaling: 3.5
             fontWidth: 0.8
+            lowResolutionFont: true
         }
         ListElement{
-            name: "ATARI_400"
+            name: "ATARI_400_SCALED"
             text: "Atari 400-800 (1979)"
             source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
-            lineSpacing: 0.3
-            pixelSize: 26
+            lineSpacing: 3
+            pixelSize: 8
+            baseScaling: 3.5
             fontWidth: 0.7
+            lowResolutionFont: true
         }
         ListElement{
-            name: "COMMODORE_64"
+            name: "COMMODORE_64_SCALED"
             text: "Commodore 64 (1982)"
             source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf"
-            lineSpacing: 0.3
-            pixelSize: 26
+            lineSpacing: 3
+            pixelSize: 8
+            baseScaling: 3.5
             fontWidth: 0.7
+            lowResolutionFont: true
         }
         ListElement{
-            name: "ATARI_ST"
+            name: "ATARI_ST_SCALED"
             text: "Atari ST (1985)"
             source: "fonts/1985-atari-st/AtariST8x16SystemFont.ttf"
-            lineSpacing: 0.2
-            pixelSize: 32
+            lineSpacing: 3
+            pixelSize: 16
+            baseScaling: 2.0
             fontWidth: 1.0
+            lowResolutionFont: true
         }
         ListElement{
             name: "IBM_DOS"
             text: "IBM DOS (1985)"
             source: "fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf"
-            lineSpacing: 0.2
-            pixelSize: 32
+            lineSpacing: 3
+            pixelSize: 16
+            baseScaling: 2.0
             fontWidth: 1.0
+            lowResolutionFont: true
+        }
+        ListElement{
+            name: "HERMIT"
+            text: "HD: Hermit (Modern)"
+            source: "fonts/modern-hermit/Hermit-medium.otf"
+            lineSpacing: 0.05
+            pixelSize: 28
+            fontWidth: 1.0
+            lowResolutionFont: false
+        }
+        ListElement{
+            name: "TERMINUS"
+            text: "HD: Terminus (Modern)"
+            source: "fonts/modern-terminus/TerminusTTF-4.38.2.ttf"
+            lineSpacing: 0.1
+            pixelSize: 35
+            fontWidth: 1.0
+            lowResolutionFont: false
+        }
+        ListElement{
+            name: "PRO_FONT"
+            text: "HD: Pro Font (Modern)"
+            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
+            lineSpacing: 0.1
+            pixelSize: 35
+            fontWidth: 1.0
+            lowResolutionFont: false
+        }
+        ListElement{
+            name: "ENVY_CODE_R"
+            text: "HD: Envy Code R (Modern)"
+            source: "fonts/modern-envy-code-r/Envy Code R.ttf"
+            lineSpacing: 0.1
+            pixelSize: 30
+            fontWidth: 1.0
+            lowResolutionFont: false
+        }
+        ListElement{
+            name: "MONACO"
+            text: "HD: Monaco (Modern)"
+            source: "fonts/modern-monaco/monaco.ttf"
+            lineSpacing: 0.1
+            pixelSize: 30
+            fontWidth: 1.0
+            lowResolutionFont: false
+        }
+        ListElement{
+            name: "INCONSOLATA"
+            text: "HD: Inconsolata (Modern)"
+            source: "fonts/modern-inconsolata/Inconsolata.otf"
+            lineSpacing: 0.1
+            pixelSize: 35
+            fontWidth: 1.0
+            lowResolutionFont: false
         }
         ListElement{
             name: "IBM_3278"
-            text: "IBM 3278 (1971)"
+            text: "HD: IBM 3278 (1971)"
             source: "fonts/1971-ibm-3278/3270Medium.ttf"
             lineSpacing: 0.2
             pixelSize: 32
             fontWidth: 1.0
+            lowResolutionFont: false
         }
     }
 }

app/qml/PreprocessedTerminal.qml

@@ -23,6 +23,8 @@ import QtQuick.Controls 1.1
 
 import QMLTermWidget 1.0
 
+import "utils.js" as Utils
+
 Item{
     id: terminalContainer
 
@@ -42,11 +44,13 @@ Item{
     anchors.topMargin: frame.displacementTop * appSettings.windowScaling
     anchors.bottomMargin: frame.displacementBottom * appSettings.windowScaling
 
-    //The blur effect has to take into account the framerate
-    property real mBlur: appSettings.burnIn
-    property real motionBlurCoefficient: (_maxBlurCoefficient * Math.sqrt(mBlur) + _minBlurCoefficient * (1 - Math.sqrt(mBlur)))
-    property real _minBlurCoefficient: 0.50
-    property real _maxBlurCoefficient: 0.90
+    //Parameters for the burnIn effect.
+    property real burnIn: appSettings.burnIn
+    property real fps: appSettings.fps !== 0 ? appSettings.fps : 60
+    property real burnInFadeTime: Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
+    property real motionBlurCoefficient: 1.0 / (fps * burnInFadeTime)
+    property real _minBurnInFadeTime: 0.16
+    property real _maxBurnInFadeTime: 1.6
 
     property size terminalSize: kterminal.terminalSize
     property size fontMetrics: kterminal.fontMetrics
@@ -83,7 +87,7 @@ Item{
 
         colorScheme: "cool-retro-term"
 
-        smooth: appSettings.rasterization === appSettings.no_rasterization
+        smooth: !appSettings.lowResolutionFont
         enableBold: false
         fullCursorHeight: true
 
@@ -115,13 +119,13 @@ Item{
         function handleFontChange(fontSource, pixelSize, lineSpacing, screenScaling, fontWidth){
             fontLoader.source = fontSource;
 
-            kterminal.antialiasText = appSettings.rasterization === appSettings.no_rasterization
+            kterminal.antialiasText = !appSettings.lowResolutionFont;
             font.pixelSize = pixelSize;
             font.family = fontLoader.name;
 
             terminalContainer.fontWidth = fontWidth;
-            terminalContainer.screenScaling= screenScaling;
-            scaleTexture = Math.max(1.0, Math.round(screenScaling / 2));
+            terminalContainer.screenScaling = screenScaling;
+            scaleTexture = Math.max(1.0, Math.floor(screenScaling * appSettings.windowScaling));
 
             kterminal.lineSpacing = lineSpacing;
         }
@@ -174,6 +178,7 @@ Item{
     MouseArea{
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: parent
+        cursorShape: kterminal.terminalUsesMouse ? Qt.ArrowCursor : Qt.IBeamCursor
         onWheel:{
             if(wheel.modifiers & Qt.ControlModifier){
                wheel.angleDelta.y > 0 ? zoomIn.trigger() : zoomOut.trigger();
@@ -225,13 +230,15 @@ Item{
     Loader{
         id: blurredSourceLoader
         asynchronous: true
-        active: mBlur !== 0
+        active: burnIn !== 0
 
         sourceComponent: ShaderEffectSource{
+            property bool updateBurnIn: false
+
             id: _blurredSourceEffect
             sourceItem: blurredTerminalLoader.item
             recursive: true
-            live: true
+            live: false
             hideSource: true
             wrapMode: kterminalSource.wrapMode
 
@@ -241,15 +248,29 @@ Item{
                 livetimer.restart();
             }
 
+            // This updates the burnin synched with the timer.
+            Connections {
+                target: updateBurnIn ? mainShader : null
+                ignoreUnknownSignals: false
+                onTimeChanged: _blurredSourceEffect.scheduleUpdate();
+            }
+
             Timer{
                 id: livetimer
+
+                // The interval assumes 60 fps. This is the time needed burnout a white pixel.
+                // We multiply 1.1 to have a little bit of margin over the theoretical value.
+                // This solution is not extremely clean, but it's probably the best to avoid measuring fps.
+
+                interval: burnInFadeTime * 1000 * 1.1
                 running: true
-                onTriggered: _blurredSourceEffect.live = false;
+                onTriggered: _blurredSourceEffect.updateBurnIn = false;
             }
             Connections{
                 target: kterminal
                 onImagePainted:{
-                    _blurredSourceEffect.live = true;
+                    _blurredSourceEffect.scheduleUpdate();
+                    _blurredSourceEffect.updateBurnIn = true;
                     livetimer.restart();
                 }
             }
@@ -271,15 +292,22 @@ Item{
     Loader{
         id: blurredTerminalLoader
 
-        width: kterminal.width * scaleTexture * appSettings.burnInQuality
-        height: kterminal.height * scaleTexture * appSettings.burnInQuality
-        active: mBlur !== 0
+        property int burnInScaling: scaleTexture * appSettings.burnInQuality
+
+        width: appSettings.lowResolutionFont
+                  ? kterminal.width * Math.max(1, burnInScaling)
+                  : kterminal.width * scaleTexture * appSettings.burnInQuality
+        height: appSettings.lowResolutionFont
+                    ? kterminal.height * Math.max(1, burnInScaling)
+                    : kterminal.height * scaleTexture * appSettings.burnInQuality
+
+        active: burnIn !== 0
         asynchronous: true
 
         sourceComponent: ShaderEffect {
             property variant txt_source: kterminalSource
             property variant blurredSource: blurredSourceLoader.item
-            property real blurCoefficient: (1.0 - motionBlurCoefficient)
+            property real blurCoefficient: motionBlurCoefficient
 
             blending: false
 
@@ -299,10 +327,10 @@ Item{
                 "void main() {" +
                     "vec2 coords = qt_TexCoord0;" +
                     "vec3 origColor = texture2D(txt_source, coords).rgb;" +
-                    "vec3 blur_color = texture2D(blurredSource, coords).rgb * (1.0 - blurCoefficient);" +
+                    "vec3 blur_color = texture2D(blurredSource, coords).rgb - vec3(blurCoefficient);" +
                     "vec3 color = min(origColor + blur_color, max(origColor, blur_color));" +
 
-                    "gl_FragColor = vec4(color, step(0.02, rgb2grey(color - origColor)));" +
+                    "gl_FragColor = vec4(color, rgb2grey(color - origColor));" +
                 "}"
 
             onStatusChanged: if (log) console.log(log) //Print warning messages

app/qml/SettingsPerformanceTab.qml

@@ -22,6 +22,8 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
+import "Components"
+
 Tab{
     ColumnLayout{
         anchors.fill: parent
@@ -34,36 +36,39 @@ Tab{
                 anchors.fill: parent
                 rows: 2
                 columns: 3
-                CheckBox{
-                    property int fps: checked ? slider.value : 0
-                    onFpsChanged: appSettings.fps = fps
-                    checked: appSettings.fps !== 0
-                    text: qsTr("Effects FPS")
-                }
+                Label{text: qsTr("Effects FPS")}
                 Slider{
-                    id: slider
                     Layout.fillWidth: true
+                    id: fpsSlider
+                    onValueChanged: {
+                        if (enabled) {
+                            appSettings.fps = value !== 60 ? value + 1 : 0;
+                        }
+                    }
                     stepSize: 1
-                    maximumValue: 60
-                    minimumValue: 1
-                    enabled: appSettings.fps !== 0
-                    value: appSettings.fps !== 0 ? appSettings.fps : 60
+                    enabled: false
+                    Component.onCompleted: {
+                        minimumValue = 0;
+                        maximumValue = 60;
+                        value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60;
+                        enabled = true;
+                    }
                 }
-                Text{text: slider.value}
-                Text{text: qsTr("Texture Quality")}
+                SizedLabel{text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")}
+                Label{text: qsTr("Texture Quality")}
                 Slider{
                     Layout.fillWidth: true
                     id: txtslider
                     onValueChanged: if (enabled) appSettings.windowScaling = value;
-                    stepSize: 0.10
+                    stepSize: 0.05
                     enabled: false
                     Component.onCompleted: {
-                        minimumValue = 0.3 //Without this value gets set to 0.5
+                        minimumValue = 0.25 //Without this value gets set to 0.5
                         value = appSettings.windowScaling;
                         enabled = true;
                     }
                 }
-                Text{text: Math.round(txtslider.value * 100) + "%"}
+                SizedLabel{text: Math.round(txtslider.value * 100) + "%"}
             }
         }
         GroupBox{
@@ -74,21 +79,20 @@ Tab{
             GridLayout{
                 id: bloomQualityContainer
                 anchors.fill: parent
-
-                Text{text: qsTr("Bloom Quality")}
+                Label{text: qsTr("Bloom Quality")}
                 Slider{
                     Layout.fillWidth: true
                     id: bloomSlider
                     onValueChanged: if (enabled) appSettings.bloomQuality = value;
-                    stepSize: 0.10
+                    stepSize: 0.05
                     enabled: false
                     Component.onCompleted: {
-                        minimumValue = 0.3
+                        minimumValue = 0.25
                         value = appSettings.bloomQuality;
                         enabled = true;
                     }
                 }
-                Text{text: Math.round(bloomSlider.value * 100) + "%"}
+                SizedLabel{text: Math.round(bloomSlider.value * 100) + "%"}
             }
         }
         GroupBox{
@@ -100,20 +104,20 @@ Tab{
                 id: blurQualityContainer
                 anchors.fill: parent
 
-                Text{text: qsTr("BurnIn Quality")}
+                Label{text: qsTr("BurnIn Quality")}
                 Slider{
                     Layout.fillWidth: true
                     id: burnInSlider
                     onValueChanged: if (enabled) appSettings.burnInQuality = value;
-                    stepSize: 0.10
+                    stepSize: 0.05
                     enabled: false
                     Component.onCompleted: {
-                        minimumValue = 0.3
+                        minimumValue = 0.25
                         value = appSettings.burnInQuality;
                         enabled = true;
                     }
                 }
-                Text{text: Math.round(burnInSlider.value * 100) + "%"}
+                SizedLabel{text: Math.round(burnInSlider.value * 100) + "%"}
             }
         }
         GroupBox{

app/qml/SettingsScreenTab.qml

@@ -46,17 +46,17 @@ Tab{
             GridLayout{
                 anchors.fill: parent
                 columns: 2
-                Text{ text: qsTr("Brightness") }
+                Label{ text: qsTr("Brightness") }
                 SimpleSlider{
                     onValueChanged: appSettings.brightness = value
                     value: appSettings.brightness
                 }
-                Text{ text: qsTr("Contrast") }
+                Label{ text: qsTr("Contrast") }
                 SimpleSlider{
                     onValueChanged: appSettings.contrast = value
                     value: appSettings.contrast
                 }
-                Text{ text: qsTr("Opacity") }
+                Label{ text: qsTr("Opacity") }
                 SimpleSlider{
                     onValueChanged: appSettings.windowOpacity = value
                     value: appSettings.windowOpacity

app/qml/SettingsTerminalTab.qml

@@ -22,6 +22,8 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
+import "Components"
+
 Tab{
     ColumnLayout{
         anchors.fill: parent
@@ -32,7 +34,7 @@ Tab{
             GridLayout{
                 anchors.fill: parent
                 columns: 2
-                Text{ text: qsTr("Name") }
+                Label{ text: qsTr("Name") }
                 ComboBox{
                     id: fontChanger
                     Layout.fillWidth: true
@@ -54,7 +56,7 @@ Tab{
                     }
                     Component.onCompleted: updateIndex();
                 }
-                Text{ text: qsTr("Scaling") }
+                Label{ text: qsTr("Scaling") }
                 RowLayout{
                     Layout.fillWidth: true
                     Slider{
@@ -64,8 +66,8 @@ Tab{
                         stepSize: 0.05
                         enabled: false // Another trick to fix initial bad behavior.
                         Component.onCompleted: {
-                            minimumValue = 0.5;
-                            maximumValue = 2.5;
+                            minimumValue = appSettings.minimumFontScaling;
+                            maximumValue = appSettings.maximumFontScaling;
                             value = appSettings.fontScaling;
                             enabled = true;
                         }
@@ -74,11 +76,11 @@ Tab{
                             onFontScalingChanged: fontScalingChanger.value = appSettings.fontScaling;
                         }
                     }
-                    Text{
+                    SizedLabel{
                         text: Math.round(fontScalingChanger.value * 100) + "%"
                     }
                 }
-                Text{ text: qsTr("Font Width") }
+                Label{ text: qsTr("Font Width") }
                 RowLayout{
                     Layout.fillWidth: true
                     Slider{
@@ -93,7 +95,7 @@ Tab{
                             maximumValue = 1.5;
                         }
                     }
-                    Text{
+                    SizedLabel{
                         text: Math.round(widthChanger.value * 100) + "%"
                     }
                 }
@@ -125,14 +127,14 @@ Tab{
                         height: 50
                         Layout.fillWidth: true
                         onColorSelected: appSettings._fontColor = color;
-                        button_color: appSettings._fontColor
+                        color: appSettings._fontColor
                     }
                     ColorButton{
                         name: qsTr("Background")
                         height: 50
                         Layout.fillWidth: true
                         onColorSelected: appSettings._backgroundColor = color;
-                        button_color: appSettings._backgroundColor
+                        color: appSettings._backgroundColor
                     }
                 }
             }

app/qml/ShaderTerminal.qml

@@ -21,6 +21,8 @@
 import QtQuick 2.2
 import QtGraphicalEffects 1.0
 
+import "utils.js" as Utils
+
 ShaderEffect {
     property ShaderEffectSource source
     property ShaderEffectSource blurredSource
@@ -38,7 +40,7 @@ ShaderEffect {
                                           (height) / (noiseTexture.height * appSettings.windowScaling * appSettings.fontScaling))
 
     property real screenCurvature: appSettings.screenCurvature
-    property real glowingLine: appSettings.glowingLine
+    property real glowingLine: appSettings.glowingLine * 0.2
 
     property real chromaColor: appSettings.chromaColor;
 
@@ -56,6 +58,12 @@ ShaderEffect {
 
     property real screen_brightness: appSettings.brightness * 1.5 + 0.5
 
+    // This is the average value of the abs(sin) function. Needed to avoid aliasing.
+    readonly property real absSinAvg: 0.63661828335466886
+    property size rasterizationSmooth: Qt.size(
+                                           Utils.clamp(2.0 * virtual_resolution.width / (width * devicePixelRatio), 0.0, 1.0),
+                                           Utils.clamp(2.0 * virtual_resolution.height / (height * devicePixelRatio), 0.0, 1.0))
+
     property real dispX
     property real dispY
     property size virtual_resolution
@@ -153,6 +161,7 @@ ShaderEffect {
         uniform lowp float screen_brightness;
 
         uniform highp vec2 virtual_resolution;
+        uniform highp vec2 rasterizationSmooth;
         uniform highp float dispX;
         uniform highp float dispY;" +
 
@@ -191,16 +200,18 @@ ShaderEffect {
 
         (glowingLine !== 0 ? "
             float randomPass(vec2 coords){
-                return fract(smoothstep(-0.2, 0.0, coords.y - 3.0 * fract(time * 0.0001))) * glowingLine;
+                return fract(smoothstep(-120.0, 0.0, coords.y - (virtual_resolution.y + 120.0) * fract(time * 0.00015)));
             }" : "") +
 
         "highp float getScanlineIntensity(vec2 coords) {
             highp float result = 1.0;" +
 
            (appSettings.rasterization != appSettings.no_rasterization ?
-               "result *= abs(sin(coords.y * virtual_resolution.y * "+Math.PI+"));" : "") +
+               "float val = abs(sin(coords.y * virtual_resolution.y * "+Math.PI+"));
+                result *= mix(val, " + absSinAvg + ", rasterizationSmooth.y);" : "") +
            (appSettings.rasterization == appSettings.pixel_rasterization ?
-               "result *= abs(sin(coords.x * virtual_resolution.x * "+Math.PI+"));" : "") + "
+               "val = abs(sin(coords.x * virtual_resolution.x * "+Math.PI+"));
+                result *= mix(val, " + absSinAvg + ", rasterizationSmooth.x);" : "") + "
 
            return result;
         }
@@ -261,7 +272,7 @@ ShaderEffect {
                 color += noiseVal * noise * (1.0 - distance * 1.3);" : "") +
 
             (glowingLine !== 0 ? "
-                color += randomPass(coords) * glowingLine;" : "") +
+                color += randomPass(coords * virtual_resolution) * glowingLine;" : "") +
 
             "vec3 txt_color = texture2D(source, txt_coords).rgb;" +
 

app/qml/SimpleSlider.qml

@@ -22,6 +22,8 @@ import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
+import "Components"
+
 RowLayout {
     property alias value: slider.value
     property alias stepSize: slider.stepSize
@@ -36,15 +38,7 @@ RowLayout {
         stepSize: parent.stepSize
         Layout.fillWidth: true
     }
-    Text{
-        id: textfield
-        text: formatNumber(Math.round(value * maxMultiplier))
-    }
-    function formatNumber(num) {
-        var n = "" + num;
-        while (n.length < 3) {
-            n = " " + n;
-        }
-        return n + "%";
+    SizedLabel{
+        text: Math.round(value * maxMultiplier) + "%"
     }
 }

app/qml/TerminalContainer.qml

@@ -1,6 +1,8 @@
 import QtQuick 2.2
 import QtGraphicalEffects 1.0
 
+import "utils.js" as Utils
+
 ShaderTerminal{
     property alias title: terminal.title
     property alias terminalSize: terminal.terminalSize
@@ -45,9 +47,10 @@ ShaderTerminal{
         asynchronous: true
         width: parent.width * appSettings.bloomQuality
         height: parent.height * appSettings.bloomQuality
+
         sourceComponent: FastBlur{
-            radius: 48 * appSettings.bloomQuality * appSettings.windowScaling
-            source: terminal.mainTerminal
+            radius: Utils.lint(16, 48, appSettings.bloomQuality * appSettings.windowScaling);
+            source: terminal.mainSource
             transparentBorder: true
         }
     }
@@ -67,8 +70,8 @@ ShaderTerminal{
     bloomSource: bloomSourceLoader.item
 
     // This shader might be useful in the future. Since we used it only for a couple
-    // of calculations is probably best to move those in the main shader. If in
-    // we will need to store another fullScreen channel this might be handy.
+    // of calculations is probably best to move those in the main shader. If in the future
+    // we need to store another fullScreen channel this might be handy.
 
 //    ShaderEffect {
 //        id: rasterizationEffect

app/qml/frames/utils/TerminalFrame.qml

@@ -83,7 +83,7 @@ Item{
         sourceComponent: FastBlur{
             id: frameReflectionEffect
             radius: 128
-            source: terminal.kterminal
+            source: terminal.mainSource
             smooth: false
         }
     }

app/qml/resources.qrc

@@ -50,5 +50,8 @@
         <file>fonts/modern-envy-code-r/Envy Code R.ttf</file>
         <file>fonts/modern-inconsolata/Inconsolata.otf</file>
         <file>SettingsScreenTab.qml</file>
+        <file>fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf</file>
+        <file>../icons/32x32/cool-retro-term.png</file>
+        <file>Components/SizedLabel.qml</file>
     </qresource>
 </RCC>

app/qml/utils.js

@@ -1,5 +1,14 @@
 .pragma library
-
+function clamp(x, min, max) {
+    if (x <= min)
+        return min;
+    if (x >= max)
+        return max;
+    return x;
+}
+function lint(a, b, t) {
+    return (1 - t) * a + (t) * b;
+}
 function mix(c1, c2, alpha){
     return Qt.rgba(c1.r * alpha + c2.r * (1-alpha),
                    c1.g * alpha + c2.g * (1-alpha),

cool-retro-term.desktop

@@ -2,7 +2,7 @@
 Comment=Use the command line the old way
 Exec=cool-retro-term
 GenericName=Terminal emulator
-Icon=utilities-terminal
+Icon=cool-retro-term
 MimeType=
 Name=Cool Retro Term
 Categories=Qt;System;Utility;TerminalEmulator;

packaging/rpm/cool-retro-term.spec

@@ -18,10 +18,10 @@
 
 Name:       cool-retro-term
 Summary:    Cool Retro Terminal
-Version:    0.9
+Version:    1.0
 Release:    0%{?dist}
 Group:      System/X11/Terminals
-License:    GPLv3
+License:    GPL-3.0+
 URL:        https://github.com/Swordfish90/cool-retro-term
 
 # For this spec file to work, the cool-retro-term sources must be located
@@ -82,9 +82,7 @@ desktop-file-install                            \
 %{_bindir}/%{name}
 %{_libdir}/qt5/qml/
 %{_datadir}/applications/%{name}.desktop
-# FIXME: Icon
-# %{_datadir}/pixmaps/%{name}.png
-# %{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %clean
 rm -rf %{buildroot}