Bump version. Yeeee

Update README.md
Tweak settings window and label sizes.
2022-01-29 15:15:52 +01:00 · 2022-01-29 15:10:08 +01:00 · 2022-01-16 09:40:20 +01:00 · 2022-01-12 21:11:58 +01:00 · 2022-01-12 21:08:58 +01:00 · 2022-01-12 21:00:11 +01:00
22 changed files with 255 additions and 448 deletions
--- a/.github/FUNDING.yml
+++ b/.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']
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
 cool-retro-term is a terminal emulator which mimics the look and feel of the old cathode tube screens.
 It has been designed to be eye-candy, customizable, and reasonably lightweight.

-It uses the QML port of qtermwidget (Konsole) developed by me: https://github.com/Swordfish90/qmltermwidget .
+It uses the QML port of qtermwidget (Konsole): https://github.com/Swordfish90/qmltermwidget.

-This terminal emulator works under Linux and macOS and requires Qt 5.2 or higher.
+This terminal emulator works under Linux and macOS and requires Qt5. It's suggested that you stick to the latest LTS version.

 Settings such as colors, fonts, and effects can be accessed via context menu.

@@ -20,192 +20,11 @@ Settings such as colors, fonts, and effects can be accessed via context menu.
 ![Image](<https://i.imgur.com/GYRDPzJ.jpg>)

 ## Install
-Walk the easy way and install cool-retro-term using one of these convenient packages:

-Just grab the latest AppImage from the release page and make it executable and run it:
+If you want to get a hold of the latest version, just go to the Releases page and grab the latest AppImage (Linux) or dmg (macOS).

-    wget https://github.com/Swordfish90/cool-retro-term/releases/download/1.1.1/Cool-Retro-Term-1.1.1-x86_64.AppImage
-    chmod a+x Cool-Retro-Term-1.1.1-x86_64.AppImage
-    ./Cool-Retro-Term-1.1.1-x86_64.AppImage
+Alternatively, most distributions such as Ubuntu, Fedora or Arch already package cool-retro-term in their official repositories.

-**Fedora** has the `cool-retro-term` in the official repositories. All you have to do is `sudo dnf install cool-retro-term`.
+## Building

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

 DESTDIR = $$OUT_PWD/../
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -6,11 +6,13 @@

 #include <QtWidgets/QApplication>
 #include <QIcon>
+#include <QQuickStyle>

 #include <QDebug>
 #include <stdlib.h>

 #include <QFontDatabase>
+#include <QLoggingCategory>

 #include <fileio.h>
 #include <monospacefontmanager.h>
@@ -33,6 +35,9 @@ int main(int argc, char *argv[])
    // This disables QT appmenu under Ubuntu, which is not working with QML apps.
    setenv("QT_QPA_PLATFORMTHEME", "", 1);

+    // Disable Connections slot warnings
+    QLoggingCategory::setFilterRules("qt.qml.connections.warning=false");
+
 #if defined (Q_OS_LINUX)
    setenv("QSG_RENDER_LOOP", "threaded", 0);
 #endif
@@ -56,18 +61,16 @@ int main(int argc, char *argv[])
        return 0;
    }

-    QString appVersion("1.1.1");
+    QString appVersion("1.2.0");

    if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
        QTextStream cout(stdout, QIODevice::WriteOnly);
        cout << "cool-retro-term " << appVersion << endl;
