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:
1718 files changed
+126739
-18495
No files matched your search
+1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "scr_gui_plugin.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "screen_recording_dialog.h"
|
||||
#include "screen_recording_worker.h"
|
||||
|
||||
|
||||
+8
-8
@@ -18,7 +18,7 @@ namespace ScreenRecording
|
||||
ScreenRecordingDialog::ScreenRecordingDialog(const QString &menuGroup, QWidget *parent, const LtsWidgets::Behaviour &behaviour)
|
||||
: LtsFramelessDialog(parent, behaviour)
|
||||
, m_ui(new Ui::ScreenRecordingDialog)
|
||||
.getNGLLogger("ScreenRecording"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
Q_UNUSED(menuGroup);
|
||||
|
||||
@@ -94,24 +94,24 @@ void ScreenRecordingDialog::onBrowseRecordingFile()
|
||||
void ScreenRecordingDialog::onChangeRecordingArea()
|
||||
{
|
||||
QWidget *mainWidgetPtr = m_baseLayoutPtr->getTabFromLayoutArea(LtsWidgets::LayoutArea::eMainTab);
|
||||
QPoint point = m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal({})
|
||||
: m_baseLayoutPtr->getTabFromLayoutArea(LtsWidgets::LayoutArea::eInfoTab)->mapToGlobal({});
|
||||
QPoint point = m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal(QPoint())
|
||||
: m_baseLayoutPtr->getTabFromLayoutArea(LtsWidgets::LayoutArea::eInfoTab)->mapToGlobal(QPoint());
|
||||
QSize size = {m_baseLayoutPtr->width(),
|
||||
m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->height() : m_baseLayoutPtr->getMenu()->height()};
|
||||
|
||||
switch (m_ui->cobRecordingArea->currentData().value<ScreenRecordingWorker::RecordingArea>())
|
||||
{
|
||||
case ScreenRecordingWorker::RecordingArea::MainArea:
|
||||
point = {mainWidgetPtr->mapToGlobal({}).x(),
|
||||
m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal({}).y()
|
||||
: mainWidgetPtr->mapToGlobal({}).y()};
|
||||
point = {mainWidgetPtr->mapToGlobal(QPoint()).x(),
|
||||
m_ui->chbRecordTitleBar->isChecked() ? m_baseLayoutPtr->mapToGlobal(QPoint()).y()
|
||||
: mainWidgetPtr->mapToGlobal(QPoint()).y()};
|
||||
size = {mainWidgetPtr->width(),
|
||||
m_ui->chbRecordTitleBar->isChecked() ? mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomLeft()).y() - m_baseLayoutPtr->mapToGlobal({}).y() + 1
|
||||
m_ui->chbRecordTitleBar->isChecked() ? mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomLeft()).y() - m_baseLayoutPtr->mapToGlobal(QPoint()).y() + 1
|
||||
: mainWidgetPtr->height()};
|
||||
break;
|
||||
|
||||
case ScreenRecordingWorker::RecordingArea::LeftOfMenu:
|
||||
size.setWidth(mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomRight()).x() - m_baseLayoutPtr->mapToGlobal({}).x() + 1);
|
||||
size.setWidth(mainWidgetPtr->mapToGlobal(mainWidgetPtr->geometry().bottomRight()).x() - m_baseLayoutPtr->mapToGlobal(QPoint()).x() + 1);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
+2
-2
@@ -169,7 +169,7 @@ const QStringList ScreenRecordingWorker::s_imageFormats = { QLatin1String("jpg")
|
||||
|
||||
ScreenRecordingWorker::ScreenRecordingWorker(QObject *parent)
|
||||
: QObject(parent)
|
||||
.getNGLLogger("ScreenRecording"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
QDir tmpRecordingDir(s_recordingTmpDir);
|
||||
if (!tmpRecordingDir.exists())
|
||||
@@ -196,7 +196,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
|
||||
args << QLatin1String("-f") << QLatin1String("x11grab");
|
||||
args << QLatin1String("-s") << (QString::number(baseLayout->geometry().width()) + QLatin1String("x") + QString::number(baseLayout->geometry().height()));
|
||||
args << QLatin1String("-r") << QString::number(1);
|
||||
args << QLatin1String("-i") << (DISPLAY + QString::number(baseLayout->mapToGlobal({}).x()) + QLatin1String(",") + QString::number(baseLayout->mapToGlobal({}).y()));
|
||||
args << QLatin1String("-i") << (DISPLAY + QString::number(baseLayout->mapToGlobal(QPoint()).x()) + QLatin1String(",") + QString::number(baseLayout->mapToGlobal(QPoint()).y()));
|
||||
args << QLatin1String("-vframes") << QString::number(1);
|
||||
args << fileInfo.absoluteFilePath();
|
||||
|
||||
|
||||
Reference in new issue
Block a user