Make version number dynamic.

Feature/appimage in GitHub actions

.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/build-appimage.yml

@@ -0,0 +1,49 @@
+name: Build AppImage
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build-appimage:
+    name: Build (Linux, AppImage)
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install build deps
+        run: |
+          sudo apt update
+          sudo apt install -y build-essential rsync wget
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: 6.10.0
+          dir: ..
+          modules: qtwayland qtshadertools
+          setup-python: false
+          cache: true
+
+      - name: Build AppImage
+        run: |
+          ./scripts/build-appimage.sh
+
+      - name: Collect artifact
+        run: |
+          mkdir -p release
+          mv ./*.AppImage release/
+
+      - name: Attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: ./release/*
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cool-retro-term-appimage
+          path: ./release/*

.github/workflows/build-dmg.yml

@@ -0,0 +1,44 @@
+name: Build DMG
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build-dmg:
+    name: Build (macOS, DMG)
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: 6.10.*
+          modules: qtshadertools
+          setup-python: false
+          cache: true
+
+      - name: Build DMG
+        run: |
+          JOBS="$(sysctl -n hw.ncpu)"
+          ./scripts/build-dmg.sh
+
+      - name: Collect artifact
+        run: |
+          mkdir -p release
+          mv ./*.dmg release/
+
+      - name: Attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: ./release/*
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cool-retro-term-dmg
+          path: ./release/*

.gitignore

@@ -18,6 +18,7 @@
 *.pro.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
 Makefile*
@@ -40,10 +41,17 @@ Makefile*
 *.json
 
 # Excludes compiled files
+
 imports
 cool-retro-term
+build
+
+# Linux
+
+*.AppImage
 
 # Mac OSX
 
 .DS_Store
 *.app
+*.dmg

.gitmodules

@@ -2,3 +2,6 @@
 	path = qmltermwidget
 	url = https://github.com/Swordfish90/qmltermwidget
 	branch = unstable
+[submodule "KDSingleApplication"]
+	path = KDSingleApplication
+	url = https://github.com/KDAB/KDSingleApplication.git

README.md

@@ -8,172 +8,23 @@
 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.
 
 ## Screenshots
-![Image](<http://i.imgur.com/I6wq1cC.png>)
-![Image](<http://i.imgur.com/12EqlpL.png>)
-![Image](<http://i.imgur.com/Lx0acQz.jpg>)
+![Image](<https://i.imgur.com/TNumkDn.png>)
+![Image](<https://i.imgur.com/hfjWOM4.png>)
+![Image](<https://i.imgur.com/GYRDPzJ.jpg>)
 
-## Get cool-retro-term
-You can either build cool-retro-term yourself (see below) or walk the easy way and install one of these packages:
+## Install
 
-Fedora has the `cool-retro-term` in the offcial repositories. All you have to do is `sudo dnf install cool-retro-term`.
+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).
 
-Users of openSUSE can grab a package from [Open Build Service](http://software.opensuse.org/package/cool-retro-term).
+Alternatively, most distributions such as Ubuntu, Fedora or Arch already package cool-retro-term in their official repositories.
 
-Arch users can install this [package](https://aur.archlinux.org/packages/cool-retro-term-git/) directly via the [AUR](https://aur.archlinux.org):
+## Building
 
-    yaourt -S aur/cool-retro-term-git
-
-or use:
-
-    pacman -S cool-retro-term
-
-to install precompiled from community repository.
-
-Gentoo users can now install the second release "1.0.1" from a 3rd-party repository preferably via layman:
-
-    USE="git" emerge app-portage/layman
-    wget https://www.gerczei.eu/files/gerczei.xml -O /etc/layman/overlays/gerczei.xml
-    layman -f -a qt -a gerczei # those who've added the repo before 27/08/17 should remove, update and add it again as its source has changed
-    ACCEPT_KEYWORDS="~*" emerge =x11-terms/cool-retro-term-1.0.1::gerczei
-
-The live ebuild (version 9999-r1) tracking the bleeding-edge WIP codebase also remains available.
-
-A word of warning: USE flags and keywords are to be added to portage's configuration files and every emerge operation should be executed with '-p' (short option for --pretend) appended to the command line first as per best practice!
-
-Ubuntu users of 14.04 LTS (Trusty) 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)
-
-macOS users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases
-
-## Build instructions (Linux)
-
-## 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
-
----
-
-**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
-```
-
-## 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.
+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)).

app/app.pro

@@ -1,20 +1,99 @@
-QT += qml quick widgets sql
-TARGET = cool-retro-term 
+QT += qml quick widgets sql quickcontrols2
+TARGET = cool-retro-term
+APP_VERSION = $$system(git -C $$PWD/.. describe --tags --always --dirty=-dirty)
+isEmpty(APP_VERSION): APP_VERSION = "unknown"
+DEFINES += APP_VERSION=\\\"$$APP_VERSION\\\"
+
+# TODO: When migrating to CMake, use KDSingleApplication's CMakeLists.txt instead of these manual sources.
+INCLUDEPATH += $$PWD/../KDSingleApplication/src
+HEADERS += \
+    $$PWD/../KDSingleApplication/src/kdsingleapplication.h \
+    $$PWD/../KDSingleApplication/src/kdsingleapplication_lib.h \
+    $$PWD/../KDSingleApplication/src/kdsingleapplication_localsocket_p.h
+SOURCES += \
+    $$PWD/../KDSingleApplication/src/kdsingleapplication.cpp \
+    $$PWD/../KDSingleApplication/src/kdsingleapplication_localsocket.cpp
+DEFINES += KDSINGLEAPPLICATION_STATIC_BUILD
 
 DESTDIR = $$OUT_PWD/../
 
 HEADERS += \
     fileio.h \
-    monospacefontmanager.h
+    fontmanager.h \
+    fontlistmodel.h
 
-SOURCES = main.cpp \
+SOURCES += main.cpp \
     fileio.cpp \
-    monospacefontmanager.cpp
+    fontmanager.cpp \
+    fontlistmodel.cpp
 
 macx:ICON = icons/crt.icns
 
 RESOURCES += qml/resources.qrc
 
+# Shader compilation (Qt Shader Baker)
+QSB_BIN = $$[QT_HOST_BINS]/qsb
+isEmpty(QSB_BIN): QSB_BIN = $$[QT_INSTALL_BINS]/qsb
+
+SHADERS_DIR = $${_PRO_FILE_PWD_}/shaders
+SHADERS += $$files($$SHADERS_DIR/*.frag) $$files($$SHADERS_DIR/*.vert)
+SHADERS -= $$SHADERS_DIR/terminal_dynamic.frag
+SHADERS -= $$SHADERS_DIR/terminal_static.frag
+SHADERS -= $$SHADERS_DIR/passthrough.vert
+
+qsb.input = SHADERS
+qsb.output = ../../app/shaders/${QMAKE_FILE_NAME}.qsb
+qsb.commands = $$QSB_BIN --glsl \"100 es,120,150\" --hlsl 50 --msl 12 --qt6 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+qsb.clean = $$qsb.output
+qsb.name = qsb ${QMAKE_FILE_IN}
+qsb.variable_out = QSB_FILES
+QMAKE_EXTRA_COMPILERS += qsb
+PRE_TARGETDEPS += $$QSB_FILES
+OTHER_FILES += $$SHADERS $$QSB_FILES
+
+DYNAMIC_SHADER = $$SHADERS_DIR/terminal_dynamic.frag
+STATIC_SHADER = $$SHADERS_DIR/terminal_static.frag
+
+RASTER_MODES = 0 1 2 3 4
+BINARY_FLAGS = 0 1
+VARIANT_SHADER_DIR = $$relative_path($$PWD/shaders, $$OUT_PWD)
+VARIANT_OUTPUTS =
+
+for(raster_mode, RASTER_MODES) {
+    for(burn_in, BINARY_FLAGS) {
+        for(display_frame, BINARY_FLAGS) {
+            for(chroma_on, BINARY_FLAGS) {
+                dynamic_variant = terminal_dynamic_raster$${raster_mode}_burn$${burn_in}_frame$${display_frame}_chroma$${chroma_on}
+                dynamic_output = $${VARIANT_SHADER_DIR}/$${dynamic_variant}.frag.qsb
+                dynamic_target = shader_variant_$${dynamic_variant}
+                $${dynamic_target}.target = $${dynamic_output}
+                $${dynamic_target}.depends = $$DYNAMIC_SHADER
+                $${dynamic_target}.commands = $$QSB_BIN --glsl \"100 es,120,150\" --hlsl 50 --msl 12 --qt6 -DCRT_RASTER_MODE=$${raster_mode} -DCRT_BURN_IN=$${burn_in} -DCRT_DISPLAY_FRAME=$${display_frame} -DCRT_CHROMA=$${chroma_on} -o $${dynamic_output} $$DYNAMIC_SHADER
+                QMAKE_EXTRA_TARGETS += $${dynamic_target}
+                VARIANT_OUTPUTS += $${dynamic_output}
+            }
+        }
+    }
+}
+
+for(rgb_shift, BINARY_FLAGS) {
+    for(bloom_on, BINARY_FLAGS) {
+        for(curve_on, BINARY_FLAGS) {
+            for(shine_on, BINARY_FLAGS) {
+                static_variant = terminal_static_rgb$${rgb_shift}_bloom$${bloom_on}_curve$${curve_on}_shine$${shine_on}
+                static_output = $${VARIANT_SHADER_DIR}/$${static_variant}.frag.qsb
+                static_target = shader_variant_$${static_variant}
+                $${static_target}.target = $${static_output}
+                $${static_target}.depends = $$STATIC_SHADER
+                $${static_target}.commands = $$QSB_BIN --glsl \"100 es,120,150\" --hlsl 50 --msl 12 --qt6 -DCRT_RGB_SHIFT=$${rgb_shift} -DCRT_BLOOM=$${bloom_on} -DCRT_CURVATURE=$${curve_on} -DCRT_FRAME_SHININESS=$${shine_on} -o $${static_output} $$STATIC_SHADER
+                QMAKE_EXTRA_TARGETS += $${static_target}
+                VARIANT_OUTPUTS += $${static_output}
+            }
+        }
+    }
+}
+PRE_TARGETDEPS += $${VARIANT_OUTPUTS}
+
 #########################################
 ##              INTALLS
 #########################################

app/fontlistmodel.cpp

@@ -0,0 +1,94 @@
+#include "fontlistmodel.h"
+
+FontListModel::FontListModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+}
+
+int FontListModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+    return m_fonts.size();
+}
+
+QVariant FontListModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= m_fonts.size()) {
+        return QVariant();
+    }
+
+    const FontEntry &font = m_fonts.at(index.row());
+
+    switch (role) {
+    case NameRole:
+        return font.name;
+    case TextRole:
+        return font.text;
+    case SourceRole:
+        return font.source;
+    case BaseWidthRole:
+        return font.baseWidth;
+    case PixelSizeRole:
+        return font.pixelSize;
+    case LowResolutionRole:
+        return font.lowResolutionFont;
+    case IsSystemRole:
+        return font.isSystemFont;
+    case FamilyRole:
+        return font.family;
+    case FallbackNameRole:
+        return font.fallbackName;
+    default:
+        return QVariant();
+    }
+}
+
+QHash<int, QByteArray> FontListModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[NameRole] = "name";
+    roles[TextRole] = "text";
+    roles[SourceRole] = "source";
+    roles[BaseWidthRole] = "baseWidth";
+    roles[PixelSizeRole] = "pixelSize";
+    roles[LowResolutionRole] = "lowResolutionFont";
+    roles[IsSystemRole] = "isSystemFont";
+    roles[FamilyRole] = "family";
+    roles[FallbackNameRole] = "fallbackName";
+    return roles;
+}
+
+void FontListModel::setFonts(const QVector<FontEntry> &fonts)
+{
+    beginResetModel();
+    m_fonts = fonts;
+    endResetModel();
+    emit countChanged();
+}
+
+const QVector<FontEntry> &FontListModel::fonts() const
+{
+    return m_fonts;
+}
+
+QVariantMap FontListModel::get(int index) const
+{
+    QVariantMap map;
+    if (index < 0 || index >= m_fonts.size()) {
+        return map;
+    }
+
+    const FontEntry &font = m_fonts.at(index);
+    map.insert("name", font.name);
+    map.insert("text", font.text);
+    map.insert("source", font.source);
+    map.insert("baseWidth", font.baseWidth);
+    map.insert("pixelSize", font.pixelSize);
+    map.insert("lowResolutionFont", font.lowResolutionFont);
+    map.insert("isSystemFont", font.isSystemFont);
+    map.insert("family", font.family);
+    map.insert("fallbackName", font.fallbackName);
+    return map;
+}

app/fontlistmodel.h

@@ -0,0 +1,59 @@
+#ifndef FONTLISTMODEL_H
+#define FONTLISTMODEL_H
+
+#include <QAbstractListModel>
+#include <QVector>
+#include <QVariant>
+#include <QVariantMap>
+#include <QString>
+
+struct FontEntry
+{
+    QString name;
+    QString text;
+    QString source;
+    qreal baseWidth = 1.0;
+    int pixelSize = 0;
+    bool lowResolutionFont = false;
+    bool isSystemFont = false;
+    QString family;
+    QString fallbackName;
+};
+
+class FontListModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+
+public:
+    explicit FontListModel(QObject *parent = nullptr);
+
+    enum Roles {
+        NameRole = Qt::UserRole + 1,
+        TextRole,
+        SourceRole,
+        BaseWidthRole,
+        PixelSizeRole,
+        LowResolutionRole,
+        IsSystemRole,
+        FamilyRole,
+        FallbackNameRole
+    };
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    void setFonts(const QVector<FontEntry> &fonts);
+    const QVector<FontEntry> &fonts() const;
+
+    Q_INVOKABLE QVariantMap get(int index) const;
+
+signals:
+    void countChanged();
+
+private:
+    QVector<FontEntry> m_fonts;
+};
+
+#endif // FONTLISTMODEL_H

app/fontmanager.cpp

@@ -0,0 +1,584 @@
+#include "fontmanager.h"
+
+#include <QFont>
+#include <QFontDatabase>
+#include <QFontMetricsF>
+#include <QtGlobal>
+#include <QtMath>
+
+namespace {
+constexpr int kModernRasterization = 4;
+constexpr int kBaseFontPixelHeight = 32;
+constexpr int kSystemFontPixelSize = 32;
+}
+
+FontManager::FontManager(QObject *parent)
+    : QObject(parent)
+    , m_fontListModel(this)
+    , m_filteredFontListModel(this)
+{
+    populateBundledFonts();
+    populateSystemFonts();
+    m_fontListModel.setFonts(m_allFonts);
+    updateFilteredFonts();
+    updateComputedFont();
+}
+
+QStringList FontManager::retrieveMonospaceFonts()
+{
+    QStringList result;
+
+    QFontDatabase fontDatabase;
+    const QStringList fontFamilies = fontDatabase.families();
+
+    for (const QString &fontFamily : fontFamilies) {
+        QFont font(fontFamily);
+        if (fontDatabase.isFixedPitch(font.family())) {
+            result.append(fontFamily);
+        }
+    }
+
+    return result;
+}
+
+void FontManager::refresh()
+{
+    updateFilteredFonts();
+    updateComputedFont();
+}
+
+FontListModel *FontManager::fontList()
+{
+    return &m_fontListModel;
+}
+
+FontListModel *FontManager::filteredFontList()
+{
+    return &m_filteredFontListModel;
+}
+
+int FontManager::fontSource() const
+{
+    return m_fontSource;
+}
+
+void FontManager::setFontSource(int fontSource)
+{
+    if (m_fontSource == fontSource) {
+        return;
+    }
+    m_fontSource = fontSource;
+    emit fontSourceChanged();
+    updateFilteredFonts();
+    updateComputedFont();
+}
+
+int FontManager::rasterization() const
+{
+    return m_rasterization;
+}
+
+void FontManager::setRasterization(int rasterization)
+{
+    if (m_rasterization == rasterization) {
+        return;
+    }
+    m_rasterization = rasterization;
+    emit rasterizationChanged();
+    updateFilteredFonts();
+    updateComputedFont();
+}
+
+QString FontManager::fontName() const
+{
+    return m_fontName;
+}
+
+void FontManager::setFontName(const QString &fontName)
+{
+    if (m_fontName == fontName) {
+        return;
+    }
+    m_fontName = fontName;
+    emit fontNameChanged();
+    updateFilteredFonts();
+    updateComputedFont();
+}
+
+qreal FontManager::fontScaling() const
+{
+    return m_fontScaling;
+}
+
+void FontManager::setFontScaling(qreal fontScaling)
+{
+    if (qFuzzyCompare(m_fontScaling, fontScaling)) {
+        return;
+    }
+    m_fontScaling = fontScaling;
+    emit fontScalingChanged();
+    updateComputedFont();
+}
+
+qreal FontManager::fontWidth() const
+{
+    return m_fontWidth;
+}
+
+void FontManager::setFontWidth(qreal fontWidth)
+{
+    if (qFuzzyCompare(m_fontWidth, fontWidth)) {
+        return;
+    }
+    m_fontWidth = fontWidth;
+    emit fontWidthChanged();
+    updateComputedFont();
+}
+
+qreal FontManager::lineSpacing() const
+{
+    return m_lineSpacing;
+}
+
+void FontManager::setLineSpacing(qreal lineSpacing)
+{
+    if (qFuzzyCompare(m_lineSpacing, lineSpacing)) {
+        return;
+    }
+    m_lineSpacing = lineSpacing;
+    emit lineSpacingChanged();
+    updateComputedFont();
+}
+
+qreal FontManager::baseFontScaling() const
+{
+    return m_baseFontScaling;
+}
+
+void FontManager::setBaseFontScaling(qreal baseFontScaling)
+{
+    if (qFuzzyCompare(m_baseFontScaling, baseFontScaling)) {
+        return;
+    }
+    m_baseFontScaling = baseFontScaling;
+    emit baseFontScalingChanged();
+    updateComputedFont();
+}
+
+bool FontManager::lowResolutionFont() const
+{
+    return m_lowResolutionFont;
+}
+
+void FontManager::setFontSubstitutions(const QString &family, const QStringList &substitutes)
+{
+    if (family.isEmpty()) {
+        return;
+    }
+
+    QFont::removeSubstitutions(family);
+
+    if (substitutes.isEmpty()) {
+        return;
+    }
+
+    QFont::insertSubstitutions(family, substitutes);
+}
+
+void FontManager::removeFontSubstitution(const QString &family)
+{
+    if (family.isEmpty()) {
+        return;
+    }
+
+    QFont::removeSubstitutions(family);
+}
+
+void FontManager::populateBundledFonts()
+{
+    m_allFonts.clear();
+
+    addBundledFont(
+        "TERMINESS_SCALED",
+        "Terminess",
+        ":/fonts/terminus/TerminessNerdFontMono-Regular.ttf",
+        1.0,
+        12,
+        true);
+    addBundledFont(
+        "BIGBLUE_TERMINAL_SCALED",
+        "BigBlue Terminal",
+        ":/fonts/bigblue-terminal/BigBlueTerm437NerdFontMono-Regular.ttf",
+        1.0,
+        12,
+        true);
+    addBundledFont(
+        "EXCELSIOR_SCALED",
+        "Fixedsys Excelsior",
+        ":/fonts/fixedsys-excelsior/FSEX301-L2.ttf",
+        1.0,
+        16,
+        true,
+        "UNSCII_16_SCALED");
+    addBundledFont(
+        "GREYBEARD_SCALED",
+        "Greybeard",
+        ":/fonts/greybeard/Greybeard-16px.ttf",
+        1.0,
+        16,
+        true,
+        "UNSCII_16_SCALED");
+    addBundledFont(
+        "COMMODORE_PET_SCALED",
+        "Commodore PET",
+        ":/fonts/pet-me/PetMe.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "GOHU_11_SCALED",
+        "Gohu 11",
+        ":/fonts/gohu/GohuFont11NerdFontMono-Regular.ttf",
+        1.0,
+        11,
+        true);
+    addBundledFont(
+        "COZETTE_SCALED",
+        "Cozette",
+        ":/fonts/cozette/CozetteVector.ttf",
+        1.0,
+        13,
+        true);
+    addBundledFont(
+        "UNSCII_8_SCALED",
+        "Unscii 8",
+        ":/fonts/unscii/unscii-8.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "UNSCII_8_THIN_SCALED",
+        "Unscii 8 Thin",
+        ":/fonts/unscii/unscii-8-thin.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "UNSCII_16_SCALED",
+        "Unscii 16",
+        ":/fonts/unscii/unscii-16-full.ttf",
+        1.0,
+        16,
+        true,
+        "UNSCII_16_SCALED");
+    addBundledFont(
+        "APPLE_II_SCALED",
+        "Apple ][",
+        ":/fonts/apple2/PrintChar21.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "ATARI_400_SCALED",
+        "Atari 400-800",
+        ":/fonts/atari-400-800/AtariClassic-Regular.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "COMMODORE_64_SCALED",
+        "Commodore 64",
+        ":/fonts/pet-me/PetMe64.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "IBM_EGA_8x8",
+        "IBM EGA 8x8",
+        ":/fonts/oldschool-pc-fonts/PxPlus_IBM_EGA_8x8.ttf",
+        0.5,
+        8,
+        true,
+        "UNSCII_8_SCALED");
+    addBundledFont(
+        "IBM_VGA_8x16",
+        "IBM VGA 8x16",
+        ":/fonts/oldschool-pc-fonts/PxPlus_IBM_VGA_8x16.ttf",
+        1.0,
+        16,
+        true,
+        "UNSCII_16_SCALED");
+
+    addBundledFont(
+        "TERMINESS",
+        "Terminess",
+        ":/fonts/terminus/TerminessNerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "HACK",
+        "Hack",
+        ":/fonts/hack/HackNerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "FIRA_CODE",
+        "Fira Code",
+        ":/fonts/fira-code/FiraCodeNerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "IOSEVKA",
+        "Iosevka",
+        ":/fonts/iosevka/IosevkaTermNerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "JETBRAINS_MONO",
+        "JetBrains Mono",
+        ":/fonts/jetbrains-mono/JetBrainsMonoNerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "IBM_3278",
+        "IBM 3278",
+        ":/fonts/ibm-3278/3270NerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "SOURCE_CODE_PRO",
+        "Source Code Pro",
+        ":/fonts/source-code-pro/SauceCodeProNerdFontMono-Regular.ttf",
+        1.0,
+        32,
+        false);
+    addBundledFont(
+        "DEPARTURE_MONO_SCALED",
+        "Departure Mono",
+        ":/fonts/departure-mono/DepartureMonoNerdFontMono-Regular.otf",
+        1.0,
+        11,
+        true);
+    addBundledFont(
+        "OPENDYSLEXIC",
+        "OpenDyslexic",
+        ":/fonts/opendyslexic/OpenDyslexicMNerdFontMono-Regular.otf",
+        1.0,
+        32,
+        false);
+}
+
+void FontManager::addBundledFont(const QString &name,
+                                 const QString &text,
+                                 const QString &source,
+                                 qreal baseWidth,
+                                 int pixelSize,
+                                 bool lowResolutionFont,
+                                 const QString &fallbackName)
+{
+    FontEntry entry;
+    entry.name = name;
+    entry.text = text;
+    entry.source = source;
+    entry.pixelSize = pixelSize;
+    entry.lowResolutionFont = lowResolutionFont;
+    entry.isSystemFont = false;
+    entry.fallbackName = fallbackName;
+    entry.family = resolveFontFamily(source);
+    entry.baseWidth = lowResolutionFont
+        ? computeBaseWidth(entry.family, pixelSize, baseWidth)
+        : baseWidth;
+    m_allFonts.append(entry);
+}
+
+void FontManager::populateSystemFonts()
+{
+    const QStringList families = retrieveMonospaceFonts();
+    for (const QString &family : families) {
+        if (m_bundledFamilies.contains(family)) {
+            continue;
+        }
+        FontEntry entry;
+        entry.name = family;
+        entry.text = family;
+        entry.source = QString();
+        entry.baseWidth = 1.0;
+        entry.pixelSize = kSystemFontPixelSize;
+        entry.lowResolutionFont = false;
+        entry.isSystemFont = true;
+        entry.family = family;
+        m_allFonts.append(entry);
+    }
+}
+
+void FontManager::updateFilteredFonts()
+{
+    QVector<FontEntry> filtered;
+    bool fontNameFound = false;
+    const bool modernMode = (m_rasterization == kModernRasterization);
+
+    for (const FontEntry &font : m_allFonts) {
+        const bool isBundled = !font.isSystemFont;
+        const bool matchesSource = (m_fontSource == 0 && isBundled)
+            || (m_fontSource == 1 && font.isSystemFont);
+
+        if (!matchesSource) {
+            continue;
+        }
+
+        const bool matchesRasterization = font.isSystemFont
+            || (modernMode == !font.lowResolutionFont);
+
+        if (!matchesRasterization) {
+            continue;
+        }
+
+        filtered.append(font);
+        if (font.name == m_fontName) {
+            fontNameFound = true;
+        }
+    }
+
+    if (!fontNameFound && !filtered.isEmpty()) {
+        if (m_fontName != filtered.first().name) {
+            m_fontName = filtered.first().name;
+            emit fontNameChanged();
+        }
+    }
+
+    m_filteredFontListModel.setFonts(filtered);
+    emit filteredFontListChanged();
+}
+
+void FontManager::updateComputedFont()
+{
+    const FontEntry *font = findFontByName(m_fontName);
+    if (!font) {
+        const QVector<FontEntry> &filteredFonts = m_filteredFontListModel.fonts();
+        if (!filteredFonts.isEmpty()) {
+            font = &filteredFonts.first();
+        }
+    }
+
+    if (!font) {
+        return;
+    }
+
+    const qreal totalFontScaling = m_baseFontScaling * m_fontScaling;
+    const qreal targetPixelHeight = kBaseFontPixelHeight * totalFontScaling;
+    const qreal lineSpacingFactor = m_lineSpacing;
+
+    const int lineSpacing = qRound(targetPixelHeight * lineSpacingFactor);
+    const int pixelSize = font->lowResolutionFont
+        ? font->pixelSize
+        : static_cast<int>(targetPixelHeight);
+
+    const qreal nativeLineHeight = font->pixelSize + qRound(font->pixelSize * lineSpacingFactor);
+    const qreal targetLineHeight = targetPixelHeight + lineSpacing;
+    const qreal screenScaling = font->lowResolutionFont
+        ? (nativeLineHeight > 0 ? targetLineHeight / nativeLineHeight : 1.0)
+        : 1.0;
+
+    const qreal fontWidth = font->baseWidth * m_fontWidth;
+
+    QString fontFamily = font->family.isEmpty() ? font->name : font->family;
+    QString fallbackFontFamily;
+
+    if (!font->fallbackName.isEmpty() && font->fallbackName != font->name) {
+        const FontEntry *fallback = findFontByName(font->fallbackName);
+        if (fallback) {
+            fallbackFontFamily = fallback->family.isEmpty() ? fallback->name : fallback->family;
+        }
+    }
+
+    QStringList fallbackChain;
+    if (!fallbackFontFamily.isEmpty()) {
+        fallbackChain.append(fallbackFontFamily);
+    }
+#if defined(Q_OS_MAC)
+    fallbackChain.append(QStringLiteral("Menlo"));
+#else
+    fallbackChain.append(QStringLiteral("Monospace"));
+#endif
+    setFontSubstitutions(fontFamily, fallbackChain);
+
+    if (m_lowResolutionFont != font->lowResolutionFont) {
+        m_lowResolutionFont = font->lowResolutionFont;
+        emit lowResolutionFontChanged();
+    }
+
+    emit terminalFontChanged(fontFamily,
+                             pixelSize,
+                             lineSpacing,
+                             screenScaling,
+                             fontWidth,
+                             fallbackFontFamily,
+                             font->lowResolutionFont);
+}
+
+const FontEntry *FontManager::findFontByName(const QString &name) const
+{
+    for (const FontEntry &font : m_allFonts) {
+        if (font.name == name) {
+            return &font;
+        }
+    }
+    return nullptr;
+}
+
+QString FontManager::resolveFontFamily(const QString &sourcePath)
+{
+    const auto cached = m_loadedFamilies.constFind(sourcePath);
+    if (cached != m_loadedFamilies.constEnd()) {
+        return cached.value();
+    }
+
+    const int fontId = QFontDatabase::addApplicationFont(sourcePath);
+    QString family;
+    if (fontId != -1) {
+        const QStringList families = QFontDatabase::applicationFontFamilies(fontId);
+        if (!families.isEmpty()) {
+            family = families.first();
+        }
+    }
+
+    if (!family.isEmpty()) {
+        m_bundledFamilies.insert(family);
+    }
+
+    m_loadedFamilies.insert(sourcePath, family);
+    return family;
+}
+
+qreal FontManager::computeBaseWidth(const QString &family, int pixelSize, qreal fallbackWidth) const
+{
+    if (family.isEmpty()) {
+        return fallbackWidth;
+    }
+
+    QFont font(family);
+    font.setPixelSize(pixelSize);
+    QFontMetricsF metrics(font);
+
+    const qreal glyphWidth = metrics.horizontalAdvance(QLatin1String("M"));
+    const qreal glyphHeight = metrics.height();
+    if (glyphWidth <= 0.0 || glyphHeight <= 0.0) {
+        return fallbackWidth;
+    }
+
+    const qreal targetRatio = 0.5;
+    qreal computedWidth = (targetRatio * glyphHeight) / glyphWidth;
+    return qBound(0.25, computedWidth, 2.0);
+}

app/fontmanager.h

@@ -0,0 +1,111 @@
+#ifndef FONTMANAGER_H
+#define FONTMANAGER_H
+
+#include <QObject>
+#include <QStringList>
+#include <QHash>
+#include <QSet>
+
+#include "fontlistmodel.h"
+
+class FontManager : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(FontListModel *fontList READ fontList CONSTANT)
+    Q_PROPERTY(FontListModel *filteredFontList READ filteredFontList NOTIFY filteredFontListChanged)
+    Q_PROPERTY(int fontSource READ fontSource WRITE setFontSource NOTIFY fontSourceChanged)
+    Q_PROPERTY(int rasterization READ rasterization WRITE setRasterization NOTIFY rasterizationChanged)
+    Q_PROPERTY(QString fontName READ fontName WRITE setFontName NOTIFY fontNameChanged)
+    Q_PROPERTY(qreal fontScaling READ fontScaling WRITE setFontScaling NOTIFY fontScalingChanged)
+    Q_PROPERTY(qreal fontWidth READ fontWidth WRITE setFontWidth NOTIFY fontWidthChanged)
+    Q_PROPERTY(qreal lineSpacing READ lineSpacing WRITE setLineSpacing NOTIFY lineSpacingChanged)
+    Q_PROPERTY(qreal baseFontScaling READ baseFontScaling WRITE setBaseFontScaling NOTIFY baseFontScalingChanged)
+    Q_PROPERTY(bool lowResolutionFont READ lowResolutionFont NOTIFY lowResolutionFontChanged)
+
+public:
+    explicit FontManager(QObject *parent = nullptr);
+
+    Q_INVOKABLE void refresh();
+
+    FontListModel *fontList();
+    FontListModel *filteredFontList();
+
+    int fontSource() const;
+    void setFontSource(int fontSource);
+
+    int rasterization() const;
+    void setRasterization(int rasterization);
+
+    QString fontName() const;
+    void setFontName(const QString &fontName);
+
+    qreal fontScaling() const;
+    void setFontScaling(qreal fontScaling);
+
+    qreal fontWidth() const;
+    void setFontWidth(qreal fontWidth);
+
+    qreal lineSpacing() const;
+    void setLineSpacing(qreal lineSpacing);
+
+    qreal baseFontScaling() const;
+    void setBaseFontScaling(qreal baseFontScaling);
+
+    bool lowResolutionFont() const;
+
+signals:
+    void fontSourceChanged();
+    void rasterizationChanged();
+    void fontNameChanged();
+    void fontScalingChanged();
+    void fontWidthChanged();
+    void lineSpacingChanged();
+    void baseFontScalingChanged();
+    void lowResolutionFontChanged();
+    void filteredFontListChanged();
+
+    void terminalFontChanged(QString fontFamily,
+                             int pixelSize,
+                             int lineSpacing,
+                             qreal screenScaling,
+                             qreal fontWidth,
+                             QString fallbackFontFamily,
+                             bool lowResolutionFont);
+
+private:
+    QStringList retrieveMonospaceFonts();
+    void populateBundledFonts();
+    void populateSystemFonts();
+    void addBundledFont(const QString &name,
+                        const QString &text,
+                        const QString &source,
+                        qreal baseWidth,
+                        int pixelSize,
+                        bool lowResolutionFont,
+                        const QString &fallbackName = QString());
+    void setFontSubstitutions(const QString &family, const QStringList &substitutes);
+    void removeFontSubstitution(const QString &family);
+    void updateFilteredFonts();
+    void updateComputedFont();
+    const FontEntry *findFontByName(const QString &name) const;
+    QString resolveFontFamily(const QString &sourcePath);
+    qreal computeBaseWidth(const QString &family, int pixelSize, qreal fallbackWidth) const;
+
+    FontListModel m_fontListModel;
+    FontListModel m_filteredFontListModel;
+    QVector<FontEntry> m_allFonts;
+
+    int m_fontSource = 0;
+    int m_rasterization = 0;
+    QString m_fontName = QStringLiteral("TERMINESS_SCALED");
+    qreal m_fontScaling = 1.0;
+    qreal m_fontWidth = 1.0;
+    qreal m_lineSpacing = 0.1;
+    qreal m_baseFontScaling = 0.75;
+    bool m_lowResolutionFont = false;
+
+    QHash<QString, QString> m_loadedFamilies;
+    QSet<QString> m_bundledFamilies;
+};
+
+#endif // FONTMANAGER_H

app/main.cpp

@@ -6,14 +6,25 @@
 
 #include <QtWidgets/QApplication>
 #include <QIcon>
+#include <QQuickStyle>
+#include <QtQml/qqml.h>
+
+#include <kdsingleapplication.h>
 
 #include <QDebug>
 #include <stdlib.h>
 
-#include <QFontDatabase>
+#include <QLoggingCategory>
 
 #include <fileio.h>
-#include <monospacefontmanager.h>
+#include <fontlistmodel.h>
+#include <fontmanager.h>
+
+#if defined(Q_OS_MAC)
+#include <CoreFoundation/CoreFoundation.h>
+#include <QStyleFactory>
+#include <QMenu>
+#endif
 
 QString getNamedArgument(QStringList args, QString name, QString defaultName)
 {
@@ -29,51 +40,79 @@ QString getNamedArgument(QStringList args, QString name)
 int main(int argc, char *argv[])
 {
     // Some environmental variable are necessary on certain platforms.
+    // Disable Connections slot warnings
+    QLoggingCategory::setFilterRules("qt.qml.connections.warning=false");
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::Round);
 
-    // This disables QT appmenu under Ubuntu, which is not working with QML apps.
-    setenv("QT_QPA_PLATFORMTHEME", "", 1);
+// #if defined (Q_OS_LINUX)
+//     setenv("QSG_RENDER_LOOP", "threaded", 0);
+// #endif
 
 #if defined(Q_OS_MAC)
     // This allows UTF-8 characters usage in OSX.
     setenv("LC_CTYPE", "UTF-8", 1);
+
+    // Ensure key repeat works for letter keys (disable macOS press-and-hold for this app).
+    CFPreferencesSetAppValue(CFSTR("ApplePressAndHoldEnabled"), kCFBooleanFalse, kCFPreferencesCurrentApplication);
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+
+    // Qt6 macOS default look is still lacking, so let's force Fusion for now
+    QQuickStyle::setStyle(QStringLiteral("Fusion"));
 #endif
 
+    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]" << Qt::endl;
+        cout << "  --default-settings  Run cool-retro-term with the default settings" << Qt::endl;
+        cout << "  --workdir <dir>     Change working directory to 'dir'" << Qt::endl;
+        cout << "  -e <cmd>            Command to execute. This option will catch all following arguments, so use it as the last option." << Qt::endl;
+        cout << "  --fullscreen        Run cool-retro-term in fullscreen." << Qt::endl;
+        cout << "  -p|--profile <prof> Run cool-retro-term with the given profile." << Qt::endl;
+        cout << "  -h|--help           Print this help." << Qt::endl;
+        cout << "  --verbose           Print additional information such as profiles and settings." << Qt::endl;
+        return 0;
+    }
+
+    QString appVersion(QStringLiteral(APP_VERSION));
+
+    if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
+        QTextStream cout(stdout, QIODevice::WriteOnly);
+        cout << "cool-retro-term " << appVersion << Qt::endl;
+        return 0;
+    }
+
     QApplication app(argc, argv);
-    // set application attributes
-    // Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293
-    // app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
+    app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
+    app.setApplicationName(QStringLiteral("cool-retro-term"));
+    app.setOrganizationName(QStringLiteral("cool-retro-term"));
+    app.setOrganizationDomain(QStringLiteral("cool-retro-term"));
+    app.setApplicationVersion(appVersion);
+
+    KDSingleApplication singleApp(QStringLiteral("cool-retro-term"));
+
+    if (!singleApp.isPrimaryInstance()) {
+        if (singleApp.sendMessage("new-window"))
+            return 0;
+        qWarning() << "KDSingleApplication: primary not reachable, continuing as independent instance.";
+    }
 
     QQmlApplicationEngine engine;
     FileIO fileIO;
-    MonospaceFontManager monospaceFontManager;
+
+    qmlRegisterType<FontManager>("CoolRetroTerm", 1, 0, "FontManager");
+    qmlRegisterUncreatableType<FontListModel>("CoolRetroTerm", 1, 0, "FontListModel", "FontListModel is created by FontManager");
 
 #if !defined(Q_OS_MAC)
     app.setWindowIcon(QIcon::fromTheme("cool-retro-term", QIcon(":../icons/32x32/cool-retro-term.png")));
+#if defined(Q_OS_LINUX)
+    QGuiApplication::setDesktopFileName(QStringLiteral("cool-retro-term"));
+#endif
 #else
     app.setWindowIcon(QIcon(":../icons/32x32/cool-retro-term.png"));
 #endif
 
     // Manage command line arguments from the cpp side
     QStringList args = app.arguments();
-    if (args.contains("-h") || args.contains("--help")) {
-        // BUG: This usage help text goes to stderr, should go to stdout.
-        // BUG: First line of output is surrounded by double quotes.
-        qDebug() << "Usage: " + args.at(0) + " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]";
-        qDebug() << "  --default-settings  Run cool-retro-term with the default settings";
-        qDebug() << "  --workdir <dir>     Change working directory to 'dir'";
-        qDebug() << "  -e <cmd>            Command to execute. This option will catch all following arguments, so use it as the last option.";
-        qDebug() << "  -T <title>          Set window title to 'title'.";
-        qDebug() << "  --fullscreen        Run cool-retro-term in fullscreen.";
-        qDebug() << "  -p|--profile <prof> Run cool-retro-term with the given profile.";
-        qDebug() << "  -h|--help           Print this help.";
-        qDebug() << "  --verbose           Print additional information such as profiles and settings.";
-        return 0;
-    }
-
-    if (args.contains("-v") || args.contains("--version")) {
-        qDebug() << "cool-retro-term 1.0.1";
-	return 0;
-    }
 
     // Manage default command
     QStringList cmdList;
@@ -82,20 +121,18 @@ int main(int argc, char *argv[])
     }
     QVariant command(cmdList.empty() ? QVariant() : cmdList[0]);
     QVariant commandArgs(cmdList.size() <= 1 ? QVariant() : QVariant(cmdList.mid(1)));
+    engine.rootContext()->setContextProperty("appVersion", appVersion);
     engine.rootContext()->setContextProperty("defaultCmd", command);
     engine.rootContext()->setContextProperty("defaultCmdArgs", commandArgs);
 
     engine.rootContext()->setContextProperty("workdir", getNamedArgument(args, "--workdir", "$HOME"));
     engine.rootContext()->setContextProperty("fileIO", &fileIO);
-    engine.rootContext()->setContextProperty("monospaceSystemFonts", monospaceFontManager.retrieveMonospaceFonts());
-
-    engine.rootContext()->setContextProperty("devicePixelRatio", app.devicePixelRatio());
 
     // Manage import paths for Linux and OSX.
     QStringList importPathList = engine.importPathList();
-    importPathList.prepend(QCoreApplication::applicationDirPath() + "/qmltermwidget");
-    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../PlugIns");
-    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../../../qmltermwidget");
+    importPathList.append(QCoreApplication::applicationDirPath() + "/qmltermwidget");
+    importPathList.append(QCoreApplication::applicationDirPath() + "/../PlugIns");
+    importPathList.append(QCoreApplication::applicationDirPath() + "/../../../qmltermwidget");
     engine.setImportPathList(importPathList);
 
     engine.load(QUrl(QStringLiteral ("qrc:/main.qml")));
@@ -108,5 +145,25 @@ int main(int argc, char *argv[])
     // Quit the application when the engine closes.
     QObject::connect((QObject*) &engine, SIGNAL(quit()), (QObject*) &app, SLOT(quit()));
 
+    auto requestNewWindow = [&engine]() {
+        if (engine.rootObjects().isEmpty())
+            return;
+
+        QObject *rootObject = engine.rootObjects().constFirst();
+        QMetaObject::invokeMethod(rootObject, "createWindow", Qt::QueuedConnection);
+    };
+
+    QObject::connect(&singleApp, &KDSingleApplication::messageReceived, &app,
+                     [&requestNewWindow](const QByteArray &message) {
+        if (message.isEmpty() || message == QByteArray("new-window"))
+            requestNewWindow();
+    });
+
+#if defined(Q_OS_MAC)
+    QMenu *dockMenu = new QMenu(nullptr);
+    dockMenu->addAction(QObject::tr("New Window"), [&requestNewWindow]() { requestNewWindow(); });
+    dockMenu->setAsDockMenu();
+#endif
+
     return app.exec();
 }

app/monospacefontmanager.cpp

@@ -1,25 +0,0 @@
-#include "monospacefontmanager.h"
-
-#include <QDebug>
-
-MonospaceFontManager::MonospaceFontManager(QObject *parent) : QObject(parent)
-{
-
-}
-
-QStringList MonospaceFontManager::retrieveMonospaceFonts() {
-    QStringList result;
-
-    QFontDatabase fontDatabase;
-    QStringList fontFamilies = fontDatabase.families();
-
-    for (int i = 0; i < fontFamilies.size(); i++) {
-        QString fontFamily = fontFamilies[i];
-        QFont font(fontFamily);
-        if (fontDatabase.isFixedPitch(font.family())) {
-            result.append(fontFamily);
-        }
-    }
-
-    return result;
-}

app/monospacefontmanager.h

@@ -1,15 +0,0 @@
-#ifndef MONOSPACEFONTMANAGER_H
-#define MONOSPACEFONTMANAGER_H
-
-#include <QObject>
-#include <QFontDatabase>
-
-class MonospaceFontManager : public QObject
-{
-    Q_OBJECT
-public:
-    explicit MonospaceFontManager(QObject *parent = nullptr);
-    Q_INVOKABLE QStringList retrieveMonospaceFonts();
-};
-
-#endif // MONOSPACEFONTMANAGER_H

app/qml/AboutDialog.qml

@@ -1,26 +1,47 @@
+/*******************************************************************************
+* 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
 
-Window{
+ApplicationWindow {
     id: dialogwindow
     title: qsTr("About")
     width: 600
     height: 400
 
-    modality: Qt.ApplicationModal
-
-    ColumnLayout{
+    ColumnLayout {
         anchors.fill: parent
         anchors.margins: 15
         spacing: 15
         Text {
             Layout.alignment: Qt.AlignHCenter
             text: "cool-retro-term"
-            font {bold: true; pointSize: 18}
+            color: palette.text
+            font {
+                bold: true
+                pointSize: 18
+            }
         }
-        Loader{
+        Loader {
             id: mainContent
             Layout.fillHeight: true
             Layout.fillWidth: true
@@ -41,32 +62,33 @@ Window{
                     }
                 }
             ]
-            Component.onCompleted: mainContent.state = "Default";
+            Component.onCompleted: mainContent.state = "Default"
         }
-        Item{
+        Item {
             Layout.fillWidth: true
             height: childrenRect.height
-            Button{
+            Button {
                 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{
+            Button {
                 anchors.right: parent.right
                 text: qsTr("Close")
-                onClicked: dialogwindow.close();
+                onClicked: dialogwindow.close()
             }
         }
     }
     // MAIN COMPONENTS ////////////////////////////////////////////////////////
-    Component{
+    Component {
         id: defaultComponent
-        ColumnLayout{
+        ColumnLayout {
             anchors.fill: parent
             spacing: 10
-            Image{
+            Image {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 Layout.alignment: Qt.AlignHCenter
@@ -74,36 +96,39 @@ Window{
                 source: "images/crt256.png"
                 smooth: true
             }
-            Text{
+            Text {
                 Layout.alignment: Qt.AlignCenter
                 horizontalAlignment: Text.AlignHCenter
-                text: appSettings.version + "\n" +
-                      qsTr("Author: ") + "Filippo Scognamiglio\n" +
-                      qsTr("Email: ")  + "flscogna@gmail.com\n" +
-                      qsTr("Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
+                color: palette.text
+                text: appSettings.version + "\n" + qsTr(
+                          "Author: ") + "Filippo Scognamiglio\n" + qsTr(
+                          "Email: ") + "flscogna@gmail.com\n" + qsTr(
+                          "Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
             }
         }
     }
-    Component{
+    Component {
         id: licenseComponent
-        TextArea{
+        ScrollView {
             anchors.fill: parent
-            readOnly: true
-            text: "Copyright (c) 2013 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 " +
-                  "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.\n\n" +
-
-                  "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.\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/>."
+            clip: true
+            TextArea {
+                readOnly: true
+                wrapMode: TextEdit.Wrap
+                color: palette.text
+                text: "Copyright (c) 2013-2025 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 "
+                      + "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.\n\n" +
+                      "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.\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/>."
+            }
         }
     }
 }

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
@@ -5,44 +24,39 @@ import "utils.js" as Utils
 Loader {
     id: burnInEffect
 
-    property ShaderEffectSource source: item ? item.source : null
+    property ShaderEffectSource effectSource: item ? item.source : null
 
     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: 160
-    property real _maxBurnInFadeTime: 1600
+    property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
+    property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
 
     active: appSettings.burnIn !== 0
 
+    anchors.fill: parent
+
     function completelyUpdate() {
-        prevLastUpdate = lastUpdate;
-        lastUpdate = timeManager.time;
-        item.source.scheduleUpdate();
+        let newTime = timeManager.time
+        if (newTime > lastUpdate) {
+            prevLastUpdate = lastUpdate
+            lastUpdate = newTime
+        }
+
+        item.source.scheduleUpdate()
     }
 
-    function restartBlurSource(){
-        prevLastUpdate = timeManager.time;
-        lastUpdate = prevLastUpdate;
-        completelyUpdate();
+    function restartBlurSource() {
+        prevLastUpdate = timeManager.time
+        lastUpdate = prevLastUpdate
+        completelyUpdate()
     }
 
     sourceComponent: Item {
         property alias source: burnInEffectSource
 
-        property int burnInScaling: scaleTexture * appSettings.burnInQuality
-
-        width: appSettings.lowResolutionFont
-               ? kterminal.width * Math.max(1, burnInScaling)
-               : kterminal.width * scaleTexture * appSettings.burnInQuality
-
-        height: appSettings.lowResolutionFont
-                ? kterminal.height * Math.max(1, burnInScaling)
-                : kterminal.height * scaleTexture * appSettings.burnInQuality
-
         ShaderEffectSource {
             id: burnInEffectSource
 
@@ -52,86 +66,62 @@ Loader {
             live: false
             recursive: true
             hideSource: true
-            wrapMode: kterminalSource.wrapMode
+            wrapMode: ShaderEffectSource.ClampToEdge
 
             format: ShaderEffectSource.RGBA
-
-            // Enabling smooth with a low burnInQuality causes bad artifacts because the FBO
-            // has different values when it's read back. This lowers the quality, but makes it more consistent.
-            smooth: appSettings.burnInQuality === 1.0
+            smooth: true
 
             visible: false
 
             Connections {
                 target: kterminal
-                onImagePainted: completelyUpdate()
+
+                onImagePainted: {
+                    completelyUpdate()
+                }
             }
             // Restart blurred source settings change.
-            Connections{
-                target: appSettings
-                onBurnInChanged: burnInEffect.restartBlurSource();
-                onTerminalFontChanged: burnInEffect.restartBlurSource();
-                onRasterizationChanged: burnInEffect.restartBlurSource();
-                onBurnInQualityChanged: burnInEffect.restartBlurSource();
+            Connections {
+                target: appSettings.fontManager
+
+                onTerminalFontChanged: {
+                    burnInEffect.restartBlurSource()
+                }
             }
 
             Connections {
-                target: kterminalScrollbar
-                onOpacityChanged: completelyUpdate()
+                target: appSettings
+
+                onBurnInChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onRasterizationChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onBurnInQualityChanged: {
+                    burnInEffect.restartBlurSource()
+                }
             }
         }
 
         ShaderEffect {
             id: burnInShaderEffect
 
+            property real time: timeManager.time
+
             property variant txt_source: kterminalSource
             property variant burnInSource: burnInEffectSource
             property real burnInTime: burnInFadeTime
-            property real lastUpdate: burnInEffect.lastUpdate
+            property real burnInLastUpdate: burnInEffect.lastUpdate
             property real prevLastUpdate: burnInEffect.prevLastUpdate
 
             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 burnInSource;
-                 uniform highp float burnInTime;
-
-                 uniform highp float lastUpdate;
-
-                 uniform highp float prevLastUpdate;" +
-
-                "float rgb2grey(vec3 v){
-                    return dot(v, vec3(0.21, 0.72, 0.04));
-                }" +
-
-                "void main() {
-                    vec2 coords = qt_TexCoord0;
-
-                    vec3 txtColor = texture2D(txt_source, coords).rgb;
-                    vec4 accColor = texture2D(burnInSource, coords);
-
-                    float prevMask = accColor.a;
-                    float currMask = rgb2grey(txtColor);
-
-                    highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
-                    blurDecay = max(0.0, blurDecay - prevMask);
-                    vec3 blurColor = accColor.rgb - vec3(blurDecay);
-                    vec3 color = max(blurColor, txtColor);
-
-                    gl_FragColor = vec4(color, currMask);
-                }
-            "
+            fragmentShader: "qrc:/shaders/burn_in.frag.qsb"
+            vertexShader: "qrc:/shaders/burn_in.vert.qsb"
 
             onStatusChanged: if (log) console.log(log) //Print warning messages
         }

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,46 +27,46 @@ RowLayout {
     property alias name: check.text
 
     property double value
-    property alias min_value: slider.minimumValue
-    property alias max_value: slider.maximumValue
+    property alias min_value: slider.from
+    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);
-        if(check.checked)
-            slider.value = value;
+        check.checked = !(value == 0)
+        if (check.checked)
+            slider.value = value
     }
 
-    CheckBox{
+    CheckBox {
         id: check
         implicitWidth: 160
         onClicked: {
-            if(!checked){
-                checked = false;
-                slider.enabled = false;
-                newValue(0);
+            if (!checked) {
+                checked = false
+                slider.enabled = false
+                newValue(0)
             } else {
-                checked = true;
-                newValue(slider.value);
-                slider.enabled = true;
+                checked = true
+                newValue(slider.value)
+                slider.enabled = true
             }
         }
     }
-    Slider{
+    Slider {
         id: slider
         stepSize: parent.stepSize
         Layout.fillWidth: true
         onValueChanged: {
-            newValue(value);
+            newValue(value)
         }
     }
     SizedLabel {
-        Layout.fillHeight: true
-        text: Math.round(((value - min_value) / (max_value - min_value)) * 100) + "%"
+        text: Math.round(
+                  ((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,14 +17,13 @@
 * 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
+import QtQuick.Dialogs
 
 Item {
     id: rootItem
 
-    signal colorSelected (color color)
+    signal colorSelected(color color)
     property color color
     property string name
 
@@ -32,18 +31,19 @@ Item {
         id: colorDialog
         title: qsTr("Choose a color")
         modality: Qt.ApplicationModal
-        visible: false
+        selectedColor: rootItem.color
 
-        //This is a workaround to a Qt 5.2 bug.
-        onColorChanged: if (Qt.platform.os !== "osx") colorSelected(color)
-        onAccepted: if (Qt.platform.os === "osx") colorSelected(color)
+        onSelectedColorChanged: {
+            if (!appSettings.isMacOS && visible)
+                colorSelected(selectedColor)
+        }
+        onAccepted: colorSelected(selectedColor)
     }
-    Rectangle{
+    Rectangle {
         anchors.fill: parent
         radius: 10
         color: rootItem.color
-        border.color: "black"
-        Glossy {}
+
         Rectangle {
             anchors.fill: parent
             anchors.margins: parent.height * 0.25
@@ -51,14 +51,14 @@ Item {
             color: "white"
             opacity: 0.5
         }
-        Text{
+        Text {
             anchors.centerIn: parent
             z: parent.z + 1
             text: name + ":  " + rootItem.color
         }
     }
-    MouseArea{
+    MouseArea {
         anchors.fill: parent
-        onClicked: colorDialog.visible = true;
+        onClicked: colorDialog.open()
     }
 }

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
+Label {
+    id: textfield
+    Layout.minimumWidth: appSettings.labelWidth
     width: appSettings.labelWidth
-    Label{
-        id: textfield
-        anchors { right: parent.right; verticalCenter: parent.verticalCenter }
-    }
 }

app/qml/FontPixels.qml

@@ -1,108 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-
-import QtQuick 2.2
-
-QtObject{
-    property int selectedFontIndex
-    property real scaling
-    property var _font: fontlist.get(selectedFontIndex)
-    property var source: _font.source
-    property int pixelSize: _font.pixelSize
-    property int lineSpacing: _font.lineSpacing
-    property real screenScaling: scaling * _font.baseScaling
-    property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
-    property bool lowResolutionFont: true
-
-    property ListModel fontlist: ListModel{
-        ListElement{
-            name: "COMMODORE_PET"
-            text: "Commodore PET (1977)"
-            source: "fonts/1977-commodore-pet/PetMe.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "IBM_PC"
-            text: "IBM PC (1981)"
-            source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "PROGGY_TINY"
-            text: "Proggy Tiny (Modern)"
-            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
-            lineSpacing: 1
-            pixelSize: 16
-            baseScaling: 3.3
-            fontWidth: 0.9
-        }
-        ListElement{
-            name: "TERMINUS_SCALED"
-            text: "Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "PRO_FONT_SCALED"
-            text: "Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "APPLE_II"
-            text: "Apple ][ (1977)"
-            source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 2
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.9
-        }
-        ListElement{
-            name: "ATARI_400"
-            text: "Atari 400-800 (1979)"
-            source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "COMMODORE_64"
-            text: "Commodore 64 (1982)"
-            source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-    }
-}

app/qml/FontScanlines.qml

@@ -1,108 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-
-import QtQuick 2.2
-
-QtObject{
-    property int selectedFontIndex
-    property real scaling
-    property var _font: fontlist.get(selectedFontIndex)
-    property var source: _font.source
-    property int pixelSize: _font.pixelSize
-    property int lineSpacing: _font.lineSpacing
-    property real screenScaling: scaling * _font.baseScaling
-    property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
-    property bool lowResolutionFont: true
-
-    property ListModel fontlist: ListModel{
-        ListElement{
-            name: "COMMODORE_PET"
-            text: "Commodore PET (1977)"
-            source: "fonts/1977-commodore-pet/PetMe.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-        }
-        ListElement{
-            name: "IBM_PC"
-            text: "IBM PC (1981)"
-            source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "PROGGY_TINY"
-            text: "Proggy Tiny (Modern)"
-            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
-            lineSpacing: 1
-            pixelSize: 16
-            baseScaling: 3.3
-            fontWidth: 0.9
-        }
-        ListElement{
-            name: "TERMINUS_SCALED"
-            text: "Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "PRO_FONT_SCALED"
-            text: "Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "APPLE_II"
-            text: "Apple ][ (1977)"
-            source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "ATARI_400"
-            text: "Atari 400-800 (1979)"
-            source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-        }
-        ListElement{
-            name: "COMMODORE_64"
-            text: "Commodore 64 (1982)"
-            source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-        }
-    }
-}

app/qml/Fonts.qml

@@ -1,258 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-
-import QtQuick 2.2
-
-QtObject{
-    property int selectedFontIndex
-    property real scaling
-    property var source: fontlist.get(selectedFontIndex).source
-    property var _font: fontlist.get(selectedFontIndex)
-    property bool lowResolutionFont: _font.lowResolutionFont
-
-    property int pixelSize: lowResolutionFont
-                                 ? _font.pixelSize
-                                 : _font.pixelSize * scaling
-
-    property int lineSpacing: lowResolutionFont
-                                  ? _font.lineSpacing
-                                  : pixelSize * _font.lineSpacing
-
-    property real screenScaling: lowResolutionFont
-                                     ? _font.baseScaling * scaling
-                                     : 1.0
-
-    property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
-
-    property string family: fontlist.get(selectedFontIndex).family
-
-    property bool isSystemFont: fontlist.get(selectedFontIndex).isSystemFont
-
-    // There are two kind of fonts: low resolution and high resolution.
-    // Low resolution font sets the lowResolutionFont property to true.
-    // They are rendered at a fixed pixel size and the texture is upscaled
-    // to fill the screen (they are much faster to render).
-    // High resolution fonts are instead drawn on a texture which has the
-    // size of the screen, and the scaling directly controls their pixels size.
-    // Those are slower to render but are not pixelated.
-
-    property ListModel fontlist: ListModel {
-        ListElement{
-            name: "TERMINUS_SCALED"
-            text: "Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "PRO_FONT_SCALED"
-            text: "Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "EXCELSIOR_SCALED"
-            text: "Fixedsys Excelsior (Modern)"
-            source: "fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf"
-            lineSpacing: 0
-            pixelSize: 16
-            baseScaling: 2.4
-            fontWidth: 1.0
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "COMMODORE_PET_SCALED"
-            text: "Commodore PET (1977)"
-            source: "fonts/1977-commodore-pet/PetMe.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "PROGGY_TINY_SCALED"
-            text: "Proggy Tiny (Modern)"
-            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
-            lineSpacing: 1
-            pixelSize: 16
-            baseScaling: 3.3
-            fontWidth: 0.9
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "APPLE_II_SCALED"
-            text: "Apple ][ (1977)"
-            source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "ATARI_400_SCALED"
-            text: "Atari 400-800 (1979)"
-            source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "IBM_PC_SCALED"
-            text: "IBM PC (1981)"
-            source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "COMMODORE_64_SCALED"
-            text: "Commodore 64 (1982)"
-            source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "IBM_DOS"
-            text: "IBM DOS (1985)"
-            source: "fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf"
-            lineSpacing: 3
-            pixelSize: 16
-            baseScaling: 2.0
-            fontWidth: 1.0
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "HERMIT"
-            text: "HD: Hermit (Modern)"
-            source: "fonts/modern-hermit/Hermit-medium.otf"
-            lineSpacing: 0.05
-            pixelSize: 27
-            fontWidth: 1.0
-            lowResolutionFont: false
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "TERMINUS"
-            text: "HD: Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 0.1
-            pixelSize: 35
-            fontWidth: 1.0
-            lowResolutionFont: false
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "PRO_FONT"
-            text: "HD: Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 0.1
-            pixelSize: 35
-            fontWidth: 1.0
-            lowResolutionFont: false
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "INCONSOLATA"
-            text: "HD: Inconsolata (Modern)"
-            source: "fonts/modern-inconsolata/Inconsolata.otf"
-            lineSpacing: 0.1
-            pixelSize: 35
-            fontWidth: 1.0
-            lowResolutionFont: false
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
-            name: "IBM_3278"
-            text: "HD: IBM 3278 (1971)"
-            source: "fonts/1971-ibm-3278/3270Medium.ttf"
-            lineSpacing: 0.2
-            pixelSize: 32
-            fontWidth: 1.0
-            lowResolutionFont: false
-            isSystemFont: false
-            family: ""
-        }
-    }
-
-    Component.onCompleted: addSystemFonts()
-
-    function addSystemFonts() {
-        var families = monospaceSystemFonts;
-        for (var i = 0; i < families.length; i++) {
-            console.log("Adding system font: ", families[i])
-            fontlist.append(convertToListElement(families[i]))
-        }
-    }
-
-    function convertToListElement(family) {
-        return {
-            name: "System: " + family,
-            text: qsTr("System: ") + family,
-            source: "",
-            lineSpacing: 0.1,
-            pixelSize: 30,
-            fontWidth: 1.0,
-            baseScaling: 1.0,
-            lowResolutionFont: false,
-            isSystemFont: true,
-            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,14 +17,13 @@
 * 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
+import QtQuick.Dialogs
 
-Window{
+Window {
     id: insertnamedialog
     width: 400
     height: 100
@@ -39,50 +38,53 @@ Window{
         title: qsTr("Error")
         visible: false
 
-        function showError(message){
-            text = message;
-            open();
+        function showError(message) {
+            text = message
+            open()
         }
     }
 
-    function validateName(name){
-        var profile_list = appSettings.profilesList;
+    function validateName(name) {
+        var profile_list = appSettings.profilesList
         if (name === "")
-            return 1;
-        return 0;
+            return 1
+        return 0
     }
 
-    ColumnLayout{
+    ColumnLayout {
         anchors.margins: 10
         anchors.fill: parent
-        RowLayout{
-            Label{text: qsTr("Name")}
-            TextField{
+        RowLayout {
+            Label {
+                text: qsTr("Name")
+            }
+            TextField {
                 id: namefield
                 Layout.fillWidth: true
                 Component.onCompleted: forceActiveFocus()
                 onAccepted: okbutton.clickAction()
             }
         }
-        RowLayout{
+        RowLayout {
             Layout.alignment: Qt.AlignBottom | Qt.AlignRight
-            Button{
+            Button {
                 id: okbutton
                 text: qsTr("OK")
                 onClicked: clickAction()
-                function clickAction(){
-                    var name = namefield.text;
-                    switch(validateName(name)){
+                function clickAction() {
+                    var name = namefield.text
+                    switch (validateName(name)) {
                     case 1:
-                        errorDialog.showError(qsTr("The name you inserted is empty. Please choose a different one."));
-                        break;
+                        errorDialog.showError(
+                                    qsTr("The name you inserted is empty. Please choose a different one."))
+                        break
                     default:
-                        nameSelected(name);
-                        close();
+                        nameSelected(name)
+                        close()
                     }
                 }
             }
-            Button{
+            Button {
                 text: qsTr("Cancel")
                 onClicked: close()
             }

app/qml/NewTerminalFrame.qml

@@ -1,73 +0,0 @@
-import QtQuick 2.0
-
-import "utils.js" as Utils
-
-ShaderEffect {
-    property color _staticFrameColor: "#dedede"
-    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)
-
-    visible: screenCurvature != 0
-
-    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;
-
-        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 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 = 0.5 * shadowLength;
-
-            float outShadow = max2(1.0 - smoothstep(vec2(-outShadowLength), vec2(0.0), coords) + smoothstep(vec2(1.0), vec2(1.0 + outShadowLength), coords));
-            outShadow = clamp(0.0, 1.0, outShadow);
-            color += frameColor.rgb * sqrt(outShadow);
-            alpha = sum2(1.0 - step(0.0, coords) + step(1.0, coords));
-            alpha = clamp(alpha, 0.0, 1.0) * mix(1.0, 0.9, sqrt(outShadow));
-
-            float inShadow = min2(step(vec2(0.0), coords) - step(vec2(1.0), coords));
-            inShadow -= min2(smoothstep(0.0, inShadowLength, coords) - smoothstep(1.0 - inShadowLength, 1.0, coords));
-            alpha += 0.35 * 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,16 +19,19 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
+import QtQml
 
 import QMLTermWidget 1.0
 
+import "menus"
 import "utils.js" as Utils
 
 Item{
-    id: terminalContainer
+    id: preprocessedTerminal
+    signal sessionFinished()
 
-    property size virtualResolution: Qt.size(kterminal.width, kterminal.height)
+    property size virtualResolution: Qt.size(kterminal.totalWidth, kterminal.totalHeight)
     property alias mainTerminal: kterminal
 
     property ShaderEffectSource mainSource: kterminalSource
@@ -43,46 +46,80 @@ Item{
     property size fontMetrics: kterminal.fontMetrics
 
     // Manage copy and paste
-    Connections{
+    Connections {
         target: copyAction
-        onTriggered: kterminal.copyClipboard();
+        enabled: terminalContainer.hasFocus
+        onTriggered: {
+            kterminal.copyClipboard()
+        }
     }
-    Connections{
+    Connections {
         target: pasteAction
-        onTriggered: kterminal.pasteClipboard()
+        enabled: terminalContainer.hasFocus
+        onTriggered: {
+            kterminal.pasteClipboard()
+        }
     }
 
     //When settings are updated sources need to be redrawn.
-    Connections{
+    Connections {
         target: appSettings
-        onFontScalingChanged: terminalContainer.updateSources();
-        onFontWidthChanged: terminalContainer.updateSources();
+
+        onFontScalingChanged: {
+            preprocessedTerminal.updateSources()
+        }
+
+        onFontWidthChanged: {
+            preprocessedTerminal.updateSources()
+        }
     }
-    Connections{
-        target: terminalContainer
-        onWidthChanged: terminalContainer.updateSources();
-        onHeightChanged: terminalContainer.updateSources();
+    Connections {
+        target: preprocessedTerminal
+
+        onWidthChanged: {
+            preprocessedTerminal.updateSources()
+        }
+
+        onHeightChanged: {
+            preprocessedTerminal.updateSources()
+        }
     }
+
     function updateSources() {
-        kterminal.update();
+        kterminal.update()
     }
 
     QMLTermWidget {
         id: kterminal
-        width: Math.floor(parent.width / (screenScaling * fontWidth))
-        height: Math.floor(parent.height / screenScaling)
+
+        property int textureResolutionScale: appSettings.lowResolutionFont ? Screen.devicePixelRatio : 1
+        property int margin: appSettings.margin / screenScaling
+        property int totalWidth: Math.floor(parent.width / (screenScaling * fontWidth))
+        property int totalHeight: Math.floor(parent.height / screenScaling)
+
+        property int rawWidth: totalWidth - 2 * margin
+        property int rawHeight: totalHeight - 2 * margin
+
+        textureSize: Qt.size(width / textureResolutionScale, height / textureResolutionScale)
+
+        width: ensureMultiple(rawWidth, Screen.devicePixelRatio)
+        height: ensureMultiple(rawHeight, Screen.devicePixelRatio)
+
+        /** Ensure size is a multiple of factor. This is needed for pixel perfect scaling on highdpi screens. */
+        function ensureMultiple(size, factor) {
+            return Math.round(size / factor) * factor;
+        }
+
+        fullCursorHeight: true
+        blinkingCursor: appSettings.blinkingCursor
 
         colorScheme: "cool-retro-term"
 
