#include <KColorScheme>
#include <KNotification>
#include <KStartupInfo>
-// #include <knewstuff2/engine.h>
#include <QDomDocument>
#include <QItemDelegate>
m_view.buttonInfo->setDown(true);
} else m_view.advanced_params->hide();
- m_view.rescale_size->setInputMask("0099\\x0099");
- m_view.rescale_size->setText("320x240");
-
+ m_view.rescale_keep->setChecked(KdenliveSettings::rescalekeepratio());
+ connect(m_view.rescale_width, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleWidth(int)));
+ connect(m_view.rescale_height, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleHeight(int)));
+ m_view.rescale_keep->setIcon(KIcon("insert-link"));
+ m_view.rescale_keep->setToolTip(i18n("Preserve aspect ratio"));
+ connect(m_view.rescale_keep, SIGNAL(clicked()), this, SLOT(slotSwitchAspectRatio()));
connect(m_view.buttonRender, SIGNAL(clicked()), this, SLOT(slotPrepareExport()));
connect(m_view.buttonGenerateScript, SIGNAL(clicked()), this, SLOT(slotGenerateScript()));
m_view.format_list->setAlternatingRowColors(true);
m_view.size_list->setAlternatingRowColors(true);
- KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
+ KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
QPalette p = m_view.errorLabel->palette();
p.setColor(QPalette::Background, scheme.background(KColorScheme::NegativeBackground).color());
m_view.errorLabel->setAutoFillBackground(true);
m_view.errorLabel->setPalette(p);
m_view.errorLabel->setHidden(true);
+ connect(m_view.export_audio, SIGNAL(stateChanged(int)), this, SLOT(slotUpdateAudioLabel(int)));
+ m_view.export_audio->setCheckState(Qt::PartiallyChecked);
+
parseProfiles();
parseScriptFiles();
-
+ m_view.running_jobs->setUniformRowHeights(false);
+ m_view.scripts_list->setUniformRowHeights(false);
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(itemSelectionChanged()), this, SLOT(slotCheckScript()));
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()));
- connect(m_view.rescale, SIGNAL(toggled(bool)), m_view.rescale_size, SLOT(setEnabled(bool)));
+ connect(m_view.rescale, SIGNAL(toggled(bool)), m_view.rescale_box, SLOT(setEnabled(bool)));
connect(m_view.destination_list, SIGNAL(activated(int)), this, SLOT(refreshCategory()));
connect(m_view.out_file, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateButtons()));
connect(m_view.out_file, SIGNAL(urlSelected(const KUrl &)), this, SLOT(slotUpdateButtons(const KUrl &)));
m_view.buttonRender->setEnabled(false);
m_view.buttonGenerateScript->setEnabled(false);
- m_view.rescale_size->setEnabled(false);
+ m_view.rescale_box->setEnabled(false);
m_view.guides_box->setVisible(false);
m_view.open_dvd->setVisible(false);
m_view.create_chapter->setVisible(false);
}
QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface();
- if (!interface || (!interface->isServiceRegistered("org.kde.ksmserver") && !interface->isServiceRegistered("org.gnome.SessionManager"))) {
+ if (!interface || (!interface->isServiceRegistered("org.kde.ksmserver") && !interface->isServiceRegistered("org.gnome.SessionManager")))
m_view.shutdown->setEnabled(false);
- }
focusFirstVisibleItem();
}
QString dest = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString();
QString customGroup = m_view.format_list->currentItem()->text();
- if (customGroup.isEmpty()) customGroup = i18n("Custom");
+ if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom");
ui.group_name->setText(customGroup);
ui.parameters->setText(m_view.advanced_params->toPlainText());
if (d->exec() == QDialog::Accepted && !ui.profile_name->text().simplified().isEmpty()) {
QString newProfileName = ui.profile_name->text().simplified();
QString newGroupName = ui.group_name->text().simplified();
- if (newGroupName.isEmpty()) newGroupName = i18n("Custom");
+ if (newGroupName.isEmpty()) newGroupName = i18nc("Group Name", "Custom");
QString newMetaGroupId = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString();
QDomDocument doc;
QDomDocument doc;
QDomElement profileElement = doc.createElement("profile");
profileElement.setAttribute("name", currentProfile);
- profileElement.setAttribute("category", i18n("Custom"));
+ profileElement.setAttribute("category", i18nc("Category Name", "Custom"));
profileElement.setAttribute("destinationid", "favorites");
profileElement.setAttribute("extension", extension);
profileElement.setAttribute("args", params);
QString dest = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString();
QString customGroup = m_view.format_list->currentItem()->text();
- if (customGroup.isEmpty()) customGroup = i18n("Custom");
+ if (customGroup.isEmpty()) customGroup = i18nc("Group Name", "Custom");
ui.group_name->setText(customGroup);
ui.profile_name->setText(currentProfile);
QString newProfileName = ui.profile_name->text().simplified();
QString newGroupName = ui.group_name->text().simplified();
- if (newGroupName.isEmpty()) newGroupName = i18n("Custom");
+ if (newGroupName.isEmpty()) newGroupName = i18nc("Group Name", "Custom");
QString newMetaGroupId = ui.destination_list->itemData(ui.destination_list->currentIndex(), Qt::UserRole).toString();
QDomNodeList profilelist = doc.elementsByTagName("profile");
int i = 0;
KMessageBox::sorry(this, i18n("Cannot find the melt program required for rendering (part of Mlt)"));
return;
}
- if (m_view.play_after->isChecked() && KdenliveSettings::defaultplayerapp().isEmpty())
+ if (m_view.play_after->isChecked() && KdenliveSettings::defaultplayerapp().isEmpty()) {
KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog."));
+ }
QString chapterFile;
if (m_view.create_chapter->isChecked()) chapterFile = m_view.out_file->url().path() + ".dvdchapter";
// mantisbt 1051
- KStandardDirs::makeDir(m_view.out_file->url().directory());
+ if (!KStandardDirs::makeDir(m_view.out_file->url().directory())) {
+ KMessageBox::sorry(this, i18n("The directory %1, could not be created.\nPlease make sure you have the required permissions.", m_view.out_file->url().directory()));
+ return;
+ }
emit prepareRenderingData(scriptExport, m_view.render_zone->isChecked(), chapterFile);
}
-void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString &playlistPath, const QString &scriptPath)
+void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const QString &playlistPath, const QString &scriptPath, bool exportAudio)
{
QListWidgetItem *item = m_view.size_list->currentItem();
if (!item) return;
int width;
int height;
if (m_view.rescale->isChecked() && m_view.rescale->isEnabled()) {
- width = m_view.rescale_size->text().section('x', 0, 0).toInt();
- height = m_view.rescale_size->text().section('x', 1, 1).toInt();
+ width = m_view.rescale_width->value();
+ height = m_view.rescale_height->value();
} else {
width = m_profile.width;
height = m_profile.height;
else if (m_view.scanning_list->currentIndex() == 2) renderArgs.append(" progressive=0");
// disable audio if requested
- if (!m_view.export_audio->isChecked())
- renderArgs.append(" an=1 ");
+ if (!exportAudio) renderArgs.append(" an=1 ");
// Check if the rendering profile is different from project profile,
// in which case we need to use the producer_comsumer from MLT
QString subsize = currentSize;
if (std.startsWith("s=")) {
subsize = std.section(' ', 0, 0).toLower();
- subsize = subsize.section("=", 1, 1);
+ subsize = subsize.section('=', 1, 1);
} else if (std.contains(" s=")) {
subsize = std.section(" s=", 1, 1);
subsize = subsize.section(' ', 0, 0).toLower();
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()->data(GroupRole).toString(), m_view.size_list->currentItem()->text(), dest);
+ QMap <QString, QString> renderProps;
+ renderProps.insert("renderdestination", m_view.size_list->currentItem()->data(MetaGroupRole).toString());
+ renderProps.insert("rendercategory", m_view.size_list->currentItem()->data(GroupRole).toString());
+ renderProps.insert("renderprofile", m_view.size_list->currentItem()->text());
+ renderProps.insert("renderurl", dest);
+ renderProps.insert("renderzone", QString::number(m_view.render_zone->isChecked()));
+ renderProps.insert("renderguide", QString::number(m_view.render_guide->isChecked()));
+ renderProps.insert("renderstartguide", QString::number(m_view.guide_start->currentIndex()));
+ renderProps.insert("renderendguide", QString::number(m_view.guide_end->currentIndex()));
+ renderProps.insert("renderendguide", QString::number(m_view.guide_end->currentIndex()));
+ renderProps.insert("renderscanning", QString::number(m_view.scanning_list->currentIndex()));
+ int export_audio = 0;
+ if (m_view.export_audio->checkState() == Qt::Checked) export_audio = 2;
+ else if (m_view.export_audio->checkState() == Qt::Unchecked) export_audio = 1;
+ renderProps.insert("renderexportaudio", QString::number(export_audio));
+ renderProps.insert("renderrescale", QString::number(m_view.rescale->isChecked()));
+ renderProps.insert("renderrescalewidth", QString::number(m_view.rescale_width->value()));
+ renderProps.insert("renderrescaleheight", QString::number(m_view.rescale_height->value()));
+ renderProps.insert("rendertcoverlay", QString::number(m_view.tc_overlay->isChecked()));
+ renderProps.insert("renderratio", QString::number(m_view.rescale_keep->isChecked()));
+ renderProps.insert("renderplay", QString::number(m_view.play_after->isChecked()));
+
+ emit selectedRenderProfile(renderProps);
// insert item in running jobs list
QTreeWidgetItem *renderItem;
}
}
renderItem->setData(1, Qt::UserRole + 3, render_process_args);
+ if (exportAudio == false) renderItem->setData(1, Qt::UserRole + 5, i18n("Video without audio track"));
+ else renderItem->setData(1, Qt::UserRole + 5, QString());
+ m_view.running_jobs->setCurrentItem(renderItem);
+ m_view.tabWidget->setCurrentIndex(1);
checkRenderStatus();
}
if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) m_view.format_selection->setCurrentIndex(0);
else m_view.format_selection->setCurrentIndex(1);
m_view.scanning_list->setCurrentIndex(0);
+ m_view.rescale_width->setValue(KdenliveSettings::defaultrescalewidth());
+ if (!m_view.rescale_keep->isChecked()) {
+ m_view.rescale_height->blockSignals(true);
+ m_view.rescale_height->setValue(KdenliveSettings::defaultrescaleheight());
+ m_view.rescale_height->blockSignals(false);
+ }
refreshView();
}
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))
- m_view.rescale->setEnabled(false);
- else m_view.rescale->setEnabled(true);
+
+ if (destination == "websites")
+ m_view.open_browser->setVisible(true);
+ else
+ m_view.open_browser->setVisible(false);
+
// hide groups that are not in the correct destination
for (int i = 0; i < m_renderCategory.count(); i++) {
sizeItem = m_renderCategory.at(i);
m_view.size_list->setEnabled(true);
}
- if (m_view.format_list->count() > 1) m_view.format_list->setVisible(true);
- else m_view.format_list->setVisible(false);
+ if (m_view.format_list->count() > 1)
+ m_view.format_list->setVisible(true);
+ else
+ m_view.format_list->setVisible(false);
refreshView();
}
return KUrl(directory + filename);
}
-
-/**
- * Called when a new format or size has been selected.
- */
void RenderWidget::refreshParams()
{
// Format not available (e.g. codec not installed); Disable start button
QString extension = item->data(ExtensionRole).toString();
m_view.advanced_params->setPlainText(params);
QString destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString();
- if (params.contains(" s=") || destination == "audioonly") {
+ if (params.contains(" s=") || params.startsWith("s=") || destination == "audioonly") {
// profile has a fixed size, do not allow resize
m_view.rescale->setEnabled(false);
- m_view.rescale_size->setEnabled(false);
+ m_view.rescale_box->setEnabled(false);
} else {
m_view.rescale->setEnabled(true);
- m_view.rescale_size->setEnabled(true);
+ m_view.rescale_box->setEnabled(m_view.rescale->isChecked());
}
KUrl url = filenameWithExtension(m_view.out_file->url(), extension);
m_view.out_file->setUrl(url);
QListWidgetItem *item = NULL;
const QStringList acodecsList = KdenliveSettings::audiocodecs();
bool replaceVorbisCodec = false;
- if (!acodecsList.contains("vorbis") && acodecsList.contains("libvorbis")) replaceVorbisCodec = true;
+ if (acodecsList.contains("libvorbis")) replaceVorbisCodec = true;
bool replaceLibfaacCodec = false;
if (!acodecsList.contains("aac") && acodecsList.contains("libfaac")) replaceLibfaacCodec = true;
newdoc.appendChild(newprofiles);
QDomNodeList profilelist = doc.elementsByTagName("profile");
for (int i = 0; i < profilelist.count(); i++) {
- QString category = i18n("Custom");
+ QString category = i18nc("Category Name", "Custom");
QString extension;
QDomNode parent = profilelist.at(i).parentNode();
if (!parent.isNull()) {
params = params.replace("aac", "libfaac");
}
- QString category = profile.attribute("category", i18n("Custom"));
+ QString category = profile.attribute("category", i18nc("Category Name", "Custom"));
QString dest = profile.attribute("destinationid");
QString prof_extension = profile.attribute("extension");
if (!prof_extension.isEmpty()) extension = prof_extension;
m_view.destination_list->addItem(icon, i18n(metagroupName.toUtf8().data()), metagroupId);
}
}
- groupName = documentElement.attribute("name", i18n("Custom"));
+ groupName = documentElement.attribute("name", i18nc("Attribute Name", "Custom"));
extension = documentElement.attribute("extension", QString());
renderer = documentElement.attribute("renderer", QString());
bool exists = false;
activate = true;
}
m_view.abort_job->setEnabled(activate);
+ for (int i = 0; i < m_view.running_jobs->topLevelItemCount(); i++) {
+ current = m_view.running_jobs->topLevelItem(i);
+ if (current == m_view.running_jobs->currentItem()) {
+ current->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 3));
+ } else current->setSizeHint(1, QSize(m_view.running_jobs->columnWidth(1), fontMetrics().height() * 2));
+ }
}
void RenderWidget::slotCLeanUpJobs()
void RenderWidget::slotCheckScript()
{
- QTreeWidgetItem *item = m_view.scripts_list->currentItem();
- if (item == NULL) return;
- m_view.start_script->setEnabled(item->data(0, Qt::UserRole).toString().isEmpty());
+ QTreeWidgetItem *current = m_view.scripts_list->currentItem();
+ if (current == NULL) return;
+ m_view.start_script->setEnabled(current->data(0, Qt::UserRole).toString().isEmpty());
m_view.delete_script->setEnabled(true);
+ for (int i = 0; i < m_view.scripts_list->topLevelItemCount(); i++) {
+ current = m_view.scripts_list->topLevelItem(i);
+ if (current == m_view.scripts_list->currentItem()) {
+ current->setSizeHint(1, QSize(m_view.scripts_list->columnWidth(1), fontMetrics().height() * 3));
+ } else current->setSizeHint(1, QSize(m_view.scripts_list->columnWidth(1), fontMetrics().height() * 2));
+ }
}
void RenderWidget::slotStartScript()
m_view.error_box->setVisible(false);
}
-void RenderWidget::setRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &url)
+void RenderWidget::setRenderProfile(QMap <QString, QString> props)
{
m_view.destination_list->blockSignals(true);
m_view.format_list->blockSignals(true);
-
+ m_view.scanning_list->setCurrentIndex(props.value("renderscanning").toInt());
+ int exportAudio = props.value("renderexportaudio").toInt();
+ switch (exportAudio) {
+ case 1:
+ m_view.export_audio->setCheckState(Qt::Unchecked);
+ break;
+ case 2:
+ m_view.export_audio->setCheckState(Qt::Checked);
+ break;
+ default:
+ m_view.export_audio->setCheckState(Qt::PartiallyChecked);
+ }
+ if (props.contains("renderrescale")) m_view.rescale->setChecked(props.value("renderrescale").toInt());
+ if (props.contains("renderrescalewidth")) m_view.rescale_width->setValue(props.value("renderrescalewidth").toInt());
+ if (props.contains("renderrescaleheight")) m_view.rescale_height->setValue(props.value("renderrescaleheight").toInt());
+ if (props.contains("rendertcoverlay")) m_view.tc_overlay->setChecked(props.value("rendertcoverlay").toInt());
+ if (props.contains("renderratio")) m_view.rescale_keep->setChecked(props.value("renderratio").toInt());
+ if (props.contains("renderplay")) m_view.play_after->setChecked(props.value("renderplay").toInt());
+
+ if (props.value("renderzone") == "1") m_view.render_zone->setChecked(true);
+ else if (props.value("renderguide") == "1") {
+ m_view.render_guide->setChecked(true);
+ m_view.guide_start->setCurrentIndex(props.value("renderstartguide").toInt());
+ m_view.guide_end->setCurrentIndex(props.value("renderendguide").toInt());
+ } else m_view.render_full->setChecked(true);
+ slotUpdateGuideBox();
+
+ QString url = props.value("renderurl");
if (!url.isEmpty()) m_view.out_file->setUrl(KUrl(url));
// set destination
for (int i = 0; i < m_view.destination_list->count(); i++) {
- if (m_view.destination_list->itemData(i, Qt::UserRole) == dest) {
+ if (m_view.destination_list->itemData(i, Qt::UserRole) == props.value("renderdestination")) {
m_view.destination_list->setCurrentIndex(i);
break;
}
refreshCategory();
// set category
+ QString group = props.value("rendercategory");
if (!group.isEmpty()) {
QList<QListWidgetItem *> childs = m_view.format_list->findItems(group, Qt::MatchExactly);
if (!childs.isEmpty()) {
m_view.format_list->setCurrentItem(childs.at(0));
+ m_view.format_list->scrollToItem(childs.at(0));
}
refreshView();
}
// set profile
- QList<QListWidgetItem *> childs = m_view.size_list->findItems(name, Qt::MatchExactly);
+ QList<QListWidgetItem *> childs = m_view.size_list->findItems(props.value("renderprofile"), Qt::MatchExactly);
if (!childs.isEmpty()) {
m_view.size_list->setCurrentItem(childs.at(0));
+ m_view.size_list->scrollToItem(childs.at(0));
}
//refreshView();
m_view.destination_list->blockSignals(false);
} else m_view.errorLabel->setHidden(true);
}
+void RenderWidget::slotUpdateRescaleWidth(int val)
+{
+ KdenliveSettings::setDefaultrescalewidth(val);
+ if (!m_view.rescale_keep->isChecked()) return;
+ m_view.rescale_height->blockSignals(true);
+ m_view.rescale_height->setValue(val * m_profile.height / m_profile.width + 0.5);
+ KdenliveSettings::setDefaultrescaleheight(m_view.rescale_height->value());
+ m_view.rescale_height->blockSignals(false);
+}
+
+void RenderWidget::slotUpdateRescaleHeight(int val)
+{
+ KdenliveSettings::setDefaultrescaleheight(val);
+ if (!m_view.rescale_keep->isChecked()) return;
+ m_view.rescale_width->blockSignals(true);
+ m_view.rescale_width->setValue(val * m_profile.width / m_profile.height + 0.5);
+ KdenliveSettings::setDefaultrescaleheight(m_view.rescale_width->value());
+ m_view.rescale_width->blockSignals(false);
+}
+
+void RenderWidget::slotSwitchAspectRatio()
+{
+ KdenliveSettings::setRescalekeepratio(m_view.rescale_keep->isChecked());
+ if (m_view.rescale_keep->isChecked()) slotUpdateRescaleWidth(m_view.rescale_width->value());
+}
+
+void RenderWidget::slotUpdateAudioLabel(int ix)
+{
+ if (ix == Qt::PartiallyChecked)
+ m_view.export_audio->setText(i18n("Export audio (automatic)"));
+ else
+ m_view.export_audio->setText(i18n("Export audio"));
+}
+
+bool RenderWidget::automaticAudioExport() const
+{
+ return (m_view.export_audio->checkState() == Qt::PartiallyChecked);
+}
+
+bool RenderWidget::selectedAudioExport() const
+{
+ return (m_view.export_audio->checkState() != Qt::Unchecked);
+}
+
projects / kdenlive / blobdiff