Merge pull request 'Revert "Make the burn-in look more like the real thing."' (#862) from revert-burnin into master

Reviewed-on: #862

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: swordfish90
+custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=flscogna%40gmail.com&item_name=Support+CRT&currency_code=EUR&source=url']

.github/workflows/appimage.yml

@@ -0,0 +1,98 @@
+name: "ci"
+
+on:
+  push:
+    tags: "**"
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  appimage:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Install dependencies
+      run: |
+        sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-bionic
+        sudo apt-get update -qq
+        sudo apt-get install -y \
+        build-essential make wget libgl1-mesa-dev \
+        qt515declarative qt515graphicaleffects \
+        qt515quickcontrols qt515quickcontrols2
+
+    - name: Download QT appimage builder
+      run: |
+        wget -c -O linuxdeployqt.AppImage \
+        https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+        chmod a+x linuxdeployqt.AppImage
+
+    - name: Build project
+      run: |
+        source /opt/qt*/bin/qt*-env.sh && \
+        qmake -v && \
+        qmake CONFIG+=release PREFIX=/usr && \
+        make -j$(nproc)
+
+    - name: Install to appdir
+      run: |
+        source /opt/qt*/bin/qt*-env.sh && \
+        make INSTALL_ROOT=appdir -j$(nproc) install
+
+    - name: Extract version number
+      run: |
+        # Extract version for linuxdeployqt to name the file. Use the tag as
+        # release name but remove prefix.
+        echo "VERSION=$(echo '${{ github.ref }}' | sed 's;.*/;;')" >> $GITHUB_ENV
+
+    - name: Build appimage directory
+      run: |
+        mkdir -p \
+        appdir/usr/bin \
+        appdir/usr/lib \
+        appdir/usr/share/applications \
+        appdir/usr/share/metainfo \
+        appdir/usr/share/icons/hicolor/128x128/apps
+
+        cp cool-retro-term appdir/usr/bin/
+        cp cool-retro-term.desktop appdir/usr/share/applications/
+        cp packaging/appdata/cool-retro-term.appdata.xml appdir/usr/share/metainfo/
+        cp app/icons/128x128/cool-retro-term.png appdir/usr/share/icons/hicolor/128x128/apps/
+        cp -r ./app/qml appdir/usr/
+        # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78
+        cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/
+
+        find appdir | sort
+
+    - name: Build appimage
+      run: |
+        source /opt/qt*/bin/qt*-env.sh && \
+        ./linuxdeployqt.AppImage appdir/usr/share/applications/cool-retro-term.desktop \
+        -verbose=1 -appimage \
+        -qmldir=./app/qml/ \
+        -qmldir=./qmltermwidget/
+      env:
+        # Unset environment variables
+        QTDIR:
+        QT_PLUGIN_PATH:
+        LD_LIBRARY_PATH:
+
+    - name: Upload release
+      uses: softprops/action-gh-release@v1
+      with:
+        body: appimage release
+        files: ./**/Cool_Retro_Term-*-x86_64.AppImage
+
+    - name: Clean up
+      if: always()
+      run: |
+        find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+        make clean
+        rm -rf appdir

.gitignore

@@ -48,3 +48,6 @@ cool-retro-term
 
 .DS_Store
 *.app
+
+# IntelliJ
+.idea

README.md

@@ -8,9 +8,9 @@
 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): https://github.com/Swordfish90/qmltermwidget.
 
-This terminal emulator works under Linux and macOS and requires Qt 5.2 or higher.
+This terminal emulator works under Linux and macOS and requires Qt5. It's suggested that you stick to the latest LTS version.
 
 Settings such as colors, fonts, and effects can be accessed via context menu.
 
