From eb6a41556df5692d6d5fe6a8f041a76d1cf82ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=A4fer?= Date: Tue, 6 Dec 2016 04:11:50 +0100 Subject: [PATCH 1/6] Updated install of needed packages for Ubuntu 16.10 --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 53ced31..66d1c46 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,12 @@ 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:i386 qml-module-qtquick-controls qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qml-module-qtquick-dialogs:i386 qml-module-qtquick-dialogs qtdeclarative5-localstorage-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 From 24dad37da76b775727f9259fa20c063a6fc395fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=A4fer?= Date: Tue, 6 Dec 2016 04:44:47 +0100 Subject: [PATCH 2/6] Removed duplicated packages from Ubuntu 16.10 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66d1c46..72a0eed 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ 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:i386 qml-module-qtquick-controls qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qml-module-qtquick-dialogs:i386 qml-module-qtquick-dialogs qtdeclarative5-localstorage-plugin qtdeclarative5-window-plugin + 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 --- From 888ab49e44b139303e59211705ee65e86acf976c Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 9 Apr 2016 16:36:08 +0100 Subject: [PATCH 3/6] add comment listing bugs in --help option output --- app/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/main.cpp b/app/main.cpp index 0cf128f..fae1f06 100644 --- a/app/main.cpp +++ b/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 ] [--program ] [-p|--profile ] [--fullscreen] [-h|--help]"; qDebug() << " --default-settings Run cool-retro-term with the default settings"; qDebug() << " --workdir Change working directory to 'dir'"; From 151fb6e58dd7ad5a383139f6f42ae5f3184c8e2b Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Sat, 9 Apr 2016 16:36:34 +0100 Subject: [PATCH 4/6] add --version, aka -v, command line option --- app/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/main.cpp b/app/main.cpp index fae1f06..448b515 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -61,6 +61,11 @@ int main(int argc, char *argv[]) return 0; } + if (args.contains("-v") || args.contains("--version")) { + qDebug() << "cool-retro-term 0.9"; + return 0; + } + // Manage default command QStringList cmdList; if (args.contains("-e")) { From 07307a6d8fdd7c64619b1f0fbfc21f38a3d9b2c7 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Wed, 7 Dec 2016 09:12:03 +0100 Subject: [PATCH 5/6] typo --- app/qml/Components/SizedLabel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/qml/Components/SizedLabel.qml b/app/qml/Components/SizedLabel.qml index a3dbfea..23a38b6 100644 --- a/app/qml/Components/SizedLabel.qml +++ b/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 { From d74bd0a39bb2237eaf64e387daa2e9272080002a Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Wed, 7 Dec 2016 09:33:30 +0100 Subject: [PATCH 6/6] version 1.0 --- app/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.cpp b/app/main.cpp index 448b515..a49bedf 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) } if (args.contains("-v") || args.contains("--version")) { - qDebug() << "cool-retro-term 0.9"; + qDebug() << "cool-retro-term 1.0"; return 0; }