Merge remote-tracking branch 'upstream/master'

README.md

@@ -30,9 +30,9 @@ to install precompiled from community repository.
 
 Gentoo users can now install the first release "1.0" from a 3rd-party repository preferably via layman:
 
-    USE="subversion git" emerge app-portage/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 already should sync instead via 'layman -s gerczei'
+    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
 
 The live ebuild (version 9999-r1) tracking the bleeding-edge WIP codebase also remains available.
@@ -56,6 +56,18 @@ Make sure to install these first.
 
 ---
 
+**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-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
+
+---
+
 **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

app/main.cpp

@@ -48,6 +48,8 @@ int main(int argc, char *argv[])
     // 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'";
@@ -59,6 +61,11 @@ int main(int argc, char *argv[])
         return 0;
     }
 
+    if (args.contains("-v") || args.contains("--version")) {
+        qDebug() << "cool-retro-term 1.0";
+	return 0;
+    }
+
     // Manage default command
     QStringList cmdList;
     if (args.contains("-e")) {

app/qml/Components/SizedLabel.qml

@@ -22,7 +22,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.0
 
-// This component is simply a label with a predifined size.
+// This component is simply a label with a predefined size.
 // Used to improve alignment.
 
 Item {

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

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012, Ricardo Banffy.
+Copyright (c) 2011-2016, Ricardo Banffy.
 Copyright (c) 1993-2011, Paul Mattes.
 Copyright (c) 2004-2005, Don Russell.
 Copyright (c) 2004, Dick Altenbern.
@@ -10,4 +10,6 @@ Redistribution and use in source and binary forms, with or without modification,
 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 and/or other materials provided with the distribution.
 Neither the names 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 PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF SPARKES AND GTRC "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 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.
+THIS SOFTWARE IS PROVIDED BY RICARDO BANFFY, PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF SPARKES AND GTRC "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 Copyright (c) 1999 Software in the Public Interest, Inc., and it is incorporated here under the terms of the Creative Commons Attribution-ShareAlike 3.0 Unported License. The logo is released under the terms of the GNU Lesser General Public License, version 3 or any later version, or, at your option, of the Creative Commons Attribution-ShareAlike 3.0 Unported License.

app/qml/fonts/1971-ibm-3278/README.md

@@ -5,14 +5,16 @@
 
 ![Screenshot](https://raw.githubusercontent.com/wiki/rbanffy/3270font/emacs.png)
 
+![Sample](https://raw.githubusercontent.com/wiki/rbanffy/3270font/3270Medium_sample.png)
+
 A little bit of history
 -----------------------
 
-This font is derived from the x3270 font, which, in turn, was translated
+This font is derived from the x3270 font, which, in turn, was
-from the one in Georgia Tech's 3270tool, which was itself hand-copied
+translated from the one in Georgia Tech's 3270tool, which was itself
-from a 3270 terminal. I built it because I felt terminals deserve to be
+hand-copied from a 3270 series terminal. I built it because I felt
-pretty. The .sfd font file contains a x3270 bitmap font that was used
+terminals deserve to be pretty. The .sfd font file contains a x3270
-for guidance.
+bitmap font that was used for guidance.
 
 ![Using with the cool-old-tern (now cool-retro-term) terminal program]
 (https://raw.githubusercontent.com/wiki/rbanffy/3270font/cool-retro-term.png)
@@ -21,13 +23,19 @@ Getting it
 ----------
 
 If you are running Debian or Ubuntu and you don't want to mess with
-building your font files, you can simply `apt-get install
+building your font files, you can simply `apt-get install fonts-3270`
-fonts-3270`. It'll most likely not the latest version, with all new
+(It's available from the Debian and Ubuntu package repos at
-glyphs I add from time to time, but it's good enough for most
+https://packages.debian.org/sid/fonts/fonts-3270 and
-purposes. For those who don't have the luxury of a proper system-managed
+http://packages.ubuntu.com/xenial/fonts/fonts-3270, although the
-package, Adobe Type 1, TTF, OTF and WOFF versions are available for
+packaged version may not be the latest version, but it's good enough for
-download on http://s3.amazonaws.com/rbanffy/3270_fonts_14e43fc.zip
+most purposes. For those who don't have the luxury of a proper
-(although this URL may not always reflect the latest version).
+system-managed package, Adobe Type 1, TTF, OTF and WOFF versions are
+available for download on
+http://s3.amazonaws.com/3270font/3270_fonts_ef53755.zip (although this
+URL may not always reflect the latest version).
+
+![ASCII is so 60's]
+(https://raw.githubusercontent.com/wiki/rbanffy/3270font/cyrillic.png)
 
 The format
 ----------
@@ -65,6 +73,9 @@ slightly more condensed .sfd file with the base font narrowed to 488
 units, with no glyph rescaling (or cropping - we need to fix that) and
 its corresponding PostScript, TTF, OTF and WOFF versions.
 
+![For your favorite editor]
+(https://raw.githubusercontent.com/wiki/rbanffy/3270font/symbols.png)
+
 Contributing
 ------------
 
@@ -78,23 +89,12 @@ it. Check if the `git diff` command gives out something sensible (does
 not change things you didn't intend to) and make a pull request. If, in
 doubt, get in touch and we will figure out how to do it right.
 
-Preserving history
-------------------
-
-I regard the evolution of electronic computing a very important part of
-our civilization's history. Consider donating to entities that help
-preserve it, such as the Computer History Museum
-(http://www.computerhistory.org/), the IT History Society
-(http://ithistory.org/) and many others around the world. If you have a
-historically significant piece of technology in your closet or garage,
-consider contacting a local technology or industrial-design-oriented
-museum for advice.
-
 Known problems
 --------------
 
 Not all symbols in the 3270 charset have Unicode counterparts. When
 possible, they are duplicated in the Unicode space. The 3270-only
-symbols are at the end of the font.
+symbols are at the end of the font, along with some glyphs useful for
+building others.
 
 Please refer to http://x3270.bgp.nu/Charset.html for a complete map.

packaging/debian/cool-retro-term.1

@@ -1,6 +1,6 @@
 .TH cool-retro-term 1 "August 22 2016"
 .SH NAME
-cool-retro-term \- terminal emulator mimicing the old cathode display
+cool-retro-term \- terminal emulator mimicking the old cathode display
 .SH SYNOPSIS
 "Usage: ./cool\-retro\-term [\-\-default\-settings] [\-\-workdir <dir>] [\-\-program <prog>] [\-p|\-\-profile <prof>] [\-\-fullscreen] [\-h|\-\-help]"
 .SH DESCRIPTION
@@ -27,5 +27,5 @@ Run cool\-retro\-term in fullscreen.
 Print this help.
 .TP
 \fB\-\-verbose\fR
-Print additional informations such as profiles and settings.
+Print additional information such as profiles and settings.
 .PP

packaging/debian/copyright

@@ -4,10 +4,8 @@ Upstream-Contact: Filippo Scognamiglio <flscogna@gmail.com>
 Source: https://github.com/Swordfish90/cool-retro-term
 
 Files: *
-Copyright: 2014 Filippo Scognamiglio
+Copyright: 2013-2017 Filippo Scognamiglio
 License: GPL-3
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
-
-