From d242ac706e4ad74b79c89092e9e413eb5160c28e Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 29 Jan 2025 11:52:54 +0100 Subject: [PATCH] Gui: Migrate to using App::Application::getNameWithVersion --- src/Gui/ApplicationPy.cpp | 13 ++----------- src/Gui/EditorView.cpp | 11 +---------- src/Gui/MDIView.cpp | 10 +--------- src/Gui/MainWindow.cpp | 7 +------ src/Gui/View3DInventor.cpp | 10 +--------- 5 files changed, 6 insertions(+), 45 deletions(-) diff --git a/src/Gui/ApplicationPy.cpp b/src/Gui/ApplicationPy.cpp index defc585675..16dc543900 100644 --- a/src/Gui/ApplicationPy.cpp +++ b/src/Gui/ApplicationPy.cpp @@ -36,7 +36,6 @@ #include -#include #include #include #include @@ -774,19 +773,11 @@ PyObject* ApplicationPy::sExport(PyObject * /*self*/, PyObject *args) view3d->viewAll(); } QPrinter printer(QPrinter::ScreenResolution); - // setPdfVersion sets the printied PDF Version to comply with PDF/A-1b, more details under: https://www.kdab.com/creating-pdfa-documents-qt/ + // setPdfVersion sets the printed PDF Version to comply with PDF/A-1b, more details under: https://www.kdab.com/creating-pdfa-documents-qt/ printer.setPdfVersion(QPagedPaintDevice::PdfVersion_A1b); printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFileName(fileName); - - QString appname = QCoreApplication::applicationName(); - auto config = App::Application::Config(); - QString major = QString::fromUtf8(config["BuildVersionMajor"].c_str()); - QString minor = QString::fromUtf8(config["BuildVersionMinor"].c_str()); - QString point = QString::fromUtf8(config["BuildVersionPoint"].c_str()); - QString suffix = QString::fromUtf8(config["BuildVersionSuffix"].c_str()); - printer.setCreator(QString::fromUtf8("%1 %2.%3.%4%5").arg(appname, major, minor, point, suffix)); - + printer.setCreator(QString::fromStdString(App::Application::getNameWithVersion())); view->print(&printer); } } diff --git a/src/Gui/EditorView.cpp b/src/Gui/EditorView.cpp index 69c39d2b77..8eefb03515 100644 --- a/src/Gui/EditorView.cpp +++ b/src/Gui/EditorView.cpp @@ -56,7 +56,6 @@ #include #include #include -#include using namespace Gui; @@ -512,15 +511,7 @@ void EditorView::printPdf() printer.setPdfVersion(QPagedPaintDevice::PdfVersion_A1b); printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFileName(filename); - - QString appname = QCoreApplication::applicationName(); - auto config = App::Application::Config(); - QString major = QString::fromUtf8(config["BuildVersionMajor"].c_str()); - QString minor = QString::fromUtf8(config["BuildVersionMinor"].c_str()); - QString point = QString::fromUtf8(config["BuildVersionPoint"].c_str()); - QString suffix = QString::fromUtf8(config["BuildVersionSuffix"].c_str()); - printer.setCreator(QString::fromUtf8("%1 %2.%3.%4%5").arg(appname, major, minor, point, suffix)); - + printer.setCreator(QString::fromStdString(App::Application::getNameWithVersion())); d->textEdit->document()->print(&printer); } } diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp index c3ece9aed2..8a420a29c5 100644 --- a/src/Gui/MDIView.cpp +++ b/src/Gui/MDIView.cpp @@ -265,15 +265,7 @@ void MDIView::printPdf() printer.setPdfVersion(QPagedPaintDevice::PdfVersion_A1b); printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFileName(filename); - - QString appname = QCoreApplication::applicationName(); - auto config = App::Application::Config(); - QString major = QString::fromUtf8(config["BuildVersionMajor"].c_str()); - QString minor = QString::fromUtf8(config["BuildVersionMinor"].c_str()); - QString point = QString::fromUtf8(config["BuildVersionPoint"].c_str()); - QString suffix = QString::fromUtf8(config["BuildVersionSuffix"].c_str()); - printer.setCreator(QString::fromUtf8("%1 %2.%3.%4%5").arg(appname, major, minor, point, suffix)); - + printer.setCreator(QString::fromStdString(App::Application::getNameWithVersion())); print(&printer); } } diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 00cd9ae045..cdb6bda72f 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -2306,12 +2306,7 @@ void MainWindow::setWindowTitle(const QString& string) if (showVersion) { // set main window title with FreeCAD Version - auto config = App::Application::Config(); - QString major = QString::fromUtf8(config["BuildVersionMajor"].c_str()); - QString minor = QString::fromUtf8(config["BuildVersionMinor"].c_str()); - QString point = QString::fromUtf8(config["BuildVersionPoint"].c_str()); - QString suffix = QString::fromUtf8(config["BuildVersionSuffix"].c_str()); - title = QString::fromUtf8("%1 %2.%3.%4%5").arg(appname, major, minor, point, suffix); + title = QString::fromStdString(App::Application::getNameWithVersion()); } else { title = appname; diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index c67043589f..c38243c473 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -259,15 +259,7 @@ void View3DInventor::printPdf() printer.setOutputFormat(QPrinter::PdfFormat); printer.setPageOrientation(QPageLayout::Landscape); printer.setOutputFileName(filename); - - QString appname = QCoreApplication::applicationName(); - auto config = App::Application::Config(); - QString major = QString::fromUtf8(config["BuildVersionMajor"].c_str()); - QString minor = QString::fromUtf8(config["BuildVersionMinor"].c_str()); - QString point = QString::fromUtf8(config["BuildVersionPoint"].c_str()); - QString suffix = QString::fromUtf8(config["BuildVersionSuffix"].c_str()); - printer.setCreator(QString::fromUtf8("%1 %2.%3.%4%5").arg(appname, major, minor, point, suffix)); - + printer.setCreator(QString::fromStdString(App::Application::getNameWithVersion())); print(&printer); } }