Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Fixed regression in previous commit.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-07-03 23:56:41 +02:00
parent 74ac7077a6
commit 74edad10e7
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model_jobList.cpp
View File

@ -285,7 +285,7 @@ QModelIndex JobListModel::insertJob(EncodeThread *thread)
m_details.insert(id, tr("Not started yet.")); m_details.insert(id, tr("Not started yet."));
endInsertRows(); endInsertRows();
connect(thread, SIGNAL(statusChanged(QUuid, EncodeThread::JobStatus)), this, SLOT(updateStatus(QUuid, EncodeThread::JobStatus)), Qt::QueuedConnection); connect(thread, SIGNAL(statusChanged(QUuid, JobStatus)), this, SLOT(updateStatus(QUuid, JobStatus)), Qt::QueuedConnection);
connect(thread, SIGNAL(progressChanged(QUuid, unsigned int)), this, SLOT(updateProgress(QUuid, unsigned int)), Qt::QueuedConnection); connect(thread, SIGNAL(progressChanged(QUuid, unsigned int)), this, SLOT(updateProgress(QUuid, unsigned int)), Qt::QueuedConnection);
connect(thread, SIGNAL(messageLogged(QUuid, QString)), logFile, SLOT(addLogMessage(QUuid, QString)), Qt::QueuedConnection); connect(thread, SIGNAL(messageLogged(QUuid, QString)), logFile, SLOT(addLogMessage(QUuid, QString)), Qt::QueuedConnection);
connect(thread, SIGNAL(detailsChanged(QUuid, QString)), this, SLOT(updateDetails(QUuid, QString)), Qt::QueuedConnection); connect(thread, SIGNAL(detailsChanged(QUuid, QString)), this, SLOT(updateDetails(QUuid, QString)), Qt::QueuedConnection);

4
src/version.h
View File

@ -21,8 +21,8 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 1 #define VER_X264_MINOR 1
#define VER_X264_PATCH 5 #define VER_X264_PATCH 6
#define VER_X264_BUILD 497 #define VER_X264_BUILD 502
#define VER_X264_MINIMUM_REV 2282 #define VER_X264_MINIMUM_REV 2282
#define VER_X264_CURRENT_API 133 #define VER_X264_CURRENT_API 133

2
src/win_main.cpp
View File

@ -84,7 +84,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures)
//Register meta types //Register meta types
qRegisterMetaType<QUuid>("QUuid"); qRegisterMetaType<QUuid>("QUuid");
qRegisterMetaType<QUuid>("DWORD"); qRegisterMetaType<QUuid>("DWORD");
qRegisterMetaType<JobStatus>("EncodeThread::JobStatus"); qRegisterMetaType<JobStatus>("JobStatus");
//Load preferences //Load preferences
m_preferences = new PreferencesModel(); m_preferences = new PreferencesModel();

6
src/win_preferences.cpp
View File

@ -44,6 +44,12 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, PreferencesModel *preferen
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint)); setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
setFixedSize(minimumSize()); setFixedSize(minimumSize());
if(WId hWindow = this->winId())
{
HMENU hMenu = GetSystemMenu(hWindow, 0);
EnableMenuItem(hMenu, SC_CLOSE, MF_BYCOMMAND | MF_GRAYED);
}
labelRunNextJob->installEventFilter(this); labelRunNextJob->installEventFilter(this);
labelUse10BitEncoding->installEventFilter(this); labelUse10BitEncoding->installEventFilter(this);
labelUse64BitAvs2YUV->installEventFilter(this); labelUse64BitAvs2YUV->installEventFilter(this);