Skip to content

Commit

Permalink
Merge pull request #326 from barak/tweaks
Browse files Browse the repository at this point in the history
Minor tweaks, either fixes or tiny additions done while updating debian packaging
  • Loading branch information
Swordfish90 authored Feb 1, 2017
2 parents dde90fb + 8d28972 commit 348e5a4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects 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
Expand Down
7 changes: 7 additions & 0 deletions app/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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'";
Expand All @@ -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")) {
Expand Down
2 changes: 1 addition & 1 deletion app/qml/Components/SizedLabel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 348e5a4

Please sign in to comment.