X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipproperties.cpp;h=afa96660e0298ab63f7eb31d54522697daa8d8e0;hb=ebc919bf530e7ff6dce5ebfb43d496ccc38823c0;hp=f9d79573a2b0d2e329899e1a86debb49daa39a1e;hpb=1e007c2d73386e714ed480aba390b827e181994a;p=kdenlive diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index f9d79573..afa96660 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -27,8 +27,24 @@ #include #include #include +#include +#include +#include +#include + +#ifdef USE_NEPOMUK +#if KDE_IS_VERSION(4,6,0) +#include +#include +#include +#include +#endif +#endif + #include +#include + static const int VIDEOTAB = 0; static const int AUDIOTAB = 1; @@ -217,7 +233,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_proxyContainer = new QFrame(); m_proxyContainer->setFrameShape(QFrame::NoFrame); QHBoxLayout *l = new QHBoxLayout; - l->addWidget(new QLabel(i18n("Proxy clip: %1").arg(KIO::convertSize(f.size())))); + l->addWidget(new QLabel(i18n("Proxy clip: %1", KIO::convertSize(f.size())))); l->addStretch(5); QPushButton *pb = new QPushButton(i18n("Delete proxy")); l->addWidget(pb); @@ -245,6 +261,9 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_force_vindex->setEnabled(false); } + if (t == PLAYLIST) + m_view.tabWidget->setTabText(VIDEOTAB, i18n("Playlist")); + if (t == IMAGE) { m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(COLORTAB); @@ -269,7 +288,6 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_color->setColor(QColor('#' + props.value("colour").right(8).left(6))); connect(m_view.clip_color, SIGNAL(changed(QColor)), this, SLOT(slotModified())); } else if (t == SLIDESHOW) { - bool isMime = true; if (url.fileName().startsWith(".all.")) { // the image sequence is defined by mimetype m_view.clip_path->setText(url.directory()); @@ -278,7 +296,6 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.slide_type_label->setHidden(true); m_view.image_type->setHidden(true); m_view.clip_path->setText(url.path()); - isMime = false; } m_view.tabWidget->removeTab(METATAB); @@ -329,7 +346,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.slide_duration_frames->setHidden(true); m_view.luma_duration_frames->setHidden(true); - parseFolder(); + parseFolder(false); m_view.luma_duration->setText(tc.getTimecodeFromFrames(props.value("luma_duration").toInt())); QString lumaFile = props.value("luma_file"); @@ -395,6 +412,8 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg if (props.contains("videocodec")) new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Video codec") << props.value("videocodec")); + else if (props.contains("videocodecid")) + new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Video codec") << props.value("videocodecid")); if (props.contains("frame_size")) new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Frame size") << props.value("frame_size")); @@ -403,6 +422,13 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Frame rate") << props.value("fps")); if (!m_view.clip_framerate->isEnabled()) m_view.clip_framerate->setValue(props.value("fps").toDouble()); } + + if (props.contains("progressive")) { + int scanning = props.value("progressive").toInt(); + QString txt = scanning == 1 ? i18n("Progressive") : i18n("Interlaced"); + new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Scanning") << txt); + } + if (props.contains("aspect_ratio")) new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Pixel aspect ratio") << props.value("aspect_ratio")); @@ -411,12 +437,10 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg if (props.contains("colorspace")) new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Colorspace") << ProfilesDialog::getColorspaceDescription(props.value("colorspace").toInt())); - - int width = 180.0 * KdenliveSettings::project_display_ratio(); - if (width % 2 == 1) width++; - QPixmap pix = m_clip->thumbProducer()->getImage(url, m_clip->getClipThumbFrame(), width, 180); - m_view.clip_thumb->setPixmap(pix); - if (t == IMAGE || t == VIDEO) m_view.tabWidget->removeTab(AUDIOTAB); + + m_view.clip_thumb->setMinimumSize(180 * KdenliveSettings::project_display_ratio(), 180); + + if (t == IMAGE || t == VIDEO || t == PLAYLIST) m_view.tabWidget->removeTab(AUDIOTAB); } else { m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(SLIDETAB); @@ -432,8 +456,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_filesize->setHidden(true); m_view.label_size->setHidden(true); } - m_view.clip_duration->setInputMask(""); - m_view.clip_duration->setValidator(tc.validator()); + m_view.clip_duration->setInputMask(tc.mask()); m_view.clip_duration->setText(tc.getTimecode(m_clip->duration())); if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true); else { @@ -448,17 +471,60 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.marker_edit->setToolTip(i18n("Edit marker")); m_view.marker_delete->setIcon(KIcon("trash-empty")); m_view.marker_delete->setToolTip(i18n("Delete marker")); - - slotFillMarkersList(); + m_view.marker_save->setIcon(KIcon("document-save-as")); + m_view.marker_save->setToolTip(i18n("Save markers")); + m_view.marker_load->setIcon(KIcon("document-open")); + m_view.marker_load->setToolTip(i18n("Load markers")); + m_view.analysis_delete->setIcon(KIcon("trash-empty")); + m_view.analysis_delete->setToolTip(i18n("Delete analysis data")); + m_view.analysis_load->setIcon(KIcon("document-open")); + m_view.analysis_load->setToolTip(i18n("Load analysis data")); + m_view.analysis_save->setIcon(KIcon("document-save-as")); + m_view.analysis_save->setToolTip(i18n("Save analysis data")); + + // Check for Nepomuk metadata +#ifdef USE_NEPOMUK +#if KDE_IS_VERSION(4,6,0) + if (!url.isEmpty()) { + Nepomuk::ResourceManager::instance()->init(); + Nepomuk::Resource res( url.path() ); + // Check if file has a license + if (res.hasProperty(Nepomuk::Vocabulary::NIE::license())) { + QString ltype = res.property(Nepomuk::Vocabulary::NIE::licenseType()).toString(); + m_view.clip_license->setText(i18n("License: %1", res.property(Nepomuk::Vocabulary::NIE::license()).toString())); + if (ltype.startsWith("http")) { + m_view.clip_license->setUrl(ltype); + connect(m_view.clip_license, SIGNAL(leftClickedUrl(const QString &)), this, SLOT(slotOpenUrl(const QString &))); + } + } + else m_view.clip_license->setHidden(true); + } + else m_view.clip_license->setHidden(true); +#else + m_view.clip_license->setHidden(true); +#endif +#else + m_view.clip_license->setHidden(true); +#endif + + slotFillMarkersList(m_clip); + slotUpdateAnalysisData(m_clip); + connect(m_view.marker_new, SIGNAL(clicked()), this, SLOT(slotAddMarker())); connect(m_view.marker_edit, SIGNAL(clicked()), this, SLOT(slotEditMarker())); connect(m_view.marker_delete, SIGNAL(clicked()), this, SLOT(slotDeleteMarker())); + connect(m_view.marker_save, SIGNAL(clicked()), this, SLOT(slotSaveMarkers())); + connect(m_view.marker_load, SIGNAL(clicked()), this, SLOT(slotLoadMarkers())); connect(m_view.markers_list, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(slotEditMarker())); - + + connect(m_view.analysis_delete, SIGNAL(clicked()), this, SLOT(slotDeleteAnalysis())); + connect(m_view.analysis_save, SIGNAL(clicked()), this, SLOT(slotSaveAnalysis())); + connect(m_view.analysis_load, SIGNAL(clicked()), this, SLOT(slotLoadAnalysis())); + connect(this, SIGNAL(accepted()), this, SLOT(slotApplyProperties())); connect(m_view.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(slotApplyProperties())); m_view.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); - //adjustSize(); + adjustSize(); } @@ -475,7 +541,7 @@ ClipProperties::ClipProperties(QList cliplist, Timecode tc, QMap setFont(KGlobalSettings::toolBarFont()); m_view.setupUi(this); QString title = windowTitle(); - title.append(" " + i18np("(%1 clip)", "(%1 clips)", cliplist.count())); + title.append(' ' + i18np("(%1 clip)", "(%1 clips)", cliplist.count())); setWindowTitle(title); QMap props = cliplist.at(0)->properties(); m_old_props = commonproperties; @@ -612,10 +678,27 @@ ClipProperties::~ClipProperties() if (del2) delete del2; } +void ClipProperties::slotGotThumbnail(const QString &id, QImage img) +{ + if (id != m_clip->getId()) return; + QPixmap framedPix(img.width(), img.height()); + framedPix.fill(Qt::transparent); + QPainter p(&framedPix); + p.setRenderHint(QPainter::Antialiasing, true); + QPainterPath path; + path.addRoundedRect(0.5, 0.5, framedPix.width() - 1, framedPix.height() - 1, 4, 4); + p.setClipPath(path); + p.drawImage(0, 0, img); + p.end(); + m_view.clip_thumb->setPixmap(framedPix); +} + void ClipProperties::slotApplyProperties() { - if (m_clip != NULL) - emit applyNewClipProperties(m_clip->getId(), m_clip->properties(), properties(), needsTimelineRefresh(), needsTimelineReload()); + if (m_clip != NULL) { + QMap props = properties(); + emit applyNewClipProperties(m_clip->getId(), m_clip->currentProperties(props), props, needsTimelineRefresh(), needsTimelineReload()); + } m_view.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); } @@ -658,26 +741,56 @@ void ClipProperties::slotEnableLumaFile(int state) m_view.label_softness->setEnabled(enable); } -void ClipProperties::slotFillMarkersList() +void ClipProperties::slotUpdateAnalysisData(DocClipBase *clip) { + if (m_clip != clip) return; + m_view.analysis_list->clear(); + QMap analysis = clip->analysisData(); + m_view.analysis_box->setHidden(analysis.isEmpty()); + QMap::const_iterator i = analysis.constBegin(); + while (i != analysis.constEnd()) { + QStringList itemtext; + itemtext << i.key() << i.value(); + (void) new QTreeWidgetItem(m_view.analysis_list, itemtext); + ++i; + } +} + +void ClipProperties::slotFillMarkersList(DocClipBase *clip) +{ + if (m_clip != clip) return; m_view.markers_list->clear(); QList < CommentedTime > marks = m_clip->commentedSnapMarkers(); for (int count = 0; count < marks.count(); ++count) { QString time = m_tc.getTimecode(marks[count].time()); QStringList itemtext; - itemtext << time << marks[count].comment(); - (void) new QTreeWidgetItem(m_view.markers_list, itemtext); + itemtext << time << marks.at(count).comment(); + QTreeWidgetItem *item = new QTreeWidgetItem(m_view.markers_list, itemtext); + item->setData(0, Qt::DecorationRole, CommentedTime::markerColor(marks.at(count).markerType())); } } void ClipProperties::slotAddMarker() { CommentedTime marker(GenTime(), i18n("Marker")); - MarkerDialog d(m_clip, marker, m_tc, i18n("Add Marker"), this); - if (d.exec() == QDialog::Accepted) { - emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment()); + QPointer d = new MarkerDialog(m_clip, marker, + m_tc, i18n("Add Marker"), this); + if (d->exec() == QDialog::Accepted) { + QList markers; + markers << d->newMarker(); + emit addMarkers(m_clip->getId(), markers); } - QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); + delete d; +} + +void ClipProperties::slotSaveMarkers() +{ + emit saveMarkers(m_clip->getId()); +} + +void ClipProperties::slotLoadMarkers() +{ + emit loadMarkers(m_clip->getId()); } void ClipProperties::slotEditMarker() @@ -687,19 +800,55 @@ void ClipProperties::slotEditMarker() if (pos < 0 || pos > marks.count() - 1) return; MarkerDialog d(m_clip, marks.at(pos), m_tc, i18n("Edit Marker"), this); if (d.exec() == QDialog::Accepted) { - emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment()); + QList markers; + markers << d.newMarker(); + emit addMarkers(m_clip->getId(), markers); } - QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); } void ClipProperties::slotDeleteMarker() { QList < CommentedTime > marks = m_clip->commentedSnapMarkers(); - int pos = m_view.markers_list->currentIndex().row(); - if (pos < 0 || pos > marks.count() - 1) return; - emit addMarker(m_clip->getId(), marks.at(pos).time(), QString()); + QList < CommentedTime > toDelete; + for (int i = 0; i < marks.count(); i++) { + if (m_view.markers_list->topLevelItem(i)->isSelected()) { + CommentedTime marker = marks.at(i); + marker.setMarkerType(-1); + toDelete << marker; + } + } + emit addMarkers(m_clip->getId(), toDelete); +} - QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); +void ClipProperties::slotDeleteAnalysis() +{ + QTreeWidgetItem *current = m_view.analysis_list->currentItem(); + if (current) emit editAnalysis(m_clip->getId(), current->text(0), QString()); +} + +void ClipProperties::slotSaveAnalysis() +{ + QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save Analysis Data")); + if (url.isEmpty()) return; + KSharedConfigPtr config = KSharedConfig::openConfig(url, KConfig::SimpleConfig); + KConfigGroup analysisConfig(config, "Analysis"); + QTreeWidgetItem *current = m_view.analysis_list->currentItem(); + analysisConfig.writeEntry(current->text(0), current->text(1)); +} + +void ClipProperties::slotLoadAnalysis() +{ + QString url = KFileDialog::getOpenFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Open Analysis Data")); + if (url.isEmpty()) return; + KSharedConfigPtr config = KSharedConfig::openConfig(url, KConfig::SimpleConfig); + KConfigGroup transConfig(config, "Analysis"); + // read the entries + QMap< QString, QString > profiles = transConfig.entryMap(); + QMapIterator i(profiles); + while (i.hasNext()) { + i.next(); + emit editAnalysis(m_clip->getId(), i.key(), i.value()); + } } const QString &ClipProperties::clipId() const @@ -934,7 +1083,7 @@ bool ClipProperties::needsTimelineReload() const } -void ClipProperties::parseFolder() +void ClipProperties::parseFolder(bool reloadThumb) { QString path = m_view.clip_path->text(); bool isMime = !(path.contains('%')); @@ -954,17 +1103,31 @@ void ClipProperties::parseFolder() QStringList result = dir.entryList(QDir::Files); if (!isMime) { - // find pattern - QString filter = KUrl(m_view.clip_path->text()).fileName(); - QString ext = filter.section('.', -1); - filter = filter.section('%', 0, -2); - QString regexp = "^" + filter + "\\d+\\." + ext + "$"; - QRegExp rx(regexp); - QStringList entries; - foreach(const QString & path, result) { - if (rx.exactMatch(path)) entries << path; - } - result = entries; + int offset = 0; + QString path = m_view.clip_path->text(); + if (path.contains('?')) { + // New MLT syntax + offset = m_view.clip_path->text().section(':', -1).toInt(); + path = path.section('?', 0, 0); + } + QString filter = KUrl(path).fileName(); + QString ext = filter.section('.', -1); + filter = filter.section('%', 0, -2); + QString regexp = '^' + filter + "\\d+\\." + ext + '$'; + QRegExp rx(regexp); + QStringList entries; + int ix; + foreach(const QString & path, result) { + if (rx.exactMatch(path)) { + if (offset > 0) { + // make sure our image is in the range we want (> begin) + ix = path.section(filter, 1).section('.', 0, 0).toInt(); + if (ix < offset) continue; + } + entries << path; + } + } + result = entries; } m_count = result.count(); @@ -977,16 +1140,16 @@ void ClipProperties::parseFolder() } m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); m_view.slide_info->setText(i18np("1 image found", "%1 images found", m_count)); - QDomElement xml = m_clip->toXML(); - xml.setAttribute("resource", m_view.clip_path->text() + extension); - int width = 180.0 * KdenliveSettings::project_display_ratio(); - if (width % 2 == 1) width++; - QString filePath = m_view.clip_path->text(); - if (isMime) filePath.append(extension); - QPixmap pix = m_clip->thumbProducer()->getImage(KUrl(filePath), 1, width, 180); QMap props = m_clip->properties(); m_view.clip_duration->setText(m_tc.getTimecodeFromFrames(props.value("ttl").toInt() * m_count)); - m_view.clip_thumb->setPixmap(pix); + if (reloadThumb) { + int width = 180.0 * KdenliveSettings::project_display_ratio(); + if (width % 2 == 1) width++; + QString filePath = m_view.clip_path->text(); + if (isMime) filePath.append(extension); + QPixmap pix = m_clip->thumbProducer()->getImage(KUrl(filePath), 1, width, 180); + m_view.clip_thumb->setPixmap(pix); + } } void ClipProperties::slotCheckMaxLength() @@ -1028,6 +1191,11 @@ void ClipProperties::slotDeleteProxy() if (m_proxyContainer) delete m_proxyContainer; } +void ClipProperties::slotOpenUrl(const QString &url) +{ + new KRun(KUrl(url), this); +} + #include "clipproperties.moc"