mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 00:53:53 +02:00
2021-07-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogedit(1) that caused the 'Audio Parameters' controls to fail to be disabled when the 'Render To' control was set to 'Cart/Cut'. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
#include <qpushbutton.h>
|
||||
|
||||
#include <rdconf.h>
|
||||
#include <rdexport_settings_dialog.h>
|
||||
#include <rdrenderer.h>
|
||||
|
||||
#include "render_dialog.h"
|
||||
@@ -48,6 +47,7 @@ RenderDialog::RenderDialog(QWidget *parent)
|
||||
//
|
||||
// Dialogs
|
||||
//
|
||||
render_settings_dialog=new RDExportSettingsDialog("RDLogEdit",this);
|
||||
render_progress_dialog=
|
||||
new QProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,0,this);
|
||||
render_progress_dialog->setWindowTitle(tr("Render Progress"));
|
||||
@@ -164,6 +164,8 @@ RenderDialog::RenderDialog(QWidget *parent)
|
||||
|
||||
RenderDialog::~RenderDialog()
|
||||
{
|
||||
delete render_progress_dialog;
|
||||
delete render_settings_dialog;
|
||||
}
|
||||
|
||||
|
||||
@@ -245,11 +247,9 @@ void RenderDialog::starttimeSourceData(int item)
|
||||
|
||||
void RenderDialog::audiosettingsData()
|
||||
{
|
||||
RDExportSettingsDialog *d=new RDExportSettingsDialog("RDLogEdit",this);
|
||||
if(d->exec(render_settings)) {
|
||||
if(render_settings_dialog->exec(render_settings)) {
|
||||
render_audiosettings_edit->setText(render_settings->description());
|
||||
}
|
||||
delete d;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -26,6 +26,7 @@
|
||||
|
||||
#include <rdcut_dialog.h>
|
||||
#include <rddialog.h>
|
||||
#include <rdexport_settings_dialog.h>
|
||||
#include <rdlogmodel.h>
|
||||
|
||||
//
|
||||
@@ -60,14 +61,12 @@ class RenderDialog : public RDDialog
|
||||
void resizeEvent(QResizeEvent *e);
|
||||
|
||||
private:
|
||||
// RDStation *render_station;
|
||||
// RDSystem *render_system;
|
||||
// RDConfig *render_config;
|
||||
RDUser *render_user;
|
||||
RDLogModel *render_model;
|
||||
int render_first_line;
|
||||
int render_last_line;
|
||||
RDSettings *render_settings;
|
||||
RDExportSettingsDialog *render_settings_dialog;
|
||||
RDCutDialog *render_cut_dialog;
|
||||
QProgressDialog *render_progress_dialog;
|
||||
QLabel *render_to_label;
|
||||
|
Reference in New Issue
Block a user