OSDN Git Service

Switched the method for including the UIC header files to "Using a Pointer Member...
[x264-launcher/x264-launcher.git] / src / win_addJob.cpp
index f3fae18..145ffdd 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Simple x264 Launcher
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2013 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
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "win_addJob.h"
+#include "uic_win_addJob.h"
 
 #include "global.h"
 #include "model_options.h"
+#include "model_recently.h"
 #include "win_help.h"
+#include "win_editor.h"
 
 #include <QDate>
 #include <QTimer>
 #include <QDir>
 #include <QInputDialog>
 #include <QSettings>
+#include <QUrl>
+#include <QAction>
+#include <QClipboard>
+#include <QToolTip>
 
+#define ARRAY_SIZE(ARRAY) (sizeof((ARRAY))/sizeof((ARRAY[0])))
 #define VALID_DIR(PATH) ((!(PATH).isEmpty()) && QFileInfo(PATH).exists() && QFileInfo(PATH).isDir())
 
 #define REMOVE_USAFED_ITEM \
 { \
-       for(int i = 0; i < cbxTemplate->count(); i++) \
+       for(int i = 0; i < ui->cbxTemplate->count(); i++) \
        { \
-               OptionsModel* temp = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(i).value<void*>()); \
+               OptionsModel* temp = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>()); \
                if(temp == NULL) \
                { \
-                       cbxTemplate->blockSignals(true); \
-                       cbxTemplate->removeItem(i); \
-                       cbxTemplate->blockSignals(false); \
+                       ui->cbxTemplate->blockSignals(true); \
+                       ui->cbxTemplate->removeItem(i); \
+                       ui->cbxTemplate->blockSignals(false); \
                        break; \
                } \
        } \
 }
 
+#define ADD_CONTEXTMENU_ACTION(WIDGET, ICON, TEXT, SLOTNAME) \
+{ \
+       QAction *_action = new QAction((ICON), (TEXT), this); \
+       _action->setData(QVariant::fromValue<void*>(WIDGET)); \
+       WIDGET->addAction(_action); \
+       connect(_action, SIGNAL(triggered(bool)), this, SLOT(SLOTNAME())); \
+}
+
+#define ADD_CONTEXTMENU_SEPARATOR(WIDGET) \
+{ \
+       QAction *_action = new QAction(this); \
+       _action->setSeparator(true); \
+       WIDGET->addAction(_action); \
+} 
+
 ///////////////////////////////////////////////////////////////////////////////
 // Validator
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,20 +91,7 @@ public:
                m_icon->hide();
        }
        
-       virtual State validate(QString &input, int &pos) const
-       {
-               static const char* p[] = {"B", "o", "h", "p", "q", "fps", "frames", "preset", "tune", "profile",
-                       "stdin", "crf", "bitrate", "qp", "pass", "stats", "output", "help","quiet", NULL};
-
-               bool invalid = false;
-
-               for(size_t i = 0; p[i] && (!invalid); i++)
-               {
-                       invalid = invalid || checkParam(input, QString::fromLatin1(p[i]));
-               }
-
-               return invalid ? QValidator::Intermediate : QValidator::Acceptable;
-       }
+       virtual State validate(QString &input, int &pos) const = 0;
 
        virtual void fixup(QString &input) const
        {
@@ -91,17 +101,18 @@ public:
 protected:
        QLabel *const m_notifier, *const m_icon;
 
-       bool checkParam(const QString &input, const QString &param) const
+       bool checkParam(const QString &input, const QString &param, const bool doubleMinus) const
        {
                static const char c[20] = {' ', '*', '?', '<', '>', '/', '\\', '"', '\'', '!', '+', '#', '&', '%', '=', ',', ';', '.', 'ยด', '`'};
+               const QString prefix = doubleMinus ? QLatin1String("--") : QLatin1String("-");
                
                bool flag = false;
                if(param.length() > 1)
                {
-                       flag = flag || input.endsWith(QString("--%1").arg(param), Qt::CaseInsensitive);
+                       flag = flag || input.endsWith(QString("%1%2").arg(prefix, param), Qt::CaseInsensitive);
                        for(size_t i = 0; i < sizeof(c); i++)
                        {
-                               flag = flag || input.contains(QString("--%1%2").arg(param, QChar::fromLatin1(c[i])), Qt::CaseInsensitive);
+                               flag = flag || input.contains(QString("%1%2%3").arg(prefix, param, QChar::fromLatin1(c[i])), Qt::CaseInsensitive);
                        }
                }
                else
@@ -112,13 +123,25 @@ protected:
                                flag = flag || input.contains(QString("%1-%2").arg(QChar::fromLatin1(c[i]), param), Qt::CaseSensitive);
                        }
                }
+               if((flag) && (m_notifier))
+               {
+                       m_notifier->setText(tr("Invalid parameter: %1").arg((param.length() > 1) ? QString("%1%2").arg(prefix, param) : QString("-%1").arg(param)));
+               }
+               return flag;
+       }
+
+       const bool &setStatus(const bool &flag, const QString &toolName) const
+       {
                if(flag)
                {
                        if(m_notifier)
                        {
-                               m_notifier->setText(tr("Invalid parameter: %1").arg((param.length() > 1) ? QString("--%1").arg(param) : QString("-%1").arg(param)));
                                if(m_notifier->isHidden()) m_notifier->show();
                                if(m_icon) { if(m_icon->isHidden()) m_icon->show(); }
+                               if(QWidget *w = m_notifier->topLevelWidget()->focusWidget())
+                               {
+                                       QToolTip::showText(static_cast<QWidget*>(w->parent())->mapToGlobal(w->pos()), QString("<nobr>%1</nobr>").arg(tr("<b>Warning:</b> You entered a parameter that is incomaptible with using %1 from a GUI.<br>Please note that the GUI will automatically set <i>this</i> parameter for you (if required).").arg(toolName)), m_notifier, QRect());
+                               }
                        }
                }
                else
@@ -127,89 +150,157 @@ protected:
                        {
                                if(m_notifier->isVisible()) m_notifier->hide();
                                if(m_icon) { if(m_icon->isVisible()) m_icon->hide(); }
+                               QToolTip::hideText();
                        }
                }
                return flag;
        }
 };
 
