Updated copyright year.

[x264-launcher/x264-launcher.git] / src / win_preferences.cpp

diff --git a/src/win_preferences.cpp b/src/win_preferences.cpp
index 5a12bb3..74a98fd 100644 (file)
--- a/src/win_preferences.cpp
+++ b/src/win_preferences.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2019 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -74,14 +74,14 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, PreferencesModel *preferen
        ui->comboBoxPriority->setItemData(2, QVariant::fromValue(-1)); //Below Normal
        ui->comboBoxPriority->setItemData(3, QVariant::fromValue(-2)); //Idle
 
-       ui->labelRunNextJob->installEventFilter(this);
-       ui->labelUse64BitAvs2YUV->installEventFilter(this);
-       ui->labelShutdownComputer->installEventFilter(this);
-       ui->labelSaveLogFiles->installEventFilter(this);
+       ui->labelRunNextJob        ->installEventFilter(this);
+       ui->labelUse64BitAvs2YUV   ->installEventFilter(this);
+       ui->labelSaveLogFiles      ->installEventFilter(this);
        ui->labelSaveToSourceFolder->installEventFilter(this);
-       ui->labelEnableSounds->installEventFilter(this);
-       ui->labelDisableWarnings->installEventFilter(this);
-       ui->labelNoUpdateReminder->installEventFilter(this);
+       ui->labelEnableSounds      ->installEventFilter(this);
+       ui->labelDisableWarnings   ->installEventFilter(this);
+       ui->labelNoUpdateReminder  ->installEventFilter(this);
+       ui->labelSaveQueueNoConfirm->installEventFilter(this);
 
        ui->checkBoxDummy1->installEventFilter(this);
        ui->checkBoxDummy2->installEventFilter(this);
@@ -102,20 +102,20 @@ void PreferencesDialog::showEvent(QShowEvent *event)
        if(event) QDialog::showEvent(event);
        
        UPDATE_CHECKBOX(ui->checkRunNextJob,         m_preferences->getAutoRunNextJob());
-       UPDATE_CHECKBOX(ui->checkShutdownComputer,   m_preferences->getShutdownComputer());
-       UPDATE_CHECKBOX(ui->checkUse64BitAvs2YUV,    m_preferences->getUseAvisyth64Bit() && m_sysinfo->hasX64Support());
+       UPDATE_CHECKBOX(ui->checkUse64BitAvs2YUV,    m_preferences->getPrefer64BitSource() && m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64));
        UPDATE_CHECKBOX(ui->checkSaveLogFiles,       m_preferences->getSaveLogFiles());
        UPDATE_CHECKBOX(ui->checkSaveToSourceFolder, m_preferences->getSaveToSourcePath());
        UPDATE_CHECKBOX(ui->checkEnableSounds,       m_preferences->getEnableSounds());
        UPDATE_CHECKBOX(ui->checkNoUpdateReminder,   m_preferences->getNoUpdateReminder());
        UPDATE_CHECKBOX(ui->checkDisableWarnings,    m_preferences->getDisableWarnings(), true);
+       UPDATE_CHECKBOX(ui->checkSaveQueueNoConfirm, m_preferences->getSaveQueueNoConfirm());
        
        ui->spinBoxJobCount->setValue(m_preferences->getMaxRunningJobCount());
-       
        UPDATE_COMBOBOX(ui->comboBoxPriority, qBound(-2, m_preferences->getProcessPriority(), 1), 0);
        
-       ui->checkUse64BitAvs2YUV->setEnabled(m_sysinfo->hasX64Support());
-       ui->labelUse64BitAvs2YUV->setEnabled(m_sysinfo->hasX64Support());
+       const bool hasX64 = m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64);
+       ui->checkUse64BitAvs2YUV->setEnabled(hasX64);
+       ui->labelUse64BitAvs2YUV->setEnabled(hasX64);
 }
 
 bool PreferencesDialog::eventFilter(QObject *o, QEvent *e)
