diff --git a/README.md b/README.md index d31b4ea..b0b7e5e 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,9 @@ 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). + +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 @@ -64,7 +66,7 @@ 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 --- @@ -74,9 +76,15 @@ Make sure to install these first. --- -**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 + +--- + +**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 --- @@ -166,6 +174,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. 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..96297b4 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 @@ -439,6 +441,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":""}' @@ -480,6 +487,10 @@ QtObject{ showMenubar = false; } + if (args.indexOf("-T") !== -1) { + wintitle = args[args.indexOf("-T") + 1] + } + initializedSettings(); } Component.onDestruction: { diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml index ad20844..7189723 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: 3.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 0000000..4d133fb Binary files /dev/null and b/app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf differ 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 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>