-        smooth: !appSettings.lowResolutionFont
-        enableBold: false
-        fullCursorHeight: true
-
         session: QMLTermSession {
             id: ksession
 
             onFinished: {
-                Qt.quit()
+                preprocessedTerminal.sessionFinished()
             }
         }
 
@@ -96,26 +133,36 @@ Item{
                 anchors.topMargin: 1
                 anchors.bottomMargin: 1
                 color: "white"
-                radius: width * 0.25
                 opacity: 0.7
             }
         }
 
-        function handleFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling, fontWidth) {
-            kterminal.antialiasText = !appSettings.lowResolutionFont;
-            font.pixelSize = pixelSize;
-            font.family = fontFamily;
-
-            terminalContainer.fontWidth = fontWidth;
-            terminalContainer.screenScaling = screenScaling;
-            scaleTexture = Math.max(1.0, Math.floor(screenScaling * appSettings.windowScaling));
-
+        function handleFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling, fontWidth, fallbackFontFamily, lowResolutionFont) {
             kterminal.lineSpacing = lineSpacing;
+            kterminal.antialiasText = !lowResolutionFont;
+            kterminal.smooth = !lowResolutionFont;
+            kterminal.enableBold = !lowResolutionFont;
+            kterminal.enableItalic = !lowResolutionFont;
+
+            kterminal.font = Qt.font({
+                family: fontFamily,
+                pixelSize: pixelSize
+            });
+
+            preprocessedTerminal.fontWidth = fontWidth;
+            preprocessedTerminal.screenScaling = screenScaling;
+            scaleTexture = Math.max(1.0, Math.floor(screenScaling * appSettings.windowScaling));
+        }
+
+        Connections {
+            target: appSettings
+
+            onWindowScalingChanged: {
+                scaleTexture = Math.max(1.0, Math.floor(preprocessedTerminal.screenScaling * appSettings.windowScaling));
+            }
         }
 
         function startSession() {
-            appSettings.initializedSettings.disconnect(startSession);
-
             // Retrieve the variable set in main.cpp if arguments are passed.
             if (defaultCmd) {
                 ksession.setShellProgram(defaultCmd);
@@ -124,7 +171,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"]);
             }
@@ -136,78 +183,79 @@ Item{
             forceActiveFocus();
         }
         Component.onCompleted: {
-            appSettings.terminalFontChanged.connect(handleFontChanged);
-            appSettings.initializedSettings.connect(startSession);
+            appSettings.fontManager.terminalFontChanged.connect(handleFontChanged);
+            appSettings.fontManager.refresh()
+            startSession();
         }
     }
