Fixed a small bug: When adding multiple files and enabling the "Apply To All Files...

diff --git a/ReadMe.txt b/ReadMe.txt
index ff225cb..1f1506f 100644 (file)
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,5 +1,5 @@
 Simple x264 Launcher - use 64-Bit x264 with 32-Bit Avisynth
-Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
 
 
 1. Introduction

diff --git a/src/global.cpp b/src/global.cpp
index e854723..9a80922 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -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

diff --git a/src/global.h b/src/global.h
index 9381df2..98cd836 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -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

diff --git a/src/main.cpp b/src/main.cpp
index 5e64ce2..738b167 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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

diff --git a/src/model_jobList.cpp b/src/model_jobList.cpp
index f5b359a..5b0a19e 100644 (file)
--- a/src/model_jobList.cpp
+++ b/src/model_jobList.cpp
@@ -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
@@ -222,7 +222,6 @@ QVariant JobListModel::data(const QModelIndex &index, int role) const
 QModelIndex JobListModel::insertJob(EncodeThread *thread)
 {
        QUuid id = thread->getId();
-       LogFileModel *logFile = NULL;
 
        if(m_jobs.contains(id))
        {
@@ -268,14 +267,16 @@ QModelIndex JobListModel::insertJob(EncodeThread *thread)
                }
                break;
        }
-
+       
+       LogFileModel *logFile = new LogFileModel(thread->sourceFileName(), thread->outputFileName(), config);
+       
        beginInsertRows(QModelIndex(), m_jobs.count(), m_jobs.count());
        m_jobs.append(id);
        m_name.insert(id, jobName);
        m_status.insert(id, EncodeThread::JobStatus_Enqueued);
        m_progress.insert(id, 0);
        m_threads.insert(id, thread);
-       m_logFile.insert(id, (logFile = new LogFileModel));
+       m_logFile.insert(id, logFile);
        m_details.insert(id, tr("Not started yet."));
        endInsertRows();
 

diff --git a/src/model_jobList.h b/src/model_jobList.h
index 9880b7a..145b2cb 100644 (file)
--- a/src/model_jobList.h
+++ b/src/model_jobList.h
@@ -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

diff --git a/src/model_logFile.cpp b/src/model_logFile.cpp
index 55d8e80..c5fb702 100644 (file)
--- a/src/model_logFile.cpp
+++ b/src/model_logFile.cpp
@@ -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
@@ -25,10 +25,14 @@
 #include <QIcon>
 #include <QApplication>
 #include <QClipboard>
+#include <QDir>
 
-LogFileModel::LogFileModel(void)
+LogFileModel::LogFileModel(const QString &sourceName, const QString &outputName, const QString &configName)
 {
-       m_lines << "Job not started yet.";
+       m_lines << "Job not started yet." << QString();
+       m_lines << QString("Scheduled source: %1").arg(QDir::toNativeSeparators(sourceName));
+       m_lines << QString("Scheduled output: %1").arg(QDir::toNativeSeparators(outputName));
+       m_lines << QString("Scheduled config: %1").arg(configName);
        m_firstLine = true;
 }
 

diff --git a/src/model_logFile.h b/src/model_logFile.h
index 855714e..235e617 100644 (file)
--- a/src/model_logFile.h
+++ b/src/model_logFile.h
@@ -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
@@ -33,7 +33,7 @@ class LogFileModel : public QAbstractItemModel
        Q_OBJECT
                
 public:
-       LogFileModel(void);
+       LogFileModel(const QString &sourceName, const QString &outputName, const QString &configName);
        ~LogFileModel(void);
 
        virtual int columnCount(const QModelIndex &parent) const;

diff --git a/src/model_options.cpp b/src/model_options.cpp
index e5b89bd..1abbe09 100644 (file)
--- a/src/model_options.cpp
+++ b/src/model_options.cpp
@@ -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

diff --git a/src/model_options.h b/src/model_options.h
index ae65ea5..20fa814 100644 (file)
--- a/src/model_options.h
+++ b/src/model_options.h
@@ -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

diff --git a/src/taskbar7.cpp b/src/taskbar7.cpp
index 2b377d4..0c10288 100644 (file)
--- a/src/taskbar7.cpp
+++ b/src/taskbar7.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// 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

diff --git a/src/taskbar7.h b/src/taskbar7.h
index 81df2d0..fb9fd0c 100644 (file)
--- a/src/taskbar7.h
+++ b/src/taskbar7.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// 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

diff --git a/src/thread_avisynth.cpp b/src/thread_avisynth.cpp
index 5240b02..8abb4b1 100644 (file)
--- a/src/thread_avisynth.cpp
+++ b/src/thread_avisynth.cpp
@@ -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

diff --git a/src/thread_avisynth.h b/src/thread_avisynth.h
index 54d3421..9e18855 100644 (file)
--- a/src/thread_avisynth.h
+++ b/src/thread_avisynth.h
@@ -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

diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp
index 820dc0d..8d1e818 100644 (file)
--- a/src/thread_encode.cpp
+++ b/src/thread_encode.cpp
@@ -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
@@ -203,8 +203,8 @@ void EncodeThread::encode(void)
        //Print some basic info
        log(tr("Simple x264 Launcher (Build #%1), built %2\n").arg(QString::number(x264_version_build()), x264_version_date().toString(Qt::ISODate)));
        log(tr("Job started at %1, %2.\n").arg(QDate::currentDate().toString(Qt::ISODate), QTime::currentTime().toString( Qt::ISODate)));
-       log(tr("Source file: %1").arg(m_sourceFileName));
-       log(tr("Output file: %1").arg(m_outputFileName));
+       log(tr("Source file: %1").arg(QDir::toNativeSeparators(m_sourceFileName)));
+       log(tr("Output file: %1").arg(QDir::toNativeSeparators(m_outputFileName)));
        
        //Print encoder settings
        log(tr("\n--- SETTINGS ---\n"));

diff --git a/src/thread_encode.h b/src/thread_encode.h
index 0ed9b37..52c94b1 100644 (file)
--- a/src/thread_encode.h
+++ b/src/thread_encode.h
@@ -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

diff --git a/src/thread_ipc.cpp b/src/thread_ipc.cpp
index 45fe4e3..a1b0a34 100644 (file)
--- a/src/thread_ipc.cpp
+++ b/src/thread_ipc.cpp
@@ -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

diff --git a/src/thread_ipc.h b/src/thread_ipc.h
index e054e5f..eb5bf16 100644 (file)
--- a/src/thread_ipc.h
+++ b/src/thread_ipc.h
@@ -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

diff --git a/src/version.h b/src/version.h
index 4d6d7bf..4d1bb26 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -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
@@ -22,7 +22,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 1
 #define VER_X264_PATCH 1
-#define VER_X264_BUILD 460
+#define VER_X264_BUILD 465
 
 #define VER_X264_MINIMUM_REV 2282
 #define VER_X264_CURRENT_API 132

diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp
index a0315b6..d62fbb5 100644 (file)
--- a/src/win_addJob.cpp
+++ b/src/win_addJob.cpp
@@ -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

diff --git a/src/win_addJob.h b/src/win_addJob.h
index 093fa71..78db156 100644 (file)
--- a/src/win_addJob.h
+++ b/src/win_addJob.h
@@ -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

diff --git a/src/win_editor.cpp b/src/win_editor.cpp
index 1f305aa..1053ea9 100644 (file)
--- a/src/win_editor.cpp
+++ b/src/win_editor.cpp
@@ -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

diff --git a/src/win_editor.h b/src/win_editor.h
index bd678f2..d90d9a7 100644 (file)
--- a/src/win_editor.h
+++ b/src/win_editor.h
@@ -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

diff --git a/src/win_help.cpp b/src/win_help.cpp
index 367b08d..a3cce3b 100644 (file)
--- a/src/win_help.cpp
+++ b/src/win_help.cpp
@@ -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

diff --git a/src/win_help.h b/src/win_help.h
index bcd7fc7..d60a8ca 100644 (file)
--- a/src/win_help.h
+++ b/src/win_help.h
@@ -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

diff --git a/src/win_main.cpp b/src/win_main.cpp
index 68a8606..f376bdf 100644 (file)
--- a/src/win_main.cpp
+++ b/src/win_main.cpp
@@ -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
@@ -1063,7 +1063,7 @@ bool MainWindow::createJobMultiple(const QStringList &filePathIn)
        int counter = 0;
 
        //Add files individually
-       for(iter = filePathIn.constBegin(); iter != filePathIn.constEnd(); iter++)
+       for(iter = filePathIn.constBegin(); (iter != filePathIn.constEnd()) && (!applyToAll); iter++)
        {
                runImmediately = (countRunningJobs() < (m_preferences.autoRunNextJob ? m_preferences.maxRunningJobCount : 1));
                QString sourceFileName(*iter), outputFileName;
@@ -1071,7 +1071,6 @@ bool MainWindow::createJobMultiple(const QStringList &filePathIn)
                {
                        if(appendJob(sourceFileName, outputFileName, m_options, runImmediately))
                        {
-                               if(applyToAll) break;
                                continue;
                        }
                }

diff --git a/src/win_main.h b/src/win_main.h
index bc1b030..410c6ff 100644 (file)
--- a/src/win_main.h
+++ b/src/win_main.h
@@ -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

diff --git a/src/win_preferences.cpp b/src/win_preferences.cpp
index 8bbf28f..f8e907a 100644 (file)
--- a/src/win_preferences.cpp
+++ b/src/win_preferences.cpp
@@ -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

diff --git a/src/win_preferences.h b/src/win_preferences.h
index 6a6c81c..2f07a86 100644 (file)
--- a/src/win_preferences.h
+++ b/src/win_preferences.h
@@ -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

diff --git a/x264_launcher.rc b/x264_launcher.rc
index 08caf8a..32845db 100644 (file)
Binary files a/x264_launcher.rc and b/x264_launcher.rc differ