#include <QThread>
#include <QScriptEngine>
+#include "locale.h"
+
// Render profiles roles
const int GroupRole = Qt::UserRole;
const int ProgressRole = Qt::UserRole + 3;
const int ExtraInfoRole = Qt::UserRole + 5;
-const int ScriptType = QTreeWidgetItem::UserType;
+const int DirectRenderType = QTreeWidgetItem::Type;
+const int ScriptRenderType = QTreeWidgetItem::UserType;
// Running job status
m_view.buttonFavorite->setIcon(KIcon("favorites"));
m_view.buttonFavorite->setToolTip(i18n("Copy profile to favorites"));
+ m_view.show_all_profiles->setToolTip(i18n("Show profiles with different framerate"));
+
m_view.advanced_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
m_view.buttonRender->setEnabled(false);
connect(m_view.out_file, SIGNAL(urlSelected(const KUrl &)), this, SLOT(slotUpdateButtons(const KUrl &)));
connect(m_view.format_list, SIGNAL(currentRowChanged(int)), this, SLOT(refreshView()));
connect(m_view.size_list, SIGNAL(currentRowChanged(int)), this, SLOT(refreshParams()));
+ connect(m_view.show_all_profiles, SIGNAL(stateChanged(int)), this, SLOT(refreshView()));
connect(m_view.size_list, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this, SLOT(slotEditItem(QListWidgetItem *)));
m_view.splitter->setStretchFactor(0, 2);
m_view.out_file->setMode(KFile::File);
+ m_view.out_file->setFocusPolicy(Qt::ClickFocus);
m_view.running_jobs->setHeaderLabels(QStringList() << QString() << i18n("File"));
m_jobsDelegate = new RenderViewDelegate(this);
if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom");
ui.group_name->setText(customGroup);
- QStringList arguments = m_view.advanced_params->toPlainText().split(" ", QString::SkipEmptyParts);
+ QStringList arguments = m_view.advanced_params->toPlainText().split(' ', QString::SkipEmptyParts);
ui.parameters->setText(arguments.join(" "));
ui.extension->setText(m_view.size_list->currentItem()->data(ExtensionRole).toString());
ui.profile_name->setFocus();
QString extension = item->data(ExtensionRole).toString();
if (!dest.endsWith(extension, Qt::CaseInsensitive)) {
if (KMessageBox::questionYesNo(this, i18n("File has no extension. Add extension (%1)?", extension)) == KMessageBox::Yes) {
- dest.append("." + extension);
+ dest.append('.' + extension);
}
}
// Set locale for render process if required
if (QLocale().decimalPoint() != QLocale::system().decimalPoint()) {
- render_process_args << QString("-locale:%1").arg(QLocale().name());
+ const QString currentLocale = setlocale(LC_NUMERIC, NULL);
+ render_process_args << QString("-locale:%1").arg(currentLocale);
}
double guideStart = 0;
renderArgs.append(subsize);
}
bool resizeProfile = (subsize != currentSize);
- QStringList paramsList = renderArgs.split(" ", QString::SkipEmptyParts);
+ QStringList paramsList = renderArgs.split(' ', QString::SkipEmptyParts);
QScriptEngine sEngine;
sEngine.globalObject().setProperty("bitrate", m_view.comboBitrates->currentText());
render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath);
else
render_process_args << (scriptExport ? "$SOURCE" : playlistPath);
+
render_process_args << (scriptExport ? "$TARGET" : KUrl(dest).url());
render_process_args << paramsList;
}
QTextStream outStream(&file);
outStream << "#! /bin/sh" << "\n" << "\n";
- outStream << "SOURCE=" << "\"" + playlistPath + "\"" << "\n";
- outStream << "TARGET=" << "\"" + KUrl(dest).url() + "\"" << "\n";
+ outStream << "SOURCE=" << "\"" + QUrl(playlistPath).toEncoded() + "\"" << "\n";
+ outStream << "TARGET=" << "\"" + QUrl(dest).toEncoded() + "\"" << "\n";
outStream << "RENDERER=" << "\"" + m_renderer + "\"" << "\n";
outStream << "MELT=" << "\"" + KdenliveSettings::rendererpath() + "\"" << "\n";
outStream << "PARAMETERS=" << "\"" + render_process_args.join(" ") + "\"" << "\n";
emit selectedRenderProfile(renderProps);
// insert item in running jobs list
- RenderJobItem *renderItem;
+ RenderJobItem *renderItem = NULL;
QList<QTreeWidgetItem *> existing = m_view.running_jobs->findItems(dest, Qt::MatchExactly, 1);
if (!existing.isEmpty()) {
renderItem = static_cast<RenderJobItem*> (existing.at(0));
- if (renderItem->status() == RUNNINGJOB) {
+ if (renderItem->status() == RUNNINGJOB || renderItem->status() == WAITINGJOB) {
KMessageBox::information(this, i18n("There is already a job writing file:<br /><b>%1</b><br />Abort the job if you want to overwrite it...", dest), i18n("Already running"));
return;
}
- renderItem->setData(1, ProgressRole, 0);
- renderItem->setStatus(WAITINGJOB);
- } else {
- renderItem = new RenderJobItem(m_view.running_jobs, QStringList() << QString() << dest);
- }
+ if (renderItem->type() != DirectRenderType) {
+ delete renderItem;
+ renderItem = NULL;
+ }
+ else {
+ renderItem->setData(1, ProgressRole, 0);
+ renderItem->setStatus(WAITINGJOB);
+ renderItem->setIcon(0, KIcon("media-playback-pause"));
+ renderItem->setData(1, Qt::UserRole, i18n("Waiting..."));
+ renderItem->setData(1, ParametersRole, dest);
+ }
+ }
+ if (!renderItem) renderItem = new RenderJobItem(m_view.running_jobs, QStringList() << QString() << dest);
renderItem->setData(1, TimeRole, QTime::currentTime());
// Set rendering type
renderItem->setMetadata(url);
}
}
+
renderItem->setData(1, ParametersRole, render_process_args);
if (exportAudio == false) renderItem->setData(1, ExtraInfoRole, i18n("Video without audio track"));
else renderItem->setData(1, ExtraInfoRole, QString());
// check if we have a job waiting to render
if (m_blockProcessing) return;
RenderJobItem* item = static_cast<RenderJobItem*> (m_view.running_jobs->topLevelItem(0));
+
+ // Make sure no other rendering is running
while (item) {
if (item->status() == RUNNINGJOB) return;
item = static_cast<RenderJobItem*> (m_view.running_jobs->itemBelow(item));
}
item = static_cast<RenderJobItem*> (m_view.running_jobs->topLevelItem(0));
bool waitingJob = false;
+
+ // Find first waiting job
while (item) {
if (item->status() == WAITINGJOB) {
item->setData(1, TimeRole, QTime::currentTime());
void RenderWidget::startRendering(RenderJobItem *item)
{
- if (item->type() == QTreeWidgetItem::Type) {
+ if (item->type() == DirectRenderType) {
// Normal render process
+ kDebug()<<"// Normal process";
if (QProcess::startDetached(m_renderer, item->data(1, ParametersRole).toStringList()) == false) {
item->setStatus(FAILEDJOB);
} else {
KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", item->text(1)), QPixmap(), this);
}
- } else if (item->type() == ScriptType){
+ } else if (item->type() == ScriptRenderType){
// Script item
- if (QProcess::startDetached(item->data(1, ParametersRole).toString()) == false) {
+ kDebug()<<"// SCRIPT process: "<<item->data(1, ParametersRole).toString();
+ if (QProcess::startDetached('"' + item->data(1, ParametersRole).toString() + '"') == false) {
item->setStatus(FAILEDJOB);
}
}
KIcon brokenIcon("dialog-close");
KIcon warningIcon("dialog-warning");
- const QStringList formatsList = KdenliveSettings::supportedformats();
- const QStringList vcodecsList = KdenliveSettings::videocodecs();
- const QStringList acodecsList = KdenliveSettings::audiocodecs();
+ QStringList formatsList;
+ QStringList vcodecsList;
+ QStringList acodecsList;
+ if (!KdenliveSettings::bypasscodeccheck()) {
+ formatsList= KdenliveSettings::supportedformats();
+ vcodecsList = KdenliveSettings::videocodecs();
+ acodecsList = KdenliveSettings::audiocodecs();
+ }
KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color();
QListWidgetItem *dupItem = NULL;
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 (!m_view.show_all_profiles->isChecked() && !std.isEmpty()) {
if ((std.contains("PAL", Qt::CaseInsensitive) && m_profile.frame_rate_num == 25 && m_profile.frame_rate_den == 1) ||
(std.contains("NTSC", Qt::CaseInsensitive) && m_profile.frame_rate_num == 30000 && m_profile.frame_rate_den == 1001))
dupItem = sizeItem->clone();
m_view.size_list->addItem(dupItem);
std = dupItem->data(ParamsRole).toString();
// Make sure the selected profile uses the same frame rate as project profile
- if (std.contains("mlt_profile=")) {
+ if (!m_view.show_all_profiles->isChecked() && std.contains("mlt_profile=")) {
QString profile = std.section("mlt_profile=", 1, 1).section(' ', 0, 0);
MltVideoProfile p = ProfilesDialog::getVideoProfile(profile);
if (p.frame_rate_den > 0) {
}
}
}
- // m_view.size_list->sortItems();
focusFirstVisibleItem();
- m_view.size_list->setVisible(m_view.size_list->count() > 1 || m_view.format_list->count() <= 1);
m_view.size_list->blockSignals(false);
m_view.format_list->blockSignals(false);
if (m_view.size_list->count() > 0) {
m_view.bitrateLabel->setEnabled(true);
if ( item->data(BitratesRole).canConvert(QVariant::StringList) && item->data(BitratesRole).toStringList().count()) {
QStringList bitrates = item->data(BitratesRole).toStringList();
- foreach (QString bitrate, bitrates)
+ foreach (const QString &bitrate, bitrates)
m_view.comboBitrates->addItem(bitrate);
if (item->data(DefaultBitrateRole).canConvert(QVariant::String))
m_view.comboBitrates->setCurrentIndex(bitrates.indexOf(item->data(DefaultBitrateRole).toString()));
m_view.audiobitrateLabel->setEnabled(true);
if ( item->data(AudioBitratesRole).canConvert(QVariant::StringList) && item->data(AudioBitratesRole).toStringList().count()) {
QStringList audiobitrates = item->data(AudioBitratesRole).toStringList();
- foreach (QString bitrate, audiobitrates)
+ foreach (const QString &bitrate, audiobitrates)
m_view.comboAudioBitrates->addItem(bitrate);
if (item->data(DefaultAudioBitrateRole).canConvert(QVariant::String))
m_view.comboAudioBitrates->setCurrentIndex(audiobitrates.indexOf(item->data(DefaultAudioBitrateRole).toString()));
bool replaceLibfaacCodec = false;
if (!acodecsList.contains("aac") && acodecsList.contains("libfaac")) replaceLibfaacCodec = true;
-
if (editable || groups.count() == 0) {
QDomElement profiles = doc.documentElement();
if (editable && profiles.attribute("version", 0).toInt() < 1) {
item->setData(1, Qt::UserRole, t);
QString itemGroup = item->data(0, Qt::UserRole).toString();
if (itemGroup == "dvd") {
- emit openDvdWizard(item->text(1), item->metadata());
+ emit openDvdWizard(item->text(1));
} else if (itemGroup == "websites") {
QString url = item->metadata();
if (!url.isEmpty()) new KRun(url, this);
QTextStream stream(&file);
while (!stream.atEnd()) {
QString line = stream.readLine();
- kDebug()<<"# :"<<line;
+ //kDebug()<<"# :"<<line;
if (line.startsWith("TARGET=")) {
target = line.section("TARGET=\"", 1);
target = target.section('"', 0, 0);
file.close();
}
if (target.isEmpty()) continue;
- kDebug()<<"ScRIPT RENDERER: "<<renderer<<"\n++++++++++++++++++++++++++";
+ //kDebug()<<"ScRIPT RENDERER: "<<renderer<<"\n++++++++++++++++++++++++++";
item = new QTreeWidgetItem(m_view.scripts_list, QStringList() << QString() << scriptpath.fileName());
if (!renderer.isEmpty() && renderer.contains('/') && !QFile::exists(renderer)) {
item->setIcon(0, KIcon("dialog-cancel"));
item->setData(0, Qt::UserRole, '1');
} else item->setIcon(0, KIcon("application-x-executable-script"));
item->setSizeHint(0, QSize(m_view.scripts_list->columnWidth(0), fontMetrics().height() * 2));
- item->setData(1, Qt::UserRole, KUrl(target).path());
+ item->setData(1, Qt::UserRole, KUrl(QUrl::fromEncoded(target.toUtf8())).pathOrUrl());
item->setData(1, Qt::UserRole + 1, scriptpath.path());
}
-// bool activate = false;
QTreeWidgetItem *script = m_view.scripts_list->topLevelItem(0);
if (script) {
m_view.scripts_list->setCurrentItem(script);
script->setSelected(true);
-// activate = true;
}
-// m_view.start_script->setEnabled(activate);
-// m_view.delete_script->setEnabled(activate);
}
void RenderWidget::slotCheckScript()
{
RenderJobItem* item = static_cast<RenderJobItem*> (m_view.scripts_list->currentItem());
if (item) {
+ kDebug() << "// STARTING SCRIPT: "<<item->text(1);
QString destination = item->data(1, Qt::UserRole).toString();
QString path = item->data(1, Qt::UserRole + 1).toString();
// Insert new job in queue
- RenderJobItem *renderItem;
+ RenderJobItem *renderItem = NULL;
QList<QTreeWidgetItem *> existing = m_view.running_jobs->findItems(destination, Qt::MatchExactly, 1);
kDebug() << "------ START SCRIPT";
if (!existing.isEmpty()) {
renderItem = static_cast<RenderJobItem*> (existing.at(0));
- if (renderItem->status() == RUNNINGJOB) {
+ if (renderItem->status() == RUNNINGJOB || renderItem->status() == WAITINGJOB) {
KMessageBox::information(this, i18n("There is already a job writing file:<br /><b>%1</b><br />Abort the job if you want to overwrite it...", destination), i18n("Already running"));
return;
}
- } else renderItem = new RenderJobItem(m_view.running_jobs, QStringList() << QString() << destination, ScriptType);
+ else if (renderItem->type() != ScriptRenderType) {
+ delete renderItem;
+ renderItem = NULL;
+ }
+ }
+ if (!renderItem) renderItem = new RenderJobItem(m_view.running_jobs, QStringList() << QString() << destination, ScriptRenderType);
renderItem->setData(1, ProgressRole, 0);
renderItem->setStatus(WAITINGJOB);
renderItem->setIcon(0, KIcon("media-playback-pause"));
bool RenderWidget::startWaitingRenderJobs()
{
m_blockProcessing = true;
- QString autoscriptFile = getFreeScriptName("auto");
+ QString autoscriptFile = getFreeScriptName(KUrl(), "auto");
QFile file(autoscriptFile);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
kWarning() << "////// ERROR writing to file: " << autoscriptFile;
RenderJobItem *item = static_cast<RenderJobItem*> (m_view.running_jobs->topLevelItem(0));
while (item) {
if (item->status() == WAITINGJOB) {
- if (item->type() == QTreeWidgetItem::Type) {
+ if (item->type() == DirectRenderType) {
// Add render process for item
const QString params = item->data(1, ParametersRole).toStringList().join(" ");
outStream << m_renderer << " " << params << "\n";
- } else if (item->type() == ScriptType){
+ } else if (item->type() == ScriptRenderType){
// Script item
outStream << item->data(1, ParametersRole).toString() << "\n";
}
return true;
}
-QString RenderWidget::getFreeScriptName(const QString &prefix)
+QString RenderWidget::getFreeScriptName(const KUrl &projectName, const QString &prefix)
{
int ix = 0;
QString scriptsFolder = m_projectFolder + "scripts/";
KStandardDirs::makeDir(scriptsFolder);
QString path;
+ QString fileName;
+ if (projectName.isEmpty()) fileName = i18n("script");
+ else fileName = projectName.fileName().section('.', 0, -2) + "_";
while (path.isEmpty() || QFile::exists(path)) {
ix++;
- path = scriptsFolder + prefix + i18n("script") + QString::number(ix).rightJustified(3, '0', false) + ".sh";
+ path = scriptsFolder + prefix + fileName + QString::number(ix).rightJustified(3, '0', false) + ".sh";
}
return path;
}
void RenderWidget::errorMessage(const QString &message)
{
+ show();
if (!message.isEmpty()) {
#if KDE_IS_VERSION(4,7,0)
m_infoMessage->setMessageType(KMessageWidget::Warning);
}
}
+void RenderWidget::keyPressEvent(QKeyEvent *e) {
+ if(e->key()==Qt::Key_Return || e->key()==Qt::Key_Enter) {
+ switch (m_view.tabWidget->currentIndex()) {
+ case 1:
+ if (m_view.start_job->isEnabled()) slotStartCurrentJob();
+ break;
+ case 2:
+ if (m_view.start_script->isEnabled()) slotStartScript();
+ break;
+ default:
+ if (m_view.buttonRender->isEnabled()) slotPrepareExport();
+ break;
+ }
+ }
+ else QDialog::keyPressEvent(e);
+}
+
projects / kdenlive / blobdiff