+
     Component {
-        id: linuxContextMenu
-        Menu{
-            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 }
-        }
+        id: shortContextMenu
+        ShortContextMenu { }
     }
+
     Component {
-        id: osxContextMenu
-        Menu{
-            id: contextmenu
-            MenuItem{action: copyAction}
-            MenuItem{action: pasteAction}
-        }
+        id: fullContextMenu
+        FullContextMenu { }
     }
+
     Loader {
         id: menuLoader
-        sourceComponent: (Qt.platform.os === "osx" ? osxContextMenu : linuxContextMenu)
+        sourceComponent: (appSettings.isMacOS || (appSettings.showMenubar && !terminalWindow.fullscreen) ? shortContextMenu : fullContextMenu)
     }
     property alias contextmenu: menuLoader.item
 
-    MouseArea{
+    MouseArea {
+        property real margin: appSettings.margin
+        property real frameSize: appSettings.frameSize * terminalWindow.normalizedWindowScale
+
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: parent
         cursorShape: kterminal.terminalUsesMouse ? Qt.ArrowCursor : Qt.IBeamCursor
-        onWheel:{
-            if(wheel.modifiers & Qt.ControlModifier){
-               wheel.angleDelta.y > 0 ? zoomIn.trigger() : zoomOut.trigger();
+        onWheel: function(wheel) {
+            if (wheel.modifiers & Qt.ControlModifier) {
+               wheel.angleDelta.y > 0 ? zoomInAction.trigger() : zoomOutAction.trigger();
             } else {
                 var coord = correctDistortion(wheel.x, wheel.y);
                 kterminal.simulateWheel(coord.x, coord.y, wheel.buttons, wheel.modifiers, wheel.angleDelta);
             }
         }
-        onDoubleClicked: {
+        onDoubleClicked: function(mouse) {
             var coord = correctDistortion(mouse.x, mouse.y);
             kterminal.simulateMouseDoubleClick(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers);
         }
-        onPressed: {
-            if((!kterminal.terminalUsesMouse || mouse.modifiers & Qt.ShiftModifier) && mouse.button == Qt.RightButton) {
+        onPressed: function(mouse) {
+            kterminal.forceActiveFocus()
+            if ((!kterminal.terminalUsesMouse || mouse.modifiers & Qt.ShiftModifier) && mouse.button == Qt.RightButton) {
                 contextmenu.popup();
             } else {
                 var coord = correctDistortion(mouse.x, mouse.y);
                 kterminal.simulateMousePress(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers)
             }
         }
-        onReleased: {
+        onReleased: function(mouse) {
             var coord = correctDistortion(mouse.x, mouse.y);
             kterminal.simulateMouseRelease(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers);
         }
-        onPositionChanged: {
+        onPositionChanged: function(mouse) {
             var coord = correctDistortion(mouse.x, mouse.y);
             kterminal.simulateMouseMove(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers);
         }
 
-        function correctDistortion(x, y){
-            x = x / width;
-            y = y / height;
+        function correctDistortion(x, y) {
+            x = (x - margin) / width;
+            y = (y - margin) / height;
+
+            x = x * (1 + frameSize * 2) - frameSize;
+            y = y * (1 + frameSize * 2) - frameSize;
 
             var cc = Qt.size(0.5 - x, 0.5 - y);
-            var distortion = (cc.height * cc.height + cc.width * cc.width) * appSettings.screenCurvature * appSettings.screenCurvatureSize;
+            var distortion = (cc.height * cc.height + cc.width * cc.width)
+                    * appSettings.screenCurvature * appSettings.screenCurvatureSize
+                    * terminalWindow.normalizedWindowScale;
 
-            return Qt.point((x - cc.width  * (1+distortion) * distortion) * kterminal.width,
-                           (y - cc.height * (1+distortion) * distortion) * kterminal.height)
+            return Qt.point((x - cc.width  * (1+distortion) * distortion) * (kterminal.totalWidth),
+                           (y - cc.height * (1+distortion) * distortion) * (kterminal.totalHeight))
         }
     }
     ShaderEffectSource{
@@ -216,10 +264,26 @@ Item{
         hideSource: true
         wrapMode: ShaderEffectSource.Repeat
         visible: false
-        textureSize: Qt.size(kterminal.width * scaleTexture, kterminal.height * scaleTexture);
+        textureSize: Qt.size(kterminal.totalWidth * scaleTexture, kterminal.totalHeight * scaleTexture)
+        sourceRect: Qt.rect(-kterminal.margin, -kterminal.margin, kterminal.totalWidth, kterminal.totalHeight)
     }
 
-    BurnInEffect {
-        id: burnInEffect
+    Item {
+        id: burnInContainer
+
+        property int burnInScaling: scaleTexture * appSettings.burnInQuality
+
+        width: Math.round(appSettings.lowResolutionFont
+               ? kterminal.totalWidth * Math.max(1, burnInScaling)
+               : kterminal.totalWidth * scaleTexture * appSettings.burnInQuality)
+
+        height: Math.round(appSettings.lowResolutionFont
+                ? kterminal.totalHeight * Math.max(1, burnInScaling)
+                : kterminal.totalHeight * scaleTexture * appSettings.burnInQuality)
+
+
+        BurnInEffect {
+            id: burnInEffect
+        }
     }
 }

app/qml/SettingsAdvancedTab.qml

@@ -0,0 +1,165 @@
+/*******************************************************************************
+* 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.0
+import QtQuick.Layouts 1.1
+import QtQml 2.0
+
+import "Components"
+
+ColumnLayout {
+    GroupBox {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        title: qsTr("Command")
+        padding: appSettings.defaultMargin
+
+        ColumnLayout {
+            anchors.fill: parent
+            CheckBox {
+                id: useCustomCommand
+                text: qsTr("Use custom command instead of shell at startup")
+                checked: appSettings.useCustomCommand
+                onCheckedChanged: appSettings.useCustomCommand = checked
+            }
+            // Workaround for QTBUG-31627 for pre 5.3.0
+            Binding {
+                target: useCustomCommand
+                property: "checked"
+                value: appSettings.useCustomCommand
+            }
+            TextField {
+                id: customCommand
+                Layout.fillWidth: true
+                text: appSettings.customCommand
+                enabled: useCustomCommand.checked
+                onEditingFinished: appSettings.customCommand = text
+
+                // Save text even if user forgets to press enter or unfocus
+                function saveSetting() {
+                    appSettings.customCommand = text
+                }
+                Component.onCompleted: settings_window.closing.connect(
+                                           saveSetting)
+            }
+        }
+    }
+
+    GroupBox {
+        title: qsTr("Cursor")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        ColumnLayout {
+            anchors.fill: parent
+            CheckBox {
+                id: blinkingCursor
+                text: qsTr("Blinking Cursor")
+                checked: appSettings.blinkingCursor
+                onCheckedChanged: appSettings.blinkingCursor = checked
+            }
+            Binding {
+                target: blinkingCursor
+                property: "checked"
+                value: appSettings.blinkingCursor
+            }
+        }
+    }
+
+    GroupBox {
+        title: qsTr("Performance")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        GridLayout {
+            anchors.fill: parent
+            columns: 4
+
+            Label {
+                text: qsTr("Effects FPS")
+            }
+            Slider {
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                id: effectsFpsSlider
+                onValueChanged: appSettings.effectsFrameSkip = Math.round(value)
+                stepSize: 1
+                enabled: true
+                from: 5
+                to: 1
+                value: appSettings.effectsFrameSkip
+            }
+
+            SizedLabel {
+                text: Math.round(100 / Math.max(1, Math.round(effectsFpsSlider.value))) + "%"
+            }
+            Label {
+                text: qsTr("Texture Quality")
+            }
+            Slider {
+                id: txtslider
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                onValueChanged: appSettings.windowScaling = value
+                stepSize: 0.05
+                enabled: true
+                from: 0.25
+                value: appSettings.windowScaling
+            }
+            SizedLabel {
+                text: Math.round(txtslider.value * 100) + "%"
+            }
+
+            Label {
+                text: qsTr("Bloom Quality")
+            }
+            Slider {
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                id: bloomSlider
+                onValueChanged: appSettings.bloomQuality = value
+                stepSize: 0.05
+                enabled: true
+                from: 0.25
+                value: appSettings.bloomQuality
+            }
+            SizedLabel {
+                text: Math.round(bloomSlider.value * 100) + "%"
+            }
+
+            Label {
+                text: qsTr("BurnIn Quality")
+            }
+            Slider {
+                Layout.fillWidth: true
+                id: burnInSlider
+                Layout.columnSpan: 2
+                onValueChanged: appSettings.burnInQuality = value
+                stepSize: 0.05
+                enabled: true
+                from: 0.25
+                value: appSettings.burnInQuality
+            }
+            SizedLabel {
+                text: Math.round(burnInSlider.value * 100) + "%"
+            }
+        }
+    }
+}

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,68 +17,79 @@
 * 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{
-    GroupBox{
+ColumnLayout {
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    spacing: 2
+
+    GroupBox {
         title: qsTr("Effects")
-        anchors.fill: parent
-        ColumnLayout{
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+
+        ColumnLayout {
             anchors.fill: parent
-            spacing: 2
-            CheckableSlider{
+
+            CheckableSlider {
                 name: qsTr("Bloom")
-                onNewValue: appSettings.bloom = newValue
+                onNewValue: function(newValue) { appSettings.bloom = newValue }
                 value: appSettings.bloom
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("BurnIn")
-                onNewValue: appSettings.burnIn = newValue
+                onNewValue: function(newValue) { appSettings.burnIn = newValue }
                 value: appSettings.burnIn
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Static Noise")
-                onNewValue: appSettings.staticNoise = newValue
+                onNewValue: function(newValue) { appSettings.staticNoise = newValue }
                 value: appSettings.staticNoise
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Jitter")
-                onNewValue: appSettings.jitter = newValue
+                onNewValue: function(newValue) { appSettings.jitter = newValue }
                 value: appSettings.jitter
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Glow Line")
-                onNewValue: appSettings.glowingLine = newValue;
+                onNewValue: function(newValue) { appSettings.glowingLine = newValue }
                 value: appSettings.glowingLine
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Screen Curvature")
-                onNewValue: appSettings.screenCurvature = newValue;
-                value: appSettings.screenCurvature;
+                onNewValue: function(newValue) { appSettings.screenCurvature = newValue }
+                value: appSettings.screenCurvature
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Ambient Light")
-                onNewValue: appSettings.ambientLight = newValue;
+                onNewValue: function(newValue) { appSettings.ambientLight = newValue }
                 value: appSettings.ambientLight
                 enabled: appSettings.framesIndex !== 0
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Flickering")
-                onNewValue: appSettings.flickering = newValue;
-                value: appSettings.flickering;
+                onNewValue: function(newValue) { appSettings.flickering = newValue }
+                value: appSettings.flickering
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("Horizontal Sync")
-                onNewValue: appSettings.horizontalSync = newValue;
-                value: appSettings.horizontalSync;
+                onNewValue: function(newValue) { appSettings.horizontalSync = newValue }
+                value: appSettings.horizontalSync
             }
-            CheckableSlider{
+            CheckableSlider {
                 name: qsTr("RGB Shift")
-                onNewValue: appSettings.rbgShift = newValue;
-                value: appSettings.rbgShift;
+                onNewValue: function(newValue) { appSettings.rgbShift = newValue }
+                value: appSettings.rgbShift
+            }
+            CheckableSlider {
+                name: qsTr("Frame Shininess")
+                onNewValue: function(newValue) { appSettings._frameShininess = newValue }
+                value: appSettings._frameShininess
             }
         }
     }

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,222 +17,262 @@
 * 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
+import QtQuick.Dialogs
 
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-        GroupBox{
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            title: qsTr("Profile")
-            RowLayout {
-                anchors.fill: parent
-                TableView {
-                    id: profilesView
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    model: appSettings.profilesList
-                    headerVisible: false
-                    TableViewColumn {
-                        title: qsTr("Profile")
-                        role: "text"
-                        width: parent.width * 0.5
-                    }
-                    onActivated: {
-                        appSettings.loadProfile(row);
-                    }
-                }
-                ColumnLayout {
-                    Layout.fillHeight: true
-                    Layout.fillWidth: false
-                    Button{
-                        Layout.fillWidth: true
-                        text: qsTr("New")
-                        onClicked: {
-                            insertname.profileName = "";
-                            insertname.show()
-                        }
-                    }
-                    Button{
-                        Layout.fillWidth: true
-                        property alias currentIndex: profilesView.currentRow
-                        enabled: currentIndex >= 0
-                        text: qsTr("Load")
-                        onClicked: {
-                            var index = profilesView.currentRow;
-                            if (index >= 0)
-                                appSettings.loadProfile(index);
-                        }
-                    }
-                    Button{
-                        Layout.fillWidth: true
-                        text: qsTr("Remove")
-                        property alias currentIndex: profilesView.currentRow
-
-                        enabled: currentIndex >= 0 && !appSettings.profilesList.get(currentIndex).builtin
-                        onClicked: {
-                            appSettings.profilesList.remove(currentIndex);
-                            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 = appSettings.profilesList;
-                        }
-                    }
-                    Item {
-                        // Spacing
-                        Layout.fillHeight: true
-                    }
-                    Button{
-                        Layout.fillWidth: true
-                        text: qsTr("Import")
-                        onClicked: {
-                            fileDialog.selectExisting = true;
-                            fileDialog.callBack = function (url) {loadFile(url);};
-                            fileDialog.open();
-                        }
-                        function loadFile(url) {
-                            try {
-                                if (appSettings.verbose)
-                                    console.log("Loading file: " + url);
-
-                                var profileObject = JSON.parse(fileIO.read(url));
-                                var name = profileObject.name;
-
-                                if (!name)
-                                    throw "Profile doesn't have a name";
-
-                                var version = profileObject.version !== undefined ? profileObject.version : 1;
-                                if (version !== appSettings.profileVersion)
-                                    throw "This profile is not supported on this version of CRT.";
-
-                                delete profileObject.name;
-
-                                appSettings.appendCustomProfile(name, JSON.stringify(profileObject));
-                            } catch (err) {
-                                messageDialog.text = qsTr(err)
-                                messageDialog.open();
-                            }
-                        }
-                    }
-                    Button{
-                        property alias currentIndex: profilesView.currentRow
-
-                        Layout.fillWidth: true
-
-                        text: qsTr("Export")
-                        enabled: currentIndex >= 0 && !appSettings.profilesList.get(currentIndex).builtin
-                        onClicked: {
-                            fileDialog.selectExisting = false;
-                            fileDialog.callBack = function (url) {storeFile(url);};
-                            fileDialog.open();
-                        }
-                        function storeFile(url) {
-                            try {
-                                var urlString = url.toString();
-
-                                // Fix the extension if it's missing.
-                                var extension = urlString.substring(urlString.length - 5, urlString.length);
-                                var urlTail = (extension === ".json" ? "" : ".json");
-                                url += urlTail;
-
-                                if (true)
-                                    console.log("Storing file: " + url);
-
-                                var profileObject = appSettings.profilesList.get(currentIndex);
-                                var profileSettings = JSON.parse(profileObject.obj_string);
-                                profileSettings["name"] = profileObject.text;
-                                profileSettings["version"] = appSettings.profileVersion;
-
-                                var result = fileIO.write(url, JSON.stringify(profileSettings, undefined, 2));
-                                if (!result)
-                                    throw "The file could not be written.";
-                            } catch (err) {
-                                console.log(err);
-                                messageDialog.text = qsTr("There has been an error storing the file.")
-                                messageDialog.open();
-                            }
+ColumnLayout {
+    GroupBox {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        title: qsTr("Profile")
+        padding: appSettings.defaultMargin
+        RowLayout {
+            anchors.fill: parent
+            ListView {
+                id: profilesView
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                model: appSettings.profilesList
+                clip: true
+                delegate: Rectangle {
+                    width: label.width
+                    height: label.height
+                    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)
                         }
                     }
                 }
             }
-        }
-
-        GroupBox{
-            Layout.fillWidth: true
-            title: qsTr("Command")
             ColumnLayout {
-                anchors.fill: parent
-                CheckBox{
-                    id: useCustomCommand
-                    text: qsTr("Use custom command instead of shell at startup")
-                    checked: appSettings.useCustomCommand
-                    onCheckedChanged: appSettings.useCustomCommand = checked
-                }
-                // Workaround for QTBUG-31627 for pre 5.3.0
-                Binding{
-                    target: useCustomCommand
-                    property: "checked"
-                    value: appSettings.useCustomCommand
-                }
-                TextField{
-                    id: customCommand
+                Layout.fillHeight: true
+                Layout.fillWidth: false
+                Button {
                     Layout.fillWidth: true
-                    text: appSettings.customCommand
-                    enabled: useCustomCommand.checked
-                    onEditingFinished: appSettings.customCommand = text
-
-                    // Save text even if user forgets to press enter or unfocus
-                    function saveSetting() {
-                        appSettings.customCommand = text;
+                    text: qsTr("Save")
+                    onClicked: {
+                        insertname.profileName = ""
+                        insertname.show()
                     }
-                    Component.onCompleted: settings_window.closing.connect(saveSetting)
                 }
-            }
-        }
+                Button {
+                    Layout.fillWidth: true
+                    property alias currentIndex: profilesView.currentIndex
+                    enabled: currentIndex >= 0
+                    text: qsTr("Load")
+                    onClicked: {
+                        var index = currentIndex
+                        if (index >= 0)
+                            appSettings.loadProfile(index)
+                    }
+                }
+                Button {
+                    Layout.fillWidth: true
+                    text: qsTr("Remove")
+                    property alias currentIndex: profilesView.currentIndex
 
-        // DIALOGS ////////////////////////////////////////////////////////////////
-        InsertNameDialog{
-            id: insertname
-            onNameSelected: {
-                appSettings.appendCustomProfile(name, appSettings.composeProfileString());
-            }
-        }
-        MessageDialog {
-            id: messageDialog
-            title: qsTr("File Error")
-            onAccepted: {
-                messageDialog.close();
-            }
-        }
-        Loader {
-            property var callBack
-            property bool selectExisting: false
-            id: fileDialog
+                    enabled: currentIndex >= 0 && !appSettings.profilesList.get(
+                                 currentIndex).builtin
+                    onClicked: {
+                        appSettings.profilesList.remove(currentIndex)
+                        profilesView.selection.clear()
 
-            sourceComponent: FileDialog{
-                nameFilters: ["Json files (*.json)"]
-                selectMultiple: false
-                selectFolder: false
-                selectExisting: fileDialog.selectExisting
-                onAccepted: callBack(fileUrl);
-            }
+                        // TODO This is a very ugly workaround. The view didn't update on Qt 5.3.2.
+                        profilesView.model = 0
+                        profilesView.model = appSettings.profilesList
+                    }
+                }
+                Item {
+                    // Spacing
+                    Layout.fillHeight: true
+                }
+                Button {
+                    Layout.fillWidth: true
+                    text: qsTr("Import")
+                    onClicked: {
+                        fileDialog.selectExisting = true
+                        fileDialog.callBack = function (url) {
+                            loadFile(url)
+                        }
+                        fileDialog.open()
+                    }
+                    function loadFile(url) {
+                        try {
+                            if (appSettings.verbose)
+                                console.log("Loading file: " + url)
 
-            onSelectExistingChanged: reload()
+                            var profileObject = JSON.parse(fileIO.read(url))
+                            var name = profileObject.name
 
-            function open() {
-                item.open();
-            }
+                            if (!name)
+                                throw "Profile doesn't have a name"
 
-            function reload() {
-                active = false;
-                active = true;
+                            var version = profileObject.version
+                                    !== undefined ? profileObject.version : 1
+                            if (version !== appSettings.profileVersion)
+                                throw "This profile is not supported on this version of CRT."
+
+                            delete profileObject.name
+
+                            appSettings.appendCustomProfile(name,
+                                                            JSON.stringify(
+                                                                profileObject))
+                        } catch (err) {
+                            messageDialog.text = qsTr(err)
+                            messageDialog.open()
+                        }
+                    }
+                }
+                Button {
+                    property alias currentIndex: profilesView.currentIndex
+
+                    Layout.fillWidth: true
+
+                    text: qsTr("Export")
+                    enabled: currentIndex >= 0 && !appSettings.profilesList.get(
+                                 currentIndex).builtin
+                    onClicked: {
+                        fileDialog.selectExisting = false
+                        fileDialog.callBack = function (url) {
+                            storeFile(url)
+                        }
+                        fileDialog.open()
+                    }
+                    function storeFile(url) {
+                        try {
+                            var urlString = url.toString()
+
+                            // Fix the extension if it's missing.
+                            var extension = urlString.substring(
+                                        urlString.length - 5, urlString.length)
+                            var urlTail = (extension === ".json" ? "" : ".json")
+                            url += urlTail
+
+                            if (true)
+                                console.log("Storing file: " + url)
+
+                            var profileObject = appSettings.profilesList.get(
+                                        currentIndex)
+                            var profileSettings = JSON.parse(
+                                        profileObject.obj_string)
+                            profileSettings["name"] = profileObject.text
+                            profileSettings["version"] = appSettings.profileVersion
+
+                            var result = fileIO.write(url, JSON.stringify(
+                                                          profileSettings,
+                                                          undefined, 2))
+                            if (!result)
+                                throw "The file could not be written."
+                        } catch (err) {
+                            console.log(err)
+                            messageDialog.text = qsTr(
+                                        "There has been an error storing the file.")
+                            messageDialog.open()
+                        }
+                    }
+                }
             }
         }
     }
+
+    GroupBox {
+        title: qsTr("Screen")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        GridLayout {
+            anchors.fill: parent
+            columns: 2
+            Label {
+                text: qsTr("Brightness")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings.brightness = value
+                value: appSettings.brightness
+            }
+            Label {
+                text: qsTr("Contrast")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings.contrast = value
+                value: appSettings.contrast
+            }
+            Label {
+                text: qsTr("Margin")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings._margin = value
+                value: appSettings._margin
+            }
+            Label {
+                text: qsTr("Radius")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings._screenRadius = value
+                value: appSettings._screenRadius
+            }
+            Label {
+                text: qsTr("Frame size")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings._frameSize = value
+                value: appSettings._frameSize
+            }
+            Label {
+                text: qsTr("Opacity")
+                visible: !appSettings.isMacOS
+            }
+            SimpleSlider {
+                onValueChanged: appSettings.windowOpacity = value
+                value: appSettings.windowOpacity
+                visible: !appSettings.isMacOS
+            }
+        }
+    }
+
+    // DIALOGS ////////////////////////////////////////////////////////////////
+    InsertNameDialog {
+        id: insertname
+        onNameSelected: {
+            appSettings.appendCustomProfile(name,
+                                            appSettings.composeProfileString())
+        }
+    }
+    MessageDialog {
+        id: messageDialog
+        title: qsTr("File Error")
+        buttons: MessageDialog.Ok
+        onAccepted: {
+            messageDialog.close()
+        }
+    }
+    Loader {
+        property var callBack
+        property bool selectExisting: false
+        id: fileDialog
+
+        sourceComponent: FileDialog {
+            nameFilters: ["Json files (*.json)"]
+            fileMode: fileDialog.selectExisting ? FileDialog.OpenFile : FileDialog.SaveFile
+            onAccepted: callBack(selectedFile)
+        }
+
+        onSelectExistingChanged: reload()
+
+        function open() {
+            item.open()
+        }
+
+        function reload() {
+            active = false
+            active = true
+        }
+    }
 }

app/qml/SettingsPerformanceTab.qml

@@ -1,118 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-
-import "Components"
-
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-        GroupBox{
-            title: qsTr("General")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                rows: 2
-                columns: 3
-                Label{text: qsTr("Effects FPS")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: fpsSlider
-                    onValueChanged: {
-                        if (enabled) {
-                            appSettings.fps = value !== 60 ? value + 1 : 0;
-                        }
-                    }
-                    stepSize: 1
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0;
-                        maximumValue = 60;
-                        value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")}
-                Label{text: qsTr("Texture Quality")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: txtslider
-                    onValueChanged: if (enabled) appSettings.windowScaling = value;
-                    stepSize: 0.05
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0.25 //Without this value gets set to 0.5
-                        value = appSettings.windowScaling;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: Math.round(txtslider.value * 100) + "%"}
-            }
-        }
-        GroupBox{
-            title: qsTr("Bloom")
-            Layout.fillWidth: true
-            GridLayout{
-                id: bloomQualityContainer
-                anchors.fill: parent
-                Label{text: qsTr("Bloom Quality")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: bloomSlider
-                    onValueChanged: if (enabled) appSettings.bloomQuality = value;
-                    stepSize: 0.05
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0.25
-                        value = appSettings.bloomQuality;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: Math.round(bloomSlider.value * 100) + "%"}
-            }
-        }
-        GroupBox{
-            title: qsTr("BurnIn")
-            Layout.fillWidth: true
-            GridLayout{
-                id: blurQualityContainer
-                anchors.fill: parent
-
-                Label{text: qsTr("BurnIn Quality")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: burnInSlider
-                    onValueChanged: if (enabled) appSettings.burnInQuality = value;
-                    stepSize: 0.05
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0.25
-                        value = appSettings.burnInQuality;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: Math.round(burnInSlider.value * 100) + "%"}
-            }
-        }
-    }
-}

app/qml/SettingsScreenTab.qml

@@ -1,67 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
-
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-        GroupBox{
-            title: qsTr("Rasterization Mode")
-            Layout.fillWidth: true
-            ComboBox {
-                id: rasterizationBox
-                property string selectedElement: model[currentIndex]
-                anchors.fill: parent
-                model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")]
-                currentIndex: appSettings.rasterization
-                onCurrentIndexChanged: {
-                    appSettings.rasterization = currentIndex
-                }
-            }
-        }
-        GroupBox{
-            title: qsTr("Lights")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                columns: 2
-                Label{ text: qsTr("Brightness") }
-                SimpleSlider{
-                    onValueChanged: appSettings.brightness = value
-                    value: appSettings.brightness
-                }
-                Label{ text: qsTr("Contrast") }
-                SimpleSlider{
-                    onValueChanged: appSettings.contrast = value
-                    value: appSettings.contrast
-                }
-                Label{ text: qsTr("Opacity") }
-                SimpleSlider{
-                    onValueChanged: appSettings.windowOpacity = value
-                    value: appSettings.windowOpacity
-                }
-            }
-        }
-    }
-}

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,125 +17,204 @@
 * 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{
-            property var rasterization: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")][appSettings.rasterization]
-            title: qsTr("Font " + "(" + rasterization + ")")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                columns: 2
-                Label{ text: qsTr("Name") }
-                ComboBox{
-                    id: fontChanger
-                    Layout.fillWidth: true
-                    model: appSettings.fontlist
-                    onActivated: {
-                        var name = appSettings.fontlist.get(index).name;
-                        appSettings.fontNames[appSettings.rasterization] = name;
-                        appSettings.handleFontChanged();
-                    }
-                    function updateIndex(){
-                        var name = appSettings.fontNames[appSettings.rasterization];
-                        var index = appSettings.getIndexByName(name);
-                        if (index !== undefined)
-                            currentIndex = index;
-                    }
-                    Connections{
-                        target: appSettings
-                        onTerminalFontChanged: fontChanger.updateIndex();
-                    }
-                    Component.onCompleted: updateIndex();
-                }
-                Label{ text: qsTr("Scaling") }
-                RowLayout{
-                    Layout.fillWidth: true
-                    Slider{
-                        Layout.fillWidth: true
-                        id: fontScalingChanger
-                        onValueChanged: if(enabled) appSettings.fontScaling = value
-                        stepSize: 0.05
-                        enabled: false // Another trick to fix initial bad behavior.
-                        Component.onCompleted: {
-                            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) + "%"
+ColumnLayout {
+    GroupBox {
+        title: qsTr("Font")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        GridLayout {
+            anchors.fill: parent
+            columns: 2
+            Label {
+                text: qsTr("Source")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                RadioButton {
+                    text: qsTr("Bundled")
+                    checked: appSettings.fontSource === appSettings.bundled_fonts
+                    onClicked: {
+                        appSettings.fontSource = appSettings.bundled_fonts
                     }
                 }
-                Label{ text: qsTr("Font Width") }
-                RowLayout{
-                    Layout.fillWidth: true
-                    Slider{
-                        Layout.fillWidth: true
-                        id: widthChanger
-                        onValueChanged: appSettings.fontWidth = value;
-                        value: appSettings.fontWidth
-                        stepSize: 0.05
-                        Component.onCompleted: {
-                            // This is needed to avoid unnecessary chnaged events.
-                            minimumValue = 0.5;
-                            maximumValue = 1.5;
-                        }
-                    }
-                    SizedLabel{
-                        text: Math.round(widthChanger.value * 100) + "%"
+                RadioButton {
+                    text: qsTr("System")
+                    checked: appSettings.fontSource === appSettings.system_fonts
+                    onClicked: {
+                        appSettings.fontSource = appSettings.system_fonts
                     }
                 }
             }
-        }
-        GroupBox{
-            title: qsTr("Colors")
-            Layout.fillWidth: true
-            ColumnLayout{
-                anchors.fill: parent
-                ColumnLayout{
-                    Layout.fillWidth: true
-                    CheckableSlider{
-                        name: qsTr("Chroma Color")
-                        onNewValue: appSettings.chromaColor = newValue
-                        value: appSettings.chromaColor
+            Label {
+                text: qsTr("Rendering")
+                enabled: appSettings.fontSource === appSettings.bundled_fonts
+            }
+            ComboBox {
+                id: renderingBox
+
+                property string selectedElement: model[currentIndex]
+
+                Layout.fillWidth: true
+                model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels"), qsTr("Sub-Pixels"), qsTr("Modern")]
+                currentIndex: appSettings.rasterization
+                onCurrentIndexChanged: {
+                    appSettings.rasterization = currentIndex
+                }
+                enabled: appSettings.fontSource === appSettings.bundled_fonts
+            }
+            Label {
+                text: qsTr("Name")
+            }
+            ComboBox {
+                id: fontChanger
+                Layout.fillWidth: true
+                model: appSettings.filteredFontList
+                textRole: "text"
+                onActivated: {
+                    var font = appSettings.filteredFontList.get(currentIndex)
+
+                    // If selecting a high-res font while not in Modern mode,
+                    // switch to Modern to render at full resolution.
+                    if (!font.lowResolutionFont && appSettings.rasterization !== appSettings.modern_rasterization) {
+                        appSettings.rasterization = appSettings.modern_rasterization
                     }
-                    CheckableSlider{
-                        name: qsTr("Saturation Color")
-                        onNewValue: appSettings.saturationColor = newValue
-                        value: appSettings.saturationColor
-                        enabled: appSettings.chromaColor !== 0
+                    // If selecting a low-res font while in Modern mode, switch back to default.
+                    if (font.lowResolutionFont && appSettings.rasterization === appSettings.modern_rasterization) {
+                        appSettings.rasterization = appSettings.no_rasterization
+                    }
+
+                    appSettings.fontName = font.name
+                }
+                function updateIndex() {
+                    for (var i = 0; i < appSettings.filteredFontList.count; i++) {
+                        var font = appSettings.filteredFontList.get(i)
+                        if (font.name === appSettings.fontName) {
+                            currentIndex = i
+                            return
+                        }
+                    }
+                    currentIndex = 0
+                }
+                Connections {
+                    target: appSettings.fontManager
+
+                    onTerminalFontChanged: {
+                        fontChanger.updateIndex()
+                    }
+
+                    onFilteredFontListChanged: {
+                        fontChanger.updateIndex()
                     }
                 }
-                RowLayout{
+                Component.onCompleted: updateIndex()
+            }
+            Label {
+                text: qsTr("Scaling")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Slider {
                     Layout.fillWidth: true
-                    ColorButton{
-                        name: qsTr("Font")
-                        height: 50
-                        Layout.fillWidth: true
-                        onColorSelected: appSettings._fontColor = color;
-                        color: appSettings._fontColor
-                    }
-                    ColorButton{
-                        name: qsTr("Background")
-                        height: 50
-                        Layout.fillWidth: true
-                        onColorSelected: appSettings._backgroundColor = color;
-                        color: appSettings._backgroundColor
-                    }
+                    id: fontScalingChanger
+                    onValueChanged: appSettings.fontScaling = value
+                    value: appSettings.fontScaling
+                    stepSize: 0.05
+                    from: appSettings.minimumFontScaling
+                    to: appSettings.maximumFontScaling
+                }
+                SizedLabel {
+                    text: Math.round(fontScalingChanger.value * 100) + "%"
+                }
+            }
+            Label {
+                text: qsTr("Font Width")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Slider {
+                    Layout.fillWidth: true
+                    id: widthChanger
+                    onValueChanged: appSettings.fontWidth = value
+                    value: appSettings.fontWidth
+                    stepSize: 0.05
+                    from: 0.5
+                    to: 1.5
+                }
+                SizedLabel {
+                    text: Math.round(widthChanger.value * 100) + "%"
+                }
+            }
+            Label {
+                text: qsTr("Line Spacing")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Slider {
+                    Layout.fillWidth: true
+                    id: lineSpacingChanger
+                    onValueChanged: appSettings.lineSpacing = value
+                    value: appSettings.lineSpacing
+                    stepSize: 0.01
+                    from: 0.0
+                    to: 1.0
+                }
+                SizedLabel {
+                    text: Math.round(lineSpacingChanger.value * 100) + "%"
+                }
+            }
+        }
+    }
+    GroupBox {
+        title: qsTr("Colors")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        ColumnLayout {
+            anchors.fill: parent
+            ColumnLayout {
+                Layout.fillWidth: true
+                CheckableSlider {
+                    name: qsTr("Chroma Color")
+                    onNewValue: function(newValue) { appSettings.chromaColor = newValue }
+                    value: appSettings.chromaColor
+                }
+                CheckableSlider {
+                    name: qsTr("Saturation Color")
+                    onNewValue: function(newValue) { appSettings.saturationColor = newValue }
+                    value: appSettings.saturationColor
+                    enabled: appSettings.chromaColor !== 0
+                }
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                ColorButton {
+                    name: qsTr("Font")
+                    height: 50
+                    Layout.fillWidth: true
+                    onColorSelected: appSettings._fontColor = color
+                    color: appSettings._fontColor
+                }
+                ColorButton {
+                    name: qsTr("Background")
+                    height: 50
+                    Layout.fillWidth: true
+                    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,52 +19,58 @@
 *******************************************************************************/
 
 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.Dialogs 1.1
+import QtQuick.Layouts 1.3
+import QtQuick.Dialogs
+
+ApplicationWindow {
+    readonly property real tabButtonPadding: 10
 
-Window {
     id: settings_window
     title: qsTr("Settings")
-    width: 580
-    height: 400
+    width: 640
+    height: 520
 
-    property int tabmargins: 15
+    Item {
+        anchors { fill: parent; }
 
-    TabView{
-        id: tabView
-        anchors.fill: parent
-        anchors.margins: 10
-        SettingsGeneralTab{
-            id: generalTab
-            title: qsTr("General")
-            anchors.fill: parent
-            anchors.margins: tabmargins
+        TabBar {
+            id: bar
+            anchors { left: parent.left; right: parent.right; top: parent.top; }
+            TabButton {
+                padding: tabButtonPadding
+                text: qsTr("General")
+            }
+            TabButton {
+                padding: tabButtonPadding
+                text: qsTr("Terminal")
+            }
+            TabButton {
+                padding: tabButtonPadding
+                text: qsTr("Effects")
+            }
+            TabButton {
+                padding: tabButtonPadding
+                text: qsTr("Advanced")
+            }
         }
-        SettingsScreenTab{
-            id: screenTab
-            title: qsTr("Screen")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsTerminalTab{
-            id: terminalTab
-            title: qsTr("Terminal")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsEffectsTab{
-            id: effectsTab
-            title: qsTr("Effects")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsPerformanceTab{
-            id: performanceTab
-            title: qsTr("Performance")
-            anchors.fill: parent
-            anchors.margins: tabmargins
+
+        StackLayout {
+            anchors {
+                top: bar.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: 16
+            }
+
+            currentIndex: bar.currentIndex
+
+            SettingsGeneralTab { }
+            SettingsTerminalTab { }
+            SettingsEffectsTab { }
+            SettingsAdvancedTab { }
         }
     }
 }

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.
@@ -19,334 +19,182 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtGraphicalEffects 1.0
 
 import "utils.js" as Utils
 
-ShaderEffect {
+Item {
+    function dynamicFragmentPath() {
+        var rasterMode = appSettings.rasterization;
+        var burnInOn = appSettings.burnIn > 0 ? 1 : 0;
+        var frameOn = appSettings.frameEnabled ? 1 : 0;
+        var chromaOn = appSettings.chromaColor > 0 ? 1 : 0;
+        return "qrc:/shaders/terminal_dynamic_raster" + rasterMode +
+               "_burn" + burnInOn +
+               "_frame" + frameOn +
+               "_chroma" + chromaOn +
+               ".frag.qsb";
+    }
+
+    function staticFragmentPath() {
+        var rgbShiftOn = appSettings.rgbShift > 0 ? 1 : 0;
+        var bloomOn = appSettings.bloom > 0 ? 1 : 0;
+        var curvatureOn = (appSettings.screenCurvature > 0 || appSettings.frameSize > 0) ? 1 : 0;
+        var shineOn = appSettings.frameShininess > 0 ? 1 : 0;
+        return "qrc:/shaders/terminal_static_rgb" + rgbShiftOn +
+               "_bloom" + bloomOn +
+               "_curve" + curvatureOn +
+               "_shine" + shineOn +
+               ".frag.qsb";
+    }
+
     property ShaderEffectSource source
     property BurnInEffect burnInEffect
     property ShaderEffectSource bloomSource
 
     property color fontColor: appSettings.fontColor
     property color backgroundColor: appSettings.backgroundColor
-    property real bloom: appSettings.bloom * 2.5
 
-    property ShaderEffectSource burnInSource: burnInEffect.source
-    property real burnIn: appSettings.burnIn
-    property real burnInLastUpdate: burnInEffect.lastUpdate
-    property real burnInTime: burnInEffect.burnInFadeTime
+    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize * terminalWindow.normalizedWindowScale
+    property real frameSize: appSettings.frameSize * terminalWindow.normalizedWindowScale
 
-    property real jitter: appSettings.jitter
-    property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter)
-
-    property real staticNoise: appSettings.staticNoise
-    property size scaleNoiseSize: Qt.size((width) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling),
-                                          (height) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling))
-
-    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize
-    property real glowingLine: appSettings.glowingLine * 0.2
-
-    property real chromaColor: appSettings.chromaColor;
-
-    property real rbgShift: (appSettings.rbgShift / width) * appSettings.totalFontScaling
-
-    property real flickering: appSettings.flickering
-    property real horizontalSync: appSettings.horizontalSync * 0.5
-
-    property int rasterization: appSettings.rasterization
-
-    property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness)
+    property real chromaColor: appSettings.chromaColor
 
     property real ambientLight: appSettings.ambientLight * 0.2
 
-    property size virtual_resolution
+    property size virtualResolution
+    property size screenResolution
 
-    property real time: timeManager.time
-    property ShaderEffectSource noiseSource: noiseShaderSource
+    property real _screenDensity: Math.min(
+        screenResolution.width / virtualResolution.width,
+        screenResolution.height / virtualResolution.height
+    )
 
-    // If something goes wrong activate the fallback version of the shader.
-    property bool fallBack: false
+    ShaderEffect {
+        id: dynamicShader
 
-    blending: false
+        property ShaderEffectSource screenBuffer: frameBuffer
+        property ShaderEffectSource burnInSource: burnInEffect.effectSource
+        property ShaderEffectSource frameSource: terminalFrameLoader.item
 
-    //Smooth random texture used for flickering effect.
-    Image{
-        id: noiseTexture
-        source: "images/allNoise512.png"
-        width: 512
-        height: 512
-        fillMode: Image.Tile
-        visible: false
-    }
-    ShaderEffectSource{
-        id: noiseShaderSource
-        sourceItem: noiseTexture
-        wrapMode: ShaderEffectSource.Repeat
-        visible: false
-        smooth: true
-    }
+        property color fontColor: parent.fontColor
+        property color backgroundColor: parent.backgroundColor
+        property real screenCurvature: parent.screenCurvature
+        property real chromaColor: parent.chromaColor
+        property real ambientLight: parent.ambientLight
 
-    //Print the number with a reasonable precision for the shader.
-    function str(num){
-        return num.toFixed(8);
-    }
+        property real flickering: appSettings.flickering
+        property real horizontalSync: appSettings.horizontalSync
+        property real horizontalSyncStrength: Utils.lint(0.05, 0.35, horizontalSync)
+        property real glowingLine: appSettings.glowingLine * 0.2
 
-    vertexShader: "
-        uniform highp mat4 qt_Matrix;
-        uniform highp float time;
+        // Fast burnin properties
+        property real burnIn: appSettings.burnIn
+        property real burnInLastUpdate: burnInEffect.lastUpdate
+        property real burnInTime: burnInEffect.burnInFadeTime
 
-        attribute highp vec4 qt_Vertex;
-        attribute highp vec2 qt_MultiTexCoord0;
+        property real jitter: appSettings.jitter
+        property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter)
+        property real staticNoise: appSettings.staticNoise
+        property size scaleNoiseSize: Qt.size((width * 0.75) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling),
+                                              (height * 0.75) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling))
 
-        varying highp vec2 qt_TexCoord0;" +
+        property size virtualResolution: parent.virtualResolution
 
-        (!fallBack ? "
-            uniform sampler2D noiseSource;" : "") +
+        // 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)
 
-        (!fallBack && rbgShift !== 0.0 ?"
-            varying lowp vec4 constantNoise;" : "") +
+        property real time: timeManager ? timeManager.time : 0
+        property ShaderEffectSource noiseSource: noiseShaderSource
 
-        (!fallBack && flickering !== 0.0 ?"
-            varying lowp float brightness;
-            uniform lowp float flickering;" : "") +
+        property real frameSize: parent.frameSize
+        property real frameShininess: appSettings.frameShininess
+        property real bloom: parent.bloomSource ? appSettings.bloom * 2.5 : 0
 
-        (!fallBack && horizontalSync !== 0.0 ?"
-            uniform lowp float horizontalSync;
-            varying lowp float distortionScale;
-            varying lowp float distortionFreq;" : "") +
+        anchors.fill: parent
+        blending: false
 
-        "
-        void main() {
-            qt_TexCoord0 = qt_MultiTexCoord0;
-            vec2 coords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));" +
-
-            (!fallBack && (flickering !== 0.0 || horizontalSync !== 0.0 || rbgShift !== 0) ?
-                "vec4 initialNoiseTexel = texture2D(noiseSource, coords);"
-            : "") +
-
-            (!fallBack && rbgShift !== 0.0 ?"
-                constantNoise = initialNoiseTexel;" : "") +
-
-            (!fallBack && flickering !== 0.0 ? "
-                brightness = 1.0 + (initialNoiseTexel.g - 0.5) * flickering;"
-            : "") +
-
-            (!fallBack && horizontalSync !== 0.0 ? "
-                float randval = horizontalSync - initialNoiseTexel.r;
-                distortionScale = step(0.0, randval) * randval * horizontalSync;
-                distortionFreq = mix(4.0, 40.0, initialNoiseTexel.g);"
-            : "") +
-
-            "gl_Position = qt_Matrix * qt_Vertex;
-        }"
-
-    fragmentShader: "
-        #ifdef GL_ES
-            precision mediump float;
-        #endif
-
-        uniform sampler2D source;
-        uniform highp float qt_Opacity;
-        uniform highp float time;
-        varying highp vec2 qt_TexCoord0;
-
-        uniform highp vec4 fontColor;
-        uniform highp vec4 backgroundColor;
-        uniform lowp float screen_brightness;
-
-        uniform highp vec2 virtual_resolution;" +
-
-        (bloom !== 0 ? "
-            uniform highp sampler2D bloomSource;
-            uniform lowp float bloom;" : "") +
-        (burnIn !== 0 ? "
-            uniform sampler2D burnInSource;
-            uniform highp float burnInLastUpdate;
-            uniform highp float burnInTime;" : "") +
-        (staticNoise !== 0 ? "
-            uniform highp float staticNoise;" : "") +
-        (((staticNoise !== 0 || jitter !== 0 || rbgShift)
-          ||(fallBack && (flickering || horizontalSync))) ? "
-            uniform lowp sampler2D noiseSource;
-            uniform highp vec2 scaleNoiseSize;" : "") +
-        (screenCurvature !== 0 ? "
-            uniform highp float screenCurvature;" : "") +
-        (glowingLine !== 0 ? "
-            uniform highp float glowingLine;" : "") +
-        (chromaColor !== 0 ? "
-            uniform lowp float chromaColor;" : "") +
-        (jitter !== 0 ? "
-            uniform lowp vec2 jitterDisplacement;" : "") +
-        (rbgShift !== 0 ? "
-            uniform lowp float rbgShift;" : "") +
-        (ambientLight !== 0 ? "
-            uniform lowp float ambientLight;" : "") +
-
-        (fallBack && horizontalSync !== 0 ? "
-            uniform lowp float horizontalSync;" : "") +
-        (fallBack && flickering !== 0.0 ?"
-            uniform lowp float flickering;" : "") +
-        (!fallBack && flickering !== 0 ? "
-            varying lowp float brightness;"
-        : "") +
-        (!fallBack && horizontalSync !== 0 ? "
-            varying lowp float distortionScale;
-            varying lowp float distortionFreq;" : "") +
-
-        (!fallBack && rbgShift !== 0.0 ?"
-            varying lowp vec4 constantNoise;" : "") +
-
-        (glowingLine !== 0 ? "
-            float randomPass(vec2 coords){
-                return fract(smoothstep(-120.0, 0.0, coords.y - (virtual_resolution.y + 120.0) * fract(time * 0.00015)));
-            }" : "") +
-
-        "highp float getScanlineIntensity(vec2 coords) {
-            float result = 1.0;" +
-
-           (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;
+        Image {
+            id: noiseTexture
+            source: "images/allNoise512.png"
+            width: 512
+            height: 512
+            fillMode: Image.Tile
+            visible: false
+        }
+        ShaderEffectSource {
+            id: noiseShaderSource
+            sourceItem: noiseTexture
+            wrapMode: ShaderEffectSource.Repeat
+            visible: false
+            smooth: true
         }
 
-        float min2(vec2 v) {
-            return min(v.x, v.y);
+        vertexShader: "qrc:/shaders/terminal_dynamic.vert.qsb"
+        fragmentShader: dynamicFragmentPath()
+
+        onStatusChanged: if (log) console.log(log)
+    }
+
+    Loader {
+        id: terminalFrameLoader
+
+        active: appSettings.frameEnabled
+
+        width: staticShader.width
+        height: staticShader.height
+
+        sourceComponent: ShaderEffectSource {
+
+            sourceItem: terminalFrame
+            hideSource: true
+            visible: false
+            format: ShaderEffectSource.RGBA
+
+            TerminalFrame {
+                id: terminalFrame
+                blending: false
+                anchors.fill: parent
+            }
         }
+    }
 
-        float rgb2grey(vec3 v){
-            return dot(v, vec3(0.21, 0.72, 0.04));
-        }" +
+    ShaderEffect {
+        id: staticShader
 
-        "void main() {" +
-            "vec2 cc = vec2(0.5) - qt_TexCoord0;" +
-            "float distance = length(cc);" +
+        width: parent.width * appSettings.windowScaling
+        height: parent.height * appSettings.windowScaling
 
-            //FallBack if there are problems
-            (fallBack && (flickering !== 0.0 || horizontalSync !== 0.0 || rbgShift !== 0.0) ?
-                "vec2 initialCoords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));
-                 vec4 initialNoiseTexel = texture2D(noiseSource, initialCoords);"
-            : "") +
-            (fallBack && flickering !== 0.0 ? "
-                float brightness = 1.0 + (initialNoiseTexel.g - 0.5) * flickering;"
-            : "") +
-            (fallBack && horizontalSync !== 0.0 ? "
-                float randval = horizontalSync - initialNoiseTexel.r;
-                float distortionScale = step(0.0, randval) * randval * horizontalSync;
-                float distortionFreq = mix(4.0, 40.0, initialNoiseTexel.g);"
-            : "") +
-            (fallBack && rbgShift !== 0.0 ?"
-                lowp vec4 constantNoise = initialNoiseTexel;" : "") +
+        property ShaderEffectSource source: parent.source
+        property ShaderEffectSource bloomSource: parent.bloomSource
 
-            (staticNoise ? "
-                float noise = staticNoise;" : "") +
+        property color fontColor: parent.fontColor
+        property color backgroundColor: parent.backgroundColor
+        property real bloom: bloomSource ? appSettings.bloom * 2.5 : 0
 
-            (screenCurvature !== 0 ? "
-                float distortion = dot(cc, cc) * screenCurvature;
-                vec2 curvatureCoords = (qt_TexCoord0 - cc * (1.0 + distortion) * distortion);
-                vec2 staticCoords = - 2.0 * curvatureCoords + 3.0 * step(vec2(0.0), curvatureCoords) * curvatureCoords - 3.0 * step(vec2(1.0), curvatureCoords) * curvatureCoords;"
-            :"
-                vec2 staticCoords = qt_TexCoord0;") +
+        property real screenCurvature: parent.screenCurvature
 
-            "vec2 coords = staticCoords;" +
+        property real chromaColor: appSettings.chromaColor;
 
-            (horizontalSync !== 0 ? "
-                float dst = sin((coords.y + time * 0.001) * distortionFreq);
-                coords.x += dst * distortionScale;" +
-                (staticNoise ? "
-                    noise += distortionScale * 7.0;" : "")
-            : "") +
+        property real rgbShift: appSettings.rgbShift * (4.0 / width) * appSettings.totalFontScaling
 
-            (jitter !== 0 || staticNoise !== 0 || rbgShift !== 0 ?
-                "vec4 noiseTexel = texture2D(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 51.0), fract(time / 237.0)));"
-            : "") +
+        property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness)
+        property real frameShininess: appSettings.frameShininess
+        property real frameSize: parent.frameSize
 
-            (jitter !== 0 ? "
-                vec2 offset = vec2(noiseTexel.b, noiseTexel.a) - vec2(0.5);
-                vec2 txt_coords = coords + offset * jitterDisplacement;"
-            :  "vec2 txt_coords = coords;") +
+        blending: false
+        visible: false
 
-            "float color = 0.0001;" +
+        vertexShader: "qrc:/shaders/terminal_static.vert.qsb"
+        fragmentShader: staticFragmentPath()
 
-            (staticNoise !== 0 ? "
-                float noiseVal = noiseTexel.a;
-                color += noiseVal * noise * (1.0 - distance * 1.3);" : "") +
+        onStatusChanged: if (log) console.log(log)
+    }
 
-            (glowingLine !== 0 ? "
-                color += randomPass(coords * virtual_resolution) * glowingLine;" : "") +
-
-            "vec3 txt_color = texture2D(source, txt_coords).rgb;" +
-
-            (rbgShift !== 0 ? "
-                vec2 displacement = vec2(12.0, 0.0) * rbgShift * (0.6 * constantNoise.r + 0.4);
-                vec3 rightColor = texture2D(source, txt_coords + displacement).rgb;
-                vec3 leftColor = texture2D(source, txt_coords - displacement).rgb;
-                txt_color.r = leftColor.r * 0.10 + rightColor.r * 0.30 + txt_color.r * 0.60;
-                txt_color.g = leftColor.g * 0.20 + rightColor.g * 0.20 + txt_color.g * 0.60;
-                txt_color.b = leftColor.b * 0.30 + rightColor.b * 0.10 + txt_color.b * 0.60;
-            " : "") +
-
-            (burnIn !== 0 ? "
-                vec4 txt_blur = texture2D(burnInSource, staticCoords);
-                float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
-                txt_color = max(txt_color, 0.5 * (txt_blur.rgb - vec3(blurDecay)));"
-            : "") +
-
-             "txt_color *= getScanlineIntensity(coords);" +
-
-             "txt_color += vec3(color);" +
-             "float greyscale_color = rgb2grey(txt_color);" +
-
-            (chromaColor !== 0 ?
-                "vec3 foregroundColor = mix(fontColor.rgb, txt_color * fontColor.rgb / greyscale_color, chromaColor);
-                 vec3 finalColor = mix(backgroundColor.rgb, foregroundColor, greyscale_color);"
-            :
-                "vec3 finalColor = mix(backgroundColor.rgb, fontColor.rgb, greyscale_color);") +
-
-            (bloom !== 0 ?
-                "vec4 bloomFullColor = texture2D(bloomSource, coords);
-                 vec3 bloomColor = bloomFullColor.rgb;
-                 float bloomAlpha = bloomFullColor.a;" +
-                (chromaColor !== 0 ?
-                    "bloomColor = fontColor.rgb * mix(vec3(rgb2grey(bloomColor)), bloomColor, chromaColor);"
-                :
-                    "bloomColor = fontColor.rgb * rgb2grey(bloomColor);") +
-                "finalColor += clamp(bloomColor * bloom * bloomAlpha, 0.0, 0.5);"
-            : "") +
-
-            (screenCurvature !== 0 ? "
-                vec2 curvatureMask = step(vec2(0.0), curvatureCoords) - step(vec2(1.0), curvatureCoords);
-                finalColor *= clamp(0.0, 1.0, curvatureMask.x + curvatureMask.y);"
-            :"") +
-
-            (flickering !== 0 ? "
-                finalColor *= brightness;" : "") +
-
-            (ambientLight !== 0 ? "
-                finalColor += vec3(ambientLight) * (1.0 - distance) * (1.0 - distance);" : "") +
-
-
-            "gl_FragColor = vec4(finalColor * screen_brightness, qt_Opacity);" +
-        "}"
-
-     onStatusChanged: {
-         // Print warning messages
-         if (log)
-             console.log(log);
-
-         // Activate fallback mode
-         if (status == ShaderEffect.Error) {
-            fallBack = true;
-         }
-     }
+    ShaderEffectSource {
+        id: frameBuffer
+        visible: false
+        sourceItem: staticShader
+        hideSource: true
+    }
 }

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,18 +26,18 @@ import "Components"
 RowLayout {
     property alias value: slider.value
     property alias stepSize: slider.stepSize
-    property alias minimumValue: slider.minimumValue
-    property alias maximumValue: slider.maximumValue
+    property alias minimumValue: slider.from
+    property alias maximumValue: slider.to
     property real maxMultiplier: 100
 
     id: setting_component
     spacing: 10
-    Slider{
+    Slider {
         id: slider
         stepSize: parent.stepSize
         Layout.fillWidth: true
     }
-    SizedLabel{
+    SizedLabel {
         text: Math.round(value * maxMultiplier) + "%"
     }
 }

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{
+Rectangle {
     property size terminalSize
     property real topOpacity: 0.6
+
     width: textSize.width * 2
     height: textSize.height * 2
     radius: 5
@@ -31,17 +31,21 @@ 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()
 
-    Text{
+    Text {
         id: textSize
         anchors.centerIn: parent
         color: "white"
         text: terminalSize.width + "x" + terminalSize.height
     }
-    Timer{
+    Timer {
         id: sizetimer
         interval: 1000
         running: false

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.
@@ -22,12 +22,12 @@ import QtQuick 2.2
 import QtQuick.LocalStorage 2.0
 
 QtObject {
-    readonly property string dbMajorVersion: "1"
+    readonly property string dbMajorVersion: "2"
     readonly property string dbMinorVersion: "1.0"
     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,43 +35,47 @@ 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) {
-       if(!initialized) initialize();
+        if(!initialized) initialize();
 
-       var db = getDatabase();
-       var res = "";
-       db.transaction(function(tx) {
-            var rs = tx.executeSql('INSERT OR REPLACE INTO settings VALUES (?,?);', [setting,value]);
-                  //console.log(rs.rowsAffected)
-                  if (rs.rowsAffected > 0) {
+        var db = getDatabase();
+        var res = "";
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('INSERT OR REPLACE INTO settings VALUES (?,?);', [setting,value]);
+                //console.log(rs.rowsAffected)
+                if (rs.rowsAffected > 0) {
                     res = "OK";
-                  } else {
+                } else {
                     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) {
-         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
+        if(!initialized) initialize();
+        var db = getDatabase();
+        var res = "";
+        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
     }
 
     function dropSettings(){
@@ -79,6 +83,7 @@ QtObject {
         db.transaction(
             function(tx) {
                 tx.executeSql('DROP TABLE settings');
-          });
+            }
+        )
     }
 }

app/qml/TerminalContainer.qml

@@ -1,125 +1,88 @@
+/*******************************************************************************
+* 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
+import Qt5Compat.GraphicalEffects
 
 import "utils.js" as Utils
 
 ShaderTerminal {
     property alias title: terminal.title
     property alias terminalSize: terminal.terminalSize
+    signal sessionFinished()
+
+    property bool loadBloomEffect: appSettings.bloom > 0 || appSettings._frameShininess > 0
+    property bool hasFocus
+
+    onHasFocusChanged: {
+        if (hasFocus) {
+            activate()
+        }
+    }
 
     id: mainShader
     opacity: appSettings.windowOpacity * 0.3 + 0.7
 
-    blending: false
-
     source: terminal.mainSource
     burnInEffect: terminal.burnInEffect
-    virtual_resolution: terminal.virtualResolution
+    virtualResolution: terminal.virtualResolution
+    screenResolution: Qt.size(
+        terminalWindow.width * Screen.devicePixelRatio * appSettings.windowScaling,
+        terminalWindow.height * Screen.devicePixelRatio * appSettings.windowScaling
+    )
+    bloomSource: bloomSourceLoader.item
 
-    TimeManager{
-        id: timeManager
-        enableTimer: terminalWindow.visible
-    }
-
-    PreprocessedTerminal{
+    PreprocessedTerminal {
         id: terminal
         anchors.fill: parent
+        onSessionFinished: mainShader.sessionFinished()
+    }
+
+    function activate() {
+        terminal.mainTerminal.forceActiveFocus()
     }
 
     //  EFFECTS  ////////////////////////////////////////////////////////////////
-
-    Loader{
+    Loader {
         id: bloomEffectLoader
-        active: appSettings.bloom
+        active: loadBloomEffect
         asynchronous: true
         width: parent.width * appSettings.bloomQuality
         height: parent.height * appSettings.bloomQuality
 
-        sourceComponent: FastBlur{
-            radius: Utils.lint(16, 64, appSettings.bloomQuality * appSettings.windowScaling);
+        sourceComponent: FastBlur {
+            radius: Utils.lint(16, 64, appSettings.bloomQuality)
             source: terminal.mainSource
             transparentBorder: true
         }
     }
-    Loader{
+    Loader {
         id: bloomSourceLoader
-        active: appSettings.bloom !== 0
+        active: loadBloomEffect
         asynchronous: true
-        sourceComponent: ShaderEffectSource{
+        sourceComponent: ShaderEffectSource {
             id: _bloomEffectSource
             sourceItem: bloomEffectLoader.item
+            wrapMode: ShaderEffectSource.Repeat
             hideSource: true
             smooth: true
             visible: false
         }
     }
-
-    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,52 @@
+/*******************************************************************************
+* 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 _staticFrameColor: Utils.sum(appSettings.frameColor, Qt.rgba(0.1, 0.1, 0.1, 1.0))
+    property color _backgroundColor: appSettings.backgroundColor
+    property color _fontColor: appSettings.fontColor
+    property color _lightColor: Utils.mix(_fontColor, _backgroundColor, 0.2)
+
+    property color frameColor: Utils.mix(
+        Utils.scaleColor(_lightColor, 0.2),
+        _staticFrameColor,
+        0.125 + 0.750 * ambientLight
+    )
+
+    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize * terminalWindow.normalizedWindowScale
+
+    property real frameShininess: appSettings.frameShininess
+
+    property real frameSize: appSettings.frameSize * terminalWindow.normalizedWindowScale
+
+    property real screenRadius: appSettings.screenRadius
+
+    property size viewportSize: Qt.size(width / appSettings.windowScaling, height / appSettings.windowScaling)
+
+    property real ambientLight: appSettings.ambientLight
+
+    vertexShader: "qrc:/shaders/terminal_frame.vert.qsb"
+    fragmentShader: "qrc:/shaders/terminal_frame.frag.qsb"
+
+    onStatusChanged: if (log) console.log(log) //Print warning messages
+}

app/qml/TerminalTabs.qml

@@ -0,0 +1,143 @@
+/*******************************************************************************
+* 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
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Item {
+    id: tabsRoot
+
+    readonly property int innerPadding: 6
+    readonly property string currentTitle: tabsModel.get(currentIndex).title ?? "cool-retro-term"
+    readonly property size terminalSize: stack.currentItem ? stack.currentItem.terminalSize : Qt.size(0, 0)
+    property alias currentIndex: tabBar.currentIndex
+    readonly property int count: tabsModel.count
+    property var hostWindow
+
+    function normalizeTitle(rawTitle) {
+        if (rawTitle === undefined || rawTitle === null) {
+            return ""
+        }
+        return String(rawTitle).trim()
+    }
+
+    function addTab() {
+        tabsModel.append({ title: "" })
+        tabBar.currentIndex = tabsModel.count - 1
+    }
+
+    function closeTab(index) {
+        if (tabsModel.count <= 1) {
+            hostWindow.close()
+            return
+        }
+
+        tabsModel.remove(index)
+        tabBar.currentIndex = Math.min(tabBar.currentIndex, tabsModel.count - 1)
+    }
+
+    ListModel {
+        id: tabsModel
+    }
+
+    Component.onCompleted: addTab()
+
+    ColumnLayout {
+        anchors.fill: parent
+        spacing: 0
+
+        Rectangle {
+            id: tabRow
+            Layout.fillWidth: true
+            height: rowLayout.implicitHeight
+            color: palette.window
+            visible: tabsModel.count > 1
+
+            RowLayout {
+                id: rowLayout
+                anchors.fill: parent
+                spacing: 0
+
+                TabBar {
+                    id: tabBar
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    focusPolicy: Qt.NoFocus
+
+                    Repeater {
+                        model: tabsModel
+                        TabButton {
+                            id: tabButton
+                            contentItem: RowLayout {
+                                anchors.fill: parent
+                                anchors { leftMargin: innerPadding; rightMargin: innerPadding }
+                                spacing: innerPadding
+
+                                Label {
+                                    text: model.title
+                                    elide: Text.ElideRight
+                                    Layout.fillWidth: true
+                                    Layout.alignment: Qt.AlignVCenter
+                                }
+
+                                ToolButton {
+                                    text: "\u00d7"
+                                    focusPolicy: Qt.NoFocus
+                                    padding: innerPadding
+                                    Layout.alignment: Qt.AlignVCenter
+                                    onClicked: tabsRoot.closeTab(index)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                ToolButton {
+                    id: addTabButton
+                    text: "+"
+                    focusPolicy: Qt.NoFocus
+                    Layout.fillHeight: true
+                    padding: innerPadding
+                    Layout.alignment: Qt.AlignVCenter
+                    onClicked: tabsRoot.addTab()
+                }
+            }
+        }
+
+        StackLayout {
+            id: stack
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            currentIndex: tabBar.currentIndex
+
+            Repeater {
+                model: tabsModel
+                TerminalContainer {
+                    id: terminalContainer
+                    hasFocus: terminalWindow.active && StackLayout.isCurrentItem
+                    onTitleChanged: tabsModel.setProperty(index, "title", normalizeTitle(title))
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    onSessionFinished: tabsRoot.closeTab(index)
+                }
+            }
+        }
+    }
+}

app/qml/TerminalWindow.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.2
+import QtQuick.Window 2.1
+import QtQuick.Controls 2.3
+import QtQml
+
+import "menus"
+
+ApplicationWindow {
+    id: terminalWindow
+
+    width: 1024
+    height: 768
+
+    // Show the window once it is ready.
+    Component.onCompleted: {
+        visible = true
+    }
+
+    minimumWidth: 320
+    minimumHeight: 240
+
+    visible: false
+
+    property bool fullscreen: false
+    onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
+
+    menuBar: qtquickMenuLoader.item
+
+    Loader {
+        id: qtquickMenuLoader
+        active: !appSettings.isMacOS && (appSettings.showMenubar && !fullscreen)
+        sourceComponent: WindowMenu { }
+    }
+
+    Connections {
+        target: newTabAction
+        enabled: terminalWindow.active
+        onTriggered: terminalTabs.addTab()
+    }
+
+    Connections {
+        target: fullscreenAction
+        enabled: terminalWindow.active
+        onTriggered: terminalWindow.fullscreen = !terminalWindow.fullscreen
+    }
+
+    property real normalizedWindowScale: 1024 / ((0.5 * width + 0.5 * height))
+
+    color: "#00000000"
+
+    title: terminalTabs.currentTitle
+
+    TerminalTabs {
+        id: terminalTabs
+        width: parent.width
+        height: (parent.height + Math.abs(y))
+        hostWindow: terminalWindow
+    }
+    Loader {
+        anchors.centerIn: parent
+        active: appSettings.showTerminalSize
+        sourceComponent: SizeOverlay {
+            z: 3
+            terminalSize: terminalTabs.terminalSize
+        }
+    }
+    onClosing: {
+        appRoot.closeWindow(terminalWindow)
+    }
+}

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,23 +17,29 @@
 * 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
 
-import QtQuick 2.2
+QtObject {
+    id: timeManager
 
-Timer{
-    default property bool enableTimer: false
-    property real time
+    property bool enableTimer: false
+    property real time: 0
 
-    NumberAnimation on time {
-        from: 0
-        to: 100000
-        running: appSettings.fps === 0 && enableTimer
-        duration: 100000
-        loops: Animation.Infinite
+    property int framesPerUpdate: Math.max(1, appSettings.effectsFrameSkip)
+    property int _frameCounter: 0
+
+    property var frameDriver: FrameAnimation {
+        running: enableTimer
+        onTriggered: {
+            timeManager._frameCounter += 1
+
+            if (timeManager._frameCounter >= timeManager.framesPerUpdate) {
+                time = elapsedTime
+                timeManager._frameCounter = 0
+            }
+        }
     }
 
-    onTriggered: time += interval
-    running: appSettings.fps !== 0 && enableTimer
-    interval: Math.round(1000 / appSettings.fps)
-    repeat: true
+    onEnableTimerChanged: if (!enableTimer) _frameCounter = 0
+    onFramesPerUpdateChanged: _frameCounter = 0
 }

app/qml/fonts/1982-commodore64/license.txt

@@ -1,8 +0,0 @@
-
-Fonts in this package are (c) 2010-2014 Style.
-
-This license is applicable to each font file included in this package in all their variants (ttf, eot, woff, woff2, svg).
-
-You MAY NOT: sell this font; include/redistribute the font in any font collection regardless of pricing; provide the font for direct download from any web site, modify or rename the font. You MAY: link to "http://style64.org/c64-truetype" in order for others to download and install the font; embed the font (without any modification or file renaming) for display on any web site using @font-face rules; use this font in static images and vector art; include this font (without any modification or file renaming) as part of a software package but ONLY if said software package is freely provided to end users. You may also contact us to negotiate a (possibly commercial) license for your use outside of these guidelines at "http://style64.org/contact-style".
-
-At all times the most recent version of this license can be found at "http://style64.org/c64-truetype/license".

app/qml/fonts/departure-mono/LICENSE

@@ -0,0 +1,93 @@
+Copyright 2022–2024 Helena Zhang (helenazhang.com).
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/fira-code/LICENSE.txt

@@ -1,94 +1,93 @@
-Copyright (c) 2013, Pablo Caro <me AT pcaro DOT es> - http://pcaro.es/
-with Reserved Font Name Hermit.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/gohu/LICENSE

@@ -0,0 +1,13 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar
+  14 rue de Plaisance, 75014 Paris, France
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO. 

app/qml/fonts/greybeard/LICENSE

@@ -1,7 +1,7 @@
-ProFont
 MIT License
 
-Copyright (c) 2014 Carl Osterwald, Stephen C. Gilardi, Andrew Welch
+Copyright (c) 2012-2015 Uwe Waldmann
+Modified work Copyright 2018 Andy Walker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10,13 +10,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/qml/fonts/hack/LICENSE.txt

@@ -0,0 +1,45 @@
+The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License
+
+The work in the DejaVu project was committed to the public domain.
+
+Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera"
+
+### MIT License
+
+Copyright (c) 2018 Source Foundry Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+### BITSTREAM VERA LICENSE
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.

app/qml/fonts/ibm-3278/LICENSE.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2011-2017, Ricardo Banffy.
+Copyright 2022 The 3270font Authors (https://github.com/rbanffy/3270font)
+
+Copyright (c) 2011-2022, Ricardo Banffy.
 Copyright (c) 1993-2011, Paul Mattes.
 Copyright (c) 2004-2005, Don Russell.
 Copyright (c) 2004, Dick Altenbern.
@@ -10,27 +12,27 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright notice, 
+    * Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
-      
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-      
-    * Neither the name of Ricardo Banffy, Paul Mattes, Don Russell, 
-      Dick Altenbern, Jeff Sparkes, GTRC nor the names of their contributors 
-      may be used to endorse or promote products derived from this software 
+
+    * Neither the name of Ricardo Banffy, Paul Mattes, Don Russell,
+      Dick Altenbern, Jeff Sparkes, GTRC nor the names of their contributors
+      may be used to endorse or promote products derived from this software
       without specific prior written permission.
-    
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-IN NO EVENT SHALL RICARDO BANFFY, PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF 
-SPARKES OR GTRC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL RICARDO BANFFY, PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF
+SPARKES OR GTRC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The Debian Logo glyph is based on the Debian Open Use Logo and is

app/qml/fonts/iosevka/LICENSE.txt

@@ -0,0 +1,110 @@
+Copyright (c) 2015-2023, Renzhi Li (aka. Belleve Invis, belleve@typeof.net)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+
+Definitions
+-------------
+
+`"Font Software"` refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+`"Reserved Font Name"` refers to any names specified as such after the
+copyright statement(s).
+
+`"Original Version"` refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+`"Modified Version"` refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+`"Author"` refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1. Neither the Font Software nor any of its individual components,
+   in Original or Modified Versions, may be sold by itself.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3. No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the corresponding
+   Copyright Holder. This restriction only applies to the primary font name as
+   presented to the users.
+
+4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5. The Font Software, modified or unmodified, in part or in whole,
+   must be distributed entirely under this license, and must not be
+   distributed under any other license. The requirement for fonts to
+   remain under this license does not apply to any document created
+   using the Font Software.
+
+
+
+Termination
+-----------
+
+This license becomes null and void if any of the above conditions are
+not met.
+
+
+    DISCLAIMER
+    
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/jetbrains-mono/LICENSE.txt

@@ -0,0 +1,93 @@
+Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/modern-pro-font-win-tweaked/Comments for ProFontWindows

@@ -1 +0,0 @@
-dopustz:-480

app/qml/fonts/modern-pro-font-win-tweaked/readme.txt

@@ -1,31 +0,0 @@
-WHAT IS THIS?
-
-This is ProFont TrueType, converted to Windows TrueType format
-by Mike Smith, with some tweaks added by "ardu".
-
-Modifications include:
-- A Euro character
-- Missing characters from the Latin 1 code page
-- Full support for CodePage 850. These are mostly the famous
-  block/box characters you know from DOS. Very useful if you use
-  Mightnight Commander through PuTTY.
-- Fixed metrics so that point size of 9 works correctly. Until now
-  you had to select 7 to obtain the native point size of 9.
-- Added some quick&dirty hinting for point size of 9. Most characters
-  now match closely the look of the bitmap version.
-  Don't expect it to look good on anything else than Windows...
-
-
-
-To get the full original Distribution, other ProFont builds
-and more information
-go to <http://tobiasjung.name/profont/>
-
-
-DISCLAIMER
-See LICENSE file
-
-
-Tobias Jung
-January 2014
-profont@tobiasjung.name

app/qml/fonts/modern-proggy-tiny/Licence.txt

@@ -1,7 +0,0 @@
-Copyright (c) 2004, 2005 Tristan Grimmer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

app/qml/fonts/opendyslexic/LICENSE.txt

@@ -0,0 +1,22 @@
+License
+-------
+The license for this font is: 
+
+♡ Copying is an act of love. Please copy.
+Bitstream License: 
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license (“Fonts”) and associated documentation files (the “Font Software”), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: 
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words “Bitstream” or the word “Vera”.
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the “Bitstream Vera” names. 
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. 
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. 
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. 

app/qml/fonts/source-code-pro/LICENSE.txt

@@ -0,0 +1,93 @@
+Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/terminus/LICENSE-Terminess.txt

@@ -1,7 +1,7 @@
 Copyright (c) 2010 Dimitar Toshkov Zhekov,
 with Reserved Font Name "Terminus Font".
 
-Copyright (c) 2011 Tilman Blumenbach,
+Copyright (c) 2011-2021 Tilman Blumenbach,
 with Reserved Font Name "Terminus (TTF)".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.