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

Code simplification: Removed the "m_status" member variable. Instead, application will be considered 'ready' when file timer is not running *and* no modal dialog is visible.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-05-18 21:59:26 +02:00
parent 214cdc4e30
commit f79633e597
3 changed files with 70 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 4 #define VER_X264_MINOR 4
#define VER_X264_PATCH 0 #define VER_X264_PATCH 0
#define VER_X264_BUILD 874 #define VER_X264_BUILD 876
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)

120
src/win_main.cpp
View File

@ -73,10 +73,11 @@ static const char *tpl_last = "<LAST_USED>";
#define SET_FONT_BOLD(WIDGET,BOLD) do { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); } while(0) #define SET_FONT_BOLD(WIDGET,BOLD) do { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); } while(0)
#define SET_TEXT_COLOR(WIDGET,COLOR) do { QPalette _palette = WIDGET->palette(); _palette.setColor(QPalette::WindowText, (COLOR)); _palette.setColor(QPalette::Text, (COLOR)); WIDGET->setPalette(_palette); } while(0) #define SET_TEXT_COLOR(WIDGET,COLOR) do { QPalette _palette = WIDGET->palette(); _palette.setColor(QPalette::WindowText, (COLOR)); _palette.setColor(QPalette::Text, (COLOR)); WIDGET->setPalette(_palette); } while(0)
#define LINK(URL) (QString("<a href=\"%1\">%1</a>").arg((URL))) #define LINK(URL) (QString("<a href=\"%1\">%1</a>").arg((URL)))
#define INIT_ERROR_EXIT() do { m_status = STATUS_EXITTING; close(); qApp->exit(-1); return; } while(0) #define INIT_ERROR_EXIT() do { close(); qApp->exit(-1); return; } while(0)
#define ENSURE_APP_IS_IDLE() do { if(m_status != STATUS_IDLE) { x264_beep(x264_beep_warning); qWarning("Cannot perfrom this action at this time!"); return; } } while(0)
#define NEXT(X) ((*reinterpret_cast<int*>(&(X)))++) #define NEXT(X) ((*reinterpret_cast<int*>(&(X)))++)
#define SETUP_WEBLINK(OBJ, URL) do { (OBJ)->setData(QVariant(QUrl(URL))); connect((OBJ), SIGNAL(triggered()), this, SLOT(showWebLink())); } while(0) #define SETUP_WEBLINK(OBJ, URL) do { (OBJ)->setData(QVariant(QUrl(URL))); connect((OBJ), SIGNAL(triggered()), this, SLOT(showWebLink())); } while(0)
#define APP_IS_READY (m_initialized && (!m_fileTimer->isActive()) && (QApplication::activeModalWidget() == NULL))
#define ENSURE_APP_IS_READY() do { if(!APP_IS_READY) { x264_beep(x264_beep_warning); qWarning("Cannot perfrom this action at this time!"); return; } } while(0)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Constructor & Destructor // Constructor & Destructor
@ -94,7 +95,7 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures, IPC *ipc)
m_pendingFiles(new QStringList()), m_pendingFiles(new QStringList()),
m_preferences(NULL), m_preferences(NULL),
m_recentlyUsed(NULL), m_recentlyUsed(NULL),
m_status(STATUS_PRE_INIT), m_initialized(false),
m_sysTray(new QSystemTrayIcon(this)), m_sysTray(new QSystemTrayIcon(this)),
ui(new Ui::MainWindow()) ui(new Ui::MainWindow())
{ {
@ -246,6 +247,10 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures, IPC *ipc)
connect(m_inputFilter_checkUp, SIGNAL(mouseClicked(int)), this, SLOT(checkUpdates())); connect(m_inputFilter_checkUp, SIGNAL(mouseClicked(int)), this, SLOT(checkUpdates()));
checkUp->hide(); checkUp->hide();
ui->menubar->setCornerWidget(checkUp); ui->menubar->setCornerWidget(checkUp);
//Create timer
m_fileTimer = new QTimer(this);
connect(m_fileTimer, SIGNAL(timeout()), this, SLOT(handlePendingFiles()));
} }
/* /*
@ -253,7 +258,6 @@ MainWindow::MainWindow(const x264_cpu_t *const cpuFeatures, IPC *ipc)
*/ */
MainWindow::~MainWindow(void) MainWindow::~MainWindow(void)
{ {
m_status = STATUS_EXITTING;
OptionsModel::saveTemplate(m_options, QString::fromLatin1(tpl_last)); OptionsModel::saveTemplate(m_options, QString::fromLatin1(tpl_last));
X264_DELETE(m_jobList); X264_DELETE(m_jobList);
@ -278,6 +282,7 @@ MainWindow::~MainWindow(void)
X264_DELETE(m_preferences); X264_DELETE(m_preferences);
X264_DELETE(m_recentlyUsed); X264_DELETE(m_recentlyUsed);
X264_DELETE(m_sysinfo); X264_DELETE(m_sysinfo);
X264_DELETE(m_fileTimer);
VapourSynthCheckThread::unload(); VapourSynthCheckThread::unload();
AvisynthCheckThread::unload(); AvisynthCheckThread::unload();
@ -295,8 +300,7 @@ MainWindow::~MainWindow(void)
*/ */
void MainWindow::addButtonPressed() void MainWindow::addButtonPressed()
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
qDebug("MainWindow::addButtonPressed"); qDebug("MainWindow::addButtonPressed");
bool runImmediately = (countRunningJobs() < (m_preferences->getAutoRunNextJob() ? m_preferences->getMaxRunningJobCount() : 1)); bool runImmediately = (countRunningJobs() < (m_preferences->getAutoRunNextJob() ? m_preferences->getMaxRunningJobCount() : 1));
@ -306,8 +310,6 @@ void MainWindow::addButtonPressed()
{ {
appendJob(sourceFileName, outputFileName, m_options, runImmediately); appendJob(sourceFileName, outputFileName, m_options, runImmediately);
} }
m_status = STATUS_IDLE;
} }
/* /*
@ -315,8 +317,7 @@ void MainWindow::addButtonPressed()
*/ */
void MainWindow::openActionTriggered() void MainWindow::openActionTriggered()
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
QStringList fileList = QFileDialog::getOpenFileNames(this, tr("Open Source File(s)"), m_recentlyUsed->sourceDirectory(), AddJobDialog::getInputFilterLst(), NULL, QFileDialog::DontUseNativeDialog); QStringList fileList = QFileDialog::getOpenFileNames(this, tr("Open Source File(s)"), m_recentlyUsed->sourceDirectory(), AddJobDialog::getInputFilterLst(), NULL, QFileDialog::DontUseNativeDialog);
if(!fileList.empty()) if(!fileList.empty())
@ -336,8 +337,6 @@ void MainWindow::openActionTriggered()
} }
} }
} }
m_status = STATUS_IDLE;
} }
/* /*
@ -345,7 +344,7 @@ void MainWindow::openActionTriggered()
*/ */
void MainWindow::startButtonPressed(void) void MainWindow::startButtonPressed(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_jobList->startJob(ui->jobsView->currentIndex()); m_jobList->startJob(ui->jobsView->currentIndex());
} }
@ -354,15 +353,12 @@ void MainWindow::startButtonPressed(void)
*/ */
void MainWindow::abortButtonPressed(void) void MainWindow::abortButtonPressed(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
if(QMessageBox::question(this, tr("Abort Job?"), tr("<nobr>Do you really want to <b>abort</b> the selected job now?</nobr>"), tr("Back"), tr("Abort Job")) == 1) if(QMessageBox::question(this, tr("Abort Job?"), tr("<nobr>Do you really want to <b>abort</b> the selected job now?</nobr>"), tr("Back"), tr("Abort Job")) == 1)
{ {
m_jobList->abortJob(ui->jobsView->currentIndex()); m_jobList->abortJob(ui->jobsView->currentIndex());
} }
m_status = STATUS_IDLE;
} }
/* /*
@ -370,7 +366,8 @@ void MainWindow::abortButtonPressed(void)
*/ */
void MainWindow::deleteButtonPressed(void) void MainWindow::deleteButtonPressed(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_jobList->deleteJob(ui->jobsView->currentIndex()); m_jobList->deleteJob(ui->jobsView->currentIndex());
m_label->setVisible(m_jobList->rowCount(QModelIndex()) == 0); m_label->setVisible(m_jobList->rowCount(QModelIndex()) == 0);
} }
@ -380,8 +377,7 @@ void MainWindow::deleteButtonPressed(void)
*/ */
void MainWindow::browseButtonPressed(void) void MainWindow::browseButtonPressed(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
QString outputFile = m_jobList->getJobOutputFile(ui->jobsView->currentIndex()); QString outputFile = m_jobList->getJobOutputFile(ui->jobsView->currentIndex());
if((!outputFile.isEmpty()) && QFileInfo(outputFile).exists() && QFileInfo(outputFile).isFile()) if((!outputFile.isEmpty()) && QFileInfo(outputFile).exists() && QFileInfo(outputFile).isFile())
@ -392,8 +388,6 @@ void MainWindow::browseButtonPressed(void)
{ {
QMessageBox::warning(this, tr("Not Found"), tr("Sorry, the output file could not be found!")); QMessageBox::warning(this, tr("Not Found"), tr("Sorry, the output file could not be found!"));
} }
m_status = STATUS_IDLE;
} }
/* /*
@ -401,7 +395,7 @@ void MainWindow::browseButtonPressed(void)
*/ */
void MainWindow::moveButtonPressed(void) void MainWindow::moveButtonPressed(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
if(sender() == ui->actionJob_MoveUp) if(sender() == ui->actionJob_MoveUp)
{ {
@ -432,7 +426,7 @@ void MainWindow::moveButtonPressed(void)
*/ */
void MainWindow::pauseButtonPressed(bool checked) void MainWindow::pauseButtonPressed(bool checked)
{ {
if(m_status != STATUS_IDLE) if(!APP_IS_READY)
{ {
x264_beep(x264_beep_warning); x264_beep(x264_beep_warning);
qWarning("Cannot perfrom this action at this time!"); qWarning("Cannot perfrom this action at this time!");
@ -454,7 +448,7 @@ void MainWindow::pauseButtonPressed(bool checked)
*/ */
void MainWindow::restartButtonPressed(void) void MainWindow::restartButtonPressed(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
const QModelIndex index = ui->jobsView->currentIndex(); const QModelIndex index = ui->jobsView->currentIndex();
const OptionsModel *options = m_jobList->getJobOptions(index); const OptionsModel *options = m_jobList->getJobOptions(index);
@ -573,16 +567,13 @@ void MainWindow::jobLogExtended(const QModelIndex & parent, int start, int end)
*/ */
void MainWindow::showAbout(void) void MainWindow::showAbout(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
if(AboutDialog *aboutDialog = new AboutDialog(this)) if(AboutDialog *aboutDialog = new AboutDialog(this))
{ {
aboutDialog->exec(); aboutDialog->exec();
X264_DELETE(aboutDialog); X264_DELETE(aboutDialog);
} }
m_status = STATUS_IDLE;
} }
/* /*
@ -590,7 +581,7 @@ void MainWindow::showAbout(void)
*/ */
void MainWindow::showWebLink(void) void MainWindow::showWebLink(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
if(QObject *obj = QObject::sender()) if(QObject *obj = QObject::sender())
{ {
@ -609,14 +600,12 @@ void MainWindow::showWebLink(void)
*/ */
void MainWindow::showPreferences(void) void MainWindow::showPreferences(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
PreferencesDialog *preferences = new PreferencesDialog(this, m_preferences, m_sysinfo); PreferencesDialog *preferences = new PreferencesDialog(this, m_preferences, m_sysinfo);
preferences->exec(); preferences->exec();
X264_DELETE(preferences); X264_DELETE(preferences);
m_status = STATUS_IDLE;
} }
/* /*
@ -693,13 +682,7 @@ void MainWindow::saveLogFile(const QModelIndex &index)
*/ */
void MainWindow::shutdownComputer(void) void MainWindow::shutdownComputer(void)
{ {
qDebug("shutdownComputer(void)"); ENSURE_APP_IS_READY();
if((m_status != STATUS_IDLE) && (m_status != STATUS_EXITTING))
{
qWarning("Cannot shutdown computer at this time!");
return;
}
if(countPendingJobs() > 0) if(countPendingJobs() > 0)
{ {
@ -707,9 +690,6 @@ void MainWindow::shutdownComputer(void)
return; return;
} }
const x264_status_t previousStatus = m_status;
m_status = STATUS_BLOCKED;
const int iTimeout = 30; const int iTimeout = 30;
const Qt::WindowFlags flags = Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint; const Qt::WindowFlags flags = Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint;
const QString text = QString("%1%2%1").arg(QString().fill(' ', 18), tr("Warning: Computer will shutdown in %1 seconds...")); const QString text = QString("%1%2%1").arg(QString().fill(' ', 18), tr("Warning: Computer will shutdown in %1 seconds..."));
@ -746,7 +726,6 @@ void MainWindow::shutdownComputer(void)
if(progressDialog.wasCanceled()) if(progressDialog.wasCanceled())
{ {
progressDialog.close(); progressDialog.close();
m_status = previousStatus;
return; return;
} }
progressDialog.setValue(i+1); progressDialog.setValue(i+1);
@ -757,7 +736,6 @@ void MainWindow::shutdownComputer(void)
} }
qWarning("Shutting down !!!"); qWarning("Shutting down !!!");
m_status = previousStatus;
if(x264_shutdown_computer("Simple x264 Launcher: All jobs completed, shutting down!", 10, true)) if(x264_shutdown_computer("Simple x264 Launcher: All jobs completed, shutting down!", 10, true))
{ {
@ -771,7 +749,7 @@ void MainWindow::shutdownComputer(void)
*/ */
void MainWindow::init(void) void MainWindow::init(void)
{ {
if(m_status != STATUS_PRE_INIT) if(m_initialized)
{ {
qWarning("Already initialized -> skipping!"); qWarning("Already initialized -> skipping!");
return; return;
@ -994,8 +972,8 @@ void MainWindow::init(void)
//Enable drag&drop support for this window, required for Qt v4.8.4+ //Enable drag&drop support for this window, required for Qt v4.8.4+
setAcceptDrops(true); setAcceptDrops(true);
//Update app staus //Update flag
m_status = STATUS_IDLE; m_initialized = true;
//--------------------------------------- //---------------------------------------
// Check for Expiration // Check for Expiration
@ -1085,18 +1063,16 @@ void MainWindow::copyLogToClipboard(bool checked)
*/ */
void MainWindow::handlePendingFiles(void) void MainWindow::handlePendingFiles(void)
{ {
if((m_status == STATUS_IDLE) || (m_status == STATUS_AWAITING))
{
qDebug("MainWindow::handlePendingFiles"); qDebug("MainWindow::handlePendingFiles");
if(!m_pendingFiles->isEmpty()) if(!m_pendingFiles->isEmpty())
{ {
QStringList pendingFiles(*m_pendingFiles); QStringList pendingFiles(*m_pendingFiles);
m_pendingFiles->clear(); m_pendingFiles->clear();
createJobMultiple(pendingFiles); createJobMultiple(pendingFiles);
} }
qDebug("Leave from MainWindow::handlePendingFiles!"); qDebug("Leave from MainWindow::handlePendingFiles!");
m_status = STATUS_IDLE;
}
} }
/* /*
@ -1104,7 +1080,7 @@ void MainWindow::handlePendingFiles(void)
*/ */
void MainWindow::handleCommand(const int &command, const QStringList &args, const quint32 &flags) void MainWindow::handleCommand(const int &command, const QStringList &args, const quint32 &flags)
{ {
if((m_status != STATUS_IDLE) && (m_status != STATUS_AWAITING)) if(!(m_initialized && (QApplication::activeModalWidget() == NULL)))
{ {
qWarning("Cannot accapt commands at this time -> discarding!"); qWarning("Cannot accapt commands at this time -> discarding!");
return; return;
@ -1140,10 +1116,10 @@ void MainWindow::handleCommand(const int &command, const QStringList &args, cons
if(QFileInfo(args[0]).exists() && QFileInfo(args[0]).isFile()) if(QFileInfo(args[0]).exists() && QFileInfo(args[0]).isFile())
{ {
*m_pendingFiles << QFileInfo(args[0]).canonicalFilePath(); *m_pendingFiles << QFileInfo(args[0]).canonicalFilePath();
if(m_status != STATUS_AWAITING) if(!m_fileTimer->isActive())
{ {
m_status = STATUS_AWAITING; m_fileTimer->setSingleShot(true);
QTimer::singleShot(5000, this, SLOT(handlePendingFiles())); m_fileTimer->start(5000);
} }
} }
else else
@ -1186,13 +1162,11 @@ void MainWindow::handleCommand(const int &command, const QStringList &args, cons
*/ */
void MainWindow::checkUpdates(void) void MainWindow::checkUpdates(void)
{ {
ENSURE_APP_IS_IDLE(); ENSURE_APP_IS_READY();
m_status = STATUS_BLOCKED;
if(countRunningJobs() > 0) if(countRunningJobs() > 0)
{ {
QMessageBox::warning(this, tr("Jobs Are Running"), tr("Sorry, can not update while there still are running jobs!")); QMessageBox::warning(this, tr("Jobs Are Running"), tr("Sorry, can not update while there still are running jobs!"));
m_status = STATUS_IDLE;
return; return;
} }
@ -1208,18 +1182,12 @@ void MainWindow::checkUpdates(void)
if(ret == UpdaterDialog::READY_TO_INSTALL_UPDATE) if(ret == UpdaterDialog::READY_TO_INSTALL_UPDATE)
{ {
m_status = STATUS_EXITTING;
qWarning("Exitting program to install update..."); qWarning("Exitting program to install update...");
close(); close();
QApplication::quit(); QApplication::quit();
} }
X264_DELETE(updater); X264_DELETE(updater);
if(m_status != STATUS_EXITTING)
{
m_status = STATUS_IDLE;
}
} }
/* /*
@ -1270,7 +1238,7 @@ void MainWindow::showEvent(QShowEvent *e)
{ {
QMainWindow::showEvent(e); QMainWindow::showEvent(e);
if(m_status == STATUS_PRE_INIT) if(!m_initialized)
{ {
QTimer::singleShot(0, this, SLOT(init())); QTimer::singleShot(0, this, SLOT(init()));
} }
@ -1281,7 +1249,7 @@ void MainWindow::showEvent(QShowEvent *e)
*/ */
void MainWindow::closeEvent(QCloseEvent *e) void MainWindow::closeEvent(QCloseEvent *e)
{ {
if((m_status != STATUS_IDLE) && (m_status != STATUS_EXITTING)) if(!APP_IS_READY)
{ {
e->ignore(); e->ignore();
qWarning("Cannot close window at this time!"); qWarning("Cannot close window at this time!");
@ -1289,20 +1257,16 @@ void MainWindow::closeEvent(QCloseEvent *e)
} }
//Make sure we have no running jobs left! //Make sure we have no running jobs left!
if(m_status != STATUS_EXITTING)
{
if(countRunningJobs() > 0) if(countRunningJobs() > 0)
{ {
e->ignore(); e->ignore();
if(!m_preferences->getNoSystrayWarning()) if(!m_preferences->getNoSystrayWarning())
{ {
m_status = STATUS_BLOCKED;
if(QMessageBox::warning(this, tr("Jobs Are Running"), tr("<nobr>You still have running jobs, application will be minimized to notification area!<nobr>"), tr("OK"), tr("Don't Show Again")) == 1) if(QMessageBox::warning(this, tr("Jobs Are Running"), tr("<nobr>You still have running jobs, application will be minimized to notification area!<nobr>"), tr("OK"), tr("Don't Show Again")) == 1)
{ {
m_preferences->setNoSystrayWarning(true); m_preferences->setNoSystrayWarning(true);
PreferencesModel::savePreferences(m_preferences); PreferencesModel::savePreferences(m_preferences);
} }
m_status = STATUS_IDLE;
} }
hide(); hide();
m_sysTray->show(); m_sysTray->show();
@ -1312,7 +1276,6 @@ void MainWindow::closeEvent(QCloseEvent *e)
//Save pending jobs for next time, if desired by user //Save pending jobs for next time, if desired by user
if(countPendingJobs() > 0) if(countPendingJobs() > 0)
{ {
m_status = STATUS_BLOCKED;
int ret = QMessageBox::question(this, tr("Jobs Are Pending"), tr("You still have pending jobs. How do you want to proceed?"), tr("Save Pending Jobs"), tr("Discard")); int ret = QMessageBox::question(this, tr("Jobs Are Pending"), tr("You still have pending jobs. How do you want to proceed?"), tr("Save Pending Jobs"), tr("Discard"));
if(ret == 0) if(ret == 0)
{ {
@ -1323,12 +1286,10 @@ void MainWindow::closeEvent(QCloseEvent *e)
if(QMessageBox::warning(this, tr("Jobs Are Pending"), tr("Do you really want to discard all pending jobs?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) if(QMessageBox::warning(this, tr("Jobs Are Pending"), tr("Do you really want to discard all pending jobs?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
{ {
e->ignore(); e->ignore();
m_status = STATUS_IDLE;
return; return;
} }
} }
} }
}
//Delete remaining jobs //Delete remaining jobs
while(m_jobList->rowCount(QModelIndex()) > 0) while(m_jobList->rowCount(QModelIndex()) > 0)
@ -1340,13 +1301,10 @@ void MainWindow::closeEvent(QCloseEvent *e)
if(!m_jobList->deleteJob(m_jobList->index(0, 0, QModelIndex()))) if(!m_jobList->deleteJob(m_jobList->index(0, 0, QModelIndex())))
{ {
e->ignore(); e->ignore();
m_status = STATUS_BLOCKED;
QMessageBox::warning(this, tr("Failed To Exit"), tr("Warning: At least one job could not be deleted!")); QMessageBox::warning(this, tr("Failed To Exit"), tr("Warning: At least one job could not be deleted!"));
m_status = STATUS_IDLE;
} }
} }
m_status = STATUS_EXITTING;
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
QMainWindow::closeEvent(e); QMainWindow::closeEvent(e);
} }
@ -1392,7 +1350,7 @@ void MainWindow::dragEnterEvent(QDragEnterEvent *event)
*/ */
void MainWindow::dropEvent(QDropEvent *event) void MainWindow::dropEvent(QDropEvent *event)
{ {
if((m_status != STATUS_IDLE) && (m_status != STATUS_AWAITING)) if(!(m_initialized && (QApplication::activeModalWidget() == NULL)))
{ {
qWarning("Cannot accept dropped files at this time -> discarding!"); qWarning("Cannot accept dropped files at this time -> discarding!");
return; return;
@ -1416,10 +1374,10 @@ void MainWindow::dropEvent(QDropEvent *event)
{ {
m_pendingFiles->append(droppedFiles); m_pendingFiles->append(droppedFiles);
m_pendingFiles->sort(); m_pendingFiles->sort();
if(m_status != STATUS_AWAITING) if(!m_fileTimer->isActive())
{ {
m_status = STATUS_AWAITING; m_fileTimer->setSingleShot(true);
QTimer::singleShot(0, this, SLOT(handlePendingFiles())); m_fileTimer->start(5000);
} }
} }
} }

13
src/win_main.h
View File

@ -59,21 +59,12 @@ protected:
virtual void dropEvent(QDropEvent *event); virtual void dropEvent(QDropEvent *event);
virtual bool winEvent(MSG *message, long *result); virtual bool winEvent(MSG *message, long *result);
typedef enum
{
STATUS_PRE_INIT = 0,
STATUS_IDLE = 1,
STATUS_AWAITING = 2,
STATUS_BLOCKED = 3,
STATUS_EXITTING = 4
}
x264_status_t;
private: private:
Ui::MainWindow *const ui; Ui::MainWindow *const ui;
x264_status_t m_status; bool m_initialized;
QLabel *m_label; QLabel *m_label;
QTimer *m_fileTimer;
IPC *const m_ipc; IPC *const m_ipc;
QSystemTrayIcon *const m_sysTray; QSystemTrayIcon *const m_sysTray;