@@ -128,13 +128,13 @@ bool PreferencesDialog::eventFilter(QObject *o, QEvent *e)
        else if((e->type() == QEvent::MouseButtonPress) || (e->type() == QEvent::MouseButtonRelease))
        {
                emulateMouseEvent(o, e, ui->labelRunNextJob,         ui->checkRunNextJob);
-               emulateMouseEvent(o, e, ui->labelShutdownComputer,   ui->checkShutdownComputer);
                emulateMouseEvent(o, e, ui->labelUse64BitAvs2YUV,    ui->checkUse64BitAvs2YUV);
                emulateMouseEvent(o, e, ui->labelSaveLogFiles,       ui->checkSaveLogFiles);
                emulateMouseEvent(o, e, ui->labelSaveToSourceFolder, ui->checkSaveToSourceFolder);
                emulateMouseEvent(o, e, ui->labelEnableSounds,       ui->checkEnableSounds);
                emulateMouseEvent(o, e, ui->labelDisableWarnings,    ui->checkDisableWarnings);
                emulateMouseEvent(o, e, ui->labelNoUpdateReminder,   ui->checkNoUpdateReminder);
+               emulateMouseEvent(o, e, ui->labelSaveQueueNoConfirm, ui->checkSaveQueueNoConfirm);
        }
        return false;
 }
@@ -158,16 +158,16 @@ void PreferencesDialog::emulateMouseEvent(QObject *object, QEvent *event, QWidge
 
 void PreferencesDialog::done(int n)
 {
-       m_preferences->setAutoRunNextJob(ui->checkRunNextJob->isChecked());
-       m_preferences->setShutdownComputer(ui->checkShutdownComputer->isChecked());
-       m_preferences->setUseAvisyth64Bit(ui->checkUse64BitAvs2YUV->isChecked());
-       m_preferences->setSaveLogFiles(ui->checkSaveLogFiles->isChecked());
-       m_preferences->setSaveToSourcePath(ui->checkSaveToSourceFolder->isChecked());
+       m_preferences->setAutoRunNextJob    (ui->checkRunNextJob->isChecked());
+       m_preferences->setPrefer64BitSource (ui->checkUse64BitAvs2YUV->isChecked());
+       m_preferences->setSaveLogFiles      (ui->checkSaveLogFiles->isChecked());
+       m_preferences->setSaveToSourcePath  (ui->checkSaveToSourceFolder->isChecked());
        m_preferences->setMaxRunningJobCount(ui->spinBoxJobCount->value());
-       m_preferences->setProcessPriority(ui->comboBoxPriority->itemData(ui->comboBoxPriority->currentIndex()).toInt());
-       m_preferences->setEnableSounds(ui->checkEnableSounds->isChecked());
-       m_preferences->setDisableWarnings(ui->checkDisableWarnings->isChecked());
-       m_preferences->setNoUpdateReminder(ui->checkNoUpdateReminder->isChecked());
+       m_preferences->setProcessPriority   (ui->comboBoxPriority->itemData(ui->comboBoxPriority->currentIndex()).toInt());
+       m_preferences->setEnableSounds      (ui->checkEnableSounds->isChecked());
+       m_preferences->setDisableWarnings   (ui->checkDisableWarnings->isChecked());
+       m_preferences->setNoUpdateReminder  (ui->checkNoUpdateReminder->isChecked());
+       m_preferences->setSaveQueueNoConfirm(ui->checkSaveQueueNoConfirm->isChecked());
 
        PreferencesModel::savePreferences(m_preferences);
        QDialog::done(n);
@@ -179,22 +179,6 @@ void PreferencesDialog::resetButtonPressed(void)
        showEvent(NULL);
 }
 
-//void PreferencesDialog::use10BitEncodingToggled(bool checked)
-//{
-//     if(checked)
-//     {
-//             QString text;
-//             text += QString("<nobr>%1</nobr><br>").arg(tr("Please note that 10&minus;Bit H.264 streams are <b>not</b> currently supported by hardware (standalone) players!"));
-//             text += QString("<nobr>%1</nobr><br>").arg(tr("To play such streams, you will need an <i>up&minus;to&minus;date</i> ffdshow&minus;tryouts, CoreAVC 3.x or another supported s/w decoder."));
-//             text += QString("<nobr>%1</nobr><br>").arg(tr("Also be aware that hardware&minus;acceleration (CUDA, DXVA, etc) usually will <b>not</b> work with 10&minus;Bit H.264 streams."));
-//             
-//             if(QMessageBox::warning(this, tr("10-Bit Encoding"), text.replace("-", "&minus;"), tr("Continue"), tr("Revert"), QString(), 1) != 0)
-//             {
-//                     UPDATE_CHECKBOX(ui->checkUse10BitEncoding, false, true);
-//             }
-//     }
-//}
-
 void PreferencesDialog::disableWarningsToggled(bool checked)
 {
        if(checked)