Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor tweaks, either fixes or tiny additions done while updating debian packaging #326

Merged
merged 7 commits into from
Feb 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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