@@ -20,192 +20,11 @@ Settings such as colors, fonts, and effects can be accessed via context menu.
 ![Image](<https://i.imgur.com/GYRDPzJ.jpg>)
 
 ## Install
-Walk the easy way and install cool-retro-term using one of these convenient packages:
 
-Just grab the latest AppImage from the release page and make it executable and run it:
+If you want to get a hold of the latest version, just go to the Releases page and grab the latest AppImage (Linux) or dmg (macOS).
 
-    wget https://github.com/Swordfish90/cool-retro-term/releases/download/1.1.1/Cool-Retro-Term-1.1.1-x86_64.AppImage
+Alternatively, most distributions such as Ubuntu, Fedora or Arch already package cool-retro-term in their official repositories.
-    chmod a+x Cool-Retro-Term-1.1.1-x86_64.AppImage
-    ./Cool-Retro-Term-1.1.1-x86_64.AppImage
 
-**Fedora** has the `cool-retro-term` in the official repositories. All you have to do is `sudo dnf install cool-retro-term`.
+## Building
 
-Users of **openSUSE** can grab a package from [Open Build Service](http://software.opensuse.org/package/cool-retro-term).
+Check out the wiki and follow the instructions on how to build it on [Linux](https://github.com/Swordfish90/cool-retro-term/wiki/Build-Instructions-(Linux)) and [macOS](https://github.com/Swordfish90/cool-retro-term/wiki/Build-Instructions-(macOS)).
-
-**Arch** users can install this [package](https://aur.archlinux.org/packages/cool-retro-term-git/) directly via the [AUR](https://aur.archlinux.org):
-
-    trizen -S aur/cool-retro-term-git
-
-or use:
-
-    pacman -S cool-retro-term
-
-to install precompiled from community repository.
-
-Users of **Ubuntu 14.04 LTS (Trusty) up to 15.10 (Wily)** can use [this PPA](https://launchpad.net/~bugs-launchpad-net-falkensweb).
-
-**Ubuntu 17.10** can use [this PPA](https://launchpad.net/%7Evantuz/+archive/ubuntu/cool-retro-term)
-
-**Solus** users can install using `eopg`:
-```
-eopkg it cool-retro-term
-```
-
-**macOS** users can grab the latest dmg from the [release page](https://github.com/Swordfish90/cool-retro-term/releases) or install via Homebrew:
-```
-brew cask install cool-retro-term
-```
-
-**FreeBSD** users can install cool-retro-term with `pkg`:
-
-    pkg install cool-retro-term
-    
-## Build instructions (FreeBSD)
-
-Grab a copy of [the FreeBSD Ports Collection](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html), modify [`/usr/ports/x11/cool-retro-term/Makefile`](https://svnweb.freebsd.org/ports/head/x11/cool-retro-term/Makefile?view=markup) as you like, and then run `make install` to build and install the emulator:
-
-```
-cd /usr/ports/x11/cool-retro-term
-make install
-```
-
-## Build instructions (Linux)
-
-Build cool-retro-term yourself, you know, the retro way.
-
-## Dependencies
-Make sure to install these first.
-
----
-
-**Ubuntu 14.04**
-
-    sudo apt-get install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qtdeclarative5-controls-plugin qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qtdeclarative5-dialogs-plugin qtdeclarative5-localstorage-plugin qtdeclarative5-window-plugin
-
----
-
-**Ubuntu 16.10**
-
-    sudo apt-get install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qml-module-qtquick-controls qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qml-module-qtquick-dialogs qtdeclarative5-localstorage-plugin qtdeclarative5-window-plugin
-
----
-
-**Ubuntu 17.04**
-
-    sudo apt install build-essential libqt5qml-graphicaleffects qml-module-qt-labs-folderlistmodel qml-module-qt-labs-settings qml-module-qtquick-controls qml-module-qtquick-dialogs qmlscene qt5-default qt5-qmake qtdeclarative5-dev qtdeclarative5-localstorage-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin
-
----
-
-**Ubuntu 17.10**
-
-    sudo apt-get install build-essential qml-module-qtgraphicaleffects qml-module-qt-labs-folderlistmodel qml-module-qt-labs-settings qml-module-qtquick-controls qml-module-qtquick-dialogs qmlscene qt5-default qt5-qmake qtdeclarative5-dev qtdeclarative5-localstorage-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin
-
----
-
-**snapcraft (most of distros)**
-
-    sudo snap install cool-retro-term --classic
-
----
-
-**Debian Jessie and above**
-
-    sudo apt install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtgraphicaleffects qml-module-qtquick-dialogs qml-module-qtquick-localstorage qml-module-qtquick-window2 qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel
-
----
-
-**Fedora**
-This command should install the known fedora dependencies:
-
-    sudo yum -y install qt5-qtbase qt5-qtbase-devel qt5-qtdeclarative qt5-qtdeclarative-devel qt5-qtgraphicaleffects qt5-qtquickcontrols redhat-rpm-config
-
-or:
-
-    sudo dnf -y install qt5-qtbase qt5-qtbase-devel qt5-qtdeclarative qt5-qtdeclarative-devel qt5-qtgraphicaleffects qt5-qtquickcontrols redhat-rpm-config
-
----
-
-**Arch Linux**
-
-    sudo pacman -S qt5-base qt5-declarative qt5-quickcontrols qt5-graphicaleffects
-    
----
-
-**openSUSE**
-
-Add repository with latest Qt 5 (this is only needed on openSUSE 13.1, Factory already has it):
-
-    sudo zypper ar http://download.opensuse.org/repositories/KDE:/Qt5/openSUSE_13.1/ KDE:Qt5
-
-Install dependencies:
-
-    sudo zypper install libqt5-qtbase-devel libqt5-qtdeclarative-devel libqt5-qtquickcontrols libqt5-qtgraphicaleffects
-
----
-
-**Anyone else**
-
-Install Qt directly from here http://qt-project.org/downloads . Once done export them in you path (replace "_/opt/Qt5.3.1/5.3/gcc_64/bin_" with your correct folder):
-    
-    export PATH=/opt/Qt5.3.1/5.3/gcc_64/bin/:$PATH
----
-
-### Compile
-Once you installed all dependencies (Qt is installed and in your path) you need to compile and run the application: 
-
-```bash
-# Get it from GitHub
-git clone --recursive https://github.com/Swordfish90/cool-retro-term.git
-
-# Build it
-cd cool-retro-term
-
-# Compile (Fedora and OpenSUSE user should use qmake-qt5 instead of qmake)
-qmake && make
-
-# Have fun!
-./cool-retro-term
-```
-
-## Build instructions (macOS)
-
-1. Install [Xcode](https://developer.apple.com/xcode/) and agree to the licence agreement
-2. Enter the following commands into the terminal:
-
-**Brew**
-
-```sh
-brew install qt5
-git clone --recursive https://github.com/Swordfish90/cool-retro-term.git
-export CPPFLAGS="-I/usr/local/opt/qt5/include"
-export LDFLAGS="-L/usr/local/opt/qt5/lib"
-export PATH=/usr/local/opt/qt5/bin:$PATH
-cd cool-retro-term
-qmake && make
-mkdir cool-retro-term.app/Contents/PlugIns
-cp -r qmltermwidget/QMLTermWidget cool-retro-term.app/Contents/PlugIns
-open cool-retro-term.app
-```
-
-**MacPorts**
-
-```sh
-sudo port install qt5
-git clone --recursive https://github.com/Swordfish90/cool-retro-term.git
-cd cool-retro-term
-/opt/local/libexec/qt5/bin/qmake && make
-mkdir cool-retro-term.app/Contents/PlugIns
-cp -r qmltermwidget/QMLTermWidget cool-retro-term.app/Contents/PlugIns
-open cool-retro-term.app
-```
-
-**Homebrew**
-
-```sh
-brew cask install cool-retro-term
-```
-
-## Donations
-I made this project in my spare time because I love what I'm doing. If you are enjoying it and you want to buy me a beer click [here](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=flscogna%40gmail%2ecom&lc=IT&item_name=Filippo%20Scognamiglio&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted).
-
-You can also add "bounties" on your favourite issues. More information on the [Bountysource](https://www.bountysource.com/teams/crt/issues) page.

app/app.pro

@@ -1,4 +1,4 @@
-QT += qml quick widgets sql
+QT += qml quick widgets sql quickcontrols2
 TARGET = cool-retro-term 
 
 DESTDIR = $$OUT_PWD/../
@@ -16,7 +16,7 @@ macx:ICON = icons/crt.icns
 RESOURCES += qml/resources.qrc
 
 #########################################
-##              INTALLS
+##              INSTALLS
 #########################################
 
 target.path += /usr/bin/

app/main.cpp

@@ -6,11 +6,13 @@
 
 #include <QtWidgets/QApplication>
 #include <QIcon>
+#include <QQuickStyle>
 
 #include <QDebug>
 #include <stdlib.h>
 
 #include <QFontDatabase>
+#include <QLoggingCategory>
 
 #include <fileio.h>
 #include <monospacefontmanager.h>
@@ -33,6 +35,9 @@ int main(int argc, char *argv[])
     // This disables QT appmenu under Ubuntu, which is not working with QML apps.
     setenv("QT_QPA_PLATFORMTHEME", "", 1);
 
+    // Disable Connections slot warnings
+    QLoggingCategory::setFilterRules("qt.qml.connections.warning=false");
+
 #if defined (Q_OS_LINUX)
     setenv("QSG_RENDER_LOOP", "threaded", 0);
 #endif
@@ -44,30 +49,29 @@ int main(int argc, char *argv[])
 
     if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
         QTextStream cout(stdout, QIODevice::WriteOnly);
-        cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << endl;
+        cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << '\n';
-        cout << "  --default-settings  Run cool-retro-term with the default settings" << endl;
+        cout << "  --default-settings  Run cool-retro-term with the default settings" << '\n';
-        cout << "  --workdir <dir>     Change working directory to 'dir'" << endl;
+        cout << "  --workdir <dir>     Change working directory to 'dir'" << '\n';
-        cout << "  -e <cmd>            Command to execute. This option will catch all following arguments, so use it as the last option." << endl;
+        cout << "  -e <cmd>            Command to execute. This option will catch all following arguments, so use it as the last option." << '\n';
-        cout << "  -T <title>          Set window title to 'title'." << endl;
+        cout << "  -T <title>          Set window title to 'title'." << '\n';
-        cout << "  --fullscreen        Run cool-retro-term in fullscreen." << endl;
+        cout << "  --fullscreen        Run cool-retro-term in fullscreen." << '\n';
-        cout << "  -p|--profile <prof> Run cool-retro-term with the given profile." << endl;
+        cout << "  -p|--profile <prof> Run cool-retro-term with the given profile." << '\n';
-        cout << "  -h|--help           Print this help." << endl;
+        cout << "  -h|--help           Print this help." << '\n';
-        cout << "  --verbose           Print additional information such as profiles and settings." << endl;
+        cout << "  --verbose           Print additional information such as profiles and settings." << '\n';
+        cout << "  -v|--version        Print the program name and version." << '\n';
         return 0;
     }
 
-    QString appVersion("1.1.1");
+    QString appVersion("1.2.0");
 
     if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
         QTextStream cout(stdout, QIODevice::WriteOnly);
-        cout << "cool-retro-term " << appVersion << endl;
+        cout << "cool-retro-term " << appVersion << '\n';
         return 0;
     }
 
     QApplication app(argc, argv);
-    // set application attributes
+    app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
-    // Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293
-    // app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
 
     QQmlApplicationEngine engine;
     FileIO fileIO;
@@ -79,6 +83,9 @@ int main(int argc, char *argv[])
     app.setWindowIcon(QIcon(":../icons/32x32/cool-retro-term.png"));
 #endif
 
+    app.setOrganizationName("cool-retro-term");
+    app.setOrganizationDomain("cool-retro-term");
+
     // Manage command line arguments from the cpp side
     QStringList args = app.arguments();
 

app/qml/AboutDialog.qml

@@ -1,5 +1,24 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
 
@@ -18,7 +37,10 @@ Window{
         Text {
             Layout.alignment: Qt.AlignHCenter
             text: "cool-retro-term"
-            font {bold: true; pointSize: 18}
+            font {
+                bold: true
+                pointSize: 18
+            }
         }
         Loader {
             id: mainContent
@@ -41,7 +63,7 @@ Window{
                     }
                 }
             ]
-            Component.onCompleted: mainContent.state = "Default";
+            Component.onCompleted: mainContent.state = "Default"
         }
         Item {
             Layout.fillWidth: true
@@ -50,13 +72,14 @@ Window{
                 anchors.left: parent.left
                 text: qsTr("License")
                 onClicked: {
-                    mainContent.state == "Default" ? mainContent.state = "License" : mainContent.state = "Default"
+                    mainContent.state == "Default" ? mainContent.state
+                                                     = "License" : mainContent.state = "Default"
                 }
             }
             Button {
                 anchors.right: parent.right
                 text: qsTr("Close")
-                onClicked: dialogwindow.close();
+                onClicked: dialogwindow.close()
             }
         }
     }
@@ -77,33 +100,34 @@ Window{
             Text {
                 Layout.alignment: Qt.AlignCenter
                 horizontalAlignment: Text.AlignHCenter
-                text: appSettings.version + "\n" +
+                text: appSettings.version + "\n" + qsTr(
-                      qsTr("Author: ") + "Filippo Scognamiglio\n" +
+                          "Author: ") + "Filippo Scognamiglio\n" + qsTr(
-                      qsTr("Email: ")  + "flscogna@gmail.com\n" +
+                          "Email: ") + "flscogna@gmail.com\n" + qsTr(
-                      qsTr("Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
+                          "Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
             }
         }
     }
     Component {
         id: licenseComponent
-        TextArea{
+        ScrollView {
             anchors.fill: parent
+            clip: true
+            TextArea {
                 readOnly: true
-            text: "Copyright (c) 2013 Filippo Scognamiglio <flscogna@gmail.com>\n\n" +
+                wrapMode: TextEdit.Wrap
-                  "https://github.com/Swordfish90/cool-retro-term\n\n" +
+                text: "Copyright (c) 2013-2021 Filippo Scognamiglio <flscogna@gmail.com>\n\n"
-
+                      + "https://github.com/Swordfish90/cool-retro-term\n\n" +
-                  "cool-retro-term is free software: you can redistribute it and/or modify " +
+                      "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 " +
+                      + "it under the terms of the GNU General Public License as published by "
-                  "the Free Software Foundation, either version 3 of the License, or " +
+                      + "the Free Software Foundation, either version 3 of the License, or "
-                  "(at your option) any later version.\n\n" +
+                      + "(at your option) any later version.\n\n" +
-
+                      "This program is distributed in the hope that it will be useful, "
-                  "This program is distributed in the hope that it will be useful, " +
+                      + "but WITHOUT ANY WARRANTY; without even the implied warranty of "
-                  "but WITHOUT ANY WARRANTY; without even the implied warranty of " +
+                      + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
-                  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the " +
+                      + "GNU General Public License for more details.\n\n" +
-                  "GNU General Public License for more details.\n\n" +
+                      "You should have received a copy of the GNU General Public License "
-
+                      + "along with this program.  If not, see <http://www.gnu.org/licenses/>."
-                  "You should have received a copy of the GNU General Public License " +
+            }
-                  "along with this program.  If not, see <http://www.gnu.org/licenses/>."
         }
     }
 }

app/qml/ApplicationSettings.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,9 +17,8 @@
 * 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.2
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.0
 
 import "utils.js" as Utils
 
@@ -28,7 +27,6 @@ QtObject{
     readonly property int profileVersion: 2
 
     // STATIC CONSTANTS ////////////////////////////////////////////////////////
-
     readonly property real screenCurvatureSize: 0.4
     readonly property real minimumFontScaling: 0.25
     readonly property real maximumFontScaling: 2.50
@@ -36,15 +34,16 @@ QtObject{
     readonly property real minBurnInFadeTime: 160
     readonly property real maxBurnInFadeTime: 1600
 
-    // GENERAL SETTINGS ///////////////////////////////////////////////////////
+    property bool isMacOS: Qt.platform.os === "osx"
 
+    // GENERAL SETTINGS ///////////////////////////////////////////////////////
     property int x: 100
     property int y: 100
     property int width: 1024
     property int height: 768
 
     property bool fullscreen: false
-    property bool showMenubar: Qt.platform.os === "osx" ? true : false
+    property bool showMenubar: false
 
     property string wintitle: "cool-retro-term"
 
@@ -55,16 +54,13 @@ QtObject{
     property bool verbose: false
 
     property real bloomQuality: 0.5
-
     property real burnInQuality: 0.5
-    property bool useFastBurnIn: Qt.platform.os === "osx" ? false : true
 
     property bool blinkingCursor: false
 
-    onWindowScalingChanged: handleFontChanged();
+    onWindowScalingChanged: handleFontChanged()
 
     // PROFILE SETTINGS ///////////////////////////////////////////////////////
-
     property real windowOpacity: 1.0
     property real ambientLight: 0.2
     property real contrast: 0.80
@@ -75,9 +71,18 @@ QtObject{
 
     property string _backgroundColor: "#000000"
     property string _fontColor: "#ff8100"
-    property string saturatedColor: Utils.mix(Utils.strToColor("#FFFFFF"), Utils.strToColor(_fontColor), saturationColor * 0.5)
+    property string _frameColor: "#ffffff"
-    property color fontColor: Utils.mix(Utils.strToColor(saturatedColor), Utils.strToColor(_backgroundColor), 0.7 + (contrast * 0.3))
+    property string saturatedColor: Utils.mix(Utils.strToColor("#FFFFFF"),
-    property color backgroundColor: Utils.mix(Utils.strToColor(_backgroundColor), Utils.strToColor(saturatedColor), 0.7 + (contrast * 0.3))
+                                              Utils.strToColor(_fontColor),
+                                              saturationColor * 0.5)
+    property color fontColor: Utils.mix(Utils.strToColor(saturatedColor),
+                                        Utils.strToColor(_backgroundColor),
+                                        0.7 + (contrast * 0.3))
+    property color backgroundColor: Utils.mix(Utils.strToColor(
+                                                  _backgroundColor),
+                                              Utils.strToColor(saturatedColor),
+                                              0.7 + (contrast * 0.3))
+    property color frameColor: Utils.strToColor(_frameColor)
 
     property real staticNoise: 0.12
     property real screenCurvature: 0.3
@@ -87,6 +92,7 @@ QtObject{
 
     property real chromaColor: 0.25
     property real saturationColor: 0.25
+    property real frameGloss: 0
 
     property real jitter: 0.2
 
@@ -96,16 +102,21 @@ QtObject{
     property real rbgShift: 0.0
 
     property real _margin: 0.5
+    property real _frameMargin: 0.5
+
     property real margin: Utils.lint(1.0, 20.0, _margin)
+    property real frameMargin: Utils.lint(1.0, 50.0, _frameMargin)
+
+    property real totalMargin: frameMargin + margin
 
     readonly property int no_rasterization: 0
     readonly property int scanline_rasterization: 1
     readonly property int pixel_rasterization: 2
+    readonly property int subpixel_rasterization: 3
 
     property int rasterization: no_rasterization
 
     // FONTS //////////////////////////////////////////////////////////////////
-
     readonly property real baseFontScaling: 0.75
     property real fontScaling: 1.0
     property real totalFontScaling: baseFontScaling * fontScaling
@@ -119,16 +130,38 @@ QtObject{
 
     signal terminalFontChanged(string fontFamily, int pixelSize, int lineSpacing, real screenScaling, real fontWidth)
 
-    signal initializedSettings()
+    signal initializedSettings
 
     property Loader fontManager: Loader {
         states: [
-            State { when: rasterization == no_rasterization
+            State {
-                PropertyChanges {target: fontManager; source: "Fonts.qml" } },
+                when: rasterization == no_rasterization
-            State { when: rasterization == scanline_rasterization
+                PropertyChanges {
-                PropertyChanges {target: fontManager; source: "FontScanlines.qml" } },
+                    target: fontManager
-            State { when: rasterization == pixel_rasterization;
+                    source: "Fonts.qml"
-                PropertyChanges {target: fontManager; source: "FontPixels.qml" } }
+                }
+            },
+            State {
+                when: rasterization == scanline_rasterization
+                PropertyChanges {
+                    target: fontManager
+                    source: "FontScanlines.qml"
+                }
+            },
+            State {
+                when: rasterization == pixel_rasterization
+                PropertyChanges {
+                    target: fontManager
+                    source: "FontPixels.qml"
+                }
+            },
+            State {
+                when: rasterization == subpixel_rasterization
+                PropertyChanges {
+                    target: fontManager
+                    source: "FontPixels.qml"
+                }
+            }
         ]
 
         onLoaded: handleFontChanged()
@@ -136,151 +169,160 @@ QtObject{
 
     property FontLoader fontLoader: FontLoader {}
 
-    onTotalFontScalingChanged: handleFontChanged();
+    onTotalFontScalingChanged: handleFontChanged()
-    onFontWidthChanged: handleFontChanged();
+    onFontWidthChanged: handleFontChanged()
 
     function getIndexByName(name) {
         for (var i = 0; i < fontlist.count; i++) {
-            var requestedName = fontlist.get(i).name;
+            var requestedName = fontlist.get(i).name
             if (name === requestedName)
-                return i;
+                return i
         }
-        return 0; // If the font is not available default to 0.
+        return 0 // If the font is not available default to 0.
     }
 
     function incrementScaling() {
-        fontScaling = Math.min(fontScaling + 0.05, maximumFontScaling);
+        fontScaling = Math.min(fontScaling + 0.05, maximumFontScaling)
-        handleFontChanged();
+        handleFontChanged()
     }
 
     function decrementScaling() {
-        fontScaling = Math.max(fontScaling - 0.05, minimumFontScaling);
+        fontScaling = Math.max(fontScaling - 0.05, minimumFontScaling)
-        handleFontChanged();
+        handleFontChanged()
     }
 
     function handleFontChanged() {
-        if (!fontManager.item) return;
+        if (!fontManager.item)
+            return
 
-        var index = getIndexByName(fontNames[rasterization]);
+        var index = getIndexByName(fontNames[rasterization])
-        if (index === undefined) return;
+        if (index === undefined)
+            return
 
-        fontManager.item.selectedFontIndex = index;
+        fontManager.item.selectedFontIndex = index
-        fontManager.item.scaling = totalFontScaling;
+        fontManager.item.scaling = totalFontScaling
 
-        var fontSource = fontManager.item.source;
+        var fontSource = fontManager.item.source
-        var pixelSize = fontManager.item.pixelSize;
+        var pixelSize = fontManager.item.pixelSize
-        var lineSpacing = fontManager.item.lineSpacing;
+        var lineSpacing = fontManager.item.lineSpacing
-        var screenScaling = fontManager.item.screenScaling;
+        var screenScaling = fontManager.item.screenScaling
-        var fontWidth = fontManager.item.defaultFontWidth * appSettings.fontWidth;
+        var fontWidth = fontManager.item.defaultFontWidth * appSettings.fontWidth
-        var fontFamily = fontManager.item.family;
+        var fontFamily = fontManager.item.family
-        var isSystemFont = fontManager.item.isSystemFont;
+        var isSystemFont = fontManager.item.isSystemFont
 
-        lowResolutionFont = fontManager.item.lowResolutionFont;
+        lowResolutionFont = fontManager.item.lowResolutionFont
 
         if (!isSystemFont) {
-            fontLoader.source = fontSource;
+            fontLoader.source = fontSource
-            fontFamily = fontLoader.name;
+            fontFamily = fontLoader.name
         }
 
-        terminalFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling, fontWidth);
+        terminalFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling,
+                            fontWidth)
     }
 
     property Storage storage: Storage {}
 
     function stringify(obj) {
         var replacer = function (key, val) {
-            return val.toFixed ? Number(val.toFixed(4)) : val;
+            return val.toFixed ? Number(val.toFixed(4)) : val
         }
-        return JSON.stringify(obj, replacer, 2);
+        return JSON.stringify(obj, replacer, 2)
     }
 
     function composeSettingsString() {
         var settings = {
-            fps: fps,
+            "fps": fps,
-            x: x,
+            "x": x,
-            y: y,
+            "y": y,
-            width: width,
+            "width": width,
-            height: height,
+            "height": height,
-            windowScaling: windowScaling,
+            "windowScaling": windowScaling,
-            showTerminalSize: showTerminalSize,
+            "showTerminalSize": showTerminalSize,
-            fontScaling: fontScaling,
+            "fontScaling": fontScaling,
-            fontNames: fontNames,
+            "fontNames": fontNames,
-            showMenubar: showMenubar,
+            "showMenubar": showMenubar,
-            bloomQuality: bloomQuality,
+            "bloomQuality": bloomQuality,
-            burnInQuality: burnInQuality,
+            "burnInQuality": burnInQuality,
-            useCustomCommand: useCustomCommand,
+            "useCustomCommand": useCustomCommand,
-            customCommand: customCommand,
+            "customCommand": customCommand
-            useFastBurnIn: useFastBurnIn,
-            blinkingCursor: blinkingCursor
         }
-        return stringify(settings);
+        return stringify(settings)
     }
 
     function composeProfileObject() {
         var settings = {
-            backgroundColor: _backgroundColor,
+            "backgroundColor": _backgroundColor,
-            fontColor: _fontColor,
+            "fontColor": _fontColor,
-            flickering: flickering,
+            "frameColor": _frameColor,
-            horizontalSync: horizontalSync,
+            "flickering": flickering,
-            staticNoise: staticNoise,
+            "horizontalSync": horizontalSync,
-            chromaColor: chromaColor,
+            "staticNoise": staticNoise,
-            saturationColor: saturationColor,
+            "chromaColor": chromaColor,
-            screenCurvature: screenCurvature,
+            "saturationColor": saturationColor,
-            glowingLine: glowingLine,
+            "frameGloss": frameGloss,
-            burnIn: burnIn,
+            "screenCurvature": screenCurvature,
-            bloom: bloom,
+            "glowingLine": glowingLine,
-            rasterization: rasterization,
+            "burnIn": burnIn,
-            jitter: jitter,
+            "bloom": bloom,
-            rbgShift: rbgShift,
+            "rasterization": rasterization,
-            brightness: brightness,
+            "jitter": jitter,
-            contrast: contrast,
+            "rbgShift": rbgShift,
-            ambientLight: ambientLight,
+            "brightness": brightness,
-            windowOpacity: windowOpacity,
+            "contrast": contrast,
-            fontName: fontNames[rasterization],
+            "ambientLight": ambientLight,
-            fontWidth: fontWidth,
+            "windowOpacity": windowOpacity,
-            margin: _margin
+            "fontName": fontNames[rasterization],
+            "fontWidth": fontWidth,
+            "margin": _margin,
+            "blinkingCursor": blinkingCursor,
+            "frameMargin": _frameMargin,
         }
-        return settings;
+        return settings
     }
 
     function composeProfileString() {
-        return stringify(composeProfileObject());
+        return stringify(composeProfileObject())
     }
 
     function loadSettings() {
-        var settingsString = storage.getSetting("_CURRENT_SETTINGS");
+        var settingsString = storage.getSetting("_CURRENT_SETTINGS")
-        var profileString = storage.getSetting("_CURRENT_PROFILE");
+        var profileString = storage.getSetting("_CURRENT_PROFILE")
 
-        if(!settingsString) return;
+        if (!settingsString)
-        if(!profileString) return;
+            return
+        if (!profileString)
+            return
 
-        loadSettingsString(settingsString);
+        loadSettingsString(settingsString)
-        loadProfileString(profileString);
+        loadProfileString(profileString)
 
         if (verbose)
-            console.log("Loading settings: " + settingsString + profileString);
+            console.log("Loading settings: " + settingsString + profileString)
     }
 
     function storeSettings() {
-        var settingsString = composeSettingsString();
+        var settingsString = composeSettingsString()
-        var profileString = composeProfileString();
+        var profileString = composeProfileString()
 
-        storage.setSetting("_CURRENT_SETTINGS", settingsString);
+        storage.setSetting("_CURRENT_SETTINGS", settingsString)
-        storage.setSetting("_CURRENT_PROFILE", profileString);
+        storage.setSetting("_CURRENT_PROFILE", profileString)
 
         if (verbose) {
-            console.log("Storing settings: " + settingsString);
+            console.log("Storing settings: " + settingsString)
-            console.log("Storing profile: " + profileString);
+            console.log("Storing profile: " + profileString)
         }
     }
 
     function loadSettingsString(settingsString) {
-        var settings = JSON.parse(settingsString);
+        var settings = JSON.parse(settingsString)
 
-        showTerminalSize = settings.showTerminalSize !== undefined ? settings.showTerminalSize : showTerminalSize
+        showTerminalSize = settings.showTerminalSize
+                !== undefined ? settings.showTerminalSize : showTerminalSize
 
         fps = settings.fps !== undefined ? settings.fps : fps
-        windowScaling = settings.windowScaling !== undefined ? settings.windowScaling : windowScaling
+        windowScaling = settings.windowScaling
+                !== undefined ? settings.windowScaling : windowScaling
 
         x = settings.x !== undefined ? settings.x : x
         y = settings.y !== undefined ? settings.y : y
@@ -290,98 +332,118 @@ QtObject{
         fontNames = settings.fontNames !== undefined ? settings.fontNames : fontNames
         fontScaling = settings.fontScaling !== undefined ? settings.fontScaling : fontScaling
 
-        showMenubar = settings.showMenubar !== undefined ? settings.showMenubar : showMenubar;
+        showMenubar = settings.showMenubar !== undefined ? settings.showMenubar : showMenubar
 
-        bloomQuality = settings.bloomQuality !== undefined ? settings.bloomQuality : bloomQuality;
+        bloomQuality = settings.bloomQuality !== undefined ? settings.bloomQuality : bloomQuality
-        burnInQuality = settings.burnInQuality !== undefined ? settings.burnInQuality : burnInQuality;
+        burnInQuality = settings.burnInQuality
+                !== undefined ? settings.burnInQuality : burnInQuality
 
-        useCustomCommand = settings.useCustomCommand !== undefined ? settings.useCustomCommand : useCustomCommand
+        useCustomCommand = settings.useCustomCommand
-        customCommand = settings.customCommand !== undefined ? settings.customCommand : customCommand
+                !== undefined ? settings.useCustomCommand : useCustomCommand
-
+        customCommand = settings.customCommand
-        useFastBurnIn = settings.useFastBurnIn !== undefined ? settings.useFastBurnIn : useFastBurnIn;
+                !== undefined ? settings.customCommand : customCommand
-
-        blinkingCursor = settings.blinkingCursor !== undefined ? settings.blinkingCursor : blinkingCursor
     }
 
     function loadProfileString(profileString) {
-        var settings = JSON.parse(profileString);
+        var settings = JSON.parse(profileString)
 
-        _backgroundColor = settings.backgroundColor !== undefined ? settings.backgroundColor : _backgroundColor;
+        _backgroundColor = settings.backgroundColor
-        _fontColor = settings.fontColor !== undefined ? settings.fontColor : _fontColor;
+                !== undefined ? settings.backgroundColor : _backgroundColor
+        _fontColor = settings.fontColor !== undefined ? settings.fontColor : _fontColor
+        _frameColor = settings.frameColor !== undefined ? settings.frameColor : _frameColor
 
-        horizontalSync = settings.horizontalSync !== undefined ? settings.horizontalSync : horizontalSync
+        horizontalSync = settings.horizontalSync
-        flickering = settings.flickering !== undefined ? settings.flickering : flickering;
+                !== undefined ? settings.horizontalSync : horizontalSync
-        staticNoise = settings.staticNoise !== undefined ? settings.staticNoise : staticNoise;
+        flickering = settings.flickering !== undefined ? settings.flickering : flickering
-        chromaColor = settings.chromaColor !== undefined ? settings.chromaColor : chromaColor;
+        staticNoise = settings.staticNoise !== undefined ? settings.staticNoise : staticNoise
-        saturationColor = settings.saturationColor !== undefined ? settings.saturationColor : saturationColor;
+        chromaColor = settings.chromaColor !== undefined ? settings.chromaColor : chromaColor
-        screenCurvature = settings.screenCurvature !== undefined ? settings.screenCurvature : screenCurvature;
+        saturationColor = settings.saturationColor
-        glowingLine = settings.glowingLine !== undefined ? settings.glowingLine : glowingLine;
+                !== undefined ? settings.saturationColor : saturationColor
+        frameGloss = settings.frameGloss !== undefined ? settings.frameGloss : frameGloss
+        screenCurvature = settings.screenCurvature
+                !== undefined ? settings.screenCurvature : screenCurvature
+        glowingLine = settings.glowingLine !== undefined ? settings.glowingLine : glowingLine
 
         burnIn = settings.burnIn !== undefined ? settings.burnIn : burnIn
         bloom = settings.bloom !== undefined ? settings.bloom : bloom
 
-        rasterization = settings.rasterization !== undefined ? settings.rasterization : rasterization;
+        rasterization = settings.rasterization
+                !== undefined ? settings.rasterization : rasterization
 
-        jitter = settings.jitter !== undefined ? settings.jitter : jitter;
+        jitter = settings.jitter !== undefined ? settings.jitter : jitter
 
-        rbgShift = settings.rbgShift !== undefined ? settings.rbgShift : rbgShift;
+        rbgShift = settings.rbgShift !== undefined ? settings.rbgShift : rbgShift
 
-        ambientLight = settings.ambientLight !== undefined ? settings.ambientLight : ambientLight;
+        ambientLight = settings.ambientLight !== undefined ? settings.ambientLight : ambientLight
-        contrast = settings.contrast !== undefined ? settings.contrast : contrast;
+        contrast = settings.contrast !== undefined ? settings.contrast : contrast
-        brightness = settings.brightness !== undefined ? settings.brightness : brightness;
+        brightness = settings.brightness !== undefined ? settings.brightness : brightness
-        windowOpacity = settings.windowOpacity !== undefined ? settings.windowOpacity : windowOpacity;
+        windowOpacity = settings.windowOpacity
+                !== undefined ? settings.windowOpacity : windowOpacity
 
-        fontNames[rasterization] = settings.fontName !== undefined ? settings.fontName : fontNames[rasterization];
+        fontNames[rasterization] = settings.fontName
-        fontWidth = settings.fontWidth !== undefined ? settings.fontWidth : fontWidth;
+                !== undefined ? settings.fontName : fontNames[rasterization]
+        fontWidth = settings.fontWidth !== undefined ? settings.fontWidth : fontWidth
 
-        _margin = settings.margin !== undefined ? settings.margin : _margin;
+        _margin = settings.margin !== undefined ? settings.margin : _margin
+        _frameMargin = settings.frameMargin !== undefined ? settings.frameMargin : _frameMargin
 
-        handleFontChanged();
+        blinkingCursor = settings.blinkingCursor !== undefined ? settings.blinkingCursor : blinkingCursor
+
+        handleFontChanged()
     }
 
     function storeCustomProfiles() {
-        storage.setSetting("_CUSTOM_PROFILES", composeCustomProfilesString());
+        storage.setSetting("_CUSTOM_PROFILES", composeCustomProfilesString())
     }
 
     function loadCustomProfiles() {
-        var customProfileString = storage.getSetting("_CUSTOM_PROFILES");
+        var customProfileString = storage.getSetting("_CUSTOM_PROFILES")
-        if(customProfileString === undefined) customProfileString = "[]";
+        if (customProfileString === undefined)
-        loadCustomProfilesString(customProfileString);
+            customProfileString = "[]"
+        loadCustomProfilesString(customProfileString)
     }
 
     function loadCustomProfilesString(customProfilesString) {
-        var customProfiles = JSON.parse(customProfilesString);
+        var customProfiles = JSON.parse(customProfilesString)
         for (var i = 0; i < customProfiles.length; i++) {
-            var profile = customProfiles[i];
+            var profile = customProfiles[i]
 
             if (verbose)
-                console.log("Loading custom profile: " + stringify(profile));
+                console.log("Loading custom profile: " + stringify(profile))
 
-            profilesList.append(profile);
+            profilesList.append(profile)
         }
     }
 
     function composeCustomProfilesString() {
         var customProfiles = []
         for (var i = 0; i < profilesList.count; i++) {
-            var profile = profilesList.get(i);
+            var profile = profilesList.get(i)
-            if(profile.builtin) continue;
+            if (profile.builtin)
-            customProfiles.push({text: profile.text, obj_string: profile.obj_string, builtin: false})
+                continue
+            customProfiles.push({
+                                    "text": profile.text,
+                                    "obj_string": profile.obj_string,
+                                    "builtin": false
+                                })
         }
-        return stringify(customProfiles);
+        return stringify(customProfiles)
     }
 
     function loadProfile(index) {
-        var profile = profilesList.get(index);
+        var profile = profilesList.get(index)
-        loadProfileString(profile.obj_string);
+        loadProfileString(profile.obj_string)
     }
 
     function appendCustomProfile(name, profileString) {
-        profilesList.append({text: name, obj_string: profileString, builtin: false});
+        profilesList.append({
+                                "text": name,
+                                "obj_string": profileString,
+                                "builtin": false
+                            })
     }
 
     // PROFILES ///////////////////////////////////////////////////////////////
-
     property ListModel profilesList: ListModel {
         ListElement {
             text: "Default Amber"
@@ -404,16 +466,19 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0.2483,
                 "screenCurvature": 0.3,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.1198,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.1
             }'
             builtin: true
         }
         ListElement {
             text: "Monochrome Green"
-            obj_string: '
+            obj_string: '{
-                {
                 "ambientLight": 0.2,
                 "backgroundColor": "#000000",
                 "bloom": 0.5538,
@@ -432,16 +497,19 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0.0,
                 "screenCurvature": 0.3,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.1198,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.1
             }'
             builtin: true
         }
         ListElement {
             text: "Green Scanlines"
-            obj_string: '
+            obj_string: '{
-                {
                 "ambientLight": 0,
                 "backgroundColor": "#000000",
                 "bloom": 0.6,
@@ -460,16 +528,19 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0.5,
                 "screenCurvature": 0.3,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.15,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.1
             }'
             builtin: true
         }
         ListElement {
             text: "Default Pixelated"
-            obj_string: '
+            obj_string: '{
-                {
                 "ambientLight": 0,
                 "backgroundColor": "#000000",
                 "bloom": 0.4045,
@@ -488,16 +559,19 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0,
                 "screenCurvature": 0,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.15,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.1
             }'
             builtin: true
         }
         ListElement {
             text: "Apple ]["
-            obj_string:
+            obj_string: '{
-                '{
                 "ambientLight": 0.3038,
                 "backgroundColor": "#000000",
                 "bloom": 0.5,
@@ -516,16 +590,19 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0,
                 "screenCurvature": 0.5,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.099,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.2
             }'
             builtin: true
         }
         ListElement {
             text: "Vintage"
-            obj_string: '
+            obj_string: '{
-                {
                 "ambientLight": 0.5,
                 "backgroundColor": "#000000",
                 "bloom": 0.4983,
@@ -544,16 +621,19 @@ QtObject{
                 "rbgShift": 0.2969,
                 "saturationColor": 0,
                 "screenCurvature": 0.5,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.2969,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.5
             }'
             builtin: true
         }
         ListElement {
-            text: "IBM Dos"
+            text: "IBM DOS"
-            obj_string:
+            obj_string: '{
-                '{
                 "ambientLight": 0.151,
                 "backgroundColor": "#000000",
                 "bloom": 0.2969,
@@ -572,16 +652,19 @@ QtObject{
                 "rbgShift": 0.3524,
                 "saturationColor": 0,
                 "screenCurvature": 0.4,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.0503,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.2
             }'
             builtin: true
         }
         ListElement {
             text: "IBM 3278"
-            obj_string:
+            obj_string: '{
-                '{
                 "ambientLight": 0.1,
                 "backgroundColor": "#000000",
                 "bloom": 0.2969,
@@ -600,16 +683,19 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0,
                 "screenCurvature": 0.2,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0,
                 "windowOpacity": 1,
-                  "margin": 0.5
+                "margin": 0.5,
+                "blinkingCursor": false,
+                "frameMargin": 0.1
             }'
             builtin: true
         }
         ListElement {
             text: "Futuristic"
-            obj_string:
+            obj_string: '{
-                '{
                 "ambientLight": 0,
                 "backgroundColor": "#000000",
                 "bloom": 0.5017,
@@ -628,9 +714,13 @@ QtObject{
                 "rbgShift": 0,
                 "saturationColor": 0.4983,
                 "screenCurvature": 0,
+                "frameColor": "#ffffff",
+                "frameGloss": 0,
                 "staticNoise": 0.0955,
                 "windowOpacity": 0.7,
-                  "margin": 0.1
+                "margin": 0.1,
+                "blinkingCursor": false,
+                "frameMargin": 0
             }'
             builtin: true
         }
@@ -639,51 +729,51 @@ QtObject{
     function getProfileIndexByName(name) {
         for (var i = 0; i < profilesList.count; i++) {
             if (profilesList.get(i).text === name)
-                return i;
+                return i
         }
-        return -1;
+        return -1
     }
 
     Component.onCompleted: {
         // Manage the arguments from the QML side.
-        var args = Qt.application.arguments;
+        var args = Qt.application.arguments
         if (args.indexOf("--verbose") !== -1) {
-            verbose = true;
+            verbose = true
         }
         if (args.indexOf("--default-settings") === -1) {
-            loadSettings();
+            loadSettings()
         }
 
-        loadCustomProfiles();
+        loadCustomProfiles()
 
-        var profileArgPosition = args.indexOf("--profile");
+        var profileArgPosition = args.indexOf("--profile")
         if (profileArgPosition !== -1) {
-            var profileIndex = getProfileIndexByName(args[profileArgPosition + 1]);
+            var profileIndex = getProfileIndexByName(
+                        args[profileArgPosition + 1])
             if (profileIndex !== -1)
-                loadProfile(profileIndex);
+                loadProfile(profileIndex)
             else
-                console.log("Warning: selected profile is not valid; ignoring it");
+                console.log("Warning: selected profile is not valid; ignoring it")
         }
 
         if (args.indexOf("--fullscreen") !== -1) {
-            fullscreen = true;
+            fullscreen = true
-            showMenubar = false;
+            showMenubar = false
         }
 
         if (args.indexOf("-T") !== -1) {
             wintitle = args[args.indexOf("-T") + 1]
         }
 
-        initializedSettings();
+        initializedSettings()
     }
     Component.onDestruction: {
-        storeSettings();
+        storeSettings()
-        storeCustomProfiles();
+        storeCustomProfiles()
         //        storage.dropSettings(); //DROPS THE SETTINGS!.. REMEMBER TO DISABLE ONCE ENABLED!!
     }
 
     // VARS ///////////////////////////////////////////////////////////////////
-
     property Label _sampleLabel: Label {
         text: "100%"
     }

app/qml/BurnInEffect.qml

@@ -1,3 +1,22 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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 "utils.js" as Utils
@@ -10,26 +29,29 @@ Loader {
     property real lastUpdate: 0
     property real prevLastUpdate: 0
 
-    property real delay: (1.0 / appSettings.fps) * 1000
     property real burnIn: appSettings.burnIn
     property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
     property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
     property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
 
-    active: appSettings.useFastBurnIn && appSettings.burnIn !== 0
+    active: appSettings.burnIn !== 0
 
     anchors.fill: parent
 
     function completelyUpdate() {
-        prevLastUpdate = lastUpdate;
+        let newTime = timeManager.time
-        lastUpdate = timeManager.time;
+        if (newTime > lastUpdate) {
-        item.source.scheduleUpdate();
+            prevLastUpdate = lastUpdate
+            lastUpdate = newTime
+        }
+
+        item.source.scheduleUpdate()
     }
 
     function restartBlurSource() {
-        prevLastUpdate = timeManager.time;
+        prevLastUpdate = timeManager.time
-        lastUpdate = prevLastUpdate;
+        lastUpdate = prevLastUpdate
-        completelyUpdate();
+        completelyUpdate()
     }
 
     sourceComponent: Item {
@@ -53,21 +75,35 @@ Loader {
 
             Connections {
                 target: kterminal
-                onImagePainted: completelyUpdate()
+
+                onImagePainted: {
+                    completelyUpdate()
+                }
             }
             // Restart blurred source settings change.
             Connections {
                 target: appSettings
-                onBurnInChanged: burnInEffect.restartBlurSource();
+
-                onTerminalFontChanged: burnInEffect.restartBlurSource();
+                onBurnInChanged: {
-                onRasterizationChanged: burnInEffect.restartBlurSource();
+                    burnInEffect.restartBlurSource()
-                onBurnInQualityChanged: burnInEffect.restartBlurSource();
                 }
 
-            Connections {
+                onTerminalFontChanged: {
-                target: kterminalScrollbar
+                    burnInEffect.restartBlurSource()
-                onOpacityChanged: completelyUpdate()
                 }
+
+                onRasterizationChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onBurnInQualityChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+            }
+        }
+
+        ShaderLibrary {
+            id: shaderLibrary
         }
 
         ShaderEffect {
@@ -99,9 +135,7 @@ Loader {
 
                  uniform highp float prevLastUpdate;" +
 
-                "float rgb2grey(vec3 v){
+                shaderLibrary.rgb2grey +
-                    return dot(v, vec3(0.21, 0.72, 0.04));
-                }" +
 
                 "void main() {
                     vec2 coords = qt_TexCoord0;

app/qml/CRTMainMenuBar.qml

@@ -1,51 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-
-MenuBar {
-    id: defaultMenuBar
-    property bool visible: true
-    Menu {
-        title: qsTr("File")
-        visible: defaultMenuBar.visible
-        MenuItem {action: quitAction}
-    }
-    Menu {
-        title: qsTr("Edit")
-        visible: defaultMenuBar.visible && appSettings.showMenubar
-        MenuItem {action: copyAction}
-        MenuItem {action: pasteAction}
-        MenuSeparator{visible: Qt.platform.os !== "osx"}
-        MenuItem {action: showsettingsAction}
-    }
-    Menu{
-        title: qsTr("View")
-        visible: defaultMenuBar.visible
-        MenuItem {action: fullscreenAction; visible: fullscreenAction.enabled}
-        MenuItem {action: showMenubarAction; visible: showMenubarAction.enabled}
-        MenuSeparator{visible: showMenubarAction.enabled}
-        MenuItem {action: zoomIn}
-        MenuItem {action: zoomOut}
-    }
-    Menu{
-        id: profilesMenu
-        title: qsTr("Profiles")
-        visible: defaultMenuBar.visible
-        Instantiator{
-            model: appSettings.profilesList
-            delegate: MenuItem {
-                text: model.text
-                onTriggered: {
-                    appSettings.loadProfileString(obj_string);
-                    appSettings.handleFontChanged();
-                }
-            }
-            onObjectAdded: profilesMenu.insertItem(index, object)
-            onObjectRemoved: profilesMenu.removeItem(object)
-        }
-    }
-    Menu{
-        title: qsTr("Help")
-        visible: defaultMenuBar.visible
-        MenuItem {action: showAboutAction}
-    }
-}

app/qml/CheckableSlider.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,9 +17,8 @@
 * 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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
 import "Components"
@@ -28,19 +27,19 @@ RowLayout {
     property alias name: check.text
 
     property double value
-    property alias min_value: slider.minimumValue
+    property alias min_value: slider.from
-    property alias max_value: slider.maximumValue
+    property alias max_value: slider.to
     property alias stepSize: slider.stepSize
 
-    signal newValue(real newValue);
+    signal newValue(real newValue)
 
     id: setting_component
     Layout.fillWidth: true
 
     onValueChanged: {
-        check.checked = !(value == 0);
+        check.checked = !(value == 0)
         if (check.checked)
-            slider.value = value;
+            slider.value = value
     }
 
     CheckBox {
@@ -48,13 +47,13 @@ RowLayout {
         implicitWidth: 160
         onClicked: {
             if (!checked) {
-                checked = false;
+                checked = false
-                slider.enabled = false;
+                slider.enabled = false
-                newValue(0);
+                newValue(0)
             } else {
-                checked = true;
+                checked = true
-                newValue(slider.value);
+                newValue(slider.value)
-                slider.enabled = true;
+                slider.enabled = true
             }
         }
     }
@@ -63,11 +62,11 @@ RowLayout {
         stepSize: parent.stepSize
         Layout.fillWidth: true
         onValueChanged: {
-            newValue(value);
+            newValue(value)
         }
     }
     SizedLabel {
-        Layout.fillHeight: true
+        text: Math.round(
-        text: Math.round(((value - min_value) / (max_value - min_value)) * 100) + "%"
+                  ((value - min_value) / (max_value - min_value)) * 100) + "%"
     }
 }

app/qml/ColorButton.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,7 +17,6 @@
 * 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.2
 import QtQuick.Dialogs 1.1
 
@@ -35,15 +34,14 @@ Item {
         visible: false
 
         //This is a workaround to a Qt 5.2 bug.
-        onColorChanged: if (Qt.platform.os !== "osx") colorSelected(color)
+        onColorChanged: if (!appSettings.isMacOS) colorSelected(color)
-        onAccepted: if (Qt.platform.os === "osx") colorSelected(color)
+        onAccepted: if (appSettings.isMacOS) colorSelected(color)
     }
     Rectangle {
         anchors.fill: parent
         radius: 10
         color: rootItem.color
-        border.color: "black"
+
-        Glossy {}
         Rectangle {
             anchors.fill: parent
             anchors.margins: parent.height * 0.25
@@ -59,6 +57,6 @@ Item {
     }
     MouseArea {
         anchors.fill: parent
-        onClicked: colorDialog.visible = true;
+        onClicked: colorDialog.visible = true
     }
 }

app/qml/Components/SizedLabel.qml

@@ -1,5 +1,7 @@
+
+
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,19 +19,14 @@
 * 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
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
 
 // This component is simply a label with a predefined size.
 // Used to improve alignment.
-
-Item {
-    property alias text: textfield.text
-    width: appSettings.labelWidth
 Label {
     id: textfield
-        anchors { right: parent.right; verticalCenter: parent.verticalCenter }
+    Layout.minimumWidth: appSettings.labelWidth
-    }
+    width: appSettings.labelWidth
 }

app/qml/FontPixels.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,7 +17,6 @@
 * 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.2
 
 QtObject {

app/qml/FontScanlines.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,7 +17,6 @@
 * 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.2
 
 QtObject {

app/qml/Fonts.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,7 +17,6 @@
 * 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.2
 
 QtObject {
@@ -27,17 +26,11 @@ QtObject{
     property var _font: fontlist.get(selectedFontIndex)
     property bool lowResolutionFont: _font.lowResolutionFont
 
-    property int pixelSize: lowResolutionFont
+    property int pixelSize: lowResolutionFont ? _font.pixelSize : _font.pixelSize * scaling
-                                 ? _font.pixelSize
-                                 : _font.pixelSize * scaling
 
-    property int lineSpacing: lowResolutionFont
+    property int lineSpacing: lowResolutionFont ? _font.lineSpacing : pixelSize * _font.lineSpacing
-                                  ? _font.lineSpacing
-                                  : pixelSize * _font.lineSpacing
 
-    property real screenScaling: lowResolutionFont
+    property real screenScaling: lowResolutionFont ? _font.baseScaling * scaling : 1.0
-                                     ? _font.baseScaling * scaling
-                                     : 1.0
 
     property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
 
@@ -52,7 +45,6 @@ QtObject{
     // 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: "TERMINUS_SCALED"
@@ -221,7 +213,7 @@ QtObject{
         ListElement {
             name: "IBM_3278"
             text: "HD: IBM 3278 (1971)"
-            source: "fonts/1971-ibm-3278/3270Medium.ttf"
+            source: "fonts/1971-ibm-3278/3270-Regular.ttf"
             lineSpacing: 0.2
             pixelSize: 32
             fontWidth: 1.0
@@ -234,7 +226,7 @@ QtObject{
     Component.onCompleted: addSystemFonts()
 
     function addSystemFonts() {
-        var families = monospaceSystemFonts;
+        var families = monospaceSystemFonts
         for (var i = 0; i < families.length; i++) {
             if (verbose) {
                 console.log("Adding system font: ", families[i])
@@ -245,16 +237,16 @@ QtObject{
 
     function convertToListElement(family) {
         return {
-            name: "System: " + family,
+            "name": "System: " + family,
-            text: qsTr("System: ") + family,
+            "text": qsTr("System: ") + family,
-            source: "",
+            "source": "",
-            lineSpacing: 0.1,
+            "lineSpacing": 0.1,
-            pixelSize: 30,
+            "pixelSize": 30,
-            fontWidth: 1.0,
+            "fontWidth": 1.0,
-            baseScaling: 1.0,
+            "baseScaling": 1.0,
-            lowResolutionFont: false,
+            "lowResolutionFont": false,
-            isSystemFont: true,
+            "isSystemFont": true,
-            family: family
+            "family": family
         }
     }
 }

app/qml/Glossy.qml

@@ -1,21 +0,0 @@
-import QtQuick 2.2
-
-Rectangle {
-    anchors.centerIn: parent
-    width: parent.width - parent.border.width
-    height: parent.height - parent.border.width
-    radius:parent.radius - parent.border.width/2
-    smooth: true
-
-    border.width: parent.border.width/2
-    border.color: "#22FFFFFF"
-
-    gradient: Gradient {
-        GradientStop { position: 0;    color: "#88FFFFFF" }
-        GradientStop { position: .1;   color: "#55FFFFFF" }
-        GradientStop { position: .5;   color: "#33FFFFFF" }
-        GradientStop { position: .501; color: "#11000000" }
-        GradientStop { position: .8;   color: "#11FFFFFF" }
-        GradientStop { position: 1;    color: "#55FFFFFF" }
-    }
-}

app/qml/InsertNameDialog.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,10 +17,9 @@
 * 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.2
 import QtQuick.Window 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.1
 
@@ -40,23 +39,25 @@ Window{
         visible: false
 
         function showError(message) {
-            text = message;
+            text = message
-            open();
+            open()
         }
     }
 
     function validateName(name) {
-        var profile_list = appSettings.profilesList;
+        var profile_list = appSettings.profilesList
         if (name === "")
-            return 1;
+            return 1
-        return 0;
+        return 0
     }
 
     ColumnLayout {
         anchors.margins: 10
         anchors.fill: parent
         RowLayout {
-            Label{text: qsTr("Name")}
+            Label {
+                text: qsTr("Name")
+            }
             TextField {
                 id: namefield
                 Layout.fillWidth: true
@@ -71,14 +72,15 @@ Window{
                 text: qsTr("OK")
                 onClicked: clickAction()
                 function clickAction() {
-                    var name = namefield.text;
+                    var name = namefield.text
                     switch (validateName(name)) {
                     case 1:
-                        errorDialog.showError(qsTr("The name you inserted is empty. Please choose a different one."));
+                        errorDialog.showError(
-                        break;
+                                    qsTr("The name you inserted is empty. Please choose a different one."))
+                        break
                     default:
-                        nameSelected(name);
+                        nameSelected(name)
-                        close();
+                        close()
                     }
                 }
             }

app/qml/NewTerminalFrame.qml

@@ -1,78 +0,0 @@
-import QtQuick 2.0
-
-import "utils.js" as Utils
-
-ShaderEffect {
-    property color _staticFrameColor: "#ffffff"
-    property color _backgroundColor: appSettings.backgroundColor
-    property color _fontColor: appSettings.fontColor
-    property color _lightColor: Utils.mix(_fontColor, _backgroundColor, 0.2)
-    property real _ambientLight: Utils.lint(0.2, 0.8, appSettings.ambientLight)
-
-    property color frameColor: Utils.mix(_staticFrameColor, _lightColor, _ambientLight)
-    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize
-    property real shadowLength: 0.5 * screenCurvature * Utils.lint(0.50, 1.5, _ambientLight)
-
-    property size aadelta: Qt.size(1.0 / width, 1.0 / height)
-
-    fragmentShader: "
-        #ifdef GL_ES
-            precision mediump float;
-        #endif
-
-        uniform lowp float screenCurvature;
-        uniform lowp float shadowLength;
-        uniform highp float qt_Opacity;
-        uniform lowp vec4 frameColor;
-        uniform mediump vec2 aadelta;
-
-        varying highp vec2 qt_TexCoord0;
-
-        vec2 distortCoordinates(vec2 coords){
-            vec2 cc = (coords - vec2(0.5));
-            float dist = dot(cc, cc) * screenCurvature;
-            return (coords + cc * (1.0 + dist) * dist);
-        }
-
-        float max2(vec2 v) {
-            return max(v.x, v.y);
-        }
-
-        float min2(vec2 v) {
-            return min(v.x, v.y);
-        }
-
-        float prod2(vec2 v) {
-            return v.x * v.y;
-        }
-
-        float sum2(vec2 v) {
-            return v.x + v.y;
-        }
-
-        void main(){
-            vec2 staticCoords = qt_TexCoord0;
-            vec2 coords = distortCoordinates(staticCoords);
-
-            vec3 color = vec3(0.0);
-            float alpha = 0.0;
-
-            float outShadowLength = shadowLength;
-            float inShadowLength = shadowLength * 0.5;
-
-            float outShadow = max2(1.0 - smoothstep(vec2(-outShadowLength), vec2(0.0), coords) + smoothstep(vec2(1.0), vec2(1.0 + outShadowLength), coords));
-            outShadow = clamp(sqrt(outShadow), 0.0, 1.0);
-            color += frameColor.rgb * outShadow;
-            alpha = sum2(1.0 - smoothstep(vec2(0.0), aadelta, coords) + smoothstep(vec2(1.0) - aadelta, vec2(1.0), coords));
-            alpha = clamp(alpha, 0.0, 1.0) * mix(1.0, 0.9, outShadow);
-
-            float inShadow = 1.0 - prod2(smoothstep(0.0, inShadowLength, coords) - smoothstep(1.0 - inShadowLength, 1.0, coords));
-            inShadow = 0.5 * inShadow * inShadow;
-            alpha = max(alpha, inShadow);
-
-            gl_FragColor = vec4(color * alpha, alpha);
-        }
-    "
-
-    onStatusChanged: if (log) console.log(log) //Print warning messages
-}

app/qml/PreprocessedTerminal.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -19,10 +19,11 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 
 import QMLTermWidget 1.0
 
+import "menus"
 import "utils.js" as Utils
 
 Item{
@@ -33,7 +34,6 @@ Item{
 
     property ShaderEffectSource mainSource: kterminalSource
     property BurnInEffect burnInEffect: burnInEffect
-    property SlowBurnIn slowBurnInEffect: slowBurnInEffect
     property real fontWidth: 1.0
     property real screenScaling: 1.0
     property real scaleTexture: 1.0
@@ -46,33 +46,66 @@ Item{
     // Manage copy and paste
     Connections {
         target: copyAction
-        onTriggered: kterminal.copyClipboard();
+
+        onTriggered: {
+            kterminal.copyClipboard()
+        }
     }
     Connections {
         target: pasteAction
-        onTriggered: kterminal.pasteClipboard()
+
+        onTriggered: {
+            kterminal.pasteClipboard()
+        }
+    }
+    Connections {
+        target: pasteActionAlt
+
+        onTriggered: {
+            kterminal.pasteSelection()
+        }
     }
 
     //When settings are updated sources need to be redrawn.
     Connections {
         target: appSettings
-        onFontScalingChanged: terminalContainer.updateSources();
+
-        onFontWidthChanged: terminalContainer.updateSources();
+        onFontScalingChanged: {
+            terminalContainer.updateSources()
+        }
+
+        onFontWidthChanged: {
+            terminalContainer.updateSources()
+        }
     }
     Connections {
         target: terminalContainer
-        onWidthChanged: terminalContainer.updateSources();
+
-        onHeightChanged: terminalContainer.updateSources();
+        onWidthChanged: {
+            terminalContainer.updateSources()
         }
+
+        onHeightChanged: {
+            terminalContainer.updateSources()
+        }
+    }
+    Connections {
+        target: terminalWindow
+
+        onActiveChanged: {
+            kterminal.forceActiveFocus()
+        }
+    }
+
     function updateSources() {
-        kterminal.update();
+        kterminal.update()
     }
 
     QMLTermWidget {
         id: kterminal
 
         property int textureResolutionScale: appSettings.lowResolutionFont ? devicePixelRatio : 1
-        property int margin: appSettings.margin / screenScaling
+        property int margin: appSettings.totalMargin / screenScaling
         property int totalWidth: Math.floor(parent.width / (screenScaling * fontWidth))
         property int totalHeight: Math.floor(parent.height / screenScaling)
 
@@ -142,7 +175,7 @@ Item{
                 var args = Utils.tokenizeCommandLine(appSettings.customCommand);
                 ksession.setShellProgram(args[0]);
                 ksession.setArgs(args.slice(1));
-            } else if (!defaultCmd && Qt.platform.os === "osx") {
+            } else if (!defaultCmd && appSettings.isMacOS) {
                 // OSX Requires the following default parameters for auto login.
                 ksession.setArgs(["-i", "-l"]);
             }
@@ -156,36 +189,28 @@ Item{
         Component.onCompleted: {
             appSettings.terminalFontChanged.connect(handleFontChanged);
             appSettings.initializedSettings.connect(startSession);
+            appSettings.handleFontChanged()
         }
     }
+
     Component {
-        id: linuxContextMenu
+        id: shortContextMenu
-        Menu{
+        ShortContextMenu { }
-            id: contextmenu
-            MenuItem { action: copyAction }
-            MenuItem { action: pasteAction }
-            MenuSeparator { visible: !appSettings.showMenubar }
-            MenuItem { action: showsettingsAction ; visible: !appSettings.showMenubar}
-            MenuSeparator { visible: !appSettings.showMenubar }
-            CRTMainMenuBar { visible: !appSettings.showMenubar }
-        }
     }
+
     Component {
-        id: osxContextMenu
+        id: fullContextMenu
-        Menu{
+        FullContextMenu { }
-            id: contextmenu
-            MenuItem{action: copyAction}
-            MenuItem{action: pasteAction}
-        }
     }
+
     Loader {
         id: menuLoader
-        sourceComponent: (Qt.platform.os === "osx" ? osxContextMenu : linuxContextMenu)
+        sourceComponent: (appSettings.isMacOS || appSettings.showMenubar ? shortContextMenu : fullContextMenu)
     }
     property alias contextmenu: menuLoader.item
 
     MouseArea {
-        property real margin: appSettings.margin
+        property real margin: appSettings.totalMargin
 
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: parent
@@ -226,8 +251,8 @@ Item{
             var cc = Qt.size(0.5 - x, 0.5 - y);
             var distortion = (cc.height * cc.height + cc.width * cc.width) * appSettings.screenCurvature * appSettings.screenCurvatureSize;
 
-            return Qt.point((x - cc.width  * (1+distortion) * distortion) * kterminal.totalWidth,
+            return Qt.point((x - cc.width  * (1+distortion) * distortion) * (kterminal.totalWidth),
-                           (y - cc.height * (1+distortion) * distortion) * kterminal.totalHeight)
+                           (y - cc.height * (1+distortion) * distortion) * (kterminal.totalHeight))
         }
     }
     ShaderEffectSource{
@@ -257,9 +282,5 @@ Item{
         BurnInEffect {
             id: burnInEffect
         }
-
-        SlowBurnIn {
-            id: slowBurnInEffect
-        }
     }
 }

app/qml/SettingsAdvancedTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,20 +17,18 @@
 * 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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
+import QtQml 2.0
 
 import "Components"
 
-Tab{
 ColumnLayout {
-        anchors.fill: parent
-
     GroupBox {
         Layout.fillWidth: true
         title: qsTr("Command")
+
         ColumnLayout {
             anchors.fill: parent
             CheckBox {
@@ -54,9 +52,10 @@ Tab{
 
                 // Save text even if user forgets to press enter or unfocus
                 function saveSetting() {
-                        appSettings.customCommand = text;
+                    appSettings.customCommand = text
                 }
-                    Component.onCompleted: settings_window.closing.connect(saveSetting)
+                Component.onCompleted: settings_window.closing.connect(
+                                           saveSetting)
             }
         }
     }
@@ -66,79 +65,94 @@ Tab{
         Layout.fillWidth: true
         GridLayout {
             anchors.fill: parent
-                rows: 2
+            columns: 4
-                columns: 3
 
-                Label{text: qsTr("Effects FPS")}
+            Label {
+                text: qsTr("Effects FPS")
+            }
             Slider {
                 Layout.fillWidth: true
+                Layout.columnSpan: 2
                 id: fpsSlider
                 onValueChanged: {
                     if (enabled) {
-                            appSettings.fps = value !== 60 ? value + 1 : 0;
+                        appSettings.fps = value !== 60 ? value + 1 : 0
                     }
                 }
                 stepSize: 1
                 enabled: false
                 Component.onCompleted: {
-                        minimumValue = 0;
+                    from = 0
-                        maximumValue = 60;
+                    to = 60
-                        value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60;
+                    value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60
-                        enabled = true;
+                    enabled = true
                 }
             }
 
-                SizedLabel{text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")}
+            SizedLabel {
-                Label{text: qsTr("Texture Quality")}
+                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;
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                onValueChanged: if (enabled)
+                                    appSettings.windowScaling = value
                 stepSize: 0.05
                 enabled: false
                 Component.onCompleted: {
-                        minimumValue = 0.25 //Without this value gets set to 0.5
+                    from = 0.25 //Without this value gets set to 0.5
-                        value = appSettings.windowScaling;
+                    value = appSettings.windowScaling
-                        enabled = true;
+                    enabled = true
                 }
             }
-                SizedLabel{text: Math.round(txtslider.value * 100) + "%"}
+            SizedLabel {
+                text: Math.round(txtslider.value * 100) + "%"
+            }
 
-                Label{text: qsTr("Bloom Quality")}
+            Label {
+                text: qsTr("Bloom Quality")
+            }
             Slider {
                 Layout.fillWidth: true
+                Layout.columnSpan: 2
                 id: bloomSlider
-                    onValueChanged: if (enabled) appSettings.bloomQuality = value;
+                onValueChanged: if (enabled)
+                                    appSettings.bloomQuality = value
                 stepSize: 0.05
                 enabled: false
                 Component.onCompleted: {
-                        minimumValue = 0.25
+                    from = 0.25
-                        value = appSettings.bloomQuality;
+                    value = appSettings.bloomQuality
-                        enabled = true;
+                    enabled = true
                 }
             }
-                SizedLabel{text: Math.round(bloomSlider.value * 100) + "%"}
+            SizedLabel {
+                text: Math.round(bloomSlider.value * 100) + "%"
+            }
 
-                Label{text: qsTr("BurnIn Quality")}
+            Label {
+                text: qsTr("BurnIn Quality")
+            }
             Slider {
                 Layout.fillWidth: true
                 id: burnInSlider
-                    onValueChanged: if (enabled) appSettings.burnInQuality = value;
+                Layout.columnSpan: 2
+                onValueChanged: if (enabled)
+                                    appSettings.burnInQuality = value
                 stepSize: 0.05
                 enabled: false
                 Component.onCompleted: {
-                        minimumValue = 0.25
+                    from = 0.25
-                        value = appSettings.burnInQuality;
+                    value = appSettings.burnInQuality
-                        enabled = true;
+                    enabled = true
                 }
             }
-                SizedLabel{text: Math.round(burnInSlider.value * 100) + "%"}
+            SizedLabel {
-                CheckBox{
+                text: Math.round(burnInSlider.value * 100) + "%"
-                    Layout.columnSpan: 2
-                    text: qsTr("Burnin optimization (Might display timing artifacts)")
-                    checked: appSettings.useFastBurnIn
-                    onCheckedChanged: appSettings.useFastBurnIn = checked
-                }
             }
         }
     }

app/qml/SettingsEffectsTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,14 +17,11 @@
 * 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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
-Tab{
 ColumnLayout {
-        anchors.fill: parent
     spacing: 2
 
     GroupBox {
@@ -56,35 +53,34 @@ Tab{
             }
             CheckableSlider {
                 name: qsTr("Glow Line")
-                    onNewValue: appSettings.glowingLine = newValue;
+                onNewValue: appSettings.glowingLine = newValue
                 value: appSettings.glowingLine
             }
             CheckableSlider {
                 name: qsTr("Screen Curvature")
-                    onNewValue: appSettings.screenCurvature = newValue;
+                onNewValue: appSettings.screenCurvature = newValue
-                    value: appSettings.screenCurvature;
+                value: appSettings.screenCurvature
             }
             CheckableSlider {
                 name: qsTr("Ambient Light")
-                    onNewValue: appSettings.ambientLight = newValue;
+                onNewValue: appSettings.ambientLight = newValue
                 value: appSettings.ambientLight
                 enabled: appSettings.framesIndex !== 0
             }
             CheckableSlider {
                 name: qsTr("Flickering")
-                    onNewValue: appSettings.flickering = newValue;
+                onNewValue: appSettings.flickering = newValue
-                    value: appSettings.flickering;
+                value: appSettings.flickering
             }
             CheckableSlider {
                 name: qsTr("Horizontal Sync")
-                    onNewValue: appSettings.horizontalSync = newValue;
+                onNewValue: appSettings.horizontalSync = newValue
-                    value: appSettings.horizontalSync;
+                value: appSettings.horizontalSync
             }
             CheckableSlider {
                 name: qsTr("RGB Shift")
-                    onNewValue: appSettings.rbgShift = newValue;
+                onNewValue: appSettings.rbgShift = newValue
-                    value: appSettings.rbgShift;
+                value: appSettings.rbgShift
-                }
             }
         }
     }

app/qml/SettingsGeneralTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,34 +17,36 @@
 * 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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.1
 
-Tab{
 ColumnLayout {
-        anchors.fill: parent
     GroupBox {
         Layout.fillWidth: true
-            Layout.fillHeight: true
         title: qsTr("Profile")
         RowLayout {
             anchors.fill: parent
-                TableView {
+            ListView {
                 id: profilesView
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 model: appSettings.profilesList
-                    headerVisible: false
+                clip: true
-                    TableViewColumn {
+                delegate: Rectangle {
-                        title: qsTr("Profile")
+                    width: label.width
-                        role: "text"
+                    height: label.height
-                        width: parent.width * 0.5
+                    color: (index == profilesView.currentIndex) ? palette.highlight : palette.base
+                    Label {
+                        id: label
+                        text: appSettings.profilesList.get(index).text
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: profilesView.currentIndex = index
+                            onDoubleClicked: appSettings.loadProfile(index)
+                        }
                     }
-                    onActivated: {
-                        appSettings.loadProfile(row);
                 }
             }
             ColumnLayout {
@@ -54,34 +56,35 @@ Tab{
                     Layout.fillWidth: true
                     text: qsTr("Save")
                     onClicked: {
-                            insertname.profileName = "";
+                        insertname.profileName = ""
                         insertname.show()
                     }
                 }
                 Button {
                     Layout.fillWidth: true
-                        property alias currentIndex: profilesView.currentRow
+                    property alias currentIndex: profilesView.currentIndex
                     enabled: currentIndex >= 0
                     text: qsTr("Load")
                     onClicked: {
-                            var index = profilesView.currentRow;
+                        var index = currentIndex
                         if (index >= 0)
-                                appSettings.loadProfile(index);
+                            appSettings.loadProfile(index)
                     }
                 }
                 Button {
                     Layout.fillWidth: true
                     text: qsTr("Remove")
-                        property alias currentIndex: profilesView.currentRow
+                    property alias currentIndex: profilesView.currentIndex
 
-                        enabled: currentIndex >= 0 && !appSettings.profilesList.get(currentIndex).builtin
+                    enabled: currentIndex >= 0 && !appSettings.profilesList.get(
+                                 currentIndex).builtin
                     onClicked: {
-                            appSettings.profilesList.remove(currentIndex);
+                        appSettings.profilesList.remove(currentIndex)
-                            profilesView.selection.clear();
+                        profilesView.selection.clear()
 
                         // TODO This is a very ugly workaround. The view didn't update on Qt 5.3.2.
-                            profilesView.model = 0;
+                        profilesView.model = 0
-                            profilesView.model = appSettings.profilesList;
+                        profilesView.model = appSettings.profilesList
                     }
                 }
                 Item {
@@ -92,70 +95,84 @@ Tab{
                     Layout.fillWidth: true
                     text: qsTr("Import")
                     onClicked: {
-                            fileDialog.selectExisting = true;
+                        fileDialog.selectExisting = true
-                            fileDialog.callBack = function (url) {loadFile(url);};
+                        fileDialog.callBack = function (url) {
-                            fileDialog.open();
+                            loadFile(url)
+                        }
+                        fileDialog.open()
                     }
                     function loadFile(url) {
                         try {
                             if (appSettings.verbose)
-                                    console.log("Loading file: " + url);
+                                console.log("Loading file: " + url)
 
-                                var profileObject = JSON.parse(fileIO.read(url));
+                            var profileObject = JSON.parse(fileIO.read(url))
-                                var name = profileObject.name;
+                            var name = profileObject.name
 
                             if (!name)
-                                    throw "Profile doesn't have a name";
+                                throw "Profile doesn't have a name"
 
-                                var version = profileObject.version !== undefined ? profileObject.version : 1;
+                            var version = profileObject.version
+                                    !== undefined ? profileObject.version : 1
                             if (version !== appSettings.profileVersion)
-                                    throw "This profile is not supported on this version of CRT.";
+                                throw "This profile is not supported on this version of CRT."
 
-                                delete profileObject.name;
+                            delete profileObject.name
 
-                                appSettings.appendCustomProfile(name, JSON.stringify(profileObject));
+                            appSettings.appendCustomProfile(name,
+                                                            JSON.stringify(
+                                                                profileObject))
                         } catch (err) {
                             messageDialog.text = qsTr(err)
-                                messageDialog.open();
+                            messageDialog.open()
                         }
                     }
                 }
                 Button {
-                        property alias currentIndex: profilesView.currentRow
+                    property alias currentIndex: profilesView.currentIndex
 
                     Layout.fillWidth: true
 
                     text: qsTr("Export")
-                        enabled: currentIndex >= 0 && !appSettings.profilesList.get(currentIndex).builtin
+                    enabled: currentIndex >= 0 && !appSettings.profilesList.get(
+                                 currentIndex).builtin
                     onClicked: {
-                            fileDialog.selectExisting = false;
+                        fileDialog.selectExisting = false
-                            fileDialog.callBack = function (url) {storeFile(url);};
+                        fileDialog.callBack = function (url) {
-                            fileDialog.open();
+                            storeFile(url)
+                        }
+                        fileDialog.open()
                     }
                     function storeFile(url) {
                         try {
-                                var urlString = url.toString();
+                            var urlString = url.toString()
 
                             // Fix the extension if it's missing.
-                                var extension = urlString.substring(urlString.length - 5, urlString.length);
+                            var extension = urlString.substring(
-                                var urlTail = (extension === ".json" ? "" : ".json");
+                                        urlString.length - 5, urlString.length)
-                                url += urlTail;
+                            var urlTail = (extension === ".json" ? "" : ".json")
+                            url += urlTail
 
                             if (true)
-                                    console.log("Storing file: " + url);
+                                console.log("Storing file: " + url)
 
-                                var profileObject = appSettings.profilesList.get(currentIndex);
+                            var profileObject = appSettings.profilesList.get(
-                                var profileSettings = JSON.parse(profileObject.obj_string);
+                                        currentIndex)
-                                profileSettings["name"] = profileObject.text;
+                            var profileSettings = JSON.parse(
-                                profileSettings["version"] = appSettings.profileVersion;
+                                        profileObject.obj_string)
+                            profileSettings["name"] = profileObject.text
+                            profileSettings["version"] = appSettings.profileVersion
 
-                                var result = fileIO.write(url, JSON.stringify(profileSettings, undefined, 2));
+                            var result = fileIO.write(url, JSON.stringify(
+                                                          profileSettings,
+                                                          undefined, 2))
                             if (!result)
-                                    throw "The file could not be written.";
+                                throw "The file could not be written."
                         } catch (err) {
-                                console.log(err);
+                            console.log(err)
-                                messageDialog.text = qsTr("There has been an error storing the file.")
+                            messageDialog.text = qsTr(
-                                messageDialog.open();
+                                        "There has been an error storing the file.")
+                            messageDialog.open()
                         }
                     }
                 }
@@ -169,25 +186,42 @@ Tab{
         GridLayout {
             anchors.fill: parent
             columns: 2
-                Label{ text: qsTr("Brightness") }
+            Label {
+                text: qsTr("Brightness")
+            }
             SimpleSlider {
                 onValueChanged: appSettings.brightness = value
                 value: appSettings.brightness
             }
-                Label{ text: qsTr("Contrast") }
+            Label {
+                text: qsTr("Contrast")
+            }
             SimpleSlider {
                 onValueChanged: appSettings.contrast = value
                 value: appSettings.contrast
             }
-                Label{ text: qsTr("Margin") }
+            Label {
+                text: qsTr("Margin")
+            }
             SimpleSlider {
                 onValueChanged: appSettings._margin = value
                 value: appSettings._margin
             }
-                Label{ text: qsTr("Opacity") }
+            Label {
+                text: qsTr("Frame size")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings._frameMargin = value
+                value: appSettings._frameMargin
+            }
+            Label {
+                text: qsTr("Opacity")
+                visible: !appSettings.isMacOS
+            }
             SimpleSlider {
                 onValueChanged: appSettings.windowOpacity = value
                 value: appSettings.windowOpacity
+                visible: !appSettings.isMacOS
             }
         }
     }
@@ -196,14 +230,15 @@ Tab{
     InsertNameDialog {
         id: insertname
         onNameSelected: {
-                appSettings.appendCustomProfile(name, appSettings.composeProfileString());
+            appSettings.appendCustomProfile(name,
+                                            appSettings.composeProfileString())
         }
     }
     MessageDialog {
         id: messageDialog
         title: qsTr("File Error")
         onAccepted: {
-                messageDialog.close();
+            messageDialog.close()
         }
     }
     Loader {
@@ -216,19 +251,18 @@ Tab{
             selectMultiple: false
             selectFolder: false
             selectExisting: fileDialog.selectExisting
-                onAccepted: callBack(fileUrl);
+            onAccepted: callBack(fileUrl)
         }
 
         onSelectExistingChanged: reload()
 
         function open() {
-                item.open();
+            item.open()
         }
 
         function reload() {
-                active = false;
+            active = false
-                active = true;
+            active = true
-            }
         }
     }
 }

app/qml/SettingsTerminalTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,16 +17,14 @@
 * 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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
+import QtQml 2.0
 
 import "Components"
 
-Tab{
 ColumnLayout {
-        anchors.fill: parent
 
     GroupBox {
         title: qsTr("Font")
@@ -34,79 +32,80 @@ Tab{
         GridLayout {
             anchors.fill: parent
             columns: 2
-                Label { text: qsTr("Rasterization") }
+            Label {
+                text: qsTr("Rasterization")
+            }
             ComboBox {
                 id: rasterizationBox
 
                 property string selectedElement: model[currentIndex]
 
                 Layout.fillWidth: true
-                    model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")]
+                model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels"), qsTr("Sub-Pixels")]
                 currentIndex: appSettings.rasterization
                 onCurrentIndexChanged: {
                     appSettings.rasterization = currentIndex
                 }
             }
-                Label{ text: qsTr("Name") }
+            Label {
+                text: qsTr("Name")
+            }
             ComboBox {
                 id: fontChanger
                 Layout.fillWidth: true
                 model: appSettings.fontlist
+                textRole: "text"
                 onActivated: {
-                        var name = appSettings.fontlist.get(index).name;
+                    var name = appSettings.fontlist.get(index).name
-                        appSettings.fontNames[appSettings.rasterization] = name;
+                    appSettings.fontNames[appSettings.rasterization] = name
-                        appSettings.handleFontChanged();
+                    appSettings.handleFontChanged()
                 }
                 function updateIndex() {
-                        var name = appSettings.fontNames[appSettings.rasterization];
+                    var name = appSettings.fontNames[appSettings.rasterization]
-                        var index = appSettings.getIndexByName(name);
+                    var index = appSettings.getIndexByName(name)
                     if (index !== undefined)
-                            currentIndex = index;
+                        currentIndex = index
                 }
                 Connections {
                     target: appSettings
-                        onTerminalFontChanged: fontChanger.updateIndex();
+
+                    onTerminalFontChanged: {
+                        fontChanger.updateIndex()
                     }
-                    Component.onCompleted: updateIndex();
                 }
-                Label{ text: qsTr("Scaling") }
+                Component.onCompleted: updateIndex()
+            }
+            Label {
+                text: qsTr("Scaling")
+            }
             RowLayout {
                 Layout.fillWidth: true
                 Slider {
                     Layout.fillWidth: true
                     id: fontScalingChanger
-                        onValueChanged: if(enabled) appSettings.fontScaling = value
+                    onValueChanged: appSettings.fontScaling = value
+                    value: appSettings.fontScaling
                     stepSize: 0.05
-                        enabled: false // Another trick to fix initial bad behavior.
+                    from: appSettings.minimumFontScaling
-                        Component.onCompleted: {
+                    to: appSettings.maximumFontScaling
-                            minimumValue = appSettings.minimumFontScaling;
-                            maximumValue = appSettings.maximumFontScaling;
-                            value = appSettings.fontScaling;
-                            enabled = true;
-                        }
-                        Connections{
-                            target: appSettings
-                            onFontScalingChanged: fontScalingChanger.value = appSettings.fontScaling;
-                        }
                 }
                 SizedLabel {
                     text: Math.round(fontScalingChanger.value * 100) + "%"
                 }
             }
-                Label{ text: qsTr("Font Width") }
+            Label {
+                text: qsTr("Font Width")
+            }
             RowLayout {
                 Layout.fillWidth: true
                 Slider {
                     Layout.fillWidth: true
                     id: widthChanger
-                        onValueChanged: appSettings.fontWidth = value;
+                    onValueChanged: appSettings.fontWidth = value
                     value: appSettings.fontWidth
                     stepSize: 0.05
-                        Component.onCompleted: {
+                    from: 0.5
-                            // This is needed to avoid unnecessary chnaged events.
+                    to: 1.5
-                            minimumValue = 0.5;
-                            maximumValue = 1.5;
-                        }
                 }
                 SizedLabel {
                     text: Math.round(widthChanger.value * 100) + "%"
@@ -150,6 +149,11 @@ Tab{
                     value: appSettings.saturationColor
                     enabled: appSettings.chromaColor !== 0
                 }
+                CheckableSlider {
+                    name: qsTr("Frame Gloss")
+                    onNewValue: appSettings.frameGloss = newValue
+                    value: appSettings.frameGloss
+                }
             }
             RowLayout {
                 Layout.fillWidth: true
@@ -157,16 +161,22 @@ Tab{
                     name: qsTr("Font")
                     height: 50
                     Layout.fillWidth: true
-                        onColorSelected: appSettings._fontColor = color;
+                    onColorSelected: appSettings._fontColor = color
                     color: appSettings._fontColor
                 }
                 ColorButton {
                     name: qsTr("Background")
                     height: 50
                     Layout.fillWidth: true
-                        onColorSelected: appSettings._backgroundColor = color;
+                    onColorSelected: appSettings._backgroundColor = color
                     color: appSettings._backgroundColor
                 }
+                ColorButton {
+                    name: qsTr("Frame")
+                    height: 50
+                    Layout.fillWidth: true
+                    onColorSelected: appSettings._frameColor = color
+                    color: appSettings._frameColor
                 }
             }
         }

app/qml/SettingsWindow.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -19,46 +19,57 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Window 2.1
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.1
 
 Window {
     id: settings_window
     title: qsTr("Settings")
-    width: 580
+    width: 640
-    height: 400
+    height: 640
 
     property int tabmargins: 15
 
-    TabView{
+    Item {
-        id: tabView
+        anchors { fill: parent;  margins: tabmargins }
+
+        TabBar {
+            id: bar
+            anchors { left: parent.left; right: parent.right; top: parent.top; }
+            TabButton {
+                text: qsTr("General")
+            }
+            TabButton {
+                text: qsTr("Terminal")
+            }
+            TabButton {
+                text: qsTr("Effects")
+            }
+            TabButton {
+                text: qsTr("Advanced")
+            }
+        }
+
+        Frame {
+            anchors {
+                top: bar.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+
+            StackLayout {
                 anchors.fill: parent
-        anchors.margins: 10
+
-        SettingsGeneralTab {
+                currentIndex: bar.currentIndex
-            id: generalTab
+
-            title: qsTr("General")
+                SettingsGeneralTab { }
-            anchors.fill: parent
+                SettingsTerminalTab { }
-            anchors.margins: tabmargins
+                SettingsEffectsTab { }
-        }
+                SettingsAdvancedTab { }
-        SettingsTerminalTab {
+            }
-            id: terminalTab
-            title: qsTr("Terminal")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsEffectsTab {
-            id: effectsTab
-            title: qsTr("Effects")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsAdvancedTab {
-            id: performanceTab
-            title: qsTr("Advanced")
-            anchors.fill: parent
-            anchors.margins: tabmargins
         }
     }
 }

app/qml/ShaderLibrary.qml

@@ -0,0 +1,91 @@
+import QtQuick 2.0
+
+QtObject {
+    property string rasterizationShader:
+        (appSettings.rasterization === appSettings.no_rasterization ? "
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                return texel;
+            }" : "") +
+
+        (appSettings.rasterization === appSettings.scanline_rasterization ? "
+            #define INTENSITY 0.30
+            #define BRIGHTBOOST 0.30
+
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                lowp vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * texel)) * texel;
+                lowp vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * texel)) * texel;
+
+                vec2 coords = fract(screenCoords * virtualResolution) * 2.0 - vec2(1.0);
+                lowp float mask = 1.0 - abs(coords.y);
+
+                lowp vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+                return mix(texel, rasterizationColor, intensity);
+            }" : "") +
+
+        (appSettings.rasterization === appSettings.pixel_rasterization ? "
+            #define INTENSITY 0.30
+            #define BRIGHTBOOST 0.30
+
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                lowp vec3 result = texel;
+
+                lowp vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * texel)) * texel;
+                lowp vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * texel)) * texel;
+
+                vec2 coords = fract(screenCoords * virtualResolution) * 2.0 - vec2(1.0);
+                coords = coords * coords;
+                lowp float mask = 1.0 - coords.x - coords.y;
+
+                lowp vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+                return mix(texel, rasterizationColor, intensity);
+            }" : "") +
+
+        (appSettings.rasterization === appSettings.subpixel_rasterization ? "
+            #define INTENSITY 0.30
+            #define BRIGHTBOOST 0.30
+            #define SUBPIXELS 3.0
+            const vec3 offsets = vec3(3.141592654) * vec3(1.0/2.0,1.0/2.0 - 2.0/3.0,1.0/2.0-4.0/3.0);
+
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                vec2 omega = vec2(3.141592654) * vec2(2.0) * virtualResolution;
+                vec2 angle = screenCoords * omega;
+                vec3 xfactors = (SUBPIXELS + sin(angle.x + offsets)) / (SUBPIXELS + 1.0);
+
+                lowp vec3 result = texel * xfactors;
+                lowp vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * result)) * result;
+                lowp vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * result)) * result;
+
+                vec2 coords = fract(screenCoords * virtualResolution) * 2.0 - vec2(1.0);
+                lowp float mask = 1.0 - abs(coords.y);
+
+                lowp vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+                return mix(texel, rasterizationColor, intensity);
+            }" : "") +
+
+        "\n\n"
+
+    property string min2: "
+        float min2(vec2 v) {
+            return min(v.x, v.y);
+        }\n\n"
+
+    property string rgb2grey: "
+        float rgb2grey(vec3 v) {
+            return dot(v, vec3(0.21, 0.72, 0.04));
+        }\n\n"
+
+    property string max2: "
+        float max2(vec2 v) {
+            return max(v.x, v.y);
+        }\n\n"
+
+    property string prod2: "
+        float prod2(vec2 v) {
+            return v.x * v.y;
+        }\n\n"
+
+    property string sum2: "
+        float sum2(vec2 v) {
+            return v.x + v.y;
+        }\n\n"
+}

app/qml/ShaderTerminal.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -24,7 +24,6 @@ import QtGraphicalEffects 1.0
 import "utils.js" as Utils
 
 Item {
-    property SlowBurnIn slowBurnInEffect
     property ShaderEffectSource source
     property BurnInEffect burnInEffect
     property ShaderEffectSource bloomSource
@@ -38,11 +37,21 @@ Item {
 
     property real ambientLight: appSettings.ambientLight * 0.2
 
-    property size virtual_resolution
+    property real frameGloss: appSettings.frameGloss
+
+    property size virtualResolution
+    property size screenResolution
+
+    property real _screenDensity: Math.min(
+        screenResolution.width / virtualResolution.width,
+        screenResolution.height / virtualResolution.height
+    )
 
      ShaderEffect {
          id: dynamicShader
 
+         property ShaderLibrary shaderLibrary: ShaderLibrary { }
+
          property ShaderEffectSource screenBuffer: frameBuffer
          property ShaderEffectSource burnInSource: burnInEffect.source
          property ShaderEffectSource frameSource: terminalFrameLoader.item
@@ -52,6 +61,7 @@ Item {
          property real screenCurvature: parent.screenCurvature
          property real chromaColor: parent.chromaColor
          property real ambientLight: parent.ambientLight
+         property real frameGloss: parent.frameGloss
 
          property real flickering: appSettings.flickering
          property real horizontalSync: appSettings.horizontalSync
@@ -59,22 +69,24 @@ Item {
          property real glowingLine: appSettings.glowingLine * 0.2
 
          // Fast burnin properties
-         property real burnIn: appSettings.useFastBurnIn ? appSettings.burnIn : 0
+         property real burnIn: appSettings.burnIn
          property real burnInLastUpdate: burnInEffect.lastUpdate
          property real burnInTime: burnInEffect.burnInFadeTime
 
-         // Slow burnin properties
-         property real slowBurnIn: appSettings.useFastBurnIn ? 0 : appSettings.burnIn
-         property ShaderEffectSource slowBurnInSource: slowBurnInEffect.source
-
          property real jitter: appSettings.jitter
          property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter)
          property real shadowLength: 0.25 * screenCurvature * Utils.lint(0.50, 1.5, ambientLight)
          property real staticNoise: appSettings.staticNoise
-         property size scaleNoiseSize: Qt.size((width) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling),
+         property size scaleNoiseSize: Qt.size((width * 0.75) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling),
-                                               (height) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling))
+                                               (height * 0.75) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling))
 
-         property size virtual_resolution: parent.virtual_resolution
+         property size virtualResolution: parent.virtualResolution
+
+         // Rasterization might display oversamping issues if virtual resolution is close to physical display resolution.
+         // We progressively disable rasterization from 4x up to 2x resolution.
+         property real rasterizationIntensity: Utils.smoothstep(2.0, 4.0, _screenDensity)
+
+         property real displayTerminalFrame: appSettings._frameMargin > 0 || appSettings.screenCurvature > 0
 
          property real time: timeManager.time
          property ShaderEffectSource noiseSource: noiseShaderSource
@@ -163,24 +175,24 @@ Item {
              uniform highp vec4 fontColor;
              uniform highp vec4 backgroundColor;
              uniform lowp float shadowLength;
+             uniform lowp float frameGloss;
 
-             uniform highp vec2 virtual_resolution;" +
+             uniform highp vec2 virtualResolution;
+             uniform lowp float rasterizationIntensity;\n" +
 
              (burnIn !== 0 ? "
                  uniform sampler2D burnInSource;
                  uniform highp float burnInLastUpdate;
                  uniform highp float burnInTime;" : "") +
-             (slowBurnIn !== 0 ? "
-                 uniform sampler2D slowBurnInSource;" : "") +
              (staticNoise !== 0 ? "
                  uniform highp float staticNoise;" : "") +
-             (((staticNoise !== 0 || jitter !== 0)
+             (((staticNoise !== 0 || jitter !== 0) ||(fallBack && (flickering || horizontalSync))) ? "
-               ||(fallBack && (flickering || horizontalSync))) ? "
                  uniform lowp sampler2D noiseSource;
                  uniform highp vec2 scaleNoiseSize;" : "") +
-             (screenCurvature !== 0 ? "
+             (displayTerminalFrame ? "
-                 uniform highp float screenCurvature;
                  uniform lowp sampler2D frameSource;" : "") +
+             (screenCurvature !== 0 ? "
+                 uniform highp float screenCurvature;" : "") +
              (glowingLine !== 0 ? "
                  uniform highp float glowingLine;" : "") +
              (chromaColor !== 0 ? "
@@ -203,17 +215,14 @@ Item {
 
              (glowingLine !== 0 ? "
                  float randomPass(vec2 coords){
-                     return fract(smoothstep(-120.0, 0.0, coords.y - (virtual_resolution.y + 120.0) * fract(time * 0.00015)));
+                     return fract(smoothstep(-120.0, 0.0, coords.y - (virtualResolution.y + 120.0) * fract(time * 0.00015)));
                  }" : "") +
 
-             "float min2(vec2 v) {
+             shaderLibrary.min2 +
-                 return min(v.x, v.y);
+             shaderLibrary.rgb2grey +
-             }
+             shaderLibrary.rasterizationShader +
-
-             float rgb2grey(vec3 v){
-                 return dot(v, vec3(0.21, 0.72, 0.04));
-             }
 
+             "
              float isInScreen(vec2 v) {
                  return min2(step(0.0, v) - step(1.0, v));
              }
@@ -238,6 +247,17 @@ Item {
              "  return outColor;
              }" +
 
+             //pseudo-random vector
+             //https://stackoverflow.com/a/10625698
+             "float random( vec2 p )
+             {
+                 vec2 K1 = vec2(
+                     23.14069263277926, // e^pi (Gelfond's constant)
+                     2.665144142690225 // 2^sqrt(2) (Gelfond-Schneider constant)
+                 );
+                 return fract( cos( dot(p,K1) ) * 12345.6789 );
+             }" +
+
              "void main() {" +
                  "vec2 cc = vec2(0.5) - qt_TexCoord0;" +
                  "float distance = length(cc);" +
@@ -276,7 +296,11 @@ Item {
                  : "") +
 
                  (jitter !== 0 || staticNoise !== 0 ?
-                     "vec4 noiseTexel = texture2D(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 51.0), fract(time / 237.0)));"
+                 "vec4 noiseTexel = texture2D(
+                     noiseSource, scaleNoiseSize * coords
+                     + vec2(0.0, random(vec2(fract(time / 237.0), 822.9582)))
+                     + vec2(fract(time / 31.0), fract(time / 177.0))
+                 );"
                  : "") +
 
                  (jitter !== 0 ? "
@@ -291,7 +315,7 @@ Item {
                      color += noiseVal * noise * (1.0 - distance * 1.3);" : "") +
 
                  (glowingLine !== 0 ? "
-                     color += randomPass(coords * virtual_resolution) * glowingLine;" : "") +
+                     color += randomPass(coords * virtualResolution) * glowingLine;" : "") +
 
                  "vec3 txt_color = texture2D(screenBuffer, txt_coords).rgb;" +
 
@@ -302,13 +326,10 @@ Item {
                      txt_color = max(txt_color, convertWithChroma(burnInColor));"
                  : "") +
 
-                 (slowBurnIn !== 0 ? "
-                     vec4 txt_blur = texture2D(slowBurnInSource, staticCoords);
-                     txt_color = max(txt_color, convertWithChroma(txt_blur.rgb * txt_blur.a));
-                 " : "") +
-
                   "txt_color += fontColor.rgb * vec3(color);" +
 
+                  "txt_color = applyRasterization(staticCoords, txt_color, virtualResolution, rasterizationIntensity);\n" +
+
                  "vec3 finalColor = txt_color;" +
 
                  (flickering !== 0 ? "
@@ -317,9 +338,9 @@ Item {
                  (ambientLight !== 0 ? "
                      finalColor += vec3(ambientLight) * (1.0 - distance) * (1.0 - distance);" : "") +
 
-                 (screenCurvature !== 0 ?
+                 (displayTerminalFrame ?
                     "vec4 frameColor = texture2D(frameSource, qt_TexCoord0);
-                     finalColor = mix(finalColor, frameColor.rgb, frameColor.a);"
+                     finalColor = mix(finalColor, frameColor.rgb + (finalColor*frameGloss), frameColor.a);"
                  : "") +
 
                  "gl_FragColor = vec4(finalColor, qt_Opacity);" +
@@ -340,7 +361,7 @@ Item {
      Loader {
          id: terminalFrameLoader
 
-         active: screenCurvature !== 0
+         active: dynamicShader.displayTerminalFrame
 
          width: staticShader.width
          height: staticShader.height
@@ -352,7 +373,7 @@ Item {
              visible: false
              format: ShaderEffectSource.RGBA
 
-             NewTerminalFrame {
+             TerminalFrame {
                  id: terminalFrame
                  blending: false
                  anchors.fill: parent
@@ -360,6 +381,10 @@ Item {
          }
      }
 
+     ShaderLibrary {
+         id: shaderLibrary
+     }
+
      ShaderEffect {
          id: staticShader
 
@@ -385,7 +410,7 @@ Item {
 
          property real ambientLight: parent.ambientLight
 
-         property size virtual_resolution: parent.virtual_resolution
+         property size virtualResolution: parent.virtualResolution
 
          blending: false
          visible: false
@@ -408,7 +433,7 @@ Item {
              uniform highp vec4 backgroundColor;
              uniform lowp float screen_brightness;
 
-             uniform highp vec2 virtual_resolution;" +
+             uniform highp vec2 virtualResolution;" +
 
              (bloom !== 0 ? "
                  uniform highp sampler2D bloomSource;
@@ -426,36 +451,9 @@ Item {
              (ambientLight !== 0 ? "
                  uniform lowp float ambientLight;" : "") +
 
-             "highp float getScanlineIntensity(vec2 coords) {
+             shaderLibrary.min2 +
-                 float result = 1.0;" +
+             shaderLibrary.sum2 +
-
+             shaderLibrary.rgb2grey +
-                (appSettings.rasterization != appSettings.no_rasterization ?
-                    "float val = 0.0;
-                     vec2 rasterizationCoords = fract(coords * virtual_resolution);
-                     val += smoothstep(0.0, 0.5, rasterizationCoords.y);
-                     val -= smoothstep(0.5, 1.0, rasterizationCoords.y);
-                     result *= mix(0.5, 1.0, val);" : "") +
-
-                (appSettings.rasterization == appSettings.pixel_rasterization ?
-                    "val = 0.0;
-                     val += smoothstep(0.0, 0.5, rasterizationCoords.x);
-                     val -= smoothstep(0.5, 1.0, rasterizationCoords.x);
-                     result *= mix(0.5, 1.0, val);" : "") + "
-
-                return result;
-             }
-
-             float min2(vec2 v) {
-                 return min(v.x, v.y);
-             }
-
-             float sum2(vec2 v) {
-                 return v.x + v.y;
-             }
-
-             float rgb2grey(vec3 v){
-                 return dot(v, vec3(0.21, 0.72, 0.04));
-             }" +
 
              "vec3 convertWithChroma(vec3 inColor) {
                 vec3 outColor = inColor;" +
@@ -468,6 +466,7 @@ Item {
              "  return outColor;
              }" +
 
+             shaderLibrary.rasterizationShader +
 
              "void main() {" +
                  "vec2 cc = vec2(0.5) - qt_TexCoord0;" +
@@ -490,8 +489,6 @@ Item {
                      txt_color.b = leftColor.b * 0.30 + rightColor.b * 0.10 + txt_color.b * 0.60;
                  " : "") +
 
-                  "txt_color *= getScanlineIntensity(txt_coords);" +
-
                   "txt_color += vec3(0.0001);" +
                   "float greyscale_color = rgb2grey(txt_color);" +
 

app/qml/SimpleSlider.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,9 +17,8 @@
 * 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.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
 import "Components"
@@ -27,8 +26,8 @@ import "Components"
 RowLayout {
     property alias value: slider.value
     property alias stepSize: slider.stepSize
-    property alias minimumValue: slider.minimumValue
+    property alias minimumValue: slider.from
-    property alias maximumValue: slider.maximumValue
+    property alias maximumValue: slider.to
     property real maxMultiplier: 100
 
     id: setting_component

app/qml/SizeOverlay.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,12 +17,12 @@
 * 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.2
 
 Rectangle {
     property size terminalSize
     property real topOpacity: 0.6
+
     width: textSize.width * 2
     height: textSize.height * 2
     radius: 5
@@ -31,7 +31,11 @@ Rectangle{
     color: "black"
     opacity: sizetimer.running ? 0.6 : 0.0
 
-    Behavior on opacity{NumberAnimation{duration: 200}}
+    Behavior on opacity {
+        NumberAnimation {
+            duration: 200
+        }
+    }
 
     onTerminalSizeChanged: sizetimer.restart()
 

app/qml/SlowBurnIn.qml

@@ -1,122 +0,0 @@
-import QtQuick 2.0
-
-import "utils.js" as Utils
-
-Loader {
-    property ShaderEffectSource source: item ? item.source : null
-
-    active: !appSettings.useFastBurnIn && appSettings.burnIn !== 0
-
-    anchors.fill: parent
-
-    sourceComponent: Item {
-        property alias source: burnInSourceEffect
-
-        property int burnInScaling: scaleTexture * appSettings.burnInQuality
-
-        ShaderEffectSource {
-            property bool updateBurnIn: false
-            property real burnIn: appSettings.burnIn
-            property real fps: appSettings.fps !== 0 ? appSettings.fps : 60
-            property real burnInFadeTime: Utils.lint(minBurnInFadeTime, maxBurnInFadeTime, burnIn)
-            property real burnInCoefficient: 1000 / (fps * burnInFadeTime)
-            property real minBurnInFadeTime: appSettings.minBurnInFadeTime
-            property real maxBurnInFadeTime: appSettings.maxBurnInFadeTime
-
-            id: burnInSourceEffect
-
-            anchors.fill: parent
-
-            sourceItem: burnInEffect
-            recursive: true
-            live: false
-            hideSource: true
-            wrapMode: kterminalSource.wrapMode
-
-            visible: false
-
-            function restartBlurSource(){
-                livetimer.restart();
-            }
-
-            // This updates the burnin synched with the timer.
-            Connections {
-                target: burnInSourceEffect.updateBurnIn ? timeManager : null
-                ignoreUnknownSignals: false
-                onTimeChanged: {
-                    burnInSourceEffect.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: burnInSourceEffect.burnInFadeTime * 1.1
-                running: true
-                onTriggered: burnInSourceEffect.updateBurnIn = false;
-            }
-            Connections{
-                target: kterminal
-                onImagePainted:{
-                    burnInSourceEffect.scheduleUpdate();
-                    burnInSourceEffect.updateBurnIn = true;
-                    livetimer.restart();
-                }
-            }
-            // Restart blurred source settings change.
-            Connections{
-                target: appSettings
-                onBurnInChanged: burnInSourceEffect.restartBlurSource();
-                onTerminalFontChanged: burnInSourceEffect.restartBlurSource();
-                onRasterizationChanged: burnInSourceEffect.restartBlurSource();
-                onBurnInQualityChanged: burnInSourceEffect.restartBlurSource();
-            }
-            Connections {
-                target: kterminalScrollbar
-                onOpacityChanged: burnInSourceEffect.restartBlurSource();
-            }
-
-            ShaderEffect {
-                id: burnInEffect
-
-                property variant txt_source: kterminalSource
-                property variant blurredSource: burnInSourceEffect
-                property real burnInCoefficient: burnInSourceEffect.burnInCoefficient
-
-                anchors.fill: parent
-                blending: false
-
-                fragmentShader:
-                    "#ifdef GL_ES
-                    precision mediump float;
-                #endif\n" +
-
-                "uniform lowp float qt_Opacity;" +
-                "uniform lowp sampler2D txt_source;" +
-
-                "varying highp vec2 qt_TexCoord0;
-             uniform lowp sampler2D blurredSource;
-             uniform highp float burnInCoefficient;" +
-
-                "float max3(vec3 v) {
-                     return max (max (v.x, v.y), v.z);
-                }" +
-
-                "void main() {" +
-                    "vec2 coords = qt_TexCoord0;" +
-                    "vec3 origColor = texture2D(txt_source, coords).rgb;" +
-                    "vec3 blur_color = texture2D(blurredSource, coords).rgb - vec3(burnInCoefficient);" +
-                    "vec3 color = min(origColor + blur_color, max(origColor, blur_color));" +
-
-                    "gl_FragColor = vec4(color, max3(color - origColor));" +
-                "}"
-
-                onStatusChanged: if (log) console.log(log) //Print warning messages
-            }
-        }
-    }
-}

app/qml/Storage.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -27,7 +27,7 @@ QtObject {
     property bool initialized: false
 
     function getDatabase() {
-         return LocalStorage.openDatabaseSync("coolretroterm" + dbMajorVersion, dbMinorVersion, "StorageDatabase", 100000);
+         return LocalStorage.openDatabaseSync("coolretroterm" + dbMajorVersion, dbMinorVersion, "StorageDatabase", 100000)
     }
 
     function initialize() {
@@ -35,9 +35,10 @@ QtObject {
         db.transaction(
             function(tx) {
                 tx.executeSql('CREATE TABLE IF NOT EXISTS settings(setting TEXT UNIQUE, value TEXT)');
-          });
+            }
+        )
 
-        initialized = true;
+        initialized = true
     }
 
     function setSetting(setting, value) {
@@ -45,7 +46,8 @@ QtObject {
 
         var db = getDatabase();
         var res = "";
-       db.transaction(function(tx) {
+        db.transaction(
+            function(tx) {
                 var rs = tx.executeSql('INSERT OR REPLACE INTO settings VALUES (?,?);', [setting,value]);
                 //console.log(rs.rowsAffected)
                 if (rs.rowsAffected > 0) {
@@ -54,23 +56,25 @@ QtObject {
                     res = "Error";
                 }
            }
-      );
+      )
       // The function returns “OK” if it was successful, or “Error” if it wasn't
-      return res;
+      return res
     }
 
     function getSetting(setting) {
         if(!initialized) initialize();
         var db = getDatabase();
         var res = "";
-       db.transaction(function(tx) {
+        db.transaction(
+            function(tx) {
                 var rs = tx.executeSql('SELECT value FROM settings WHERE setting=?;', [setting]);
                 if (rs.rows.length > 0) {
                 res = rs.rows.item(0).value;
                 } else {
                 res = undefined;
                 }
-      })
+            }
+        )
         return res
     }
 
@@ -79,6 +83,7 @@ QtObject {
         db.transaction(
             function(tx) {
                 tx.executeSql('DROP TABLE settings');
-          });
+            }
+        )
     }
 }

app/qml/TerminalContainer.qml

@@ -1,3 +1,22 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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.2
 import QtGraphicalEffects 1.0
 
@@ -7,13 +26,18 @@ ShaderTerminal {
     property alias title: terminal.title
     property alias terminalSize: terminal.terminalSize
 
+    property real devicePixelRatio: terminalWindow.screen.devicePixelRatio
+
     id: mainShader
     opacity: appSettings.windowOpacity * 0.3 + 0.7
 
     source: terminal.mainSource
     burnInEffect: terminal.burnInEffect
-    slowBurnInEffect: terminal.slowBurnInEffect
+    virtualResolution: terminal.virtualResolution
-    virtual_resolution: terminal.virtualResolution
+    screenResolution: Qt.size(
+        terminalWindow.width * devicePixelRatio * appSettings.windowScaling,
+        terminalWindow.height * devicePixelRatio * appSettings.windowScaling
+    )
 
     TimeManager {
         id: timeManager
@@ -26,7 +50,6 @@ ShaderTerminal {
     }
 
     //  EFFECTS  ////////////////////////////////////////////////////////////////
-
     Loader {
         id: bloomEffectLoader
         active: appSettings.bloom
@@ -35,7 +58,7 @@ ShaderTerminal {
         height: parent.height * appSettings.bloomQuality
 
         sourceComponent: FastBlur {
-            radius: Utils.lint(16, 64, appSettings.bloomQuality);
+            radius: Utils.lint(16, 64, appSettings.bloomQuality)
             source: terminal.mainSource
             transparentBorder: true
         }
@@ -54,71 +77,4 @@ ShaderTerminal {
     }
 
     bloomSource: bloomSourceLoader.item
-
-//    NewTerminalFrame {
-//        id: terminalFrame
-//        anchors.fill: parent
-//        blending: true
-//    }
-
-    // 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 the future
-    // we need to store another fullScreen channel this might be handy.
-
-//    ShaderEffect {
-//        id: rasterizationEffect
-//        width: parent.width
-//        height: parent.height
-//        property real outColor: 0.0
-//        property real dispX: (5 / width) * appSettings.windowScaling
-//        property real dispY: (5 / height) * appSettings.windowScaling
-//        property size virtual_resolution: terminal.virtualResolution
-
-//        blending: false
-
-//        fragmentShader:
-//            "uniform lowp float qt_Opacity;" +
-
-//            "varying highp vec2 qt_TexCoord0;
-//             uniform highp vec2 virtual_resolution;
-//             uniform highp float dispX;
-//             uniform highp float dispY;
-//             uniform mediump float outColor;
-
-//             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+"));" : "") +
-//                (appSettings.rasterization == appSettings.pixel_rasterization ?
-//                    "result *= abs(sin(coords.x * virtual_resolution.x * "+Math.PI+"));" : "") + "
-
-//                return result;
-//             }" +
-
-//            "void main() {" +
-//                "highp float color = getScanlineIntensity(qt_TexCoord0);" +
-
-//                "float distance = length(vec2(0.5) - qt_TexCoord0);" +
-//                "color = mix(color, 0.0, 1.2 * distance * distance);" +
-
-//                "color *= outColor + smoothstep(0.00, dispX, qt_TexCoord0.x) * (1.0 - outColor);" +
-//                "color *= outColor + smoothstep(0.00, dispY, qt_TexCoord0.y) * (1.0 - outColor);" +
-//                "color *= outColor + (1.0 - smoothstep(1.00 - dispX, 1.00, qt_TexCoord0.x)) * (1.0 - outColor);" +
-//                "color *= outColor + (1.0 - smoothstep(1.00 - dispY, 1.00, qt_TexCoord0.y)) * (1.0 - outColor);" +
-
-//                "gl_FragColor.a = color;" +
-//            "}"
-
-//        onStatusChanged: if (log) console.log(log) //Print warning messages
-//    }
-
-//    rasterizationSource: ShaderEffectSource{
-//        id: rasterizationEffectSource
-//        sourceItem: rasterizationEffect
-//        hideSource: true
-//        smooth: true
-//        wrapMode: ShaderEffectSource.ClampToEdge
-//        visible: false
-//    }
 }

app/qml/TerminalFrame.qml

@@ -0,0 +1,104 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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 "utils.js" as Utils
+
+ShaderEffect {
+    property color _frameColor: appSettings.frameColor
+    property color _backgroundColor: appSettings.backgroundColor
+    property color _fontColor: appSettings.fontColor
+    property color _lightColor: Utils.mix(_fontColor, _backgroundColor, 0.2)
+    property real _ambientLight: Utils.lint(0.2, 0.8, appSettings.ambientLight)
+
+    property color frameColor: Utils.mix(_frameColor, _lightColor, _ambientLight)
+    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize
+
+    // Coefficient of the log curve used to approximate shadowing
+    property real screenShadowCoeff: Utils.lint(20.0, 10.0, _ambientLight)
+    property real frameShadowCoeff: Utils.lint(20.0, 10.0, _ambientLight)
+
+    property size margin: Qt.size(
+        appSettings.frameMargin / width * appSettings.windowScaling,
+        appSettings.frameMargin / height * appSettings.windowScaling
+    )
+
+    ShaderLibrary {
+        id: shaderLibrary
+    }
+
+    fragmentShader: "
+        #ifdef GL_ES
+            precision mediump float;
+        #endif
+
+        uniform lowp float screenCurvature;
+        uniform lowp float screenShadowCoeff;
+        uniform lowp float frameShadowCoeff;
+        uniform highp float qt_Opacity;
+        uniform lowp vec4 frameColor;
+        uniform mediump vec2 margin;
+
+        varying highp vec2 qt_TexCoord0;
+
+        vec2 distortCoordinates(vec2 coords){
+            vec2 cc = (coords - vec2(0.5));
+            float dist = dot(cc, cc) * screenCurvature;
+            return (coords + cc * (1.0 + dist) * dist);
+        }
+        " +
+
+        shaderLibrary.max2 +
+        shaderLibrary.min2 +
+        shaderLibrary.prod2 +
+        shaderLibrary.sum2 +
+
+        "
+
+        vec2 positiveLog(vec2 x) {
+            return clamp(log(x), vec2(0.0), vec2(100.0));
+        }
+
+        void main() {
+            vec2 staticCoords = qt_TexCoord0;
+            vec2 coords = distortCoordinates(staticCoords) * (vec2(1.0) + margin * 2.0) - margin;
+
+            vec2 vignetteCoords = staticCoords * (1.0 - staticCoords.yx);
+            float vignette = pow(prod2(vignetteCoords) * 15.0, 0.25);
+
+            vec3 color = frameColor.rgb * vec3(1.0 - vignette);
+            float alpha = 0.0;
+
+            float frameShadow = max2(positiveLog(-coords * frameShadowCoeff + vec2(1.0)) + positiveLog(coords * frameShadowCoeff - (vec2(frameShadowCoeff) - vec2(1.0))));
+            frameShadow = clamp(sqrt(frameShadow), 0.0, 1.0);
+            color *= frameShadow;
+            alpha = sum2(1.0 - step(vec2(0.0), coords) + step(vec2(1.0), coords));
+            alpha = clamp(alpha, 0.0, 1.0);
+            alpha *= mix(1.0, 0.9, frameShadow);
+
+            float screenShadow = 1.0 - prod2(positiveLog(coords * screenShadowCoeff + vec2(1.0)) * positiveLog(-coords * screenShadowCoeff + vec2(screenShadowCoeff + 1.0)));
+            alpha = max(0.8 * screenShadow, alpha);
+
+            gl_FragColor = vec4(color * alpha, alpha);
+        }
+    "
+
+    onStatusChanged: if (log) console.log(log) //Print warning messages
+}

app/qml/TimeManager.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,7 +17,6 @@
 * 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.2
 
 Timer {

app/qml/main.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,11 +17,11 @@
 * 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.2
 import QtQuick.Window 2.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.3
-import QtGraphicalEffects 1.0
+
+import "menus"
 
 ApplicationWindow {
     id: terminalWindow
@@ -37,8 +37,6 @@ ApplicationWindow{
 
     // Load saved window geometry and show the window
     Component.onCompleted: {
-        appSettings.handleFontChanged();
-
         x = appSettings.x
         y = appSettings.y
         width = appSettings.width
@@ -55,22 +53,30 @@ ApplicationWindow{
     property bool fullscreen: appSettings.fullscreen
     onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
 
-    //Workaround: Without __contentItem a ugly thin border is visible.
+    menuBar: qtquickMenuLoader.item
-    menuBar: CRTMainMenuBar{
+
-        id: mainMenu
+    Loader {
-        visible: (Qt.platform.os === "osx" || appSettings.showMenubar)
+        id: qtquickMenuLoader
-        __contentItem.visible: mainMenu.visible
+        active: !appSettings.isMacOS && appSettings.showMenubar
+        sourceComponent: WindowMenu { }
+    }
+
+    Loader {
+        id: globalMenuLoader
+        active: appSettings.isMacOS
+        sourceComponent: OSXMenu { }
     }
 
     property string wintitle: appSettings.wintitle
 
     color: "#00000000"
+
     title: terminalContainer.title || qsTr(appSettings.wintitle)
 
     Action {
         id: showMenubarAction
         text: qsTr("Show Menubar")
-        enabled: Qt.platform.os !== "osx"
+        enabled: !appSettings.isMacOS
         shortcut: "Ctrl+Shift+M"
         checkable: true
         checked: appSettings.showMenubar
@@ -79,9 +85,9 @@ ApplicationWindow{
     Action {
         id: fullscreenAction
         text: qsTr("Fullscreen")
-        enabled: Qt.platform.os !== "osx"
+        enabled: !appSettings.isMacOS
         shortcut: "Alt+F11"
-        onTriggered: appSettings.fullscreen = !appSettings.fullscreen;
+        onTriggered: appSettings.fullscreen = !appSettings.fullscreen
         checkable: true
         checked: appSettings.fullscreen
     }
@@ -89,15 +95,15 @@ ApplicationWindow{
         id: quitAction
         text: qsTr("Quit")
         shortcut: "Ctrl+Shift+Q"
-        onTriggered: Qt.quit();
+        onTriggered: Qt.quit()
     }
     Action {
         id: showsettingsAction
         text: qsTr("Settings")
         onTriggered: {
-            settingswindow.show();
+            settingswindow.show()
-            settingswindow.requestActivate();
+            settingswindow.requestActivate()
-            settingswindow.raise();
+            settingswindow.raise()
         }
     }
     Action {
@@ -110,25 +116,30 @@ ApplicationWindow{
         text: qsTr("Paste")
         shortcut: "Ctrl+Shift+V"
     }
+    Action {
+        id: pasteActionAlt
+        text: qsTr("Paste selection")
+        shortcut: "Shift+Insert"
+    }
     Action {
         id: zoomIn
         text: qsTr("Zoom In")
         shortcut: "Ctrl++"
-        onTriggered: appSettings.incrementScaling();
+        onTriggered: appSettings.incrementScaling()
     }
     Action {
         id: zoomOut
         text: qsTr("Zoom Out")
         shortcut: "Ctrl+-"
-        onTriggered: appSettings.decrementScaling();
+        onTriggered: appSettings.decrementScaling()
     }
     Action {
         id: showAboutAction
         text: qsTr("About")
         onTriggered: {
-            aboutDialog.show();
+            aboutDialog.show()
-            aboutDialog.requestActivate();
+            aboutDialog.requestActivate()
-            aboutDialog.raise();
+            aboutDialog.raise()
         }
     }
     ApplicationSettings {
@@ -136,7 +147,6 @@ ApplicationWindow{
     }
     TerminalContainer {
         id: terminalContainer
-        y: appSettings.showMenubar ? 0 : -2 // Workaroud to hide the margin in the menubar.
         width: parent.width
         height: (parent.height + Math.abs(y))
     }
@@ -159,7 +169,7 @@ ApplicationWindow{
     onClosing: {
         // OSX Since we are currently supporting only one window
         // quit the application when it is closed.
-        if (Qt.platform.os === "osx")
+        if (appSettings.isMacOS)
             Qt.quit()
     }
 }

app/qml/menus/FullContextMenu.qml

@@ -0,0 +1,95 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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.2
+import QtQuick.Controls 2.3
+
+Menu {
+    id: contextmenu
+    MenuItem {
+        action: copyAction
+    }
+    MenuItem {
+        action: pasteAction
+    }
+    MenuItem {
+        action: showsettingsAction
+    }
+
+    MenuSeparator {}
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            action: quitAction
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            action: copyAction
+        }
+        MenuItem {
+            action: pasteAction
+        }
+        MenuSeparator {}
+        MenuItem {
+            action: showsettingsAction
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            action: fullscreenAction
+            visible: fullscreenAction.enabled
+        }
+        MenuItem {
+            action: showMenubarAction
+            visible: showMenubarAction.enabled
+        }
+        MenuItem {
+            action: zoomIn
+        }
+        MenuItem {
+            action: zoomOut
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                    appSettings.handleFontChanged()
+                }
+            }
+            onObjectAdded: profilesMenu.insertItem(index, object)
+            onObjectRemoved: profilesMenu.removeItem(object)
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            action: showAboutAction
+        }
+    }
+}

app/qml/menus/OSXMenu.qml

@@ -0,0 +1,89 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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.3
+import Qt.labs.platform 1.1
+
+MenuBar {
+    id: defaultMenuBar
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            text: quitAction.text
+            onTriggered: quitAction.trigger()
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            text: copyAction.text
+            shortcut: "Meta+C"
+            onTriggered: copyAction.trigger()
+        }
+        MenuItem {
+            text: pasteAction.text
+            shortcut: "Meta+V"
+            onTriggered: pasteAction.trigger()
+        }
+        MenuSeparator {}
+        MenuItem {
+            text: showsettingsAction.text
+            shortcut: showsettingsAction.shortcut
+            onTriggered: showsettingsAction.trigger()
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            text: zoomIn.text
+            shortcut: "Meta++"
+            onTriggered: zoomIn.trigger()
+        }
+        MenuItem {
+            text: zoomOut.text
+            shortcut: "Meta+-"
+            onTriggered: zoomOut.trigger()
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                    appSettings.handleFontChanged()
+                }
+            }
+            onObjectAdded: profilesMenu.insertItem(index, object)
+            onObjectRemoved: profilesMenu.removeItem(object)
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            text: showAboutAction.text
+            onTriggered: showAboutAction.trigger()
+        }
+    }
+}

app/qml/menus/ShortContextMenu.qml

@@ -0,0 +1,31 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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.2
+import QtQuick.Controls 2.3
+
+Menu {
+    id: contextmenu
+    MenuItem {
+        action: copyAction
+    }
+    MenuItem {
+        action: pasteAction
+    }
+}

app/qml/menus/WindowMenu.qml

@@ -0,0 +1,85 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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.2
+import QtQuick.Controls 2.3
+
+MenuBar {
+    id: defaultMenuBar
+    visible: appSettings.showMenubar
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            action: quitAction
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            action: copyAction
+        }
+        MenuItem {
+            action: pasteAction
+        }
+        MenuSeparator {}
+        MenuItem {
+            action: showsettingsAction
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            action: fullscreenAction
+            visible: fullscreenAction.enabled
+        }
+        MenuItem {
+            action: showMenubarAction
+            visible: showMenubarAction.enabled
+        }
+        MenuItem {
+            action: zoomIn
+        }
+        MenuItem {
+            action: zoomOut
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                    appSettings.handleFontChanged()
+                }
+            }
+            onObjectAdded: profilesMenu.insertItem(index, object)
+            onObjectRemoved: profilesMenu.removeItem(object)
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            action: showAboutAction
+        }
+    }
+}

app/qml/resources.qrc

@@ -12,7 +12,6 @@
         <file>TimeManager.qml</file>
         <file>SimpleSlider.qml</file>
         <file>ColorButton.qml</file>
-        <file>Glossy.qml</file>
         <file>AboutDialog.qml</file>
         <file>InsertNameDialog.qml</file>
         <file>SettingsEffectsTab.qml</file>
@@ -20,9 +19,8 @@
         <file>SettingsTerminalTab.qml</file>
         <file>FontScanlines.qml</file>
         <file>fonts/1977-apple2/PrintChar21.ttf</file>
-        <file>fonts/1971-ibm-3278/3270Medium.ttf</file>
+        <file>fonts/1971-ibm-3278/3270-Regular.ttf</file>
         <file>Storage.qml</file>
-        <file>CRTMainMenuBar.qml</file>
         <file>SettingsAdvancedTab.qml</file>
         <file>TerminalContainer.qml</file>
         <file>images/crt256.png</file>
@@ -42,7 +40,11 @@
         <file>fonts/1977-commodore-pet/PetMe.ttf</file>
         <file>BurnInEffect.qml</file>
         <file>fonts/modern-terminus/TerminusTTF-4.46.0.ttf</file>
-        <file>NewTerminalFrame.qml</file>
+        <file>TerminalFrame.qml</file>
-        <file>SlowBurnIn.qml</file>
+        <file>menus/WindowMenu.qml</file>
+        <file>menus/FullContextMenu.qml</file>
+        <file>menus/ShortContextMenu.qml</file>
+        <file>ShaderLibrary.qml</file>
+        <file>menus/OSXMenu.qml</file>
     </qresource>
 </RCC>

app/qml/utils.js

@@ -1,3 +1,23 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "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/>.
+*******************************************************************************/
+
 .pragma library
 function clamp(x, min, max) {
     if (x <= min)
@@ -6,15 +26,23 @@ function clamp(x, min, 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),
                    c1.b * alpha + c2.b * (1-alpha),
                    c1.a * alpha + c2.a * (1-alpha))
 }
+
+function smoothstep(min, max, value) {
+    let x = Math.max(0, Math.min(1, (value - min) / (max - min)));
+    return x * x * (3 - 2 * x);
+}
+
 function strToColor(s){
     var r = parseInt(s.substring(1,3), 16) / 256;
     var g = parseInt(s.substring(3,5), 16) / 256;

qmltermwidget

@@ -1 +1 @@
-Subproject commit 59f967d5e1f6e9ce8e1632d9405422b071d93d30
+Subproject commit 63228027e1f97c24abb907550b22ee91836929c5