Simplify sending glabels-batch output to stdout. (#27)

This commit is contained in:
Jim Evins
2018-12-05 16:38:02 -05:00
parent e0b9eeb146
commit 9a443cda41
+22 -3
View File
@@ -39,6 +39,20 @@
#include <QtDebug> #include <QtDebug>
namespace
{
#if defined(Q_OS_WIN)
const QString STDOUT_FILENAME = "CON:";
#elif defined(Q_OS_LINUX)
const QString STDOUT_FILENAME = "/dev/stdout";
#else
const QString STDOUT_FILENAME = "/dev/stdout";
#endif
}
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
QGuiApplication app( argc, argv ); QGuiApplication app( argc, argv );
@@ -84,7 +98,7 @@ int main( int argc, char **argv )
QPrinterInfo::defaultPrinterName() }, QPrinterInfo::defaultPrinterName() },
{{"o","output"}, {{"o","output"},
QCoreApplication::translate( "main", "Set output filename to <filename>. (Default=\"output.pdf\")" ), QCoreApplication::translate( "main", "Set output filename to <filename>. Set to \"-\" for stdout. (Default=\"output.pdf\")" ),
QCoreApplication::translate( "main", "filename" ), QCoreApplication::translate( "main", "filename" ),
"output.pdf" }, "output.pdf" },
@@ -147,8 +161,13 @@ int main( int argc, char **argv )
} }
else if ( parser.isSet("output") ) else if ( parser.isSet("output") )
{ {
qDebug() << "Batch mode. output =" << parser.value("output"); QString outputFilename = parser.value("output");
printer.setOutputFileName( parser.value("output") ); if ( outputFilename == "-" )
{
outputFilename = STDOUT_FILENAME;
}
qDebug() << "Batch mode. output =" << outputFilename;
printer.setOutputFileName( outputFilename );
} }
else else
{ {