small improvements to the clip transcode dialog, allow to specify output folder for...

svn path=/trunk/kdenlive/; revision=3931

diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp
index 3386edf6981f1d771dcacad9d049d1b4025ef784..83e3ccccc675276b1ab52cbb6cbd2d6f054176cf 100644 (file)
--- a/src/cliptranscode.cpp
+++ b/src/cliptranscode.cpp
@@ -23,36 +23,40 @@
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KMessageBox>
+#include <KFileDialog>
 
 
 ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, QWidget * parent) :
         QDialog(parent), m_urls(urls)
 {
     setFont(KGlobalSettings::toolBarFont());
-    m_view.setupUi(this);
+    setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
     setWindowTitle(i18n("Transcode Clip"));
+    auto_add->setText(i18np("Add clip to project", "Add clips to project", m_urls.count()));
+    dest_url->fileDialog()->setOperationMode(KFileDialog::Saving);
 
     if (m_urls.count() == 1) {
         QString fileName = m_urls.at(0).path(); //.section('.', 0, -1);
         QString newFile = params.section(' ', -1).replace("%1", fileName);
         KUrl dest(newFile);
-        m_view.source_url->setUrl(m_urls.at(0));
-        m_view.dest_url->setUrl(dest);
-        m_view.urls_list->setHidden(true);
-        connect(m_view.source_url, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateParams()));
+        source_url->setUrl(m_urls.at(0));
+        dest_url->setUrl(dest);
+        urls_list->setHidden(true);
+        connect(source_url, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateParams()));
     } else {
-        m_view.label_source->setHidden(true);
-        m_view.label_dest->setHidden(true);
-        m_view.source_url->setHidden(true);
-        m_view.dest_url->setHidden(true);
+        label_source->setHidden(true);
+        source_url->setHidden(true);
+        label_dest->setText(i18n("Destination folder"));
+        dest_url->setMode(KFile::Directory);
+        dest_url->setUrl(KUrl(m_urls.at(0).directory()));
         for (int i = 0; i < m_urls.count(); i++)
-            m_view.urls_list->addItem(m_urls.at(i).path());
+            urls_list->addItem(m_urls.at(i).path());
     }
     if (!params.isEmpty()) {
-        m_view.label_profile->setHidden(true);
-        m_view.profile_list->setHidden(true);
-        m_view.params->setPlainText(params.simplified());
+        label_profile->setHidden(true);
+        profile_list->setHidden(true);
+        ffmpeg_params->setPlainText(params.simplified());
     } else {
         // load Profiles
         KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc");
@@ -60,14 +64,14 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, QWidget * p
         // read the entries
         QMap< QString, QString > profiles = transConfig.entryMap();
         QMapIterator<QString, QString> i(profiles);
-        connect(m_view.profile_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateParams(int)));
+        connect(profile_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateParams(int)));
         while (i.hasNext()) {
             i.next();
-            m_view.profile_list->addItem(i.key(), i.value());
+            profile_list->addItem(i.key(), i.value());
         }
     }
 
-    connect(m_view.button_start, SIGNAL(clicked()), this, SLOT(slotStartTransCode()));
+    connect(button_start, SIGNAL(clicked()), this, SLOT(slotStartTransCode()));
 
     m_transcodeProcess.setProcessChannelMode(QProcess::MergedChannels);
     connect(&m_transcodeProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowTranscodeInfo()));
@@ -89,31 +93,36 @@ void ClipTranscode::slotStartTransCode()
         return;
     }
     QStringList parameters;
