From 99c7266a1965c8919ad0e4fff1e63d5d951b05bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Fri, 1 Mar 2024 23:35:21 +0100 Subject: [PATCH] Queue: Fix missing labels on project load Fix the annoying -none- issue Ref: #119 --- src/app/GUI/RenderWidgets/renderinstancewidget.cpp | 10 ++++++++++ src/app/GUI/RenderWidgets/renderinstancewidget.h | 2 ++ src/app/GUI/RenderWidgets/renderwidget.cpp | 7 +++++++ src/app/GUI/RenderWidgets/renderwidget.h | 1 + src/app/evfileio.cpp | 1 + 5 files changed, 21 insertions(+) diff --git a/src/app/GUI/RenderWidgets/renderinstancewidget.cpp b/src/app/GUI/RenderWidgets/renderinstancewidget.cpp index 546f7c207..458216b0a 100755 --- a/src/app/GUI/RenderWidgets/renderinstancewidget.cpp +++ b/src/app/GUI/RenderWidgets/renderinstancewidget.cpp @@ -26,6 +26,7 @@ #include "renderinstancewidget.h" #include "GUI/global.h" #include +#include "canvas.h" #include "outputsettingsdialog.h" #include "outputsettingsprofilesdialog.h" #include "outputsettingsdisplaywidget.h" @@ -389,6 +390,15 @@ void RenderInstanceWidget::read(eReadStream &src) { setChecked(checked); } +void RenderInstanceWidget::updateRenderSettings() +{ + const RenderSettings &renderSettings = mSettings.getRenderSettings(); + mRenderSettingsDisplayWidget->setRenderSettings(mSettings.getTargetCanvas(), + renderSettings); + const auto label = mSettings.getTargetCanvas()->prp_getName(); + if (!label.isEmpty()) { mNameLabel->setText(label); } +} + #include "Private/esettings.h" OutputProfilesListButton::OutputProfilesListButton(RenderInstanceWidget *parent) : QPushButton(parent) { diff --git a/src/app/GUI/RenderWidgets/renderinstancewidget.h b/src/app/GUI/RenderWidgets/renderinstancewidget.h index 3aa451d83..c6de37401 100755 --- a/src/app/GUI/RenderWidgets/renderinstancewidget.h +++ b/src/app/GUI/RenderWidgets/renderinstancewidget.h @@ -60,6 +60,8 @@ class RenderInstanceWidget : public ClosableContainer { void write(eWriteStream &dst) const; void read(eReadStream &src); + void updateRenderSettings(); + protected: void mousePressEvent(QMouseEvent* e); private: diff --git a/src/app/GUI/RenderWidgets/renderwidget.cpp b/src/app/GUI/RenderWidgets/renderwidget.cpp index 33921e75f..d21fbc604 100755 --- a/src/app/GUI/RenderWidgets/renderwidget.cpp +++ b/src/app/GUI/RenderWidgets/renderwidget.cpp @@ -289,6 +289,13 @@ void RenderWidget::read(eReadStream &src) } } +void RenderWidget::updateRenderSettings() +{ + for (const auto &wid: mRenderInstanceWidgets) { + wid->updateRenderSettings(); + } +} + void RenderWidget::render(RenderInstanceSettings &settings) { const RenderSettings &renderSettings = settings.getRenderSettings(); diff --git a/src/app/GUI/RenderWidgets/renderwidget.h b/src/app/GUI/RenderWidgets/renderwidget.h index 2e4afc24c..36708fbf6 100755 --- a/src/app/GUI/RenderWidgets/renderwidget.h +++ b/src/app/GUI/RenderWidgets/renderwidget.h @@ -51,6 +51,7 @@ class RenderWidget : public QWidget void clearRenderQueue(); void write(eWriteStream& dst) const; void read(eReadStream& src); + void updateRenderSettings(); signals: void progress(int frame, int total); diff --git a/src/app/evfileio.cpp b/src/app/evfileio.cpp index 015963d45..ff1eb172b 100755 --- a/src/app/evfileio.cpp +++ b/src/app/evfileio.cpp @@ -111,6 +111,7 @@ void MainWindow::loadEVFile(const QString &path) { } file.close(); addRecentFile(path); + mRenderWidget->updateRenderSettings(); } void MainWindow::saveToFile(const QString &path,