Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
@@ -69,7 +69,7 @@ QString MemberInformationWrapper::ddsToJsonElement() const
|
||||
return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
|
||||
QStringLiteral("element.") + memberAccess + cppToJsonPost();
|
||||
|
||||
const QString optionalAccess = cppMemberName() + QStringLiteral(".is_set()");
|
||||
const QString optionalAccess = cppMemberName() + QStringLiteral(".has_value()");
|
||||
const QString getValue = cppMemberName();
|
||||
return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
|
||||
QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
|
||||
|
||||
@@ -17,7 +17,13 @@ SET(SRCS
|
||||
printing.h
|
||||
)
|
||||
|
||||
if (KDReports_FOUND AND QT6_GUI_AVAILABLE AND BUILD_CODIFICATION)
|
||||
# Legacy always built the real LtsPrinting when KDReports was available
|
||||
# (FIND_PACKAGE(KDReports REQUIRED)); it is a common lib consumed by many
|
||||
# targets (e.g. SitmapGuiPlugin::doPrint -> LtsPrinting::printImage), so it must
|
||||
# NOT be gated on the BUILD_CODIFICATION product flag (which only bundles the
|
||||
# CodificationManagement/ReportViewer plugins). Build the real lib whenever
|
||||
# KDReports is found; keep the stub only as a KDReports-absent fallback.
|
||||
if (KDReports_FOUND AND QT6_GUI_AVAILABLE)
|
||||
NGL_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
|
||||
PUBLIC
|
||||
@@ -38,5 +44,7 @@ if(QT6_GUI_AVAILABLE)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(LtsPrinting)
|
||||
else()
|
||||
message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
|
||||
message(STATUS "KDReports not found or Qt6 GUI unavailable; building LtsPrinting stub (link-only, no printing symbols)")
|
||||
add_library(LtsPrinting SHARED lts_printing_stub.cpp)
|
||||
NGL_INSTALL_TARGET(LtsPrinting)
|
||||
endif()
|
||||
@@ -0,0 +1,14 @@
|
||||
// LtsPrinting link stub for the Qt6 migration.
|
||||
//
|
||||
// The real LtsPrinting library requires KDReports (a Qt5/KDE print-reporting
|
||||
// library that is not available in the Qt6 toolchain). When KDReports is not
|
||||
// found the real library is skipped (see CMakeLists.txt); this stub provides a
|
||||
// linkable `LtsPrinting` target so that consumers referencing the target name
|
||||
// (e.g. SmoCheckButtonHandler) still link. It exports no printing symbols.
|
||||
namespace lts_printing_stub
|
||||
{
|
||||
int lts_printing_stub_marker()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -84,7 +84,7 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, const QAb
|
||||
|
||||
doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
|
||||
dialogParent->windowTitle(), QPrinter::A4, QPrinter::Landscape);
|
||||
dialogParent->windowTitle(), QPageSize(QPageSize::A4), QPageLayout::Landscape);
|
||||
if (!nglPrinter.printer())
|
||||
return;
|
||||
|
||||
@@ -118,8 +118,8 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, QAbstract
|
||||
}
|
||||
|
||||
void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image, const QString& imageTitle,
|
||||
const QString& description, const QPrinter::PageSize& pageSize,
|
||||
const QPrinter::Orientation& pageOrientation)
|
||||
const QString& description, const QPageSize& pageSize,
|
||||
const QPageLayout::Orientation& pageOrientation)
|
||||
{
|
||||
QTextDocument doc;
|
||||
QTextCursor cursor(&doc);
|
||||
@@ -141,7 +141,7 @@ void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QI
|
||||
|
||||
void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
|
||||
QVector<QImage>& images, QVector<QString>& imageTitles, QVector<QString>& descriptions,
|
||||
const QPrinter::PageSize& pageSize, const QPrinter::Orientation& pageOrientation)
|
||||
const QPageSize& pageSize, const QPageLayout::Orientation& pageOrientation)
|
||||
|
||||
{
|
||||
QTextDocument doc;
|
||||
@@ -181,8 +181,8 @@ void printPDFImages(QWidget* dialogParent, const QString& docName, const QString
|
||||
QPrinter printer;
|
||||
|
||||
printer.setColorMode(QPrinter::ColorMode::Color);
|
||||
printer.setOrientation(QPrinter::Orientation::Portrait);
|
||||
printer.setPageSize(QPrinter::PageSize::A4);
|
||||
printer.setPageOrientation(QPageLayout::Portrait);
|
||||
printer.setPageSize(QPageSize(QPageSize::A4));
|
||||
QString fn = docName;
|
||||
fn = fn.remove(QLatin1Char(' '));
|
||||
fn = fn.remove(QLatin1String(".."));
|
||||
@@ -224,7 +224,7 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
|
||||
|
||||
doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
|
||||
dialogParent->windowTitle(), QPrinter::A3, QPrinter::Landscape);
|
||||
dialogParent->windowTitle(), QPageSize(QPageSize::A3), QPageLayout::Landscape);
|
||||
if (!nglPrinter.printer())
|
||||
return;
|
||||
|
||||
@@ -233,8 +233,8 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
|
||||
cursor.movePosition(QTextCursor::End);
|
||||
|
||||
report.setWidthForEndlessPrinter(0);
|
||||
report.setPageSize(QPrinter::A3);
|
||||
report.setOrientation(QPrinter::Landscape);
|
||||
report.setPageSize(QPageSize::A3);
|
||||
report.setPageOrientation(QPageLayout::Landscape);
|
||||
|
||||
LtsPrinting::Base::printReportData(doc, report);
|
||||
nglPrinter.print(&doc);
|
||||
@@ -249,8 +249,8 @@ void printWidget(LtsSession::LtsSession* session, QWidget* dialogParent, QWidget
|
||||
|
||||
QString windowTitle = dialogParent->windowTitle();
|
||||
doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A3,
|
||||
QPrinter::Landscape);
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
|
||||
QPageSize(QPageSize::A3), QPageLayout::Landscape);
|
||||
if (!nglPrinter.printer())
|
||||
return;
|
||||
|
||||
@@ -271,8 +271,8 @@ void printMessage(LtsSession::LtsSession* session, QWidget* dialogParent, const
|
||||
QString windowTitle = subject;
|
||||
|
||||
doc.setMetaInformation(QTextDocument::DocumentTitle, subject);
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
|
||||
QPrinter::Portrait);
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
|
||||
QPageSize(QPageSize::A4), QPageLayout::Portrait);
|
||||
|
||||
QString str = QString(QStringLiteral("<H2><strong>%1</strong> %2 </H2>")).arg(subject).arg(subjectContent);
|
||||
str.append(QString(QStringLiteral("<strong>%1</strong> %2<br>")).arg(time).arg(timeContent));
|
||||
@@ -302,8 +302,8 @@ void printStoryboard(LtsSession::LtsSession* session, QWidget* dialogParent, QAb
|
||||
QString windowTitle = dialogParent->windowTitle();
|
||||
doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
|
||||
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
|
||||
QPrinter::Portrait);
|
||||
LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
|
||||
QPageSize(QPageSize::A4), QPageLayout::Portrait);
|
||||
|
||||
if (!nglPrinter.printer())
|
||||
return;
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <QtPrintSupport/QPrinter>
|
||||
#include <QtGui/QPageSize>
|
||||
#include <QtGui/QPageLayout>
|
||||
|
||||
#ifndef LTSPRINTING_EXPORT
|
||||
#ifdef BUILD_STATIC_LIBRARIES
|
||||
@@ -42,13 +44,13 @@ LTSPRINTING_EXPORT void printStoryboard(LtsSession::LtsSession* session, QWidget
|
||||
|
||||
LTSPRINTING_EXPORT void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image,
|
||||
const QString& imageTitle, const QString& description,
|
||||
const QPrinter::PageSize& pageSize = QPrinter::A3,
|
||||
const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
|
||||
const QPageSize& pageSize = QPageSize(QPageSize::A3),
|
||||
const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);
|
||||
|
||||
LTSPRINTING_EXPORT void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
|
||||
QVector<QImage>& images, QVector<QString>& imageTitles,
|
||||
QVector<QString>& descriptions, const QPrinter::PageSize& pageSize = QPrinter::A3,
|
||||
const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
|
||||
QVector<QString>& descriptions, const QPageSize& pageSize = QPageSize(QPageSize::A3),
|
||||
const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);
|
||||
|
||||
LTSPRINTING_EXPORT void printPDFImages(QWidget* dialogParent, const QString& docName, const QString& printPath,
|
||||
QVector<QImage>& images);
|
||||
|
||||
@@ -50,8 +50,8 @@ Base::Base(QTextDocument &doc,
|
||||
QWidget *dialogParent,
|
||||
const QString &dialogTitle,
|
||||
const QString &_fn,
|
||||
QPrinter::PaperSize _ps,
|
||||
QPrinter::Orientation _or,
|
||||
QPageSize _ps,
|
||||
QPageLayout::Orientation _or,
|
||||
QPrinter::ColorMode _cm) : m_printer(new QPrinter),
|
||||
m_painter(new QPainter),
|
||||
m_iconFilenameNr(0),
|
||||
@@ -61,9 +61,9 @@ Base::Base(QTextDocument &doc,
|
||||
headersize_(10), headerrule_(0.5), headertext_(HeaderText),
|
||||
footersize_(10), footerrule_(0.5), footertext_(FooterText),
|
||||
itemFontSize_(2),
|
||||
m_settings(new NGL::Settings(NGL::findProjectConfigFile())).getNGLLogger("NGLPrinting")),
|
||||
m_currentPage(1),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
m_settings(new NGL::Settings(NGL::findProjectConfigFile())),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NGLPrinting")),
|
||||
m_currentPage(1)
|
||||
{
|
||||
QString fn = _fn;
|
||||
fn = fn.remove(QLatin1Char(' '));
|
||||
@@ -77,8 +77,8 @@ Base::Base(QTextDocument &doc,
|
||||
#endif
|
||||
m_printer->setOutputFormat(QPrinter::NativeFormat);
|
||||
|
||||
m_printer->setPaperSize(_ps);
|
||||
m_printer->setOrientation(_or);
|
||||
m_printer->setPageSize(_ps);
|
||||
m_printer->setPageOrientation(_or);
|
||||
m_printer->setColorMode(_cm);
|
||||
|
||||
m_printer->setFullPage(true);
|
||||
@@ -101,13 +101,13 @@ Base::Base(QTextDocument &doc,
|
||||
QAbstractPrintDialog::PrintCollateCopies;
|
||||
dialog->setOptions(op);
|
||||
QString title = dialogTitle;
|
||||
if (_ps == QPrinter::A2)
|
||||
if (_ps.id() == QPageSize::A2)
|
||||
title += QLatin1String(" (A2)");
|
||||
if (_ps == QPrinter::A3)
|
||||
if (_ps.id() == QPageSize::A3)
|
||||
title += QLatin1String(" (A3)");
|
||||
if (_ps == QPrinter::A4)
|
||||
if (_ps.id() == QPageSize::A4)
|
||||
title += QLatin1String(" (A4)");
|
||||
if (_ps == QPrinter::A5)
|
||||
if (_ps.id() == QPageSize::A5)
|
||||
title += QLatin1String(" (A5)");
|
||||
dialog->setWindowTitle(title);
|
||||
if (dialog->exec() != QDialog::Accepted)
|
||||
@@ -153,7 +153,7 @@ QString Base::styleSheet()
|
||||
|
||||
QSize Base::printerPageSize() const
|
||||
{
|
||||
return QSize(m_printer->pageRect().width() - 2 * DOC_MARGIN, m_printer->pageRect().height() - 2 * DOC_MARGIN);
|
||||
return QSize(m_printer->pageRect(QPrinter::Point).width() - 2 * DOC_MARGIN, m_printer->pageRect(QPrinter::Point).height() - 2 * DOC_MARGIN);
|
||||
}
|
||||
|
||||
bool Base::newPage()
|
||||
@@ -543,7 +543,7 @@ bool Base::printItemData(QString& str, const QAbstractItemModel* model, const QM
|
||||
displayString += vdata.toString();
|
||||
|
||||
QString fgColorString;
|
||||
vdata = model->data(mi, Qt::TextColorRole);
|
||||
vdata = model->data(mi, Qt::ForegroundRole);
|
||||
if (vdata.isValid())
|
||||
fgColorString = vdata.value<QColor>().name();
|
||||
|
||||
@@ -684,24 +684,24 @@ bool Base::printReportData(QTextDocument& doc, KDReports::Report& report)
|
||||
return true;
|
||||
}
|
||||
|
||||
QPrinter::PageSize Base::pageSize() const
|
||||
QPageSize Base::pageSize() const
|
||||
{
|
||||
return m_printer->pageSize();
|
||||
return m_printer->pageLayout().pageSize();
|
||||
}
|
||||
|
||||
void Base::setPageSize(QPrinter::PageSize size)
|
||||
void Base::setPageSize(QPageSize size)
|
||||
{
|
||||
m_printer->setPageSize(size);
|
||||
}
|
||||
|
||||
QPrinter::Orientation Base::orientation() const
|
||||
QPageLayout::Orientation Base::orientation() const
|
||||
{
|
||||
return m_printer->orientation();
|
||||
return m_printer->pageLayout().orientation();
|
||||
}
|
||||
|
||||
void Base::setOrientation(QPrinter::Orientation orientation)
|
||||
void Base::setOrientation(QPageLayout::Orientation orientation)
|
||||
{
|
||||
m_printer->setOrientation(orientation);
|
||||
m_printer->setPageOrientation(orientation);
|
||||
}
|
||||
|
||||
double Base::leftMargin() const
|
||||
@@ -711,7 +711,7 @@ double Base::leftMargin() const
|
||||
|
||||
void Base::setLeftMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
|
||||
leftmargin_ = margin;
|
||||
else
|
||||
leftmargin_ = 0;
|
||||
@@ -724,7 +724,7 @@ double Base::rightMargin() const
|
||||
|
||||
void Base::setRightMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
|
||||
rightmargin_ = margin;
|
||||
else
|
||||
rightmargin_ = 0;
|
||||
@@ -737,7 +737,7 @@ double Base::topMargin() const
|
||||
|
||||
void Base::setTopMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
|
||||
topmargin_ = margin;
|
||||
else
|
||||
topmargin_ = 0;
|
||||
@@ -750,7 +750,7 @@ double Base::bottomMargin() const
|
||||
|
||||
void Base::setBottomMargin(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
|
||||
bottommargin_ = margin;
|
||||
else
|
||||
bottommargin_ = 0;
|
||||
@@ -758,7 +758,7 @@ void Base::setBottomMargin(double margin)
|
||||
|
||||
void Base::setMargins(double margin)
|
||||
{
|
||||
if ((margin > 0) && (margin < m_printer->paperRect().height() / 2) && (margin < m_printer->paperRect().width() / 2))
|
||||
if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 2) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
|
||||
leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = margin;
|
||||
else
|
||||
leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = 0;
|
||||
@@ -771,7 +771,7 @@ double Base::spacing() const
|
||||
|
||||
void Base::setSpacing(double spacing)
|
||||
{
|
||||
if ((spacing > 0) && (spacing <= m_printer->paperRect().height() / 8))
|
||||
if ((spacing > 0) && (spacing <= m_printer->paperRect(QPrinter::Point).height() / 8))
|
||||
spacing_ = spacing;
|
||||
else
|
||||
spacing_ = 0;
|
||||
@@ -784,7 +784,7 @@ double Base::headerSize() const
|
||||
|
||||
void Base::setHeaderSize(double size)
|
||||
{
|
||||
if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
|
||||
if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
|
||||
headersize_ = size;
|
||||
else
|
||||
headersize_ = 0;
|
||||
@@ -817,7 +817,7 @@ double Base::footerSize() const
|
||||
|
||||
void Base::setFooterSize(double size)
|
||||
{
|
||||
if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
|
||||
if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
|
||||
footersize_ = size;
|
||||
else
|
||||
footersize_ = 0;
|
||||
@@ -851,7 +851,7 @@ void Base::setItemFontSize(int itemFontSize)
|
||||
QRectF Base::paperRect(QPaintDevice* device)
|
||||
{
|
||||
|
||||
QRectF rect = m_printer->paperRect();
|
||||
QRectF rect = m_printer->paperRect(QPrinter::Point);
|
||||
|
||||
rect.setWidth(rect.width() * device->logicalDpiX() / m_printer->logicalDpiX());
|
||||
rect.setHeight(rect.height() * device->logicalDpiY() / m_printer->logicalDpiY());
|
||||
@@ -930,7 +930,7 @@ void Base::printSinglePage()
|
||||
m_tempdoc->setPageSize(contentRect(m_printer).size());
|
||||
|
||||
QTextFrameFormat fmt = m_tempdoc->rootFrame()->frameFormat();
|
||||
fmt.setContentsMargins(0, 0, 0, 0);
|
||||
fmt.setMargin(0);
|
||||
m_tempdoc->rootFrame()->setFrameFormat(fmt);
|
||||
|
||||
int doccopies;
|
||||
@@ -938,11 +938,11 @@ void Base::printSinglePage()
|
||||
if (m_printer->collateCopies())
|
||||
{
|
||||
doccopies = 1;
|
||||
pagecopies = m_printer->numCopies();
|
||||
pagecopies = m_printer->copyCount();
|
||||
}
|
||||
else
|
||||
{
|
||||
doccopies = m_printer->numCopies();
|
||||
doccopies = m_printer->copyCount();
|
||||
pagecopies = 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
#include <QtCore/QSet>
|
||||
#include <QtPrintSupport/QPrinter>
|
||||
#include <QtGui/QPageSize>
|
||||
#include <QtGui/QPageLayout>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
@@ -50,7 +52,7 @@ class Base
|
||||
{
|
||||
public:
|
||||
Base(QTextDocument& doc, QWidget* dialogParent, const QString& dialogTitle, const QString& _fn,
|
||||
QPrinter::PaperSize _ps = QPrinter::A4, QPrinter::Orientation _or = QPrinter::Portrait,
|
||||
QPageSize _ps = QPageSize(QPageSize::A4), QPageLayout::Orientation _or = QPageLayout::Portrait,
|
||||
QPrinter::ColorMode _cm = QPrinter::Color);
|
||||
|
||||
virtual ~Base();
|
||||
@@ -61,13 +63,13 @@ class Base
|
||||
|
||||
static QString styleSheet();
|
||||
|
||||
QPrinter::PageSize pageSize() const;
|
||||
QPageSize pageSize() const;
|
||||
|
||||
void setPageSize(QPrinter::PageSize size);
|
||||
void setPageSize(QPageSize size);
|
||||
|
||||
QPrinter::Orientation orientation() const;
|
||||
QPageLayout::Orientation orientation() const;
|
||||
|
||||
void setOrientation(QPrinter::Orientation orientation);
|
||||
void setOrientation(QPageLayout::Orientation orientation);
|
||||
|
||||
bool newPage();
|
||||
|
||||
|
||||
+9
-3
@@ -175,7 +175,13 @@ bool CTS::DisconnectRequest::hasValidData() const
|
||||
return true;
|
||||
}
|
||||
|
||||
LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
|
||||
// Unqualified: we are already inside namespace LtsProjectionWorkstation, and the unity
|
||||
// build concatenates lts_projection_workstation.cpp (which declares
|
||||
// class LtsProjectionWorkstation in this same namespace) into this TU, so
|
||||
// "LtsProjectionWorkstation::ErrorMessage" would resolve to the class (which has no
|
||||
// such member) instead of the namespace. In a separate TU (legacy structure) the
|
||||
// class is not visible here and the qualified name resolved to the namespace.
|
||||
ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
|
||||
: Message(nullptr, nullptr, JsonKeys::ERROR_MESSAGE(), uuid, QJsonValue()), m_reason(reason)
|
||||
{
|
||||
QJsonObject result;
|
||||
@@ -183,7 +189,7 @@ LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const
|
||||
m_replyData = result;
|
||||
}
|
||||
|
||||
void LtsProjectionWorkstation::ErrorMessage::process()
|
||||
void ErrorMessage::process()
|
||||
{
|
||||
if (!m_handler || !m_client)
|
||||
return;
|
||||
@@ -192,7 +198,7 @@ void LtsProjectionWorkstation::ErrorMessage::process()
|
||||
m_handler->handleMessage(this);
|
||||
}
|
||||
|
||||
bool LtsProjectionWorkstation::ErrorMessage::hasValidData() const
|
||||
bool ErrorMessage::hasValidData() const
|
||||
{
|
||||
if (!m_handler || !m_client)
|
||||
return false;
|
||||
|
||||
@@ -916,6 +916,11 @@ void LtsSession::setExerciseData(const LtsWidgets::ExerciseData& exerciseData)
|
||||
emit signalExerciseDataChanged();
|
||||
}
|
||||
|
||||
const LtsWidgets::ExerciseData* LtsSession::exerciseData() const
|
||||
{
|
||||
return m_exerciseData;
|
||||
}
|
||||
|
||||
void LtsSession::setProfilePicture(const QPixmap& pixmap)
|
||||
{
|
||||
// partitionType(); ?!?
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "lts_session_lock_handler.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "Event.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "TimelineHeaderView.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "TimelineWidget.h"
|
||||
|
||||
|
||||
+14
@@ -53,6 +53,20 @@ NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
|
||||
REQUEST_HELPER_WITH_GUI
|
||||
)
|
||||
|
||||
# The dds_vector_to_pixmap free functions (iconFromSvg / pixmapFromIcon / ...) are
|
||||
# declared with LTSUTILSCORE_EXPORT, but this TU's include
|
||||
# <LtsUtils/LtsUtilsCore/ltsutilscore_export.h> resolves to the SOURCE-tree header,
|
||||
# where the macro expands to Q_DECL_IMPORT (empty on Linux) because
|
||||
# MAKE_LTSUTILSCORE_LIB is only defined when building LtsUtilsCore itself. Under the
|
||||
# project-wide -fvisibility=hidden they therefore compile as hidden symbols and, with
|
||||
# USE_IPO=ON, LTO drops them from the DSO entirely (they are unreferenced inside this
|
||||
# lib), breaking every consumer that links them (LtsMultiMonitor, LtsSession, ...).
|
||||
# Legacy exported them because its include <LtsUtilsCore/ltsutilscore_export.h>
|
||||
# resolved to the GENERATED export header (visibility("default")). Restore that
|
||||
# default visibility for this target only (same fix shape as the PluginInterfaces
|
||||
# visibility preset); behavior-neutral.
|
||||
set_target_properties(LtsUtilsGuiDds PROPERTIES CXX_VISIBILITY_PRESET default)
|
||||
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR HLA SV LtsUtilsDds SHARED request_helper.cpp request_helper.h)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds
|
||||
|
||||
@@ -183,6 +183,13 @@ NGL_INSTALL_TARGET(LtsWidgets)
|
||||
SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
|
||||
NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
|
||||
# ltswidgetsplugin.cpp unconditionally includes <LtsReportDisplay/lts_report_display_widget.h>,
|
||||
# which pulls KDReports -> #include <QPrinter>. In Qt6 that forwarding header lives in
|
||||
# <QtInc>/QtPrintSupport. With BUILD_CODIFICATION=OFF the LtsReportDisplay->KDReports
|
||||
# include chain is not built, so expose the QtPrintSupport module dir directly.
|
||||
if(DEFINED QT6_INC_DIR AND EXISTS "${QT6_INC_DIR}/QtPrintSupport")
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(ltswidgetsplugin PRIVATE "${QT6_INC_DIR}/QtPrintSupport")
|
||||
endif()
|
||||
NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
|
||||
NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
{
|
||||
const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
|
||||
if (entry.first)
|
||||
ids << entry.second.id();
|
||||
ids << entry.second.id;
|
||||
}
|
||||
|
||||
return ids;
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
{
|
||||
const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
|
||||
if (!entry.first)
|
||||
ids << entry.second.id();
|
||||
ids << entry.second.id;
|
||||
}
|
||||
|
||||
return ids;
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
for (int row = 0; row < LtsAbstractTableModel<T>::rowCount(); ++row)
|
||||
{
|
||||
T &entry = LtsAbstractTableModel<T>::m_vecData[row];
|
||||
bool bContains = vecCheckedIds.contains(entry.second.id());
|
||||
bool bContains = vecCheckedIds.contains(entry.second.id);
|
||||
if (entry.first != bContains)
|
||||
{
|
||||
entry.first = bContains;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "lts_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "lts_progress_dialog_helper.h"
|
||||
#include "lts_message_dialog.h"
|
||||
#include "lts_dialog_helper.h"
|
||||
|
||||
@@ -327,7 +327,7 @@ protected:
|
||||
*/
|
||||
void translate(T *ui, const S &data, const QString &custom, const QString &title) // same as 'void translate(T *ui, const S &data, const QString &title)', but for topics without the 'name' entry
|
||||
{
|
||||
translate(ui, QString::fromUtf8(typeid(data).name()), data.id(), custom /* can be empty */, title);
|
||||
translate(ui, QString::fromUtf8(typeid(data).name()), data.id, custom /* can be empty */, title);
|
||||
}
|
||||
|
||||
|
||||
@@ -341,7 +341,7 @@ protected:
|
||||
*/
|
||||
void translate(T *ui, const S &data, const QString &title)
|
||||
{
|
||||
translate(ui, data, QString::fromStdString(data.name()), title); // -> translate #5
|
||||
translate(ui, data, QString::fromStdString(data.name), title); // -> translate #5
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,142 +0,0 @@
|
||||
|
||||
|
||||
#include "requirement_widget.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
UiRequirement::UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
|
||||
const QString& userWarningMessage)
|
||||
: m_descriptionLabel(descriptionLabel), m_requirementCheck(requirementCheck), m_lastResult(true),
|
||||
m_userWarningMessage(userWarningMessage)
|
||||
{
|
||||
retranslate();
|
||||
}
|
||||
|
||||
void UiRequirement::reset()
|
||||
{
|
||||
if (!isValid())
|
||||
return;
|
||||
m_descriptionLabel->setText(m_originalText);
|
||||
m_descriptionLabel->setToolTip(m_originalTooltip);
|
||||
}
|
||||
|
||||
void UiRequirement::setTexts()
|
||||
{
|
||||
if (!isValid())
|
||||
return;
|
||||
if (!m_lastResult)
|
||||
{
|
||||
m_descriptionLabel->setText(
|
||||
QStringLiteral("<span style=\"color:#aa0000;\">\u2022 %1</span>").arg(m_originalText));
|
||||
|
||||
if (!m_userWarningMessage.isEmpty())
|
||||
{
|
||||
m_descriptionLabel->setCursor(Qt::WhatsThisCursor);
|
||||
m_descriptionLabel->setToolTip(m_userWarningMessage);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
|
||||
return;
|
||||
|
||||
m_descriptionLabel->setText(QStringLiteral("\u2022 %1").arg(m_originalText));
|
||||
m_descriptionLabel->setCursor(Qt::ArrowCursor);
|
||||
m_descriptionLabel->setToolTip(m_originalTooltip);
|
||||
}
|
||||
}
|
||||
|
||||
void UiRequirement::retranslate()
|
||||
{
|
||||
if (!isValid())
|
||||
return;
|
||||
|
||||
if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
|
||||
return;
|
||||
|
||||
auto x = m_descriptionLabel->text();
|
||||
if (x.startsWith(QStringLiteral("\u2022 ")))
|
||||
return;
|
||||
|
||||
m_originalText = x;
|
||||
|
||||
m_originalTooltip = m_descriptionLabel->toolTip();
|
||||
setTexts();
|
||||
}
|
||||
|
||||
bool UiRequirement::checkRequirement()
|
||||
{
|
||||
if (!isValid())
|
||||
return m_lastResult;
|
||||
|
||||
m_lastResult = m_requirementCheck();
|
||||
|
||||
if (!m_descriptionLabel->isVisible() && !m_descriptionLabel->property("checkMe").toBool())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
setTexts();
|
||||
|
||||
return m_lastResult;
|
||||
}
|
||||
|
||||
bool UiRequirementList::checkRequirements(QWidget* messageOnThisParent)
|
||||
{
|
||||
bool result = true;
|
||||
for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
|
||||
{
|
||||
UiRequirement& r = (*i);
|
||||
|
||||
if (!r.isValid())
|
||||
continue;
|
||||
|
||||
if (!r.checkRequirement())
|
||||
{
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (!result && messageOnThisParent)
|
||||
{
|
||||
LtsWidgets::LtsMessageDialog::showMessage(
|
||||
messageOnThisParent,
|
||||
QApplication::translate("LtsWidgets::LtsDialog",
|
||||
"There are elements that have invalid or no value.<br>"
|
||||
"Please change values in the elements which are marked with red text."),
|
||||
QApplication::translate("LtsWidgets::LtsDialog", "Operation not complete"));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void UiRequirementList::addRequirement(const UiRequirement& uiRequirement)
|
||||
{
|
||||
m_requirementList.append(uiRequirement);
|
||||
}
|
||||
|
||||
void UiRequirementList::clear()
|
||||
{
|
||||
for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
|
||||
{
|
||||
UiRequirement& uir = *i;
|
||||
uir.reset();
|
||||
}
|
||||
|
||||
m_requirementList.clear();
|
||||
}
|
||||
|
||||
void UiRequirementList::retranslate()
|
||||
{
|
||||
for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
|
||||
{
|
||||
UiRequirement& r = (*i);
|
||||
|
||||
r.retranslate();
|
||||
}
|
||||
}
|
||||
} // namespace LtsWidgets
|
||||
@@ -1,62 +0,0 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "lts_widgets_export.h"
|
||||
|
||||
#include <QtCore/QVector>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <functional>
|
||||
|
||||
class QLabel;
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
class LTSWIDGETS_EXPORT UiRequirement
|
||||
{
|
||||
public:
|
||||
explicit UiRequirement() = default;
|
||||
|
||||
UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
|
||||
const QString& userWarningMessage = QString());
|
||||
|
||||
void reset();
|
||||
|
||||
bool checkRequirement();
|
||||
|
||||
bool isValid() const
|
||||
{
|
||||
return m_descriptionLabel != nullptr;
|
||||
}
|
||||
|
||||
void retranslate();
|
||||
|
||||
private:
|
||||
void setTexts();
|
||||
|
||||
QLabel* m_descriptionLabel;
|
||||
std::function<bool()> m_requirementCheck;
|
||||
QString m_originalText;
|
||||
QString m_originalTooltip;
|
||||
bool m_lastResult;
|
||||
QString m_userWarningMessage;
|
||||
};
|
||||
|
||||
class LTSWIDGETS_EXPORT UiRequirementList
|
||||
{
|
||||
public:
|
||||
UiRequirementList() = default;
|
||||
|
||||
bool checkRequirements(QWidget* messageOnThisParent = nullptr);
|
||||
|
||||
void addRequirement(const UiRequirement& uiRequirement);
|
||||
|
||||
void clear();
|
||||
|
||||
void retranslate();
|
||||
|
||||
private:
|
||||
QVector<UiRequirement> m_requirementList;
|
||||
};
|
||||
} // namespace LtsWidgets
|
||||
@@ -51,8 +51,27 @@ ADD_LIBRARY(TopicReplayInterface SHARED
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.cpp
|
||||
)
|
||||
TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC
|
||||
TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/TopicEditorBase # topiceditorbase_export.h
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(TopicReplayInterface PUBLIC Qt6::Core TopicEditorBase)
|
||||
|
||||
# These interface base classes (e.g. DataPluginBase::Plugin) are Q_OBJECT classes. The top-level
|
||||
# CMAKE_CXX_VISIBILITY_PRESET hidden compiles their Q_OBJECT meta symbols (staticMetaObject/vtable/
|
||||
# qt_metacall/typeinfo) as GLOBAL HIDDEN, so they are not exported from the .so. A cross-DSO
|
||||
# subclass (e.g. AsbDataPlugin) then fails with "undefined reference to ...::staticMetaObject".
|
||||
# Compile these interface libs with default visibility so the meta symbols are exported to consumers
|
||||
# (the legacy build, without LTO, exported them). This only widens the export surface of these tiny
|
||||
# interface libs; it changes no runtime behaviour.
|
||||
set_target_properties(
|
||||
DataPluginInterface
|
||||
GuiPluginInterface
|
||||
ProjectPluginInterface
|
||||
StylePluginInterface
|
||||
RecordReplayPlugin
|
||||
TopicReplayInterface
|
||||
PROPERTIES
|
||||
CXX_VISIBILITY_PRESET default
|
||||
CXX_VISIBILITY_INLINES_HIDDEN OFF
|
||||
)
|
||||
@@ -132,12 +132,12 @@ class Interface
|
||||
|
||||
protected:
|
||||
LtsSession::LtsSession* m_session;
|
||||
NGL::INGLLogger& m_logger;
|
||||
|
||||
private:
|
||||
QFlags<LtsAppDescriptor::PluginInfo::Flag> m_flags;
|
||||
QStringList m_options;
|
||||
LtsAppDescriptor::App m_appId;
|
||||
NGL::INGLLogger& m_logger;
|
||||
};
|
||||
|
||||
} // namespace GuiPluginBase
|
||||
|
||||
@@ -45,6 +45,7 @@ NGL_ADD_LIBRARY2(WS TopicEditorBase SHARED ${topic_editor_base_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR} # topiceditorbase_export.h (generated here)
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
|
||||
${CMAKE_BINARY_DIR}/Z/src/NGLLogger # ngllogger_export.h
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
#include "topic_editor_utils.h"
|
||||
#include "topiceditorbase_export.h"
|
||||
#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/promise.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "topiceditorbase_export.h"
|
||||
#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
|
||||
|
||||
#include <LtsScriptTimeline/track_entry.h>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "topic_editor_utils.h"
|
||||
#include "topiceditorbase_export.h"
|
||||
#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
#include "topic_editor_utils.h"
|
||||
#include "topiceditorbase_export.h"
|
||||
#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
Reference in new issue
Block a user