From e6a049c21458425aac0ffff646668deade44f814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20G=C3=A9rczei?= Date: Fri, 27 Oct 2017 21:00:53 +0200 Subject: [PATCH 01/18] Gentoo package version bump announced --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96f17d7..7755345 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ or use: to install precompiled from community repository. -Gentoo users can now install the first release "1.0" from a 3rd-party repository preferably via layman: +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.0-r1::gerczei + 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. -- 2.47.2 From 351b98189fea4a557b832d2edcb519147561f042 Mon Sep 17 00:00:00 2001 From: Lee Reilly Date: Sun, 29 Oct 2017 16:04:23 -0700 Subject: [PATCH 02/18] =?UTF-8?q?Updated=20OS=20X=20=E2=86=92=20macOS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 96f17d7..01daeb6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 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 . -This terminal emulator works under Linux and OSX and requires Qt 5.2 or higher. +This terminal emulator works under Linux and macOS and requires Qt 5.2 or higher. ## Screenshots ![Image]() @@ -41,7 +41,7 @@ A word of warning: USE flags and keywords are to be added to portage's configura Ubuntu users of 14.04 LTS (Trusty) up to 15.10 (Wily) can use [this PPA](https://launchpad.net/~bugs-launchpad-net-falkensweb) -OSX users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases +macOS users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases ## Build instructions (Linux) @@ -127,7 +127,7 @@ qmake && make ./cool-retro-term ``` -## Build instructions (OSX) +## 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: -- 2.47.2 From 88988dd3e19504fa365eecd581adb7746bec6adb Mon Sep 17 00:00:00 2001 From: Lee Reilly Date: Sun, 29 Oct 2017 16:07:24 -0700 Subject: [PATCH 03/18] Add some GIFs? --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 01daeb6..c617b76 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # cool-retro-term +|> Default Amber|C:\ IBM DOS|$ Default Green| +|---|---|---| +|![Default Amber Cool Retro Term](https://user-images.githubusercontent.com/121322/32070717-16708784-ba42-11e7-8572-a8fcc10d7f7d.gif)|![IBM DOS](https://user-images.githubusercontent.com/121322/32070716-16567e5c-ba42-11e7-9e64-ba96dfe9b64d.gif)|![Default Green Cool Retro Term](https://user-images.githubusercontent.com/121322/32070715-163a1c94-ba42-11e7-80bb-41fbf10fc634.gif)| + ## Description 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. -- 2.47.2 From c34c3c365478ba38663d2a57545c03918fcd3673 Mon Sep 17 00:00:00 2001 From: suve Date: Sun, 5 Nov 2017 00:04:45 +0100 Subject: [PATCH 04/18] Make screenshot sizes in appdata XML match actual image sizes --- packaging/appdata/cool-retro-term.appdata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/appdata/cool-retro-term.appdata.xml b/packaging/appdata/cool-retro-term.appdata.xml index 29029f8..50d009c 100644 --- a/packaging/appdata/cool-retro-term.appdata.xml +++ b/packaging/appdata/cool-retro-term.appdata.xml @@ -16,11 +16,11 @@ Default amber look - https://camo.githubusercontent.com/2443e662e95733ba6ae331f391f6ec036d1ee7fd/687474703a2f2f692e696d6775722e636f6d2f4e5566766e6c752e706e67 + https://camo.githubusercontent.com/2443e662e95733ba6ae331f391f6ec036d1ee7fd/687474703a2f2f692e696d6775722e636f6d2f4e5566766e6c752e706e67 Apple II look - https://camo.githubusercontent.com/44a19842d532555c7b02bf6b4b4684add9edf18c/687474703a2f2f692e696d6775722e636f6d2f4d4d6d4d3648742e706e67 + https://camo.githubusercontent.com/44a19842d532555c7b02bf6b4b4684add9edf18c/687474703a2f2f692e696d6775722e636f6d2f4d4d6d4d3648742e706e67 -- 2.47.2 From b7c8108ad5f990d74ca9bf9e58fbfcdc04346c81 Mon Sep 17 00:00:00 2001 From: suve Date: Mon, 6 Nov 2017 21:48:55 +0100 Subject: [PATCH 05/18] Improve manpage: add description and missing options, improve formatting --- packaging/debian/cool-retro-term.1 | 48 +++++++++++++++++++----------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/packaging/debian/cool-retro-term.1 b/packaging/debian/cool-retro-term.1 index 8cc3b3b..beff16e 100644 --- a/packaging/debian/cool-retro-term.1 +++ b/packaging/debian/cool-retro-term.1 @@ -1,31 +1,43 @@ -.TH cool-retro-term 1 "August 22 2016" +.TH "COOL-RETRO-TERM" 1 "2017-11-06" .SH NAME -cool-retro-term \- terminal emulator mimicking the old cathode display +cool\-retro\-term \- terminal emulator mimicking an old cathode display .SH SYNOPSIS -"Usage: ./cool\-retro\-term [\-\-default\-settings] [\-\-workdir ] [\-\-program ] [\-p|\-\-profile ] [\-\-fullscreen] [\-h|\-\-help]" +\fBcool\-retro\-term\fR [\fIOPTIONS\fR] +.br +\fBcool\-retro\-term\fR [\fIOPTIONS\fR] -e \fICOMMAND\fR [\fIARGUMENT\fR...] .SH DESCRIPTION -This manual page documents briefly the -.B cool-retro-term -command. +This manual page documents briefly the \fBcool\-retro\-term\fR command. +.PP +\fBcool\-retro\-term\fR 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. .SH OPTIONS .TP \fB\-\-default\-settings\fR -Run cool\-retro\-term with the default settings +Run with the default settings. .TP -\fB\-\-workdir\fR -Change working directory to 'dir' -.TP -\fB\-e\fR -Command to execute. This option will catch all following arguments, so use it as the last option. +\fB\-e\fR \fICOMMAND\fR +Command to execute. This should be used as the last option. +All the arguments following \fICOMMAND\fR will be passed to said command. .TP \fB\-\-fullscreen\fR -Run cool\-retro\-term in fullscreen. -.HP -\fB\-p\fR|\-\-profile Run cool\-retro\-term with the given profile. +Run in fullscreen mode. .TP -\fB\-h\fR|\-\-help -Print this help. +\fB\-h\fR, \fB\-\-help\fR +Print a help screen and exit. +.TP +\fB\-p\fR \fIPROFILE\fR, \fB\-\-profile\fR \fIPROFILE\fR +Run with the given profile. +.TP +\fB\-\-workdir\fR \fIDIR\fR +Start with \fIDIR\fR as the working directory. .TP \fB\-\-verbose\fR Print additional information such as profiles and settings. -.PP +.TP +\fB\-v\fR, \fB\-\-version\fR +Print the version number and exit. +.SH LICENCE +This program is available under the terms of the GNU General Public License, +version 3 or any later version, as published by the Free Software Foundation. -- 2.47.2 From a34654a9a93643a5fe7e451a825e24237e16b7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 12 Dec 2017 00:37:25 +0100 Subject: [PATCH 06/18] cool-retro-term made it to Fedora official repos --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 96f17d7..e03ea7a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,9 @@ This terminal emulator works under Linux and OSX and requires Qt 5.2 or higher. ## 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: -Users of Fedora and openSUSE can grab a package from [Open Build Service](http://software.opensuse.org/package/cool-retro-term). +Fedora has the `cool-retro-term` in the offcial repositories. All you have to do is `sudo dnf install cool-retro-term`. + +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): -- 2.47.2 From 8adec835f6edaa6ebb383761d43795f92363431b Mon Sep 17 00:00:00 2001 From: Lars Falk-Petersen Date: Tue, 12 Dec 2017 15:24:20 +0100 Subject: [PATCH 07/18] Instrucitons for ubuntu 17.10. Fixes https://github.com/Swordfish90/cool-retro-term/issues/396 --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 96f17d7..d31b4ea 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,12 @@ Make sure to install these first. --- +**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** sudo apt-get 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 -- 2.47.2 From 2d54638f49d0acefcb2af284c9d01496334eff3b Mon Sep 17 00:00:00 2001 From: maiki Date: Thu, 21 Dec 2017 21:17:45 -0800 Subject: [PATCH 08/18] Update readme Periods, amirite? --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96f17d7..8a2199e 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The live ebuild (version 9999-r1) tracking the bleeding-edge WIP codebase also r 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 users of 14.04 LTS (Trusty) up to 15.10 (Wily) can use [this PPA](https://launchpad.net/~bugs-launchpad-net-falkensweb). OSX users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases @@ -160,6 +160,6 @@ 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¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted) . +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¤cy_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. -- 2.47.2 From 6b22a0c03ac4ba7e407ef0a74e0156c979ae1ea7 Mon Sep 17 00:00:00 2001 From: mason1920 Date: Tue, 2 Jan 2018 11:45:08 -0500 Subject: [PATCH 09/18] Change apt-get to apt, and added stretch. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 96f17d7..c399dfe 100644 --- a/README.md +++ b/README.md @@ -64,13 +64,13 @@ Make sure to install these first. **Ubuntu 17.04** - sudo apt-get 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 + 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 --- -**Debian Jessie** +**Debian Stretch and Jessie** - sudo apt-get 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 + 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 --- -- 2.47.2 From 799ef63b813066e7fd9b13ccf1339ac416c40cdf Mon Sep 17 00:00:00 2001 From: Christiano Haesbaert Date: Sat, 6 Jan 2018 20:17:28 +0100 Subject: [PATCH 10/18] Add a -T option that sets window title. `cool-retro-term -T myretrosession` sets window name to 'myretrosession' This is useful especially for people who rely on wmctrl to change windows, now I can do `wmctrl -a myretrocession` to focus on cool-retro-term. -T was chosen since it matches classic xterm(1) and other terminal emulators --- app/main.cpp | 1 + app/qml/ApplicationSettings.qml | 6 ++++++ app/qml/main.qml | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/main.cpp b/app/main.cpp index 7c0bb51..55df439 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -54,6 +54,7 @@ int main(int argc, char *argv[]) qDebug() << " --default-settings Run cool-retro-term with the default settings"; qDebug() << " --workdir Change working directory to 'dir'"; qDebug() << " -e Command to execute. This option will catch all following arguments, so use it as the last option."; + qDebug() << " -T 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."; diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 3d20687..c786de3 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -41,6 +41,8 @@ QtObject{ property bool fullscreen: false property bool showMenubar: true + property string wintitle: "cool-retro-term" + property real windowOpacity: 1.0 property real ambientLight: 0.2 property real contrast: 0.85 @@ -480,6 +482,10 @@ QtObject{ showMenubar = false; } + if (args.indexOf("-T") !== -1) { + wintitle = args[args.indexOf("-T") + 1] + } + initializedSettings(); } Component.onDestruction: { diff --git a/app/qml/main.qml b/app/qml/main.qml index ed0801c..11f836e 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -62,8 +62,10 @@ ApplicationWindow{ __contentItem.visible: mainMenu.visible } + property string wintitle: appSettings.wintitle + color: "#00000000" - title: terminalContainer.title || qsTr("cool-retro-term") + title: terminalContainer.title || qsTr(appSettings.wintitle) Action { id: showMenubarAction -- 2.47.2 From 1d6f0445f73a6cbea95835082d3ac1c8b446b537 Mon Sep 17 00:00:00 2001 From: Alex Von Hoene <avh.on1@gmail.com> Date: Mon, 15 Jan 2018 16:31:30 -0500 Subject: [PATCH 11/18] add Debian Stretch to dependency instructions I've confirmed that the same instructions for Jessie also work for Stretch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 96f17d7..1a8ea14 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Make sure to install these first. --- -**Debian Jessie** +**Debian Jessie or Stretch** sudo apt-get 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 -- 2.47.2 From ae50ed980f3288ce84d5fe034ca95dc9d148cb3a Mon Sep 17 00:00:00 2001 From: Alex Von Hoene <avh.on1@gmail.com> Date: Mon, 15 Jan 2018 16:43:55 -0500 Subject: [PATCH 12/18] Added Debian Stretch dependencies In addition to what Debian Jessie needs, Stretch also needs qml-module-qt-labs-settings and qml-module-qt-labs-folderlistmodel These packages are not needed to build cool-retro-term, but they are needed to run it. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a8ea14..690727e 100644 --- a/README.md +++ b/README.md @@ -68,12 +68,18 @@ Make sure to install these first. --- -**Debian Jessie or Stretch** +**Debian Jessie** sudo apt-get 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 --- +**Debian Stretch** + + sudo apt-get 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: -- 2.47.2 From 35c48de638244842c1e9a3b36138f31f00979f95 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff <lars@nocrew.org> Date: Mon, 6 Mar 2017 21:36:02 +0100 Subject: [PATCH 13/18] Add Knight TV font. As used by the MIT AI Lab. --- app/qml/Fonts.qml | 10 ++++++++++ app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf | Bin 0 -> 6048 bytes app/qml/resources.qrc | 1 + 3 files changed, 11 insertions(+) create mode 100644 app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml index ad20844..24dc7b9 100644 --- a/app/qml/Fonts.qml +++ b/app/qml/Fonts.qml @@ -204,5 +204,15 @@ QtObject{ fontWidth: 1.0 lowResolutionFont: false } + ListElement{ + name: "Knight_TV" + text: "Knight TV (1975)" + source: "fonts/1975-knight-tv/KnightTVMedium.ttf" + lineSpacing: 0.2 + pixelSize: 10 + fontWidth: 1.0 + baseScaling: 2.0 + lowResolutionFont: true + } } } diff --git a/app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf b/app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf new file mode 100644 index 0000000000000000000000000000000000000000..4d133fb60b1e8148b3994b4d2a0982ac20a90c2b GIT binary patch literal 6048 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 literal 0 HcmV?d00001 diff --git a/app/qml/resources.qrc b/app/qml/resources.qrc index 97f23c9..ac36910 100644 --- a/app/qml/resources.qrc +++ b/app/qml/resources.qrc @@ -31,6 +31,7 @@ <file>fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf</file> <file>fonts/1977-apple2/PrintChar21.ttf</file> <file>fonts/1971-ibm-3278/3270Medium.ttf</file> + <file>fonts/1975-knight-tv/KnightTVMedium.ttf</file> <file>fonts/1985-atari-st/AtariST8x16SystemFont.ttf</file> <file>fonts/modern-terminus/TerminusTTF-4.38.2.ttf</file> <file>fonts/1977-commodore-pet/COMMODORE_PET.ttf</file> -- 2.47.2 From e7aa72a7ab243691497832c428e4704ca279afc3 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff <lars@nocrew.org> Date: Wed, 24 Jan 2018 21:58:34 +0100 Subject: [PATCH 14/18] Add a Knight TV profile. --- app/qml/ApplicationSettings.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml index 3d20687..c1b7612 100644 --- a/app/qml/ApplicationSettings.qml +++ b/app/qml/ApplicationSettings.qml @@ -439,6 +439,11 @@ QtObject{ obj_string: '{"ambientLight":0.1,"backgroundColor":"#000000","bloom":0.15,"brightness":0.5,"flickering":0,"contrast":0.85,"fontName":"IBM_3278","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0,"horizontalSync":0,"jitter":0,"burnIn":0.6,"staticNoise":0,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}' builtin: true } + ListElement{ + text: "Knight TV" + obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.45,"brightness":0.5,"burnIn":0.3,"chromaColor":0,"contrast":0.85,"customCommand":"","flickering":0.1,"fontColor":"#0ccc68","fontName":"Knight_TV","fontWidth":1,"frameName":"SIMPLE_WHITE_FRAME","glowingLine":0,"horizontalSync":0.16,"jitter":0,"rasterization":0,"rbgShift":0,"saturationColor":0,"screenCurvature":0.07,"staticNoise":0,"useCustomCommand":false,"windowOpacity":1}' + builtin: true + } ListElement{ text: "Transparent Green" obj_string: '{"ambientLight":0.2,"backgroundColor":"#000000","bloom":0.45,"brightness":0.5,"flickering":0.20,"contrast":0.85,"fontName":"TERMINUS_SCALED","fontColor":"#0ccc68","frameName":"NO_FRAME","glowingLine":0.16,"horizontalSync":0.1,"jitter":0.20,"burnIn":0.25,"staticNoise":0.20,"rasterization":0,"screenCurvature":0.05,"windowOpacity":0.60,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}' -- 2.47.2 From 7325835c3f6946c2bd701514052b237c6817ff71 Mon Sep 17 00:00:00 2001 From: Tom Chiverton <tomchiverton@users.noreply.github.com> Date: Sat, 10 Feb 2018 14:40:56 +0000 Subject: [PATCH 15/18] Ubuntu 17.10 PPA --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 96f17d7..6416e5e 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,8 @@ A word of warning: USE flags and keywords are to be added to portage's configura 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) + OSX users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases ## Build instructions (Linux) -- 2.47.2 From dda5fbc330ffd581ffa2c09a4024d7c35a4cb56d Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio <flscogna@gmail.com> Date: Sun, 25 Feb 2018 11:50:23 +0100 Subject: [PATCH 16/18] Increase baseScaling font for knight profile to improve consistency. --- app/qml/Fonts.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml index 24dc7b9..7189723 100644 --- a/app/qml/Fonts.qml +++ b/app/qml/Fonts.qml @@ -211,7 +211,7 @@ QtObject{ lineSpacing: 0.2 pixelSize: 10 fontWidth: 1.0 - baseScaling: 2.0 + baseScaling: 3.0 lowResolutionFont: true } } -- 2.47.2 From 654f8d0761da016659a7d0b2212a468608d83825 Mon Sep 17 00:00:00 2001 From: spuch <picospuch@gmail.com> Date: Tue, 6 Mar 2018 17:33:30 +0800 Subject: [PATCH 17/18] fix alt(meta), ctrl for emacs on macos --- app/main.cpp | 4 ++++ app/qml/main.qml | 4 ++-- qmltermwidget | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index 7c0bb51..a6268b4 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -36,6 +36,10 @@ int main(int argc, char *argv[]) #endif QApplication app(argc, argv); + // set application attributes + // Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293 + // app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true); + QQmlApplicationEngine engine; FileIO fileIO; diff --git a/app/qml/main.qml b/app/qml/main.qml index ed0801c..8a9d620 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -101,12 +101,12 @@ ApplicationWindow{ Action{ id: copyAction text: qsTr("Copy") - shortcut: Qt.platform.os === "osx" ? StandardKey.Copy : "Ctrl+Shift+C" + shortcut: "Ctrl+Shift+C" } Action{ id: pasteAction text: qsTr("Paste") - shortcut: Qt.platform.os === "osx" ? StandardKey.Paste : "Ctrl+Shift+V" + shortcut: "Ctrl+Shift+V" } Action{ id: zoomIn diff --git a/qmltermwidget b/qmltermwidget index 08958f7..214eeef 160000 --- a/qmltermwidget +++ b/qmltermwidget @@ -1 +1 @@ -Subproject commit 08958f7c83a7d05627f623b8904f3e79a0b7366b +Subproject commit 214eeefc2a1293a5d7d3da77e853e931103a1428 -- 2.47.2 From 68a5f0dd4b6580842515f00c41fdb48f9cc57a8e Mon Sep 17 00:00:00 2001 From: spuch <picospuch@gmail.com> Date: Thu, 8 Mar 2018 20:00:15 +0800 Subject: [PATCH 18/18] update submodule --- qmltermwidget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmltermwidget b/qmltermwidget index 214eeef..5da5047 160000 --- a/qmltermwidget +++ b/qmltermwidget @@ -1 +1 @@ -Subproject commit 214eeefc2a1293a5d7d3da77e853e931103a1428 +Subproject commit 5da50472e385537879b6e733bc89972c0ed0ec13 -- 2.47.2