From f481e229373bd07c34ad70b0ad2471edd023ae58 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 3 May 2020 20:34:01 +0200 Subject: [PATCH] organize command line help #165, #166, thanks to newlaurent62 --- src/main.cpp | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9717330e..41121692 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -655,45 +655,43 @@ int main ( int argc, char** argv ) QString UsageArguments ( char **argv ) { return - "Usage: " + QString ( argv[0] ) + " [option] [argument]\n" + "Usage: " + QString ( argv[0] ) + " [option] [optional argument]\n" "\nRecognized options:\n" - " -a, --servername server name, required for HTML status (server\n" - " only)\n" - " -c, --connect connect to given server address on startup\n" - " (client only)\n" - " -e, --centralserver address of the central server (server only)\n" - " -F, --fastupdate use 64 samples frame size mode (server only)\n" - " -g, --pingservers ping servers in list to keep NAT port open\n" - " (central server only)\n" " -h, -?, --help display this help text and exit\n" " -i, --inifile initialization file name\n" - " -j, --nojackconnect disable auto Jack connections (client only)\n" + " -n, --nogui disable GUI\n" + " -p, --port set your local port number\n" + " -v, --version output version information and exit\n" + "\nServer only:\n" + " -a, --servername server name, required for HTML status\n" + " -D, --histdays number of days of history to display\n" + " -e, --centralserver address of the central server\n" + " -F, --fastupdate use 64 samples frame size mode\n" + " -g, --pingservers ping servers in list to keep NAT port open\n" + " (central server only)\n" " -l, --log enable logging, set file name\n" " -L, --licence a licence must be accepted on a new\n" - " connection (server only)\n" - " -m, --htmlstatus enable HTML status file, set file name (server\n" - " only)\n" - " -n, --nogui disable GUI\n" + " connection\n" + " -m, --htmlstatus enable HTML status file, set file name\n" " -o, --serverinfo infos of the server(s) in the format:\n" " [name];[city];[country as QLocale ID]; ...\n" " [server1 address];[server1 name]; ...\n" " [server1 city]; ...\n" " [server1 country as QLocale ID]; ...\n" - " [server2 address]; ... (server only)\n" - " -p, --port local port number (server only)\n" + " [server2 address]; ...\n" " -R, --recording enables recording and sets directory to contain\n" - " recorded jams (server only)\n" + " recorded jams\n" " -s, --server start server\n" - " -u, --numchannels maximum number of channels (server only)\n" - " -v, --version output version information and exit\n" - " -w, --welcomemessage welcome message on connect (server only)\n" - " -y, --history enable connection history and set file\n" - " name (server only)\n" - " -D, --histdays number of days of history to display (server only)\n" - " -z, --startminimized start minimizied (server only)\n" - " --ctrlmidich MIDI controller channel to listen (client only)\n" + " -u, --numchannels maximum number of channels\n" + " -w, --welcomemessage welcome message on connect\n" + " -y, --history enable connection history and set file name\n" + " -z, --startminimized start minimizied\n" + "\nClient only:\n" + " -c, --connect connect to given server address on startup\n" + " -j, --nojackconnect disable auto Jack connections\n" + " --ctrlmidich MIDI controller channel to listen\n" " --clientname client name (window title and jack client name)\n" - "\nExample: " + QString ( argv[0] ) + " -l -inifile myinifile.ini\n"; + "\nExample: " + QString ( argv[0] ) + " -s -inifile myinifile.ini\n"; } bool GetFlagArgument ( char** argv,