Removed "use 10-Bit encoding" from preferences. Also updated Help screen to show the help for the *selected* encoder.
This commit is contained in:
parent
5d9c70db03
commit
7ed6499ff2
@ -42,7 +42,6 @@ void PreferencesModel::initPreferences(PreferencesModel *preferences)
|
|||||||
preferences->m_autoRunNextJob = true;
|
preferences->m_autoRunNextJob = true;
|
||||||
preferences->m_maxRunningJobCount = 1;
|
preferences->m_maxRunningJobCount = 1;
|
||||||
preferences->m_shutdownComputer = false;
|
preferences->m_shutdownComputer = false;
|
||||||
preferences->m_use10BitEncoding = false;
|
|
||||||
preferences->m_useAvisyth64Bit = false;
|
preferences->m_useAvisyth64Bit = false;
|
||||||
preferences->m_saveLogFiles = false;
|
preferences->m_saveLogFiles = false;
|
||||||
preferences->m_saveToSourcePath = false;
|
preferences->m_saveToSourcePath = false;
|
||||||
@ -63,7 +62,6 @@ void PreferencesModel::loadPreferences(PreferencesModel *preferences)
|
|||||||
preferences->m_autoRunNextJob = settings.value("auto_run_next_job", QVariant(defaults.m_autoRunNextJob)).toBool();
|
preferences->m_autoRunNextJob = settings.value("auto_run_next_job", QVariant(defaults.m_autoRunNextJob)).toBool();
|
||||||
preferences->m_maxRunningJobCount = qBound(1U, settings.value("max_running_job_count", QVariant(defaults.m_maxRunningJobCount)).toUInt(), 16U);
|
preferences->m_maxRunningJobCount = qBound(1U, settings.value("max_running_job_count", QVariant(defaults.m_maxRunningJobCount)).toUInt(), 16U);
|
||||||
preferences->m_shutdownComputer = settings.value("shutdown_computer_on_completion", QVariant(defaults.m_shutdownComputer)).toBool();
|
preferences->m_shutdownComputer = settings.value("shutdown_computer_on_completion", QVariant(defaults.m_shutdownComputer)).toBool();
|
||||||
preferences->m_use10BitEncoding = settings.value("use_10bit_encoding", QVariant(defaults.m_use10BitEncoding)).toBool();
|
|
||||||
preferences->m_useAvisyth64Bit = settings.value("use_64bit_avisynth", QVariant(defaults.m_useAvisyth64Bit)).toBool();
|
preferences->m_useAvisyth64Bit = settings.value("use_64bit_avisynth", QVariant(defaults.m_useAvisyth64Bit)).toBool();
|
||||||
preferences->m_saveLogFiles = settings.value("save_log_files", QVariant(defaults.m_saveLogFiles)).toBool();
|
preferences->m_saveLogFiles = settings.value("save_log_files", QVariant(defaults.m_saveLogFiles)).toBool();
|
||||||
preferences->m_saveToSourcePath = settings.value("save_to_source_path", QVariant(defaults.m_saveToSourcePath)).toBool();
|
preferences->m_saveToSourcePath = settings.value("save_to_source_path", QVariant(defaults.m_saveToSourcePath)).toBool();
|
||||||
@ -82,7 +80,6 @@ void PreferencesModel::savePreferences(PreferencesModel *preferences)
|
|||||||
settings.setValue("auto_run_next_job", preferences->m_autoRunNextJob);
|
settings.setValue("auto_run_next_job", preferences->m_autoRunNextJob);
|
||||||
settings.setValue("shutdown_computer_on_completion", preferences->m_shutdownComputer);
|
settings.setValue("shutdown_computer_on_completion", preferences->m_shutdownComputer);
|
||||||
settings.setValue("max_running_job_count", preferences->m_maxRunningJobCount);
|
settings.setValue("max_running_job_count", preferences->m_maxRunningJobCount);
|
||||||
settings.setValue("use_10bit_encoding", preferences->m_use10BitEncoding);
|
|
||||||
settings.setValue("use_64bit_avisynth", preferences->m_useAvisyth64Bit);
|
settings.setValue("use_64bit_avisynth", preferences->m_useAvisyth64Bit);
|
||||||
settings.setValue("save_log_files", preferences->m_saveLogFiles);
|
settings.setValue("save_log_files", preferences->m_saveLogFiles);
|
||||||
settings.setValue("save_to_source_path", preferences->m_saveToSourcePath);
|
settings.setValue("save_to_source_path", preferences->m_saveToSourcePath);
|
||||||
|
@ -30,7 +30,6 @@ public:
|
|||||||
bool autoRunNextJob(void) { return m_autoRunNextJob; }
|
bool autoRunNextJob(void) { return m_autoRunNextJob; }
|
||||||
unsigned int maxRunningJobCount(void) { return m_maxRunningJobCount; }
|
unsigned int maxRunningJobCount(void) { return m_maxRunningJobCount; }
|
||||||
bool shutdownComputer(void) { return m_shutdownComputer; }
|
bool shutdownComputer(void) { return m_shutdownComputer; }
|
||||||
bool use10BitEncoding(void) { return m_use10BitEncoding; }
|
|
||||||
bool useAvisyth64Bit(void) { return m_useAvisyth64Bit; }
|
bool useAvisyth64Bit(void) { return m_useAvisyth64Bit; }
|
||||||
bool saveLogFiles(void) { return m_saveLogFiles; }
|
bool saveLogFiles(void) { return m_saveLogFiles; }
|
||||||
bool saveToSourcePath(void) { return m_saveToSourcePath; }
|
bool saveToSourcePath(void) { return m_saveToSourcePath; }
|
||||||
@ -43,7 +42,6 @@ public:
|
|||||||
void setAutoRunNextJob(const bool autoRunNextJob) { m_autoRunNextJob = autoRunNextJob; }
|
void setAutoRunNextJob(const bool autoRunNextJob) { m_autoRunNextJob = autoRunNextJob; }
|
||||||
void setMaxRunningJobCount(const unsigned int maxRunningJobCount) { m_maxRunningJobCount = maxRunningJobCount; }
|
void setMaxRunningJobCount(const unsigned int maxRunningJobCount) { m_maxRunningJobCount = maxRunningJobCount; }
|
||||||
void setShutdownComputer(const bool shutdownComputer) { m_shutdownComputer = shutdownComputer; }
|
void setShutdownComputer(const bool shutdownComputer) { m_shutdownComputer = shutdownComputer; }
|
||||||
void setUse10BitEncoding(const bool use10BitEncoding) { m_use10BitEncoding = use10BitEncoding; }
|
|
||||||
void setUseAvisyth64Bit(const bool useAvisyth64Bit) { m_useAvisyth64Bit = useAvisyth64Bit; }
|
void setUseAvisyth64Bit(const bool useAvisyth64Bit) { m_useAvisyth64Bit = useAvisyth64Bit; }
|
||||||
void setSaveLogFiles(const bool saveLogFiles) { m_saveLogFiles = saveLogFiles; }
|
void setSaveLogFiles(const bool saveLogFiles) { m_saveLogFiles = saveLogFiles; }
|
||||||
void setSaveToSourcePath(const bool saveToSourcePath) { m_saveToSourcePath = saveToSourcePath; }
|
void setSaveToSourcePath(const bool saveToSourcePath) { m_saveToSourcePath = saveToSourcePath; }
|
||||||
@ -61,7 +59,6 @@ protected:
|
|||||||
bool m_autoRunNextJob;
|
bool m_autoRunNextJob;
|
||||||
unsigned int m_maxRunningJobCount;
|
unsigned int m_maxRunningJobCount;
|
||||||
bool m_shutdownComputer;
|
bool m_shutdownComputer;
|
||||||
bool m_use10BitEncoding;
|
|
||||||
bool m_useAvisyth64Bit;
|
bool m_useAvisyth64Bit;
|
||||||
bool m_saveLogFiles;
|
bool m_saveLogFiles;
|
||||||
bool m_saveToSourcePath;
|
bool m_saveToSourcePath;
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#define VER_X264_MAJOR 2
|
#define VER_X264_MAJOR 2
|
||||||
#define VER_X264_MINOR 3
|
#define VER_X264_MINOR 3
|
||||||
#define VER_X264_PATCH 1
|
#define VER_X264_PATCH 1
|
||||||
#define VER_X264_BUILD 758
|
#define VER_X264_BUILD 761
|
||||||
|
|
||||||
#define VER_X264_MINIMUM_REV 2380
|
#define VER_X264_MINIMUM_REV 2380
|
||||||
#define VER_X264_CURRENT_API 142
|
#define VER_X264_CURRENT_API 142
|
||||||
|
@ -76,17 +76,21 @@
|
|||||||
WIDGET->addAction(_action); \
|
WIDGET->addAction(_action); \
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ENABLE_SIGNALS(Ui::AddJobDialog *ui, const bool &flag)
|
#define BLOCK_SIGNALS(FLAG) do \
|
||||||
{
|
{ \
|
||||||
ui->cbxRateControlMode->blockSignals(flag);
|
ui->cbxEncoderType->blockSignals(FLAG); \
|
||||||
ui->spinQuantizer->blockSignals(flag);
|
ui->cbxEncoderArch->blockSignals(FLAG); \
|
||||||
ui->spinBitrate->blockSignals(flag);
|
ui->cbxEncoderVariant->blockSignals(FLAG); \
|
||||||
ui->cbxPreset->blockSignals(flag);
|
ui->cbxRateControlMode->blockSignals(FLAG); \
|
||||||
ui->cbxTuning->blockSignals(flag);
|
ui->spinQuantizer->blockSignals(FLAG); \
|
||||||
ui->cbxProfile->blockSignals(flag);
|
ui->spinBitrate->blockSignals(FLAG); \
|
||||||
ui->editCustomX264Params->blockSignals(flag);
|
ui->cbxPreset->blockSignals(FLAG); \
|
||||||
ui->editCustomAvs2YUVParams->blockSignals(flag);
|
ui->cbxTuning->blockSignals(FLAG); \
|
||||||
}
|
ui->cbxProfile->blockSignals(FLAG); \
|
||||||
|
ui->editCustomX264Params->blockSignals(FLAG); \
|
||||||
|
ui->editCustomAvs2YUVParams->blockSignals(FLAG); \
|
||||||
|
} \
|
||||||
|
while(0)
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Validator
|
// Validator
|
||||||
@ -214,13 +218,12 @@ public:
|
|||||||
// Constructor & Destructor
|
// Constructor & Destructor
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *options, RecentlyUsed *recentlyUsed, bool x64supported, bool use10BitEncoding, bool saveToSourceFolder)
|
AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *options, RecentlyUsed *recentlyUsed, bool x64supported, bool saveToSourceFolder)
|
||||||
:
|
:
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
m_defaults(new OptionsModel()),
|
m_defaults(new OptionsModel()),
|
||||||
m_options(options),
|
m_options(options),
|
||||||
m_x64supported(x64supported),
|
m_x64supported(x64supported),
|
||||||
m_use10BitEncoding(use10BitEncoding),
|
|
||||||
m_saveToSourceFolder(saveToSourceFolder),
|
m_saveToSourceFolder(saveToSourceFolder),
|
||||||
m_recentlyUsed(recentlyUsed),
|
m_recentlyUsed(recentlyUsed),
|
||||||
ui(new Ui::AddJobDialog())
|
ui(new Ui::AddJobDialog())
|
||||||
@ -262,6 +265,9 @@ AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *options, RecentlyUsed
|
|||||||
ui->labelHelpScreenAvs2YUV->installEventFilter(this);
|
ui->labelHelpScreenAvs2YUV->installEventFilter(this);
|
||||||
|
|
||||||
//Monitor for options changes
|
//Monitor for options changes
|
||||||
|
connect(ui->cbxEncoderType, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
|
||||||
|
connect(ui->cbxEncoderArch, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
|
||||||
|
connect(ui->cbxEncoderVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
|
||||||
connect(ui->cbxRateControlMode, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
|
connect(ui->cbxRateControlMode, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
|
||||||
connect(ui->spinQuantizer, SIGNAL(valueChanged(double)), this, SLOT(configurationChanged()));
|
connect(ui->spinQuantizer, SIGNAL(valueChanged(double)), this, SLOT(configurationChanged()));
|
||||||
connect(ui->spinBitrate, SIGNAL(valueChanged(int)), this, SLOT(configurationChanged()));
|
connect(ui->spinBitrate, SIGNAL(valueChanged(int)), this, SLOT(configurationChanged()));
|
||||||
@ -345,13 +351,14 @@ bool AddJobDialog::eventFilter(QObject *o, QEvent *e)
|
|||||||
{
|
{
|
||||||
if((o == ui->labelHelpScreenX264) && (e->type() == QEvent::MouseButtonPress))
|
if((o == ui->labelHelpScreenX264) && (e->type() == QEvent::MouseButtonPress))
|
||||||
{
|
{
|
||||||
HelpDialog *helpScreen = new HelpDialog(this, false, m_x64supported, m_use10BitEncoding);
|
OptionsModel options; saveOptions(&options);
|
||||||
|
HelpDialog *helpScreen = new HelpDialog(this, false, &options);
|
||||||
helpScreen->exec();
|
helpScreen->exec();
|
||||||
X264_DELETE(helpScreen);
|
X264_DELETE(helpScreen);
|
||||||
}
|
}
|
||||||
else if((o == ui->labelHelpScreenAvs2YUV) && (e->type() == QEvent::MouseButtonPress))
|
else if((o == ui->labelHelpScreenAvs2YUV) && (e->type() == QEvent::MouseButtonPress))
|
||||||
{
|
{
|
||||||
HelpDialog *helpScreen = new HelpDialog(this, true, m_x64supported, m_use10BitEncoding);
|
HelpDialog *helpScreen = new HelpDialog(this, true, NULL);
|
||||||
helpScreen->exec();
|
helpScreen->exec();
|
||||||
X264_DELETE(helpScreen);
|
X264_DELETE(helpScreen);
|
||||||
}
|
}
|
||||||
@ -437,6 +444,14 @@ void AddJobDialog::modeIndexChanged(int index)
|
|||||||
|
|
||||||
void AddJobDialog::accept(void)
|
void AddJobDialog::accept(void)
|
||||||
{
|
{
|
||||||
|
//Check 64-Bit support
|
||||||
|
if((ui->cbxEncoderArch->currentIndex() == OptionsModel::EncArch_x64) && (!m_x64supported))
|
||||||
|
{
|
||||||
|
QMessageBox::warning(this, tr("64-Bit unsupported!"), tr("Sorry, this computer does <b>not</b> support 64-Bit encoders!"));
|
||||||
|
ui->cbxEncoderArch->setCurrentIndex(OptionsModel::EncArch_x32);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
//Selection complete?
|
//Selection complete?
|
||||||
if(ui->editSource->text().trimmed().isEmpty())
|
if(ui->editSource->text().trimmed().isEmpty())
|
||||||
{
|
{
|
||||||
@ -795,12 +810,11 @@ void AddJobDialog::loadTemplateList(void)
|
|||||||
QStringList templateNames = templates.keys();
|
QStringList templateNames = templates.keys();
|
||||||
templateNames.sort();
|
templateNames.sort();
|
||||||
|
|
||||||
while(!templateNames.isEmpty())
|
for(QStringList::ConstIterator current = templateNames.constBegin(); current != templateNames.constEnd(); current++)
|
||||||
{
|
{
|
||||||
QString current = templateNames.takeFirst();
|
OptionsModel *currentTemplate = templates.take(*current);
|
||||||
ui->cbxTemplate->addItem(current, QVariant::fromValue<void*>(templates.value(current)));
|
ui->cbxTemplate->addItem(*current, QVariant::fromValue<void*>(currentTemplate));
|
||||||
|
if(currentTemplate->equals(m_options))
|
||||||
if(templates.value(current)->equals(m_options))
|
|
||||||
{
|
{
|
||||||
ui->cbxTemplate->setCurrentIndex(ui->cbxTemplate->count() - 1);
|
ui->cbxTemplate->setCurrentIndex(ui->cbxTemplate->count() - 1);
|
||||||
}
|
}
|
||||||
@ -808,6 +822,7 @@ void AddJobDialog::loadTemplateList(void)
|
|||||||
|
|
||||||
if((ui->cbxTemplate->currentIndex() == 0) && (!m_options->equals(m_defaults)))
|
if((ui->cbxTemplate->currentIndex() == 0) && (!m_options->equals(m_defaults)))
|
||||||
{
|
{
|
||||||
|
qWarning("Not the default -> recently used!");
|
||||||
ui->cbxTemplate->insertItem(1, tr("<Recently Used>"), QVariant::fromValue<void*>(m_options));
|
ui->cbxTemplate->insertItem(1, tr("<Recently Used>"), QVariant::fromValue<void*>(m_options));
|
||||||
ui->cbxTemplate->setCurrentIndex(1);
|
ui->cbxTemplate->setCurrentIndex(1);
|
||||||
}
|
}
|
||||||
@ -832,8 +847,11 @@ void AddJobDialog::updateComboBox(QComboBox *cbox, const QString &text)
|
|||||||
|
|
||||||
void AddJobDialog::restoreOptions(OptionsModel *options)
|
void AddJobDialog::restoreOptions(OptionsModel *options)
|
||||||
{
|
{
|
||||||
ENABLE_SIGNALS(ui, false);
|
BLOCK_SIGNALS(true);
|
||||||
|
|
||||||
|
ui->cbxEncoderType->setCurrentIndex(options->encType());
|
||||||
|
ui->cbxEncoderArch->setCurrentIndex(options->encArch());
|
||||||
|
ui->cbxEncoderVariant->setCurrentIndex(options->encVariant());
|
||||||
ui->cbxRateControlMode->setCurrentIndex(options->rcMode());
|
ui->cbxRateControlMode->setCurrentIndex(options->rcMode());
|
||||||
ui->spinQuantizer->setValue(options->quantizer());
|
ui->spinQuantizer->setValue(options->quantizer());
|
||||||
ui->spinBitrate->setValue(options->bitrate());
|
ui->spinBitrate->setValue(options->bitrate());
|
||||||
@ -843,13 +861,13 @@ void AddJobDialog::restoreOptions(OptionsModel *options)
|
|||||||
ui->editCustomX264Params->setText(options->customEncParams());
|
ui->editCustomX264Params->setText(options->customEncParams());
|
||||||
ui->editCustomAvs2YUVParams->setText(options->customAvs2YUV());
|
ui->editCustomAvs2YUVParams->setText(options->customAvs2YUV());
|
||||||
|
|
||||||
ENABLE_SIGNALS(ui, true);
|
BLOCK_SIGNALS(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddJobDialog::saveOptions(OptionsModel *options)
|
void AddJobDialog::saveOptions(OptionsModel *options)
|
||||||
{
|
{
|
||||||
options->setEncType(static_cast<OptionsModel::EncType>(ui->cbxEncoderArch->currentIndex()));
|
options->setEncType(static_cast<OptionsModel::EncType>(ui->cbxEncoderType->currentIndex()));
|
||||||
options->setEncArch(static_cast<OptionsModel::EncArch>(ui->cbxEncoderType->currentIndex()));
|
options->setEncArch(static_cast<OptionsModel::EncArch>(ui->cbxEncoderArch->currentIndex()));
|
||||||
options->setEncVariant(static_cast<OptionsModel::EncVariant>(ui->cbxEncoderVariant->currentIndex()));
|
options->setEncVariant(static_cast<OptionsModel::EncVariant>(ui->cbxEncoderVariant->currentIndex()));
|
||||||
options->setRCMode(static_cast<OptionsModel::RCMode>(ui->cbxRateControlMode->currentIndex()));
|
options->setRCMode(static_cast<OptionsModel::RCMode>(ui->cbxRateControlMode->currentIndex()));
|
||||||
options->setQuantizer(ui->spinQuantizer->value());
|
options->setQuantizer(ui->spinQuantizer->value());
|
||||||
|
@ -37,7 +37,7 @@ class AddJobDialog : public QDialog
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AddJobDialog(QWidget *parent, OptionsModel *options, RecentlyUsed *recentlyUsed, bool x64supported, bool use10BitEncoding, bool saveToSourceFolder);
|
AddJobDialog(QWidget *parent, OptionsModel *options, RecentlyUsed *recentlyUsed, bool x64supported, bool saveToSourceFolder);
|
||||||
~AddJobDialog(void);
|
~AddJobDialog(void);
|
||||||
|
|
||||||
QString sourceFile(void);
|
QString sourceFile(void);
|
||||||
@ -64,7 +64,6 @@ protected:
|
|||||||
RecentlyUsed *m_recentlyUsed;
|
RecentlyUsed *m_recentlyUsed;
|
||||||
|
|
||||||
const bool m_x64supported;
|
const bool m_x64supported;
|
||||||
const bool m_use10BitEncoding;
|
|
||||||
const bool m_saveToSourceFolder;
|
const bool m_saveToSourceFolder;
|
||||||
|
|
||||||
virtual void showEvent(QShowEvent *event);
|
virtual void showEvent(QShowEvent *event);
|
||||||
|
@ -23,25 +23,49 @@
|
|||||||
#include "uic_win_help.h"
|
#include "uic_win_help.h"
|
||||||
|
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
|
#include "model_options.h"
|
||||||
|
|
||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
#define AVS2_BINARY(BIN_DIR, IS_X64) QString("%1/%2/avs2yuv_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"))
|
#define AVS2_BINARY(BIN_DIR) QString("%1/%2/avs2yuv_%2.exe").arg((BIN_DIR), "x86")
|
||||||
#define X264_BINARY(BIN_DIR, IS_10BIT, IS_X64) QString("%1/%2/x264_%3_%2.exe").arg((BIN_DIR), ((IS_X64) ? "x64" : "x86"), ((IS_10BIT) ? "10bit" : "8bit"))
|
|
||||||
|
static QString X264_BINARY(const QString &binDir, const OptionsModel *options)
|
||||||
|
{
|
||||||
|
QString baseName, arch, variant;
|
||||||
|
|
||||||
|
switch(options->encType())
|
||||||
|
{
|
||||||
|
case OptionsModel::EncType_X264: baseName = "x264"; break;
|
||||||
|
case OptionsModel::EncType_X265: baseName = "x265"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch(options->encArch())
|
||||||
|
{
|
||||||
|
case OptionsModel::EncArch_x32: arch = "x86"; break;
|
||||||
|
case OptionsModel::EncArch_x64: arch = "x64"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch(options->encVariant())
|
||||||
|
{
|
||||||
|
case OptionsModel::EncVariant_LoBit: variant = "8bit"; break;
|
||||||
|
case OptionsModel::EncVariant_HiBit: variant = (options->encType() == OptionsModel::EncType_X265) ? "16bit" : "10bit"; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QString("%1/%2/x264_%3_%2.exe").arg((binDir), arch, variant);
|
||||||
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
// Constructor & Destructor
|
// Constructor & Destructor
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
HelpDialog::HelpDialog(QWidget *parent, bool avs2yuv, bool x64supported, bool use10BitEncoding)
|
HelpDialog::HelpDialog(QWidget *parent, bool avs2yuv, const OptionsModel *options)
|
||||||
:
|
:
|
||||||
QDialog(parent),
|
QDialog(parent),
|
||||||
m_appDir(QApplication::applicationDirPath() + "/toolset"),
|
m_appDir(QApplication::applicationDirPath() + "/toolset"),
|
||||||
m_avs2yuv(avs2yuv),
|
m_avs2yuv(avs2yuv),
|
||||||
m_x64supported(x64supported),
|
m_options(options),
|
||||||
m_use10BitEncoding(use10BitEncoding),
|
|
||||||
m_process(new QProcess()),
|
m_process(new QProcess()),
|
||||||
ui(new Ui::HelpDialog())
|
ui(new Ui::HelpDialog())
|
||||||
{
|
{
|
||||||
@ -82,11 +106,11 @@ void HelpDialog::showEvent(QShowEvent *event)
|
|||||||
|
|
||||||
if(!m_avs2yuv)
|
if(!m_avs2yuv)
|
||||||
{
|
{
|
||||||
m_process->start(X264_BINARY(m_appDir, m_use10BitEncoding, m_x64supported), QStringList() << "--version");
|
m_process->start(X264_BINARY(m_appDir, m_options), QStringList() << "--version");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_process->start(AVS2_BINARY(m_appDir, m_x64supported), QStringList());
|
m_process->start(AVS2_BINARY(m_appDir), QStringList());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!m_process->waitForStarted())
|
if(!m_process->waitForStarted())
|
||||||
@ -131,7 +155,7 @@ void HelpDialog::finished(void)
|
|||||||
m_startAgain = false;
|
m_startAgain = false;
|
||||||
if(!m_avs2yuv)
|
if(!m_avs2yuv)
|
||||||
{
|
{
|
||||||
m_process->start(X264_BINARY(m_appDir, m_use10BitEncoding, m_x64supported), QStringList() << "--fullhelp");
|
m_process->start(X264_BINARY(m_appDir, m_options), QStringList() << "--fullhelp");
|
||||||
ui->plainTextEdit->appendPlainText("\n--------\n");
|
ui->plainTextEdit->appendPlainText("\n--------\n");
|
||||||
|
|
||||||
if(!m_process->waitForStarted())
|
if(!m_process->waitForStarted())
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
|
||||||
class QProcess;
|
class QProcess;
|
||||||
|
class OptionsModel;
|
||||||
|
|
||||||
namespace Ui
|
namespace Ui
|
||||||
{
|
{
|
||||||
@ -35,7 +36,7 @@ class HelpDialog : public QDialog
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
HelpDialog(QWidget *parent, bool avs2yuv, bool x64supported, bool use10BitEncoding);
|
HelpDialog(QWidget *parent, bool avs2yuv, const OptionsModel *options);
|
||||||
~HelpDialog(void);
|
~HelpDialog(void);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
@ -52,8 +53,7 @@ private:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
const bool m_avs2yuv;
|
const bool m_avs2yuv;
|
||||||
const bool m_x64supported;
|
const OptionsModel *m_options;
|
||||||
const bool m_use10BitEncoding;
|
|
||||||
|
|
||||||
virtual void showEvent(QShowEvent *event);
|
virtual void showEvent(QShowEvent *event);
|
||||||
virtual void closeEvent(QCloseEvent *e);
|
virtual void closeEvent(QCloseEvent *e);
|
||||||
|
@ -1272,7 +1272,7 @@ void MainWindow::dropEvent(QDropEvent *event)
|
|||||||
bool MainWindow::createJob(QString &sourceFileName, QString &outputFileName, OptionsModel *options, bool &runImmediately, const bool restart, int fileNo, int fileTotal, bool *applyToAll)
|
bool MainWindow::createJob(QString &sourceFileName, QString &outputFileName, OptionsModel *options, bool &runImmediately, const bool restart, int fileNo, int fileTotal, bool *applyToAll)
|
||||||
{
|
{
|
||||||
bool okay = false;
|
bool okay = false;
|
||||||
AddJobDialog *addDialog = new AddJobDialog(this, options, m_recentlyUsed, m_cpuFeatures->x64, m_preferences->use10BitEncoding(), m_preferences->saveToSourcePath());
|
AddJobDialog *addDialog = new AddJobDialog(this, options, m_recentlyUsed, m_cpuFeatures->x64, m_preferences->saveToSourcePath());
|
||||||
|
|
||||||
addDialog->setRunImmediately(runImmediately);
|
addDialog->setRunImmediately(runImmediately);
|
||||||
if(!sourceFileName.isEmpty()) addDialog->setSourceFile(sourceFileName);
|
if(!sourceFileName.isEmpty()) addDialog->setSourceFile(sourceFileName);
|
||||||
@ -1359,7 +1359,7 @@ bool MainWindow::appendJob(const QString &sourceFileName, const QString &outputF
|
|||||||
QString("%1/toolset").arg(m_appDir),
|
QString("%1/toolset").arg(m_appDir),
|
||||||
m_vapoursynthPath,
|
m_vapoursynthPath,
|
||||||
m_cpuFeatures->x64,
|
m_cpuFeatures->x64,
|
||||||
m_preferences->use10BitEncoding(),
|
false /*m_preferences->use10BitEncoding()*/,
|
||||||
m_cpuFeatures->x64 && m_preferences->useAvisyth64Bit(),
|
m_cpuFeatures->x64 && m_preferences->useAvisyth64Bit(),
|
||||||
m_skipVersionTest,
|
m_skipVersionTest,
|
||||||
m_preferences->processPriority(),
|
m_preferences->processPriority(),
|
||||||
|
@ -105,7 +105,6 @@ void PreferencesDialog::showEvent(QShowEvent *event)
|
|||||||
UPDATE_CHECKBOX(ui->checkEnableSounds, m_preferences->enableSounds());
|
UPDATE_CHECKBOX(ui->checkEnableSounds, m_preferences->enableSounds());
|
||||||
UPDATE_CHECKBOX(ui->checkNoUpdateReminder, m_preferences->noUpdateReminder());
|
UPDATE_CHECKBOX(ui->checkNoUpdateReminder, m_preferences->noUpdateReminder());
|
||||||
UPDATE_CHECKBOX(ui->checkDisableWarnings, m_preferences->disableWarnings(), true);
|
UPDATE_CHECKBOX(ui->checkDisableWarnings, m_preferences->disableWarnings(), true);
|
||||||
UPDATE_CHECKBOX(ui->checkUse10BitEncoding, m_preferences->use10BitEncoding(), true);
|
|
||||||
|
|
||||||
ui->spinBoxJobCount->setValue(m_preferences->maxRunningJobCount());
|
ui->spinBoxJobCount->setValue(m_preferences->maxRunningJobCount());
|
||||||
|
|
||||||
@ -158,7 +157,6 @@ void PreferencesDialog::done(int n)
|
|||||||
{
|
{
|
||||||
m_preferences->setAutoRunNextJob(ui->checkRunNextJob->isChecked());
|
m_preferences->setAutoRunNextJob(ui->checkRunNextJob->isChecked());
|
||||||
m_preferences->setShutdownComputer(ui->checkShutdownComputer->isChecked());
|
m_preferences->setShutdownComputer(ui->checkShutdownComputer->isChecked());
|
||||||
m_preferences->setUse10BitEncoding(ui->checkUse10BitEncoding->isChecked());
|
|
||||||
m_preferences->setUseAvisyth64Bit(ui->checkUse64BitAvs2YUV->isChecked());
|
m_preferences->setUseAvisyth64Bit(ui->checkUse64BitAvs2YUV->isChecked());
|
||||||
m_preferences->setSaveLogFiles(ui->checkSaveLogFiles->isChecked());
|
m_preferences->setSaveLogFiles(ui->checkSaveLogFiles->isChecked());
|
||||||
m_preferences->setSaveToSourcePath(ui->checkSaveToSourceFolder->isChecked());
|
m_preferences->setSaveToSourcePath(ui->checkSaveToSourceFolder->isChecked());
|
||||||
|
Loading…
Reference in New Issue
Block a user