Merge branch 'tweaks'

This commit is contained in:
Barak A. Pearlmutter 2016-12-18 22:58:21 +00:00
commit cdaa020a42
2 changed files with 8 additions and 1 deletions

View File

@ -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")) {

View File

@ -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 {