From: Jean-Baptiste Mardelle Date: Wed, 16 Feb 2011 15:49:16 +0000 (+0000) Subject: Add checkbox to "Add clip" dialog to automatically add transparency to images: http... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4530f9cffd57e8e81efca60a7913ce8d6fac6a17;p=kdenlive Add checkbox to "Add clip" dialog to automatically add transparency to images: http://kdenlive.org/mantis/view.php?id=2021 svn path=/trunk/kdenlive/; revision=5412 --- diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index 413fa787..3ed3ed37 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -279,6 +279,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co prod.setAttribute("type", (int) IMAGE); prod.setAttribute("in", 0); prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1); + if (KdenliveSettings::autoimagetransparency()) prod.setAttribute("transparency", 1); // Read EXIF metadata for JPEG if (type->is("image/jpeg")) { KFileMetaInfo metaInfo(file.path(), QString("image/jpeg"), KFileMetaInfo::TechnicalInfo); diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg index 6be859b2..9800a93f 100644 --- a/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -49,6 +49,11 @@ false + + + + false + diff --git a/src/projectlist.cpp b/src/projectlist.cpp index da8b443b..94286501 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -1154,8 +1154,7 @@ void ProjectList::updateAllClips() //qApp->processEvents(); ++it; } - /*if (!m_queueTimer.isActive()) - m_queueTimer.start();*/ + if (!m_queueRunner.isRunning() && m_processingClips.isEmpty()) m_queueRunner = QtConcurrent::run(this, &ProjectList::slotProcessNextClipInQueue); if (m_listView->isEnabled()) monitorItemEditing(true); @@ -1195,10 +1194,21 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group const QString dialogFilter = allExtensions + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files"); QCheckBox *b = new QCheckBox(i18n("Import image sequence")); b->setChecked(KdenliveSettings::autoimagesequence()); - KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), b); + QCheckBox *c = new QCheckBox(i18n("Transparent background for images")); + c->setChecked(KdenliveSettings::autoimagetransparency()); + QFrame *f = new QFrame; + f->setFrameShape(QFrame::NoFrame); + QHBoxLayout *l = new QHBoxLayout; + l->addWidget(b); + l->addWidget(c); + l->addStretch(5); + f->setLayout(l); + KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f); d->setOperationMode(KFileDialog::Opening); d->setMode(KFile::Files); - d->exec(); + if (d->exec() == QDialog::Accepted) { + KdenliveSettings::setAutoimagetransparency(c->isChecked()); + } list = d->selectedUrls(); if (b->isChecked() && list.count() == 1) { // Check for image sequence