mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 05:00:06 -05:00
--Bug fixes
-Preserve prefix and suffix fields between open/close of the Final Render dialog.
This commit is contained in:
parent
61ddc06151
commit
83ce2a29cb
@ -2,6 +2,10 @@
|
||||
#include "FinalRenderDialog.h"
|
||||
#include "Fractorium.h"
|
||||
|
||||
QString FractoriumFinalRenderDialog::m_Prefix = "";
|
||||
QString FractoriumFinalRenderDialog::m_Suffix = "";
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Constructor which sets up the GUI for the final rendering dialog.
|
||||
/// Settings used to populate widgets with initial values.
|
||||
@ -83,8 +87,10 @@ FractoriumFinalRenderDialog::FractoriumFinalRenderDialog(QWidget* p, Qt::WindowF
|
||||
connect(m_Tbcw->m_Button2, SIGNAL(clicked(bool)), this, SLOT(OnShowFolderButtonClicked(bool)), Qt::QueuedConnection);
|
||||
connect(m_Tbcw->m_Combo, SIGNAL(currentIndexChanged(int)), this, SLOT(OnExtIndexChanged(int)), Qt::QueuedConnection);
|
||||
m_PrefixEdit = new QLineEdit(table);
|
||||
m_PrefixEdit->setText(m_Prefix);
|
||||
table->setCellWidget(row++, 1, m_PrefixEdit);
|
||||
m_SuffixEdit = new QLineEdit(table);
|
||||
m_SuffixEdit->setText(m_Suffix);
|
||||
table->setCellWidget(row++, 1, m_SuffixEdit);
|
||||
connect(m_PrefixEdit, SIGNAL(textChanged(const QString&)), this, SLOT(OnPrefixChanged(const QString&)), Qt::QueuedConnection);
|
||||
connect(m_SuffixEdit, SIGNAL(textChanged(const QString&)), this, SLOT(OnSuffixChanged(const QString&)), Qt::QueuedConnection);
|
||||
@ -274,6 +280,12 @@ FractoriumFinalRenderDialog::FractoriumFinalRenderDialog(QWidget* p, Qt::WindowF
|
||||
w = SetTabOrder(this, w, ui.FinalRenderCloseButton);
|
||||
}
|
||||
|
||||
FractoriumFinalRenderDialog::~FractoriumFinalRenderDialog()
|
||||
{
|
||||
m_Prefix = m_PrefixEdit->text();
|
||||
m_Suffix = m_SuffixEdit->text();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Show the final render dialog and specify whether it was called from the toolbar or the sequence render button.
|
||||
/// </summary>
|
||||
|
@ -51,6 +51,7 @@ class FractoriumFinalRenderDialog : public QDialog
|
||||
|
||||
public:
|
||||
FractoriumFinalRenderDialog(QWidget* p, Qt::WindowFlags f = 0);
|
||||
~FractoriumFinalRenderDialog();
|
||||
void Show(bool fromSequence);
|
||||
bool EarlyClip();
|
||||
bool YAxisUp();
|
||||
@ -125,6 +126,8 @@ protected:
|
||||
private:
|
||||
bool CreateControllerFromGUI(bool createRenderer);
|
||||
bool SetMemory();
|
||||
static QString m_Prefix;
|
||||
static QString m_Suffix;
|
||||
|
||||
bool m_FromSequence;
|
||||
int m_MemoryCellIndex;
|
||||
|
Loading…
Reference in New Issue
Block a user