-	return 0;
+        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);

    QQmlApplicationEngine engine;
    FileIO fileIO;
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -34,6 +34,8 @@ QtObject {
    readonly property real minBurnInFadeTime: 160
    readonly property real maxBurnInFadeTime: 1600

+    property bool isMacOS: Qt.platform.os === "osx"
+
    // GENERAL SETTINGS ///////////////////////////////////////////////////////
    property int x: 100
    property int y: 100
@@ -41,7 +43,7 @@ QtObject {
    property int height: 768

    property bool fullscreen: false
-    property bool showMenubar: Qt.platform.os === "osx" ? true : false
+    property bool showMenubar: false

    property string wintitle: "cool-retro-term"

@@ -52,9 +54,7 @@ QtObject {
    property bool verbose: false

    property real bloomQuality: 0.5
-
    property real burnInQuality: 0.5
-    property bool useFastBurnIn: Qt.platform.os === "osx" ? false : true

    property bool blinkingCursor: false

@@ -242,8 +242,7 @@ QtObject {
            "bloomQuality": bloomQuality,
            "burnInQuality": burnInQuality,
            "useCustomCommand": useCustomCommand,
-            "customCommand": customCommand,
-            "useFastBurnIn": useFastBurnIn
+            "customCommand": customCommand
        }
        return stringify(settings)
    }
@@ -338,9 +337,6 @@ QtObject {
                !== undefined ? settings.useCustomCommand : useCustomCommand
        customCommand = settings.customCommand
                !== undefined ? settings.customCommand : customCommand
-
-        useFastBurnIn = settings.useFastBurnIn
-                !== undefined ? settings.useFastBurnIn : useFastBurnIn
    }

    function loadProfileString(profileString) {
--- a/app/qml/BurnInEffect.qml
+++ b/app/qml/BurnInEffect.qml
@@ -29,26 +29,29 @@ Loader {
    property real lastUpdate: 0
    property real prevLastUpdate: 0

-    property real delay: (1.0 / appSettings.fps) * 1000
    property real burnIn: appSettings.burnIn
    property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
    property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
    property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime

-    active: appSettings.useFastBurnIn && appSettings.burnIn !== 0
+    active: appSettings.burnIn !== 0

    anchors.fill: parent

    function completelyUpdate() {
-        prevLastUpdate = lastUpdate;
-        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 {
@@ -72,20 +75,30 @@ Loader {

            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: kterminalScrollbar
-                onOpacityChanged: completelyUpdate()
+                target: appSettings
+
+                onBurnInChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onTerminalFontChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onRasterizationChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onBurnInQualityChanged: {
+                    burnInEffect.restartBlurSource()
+                }
            }
        }

--- a/app/qml/ColorButton.qml
+++ b/app/qml/ColorButton.qml
@@ -34,10 +34,8 @@ Item {
        visible: false

        //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)
+        onColorChanged: if (!appSettings.isMacOS) colorSelected(color)
+        onAccepted: if (appSettings.isMacOS) colorSelected(color)
    }
    Rectangle {
        anchors.fill: parent
--- a/app/qml/Fonts.qml
+++ b/app/qml/Fonts.qml
@@ -213,7 +213,7 @@ QtObject {
        ListElement {
            name: "IBM_3278"
            text: "HD: IBM 3278 (1971)"
-            source: "fonts/1971-ibm-3278/3270Medium.ttf"
+            source: "fonts/1971-ibm-3278/3270-Regular.ttf"
            lineSpacing: 0.2
            pixelSize: 32
            fontWidth: 1.0
--- a/app/qml/PreprocessedTerminal.qml
+++ b/app/qml/PreprocessedTerminal.qml
@@ -34,7 +34,6 @@ Item{

    property ShaderEffectSource mainSource: kterminalSource
    property BurnInEffect burnInEffect: burnInEffect
-    property SlowBurnIn slowBurnInEffect: slowBurnInEffect
    property real fontWidth: 1.0
    property real screenScaling: 1.0
    property real scaleTexture: 1.0
@@ -45,28 +44,54 @@ Item{
    property size fontMetrics: kterminal.fontMetrics

    // Manage copy and paste
-    Connections{
+    Connections {
        target: copyAction
-        onTriggered: kterminal.copyClipboard();
+
+        onTriggered: {
+            kterminal.copyClipboard()
+        }
    }
-    Connections{
+    Connections {
        target: pasteAction
-        onTriggered: kterminal.pasteClipboard()
+
+        onTriggered: {
+            kterminal.pasteClipboard()
+        }
    }

    //When settings are updated sources need to be redrawn.
-    Connections{
+    Connections {
        target: appSettings
-        onFontScalingChanged: terminalContainer.updateSources();
-        onFontWidthChanged: terminalContainer.updateSources();
+
+        onFontScalingChanged: {
+            terminalContainer.updateSources()
+        }
+
+        onFontWidthChanged: {
+            terminalContainer.updateSources()
+        }
    }
-    Connections{
+    Connections {
        target: terminalContainer
-        onWidthChanged: terminalContainer.updateSources();
-        onHeightChanged: terminalContainer.updateSources();
+
+        onWidthChanged: {
+            terminalContainer.updateSources()
+        }
+
+        onHeightChanged: {
+            terminalContainer.updateSources()
+        }
    }
+    Connections {
+        target: terminalWindow
+
+        onActiveChanged: {
+            kterminal.forceActiveFocus()
+        }
+    }
+
    function updateSources() {
-        kterminal.update();
+        kterminal.update()
    }

    QMLTermWidget {
@@ -143,7 +168,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"]);
            }
@@ -173,7 +198,7 @@ Item{

    Loader {
        id: menuLoader
-        sourceComponent: (Qt.platform.os === "osx" || appSettings.showMenubar ? shortContextMenu : fullContextMenu)
+        sourceComponent: (appSettings.isMacOS || appSettings.showMenubar ? shortContextMenu : fullContextMenu)
    }
    property alias contextmenu: menuLoader.item

@@ -250,9 +275,5 @@ Item{
        BurnInEffect {
            id: burnInEffect
        }
-
-        SlowBurnIn {
-            id: slowBurnInEffect
-        }
    }
 }
--- a/app/qml/SettingsAdvancedTab.qml
+++ b/app/qml/SettingsAdvancedTab.qml
@@ -89,7 +89,7 @@ ColumnLayout {
                }
            }

-            Label {
+            SizedLabel {
                text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")
            }
            Label {
@@ -109,7 +109,7 @@ ColumnLayout {
                    enabled = true
                }
            }
-            Label {
+            SizedLabel {
                text: Math.round(txtslider.value * 100) + "%"
            }

@@ -130,7 +130,7 @@ ColumnLayout {
                    enabled = true
                }
            }
-            Label {
+            SizedLabel {
                text: Math.round(bloomSlider.value * 100) + "%"
            }

@@ -151,15 +151,9 @@ ColumnLayout {
                    enabled = true
                }
            }
-            Label {
+            SizedLabel {
                text: Math.round(burnInSlider.value * 100) + "%"
            }
-            CheckBox {
-                Layout.columnSpan: 2
-                text: qsTr("Burnin optimization (Might display timing artifacts)")
-                checked: appSettings.useFastBurnIn
-                onCheckedChanged: appSettings.useFastBurnIn = checked
-            }
        }
    }
 }
--- a/app/qml/SettingsGeneralTab.qml
+++ b/app/qml/SettingsGeneralTab.qml
@@ -33,6 +33,7 @@ ColumnLayout {
                Layout.fillWidth: true
                Layout.fillHeight: true
                model: appSettings.profilesList
+                clip: true
                delegate: Rectangle {
                    width: label.width
                    height: label.height
@@ -215,10 +216,12 @@ ColumnLayout {
            }
            Label {
                text: qsTr("Opacity")
+                visible: !appSettings.isMacOS
            }
            SimpleSlider {
                onValueChanged: appSettings.windowOpacity = value
                value: appSettings.windowOpacity
+                visible: !appSettings.isMacOS
            }
        }
    }
--- a/app/qml/SettingsTerminalTab.qml
+++ b/app/qml/SettingsTerminalTab.qml
@@ -68,7 +68,10 @@ ColumnLayout {
                }
                Connections {
                    target: appSettings
-                    onTerminalFontChanged: fontChanger.updateIndex()
+
+                    onTerminalFontChanged: {
+                        fontChanger.updateIndex()
+                    }
                }
                Component.onCompleted: updateIndex()
            }
--- a/app/qml/SettingsWindow.qml
+++ b/app/qml/SettingsWindow.qml
@@ -27,42 +27,49 @@ import QtQuick.Dialogs 1.1
 Window {
    id: settings_window
    title: qsTr("Settings")
-    width: 800
-    height: 600
+    width: 640
+    height: 640

    property int tabmargins: 15

-    TabBar {
-        id: bar
-        width: parent.width
-        TabButton {
-            text: qsTr("General")
-        }
-        TabButton {
-            text: qsTr("Terminal")
-        }
-        TabButton {
-            text: qsTr("Effects")
-        }
-        TabButton {
-            text: qsTr("Advanced")
-        }
-    }
+    Item {
+        anchors { fill: parent;  margins: tabmargins }

-    StackLayout {
-        anchors {
-            top: bar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-            margins: tabmargins
+        TabBar {
+            id: bar
+            anchors { left: parent.left; right: parent.right; top: parent.top; }
+            TabButton {
+                text: qsTr("General")
+            }
+            TabButton {
+                text: qsTr("Terminal")
+            }
+            TabButton {
+                text: qsTr("Effects")
+            }
+            TabButton {
+                text: qsTr("Advanced")
+            }
        }

-        currentIndex: bar.currentIndex
+        Frame {
+            anchors {
+                top: bar.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }

-        SettingsGeneralTab { }
-        SettingsTerminalTab { }
-        SettingsEffectsTab { }
-        SettingsAdvancedTab { }
+            StackLayout {
+                anchors.fill: parent
+
+                currentIndex: bar.currentIndex
+
+                SettingsGeneralTab { }
+                SettingsTerminalTab { }
+                SettingsEffectsTab { }
+                SettingsAdvancedTab { }
+            }
+        }
    }
 }
--- a/app/qml/ShaderTerminal.qml
+++ b/app/qml/ShaderTerminal.qml
@@ -24,7 +24,6 @@ import QtGraphicalEffects 1.0
 import "utils.js" as Utils

 Item {
-    property SlowBurnIn slowBurnInEffect
    property ShaderEffectSource source
    property BurnInEffect burnInEffect
    property ShaderEffectSource bloomSource
@@ -67,14 +66,10 @@ Item {
         property real glowingLine: appSettings.glowingLine * 0.2

         // Fast burnin properties
-         property real burnIn: appSettings.useFastBurnIn ? appSettings.burnIn : 0
+         property real burnIn: appSettings.burnIn
         property real burnInLastUpdate: burnInEffect.lastUpdate
         property real burnInTime: burnInEffect.burnInFadeTime

-         // Slow burnin properties
-         property real slowBurnIn: appSettings.useFastBurnIn ? 0 : appSettings.burnIn
-         property ShaderEffectSource slowBurnInSource: slowBurnInEffect.source
-
         property real jitter: appSettings.jitter
         property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter)
         property real shadowLength: 0.25 * screenCurvature * Utils.lint(0.50, 1.5, ambientLight)
@@ -185,8 +180,6 @@ Item {
                 uniform sampler2D burnInSource;
                 uniform highp float burnInLastUpdate;
                 uniform highp float burnInTime;" : "") +
-             (slowBurnIn !== 0 ? "
-                 uniform sampler2D slowBurnInSource;" : "") +
             (staticNoise !== 0 ? "
                 uniform highp float staticNoise;" : "") +
             (((staticNoise !== 0 || jitter !== 0) ||(fallBack && (flickering || horizontalSync))) ? "
@@ -314,11 +307,6 @@ Item {
                     txt_color = max(txt_color, convertWithChroma(burnInColor));"
                 : "") +

-                 (slowBurnIn !== 0 ? "
-                     vec4 txt_blur = texture2D(slowBurnInSource, staticCoords);
-                     txt_color = max(txt_color, convertWithChroma(txt_blur.rgb * txt_blur.a));
-                 " : "") +
-
                  "txt_color += fontColor.rgb * vec3(color);" +

                  "txt_color = applyRasterization(staticCoords, txt_color, virtualResolution, rasterizationIntensity);\n" +
--- a/app/qml/SlowBurnIn.qml
+++ b/app/qml/SlowBurnIn.qml
@@ -1,140 +0,0 @@
-/*******************************************************************************
-* 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
-
-Loader {
-    property ShaderEffectSource source: item ? item.source : null
-
-    active: !appSettings.useFastBurnIn && appSettings.burnIn !== 0
-    anchors.fill: parent
-
-    sourceComponent: Item {
-        property alias source: burnInSourceEffect
-        property int burnInScaling: scaleTexture * appSettings.burnInQuality
-
-        ShaderEffectSource {
-            property bool updateBurnIn: false
-            property real burnIn: appSettings.burnIn
-            property real fps: appSettings.fps !== 0 ? appSettings.fps : 60
-            property real burnInFadeTime: Utils.lint(minBurnInFadeTime, maxBurnInFadeTime, burnIn)
-            property real burnInCoefficient: 1000 / (fps * burnInFadeTime)
-            property real minBurnInFadeTime: appSettings.minBurnInFadeTime
-            property real maxBurnInFadeTime: appSettings.maxBurnInFadeTime
-
-            id: burnInSourceEffect
-
-            anchors.fill: parent
-
-            sourceItem: burnInEffect
-            recursive: true
-            live: false
-            hideSource: true
-            wrapMode: kterminalSource.wrapMode
-
-            visible: false
-
-            function restartBlurSource(){
-                livetimer.restart();
-            }
-
-            // This updates the burnin synched with the timer.
-            Connections {
-                target: burnInSourceEffect.updateBurnIn ? timeManager : null
-                ignoreUnknownSignals: false
-                onTimeChanged: {
-                    burnInSourceEffect.scheduleUpdate();
-                }
-            }
-
-            Timer {
-                id: livetimer
-
-                // The interval assumes 60 fps. This is the time needed burnout a white pixel.
-                // We multiply 1.1 to have a little bit of margin over the theoretical value.
-                // This solution is not extremely clean, but it's probably the best to avoid measuring fps.
-
-                interval: burnInSourceEffect.burnInFadeTime * 1.1
-                running: true
-                onTriggered: burnInSourceEffect.updateBurnIn = false;
-            }
-            Connections {
-                target: kterminal
-                onImagePainted:{
-                    burnInSourceEffect.scheduleUpdate();
-                    burnInSourceEffect.updateBurnIn = true;
-                    livetimer.restart();
-                }
-            }
-            // Restart blurred source settings change.
-            Connections {
-                target: appSettings
-                onBurnInChanged: burnInSourceEffect.restartBlurSource();
-                onTerminalFontChanged: burnInSourceEffect.restartBlurSource();
-                onRasterizationChanged: burnInSourceEffect.restartBlurSource();
-                onBurnInQualityChanged: burnInSourceEffect.restartBlurSource();
-            }
-            Connections {
-                target: kterminalScrollbar
-                onOpacityChanged: burnInSourceEffect.restartBlurSource();
-            }
-
-            ShaderEffect {
-                id: burnInEffect
-
-                property variant txt_source: kterminalSource
-                property variant blurredSource: burnInSourceEffect
-                property real burnInCoefficient: burnInSourceEffect.burnInCoefficient
-
-                anchors.fill: parent
-                blending: false
-
-                fragmentShader:
-                    "#ifdef GL_ES
-                        precision mediump float;
-                    #endif\n" +
-
-                    "uniform lowp float qt_Opacity;" +
-                    "uniform lowp sampler2D txt_source;" +
-
-                    "varying highp vec2 qt_TexCoord0;
-                     uniform lowp sampler2D blurredSource;
-                     uniform highp float burnInCoefficient;" +
-
-                    "float max3(vec3 v) {
-                         return max (max (v.x, v.y), v.z);
-                    }" +
-
-                    "void main() {" +
-                        "vec2 coords = qt_TexCoord0;" +
-                        "vec3 origColor = texture2D(txt_source, coords).rgb;" +
-                        "vec3 blur_color = texture2D(blurredSource, coords).rgb - vec3(burnInCoefficient);" +
-                        "vec3 color = min(origColor + blur_color, max(origColor, blur_color));" +
-
-                        "gl_FragColor = vec4(color, max3(color - origColor));" +
-                    "}"
-
-                onStatusChanged: if (log) console.log(log) //Print warning messages
-            }
-        }
-    }
-}
--- a/app/qml/TerminalContainer.qml
+++ b/app/qml/TerminalContainer.qml
@@ -33,7 +33,6 @@ ShaderTerminal {

    source: terminal.mainSource
    burnInEffect: terminal.burnInEffect
-    slowBurnInEffect: terminal.slowBurnInEffect
    virtualResolution: terminal.virtualResolution
    screenResolution: Qt.size(
        terminalWindow.width * devicePixelRatio * appSettings.windowScaling,
--- a/app/qml/fonts/1971-ibm-3278/3270-Regular.ttf
+++ b/app/qml/fonts/1971-ibm-3278/3270-Regular.ttf
--- a/app/qml/fonts/1971-ibm-3278/3270Medium.ttf
+++ b/app/qml/fonts/1971-ibm-3278/3270Medium.ttf
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -53,20 +53,30 @@ ApplicationWindow {
    property bool fullscreen: appSettings.fullscreen
    onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)

-    menuBar: WindowMenu {
-        id: mainMenu
-        visible: (Qt.platform.os === "osx" || appSettings.showMenubar)
+    menuBar: qtquickMenuLoader.item
+
+    Loader {
+        id: qtquickMenuLoader
+        active: !appSettings.isMacOS && appSettings.showMenubar
+        sourceComponent: WindowMenu { }
+    }
+
+    Loader {
+        id: globalMenuLoader
+        active: appSettings.isMacOS
+        sourceComponent: OSXMenu { }
    }

    property string wintitle: appSettings.wintitle

    color: "#00000000"
+
    title: terminalContainer.title || qsTr(appSettings.wintitle)

    Action {
        id: showMenubarAction
        text: qsTr("Show Menubar")
-        enabled: Qt.platform.os !== "osx"
+        enabled: !appSettings.isMacOS
        shortcut: "Ctrl+Shift+M"
        checkable: true
        checked: appSettings.showMenubar
@@ -75,7 +85,7 @@ ApplicationWindow {
    Action {
        id: fullscreenAction
        text: qsTr("Fullscreen")
-        enabled: Qt.platform.os !== "osx"
+        enabled: !appSettings.isMacOS
        shortcut: "Alt+F11"
        onTriggered: appSettings.fullscreen = !appSettings.fullscreen
        checkable: true
@@ -154,7 +164,7 @@ ApplicationWindow {
    onClosing: {
        // OSX Since we are currently supporting only one window
        // quit the application when it is closed.
-        if (Qt.platform.os === "osx")
+        if (appSettings.isMacOS)
            Qt.quit()
    }
 }
--- a/app/qml/menus/OSXMenu.qml
+++ b/app/qml/menus/OSXMenu.qml
@@ -0,0 +1,89 @@
+/*******************************************************************************
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
+* https://github.com/Swordfish90/cool-retro-term
+*
+* This file is part of cool-retro-term.
+*
+* cool-retro-term is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+import QtQuick 2.3
+import Qt.labs.platform 1.1
+
+MenuBar {
+    id: defaultMenuBar
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            text: quitAction.text
+            onTriggered: quitAction.trigger()
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            text: copyAction.text
+            shortcut: "Meta+C"
+            onTriggered: copyAction.trigger()
+        }
+        MenuItem {
+            text: pasteAction.text
+            shortcut: "Meta+V"
+            onTriggered: pasteAction.trigger()
+        }
+        MenuSeparator {}
+        MenuItem {
+            text: showsettingsAction.text
+            shortcut: showsettingsAction.shortcut
+            onTriggered: showsettingsAction.trigger()
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            text: zoomIn.text
+            shortcut: "Meta++"
+            onTriggered: zoomIn.trigger()
+        }
+        MenuItem {
+            text: zoomOut.text
+            shortcut: "Meta+-"
+            onTriggered: zoomOut.trigger()
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                    appSettings.handleFontChanged()
+                }
+            }
+            onObjectAdded: profilesMenu.insertItem(index, object)
+            onObjectRemoved: profilesMenu.removeItem(object)
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            text: showAboutAction.text
+            onTriggered: showAboutAction.trigger()
+        }
+    }
+}
--- a/app/qml/resources.qrc
+++ b/app/qml/resources.qrc
@@ -19,7 +19,7 @@
        <file>SettingsTerminalTab.qml</file>
        <file>FontScanlines.qml</file>
        <file>fonts/1977-apple2/PrintChar21.ttf</file>
-        <file>fonts/1971-ibm-3278/3270Medium.ttf</file>
+        <file>fonts/1971-ibm-3278/3270-Regular.ttf</file>
        <file>Storage.qml</file>
        <file>SettingsAdvancedTab.qml</file>
        <file>TerminalContainer.qml</file>
@@ -41,10 +41,10 @@
        <file>BurnInEffect.qml</file>
        <file>fonts/modern-terminus/TerminusTTF-4.46.0.ttf</file>
        <file>TerminalFrame.qml</file>
-        <file>SlowBurnIn.qml</file>
        <file>menus/WindowMenu.qml</file>
        <file>menus/FullContextMenu.qml</file>
        <file>menus/ShortContextMenu.qml</file>
        <file>ShaderLibrary.qml</file>
+        <file>menus/OSXMenu.qml</file>
    </qresource>
 </RCC>
--- a/2
+++ b/2
Author	SHA1	Message	Date
Filippo Scognamiglio	74ae511f92	Bump version. Yeeee	2022-01-29 15:15:52 +01:00
Filippo Scognamiglio	a3fbafe4ae	Update README.md	2022-01-29 15:10:08 +01:00
Filippo Scognamiglio	8a45fbe9ed	Tweak settings window and label sizes.	2022-01-16 09:40:20 +01:00
Filippo Scognamiglio	01c7929ee3	Increase size of settings window.	2022-01-12 21:11:58 +01:00
Filippo Scognamiglio	2261af17d7	Restore legacy Connection slots. Restore compilation on Qt 5.12.	2022-01-12 21:08:58 +01:00
Filippo Scognamiglio	41f34c3992	Disable Fusion style which has issues with dark themes.	2022-01-12 21:00:11 +01:00
Filippo Scognamiglio	36b1cd2dde	Add github funding links.	2022-01-09 15:11:08 +01:00
Filippo Scognamiglio	80374b3ec6	Update README.md	2022-01-09 15:08:15 +01:00
Filippo Scognamiglio	bc00d1e45f	Bump version.	2022-01-09 14:08:36 +01:00
Filippo Scognamiglio	6ddb507247	Merge pull request #694 from Swordfish90/osx-fixes MacOS improvements	2022-01-09 10:56:30 +01:00
Filippo Scognamiglio	b0f3b8f3d0	Update QMLTermWidget submodule.	2022-01-09 10:53:35 +01:00
Filippo Scognamiglio	06e7191056	Disable Qt5 Connections warnings.	2022-01-09 10:47:02 +01:00
Filippo Scognamiglio	997131ba64	Tiny fixes to burn-in.	2022-01-08 23:15:29 +01:00
Filippo Scognamiglio	ef9f412e5f	Clip profiles list.	2022-01-08 22:36:02 +01:00
Filippo Scognamiglio	7b69d41c60	Remove slow burn-in effect.	2022-01-08 22:32:42 +01:00
Filippo Scognamiglio	552947f507	Improve burn-in timings.	2022-01-08 22:20:44 +01:00
Filippo Scognamiglio	f69f2df63c	More Connections refactorings.	2022-01-03 21:06:33 +01:00
Filippo Scognamiglio	aa270067f6	Improve settings window.	2022-01-03 20:56:49 +01:00
Filippo Scognamiglio	28977313da	UI/UX fixes for OSX version.	2022-01-03 18:43:07 +01:00
Filippo Scognamiglio	cfe35d7795	Merge pull request #665 from Swordfish90/unstable Improve rasterization and terminal frame. Some refactoring.	2021-07-15 23:43:06 +02:00
Dmytro Pashchenko	9d06f10a9b	some grammar fixes (#636 )	2021-07-01 23:14:53 +02:00
Mizumoto Ryohei	8c27f7683b	update brew command (#664 ) * update brew command * Update README.md	2021-07-01 23:12:26 +02:00
Filippo Scognamiglio	bf1a491789	Merge pull request #638 from amake/patch-1 Mention MacPorts in readme	2021-07-01 23:10:42 +02:00
Filippo Scognamiglio	0f18a0349a	Merge pull request #589 from rbanffy/master Update 3270 font to 2.3.1	2021-06-30 08:49:39 +02:00
Ricardo Bánffy	39181f42cf	Update font version to 2.3.1	2021-03-25 09:52:21 +00:00
Aaron Madlon-Kay	3d706ad1a7	Mention MacPorts in readme	2021-01-27 14:42:57 +09:00
Ricardo Bánffy	a31b77e5bc	Update 3270 font with version 2.0.4. See https://github.com/rbanffy/3270font/tree/v2.0.4 for changes.	2020-05-17 12:29:24 +01:00
Ricardo Bánffy	b417643415	Renamed 3270 font to latest binary version	2020-05-17 12:21:13 +01:00