Big-Ugly Style Update (#278)
* 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
GitHub
+112
-111
@@ -1,34 +1,35 @@
|
||||
/* 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 "MainWindow.h"
|
||||
|
||||
#include "model/FileUtil.h"
|
||||
#include "model/Db.h"
|
||||
#include "model/Model.h"
|
||||
#include "model/Settings.h"
|
||||
#include "model/Version.h"
|
||||
#include "model/XmlLabelParser.h"
|
||||
#include "MainWindow.hpp"
|
||||
|
||||
#include "barcode/Backends.h"
|
||||
#include "merge/Factory.h"
|
||||
#include "model/Db.hpp"
|
||||
#include "model/FileUtil.hpp"
|
||||
#include "model/Model.hpp"
|
||||
#include "model/Settings.hpp"
|
||||
#include "model/Version.hpp"
|
||||
#include "model/XmlLabelParser.hpp"
|
||||
|
||||
#include "barcode/Backends.hpp"
|
||||
#include "merge/Factory.hpp"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCommandLineParser>
|
||||
@@ -42,100 +43,100 @@
|
||||
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
QApplication app( argc, argv );
|
||||
QApplication app( argc, argv );
|
||||
|
||||
QCoreApplication::setOrganizationName( glabels::model::Version::ORGANIZATION_NAME );
|
||||
QCoreApplication::setOrganizationDomain( glabels::model::Version::ORGANIZATION_DOMAIN );
|
||||
QCoreApplication::setApplicationName( glabels::model::Version::APPLICATION_NAME );
|
||||
QCoreApplication::setApplicationVersion( glabels::model::Version::LONG_STRING );
|
||||
QApplication::setDesktopFileName( glabels::model::Version::DESKTOP_FILE_NAME );
|
||||
QCoreApplication::setOrganizationName( glabels::model::Version::ORGANIZATION_NAME );
|
||||
QCoreApplication::setOrganizationDomain( glabels::model::Version::ORGANIZATION_DOMAIN );
|
||||
QCoreApplication::setApplicationName( glabels::model::Version::APPLICATION_NAME );
|
||||
QCoreApplication::setApplicationVersion( glabels::model::Version::LONG_STRING );
|
||||
QApplication::setDesktopFileName( glabels::model::Version::DESKTOP_FILE_NAME );
|
||||
|
||||
QIcon::setThemeName( "glabels-flat" );
|
||||
QIcon::setThemeName( "glabels-flat" );
|
||||
|
||||
//
|
||||
// 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
|
||||
//
|
||||
QCommandLineParser parser;
|
||||
parser.setApplicationDescription( QCoreApplication::translate( "main", "gLabels Label Designer" ) );
|
||||
parser.addHelpOption();
|
||||
parser.addVersionOption();
|
||||
parser.addOption( { { "V", "Version" }, QCoreApplication::translate( "main", "More detailed version information." ) } );
|
||||
parser.addPositionalArgument( "files",
|
||||
QCoreApplication::translate( "main", "gLabels project files to open, optionally." ),
|
||||
"[files...]" );
|
||||
parser.process( app );
|
||||
//
|
||||
// Parse command line
|
||||
//
|
||||
QCommandLineParser parser;
|
||||
parser.setApplicationDescription( QCoreApplication::translate( "main", "gLabels Label Designer" ) );
|
||||
parser.addHelpOption();
|
||||
parser.addVersionOption();
|
||||
parser.addOption( { { "V", "Version" }, QCoreApplication::translate( "main", "More detailed version information." ) } );
|
||||
parser.addPositionalArgument( "files",
|
||||
QCoreApplication::translate( "main", "gLabels project files to open, optionally." ),
|
||||
"[files...]" );
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Initialize subsystems
|
||||
//
|
||||
glabels::model::Settings::init();
|
||||
glabels::model::Db::init();
|
||||
glabels::merge::Factory::init();
|
||||
glabels::barcode::Backends::init();
|
||||
|
||||
|
||||
//
|
||||
// Open each file in its own main window
|
||||
//
|
||||
bool openedFiles = false;
|
||||
for ( QString filename : parser.positionalArguments() )
|
||||
{
|
||||
glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
|
||||
if ( model )
|
||||
{
|
||||
auto *newWindow = new glabels::MainWindow();
|
||||
newWindow->setModel( model );
|
||||
newWindow->show();
|
||||
openedFiles = true;
|
||||
//
|
||||
// Initialize subsystems
|
||||
//
|
||||
glabels::model::Settings::init();
|
||||
glabels::model::Db::init();
|
||||
glabels::merge::Factory::init();
|
||||
glabels::barcode::Backends::init();
|
||||
|
||||
glabels::model::Settings::addToRecentFileList( model->fileName() );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Launch main window
|
||||
//
|
||||
if ( !openedFiles )
|
||||
{
|
||||
auto *mainWindow = new glabels::MainWindow();
|
||||
mainWindow->show();
|
||||
}
|
||||
//
|
||||
// Open each file in its own main window
|
||||
//
|
||||
bool openedFiles = false;
|
||||
for ( QString filename : parser.positionalArguments() )
|
||||
{
|
||||
glabels::model::Model *model = glabels::model::XmlLabelParser::readFile( filename );
|
||||
if ( model )
|
||||
{
|
||||
auto *newWindow = new glabels::MainWindow();
|
||||
newWindow->setModel( model );
|
||||
newWindow->show();
|
||||
openedFiles = true;
|
||||
|
||||
|
||||
return app.exec();
|
||||
glabels::model::Settings::addToRecentFileList( model->fileName() );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Launch main window
|
||||
//
|
||||
if ( !openedFiles )
|
||||
{
|
||||
auto *mainWindow = new glabels::MainWindow();
|
||||
mainWindow->show();
|
||||
}
|
||||
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user