X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderwidget.cpp;h=21bf85423698051291d74afa2e2785810c915ff8;hb=0bd32ab64549902b7313bd2a396352e2bc534f9f;hp=9bb08df998345f4ab91229c692362e5f92d8cc6f;hpb=c42a026234a44a2d766e57bc64a6ac7bbd094000;p=kdenlive diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 9bb08df9..21bf8542 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -28,6 +28,7 @@ #include #include #include +#include // #include #include @@ -48,7 +49,15 @@ const int EditableRole = GroupRole + 5; const int MetaGroupRole = GroupRole + 6; const int ExtraRole = GroupRole + 7; -RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent): QDialog(parent), m_projectFolder(projectfolder) +// Running job status +const int WAITINGJOB = 0; +const int RUNNINGJOB = 1; +const int FINISHEDJOB = 2; + + +RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : + QDialog(parent), + m_projectFolder(projectfolder) { m_view.setupUi(this); setWindowTitle(i18n("Rendering")); @@ -64,6 +73,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent): QDia m_view.buttonSave->setToolTip(i18n("Create new profile")); m_view.buttonInfo->setIcon(KIcon("help-about")); + m_view.hide_log->setIcon(KIcon("go-down")); if (KdenliveSettings::showrenderparams()) { m_view.buttonInfo->setDown(true); @@ -95,8 +105,8 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent): QDia connect(m_view.start_script, SIGNAL(clicked()), this, SLOT(slotStartScript())); connect(m_view.delete_script, SIGNAL(clicked()), this, SLOT(slotDeleteScript())); - connect(m_view.scripts_list, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(slotCheckScript())); - connect(m_view.running_jobs, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(slotCheckJob())); + connect(m_view.scripts_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckScript())); + connect(m_view.running_jobs, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckJob())); connect(m_view.buttonInfo, SIGNAL(clicked()), this, SLOT(showInfoPanel())); @@ -104,6 +114,9 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent): QDia connect(m_view.buttonEdit, SIGNAL(clicked()), this, SLOT(slotEditProfile())); connect(m_view.buttonDelete, SIGNAL(clicked()), this, SLOT(slotDeleteProfile())); connect(m_view.abort_job, SIGNAL(clicked()), this, SLOT(slotAbortCurrentJob())); + connect(m_view.clean_up, SIGNAL(clicked()), this, SLOT(slotCLeanUpJobs())); + connect(m_view.hide_log, SIGNAL(clicked()), this, SLOT(slotHideLog())); + connect(m_view.buttonClose, SIGNAL(clicked()), this, SLOT(hide())); connect(m_view.buttonClose2, SIGNAL(clicked()), this, SLOT(hide())); connect(m_view.buttonClose3, SIGNAL(clicked()), this, SLOT(hide())); @@ -129,6 +142,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent): QDia m_view.rescale_size->setEnabled(false); m_view.guides_box->setVisible(false); m_view.open_dvd->setVisible(false); + m_view.create_chapter->setVisible(false); m_view.open_browser->setVisible(false); m_view.error_box->setVisible(false); @@ -210,9 +224,13 @@ void RenderWidget::setGuides(QDomElement guidesxml, double duration) m_view.guide_end->clear(); QDomNodeList nodes = guidesxml.elementsByTagName("guide"); if (nodes.count() > 0) { - m_view.guide_start->addItem(i18n("Render"), "0"); + m_view.guide_start->addItem(i18n("Beginning"), "0"); m_view.render_guide->setEnabled(true); - } else m_view.render_guide->setEnabled(false); + m_view.create_chapter->setEnabled(true); + } else { + m_view.render_guide->setEnabled(false); + m_view.create_chapter->setEnabled(false); + } for (int i = 0; i < nodes.count(); i++) { QDomElement e = nodes.item(i).toElement(); if (!e.isNull()) { @@ -224,12 +242,17 @@ void RenderWidget::setGuides(QDomElement guidesxml, double duration) m_view.guide_end->addItem(i18n("End"), QString::number(duration)); } -// Will be called when the user selects an output file via the file dialog. -// File extension will be added automatically. +/** + * Will be called when the user selects an output file via the file dialog. + * File extension will be added automatically. + */ void RenderWidget::slotUpdateButtons(KUrl url) { if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); - else m_view.buttonStart->setEnabled(true); + else { + updateButtons(); // This also checks whether the selected format is available + //m_view.buttonStart->setEnabled(true); + } if (url != 0) { QListWidgetItem *item = m_view.size_list->currentItem(); QString extension = item->data(ExtensionRole).toString(); @@ -238,12 +261,15 @@ void RenderWidget::slotUpdateButtons(KUrl url) } } -// Will be called when the user changes the output file path in the text line. -// File extension must NOT be added, would make editing impossible! +/** + * Will be called when the user changes the output file path in the text line. + * File extension must NOT be added, would make editing impossible! + */ void RenderWidget::slotUpdateButtons() { if (m_view.out_file->url().isEmpty()) m_view.buttonStart->setEnabled(false); - else m_view.buttonStart->setEnabled(true); + else updateButtons(); // This also checks whether the selected format is available + //else m_view.buttonStart->setEnabled(true); } void RenderWidget::slotSaveProfile() @@ -266,6 +292,7 @@ void RenderWidget::slotSaveProfile() ui.parameters->setText(m_view.advanced_params->toPlainText()); ui.extension->setText(m_view.size_list->currentItem()->data(ExtensionRole).toString()); ui.profile_name->setFocus(); + if (d->exec() == QDialog::Accepted && !ui.profile_name->text().simplified().isEmpty()) { QString exportFile = KStandardDirs::locateLocal("appdata", "export/customprofiles.xml"); QDomDocument doc; @@ -332,6 +359,7 @@ void RenderWidget::slotSaveProfile() if (file.error() != QFile::NoError) { KMessageBox::error(this, i18n("Cannot write to file %1", exportFile)); file.close(); + delete d; return; } file.close(); @@ -450,7 +478,7 @@ void RenderWidget::slotDeleteProfile(bool refresh) /* QString edit = m_view.size_list->currentItem()->data(EditableRole).toString(); if (!edit.endsWith("customprofiles.xml")) { - // This is a KNewStuff installed file, process through KNS + // This is a KNewStuff installed file, process through KNS KNS::Engine engine(0); if (engine.init("kdenlive_render.knsrc")) { KNS::Entry::List entries; @@ -515,7 +543,7 @@ void RenderWidget::updateButtons() m_view.buttonStart->setEnabled(false); } else { m_view.buttonSave->setEnabled(true); - m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->flags() & Qt::ItemIsEnabled); + m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); QString edit = m_view.size_list->currentItem()->data(EditableRole).toString(); if (edit.isEmpty() || !edit.endsWith("customprofiles.xml")) { m_view.buttonDelete->setEnabled(false); @@ -534,7 +562,7 @@ void RenderWidget::focusFirstVisibleItem() updateButtons(); return; } - for (uint ix = 0; ix < m_view.size_list->count(); ix++) { + for (int ix = 0; ix < m_view.size_list->count(); ix++) { QListWidgetItem *item = m_view.size_list->item(ix); if (item && !item->isHidden()) { m_view.size_list->setCurrentRow(ix); @@ -550,41 +578,31 @@ void RenderWidget::slotExport(bool scriptExport) QListWidgetItem *item = m_view.size_list->currentItem(); if (!item) return; - const QString dest = m_view.out_file->url().path(); + QString dest = m_view.out_file->url().path(); if (dest.isEmpty()) return; + + // Check whether target file has an extension. + // If not, ask whether extension should be added or not. + QString extension = item->data(ExtensionRole).toString(); + if (!dest.endsWith(extension)) { + if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) { + dest.append("." + extension); + } + } + QFile f(dest); if (f.exists()) { - if (KMessageBox::warningYesNo(this, i18n("Output file already exists. Do you want to overwrite it ?")) != KMessageBox::Yes) + if (KMessageBox::warningYesNo(this, i18n("Output file already exists. Do you want to overwrite it?")) != KMessageBox::Yes) return; } - QString scriptName; - if (scriptExport) { - bool ok; - int ix = 0; - QString scriptsFolder = m_projectFolder + "/scripts/"; - KStandardDirs::makeDir(scriptsFolder); - QString path = scriptsFolder + i18n("script") + QString::number(ix).rightJustified(3, '0', false) + ".sh"; - while (QFile::exists(path)) { - ix++; - path = scriptsFolder + i18n("script") + QString::number(ix).rightJustified(3, '0', false) + ".sh"; - } - scriptName = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok); - if (!ok || scriptName.isEmpty()) return; - scriptName.prepend(scriptsFolder); - QFile f(scriptName); - if (f.exists()) { - if (KMessageBox::warningYesNo(this, i18n("Script file already exists. Do you want to overwrite it ?")) != KMessageBox::Yes) - return; - } - } QStringList overlayargs; if (m_view.tc_overlay->isChecked()) { QString filterFile = KStandardDirs::locate("appdata", "metadata.properties"); overlayargs << "meta.attr.timecode=1" << "meta.attr.timecode.markup=#timecode"; overlayargs << "-attach" << "data_feed:attr_check" << "-attach"; - overlayargs << "data_show:" + filterFile << "_fezzik=1" << "dynamic=1"; + overlayargs << "data_show:" + filterFile << "_loader=1" << "dynamic=1"; } double startPos = -1; double endPos = -1; @@ -592,7 +610,7 @@ void RenderWidget::slotExport(bool scriptExport) startPos = m_view.guide_start->itemData(m_view.guide_start->currentIndex()).toDouble(); endPos = m_view.guide_end->itemData(m_view.guide_end->currentIndex()).toDouble(); } - QString renderArgs = m_view.advanced_params->toPlainText(); + QString renderArgs = m_view.advanced_params->toPlainText().simplified(); // Adjust frame scale int width; @@ -616,51 +634,127 @@ void RenderWidget::slotExport(bool scriptExport) // Check if the rendering profile is different from project profile, // in which case we need to use the producer_comsumer from MLT - bool resizeProfile = false; - QString std = renderArgs; QString destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); - if (std.contains(" s=")) { - QString subsize = std.section(" s=", 1, 1); + const QString currentSize = QString::number(width) + 'x' + QString::number(height); + QString subsize = currentSize; + if (std.startsWith("s=")) { + subsize = std.section(' ', 0, 0).toLower(); + subsize = subsize.section("=", 1, 1); + } else if (std.contains(" s=")) { + subsize = std.section(" s=", 1, 1); subsize = subsize.section(' ', 0, 0).toLower(); - const QString currentSize = QString::number(width) + 'x' + QString::number(height); - if (subsize != currentSize) resizeProfile = true; - } else if (destination != "audioonly") { - // Add current size parametrer - renderArgs.append(QString(" s=%1x%2").arg(width).arg(height)); + } else if (destination != "audioonly" && m_view.rescale->isChecked() && m_view.rescale->isEnabled()) { + subsize = QString(" s=%1x%2").arg(width).arg(height); + // Add current size parameter + renderArgs.append(subsize); + } + bool resizeProfile = (subsize != currentSize); + + QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); + + QStringList renderParameters; + renderParameters << dest << item->data(RenderRole).toString() << renderArgs.simplified(); + renderParameters << QString::number(m_view.render_zone->isChecked()) << QString::number(m_view.play_after->isChecked()); + renderParameters << QString::number(startPos) << QString::number(endPos) << QString::number(resizeProfile); + + QString scriptName; + if (scriptExport) { + bool ok; + int ix = 0; + QString scriptsFolder = m_projectFolder + "/scripts/"; + KStandardDirs::makeDir(scriptsFolder); + QString path = scriptsFolder + i18n("script") + QString::number(ix).rightJustified(3, '0', false) + ".sh"; + while (QFile::exists(path)) { + ix++; + path = scriptsFolder + i18n("script") + QString::number(ix).rightJustified(3, '0', false) + ".sh"; + } + scriptName = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok); + if (!ok || scriptName.isEmpty()) return; + scriptName.prepend(scriptsFolder); + QFile f(scriptName); + if (f.exists()) { + if (KMessageBox::warningYesNo(this, i18n("Script file already exists. Do you want to overwrite it?")) != KMessageBox::Yes) + return; + } + renderParameters << scriptName; + if (group == "dvd") renderParameters << QString::number(m_view.create_chapter->isChecked()); + else renderParameters << QString::number(false); + emit doRender(renderParameters, overlayargs); + QTimer::singleShot(400, this, SLOT(parseScriptFiles())); + m_view.tabWidget->setCurrentIndex(2); + return; } + renderParameters << scriptName; + m_view.tabWidget->setCurrentIndex(1); + + // Save rendering profile to document + emit selectedRenderProfile(m_view.size_list->currentItem()->data(MetaGroupRole).toString(), m_view.size_list->currentItem()->text()); // insert item in running jobs list QTreeWidgetItem *renderItem; QList existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1); - if (!existing.isEmpty()) renderItem = existing.at(0); - else renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString()); + if (!existing.isEmpty()) { + renderItem = existing.at(0); + if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { + KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", dest), i18n("Already running")); + return; + } + renderItem->setData(1, Qt::UserRole + 4, QString()); + } else { + renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString()); + renderItem->setData(1, Qt::UserRole + 2, WAITINGJOB); + renderItem->setIcon(0, KIcon("media-playback-pause")); + renderItem->setData(1, Qt::UserRole, i18n("Waiting...")); + } renderItem->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2)); renderItem->setData(1, Qt::UserRole + 1, QTime::currentTime()); + renderItem->setData(1, Qt::UserRole + 2, overlayargs); // Set rendering type - QString group = m_view.size_list->currentItem()->data(MetaGroupRole).toString(); - if (group == "dvd" && m_view.open_dvd->isChecked()) { - renderItem->setData(0, Qt::UserRole, group); - if (renderArgs.contains("profile=")) { - // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd - QString prof = renderArgs.section("profile=", 1, 1); - prof = prof.section(' ', 0, 0); - kDebug() << "// render profile: " << prof; - renderItem->setData(0, Qt::UserRole + 1, prof); + if (group == "dvd") { + renderParameters << QString::number(m_view.create_chapter->isChecked()); + if (m_view.open_dvd->isChecked()) { + renderItem->setData(0, Qt::UserRole, group); + if (renderArgs.contains("profile=")) { + // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd + QString prof = renderArgs.section("profile=", 1, 1); + prof = prof.section(' ', 0, 0); + kDebug() << "// render profile: " << prof; + renderItem->setData(0, Qt::UserRole + 1, prof); + } + } + } else { + renderParameters << QString::number(false); + if (group == "websites" && m_view.open_browser->isChecked()) { + renderItem->setData(0, Qt::UserRole, group); + // pass the url + QString url = m_view.size_list->currentItem()->data(ExtraRole).toString(); + renderItem->setData(0, Qt::UserRole + 1, url); } - } else if (group == "websites" && m_view.open_browser->isChecked()) { - renderItem->setData(0, Qt::UserRole, group); - // pass the url - QString url = m_view.size_list->currentItem()->data(ExtraRole).toString(); - renderItem->setData(0, Qt::UserRole + 1, url); } - emit doRender(dest, item->data(RenderRole).toString(), overlayargs, renderArgs.simplified().split(' '), m_view.render_zone->isChecked(), m_view.play_after->isChecked(), startPos, endPos, resizeProfile, scriptName); - if (scriptName.isEmpty()) m_view.tabWidget->setCurrentIndex(1); - else { - QTimer::singleShot(400, this, SLOT(parseScriptFiles())); - m_view.tabWidget->setCurrentIndex(2); + + renderItem->setData(1, Qt::UserRole + 3, renderParameters); + checkRenderStatus(); +} + +void RenderWidget::checkRenderStatus() +{ + QTreeWidgetItem *item = m_view.running_jobs->topLevelItem(0); + while (item) { + if (item->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) break; + else if (item->data(1, Qt::UserRole + 2).toInt() == WAITINGJOB) { + item->setData(1, Qt::UserRole + 1, QTime::currentTime()); + if (item->data(1, Qt::UserRole + 4).isNull()) { + emit doRender(item->data(1, Qt::UserRole + 3).toStringList(), item->data(1, Qt::UserRole + 2).toStringList()); + } else { + // Script item + QProcess::startDetached(item->data(1, Qt::UserRole + 3).toString()); + } + break; + } + item = m_view.running_jobs->itemBelow(item); } } @@ -685,8 +779,13 @@ void RenderWidget::refreshView() destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString(); - if (destination == "dvd") m_view.open_dvd->setVisible(true); - else m_view.open_dvd->setVisible(false); + if (destination == "dvd") { + m_view.open_dvd->setVisible(true); + m_view.create_chapter->setVisible(true); + } else { + m_view.open_dvd->setVisible(false); + m_view.create_chapter->setVisible(false); + } if (destination == "websites") m_view.open_browser->setVisible(true); else m_view.open_browser->setVisible(false); if (!destination.isEmpty() && QString("dvd websites audioonly").contains(destination)) @@ -733,9 +832,13 @@ void RenderWidget::refreshView() const QStringList vcodecsList = KdenliveSettings::videocodecs(); const QStringList acodecsList = KdenliveSettings::audiocodecs(); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); + const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color(); + const QColor disabledbg = scheme.background(KColorScheme::NegativeBackground).color(); + for (int i = 0; i < m_view.size_list->count(); i++) { sizeItem = m_view.size_list->item(i); - if ((sizeItem->data(GroupRole) == group || sizeItem->data(GroupRole).toString().isEmpty()) && sizeItem->data(MetaGroupRole) == destination) { + if ((sizeItem->data(GroupRole).toString() == group || sizeItem->data(GroupRole).toString().isEmpty()) && sizeItem->data(MetaGroupRole).toString() == destination) { std = sizeItem->data(StandardRole).toString(); if (!std.isEmpty()) { if (std.contains("PAL", Qt::CaseInsensitive)) sizeItem->setHidden(m_view.format_selection->currentIndex() != 0); @@ -759,9 +862,10 @@ void RenderWidget::refreshView() if (!formatsList.contains(format)) { kDebug() << "***** UNSUPPORTED F: " << format; //sizeItem->setHidden(true); - sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported video format: %1", format)); sizeItem->setIcon(brokenIcon); + sizeItem->setForeground(disabled); } } } @@ -774,9 +878,11 @@ void RenderWidget::refreshView() if (!acodecsList.contains(format)) { kDebug() << "***** UNSUPPORTED ACODEC: " << format; //sizeItem->setHidden(true); - sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported audio codec: %1", format)); sizeItem->setIcon(brokenIcon); + sizeItem->setForeground(disabled); + sizeItem->setBackground(disabledbg); } } } @@ -789,9 +895,10 @@ void RenderWidget::refreshView() if (!vcodecsList.contains(format)) { kDebug() << "***** UNSUPPORTED VCODEC: " << format; //sizeItem->setHidden(true); - sizeItem->setFlags(Qt::ItemIsSelectable); + //sizeItem->setFlags(Qt::ItemIsSelectable); sizeItem->setToolTip(i18n("Unsupported video codec: %1", format)); sizeItem->setIcon(brokenIcon); + sizeItem->setForeground(disabled); } } } @@ -819,8 +926,12 @@ KUrl RenderWidget::filenameWithExtension(KUrl url, QString extension) } +/** + * Called when a new format or size has been selected. + */ void RenderWidget::refreshParams() { + // Format not available (e.g. codec not installed); Disable start button QListWidgetItem *item = m_view.size_list->currentItem(); if (!item || item->isHidden()) { m_view.advanced_params->clear(); @@ -860,7 +971,7 @@ void RenderWidget::refreshParams() m_view.buttonEdit->setEnabled(true); } - m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->flags() & Qt::ItemIsEnabled); + m_view.buttonStart->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); } void RenderWidget::reloadProfiles() @@ -1106,8 +1217,17 @@ void RenderWidget::setRenderJob(const QString &dest, int progress) QTreeWidgetItem *item; QList existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1); if (!existing.isEmpty()) item = existing.at(0); - else item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString()); + else { + item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString()); + item->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2)); + if (progress == 0) { + item->setData(1, Qt::UserRole + 2, WAITINGJOB); + item->setIcon(0, KIcon("media-playback-pause")); + item->setData(1, Qt::UserRole, i18n("Waiting...")); + } + } item->setData(2, Qt::UserRole, progress); + item->setData(1, Qt::UserRole + 2, RUNNINGJOB); if (progress == 0) { item->setIcon(0, KIcon("system-run")); item->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2)); @@ -1126,7 +1246,11 @@ void RenderWidget::setRenderStatus(const QString &dest, int status, const QStrin QTreeWidgetItem *item; QList existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1); if (!existing.isEmpty()) item = existing.at(0); - else item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString()); + else { + item = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << dest << QString()); + item->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2)); + } + item->setData(1, Qt::UserRole + 2, FINISHEDJOB); if (status == -1) { // Job finished successfully item->setIcon(0, KIcon("dialog-ok")); @@ -1159,12 +1283,20 @@ void RenderWidget::setRenderStatus(const QString &dest, int status, const QStrin item->setData(2, Qt::UserRole, 100); } slotCheckJob(); + checkRenderStatus(); } void RenderWidget::slotAbortCurrentJob() { QTreeWidgetItem *current = m_view.running_jobs->currentItem(); - if (current) emit abortProcess(current->text(1)); + if (current) { + if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) + emit abortProcess(current->text(1)); + else { + delete current; + slotCheckJob(); + } + } } void RenderWidget::slotCheckJob() @@ -1172,12 +1304,27 @@ void RenderWidget::slotCheckJob() bool activate = false; QTreeWidgetItem *current = m_view.running_jobs->currentItem(); if (current) { - int percent = current->data(2, Qt::UserRole).toInt(); - if (percent < 100) activate = true; + if (current->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) + m_view.abort_job->setText(i18n("Abort Job")); + else m_view.abort_job->setText(i18n("Remove Job")); + activate = true; } m_view.abort_job->setEnabled(activate); } +void RenderWidget::slotCLeanUpJobs() +{ + int ix = 0; + QTreeWidgetItem *current = m_view.running_jobs->topLevelItem(ix); + while (current) { + if (current->data(1, Qt::UserRole + 2).toInt() == FINISHEDJOB) + delete current; + else ix++; + current = m_view.running_jobs->topLevelItem(ix); + } + slotCheckJob(); +} + void RenderWidget::parseScriptFiles() { QStringList scriptsFilter; @@ -1185,7 +1332,7 @@ void RenderWidget::parseScriptFiles() m_view.scripts_list->clear(); QTreeWidgetItem *item; - // List the project scripts + // List the project scripts QStringList scriptFiles = QDir(m_projectFolder + "/scripts").entryList(scriptsFilter, QDir::Files); for (int i = 0; i < scriptFiles.size(); ++i) { KUrl scriptpath(m_projectFolder + "/scripts/" + scriptFiles.at(i)); @@ -1204,21 +1351,18 @@ void RenderWidget::parseScriptFiles() file.close(); } item->setSizeHint(0, QSize(m_view.scripts_list->columnWidth(0), fontMetrics().height() * 2)); - item->setData(0, Qt::UserRole, target); + item->setData(0, Qt::UserRole, target.simplified()); item->setData(0, Qt::UserRole + 1, scriptpath.path()); } bool activate = false; - QTreeWidgetItemIterator it(m_view.scripts_list); - if (*it) { - kDebug() << "// FOUND SCRIPT ITEM:" << (*it)->text(0); - // Selecting item does not work, why ??? - m_view.scripts_list->setCurrentItem(*it); - (*it)->setSelected(true); + QTreeWidgetItem *script = m_view.scripts_list->topLevelItem(0); + if (script) { + script->setSelected(true); + m_view.scripts_list->setCurrentItem(script); activate = true; } - kDebug() << "SELECTED SCRIPTS: " << m_view.scripts_list->selectedItems().count(); - m_view.start_script->setEnabled(activate); - m_view.delete_script->setEnabled(activate); +// m_view.start_script->setEnabled(activate); +// m_view.delete_script->setEnabled(activate); } void RenderWidget::slotCheckScript() @@ -1234,8 +1378,29 @@ void RenderWidget::slotStartScript() { QTreeWidgetItem *item = m_view.scripts_list->currentItem(); if (item) { + QString destination = item->data(0, Qt::UserRole).toString(); QString path = item->data(0, Qt::UserRole + 1).toString(); - QProcess::startDetached(path); + // Insert new job in queue + QTreeWidgetItem *renderItem; + QList existing = m_view.running_jobs->findItems(destination, Qt::MatchExactly, 1); + kDebug() << "------ START SCRIPT"; + if (!existing.isEmpty()) { + renderItem = existing.at(0); + if (renderItem->data(1, Qt::UserRole + 2).toInt() == RUNNINGJOB) { + KMessageBox::information(this, i18n("There is already a job writing file:
%1
Abort the job if you want to overwrite it...", destination), i18n("Already running")); + return; + } + } else renderItem = new QTreeWidgetItem(m_view.running_jobs, QStringList() << QString() << destination << QString()); + kDebug() << "------ START SCRIPT 2"; + renderItem->setData(2, Qt::UserRole, 0); + renderItem->setData(1, Qt::UserRole + 2, WAITINGJOB); + renderItem->setIcon(0, KIcon("media-playback-pause")); + renderItem->setData(1, Qt::UserRole, i18n("Waiting...")); + renderItem->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2)); + renderItem->setData(1, Qt::UserRole + 1, QTime::currentTime()); + renderItem->setData(1, Qt::UserRole + 3, path); + renderItem->setData(1, Qt::UserRole + 4, '1'); + checkRenderStatus(); m_view.tabWidget->setCurrentIndex(1); } } @@ -1245,7 +1410,7 @@ void RenderWidget::slotDeleteScript() QTreeWidgetItem *item = m_view.scripts_list->currentItem(); if (item) { QString path = item->data(0, Qt::UserRole + 1).toString(); - KIO::NetAccess::del(path + ".westley", this); + KIO::NetAccess::del(path + ".mlt", this); KIO::NetAccess::del(path, this); parseScriptFiles(); } @@ -1256,3 +1421,38 @@ void RenderWidget::slotGenerateScript() slotExport(true); } +void RenderWidget::slotHideLog() +{ + m_view.error_box->setVisible(false); +} + +void RenderWidget::setRenderProfile(const QString &dest, const QString &name) +{ + m_view.destination_list->blockSignals(true); + m_view.format_list->blockSignals(true); + m_view.size_list->blockSignals(true); + for (int i = 0; i < m_view.destination_list->count(); i++) { + if (m_view.destination_list->itemData(i, Qt::UserRole) == dest) { + m_view.destination_list->setCurrentIndex(i); + break; + } + } + QList childs = m_view.size_list->findItems(name, Qt::MatchExactly); + if (!childs.isEmpty()) { + QListWidgetItem *profile = childs.at(0); + if (profile->isHidden()) { + QString group = profile->data(GroupRole).toString(); + childs = m_view.format_list->findItems(group, Qt::MatchExactly); + if (!childs.isEmpty()) { + m_view.format_list->setCurrentItem(childs.at(0)); + } + } + refreshView(); + m_view.size_list->blockSignals(false); + m_view.size_list->setCurrentItem(profile); + } else m_view.size_list->blockSignals(false); + m_view.destination_list->blockSignals(false); + m_view.format_list->blockSignals(false); + +} +