Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Big-Ugly Style Update (#278)

Browse Source 
* Bulk replaced tabs with spaces
* Bulk removed trailing whitespace from lines
* Replaced c-style comments with c++-style comments in file banners
* Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable
* Cleanup ordering and spacing of include directives
* Bulk renaming of header file extensions from '.h' to '.hpp'.
* Update CODING-STYLE.md
* Update target_compile_features from cxx_std_11 to cxx_std_20.
* Refresh .clang-format file.  Still needs a lot of tweaking.
This commit is contained in:
Jaye Evins
2026-01-07 19:43:34 -05:00
committed by GitHub
parent 3cd173a37f
commit 1c902230fe
454 changed files with 51827 additions and 52031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels-batch/CMakeLists.txt
+1 -1
View File
@@ -15,7 +15,7 @@ add_executable (glabels-batch-qt
)
target_compile_features (glabels-batch-qt
PUBLIC cxx_std_11
PUBLIC cxx_std_20
)
target_link_libraries (glabels-batch-qt
glabels-batch/main.cpp
+261 -260
View File
@@ -1,32 +1,33 @@
/* main.cpp
*
* Copyright (C) 2013-2016 Jaye Evins <evins@snaught.com>
*
* This file is part of gLabels-qt.
*
* gLabels-qt is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* gLabels-qt is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
*/
// main.cpp
//
// Copyright (C) 2013-2016 Jaye Evins <evins@snaught.com>
//
// This file is part of gLabels-qt.
//
// gLabels-qt is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// gLabels-qt is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
//
#include "model/FileUtil.h"
#include "model/Db.h"
#include "model/Model.h"
#include "model/PageRenderer.h"
#include "model/Version.h"
#include "model/XmlLabelParser.h"
#include "barcode/Backends.h"
#include "merge/Factory.h"
#include "model/FileUtil.hpp"
#include "model/Db.hpp"
#include "model/Model.hpp"
#include "model/PageRenderer.hpp"
#include "model/Version.hpp"
#include "model/XmlLabelParser.hpp"
#include "barcode/Backends.hpp"
#include "merge/Factory.hpp"
#include <QApplication>
#include <QCommandLineParser>
@@ -41,16 +42,16 @@
namespace
{
#if defined(Q_OS_WIN)
const QString STDOUT_FILENAME = "CON:";
const QString STDIN_FILENAME = "CON:";
const QString STDOUT_FILENAME = "CON:";
const QString STDIN_FILENAME = "CON:";
#elif defined(Q_OS_LINUX)
const QString STDOUT_FILENAME = "/dev/stdout";
const QString STDIN_FILENAME = "/dev/stdin";
const QString STDOUT_FILENAME = "/dev/stdout";
const QString STDIN_FILENAME = "/dev/stdin";
#else
const QString STDOUT_FILENAME = "/dev/stdout";
const QString STDIN_FILENAME = "/dev/stdin";
const QString STDOUT_FILENAME = "/dev/stdout";
const QString STDIN_FILENAME = "/dev/stdin";
#endif
}
@@ -58,253 +59,253 @@ namespace
int main( int argc, char **argv )
{
QGuiApplication app( argc, argv );
QGuiApplication app( argc, argv );
QCoreApplication::setOrganizationName( "glabels.org" );
QCoreApplication::setOrganizationDomain( "glabels.org" );
QCoreApplication::setApplicationName( "glabels-batch-qt" );
QCoreApplication::setApplicationVersion( glabels::model::Version::LONG_STRING );
QCoreApplication::setOrganizationName( "glabels.org" );
QCoreApplication::setOrganizationDomain( "glabels.org" );
QCoreApplication::setApplicationName( "glabels-batch-qt" );
QCoreApplication::setApplicationVersion( glabels::model::Version::LONG_STRING );
//
// Setup translators
//
QLocale locale = QLocale::system();
QString qtTranslationsDir = QLibraryInfo::path( QLibraryInfo::TranslationsPath );
QString myTranslationsDir = glabels::model::FileUtil::translationsDir().canonicalPath();
QTranslator qtTranslator;
if ( qtTranslator.load( locale, "qt", "_", qtTranslationsDir ) )
{
app.installTranslator(&qtTranslator);
}
//
// Setup translators
//
QLocale locale = QLocale::system();
QString qtTranslationsDir = QLibraryInfo::path( QLibraryInfo::TranslationsPath );
QString myTranslationsDir = glabels::model::FileUtil::translationsDir().canonicalPath();
QTranslator glabelsTranslator;
if ( glabelsTranslator.load( locale, "glabels", "_", myTranslationsDir ) )
{
app.installTranslator(&glabelsTranslator);
}
QTranslator qtTranslator;
if ( qtTranslator.load( locale, "qt", "_", qtTranslationsDir ) )
{
app.installTranslator(&qtTranslator);
}
QTranslator templatesTranslator;
if ( templatesTranslator.load( locale, "templates", "_", myTranslationsDir ) )
{
app.installTranslator(&templatesTranslator);
}
QTranslator glabelsTranslator;
if ( glabelsTranslator.load( locale, "glabels", "_", myTranslationsDir ) )
{
app.installTranslator(&glabelsTranslator);
}
QTranslator templatesTranslator;
if ( templatesTranslator.load( locale, "templates", "_", myTranslationsDir ) )
{
app.installTranslator(&templatesTranslator);
}
//
// Parse command line
//
const QList<QCommandLineOption> options = {
{{"p","printer"},
QString( QCoreApplication::translate( "main", "Send output to <printer>. (Default=\"%1\")") ).arg( QPrinterInfo::defaultPrinterName() ),
QCoreApplication::translate( "main", "printer" ),
QPrinterInfo::defaultPrinterName() },
{{"i","input"},
QCoreApplication::translate( "main", "Set merge input to <source> (typically a filename). Set to \"-\" for stdin." ),
QCoreApplication::translate( "main", "source" ),
"" },
{{"o","output"},
QCoreApplication::translate( "main", "Set output filename to <filename>. Set to \"-\" for stdout. (Default=\"output.pdf\")" ),
QCoreApplication::translate( "main", "filename" ),
"output.pdf" },
{{"s","sheets"},
QCoreApplication::translate( "main", "Set number of sheets to <n>. (Default=1)" ),
"n", "1" },
//
// Parse command line
//
const QList<QCommandLineOption> options = {
{{"p","printer"},
QString( QCoreApplication::translate( "main", "Send output to <printer>. (Default=\"%1\")") ).arg( QPrinterInfo::defaultPrinterName() ),
QCoreApplication::translate( "main", "printer" ),
QPrinterInfo::defaultPrinterName() },
{{"c","copies"},
QCoreApplication::translate( "main", "Set number of copies to <n>. (Default=1)" ),
"n", "1" },
{{"a","collate"},
QCoreApplication::translate( "main", "Collate merge copies." ) },
{{"g","group"},
QCoreApplication::translate( "main", "Start each merge group on a new page." ) },
{{"f","first"},
QCoreApplication::translate( "main", "Set starting position to <n>. (Default=1)" ),
"n", "1" },
{{"i","input"},
QCoreApplication::translate( "main", "Set merge input to <source> (typically a filename). Set to \"-\" for stdin." ),
QCoreApplication::translate( "main", "source" ),
"" },
{{"l","outlines"},
QCoreApplication::translate( "main", "Print label outlines." ) },
{{"m","crop-marks"},
QCoreApplication::translate( "main", "Print crop marks." ) },
{{"r","reverse"},
QCoreApplication::translate( "main", "Print in reverse (mirror image)." ) },
{{"o","output"},
QCoreApplication::translate( "main", "Set output filename to <filename>. Set to \"-\" for stdout. (Default=\"output.pdf\")" ),
QCoreApplication::translate( "main", "filename" ),
"output.pdf" },
{{"D","define"},
QCoreApplication::translate( "main", "Set user variable <var> to <value>" ),
QCoreApplication::translate( "main", "var>=<value" ) }
};
{{"s","sheets"},
QCoreApplication::translate( "main", "Set number of sheets to <n>. (Default=1)" ),
"n", "1" },
{{"c","copies"},
QCoreApplication::translate( "main", "Set number of copies to <n>. (Default=1)" ),
"n", "1" },
{{"a","collate"},
QCoreApplication::translate( "main", "Collate merge copies." ) },
{{"g","group"},
QCoreApplication::translate( "main", "Start each merge group on a new page." ) },
{{"f","first"},
QCoreApplication::translate( "main", "Set starting position to <n>. (Default=1)" ),
"n", "1" },
{{"l","outlines"},
QCoreApplication::translate( "main", "Print label outlines." ) },
{{"m","crop-marks"},
QCoreApplication::translate( "main", "Print crop marks." ) },
{{"r","reverse"},
QCoreApplication::translate( "main", "Print in reverse (mirror image)." ) },
{{"D","define"},
QCoreApplication::translate( "main", "Set user variable <var> to <value>" ),
QCoreApplication::translate( "main", "var>=<value" ) }
};
QCommandLineParser parser;
parser.setApplicationDescription( QCoreApplication::translate( "main", "gLabels Label Designer (Batch Front-end)" ) );
parser.addOptions( options );
parser.addHelpOption();
parser.addVersionOption();
parser.addOption( { { "V", "Version" }, QCoreApplication::translate( "main", "More detailed version information." ) } );
parser.addPositionalArgument( "file",
QCoreApplication::translate( "main", "gLabels project file to print." ),
"file" );
parser.process( app );
QCommandLineParser parser;
parser.setApplicationDescription( QCoreApplication::translate( "main", "gLabels Label Designer (Batch Front-end)" ) );
parser.addOptions( options );
parser.addHelpOption();
parser.addVersionOption();
parser.addOption( { { "V", "Version" }, QCoreApplication::translate( "main", "More detailed version information." ) } );
parser.addPositionalArgument( "file",
QCoreApplication::translate( "main", "gLabels project file to print." ),
"file" );
parser.process( app );
// Handle verbose version option
if ( parser.isSet( "Version" ) )
{
QTextStream(stdout) << glabels::model::Version::details() << Qt::endl;
return 0;
}
// Handle verbose version option
if ( parser.isSet( "Version" ) )
{
QTextStream(stdout) << glabels::model::Version::details() << Qt::endl;
return 0;
}
//
// Parse variable definitions from command line, if any
//
QMap<QString,QString> variableDefinitions;
for ( QString definition : parser.values("define") )
{
QStringList parts = definition.split( '=' );
if ( parts.size() != 2 )
{
qWarning() << "Error: bad variable definition: " << definition;
return -1;
}
//
// Parse variable definitions from command line, if any
//
QMap<QString,QString> variableDefinitions;
variableDefinitions[ parts[0] ] = parts[1];
}
for ( QString definition : parser.values("define") )
{
QStringList parts = definition.split( '=' );
if ( parts.size() != 2 )
{
qWarning() << "Error: bad variable definition: " << definition;
return -1;
}
//
// Initialize subsystems
//
glabels::model::Settings::init();
glabels::model::Db::init();
glabels::merge::Factory::init();
glabels::barcode::Backends::init();
variableDefinitions[ parts[0] ] = parts[1];
}
if ( parser.positionalArguments().size() == 1 )
{
qDebug() << "Batch mode.";
//
// Initialize subsystems
//
glabels::model::Settings::init();
glabels::model::Db::init();
glabels::merge::Factory::init();
glabels::barcode::Backends::init();
QString filename = parser.positionalArguments().constFirst();
if ( filename == "-" )
{
filename = STDIN_FILENAME;
}
qDebug() << "Project file =" << filename;
glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
if ( model )
{
model->variables().setVariables( variableDefinitions );
if ( parser.positionalArguments().size() == 1 )
{
qDebug() << "Batch mode.";
QPrinter printer( QPrinter::HighResolution );
printer.setColorMode( QPrinter::Color );
if ( parser.isSet("printer") )
{
qDebug() << "Printer =" << parser.value("printer");
printer.setPrinterName( parser.value("printer") );
}
else if ( parser.isSet("output") )
{
QString outputFilename = parser.value("output");
if ( outputFilename == "-" )
{
outputFilename = STDOUT_FILENAME;
}
qDebug() << "Output =" << outputFilename;
printer.setOutputFileName( outputFilename );
}
else
{
qDebug() << "Batch mode. printer =" << QPrinterInfo::defaultPrinterName();
}
QString filename = parser.positionalArguments().constFirst();
if ( filename == "-" )
{
filename = STDIN_FILENAME;
}
qDebug() << "Project file =" << filename;
if ( parser.isSet( "input" ) )
{
QString inputSource = parser.value( "input" );
if ( inputSource == "-" )
{
inputSource = STDIN_FILENAME;
}
qDebug() << "Merge source =" << inputSource;
model->merge()->setSource( inputSource );
}
glabels::model::PageRenderer renderer( model );
if ( model->merge()->keys().empty() )
{
// Simple project (no merge)
if ( parser.isSet( "sheets" ) )
{
// Full sheets of simple items
renderer.setNCopies( parser.value( "sheets" ).toInt() * model->frame()->nLabels() );
renderer.setStartItem( 0 );
}
else if ( parser.isSet( "copies" ) )
{
// Partial sheet(s) of simple items
renderer.setNCopies( parser.value( "copies" ).toInt() );
renderer.setStartItem( parser.value( "first" ).toInt() - 1 );
}
else
{
// One full sheet of simple items
renderer.setNCopies( model->frame()->nLabels() );
renderer.setStartItem( 0 );
}
}
else
{
// Project with merge
renderer.setNCopies( parser.value( "copies" ).toInt() );
renderer.setStartItem( parser.value( "first" ).toInt() - 1 );
renderer.setIsCollated( parser.isSet( "collate" ) );
renderer.setAreGroupsContiguous( !parser.isSet( "group" ) );
}
renderer.setPrintOutlines( parser.isSet( "outlines" ) );
renderer.setPrintCropMarks( parser.isSet( "crop-marks" ) );
renderer.setPrintReverse( parser.isSet( "reverse" ) );
glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
if ( model )
{
model->variables().setVariables( variableDefinitions );
// Item and page count summary
if ( renderer.nPages() == 1 )
{
if ( renderer.nItems() == 1 )
{
qDebug() << "Printing 1 item on 1 page.";
}
else
{
qDebug() << "Printing" << renderer.nItems() << "items on 1 page.";
}
}
else
{
qDebug() << "Printing" << renderer.nItems() << "items on" << renderer.nPages() << "pages.";
}
QPrinter printer( QPrinter::HighResolution );
printer.setColorMode( QPrinter::Color );
if ( parser.isSet("printer") )
{
qDebug() << "Printer =" << parser.value("printer");
printer.setPrinterName( parser.value("printer") );
}
else if ( parser.isSet("output") )
{
QString outputFilename = parser.value("output");
if ( outputFilename == "-" )
{
outputFilename = STDOUT_FILENAME;
}
qDebug() << "Output =" << outputFilename;
printer.setOutputFileName( outputFilename );
}
else
{
qDebug() << "Batch mode. printer =" << QPrinterInfo::defaultPrinterName();
}
// Do it!
renderer.print( &printer );
}
}
else
{
if ( parser.positionalArguments().size() == 0 )
{
qWarning() << "Error: missing glabels project file.";
}
else
{
qWarning() << "Error: batch mode supports only one glabels project file.";
}
return -1;
}
return 0;
if ( parser.isSet( "input" ) )
{
QString inputSource = parser.value( "input" );
if ( inputSource == "-" )
{
inputSource = STDIN_FILENAME;
}
qDebug() << "Merge source =" << inputSource;
model->merge()->setSource( inputSource );
}
glabels::model::PageRenderer renderer( model );
if ( model->merge()->keys().empty() )
{
// Simple project (no merge)
if ( parser.isSet( "sheets" ) )
{
// Full sheets of simple items
renderer.setNCopies( parser.value( "sheets" ).toInt() * model->frame()->nLabels() );
renderer.setStartItem( 0 );
}
else if ( parser.isSet( "copies" ) )
{
// Partial sheet(s) of simple items
renderer.setNCopies( parser.value( "copies" ).toInt() );
renderer.setStartItem( parser.value( "first" ).toInt() - 1 );
}
else
{
// One full sheet of simple items
renderer.setNCopies( model->frame()->nLabels() );
renderer.setStartItem( 0 );
}
}
else
{
// Project with merge
renderer.setNCopies( parser.value( "copies" ).toInt() );
renderer.setStartItem( parser.value( "first" ).toInt() - 1 );
renderer.setIsCollated( parser.isSet( "collate" ) );
renderer.setAreGroupsContiguous( !parser.isSet( "group" ) );
}
renderer.setPrintOutlines( parser.isSet( "outlines" ) );
renderer.setPrintCropMarks( parser.isSet( "crop-marks" ) );
renderer.setPrintReverse( parser.isSet( "reverse" ) );
// Item and page count summary
if ( renderer.nPages() == 1 )
{
if ( renderer.nItems() == 1 )
{
qDebug() << "Printing 1 item on 1 page.";
}
else
{
qDebug() << "Printing" << renderer.nItems() << "items on 1 page.";
}
}
else
{
qDebug() << "Printing" << renderer.nItems() << "items on" << renderer.nPages() << "pages.";
}
// Do it!
renderer.print( &printer );
}
}
else
{
if ( parser.positionalArguments().size() == 0 )
{
qWarning() << "Error: missing glabels project file.";
}
else
{
qWarning() << "Error: batch mode supports only one glabels project file.";
}
return -1;
}
return 0;
}