-    if (m_view.urls_list->count() > 0) {
-        m_view.source_url->setUrl(m_urls.takeFirst());
-        slotUpdateParams(-1);
-        QList<QListWidgetItem *> matching = m_view.urls_list->findItems(m_view.source_url->url().path(), Qt::MatchExactly);
+    QString destination;
+    QString params = ffmpeg_params->toPlainText().simplified();
+    if (urls_list->count() > 0) {
+        source_url->setUrl(m_urls.takeFirst());
+        destination = dest_url->url().path(KUrl::AddTrailingSlash) + source_url->url().fileName();
+        QList<QListWidgetItem *> matching = urls_list->findItems(source_url->url().path(), Qt::MatchExactly);
         if (matching.count() > 0) {
             matching.at(0)->setFlags(Qt::ItemIsSelectable);
-            m_view.urls_list->setCurrentItem(matching.at(0));
+            urls_list->setCurrentItem(matching.at(0));
         }
+    } else {
+        destination = dest_url->url().path().section('.', 0, -2);
     }
-    QString source_url = m_view.source_url->url().path();
+    QString extension = params.section("%1", 1, 1).section(' ', 0, 0);
+    params = params.replace("%1", destination);
+    QString s_url = source_url->url().path();
 
-    parameters << "-i" << source_url;
-    if (QFile::exists(m_view.dest_url->url().path())) {
-        if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", m_view.dest_url->url().path())) == KMessageBox::No) return;
+    parameters << "-i" << s_url;
+    if (QFile::exists(destination + extension)) {
+        if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", destination + extension)) == KMessageBox::No) return;
         parameters << "-y";
     }
-    m_view.buttonBox->button(QDialogButtonBox::Abort)->setText(i18n("Abort"));
-    QString params = m_view.params->toPlainText().simplified();
-    params = params.section(' ', 0, -2);
-    parameters << params.split(' ') << m_view.dest_url->url().path();
+    buttonBox->button(QDialogButtonBox::Abort)->setText(i18n("Abort"));
+
+    parameters << params.split(' ');
 
     //kDebug() << "/// FFMPEG ARGS: " << parameters;
 
     m_transcodeProcess.start("ffmpeg", parameters);
-    m_view.button_start->setEnabled(false);
+    button_start->setEnabled(false);
 
 }
 
@@ -121,24 +130,32 @@ void ClipTranscode::slotShowTranscodeInfo()
 {
     QString log = QString(m_transcodeProcess.readAll());
     //kDebug() << "//LOG: " << log;
-    m_view.log->setPlainText(log);
+    log_text->setPlainText(log);
 }
 
 void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    m_view.buttonBox->button(QDialogButtonBox::Abort)->setText(i18n("Close"));
-    m_view.button_start->setEnabled(true);
+    buttonBox->button(QDialogButtonBox::Abort)->setText(i18n("Close"));
+    button_start->setEnabled(true);
 
     if (exitCode == 0 && exitStatus == QProcess::NormalExit) {
-        m_view.log->setHtml(m_view.log->toPlainText() + "<br><b>" + i18n("Transcoding finished."));
-        if (m_view.auto_add->isChecked()) emit addClip(m_view.dest_url->url());
-        if (m_view.urls_list->count() > 0 && m_urls.count() > 0) {
+        log_text->setHtml(log_text->toPlainText() + "<br><b>" + i18n("Transcoding finished."));
+        if (auto_add->isChecked()) {
+            KUrl url;
+            if (urls_list->count() > 0) {
+                QString params = ffmpeg_params->toPlainText().simplified();
+                QString extension = params.section("%1", 1, 1).section(' ', 0, 0);
+                url = KUrl(dest_url->url().path(KUrl::AddTrailingSlash) + source_url->url().fileName() + extension);
+            } else url = dest_url->url();
+            emit addClip(url);
+        }
+        if (urls_list->count() > 0 && m_urls.count() > 0) {
             m_transcodeProcess.close();
             slotStartTransCode();
             return;
-        } else if (m_view.auto_close->isChecked()) accept();
+        } else if (auto_close->isChecked()) accept();
     } else {
-        m_view.log->setHtml(m_view.log->toPlainText() + "<br><b>" + i18n("Transcoding FAILED!"));
+        log_text->setHtml(log_text->toPlainText() + "<br><b>" + i18n("Transcoding FAILED!"));
     }
 
     m_transcodeProcess.close();
@@ -146,14 +163,15 @@ void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exi
 
 void ClipTranscode::slotUpdateParams(int ix)
 {
-    QString fileName = m_view.source_url->url().path();
+    QString fileName = source_url->url().path();
     if (ix != -1) {
-        QString params = m_view.profile_list->itemData(ix).toString();
-        m_view.params->setPlainText(params.simplified());
+        QString params = profile_list->itemData(ix).toString();
+        ffmpeg_params->setPlainText(params.simplified());
+    }
+    if (urls_list->count() == 0) {
+        QString newFile = ffmpeg_params->toPlainText().simplified().section(' ', -1).replace("%1", fileName);
+        dest_url->setUrl(KUrl(newFile));
     }
-
-    QString newFile = m_view.params->toPlainText().simplified().section(' ', -1).replace("%1", fileName);
-    m_view.dest_url->setUrl(KUrl(newFile));
 
 }
 

diff --git a/src/cliptranscode.h b/src/cliptranscode.h
index e46fc53a000f7377bc33bd2246110d90495203b2..9933da5864bb148c18b756578e8459816252f0a6 100644 (file)
--- a/src/cliptranscode.h
+++ b/src/cliptranscode.h
@@ -28,7 +28,7 @@
 
 #include <QProcess>
 
-class ClipTranscode : public QDialog
+class ClipTranscode : public QDialog, public Ui::ClipTranscode_UI
 {
     Q_OBJECT
 
@@ -44,7 +44,6 @@ private slots:
     void slotUpdateParams(int ix = -1);
 
 private:
-    Ui::ClipTranscode_UI m_view;
     QProcess m_transcodeProcess;
     KUrl::List m_urls;
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e4cc0fbb6c9c8dc1753c4fc60976062197dd74df..6e7fcf84fb1464c413834f409a51d42029cf136f 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -879,7 +879,7 @@ void MainWindow::setupActions()
     collection->addAction("dvd_wizard", dvdWizard);
     connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard()));
 
-    KAction *transcodeClip =  new KAction(KIcon("edit-copy"), i18n("Transcode Clip"), this);
+    KAction *transcodeClip =  new KAction(KIcon("edit-copy"), i18n("Transcode Clips"), this);
     collection->addAction("transcode_clip", transcodeClip);
     connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip()));
 

diff --git a/src/widgets/cliptranscode_ui.ui b/src/widgets/cliptranscode_ui.ui
index 9fc90ce3f10a91ea217b0e7d6493bc53c9b64154..a31d86e2f3c1525785811a2223ddabe96b85f326 100644 (file)
--- a/src/widgets/cliptranscode_ui.ui
+++ b/src/widgets/cliptranscode_ui.ui
@@ -42,7 +42,7 @@
     </widget>
    </item>
    <item row="5" column="0" colspan="3">
-    <widget class="QTextEdit" name="params">
+    <widget class="QTextEdit" name="ffmpeg_params">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
        <horstretch>0</horstretch>
@@ -59,7 +59,7 @@
     </widget>
    </item>
    <item row="7" column="0" colspan="3">
-    <widget class="QTextEdit" name="log">
+    <widget class="QTextEdit" name="log_text">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
@@ -129,7 +129,11 @@
     <widget class="KComboBox" name="profile_list"/>
    </item>
    <item row="2" column="0" colspan="3">
-    <widget class="QListWidget" name="urls_list"/>
+    <widget class="QListWidget" name="urls_list">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>