Fixed regression in previous commit.
This commit is contained in:
parent
74ac7077a6
commit
74edad10e7
@ -285,7 +285,7 @@ QModelIndex JobListModel::insertJob(EncodeThread *thread)
|
||||
m_details.insert(id, tr("Not started yet."));
|
||||
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(messageLogged(QUuid, QString)), logFile, SLOT(addLogMessage(QUuid, QString)), Qt::QueuedConnection);
|
||||
connect(thread, SIGNAL(detailsChanged(QUuid, QString)), this, SLOT(updateDetails(QUuid, QString)), Qt::QueuedConnection);
|
||||
|
@ -21,8 +21,8 @@
|
||||
|
||||
#define VER_X264_MAJOR 2
|
||||
#define VER_X264_MINOR 1
|
||||
#define VER_X264_PATCH 5
|
||||
#define VER_X264_BUILD 497
|
||||
#define VER_X264_PATCH 6
|
||||
#define VER_X264_BUILD 502
|
||||
|
||||
#define VER_X264_MINIMUM_REV 2282
|
||||
#define VER_X264_CURRENT_API 133
|
||||
|
@ -84,7 +84,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures)
|
||||
//Register meta types
|
||||
qRegisterMetaType<QUuid>("QUuid");
|
||||
qRegisterMetaType<QUuid>("DWORD");
|
||||
qRegisterMetaType<JobStatus>("EncodeThread::JobStatus");
|
||||
qRegisterMetaType<JobStatus>("JobStatus");
|
||||
|
||||
//Load preferences
|
||||
m_preferences = new PreferencesModel();
|
||||
|
@ -44,6 +44,12 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, PreferencesModel *preferen
|
||||
setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint));
|
||||
setFixedSize(minimumSize());
|
||||
|
||||
if(WId hWindow = this->winId())
|
||||
{
|
||||
HMENU hMenu = GetSystemMenu(hWindow, 0);
|
||||
EnableMenuItem(hMenu, SC_CLOSE, MF_BYCOMMAND | MF_GRAYED);
|
||||
}
|
||||
|
||||
labelRunNextJob->installEventFilter(this);
|
||||
labelUse10BitEncoding->installEventFilter(this);
|
||||
labelUse64BitAvs2YUV->installEventFilter(this);
|
||||
|
Loading…
Reference in New Issue
Block a user