Fixed Frensh spacing and a typo.

[kdenlive] / src / renderwidget.cpp

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 9bb08df998345f4ab91229c692362e5f92d8cc6f..384facbee3a405ebbce1f0c6c02732390c838a72 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -48,7 +48,9 @@ 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)
+RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) :
+        QDialog(parent),
+        m_projectFolder(projectfolder)
 {
     m_view.setupUi(this);
     setWindowTitle(i18n("Rendering"));
@@ -332,6 +334,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();
@@ -534,7 +537,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);
@@ -554,7 +557,7 @@ void RenderWidget::slotExport(bool scriptExport)
     if (dest.isEmpty()) return;
     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;
     }
 
@@ -574,7 +577,7 @@ void RenderWidget::slotExport(bool scriptExport)
         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)
+            if (KMessageBox::warningYesNo(this, i18n("Script file already exists. Do you want to overwrite it?")) != KMessageBox::Yes)
                 return;
         }
     }
@@ -592,7 +595,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;
@@ -620,7 +623,12 @@ void RenderWidget::slotExport(bool scriptExport)
 
     QString std = renderArgs;
     QString destination = m_view.destination_list->itemData(m_view.destination_list->currentIndex()).toString();
-    if (std.contains(" s=")) {
+    if (std.startsWith("s=")) {
+        QString subsize = std.section(' ', 0, 0).toLower();
+        subsize = subsize.section("=", 1, 1);
+        const QString currentSize = QString::number(width) + 'x' + QString::number(height);
+        if (subsize != currentSize) resizeProfile = true;
+    } else if (std.contains(" s=")) {
         QString subsize = std.section(" s=", 1, 1);
         subsize = subsize.section(' ', 0, 0).toLower();
         const QString currentSize = QString::number(width) + 'x' + QString::number(height);
@@ -1211,7 +1219,7 @@ void RenderWidget::parseScriptFiles()
     QTreeWidgetItemIterator it(m_view.scripts_list);
     if (*it) {
         kDebug() << "// FOUND SCRIPT ITEM:" << (*it)->text(0);
-        // Selecting item does not work, why ???
+        // Selecting item does not work, why???
         m_view.scripts_list->setCurrentItem(*it);
         (*it)->setSelected(true);
         activate = true;