+class StringValidatorX264 : public StringValidator
+{
+public:
+       StringValidatorX264(QLabel *notifier, QLabel *icon) : StringValidator(notifier, icon) {}
+
+       virtual State validate(QString &input, int &pos) const
+       {
+               static const char* p[] = {"B", "o", "h", "p", "q", /*"fps", "frames",*/ "preset", "tune", "profile",
+                       "stdin", "crf", "bitrate", "qp", "pass", "stats", "output", "help","quiet", NULL};
+
+               bool invalid = false;
+
+               for(size_t i = 0; p[i] && (!invalid); i++)
+               {
+                       invalid = invalid || checkParam(input, QString::fromLatin1(p[i]), true);
+               }
+
+               return setStatus(invalid, "x264") ? QValidator::Intermediate : QValidator::Acceptable;
+       }
+};
+
+class StringValidatorAvs2YUV : public StringValidator
+{
+public:
+       StringValidatorAvs2YUV(QLabel *notifier, QLabel *icon) : StringValidator(notifier, icon) {}
+
+       virtual State validate(QString &input, int &pos) const
+       {
+               static const char* p[] = {"o", "frames", "seek", "raw", "hfyu", "slave", NULL};
+
+               bool invalid = false;
+
+               for(size_t i = 0; p[i] && (!invalid); i++)
+               {
+                       invalid = invalid || checkParam(input, QString::fromLatin1(p[i]), false);
+               }
+               
+               return setStatus(invalid, "Avs2YUV") ? QValidator::Intermediate : QValidator::Acceptable;
+       }
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 // Constructor & Destructor
 ///////////////////////////////////////////////////////////////////////////////
 
-AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *options, bool x64supported)
+AddJobDialog::AddJobDialog(QWidget *parent, OptionsModel *options, RecentlyUsed *recentlyUsed, bool x64supported, bool use10BitEncoding, bool saveToSourceFolder)
 :
        QDialog(parent),
        m_defaults(new OptionsModel()),
        m_options(options),
        m_x64supported(x64supported),
