Skip to content

Unified command line options of applications #146

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.

Sign up for GitHub

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

Merged
rdumusc merged 1 commit into from
Jan 25, 2017
Merged

Unified command line options of applications #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions apps/DesktopStreamer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Copyright (c) 2013-2016, EPFL/Blue Brain Project
# Copyright (c) 2013-2017, EPFL/Blue Brain Project
# Raphael Dumusc <raphael.dumusc@epfl.ch>

set(DESKTOPSTREAMER_HEADERS
Expand Down Expand Up @@ -66,7 +66,7 @@ if(MSVC)
list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES Ws2_32)
endif()

common_application(${DESKTOPSTREAMER_APP_NAME} GUI NOHELP)
common_application(${DESKTOPSTREAMER_APP_NAME} GUI)

if(APPLE)
# create a zip for Puppet deployment
Expand Down
15 changes: 14 additions & 1 deletion apps/DesktopStreamer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*********************************************************************/
/* Copyright (c) 2011 - 2012, The University of Texas at Austin. */
/* Copyright (c) 2013-2016, EPFL/Blue Brain Project */
/* Copyright (c) 2013-2017, EPFL/Blue Brain Project */
/* Raphael Dumusc <raphael.dumusc@epfl.ch> */
/* All rights reserved. */
/* */
Expand Down Expand Up @@ -40,10 +40,23 @@

#include "MainWindow.h"

#include <deflect/version.h>

#include <QCommandLineParser>

int main( int argc, char* argv[] )
{
QApplication app( argc, argv );

QApplication::setApplicationVersion(
QString::fromStdString( deflect::Version::getString( )));

QCommandLineParser parser;
parser.setApplicationDescription( "Stream your desktop to a remote host" );
parser.addHelpOption();
parser.addVersionOption();
parser.process( app );

Q_INIT_RESOURCE( resources );

MainWindow mainWindow;
Expand Down
3 changes: 2 additions & 1 deletion apps/QmlStreamer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ int main( int argc, char** argv )
app.setQuitOnLastWindowClosed( true );

QCommandLineParser parser;
parser.setApplicationDescription( "QmlStreamer example" );
parser.setApplicationDescription( "Stream an offscreen QML scene to a remote"
" host" );
parser.addHelpOption();
parser.addVersionOption();

Expand Down
11 changes: 6 additions & 5 deletions apps/SimpleStreamer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,12 @@ void initDeflectStream()

void syntax( char* app )
{
std::cout << "syntax: " << app << " [options] <host>" << std::endl;
std::cout << "options:" << std::endl;
std::cout << " -n <stream id> set stream identifier (default: 'SimpleStreamer')" << std::endl;
std::cout << " -i enable interaction events (default: OFF)" << std::endl;
std::cout << " -u enable uncompressed streaming (default: OFF)" << std::endl;
std::cout << "Usage: " << app << " [options] <host>" << std::endl;
std::cout << "Stream a GLUT teapot to a remote host\n" << std::endl;
std::cout << "Options:" << std::endl;
std::cout << " -n <stream id> set stream identifier (default: 'SimpleStreamer')" << std::endl;
std::cout << " -i enable interaction events (default: OFF)" << std::endl;
std::cout << " -u enable uncompressed streaming (default: OFF)" << std::endl;
}

void display()
Expand Down
2 changes: 2 additions & 0 deletions doc/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Changelog {#Changelog}

### 0.12.1 (git master)

* [146](https://github.com/BlueBrain/Deflect/pull/146):
Unified the command line options and help message of applications.
* [145](https://github.com/BlueBrain/Deflect/pull/145):
DesktopStreamer: new slider to adjust the JPEG quality in advanced settings.

Expand Down