-       initialDir_src(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation)),
-       initialDir_out(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation))
-
+       m_use10BitEncoding(use10BitEncoding),
+       m_saveToSourceFolder(saveToSourceFolder),
+       m_recentlyUsed(recentlyUsed),
+       ui(new Ui::AddJobDialog())
 {
        //Init the dialog, from the .ui file
-       setupUi(this);
+       ui->setupUi(this);
        setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
        
        //Fix dialog size
-       buttonSaveTemplate->setMaximumHeight(20);
-       buttonDeleteTemplate->setMaximumHeight(20);
+       ui->buttonSaveTemplate->setMaximumHeight(20);
+       ui->buttonDeleteTemplate->setMaximumHeight(20);
        resize(width(), minimumHeight());
        setMinimumSize(size());
        setMaximumHeight(height());
 
+       //Hide optional controls
+       ui->checkBoxApplyToAll->setVisible(false);
+
        //Monitor RC mode combobox
-       connect(cbxRateControlMode, SIGNAL(currentIndexChanged(int)), this, SLOT(modeIndexChanged(int)));
+       connect(ui->cbxRateControlMode, SIGNAL(currentIndexChanged(int)), this, SLOT(modeIndexChanged(int)));
 
        //Activate buttons
-       connect(buttonBrowseSource, SIGNAL(clicked()), this, SLOT(browseButtonClicked()));
-       connect(buttonBrowseOutput, SIGNAL(clicked()), this, SLOT(browseButtonClicked()));
-       connect(buttonSaveTemplate, SIGNAL(clicked()), this, SLOT(saveTemplateButtonClicked()));
-       connect(buttonDeleteTemplate, SIGNAL(clicked()), this, SLOT(deleteTemplateButtonClicked()));
+       connect(ui->buttonBrowseSource, SIGNAL(clicked()), this, SLOT(browseButtonClicked()));
+       connect(ui->buttonBrowseOutput, SIGNAL(clicked()), this, SLOT(browseButtonClicked()));
+       connect(ui->buttonSaveTemplate, SIGNAL(clicked()), this, SLOT(saveTemplateButtonClicked()));
+       connect(ui->buttonDeleteTemplate, SIGNAL(clicked()), this, SLOT(deleteTemplateButtonClicked()));
 
        //Setup validator
-       editCustomParams->installEventFilter(this);
-       editCustomParams->setValidator(new StringValidator(labelNotification, iconNotification));
-       editCustomParams->clear();
+       ui->editCustomX264Params->installEventFilter(this);
+       ui->editCustomX264Params->setValidator(new StringValidatorX264(ui->labelNotificationX264, ui->iconNotificationX264));
+       ui->editCustomX264Params->clear();
+       ui->editCustomAvs2YUVParams->installEventFilter(this);
+       ui->editCustomAvs2YUVParams->setValidator(new StringValidatorAvs2YUV(ui->labelNotificationAvs2YUV, ui->iconNotificationAvs2YUV));
+       ui->editCustomAvs2YUVParams->clear();
 
        //Install event filter
-       labelHelpScreen->installEventFilter(this);
+       ui->labelHelpScreenX264->installEventFilter(this);
+       ui->labelHelpScreenAvs2YUV->installEventFilter(this);
 
        //Monitor for options changes
-       connect(cbxRateControlMode, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
-       connect(spinQuantizer, SIGNAL(valueChanged(double)), this, SLOT(configurationChanged()));
-       connect(spinBitrate, SIGNAL(valueChanged(int)), this, SLOT(configurationChanged()));
-       connect(cbxPreset, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
-       connect(cbxTuning, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
-       connect(cbxProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
-       connect(editCustomParams, SIGNAL(textChanged(QString)), this, SLOT(configurationChanged()));
+       connect(ui->cbxRateControlMode, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
+       connect(ui->spinQuantizer, SIGNAL(valueChanged(double)), this, SLOT(configurationChanged()));
+       connect(ui->spinBitrate, SIGNAL(valueChanged(int)), this, SLOT(configurationChanged()));
+       connect(ui->cbxPreset, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
+       connect(ui->cbxTuning, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
+       connect(ui->cbxProfile, SIGNAL(currentIndexChanged(int)), this, SLOT(configurationChanged()));
+       connect(ui->editCustomX264Params, SIGNAL(textChanged(QString)), this, SLOT(configurationChanged()));
+       connect(ui->editCustomAvs2YUVParams, SIGNAL(textChanged(QString)), this, SLOT(configurationChanged()));
+
+       //Create context menus
+       ADD_CONTEXTMENU_ACTION(ui->editCustomX264Params, QIcon(":/buttons/page_edit.png"), tr("Open the Text-Editor"), editorActionTriggered);
+       ADD_CONTEXTMENU_ACTION(ui->editCustomAvs2YUVParams, QIcon(":/buttons/page_edit.png"), tr("Open the Text-Editor"), editorActionTriggered);
+       ADD_CONTEXTMENU_SEPARATOR(ui->editCustomX264Params);
+       ADD_CONTEXTMENU_SEPARATOR(ui->editCustomAvs2YUVParams);
+       ADD_CONTEXTMENU_ACTION(ui->editCustomX264Params, QIcon(":/buttons/page_copy.png"), tr("Copy to Clipboard"), copyActionTriggered);
+       ADD_CONTEXTMENU_ACTION(ui->editCustomAvs2YUVParams, QIcon(":/buttons/page_copy.png"), tr("Copy to Clipboard"), copyActionTriggered);
+       ADD_CONTEXTMENU_ACTION(ui->editCustomX264Params, QIcon(":/buttons/page_paste.png"), tr("Paste from Clipboard"), pasteActionTriggered);
+       ADD_CONTEXTMENU_ACTION(ui->editCustomAvs2YUVParams, QIcon(":/buttons/page_paste.png"), tr("Paste from Clipboard"), pasteActionTriggered);
 
        //Setup template selector
        loadTemplateList();
-       connect(cbxTemplate, SIGNAL(currentIndexChanged(int)), this, SLOT(templateSelected()));
-
-       //Load directories
-       const QString appDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-       QSettings settings(QString("%1/last.ini").arg(appDir), QSettings::IniFormat);
-       initialDir_src = settings.value("path/directory_openFrom", initialDir_src).toString();
-       initialDir_out = settings.value("path/directory_saveTo", initialDir_out).toString();
+       connect(ui->cbxTemplate, SIGNAL(currentIndexChanged(int)), this, SLOT(templateSelected()));
 }
 
 AddJobDialog::~AddJobDialog(void)
 {
        //Free templates
-       for(int i = 0; i < cbxTemplate->model()->rowCount(); i++)
+       for(int i = 0; i < ui->cbxTemplate->model()->rowCount(); i++)
        {
-               if(cbxTemplate->itemText(i).startsWith("<") || cbxTemplate->itemText(i).endsWith(">"))
+               if(ui->cbxTemplate->itemText(i).startsWith("<") || ui->cbxTemplate->itemText(i).endsWith(">"))
                {
                        continue;
                }
-               OptionsModel *item = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(i).value<void*>());
-               cbxTemplate->setItemData(i, QVariant::fromValue<void*>(NULL));
+               OptionsModel *item = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>());
+               ui->cbxTemplate->setItemData(i, QVariant::fromValue<void*>(NULL));
                X264_DELETE(item);
        }
-       
+
+       //Free validators
+       if(const QValidator *tmp = ui->editCustomX264Params->validator())
+       {
+               ui->editCustomX264Params->setValidator(NULL);
+               X264_DELETE(tmp);
+       }
+       if(const QValidator *tmp = ui->editCustomAvs2YUVParams->validator())
+       {
+               ui->editCustomAvs2YUVParams->setValidator(NULL);
+               X264_DELETE(tmp);
+       }
+
        X264_DELETE(m_defaults);
+       delete ui;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -221,73 +312,131 @@ void AddJobDialog::showEvent(QShowEvent *event)
        QDialog::showEvent(event);
        templateSelected();
 
-       if(!editSource->text().isEmpty()) initialDir_src = QFileInfo(QDir::fromNativeSeparators(editSource->text())).path();
-       if(!editOutput->text().isEmpty()) initialDir_out = QFileInfo(QDir::fromNativeSeparators(editOutput->text())).path();
-
-       if((!editSource->text().isEmpty()) && editOutput->text().isEmpty())
+       if((!ui->editSource->text().isEmpty()) && ui->editOutput->text().isEmpty())
        {
-               generateOutputFileName(QDir::fromNativeSeparators(editSource->text()));
-               buttonAccept->setFocus();
+               QString outPath = generateOutputFileName(QDir::fromNativeSeparators(ui->editSource->text()), m_recentlyUsed->outputDirectory(), m_recentlyUsed->filterIndex(), m_saveToSourceFolder);
+               ui->editOutput->setText(QDir::toNativeSeparators(outPath));
+               ui->buttonAccept->setFocus();
        }
 
-       labelNotification->hide();
-       iconNotification->hide();
+       ui->labelNotificationX264->hide();
+       ui->iconNotificationX264->hide();
+       ui->labelNotificationAvs2YUV->hide();
+       ui->iconNotificationAvs2YUV->hide();
+
+       //Enable drag&drop support for this window, required for Qt v4.8.4+
+       setAcceptDrops(true);
 }
 
 bool AddJobDialog::eventFilter(QObject *o, QEvent *e)
 {
-       if((o == labelHelpScreen) && (e->type() == QEvent::MouseButtonPress))
+       if((o == ui->labelHelpScreenX264) && (e->type() == QEvent::MouseButtonPress))
+       {
+               HelpDialog *helpScreen = new HelpDialog(this, false, m_x64supported, m_use10BitEncoding);
+               helpScreen->exec();
+               X264_DELETE(helpScreen);
+       }
+       else if((o == ui->labelHelpScreenAvs2YUV) && (e->type() == QEvent::MouseButtonPress))
        {
-               HelpDialog *helpScreen = new HelpDialog(this, m_x64supported);
+               HelpDialog *helpScreen = new HelpDialog(this, true, m_x64supported, m_use10BitEncoding);
                helpScreen->exec();
                X264_DELETE(helpScreen);
        }
-       else if((o == editCustomParams) && (e->type() == QEvent::FocusOut))
+       else if((o == ui->editCustomX264Params) && (e->type() == QEvent::FocusOut))
+       {
+               ui->editCustomX264Params->setText(ui->editCustomX264Params->text().simplified());
+       }
+       else if((o == ui->editCustomAvs2YUVParams) && (e->type() == QEvent::FocusOut))
        {
-               editCustomParams->setText(editCustomParams->text().simplified());
+               ui->editCustomAvs2YUVParams->setText(ui->editCustomAvs2YUVParams->text().simplified());
        }
        return false;
 }
 
+void AddJobDialog::dragEnterEvent(QDragEnterEvent *event)
+{
+       bool accept[2] = {false, false};
+
+       foreach(const QString &fmt, event->mimeData()->formats())
+       {
+               accept[0] = accept[0] || fmt.contains("text/uri-list", Qt::CaseInsensitive);
+               accept[1] = accept[1] || fmt.contains("FileNameW", Qt::CaseInsensitive);
+       }
+
+       if(accept[0] && accept[1])
+       {
+               event->acceptProposedAction();
+       }
+}
+
+void AddJobDialog::dropEvent(QDropEvent *event)
+{
+       QString droppedFile;
+       QList<QUrl> urls = event->mimeData()->urls();
+
+       if(urls.count() > 1)
+       {
+               QDragEnterEvent dragEvent(event->pos(), event->proposedAction(), event->mimeData(), Qt::NoButton, Qt::NoModifier);
+               if(qApp->notify(parent(), &dragEvent))
+               {
+                       qApp->notify(parent(), event);
+                       reject(); return;
+               }
+       }
+
+       while((!urls.isEmpty()) && droppedFile.isEmpty())
+       {
+               QUrl currentUrl = urls.takeFirst();
+               QFileInfo file(currentUrl.toLocalFile());
+               if(file.exists() && file.isFile())
+               {
+                       qDebug("AddJobDialog::dropEvent: %s", file.canonicalFilePath().toUtf8().constData());
+                       droppedFile = file.canonicalFilePath();
+               }
+       }
+       
+       if(!droppedFile.isEmpty())
+       {
+               const QString outFileName = generateOutputFileName(droppedFile, currentOutputPath(), currentOutputIndx(), m_saveToSourceFolder);
+               ui->editSource->setText(QDir::toNativeSeparators(droppedFile));
+               ui->editOutput->setText(QDir::toNativeSeparators(outFileName));
+       }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Slots
 ///////////////////////////////////////////////////////////////////////////////
 
 void AddJobDialog::modeIndexChanged(int index)
 {
-       spinQuantizer->setEnabled(index == 0 || index == 1);
-       spinBitrate->setEnabled(index == 2 || index == 3);
+       ui->spinQuantizer->setEnabled(index == 0 || index == 1);
+       ui->spinBitrate->setEnabled(index == 2 || index == 3);
 }
 
 void AddJobDialog::accept(void)
 {
-       if(editSource->text().trimmed().isEmpty())
+       //Selection complete?
+       if(ui->editSource->text().trimmed().isEmpty())
        {
                QMessageBox::warning(this, tr("Not Found!"), tr("Please select a valid source file first!"));
                return;
        }
-       
-       if(editOutput->text().trimmed().isEmpty())
+       if(ui->editOutput->text().trimmed().isEmpty())
        {
                QMessageBox::warning(this, tr("Not Selected!"), tr("<nobr>Please select a valid output file first!</nobr>"));
                return;
        }
 
-       QFileInfo sourceFile = QFileInfo(editSource->text());
+       //Does source exist?
+       QFileInfo sourceFile = QFileInfo(this->sourceFile());
        if(!(sourceFile.exists() && sourceFile.isFile()))
        {
                QMessageBox::warning(this, tr("Not Found!"), tr("<nobr>The selected source file could not be found!</nobr>"));
                return;
        }
 
-       QFileInfo outputDir = QFileInfo(QFileInfo(editOutput->text()).path());
-       if(!(outputDir.exists() && outputDir.isDir() && outputDir.isWritable()))
-       {
-               QMessageBox::warning(this, tr("Not Writable!"), tr("<nobr>Output directory does not exist or is not writable!</nobr>"));
-               return;
-       }
-
-       QFileInfo outputFile = QFileInfo(editOutput->text());
+       //Does output file already exist?
+       QFileInfo outputFile = QFileInfo(this->outputFile());
        if(outputFile.exists() && outputFile.isFile())
        {
                int ret = QMessageBox::question(this, tr("Already Exists!"), tr("<nobr>Output file already exists! Overwrite?</nobr>"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
@@ -295,115 +444,89 @@ void AddJobDialog::accept(void)
        }
        if(outputFile.exists() && (!outputFile.isFile()))
        {
-               QMessageBox::warning(this, tr("Not a File!"), tr("<nobr>Selected output files does not appear to be a file!</nobr>"));
+               QMessageBox::warning(this, tr("Not a File!"), tr("<nobr>Selected output file does not appear to be a valid file!</nobr>"));
                return;
        }
-       if(!editCustomParams->hasAcceptableInput())
+
+       //Is destination dir writable?
+       QFileInfo outputDir = QFileInfo(outputFile.absolutePath());
+       if(!(outputDir.exists() && outputDir.isDir() && outputDir.isWritable()))
        {
-               int ret = QMessageBox::warning(this, tr("Invalid Params"), tr("<nobr>Your custom parameters are invalid and will be discarded!</nobr>"), QMessageBox::Ignore | QMessageBox::Cancel, QMessageBox::Cancel);
-               if(ret != QMessageBox::Ignore) return;
+               QMessageBox::warning(this, tr("Not Writable!"), tr("<nobr>Output directory does not exist or is not writable!</nobr>"));
+               return;
        }
 
-       //Save directories
-       const QString appDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-       QSettings settings(QString("%1/last.ini").arg(appDir), QSettings::IniFormat);
-       if(settings.isWritable())
+       //Custom parameters okay?
+       if(!ui->editCustomX264Params->hasAcceptableInput())
        {
-               settings.setValue("path/directory_openFrom", initialDir_src);
-               settings.setValue("path/directory_saveTo", initialDir_out);
-               settings.sync();
+               int ret = QMessageBox::warning(this, tr("Invalid Params"), tr("<nobr>Your custom parameters are invalid and will be discarded!</nobr>"), QMessageBox::Ignore | QMessageBox::Cancel, QMessageBox::Cancel);
+               if(ret != QMessageBox::Ignore) return;
        }
 
+       //Update recently used
+       m_recentlyUsed->setFilterIndex(currentOutputIndx());
+       m_recentlyUsed->setSourceDirectory(currentSourcePath());
+       m_recentlyUsed->setOutputDirectory(currentOutputPath());
+       RecentlyUsed::saveRecentlyUsed(m_recentlyUsed);
+
+       //Save options
        saveOptions(m_options);
        QDialog::accept();
 }
 
 void AddJobDialog::browseButtonClicked(void)
 {
-       if(QObject::sender() == buttonBrowseSource)
+       if(QObject::sender() == ui->buttonBrowseSource)
        {
-               QString initDir = VALID_DIR(initialDir_src) ? initialDir_src : QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
-               if(!editSource->text().isEmpty()) initDir = QString("%1/%2").arg(initDir, QFileInfo(QDir::fromNativeSeparators(editSource->text())).fileName());
-
-               QString filePath = QFileDialog::getOpenFileName(this, tr("Open Source File"), initDir, makeFileFilter(), NULL, QFileDialog::DontUseNativeDialog);
+               QString filePath = QFileDialog::getOpenFileName(this, tr("Open Source File"), currentSourcePath(true), getInputFilterLst(), NULL, QFileDialog::DontUseNativeDialog);
                if(!(filePath.isNull() || filePath.isEmpty()))
                {
-                       editSource->setText(QDir::toNativeSeparators(filePath));
-                       generateOutputFileName(filePath);
-                       initialDir_src = QFileInfo(filePath).path();
+                       QString destFile = generateOutputFileName(filePath, currentOutputPath(), currentOutputIndx(), m_saveToSourceFolder);
+                       ui->editSource->setText(QDir::toNativeSeparators(filePath));
+                       ui->editOutput->setText(QDir::toNativeSeparators(destFile));
                }
        }
-       else if(QObject::sender() == buttonBrowseOutput)
+       else if(QObject::sender() == ui->buttonBrowseOutput)
        {
-               QString selectedType; QStringList types;
-               types << tr("Matroska Files (*.mkv)");
-               types << tr("MPEG-4 Part 14 Container (*.mp4)");
-               types << tr("H.264 Elementary Stream (*.264)");
-
-               QString initDir = VALID_DIR(initialDir_out) ? initialDir_out : QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
-               if(!editOutput->text().isEmpty()) initDir = QString("%1/%2").arg(initDir, QFileInfo(QDir::fromNativeSeparators(editOutput->text())).completeBaseName());
-
-               QRegExp ext("\\(\\*\\.(.+)\\)");
-               for(int i = 0; i < types.count(); i++)
-               {
-                       if(ext.lastIndexIn(types.at(i)) >= 0)
-                       {
-                               if(QFileInfo(initDir).suffix().compare(ext.cap(1), Qt::CaseInsensitive) == 0)
-                               {
-                                       selectedType = types.at(i);
-                                       break;
-                               }
-                       }
-               }
-
-               QString filePath = QFileDialog::getSaveFileName(this, tr("Choose Output File"), initDir, types.join(";;"), &selectedType, QFileDialog::DontUseNativeDialog | QFileDialog::DontConfirmOverwrite);
+               QString selectedType = getFilterStr(currentOutputIndx());
+               QString filePath = QFileDialog::getSaveFileName(this, tr("Choose Output File"), currentOutputPath(true), getFilterLst(), &selectedType, QFileDialog::DontUseNativeDialog | QFileDialog::DontConfirmOverwrite);
 
                if(!(filePath.isNull() || filePath.isEmpty()))
                {
-                       QString suffix = QFileInfo(filePath).suffix();
-                       bool hasProperExt = false;
-                       for(int i = 0; i < types.count(); i++)
+                       if(getFilterIdx(QFileInfo(filePath).suffix()) < 0)
                        {
-                               if(ext.lastIndexIn(types.at(i)) >= 0)
+                               int tempIndex = -1;
+                               QRegExp regExp("\\(\\*\\.(\\w+)\\)");
+                               if(regExp.lastIndexIn(selectedType) >= 0)
                                {
-                                       if(suffix.compare(ext.cap(1), Qt::CaseInsensitive) == 0)
-                                       {
-                                               hasProperExt = true;
-                                               break;
-                                       }
+                                       tempIndex = getFilterIdx(regExp.cap(1));
                                }
-                       }
-                       if(!hasProperExt)
-                       {
-                               if(ext.lastIndexIn(selectedType) >= 0)
+                               if(tempIndex < 0)
                                {
-                                       if(suffix.compare(ext.cap(1), Qt::CaseInsensitive))
-                                       {
-                                               filePath = QString("%1.%2").arg(filePath, ext.cap(1));
-                                       }
+                                       tempIndex = m_recentlyUsed->filterIndex();
                                }
+                               filePath = QString("%1.%2").arg(filePath, getFilterExt(tempIndex));
                        }
-                       editOutput->setText(QDir::toNativeSeparators(filePath));
-                       initialDir_out = QFileInfo(filePath).path();
+                       ui->editOutput->setText(QDir::toNativeSeparators(filePath));
                }
        }
 }
 
 void AddJobDialog::configurationChanged(void)
 {
-       OptionsModel* options = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(cbxTemplate->currentIndex()).value<void*>());
+       OptionsModel* options = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(ui->cbxTemplate->currentIndex()).value<void*>());
        if(options)
        {
-               cbxTemplate->blockSignals(true);
-               cbxTemplate->insertItem(0, tr("<Unsaved Configuration>"), QVariant::fromValue<void*>(NULL));
-               cbxTemplate->setCurrentIndex(0);
-               cbxTemplate->blockSignals(false);
+               ui->cbxTemplate->blockSignals(true);
+               ui->cbxTemplate->insertItem(0, tr("<Unsaved Configuration>"), QVariant::fromValue<void*>(NULL));
+               ui->cbxTemplate->setCurrentIndex(0);
+               ui->cbxTemplate->blockSignals(false);
        }
 }
 
 void AddJobDialog::templateSelected(void)
 {
-       OptionsModel* options = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(cbxTemplate->currentIndex()).value<void*>());
+       OptionsModel* options = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(ui->cbxTemplate->currentIndex()).value<void*>());
        if(options)
        {
                qDebug("Loading options!");
@@ -411,7 +534,7 @@ void AddJobDialog::templateSelected(void)
                restoreOptions(options);
        }
 
-       modeIndexChanged(cbxRateControlMode->currentIndex());
+       modeIndexChanged(ui->cbxRateControlMode->currentIndex());
 }
 
 void AddJobDialog::saveTemplateButtonClicked(void)
@@ -431,25 +554,30 @@ void AddJobDialog::saveTemplateButtonClicked(void)
        if(options->equals(m_defaults))
        {
                QMessageBox::warning (this, tr("Oups"), tr("<nobr>It makes no sense to save the default settings!</nobr>"));
-               cbxTemplate->blockSignals(true);
-               cbxTemplate->setCurrentIndex(0);
-               cbxTemplate->blockSignals(false);
+               ui->cbxTemplate->blockSignals(true);
+               ui->cbxTemplate->setCurrentIndex(0);
+               ui->cbxTemplate->blockSignals(false);
                REMOVE_USAFED_ITEM;
                X264_DELETE(options);
                return;
        }
 
-       for(int i = 0; i < cbxTemplate->count(); i++)
+       for(int i = 0; i < ui->cbxTemplate->count(); i++)
        {
-               OptionsModel* test = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(i).value<void*>());
+               const QString tempName = ui->cbxTemplate->itemText(i);
+               if(tempName.contains('<') || tempName.contains('>'))
+               {
+                       continue;
+               }
+               OptionsModel* test = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>());
                if(test != NULL)
                {
                        if(options->equals(test))
                        {
                                QMessageBox::warning (this, tr("Oups"), tr("<nobr>There already is a template for the current settings!</nobr>"));
-                               cbxTemplate->blockSignals(true);
-                               cbxTemplate->setCurrentIndex(i);
-                               cbxTemplate->blockSignals(false);
+                               ui->cbxTemplate->blockSignals(true);
+                               ui->cbxTemplate->setCurrentIndex(i);
+                               ui->cbxTemplate->blockSignals(false);
                                REMOVE_USAFED_ITEM;
                                X264_DELETE(options);
                                return;
@@ -495,33 +623,33 @@ void AddJobDialog::saveTemplateButtonClicked(void)
                return;
        }
        
-       int index = cbxTemplate->model()->rowCount();
-       cbxTemplate->blockSignals(true);
-       for(int i = 0; i < cbxTemplate->count(); i++)
+       int index = ui->cbxTemplate->model()->rowCount();
+       ui->cbxTemplate->blockSignals(true);
+       for(int i = 0; i < ui->cbxTemplate->count(); i++)
        {
-               if(cbxTemplate->itemText(i).compare(name, Qt::CaseInsensitive) == 0)
+               if(ui->cbxTemplate->itemText(i).compare(name, Qt::CaseInsensitive) == 0)
                {
                        index = -1; //Do not append new template
-                       OptionsModel *oldItem = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(i).value<void*>());
-                       cbxTemplate->setItemData(i, QVariant::fromValue<void*>(options));
-                       cbxTemplate->setCurrentIndex(i);
+                       OptionsModel *oldItem = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>());
+                       ui->cbxTemplate->setItemData(i, QVariant::fromValue<void*>(options));
+                       ui->cbxTemplate->setCurrentIndex(i);
                        X264_DELETE(oldItem);
                }
        }
        if(index >= 0)
        {
-               cbxTemplate->insertItem(index, name, QVariant::fromValue<void*>(options));
-               cbxTemplate->setCurrentIndex(index);
+               ui->cbxTemplate->insertItem(index, name, QVariant::fromValue<void*>(options));
+               ui->cbxTemplate->setCurrentIndex(index);
        }
-       cbxTemplate->blockSignals(false);
+       ui->cbxTemplate->blockSignals(false);
 
        REMOVE_USAFED_ITEM;
 }
 
 void AddJobDialog::deleteTemplateButtonClicked(void)
 {
-       const int index = cbxTemplate->currentIndex();
-       QString name = cbxTemplate->itemText(index);
+       const int index = ui->cbxTemplate->currentIndex();
+       QString name = ui->cbxTemplate->itemText(index);
 
        if(name.contains('<') || name.contains('>') || name.contains('\\') || name.contains('/'))
        {
@@ -537,23 +665,118 @@ void AddJobDialog::deleteTemplateButtonClicked(void)
 
 
        OptionsModel::deleteTemplate(name);
-       OptionsModel *item = reinterpret_cast<OptionsModel*>(cbxTemplate->itemData(index).value<void*>());
-       cbxTemplate->removeItem(index);
+       OptionsModel *item = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(index).value<void*>());
+       ui->cbxTemplate->removeItem(index);
        X264_DELETE(item);
 }
 
+void AddJobDialog::editorActionTriggered(void)
+{
+
+       if(QAction *action = dynamic_cast<QAction*>(QObject::sender()))
+       {
+               QLineEdit *lineEdit = reinterpret_cast<QLineEdit*>(action->data().value<void*>());
+               
+               EditorDialog *editor = new EditorDialog(this);
+               editor->setEditText(lineEdit->text());
+
+               if(editor->exec() == QDialog::Accepted)
+               {
+                       lineEdit->setText(editor->getEditText());
+               }
+
+               X264_DELETE(editor);
+       }
+}
+
+void AddJobDialog::copyActionTriggered(void)
+{
+       if(QAction *action = dynamic_cast<QAction*>(QObject::sender()))
+       {
+               QClipboard *clipboard = QApplication::clipboard();
+               QLineEdit *lineEdit = reinterpret_cast<QLineEdit*>(action->data().value<void*>());
+               QString text = lineEdit->hasSelectedText() ? lineEdit->selectedText() : lineEdit->text();
+               clipboard->setText(text);
+       }
+}
+
+void AddJobDialog::pasteActionTriggered(void)
+{
+       if(QAction *action = dynamic_cast<QAction*>(QObject::sender()))
+       {
+               QClipboard *clipboard = QApplication::clipboard();
+               QLineEdit *lineEdit = reinterpret_cast<QLineEdit*>(action->data().value<void*>());
+               QString text = clipboard->text();
+               if(!text.isEmpty()) lineEdit->setText(text);
+       }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Public functions
 ///////////////////////////////////////////////////////////////////////////////
 
 QString AddJobDialog::sourceFile(void)
 {
-       return QDir::fromNativeSeparators(editSource->text());
+       return QDir::fromNativeSeparators(ui->editSource->text());
 }
 
 QString AddJobDialog::outputFile(void)
 {
-       return QDir::fromNativeSeparators(editOutput->text());
+       return QDir::fromNativeSeparators(ui->editOutput->text());
+}
+
+QString AddJobDialog::preset(void)
+{
+       return ui->cbxPreset->itemText(ui->cbxPreset->currentIndex());
+}
+
+QString AddJobDialog::tuning(void)
+{
+       return ui->cbxTuning->itemText(ui->cbxTuning->currentIndex());
+}
+
+QString AddJobDialog::profile(void)
+{
+       return ui->cbxProfile->itemText(ui->cbxProfile->currentIndex());
+}
+
+QString AddJobDialog::params(void)
+{
+       return ui->editCustomX264Params->text().simplified();
+}
+
+bool AddJobDialog::runImmediately(void)
+{
+       return ui->checkBoxRun->isChecked();
+}
+
+bool AddJobDialog::applyToAll(void)
+{
+       return ui->checkBoxApplyToAll->isChecked();
+}
+
+void AddJobDialog::setRunImmediately(bool run)
+{
+       ui->checkBoxRun->setChecked(run);
+}
+
+void AddJobDialog::setSourceFile(const QString &path)
+{
+       ui->editSource->setText(QDir::toNativeSeparators(path));
+}
+
+void AddJobDialog::setOutputFile(const QString &path)
+{
+       ui->editOutput->setText(QDir::toNativeSeparators(path));}
+
+void AddJobDialog::setSourceEditable(const bool editable)
+{
+       ui->buttonBrowseSource->setEnabled(editable);
+}
+
+void AddJobDialog::setApplyToAllVisible(const bool visible)
+{
+       ui->checkBoxApplyToAll->setVisible(visible);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -562,8 +785,8 @@ QString AddJobDialog::outputFile(void)
 
 void AddJobDialog::loadTemplateList(void)
 {
-       cbxTemplate->addItem(tr("<Default>"), QVariant::fromValue<void*>(m_defaults));
-       cbxTemplate->setCurrentIndex(0);
+       ui->cbxTemplate->addItem(tr("<Default>"), QVariant::fromValue<void*>(m_defaults));
+       ui->cbxTemplate->setCurrentIndex(0);
 
        QMap<QString, OptionsModel*> templates = OptionsModel::loadAllTemplates();
        QStringList templateNames = templates.keys();
@@ -572,18 +795,18 @@ void AddJobDialog::loadTemplateList(void)
        while(!templateNames.isEmpty())
        {
                QString current = templateNames.takeFirst();
-               cbxTemplate->addItem(current, QVariant::fromValue<void*>(templates.value(current)));
+               ui->cbxTemplate->addItem(current, QVariant::fromValue<void*>(templates.value(current)));
 
                if(templates.value(current)->equals(m_options))
                {
-                       cbxTemplate->setCurrentIndex(cbxTemplate->count() - 1);
+                       ui->cbxTemplate->setCurrentIndex(ui->cbxTemplate->count() - 1);
                }
        }
 
-       if((cbxTemplate->currentIndex() == 0) && (!m_options->equals(m_defaults)))
+       if((ui->cbxTemplate->currentIndex() == 0) && (!m_options->equals(m_defaults)))
        {
-               cbxTemplate->insertItem(1, tr("<Recently Used>"), QVariant::fromValue<void*>(m_options));
-               cbxTemplate->setCurrentIndex(1);
+               ui->cbxTemplate->insertItem(1, tr("<Recently Used>"), QVariant::fromValue<void*>(m_options));
+               ui->cbxTemplate->setCurrentIndex(1);
        }
 }
 
@@ -601,43 +824,188 @@ void AddJobDialog::updateComboBox(QComboBox *cbox, const QString &text)
 
 void AddJobDialog::restoreOptions(OptionsModel *options)
 {
-       cbxRateControlMode->blockSignals(true);
-       spinQuantizer->blockSignals(true);
-       spinBitrate->blockSignals(true);
-       cbxPreset->blockSignals(true);
-       cbxTuning->blockSignals(true);
-       cbxProfile->blockSignals(true);
-       editCustomParams->blockSignals(true);
-
-       cbxRateControlMode->setCurrentIndex(options->rcMode());
-       spinQuantizer->setValue(options->quantizer());
-       spinBitrate->setValue(options->bitrate());
-       updateComboBox(cbxPreset, options->preset());
-       updateComboBox(cbxTuning, options->tune());
-       updateComboBox(cbxProfile, options->profile());
-       editCustomParams->setText(options->custom());
-
-       cbxRateControlMode->blockSignals(false);
-       spinQuantizer->blockSignals(false);
-       spinBitrate->blockSignals(false);
-       cbxPreset->blockSignals(false);
-       cbxTuning->blockSignals(false);
-       cbxProfile->blockSignals(false);
-       editCustomParams->blockSignals(false);
+       ui->cbxRateControlMode->blockSignals(true);
+       ui->spinQuantizer->blockSignals(true);
+       ui->spinBitrate->blockSignals(true);
+       ui->cbxPreset->blockSignals(true);
+       ui->cbxTuning->blockSignals(true);
+       ui->cbxProfile->blockSignals(true);
+       ui->editCustomX264Params->blockSignals(true);
+       ui->editCustomAvs2YUVParams->blockSignals(true);
+
+       ui->cbxRateControlMode->setCurrentIndex(options->rcMode());
+       ui->spinQuantizer->setValue(options->quantizer());
+       ui->spinBitrate->setValue(options->bitrate());
+       updateComboBox(ui->cbxPreset, options->preset());
+       updateComboBox(ui->cbxTuning, options->tune());
+       updateComboBox(ui->cbxProfile, options->profile());
+       ui->editCustomX264Params->setText(options->customX264());
+       ui->editCustomAvs2YUVParams->setText(options->customAvs2YUV());
+
+       ui->cbxRateControlMode->blockSignals(false);
+       ui->spinQuantizer->blockSignals(false);
+       ui->spinBitrate->blockSignals(false);
+       ui->cbxPreset->blockSignals(false);
+       ui->cbxTuning->blockSignals(false);
+       ui->cbxProfile->blockSignals(false);
+       ui->editCustomX264Params->blockSignals(false);
+       ui->editCustomAvs2YUVParams->blockSignals(false);
 }
 
 void AddJobDialog::saveOptions(OptionsModel *options)
 {
-       options->setRCMode(static_cast<OptionsModel::RCMode>(cbxRateControlMode->currentIndex()));
-       options->setQuantizer(spinQuantizer->value());
-       options->setBitrate(spinBitrate->value());
-       options->setPreset(cbxPreset->model()->data(cbxPreset->model()->index(cbxPreset->currentIndex(), 0)).toString());
-       options->setTune(cbxTuning->model()->data(cbxTuning->model()->index(cbxTuning->currentIndex(), 0)).toString());
-       options->setProfile(cbxProfile->model()->data(cbxProfile->model()->index(cbxProfile->currentIndex(), 0)).toString());
-       options->setCustom(editCustomParams->hasAcceptableInput() ? editCustomParams->text().simplified() : QString());
+       options->setRCMode(static_cast<OptionsModel::RCMode>(ui->cbxRateControlMode->currentIndex()));
+       options->setQuantizer(ui->spinQuantizer->value());
+       options->setBitrate(ui->spinBitrate->value());
+       options->setPreset(ui->cbxPreset->model()->data(ui->cbxPreset->model()->index(ui->cbxPreset->currentIndex(), 0)).toString());
+       options->setTune(ui->cbxTuning->model()->data(ui->cbxTuning->model()->index(ui->cbxTuning->currentIndex(), 0)).toString());
+       options->setProfile(ui->cbxProfile->model()->data(ui->cbxProfile->model()->index(ui->cbxProfile->currentIndex(), 0)).toString());
+       options->setCustomX264(ui->editCustomX264Params->hasAcceptableInput() ? ui->editCustomX264Params->text().simplified() : QString());
+       options->setCustomAvs2YUV(ui->editCustomAvs2YUVParams->hasAcceptableInput() ? ui->editCustomAvs2YUVParams->text().simplified() : QString());
+}
+
+QString AddJobDialog::currentSourcePath(const bool bWithName)
+{
+       QString path = m_recentlyUsed->sourceDirectory();
+       QString currentSourceFile = this->sourceFile();
+       
+       if(!currentSourceFile.isEmpty())
+       {
+               QString currentSourceDir = QFileInfo(currentSourceFile).absolutePath();
+               if(VALID_DIR(currentSourceDir))
+               {
+                       path = currentSourceDir;
+               }
+               if(bWithName)
+               {
+                       path.append("/").append(QFileInfo(currentSourceFile).fileName());
+               }
+       }
+
+       return path;
+}
+
+QString AddJobDialog::currentOutputPath(const bool bWithName)
+{
+       QString path = m_recentlyUsed->outputDirectory();
+       QString currentOutputFile = this->outputFile();
+       
+       if(!currentOutputFile.isEmpty())
+       {
+               QString currentOutputDir = QFileInfo(currentOutputFile).absolutePath();
+               if(VALID_DIR(currentOutputDir))
+               {
+                       path = currentOutputDir;
+               }
+               if(bWithName)
+               {
+                       path.append("/").append(QFileInfo(currentOutputFile).fileName());
+               }
+       }
+
+       return path;
 }
 
-QString AddJobDialog::makeFileFilter(void)
+int AddJobDialog::currentOutputIndx(void)
+{
+       int index = m_recentlyUsed->filterIndex();
+       QString currentOutputFile = this->outputFile();
+       
+       if(!currentOutputFile.isEmpty())
+       {
+               const QString currentOutputExtn = QFileInfo(currentOutputFile).suffix();
+               const int tempIndex = getFilterIdx(currentOutputExtn);
+               if(tempIndex >= 0)
+               {
+                       index = tempIndex;
+               }
+       }
+
+       return index;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Static functions
+///////////////////////////////////////////////////////////////////////////////
+
+QString AddJobDialog::generateOutputFileName(const QString &sourceFilePath, const QString &destinationDirectory, const int filterIndex, const bool saveToSourceDir)
+{
+       QString name = QFileInfo(sourceFilePath).completeBaseName();
+       QString path = saveToSourceDir ? QFileInfo(sourceFilePath).canonicalPath() : destinationDirectory;
+       QString fext = getFilterExt(filterIndex);
+       
+       if(!VALID_DIR(path))
+       {
+               RecentlyUsed defaults;
+               path = defaults.outputDirectory();
+       }
+
+       QString outPath = QString("%1/%2.%3").arg(path, name, fext);
+
+       int n = 2;
+       while(QFileInfo(outPath).exists())
+       {
+               outPath = QString("%1/%2 (%3).%4").arg(path, name, QString::number(n++), fext);
+       }
+
+       return outPath;
+}
+
+/* ------------------------------------------------------------------------- */
+
+QString AddJobDialog::getFilterExt(const int filterIndex)
+{
+       const int count = ARRAY_SIZE(X264_FILE_TYPE_FILTERS);
+
+       if((filterIndex >= 0) && (filterIndex < count))
+       {
+               return QString::fromLatin1(X264_FILE_TYPE_FILTERS[filterIndex].pcExt);
+       }
+
+       return QString::fromLatin1(X264_FILE_TYPE_FILTERS[0].pcExt);
+}
+
+int AddJobDialog::getFilterIdx(const QString &fileExt)
+{
+       const int count = ARRAY_SIZE(X264_FILE_TYPE_FILTERS);
+
+       for(int i = 0; i < count; i++)
+       {
+               if(fileExt.compare(QString::fromLatin1(X264_FILE_TYPE_FILTERS[i].pcExt), Qt::CaseInsensitive) == 0)
+               {
+                       return i;
+               }
+       }
+
+       return -1;
+}
+
+QString AddJobDialog::getFilterStr(const int filterIndex)
+{
+       const int count = ARRAY_SIZE(X264_FILE_TYPE_FILTERS);
+
+       if((filterIndex >= 0) && (filterIndex < count))
+       {
+               return QString("%1 (*.%2)").arg(QString::fromLatin1(X264_FILE_TYPE_FILTERS[filterIndex].pcStr), QString::fromLatin1(X264_FILE_TYPE_FILTERS[filterIndex].pcExt));
+       }
+
+       return QString("%1 (*.%2)").arg(QString::fromLatin1(X264_FILE_TYPE_FILTERS[0].pcStr), QString::fromLatin1(X264_FILE_TYPE_FILTERS[0].pcExt));
+}
+
+QString AddJobDialog::getFilterLst(void)
+{
+       QStringList filters;
+       const int count = ARRAY_SIZE(X264_FILE_TYPE_FILTERS);
+       
+       for(int i = 0; i < count; i++)
+       {
+               filters << QString("%1 (*.%2)").arg(QString::fromLatin1(X264_FILE_TYPE_FILTERS[i].pcStr), QString::fromLatin1(X264_FILE_TYPE_FILTERS[i].pcExt));
+       }
+
+       return filters.join(";;");
+}
+
+QString AddJobDialog::getInputFilterLst(void)
 {
        static const struct
        {
@@ -647,48 +1015,32 @@ QString AddJobDialog::makeFileFilter(void)
        s_filters[] =
        {
                {"Avisynth Scripts", "avs"},
+               {"VapourSynth Scripts", "vpy"},
                {"Matroska Files", "mkv"},
                {"MPEG-4 Part 14 Container", "mp4"},
                {"Audio Video Interleaved", "avi"},
                {"Flash Video", "flv"},
                {"YUV4MPEG2 Stream", "y4m"},
                {"Uncompresses YUV Data", "yuv"},
-               {NULL, NULL}
        };
 
-       QString filters("All supported files (");
+       const int count = ARRAY_SIZE(s_filters);
 
-       for(size_t index = 0; s_filters[index].name && s_filters[index].fext; index++)
+       QString allTypes;
+       for(size_t index = 0; index < count; index++)
        {
-               filters += QString((index > 0) ? " *.%1" : "*.%1").arg(QString::fromLatin1(s_filters[index].fext));
-       }
-
-       filters += QString(");;");
 
-       for(size_t index = 0; s_filters[index].name && s_filters[index].fext; index++)
-       {
-               filters += QString("%1 (*.%2);;").arg(QString::fromLatin1(s_filters[index].name), QString::fromLatin1(s_filters[index].fext));
+               allTypes += QString((index > 0) ? " *.%1" : "*.%1").arg(QString::fromLatin1(s_filters[index].fext));
        }
-               
-       filters += QString("All files (*.*)");
-       return filters;
-}
-
-void AddJobDialog::generateOutputFileName(const QString &filePath)
-{
-       QString name = QFileInfo(filePath).completeBaseName();
-       QString path = VALID_DIR(initialDir_out) ? initialDir_out : QFileInfo(filePath).path();
-                       
-       QString outPath = QString("%1/%2.mkv").arg(path, name);
+       
+       QStringList filters;
+       filters << QString("All supported files (%1)").arg(allTypes);
 
-       if(QFileInfo(outPath).exists())
+       for(size_t index = 0; index < count; index++)
        {
-               int i = 2;
-               while(QFileInfo(outPath).exists())
-               {
-                       outPath = QString("%1/%2 (%3).mkv").arg(path, name, QString::number(i++));
-               }
+               filters << QString("%1 (*.%2)").arg(QString::fromLatin1(s_filters[index].name), QString::fromLatin1(s_filters[index].fext));
        }
-
-       editOutput->setText(QDir::toNativeSeparators(outPath));
+               
+       filters << QString("All files (*.*)");
+       return filters.join(";;");
 }