X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipproperties.cpp;h=18c2a6b9a9c8cdcae344f5f774347fa4d485d4e9;hb=c24658bd34221d735f0641c924b890e1a6be7101;hp=adb9ad44a982154b39eac0e3221e8f1ec54eb173;hpb=57fe61218c3ecab2c5c18bc8e81b55823691540b;p=kdenlive diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index adb9ad44..18c2a6b9 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,12 @@ #include #endif #endif +#ifdef USE_NEPOMUKCORE +#include +#include +#include +#include +#endif #include @@ -55,14 +62,15 @@ static const int METATAB = 6; static const int ADVANCEDTAB = 7; -ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent) : - QDialog(parent), - m_clip(clip), - m_tc(tc), - m_fps(fps), - m_count(0), - m_clipNeedsRefresh(false), - m_clipNeedsReLoad(false) +ClipProperties::ClipProperties(DocClipBase *clip, const Timecode &tc, double fps, QWidget * parent) : + QDialog(parent) + , m_clip(clip) + , m_tc(tc) + , m_fps(fps) + , m_count(0) + , m_clipNeedsRefresh(false) + , m_clipNeedsReLoad(false) + , m_proxyContainer(NULL) { setAttribute(Qt::WA_DeleteOnClose, true); setFont(KGlobalSettings::toolBarFont()); @@ -83,7 +91,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg // New display aspect ratio support if (props.contains("force_aspect_num") && props.value("force_aspect_num").toInt() > 0 && - props.contains("force_aspect_den") && props.value("force_aspect_den").toInt() > 0) { + props.contains("force_aspect_den") && props.value("force_aspect_den").toInt() > 0) { m_view.clip_force_ar->setChecked(true); m_view.clip_ar_num->setEnabled(true); m_view.clip_ar_den->setEnabled(true); @@ -123,14 +131,16 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg } connect(m_view.clip_force_framerate, SIGNAL(toggled(bool)), this, SLOT(slotModified())); connect(m_view.clip_framerate, SIGNAL(valueChanged(double)), this, SLOT(slotModified())); + m_view.clip_progressive->addItem(i18n("Interlaced"), 0); + m_view.clip_progressive->addItem(i18n("Progressive"), 1); if (props.contains("force_progressive")) { m_view.clip_force_progressive->setChecked(true); m_view.clip_progressive->setEnabled(true); - m_view.clip_progressive->setValue(props.value("force_progressive").toInt()); + m_view.clip_progressive->setCurrentIndex(props.value("force_progressive").toInt()); } connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), this, SLOT(slotModified())); - connect(m_view.clip_progressive, SIGNAL(valueChanged(int)), this, SLOT(slotModified())); + connect(m_view.clip_progressive, SIGNAL(currentIndexChanged(int)), this, SLOT(slotModified())); m_view.clip_fieldorder->addItem(i18n("Bottom first"), 0); m_view.clip_fieldorder->addItem(i18n("Top first"), 1); @@ -193,12 +203,45 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg connect(m_view.clip_full_luma, SIGNAL(toggled(bool)), this, SLOT(slotModified())); // Check for Metadata - QMap meta = m_clip->metadata(); - QMap::const_iterator i = meta.constBegin(); + QMap meta = m_clip->metadata(); + QMap::const_iterator i = meta.constBegin(); while (i != meta.constEnd()) { - QTreeWidgetItem *metaitem = new QTreeWidgetItem(m_view.metadata_list); + QStringList values = i.value(); + QString parentName; + QString iconName; + if (values.count() > 1 && !values.at(1).isEmpty()) { + parentName = values.at(1); + } else { + if (KdenliveSettings::ffmpegpath().endsWith("avconv")) { + parentName = i18n("Libav"); + iconName = "meta_libav.png"; + } + else { + parentName = i18n("FFmpeg"); + iconName = "meta_ffmpeg.png"; + } + } + QTreeWidgetItem *parent = NULL; + QList matches = m_view.metadata_list->findItems(parentName, Qt::MatchExactly); + if (!matches.isEmpty()) { + parent = matches.at(0); + } else { + if (parentName == "Magic Lantern") + iconName = "meta_magiclantern.png"; + parent = new QTreeWidgetItem(m_view.metadata_list, QStringList() << parentName); + if (!iconName.isEmpty()) { + KIcon icon(KStandardDirs::locate("appdata", iconName)); + parent->setIcon(0, icon); + } + } + QTreeWidgetItem *metaitem = NULL; + if (parent) { + metaitem = new QTreeWidgetItem(parent); + parent->setExpanded(true); + } + else metaitem = new QTreeWidgetItem(m_view.metadata_list); metaitem->setText(0, i.key()); //i18n(i.key().section('.', 2, 3).toUtf8().data())); - metaitem->setText(1, i.value()); + metaitem->setText(1, values.at(0)); ++i; } @@ -222,7 +265,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Frequency") << props.value("frequency")); - CLIPTYPE t = m_clip->clipType(); + ClipType t = m_clip->clipType(); if (props.contains("proxy") && props.value("proxy") != "-") { KFileItem f(KFileItem::Unknown, KFileItem::Unknown, KUrl(props.value("proxy")), true); @@ -238,11 +281,11 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg l->addWidget(pb); connect(pb, SIGNAL(clicked()), this, SLOT(slotDeleteProxy())); m_proxyContainer->setLayout(l); - if (t == IMAGE) { + if (t == Image) { m_view.tab_image->layout()->addWidget(line); m_view.tab_image->layout()->addWidget(m_proxyContainer); } - else if (t == AUDIO) { + else if (t == Audio) { m_view.tab_audio->layout()->addWidget(line); m_view.tab_audio->layout()->addWidget(m_proxyContainer); } @@ -252,18 +295,18 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg } } - if (t != AUDIO && t != AV) { + if (t != Audio && t != AV) { m_view.clip_force_aindex->setEnabled(false); } - if (t != VIDEO && t != AV) { + if (t != Video && t != AV) { m_view.clip_force_vindex->setEnabled(false); } - if (t == PLAYLIST) - m_view.tabWidget->setTabText(VIDEOTAB, i18n("Playlist")); + if (t == Playlist) + m_view.tabWidget->setTabText(VIDEOTAB, i18n("Playlist")); - if (t == IMAGE) { + if (t == Image) { m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(COLORTAB); m_view.tabWidget->removeTab(AUDIOTAB); @@ -274,9 +317,10 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.image_transparency->setChecked(props.value("transparency").toInt()); connect(m_view.image_transparency, SIGNAL(toggled(bool)), this, SLOT(slotModified())); int width = 180.0 * KdenliveSettings::project_display_ratio(); - if (width % 2 == 1) width++; + if (width % 2 == 1) + width++; m_view.clip_thumb->setPixmap(QPixmap(url.path()).scaled(QSize(width, 180), Qt::KeepAspectRatio)); - } else if (t == COLOR) { + } else if (t == Color) { m_view.clip_path->setEnabled(false); m_view.tabWidget->removeTab(METATAB); m_view.tabWidget->removeTab(IMAGETAB); @@ -286,8 +330,8 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_thumb->setHidden(true); 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) { - if (url.fileName().startsWith(".all.")) { + } else if (t == SlideShow) { + if (url.fileName().startsWith(QLatin1String(".all."))) { // the image sequence is defined by mimetype m_view.clip_path->setText(url.directory()); } else { @@ -331,7 +375,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.animation->setCurrentIndex(0); QString path = props.value("resource"); QString ext = path.section('.', -1); - for (int i = 0; i < m_view.image_type->count(); i++) { + for (int i = 0; i < m_view.image_type->count(); ++i) { if (m_view.image_type->itemData(i).toString() == ext) { m_view.image_type->setCurrentIndex(i); break; @@ -345,7 +389,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"); @@ -397,7 +441,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg connect(m_view.slide_luma, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int))); connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder())); - } else if (t != AUDIO) { + } else if (t != Audio) { m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(COLORTAB); @@ -408,49 +452,12 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_aproperties->setItemDelegate(del2); m_view.clip_aproperties->setStyleSheet(QString("QTreeWidget { background-color: transparent;}")); m_view.clip_vproperties->setStyleSheet(QString("QTreeWidget { background-color: transparent;}")); - - if (props.contains("videocodec")) - new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Video codec") << props.value("videocodec")); - - if (props.contains("frame_size")) - new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Frame size") << props.value("frame_size")); - - if (props.contains("fps")) { - 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); - } + loadVideoProperties(props); - if (props.contains("aspect_ratio")) - new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Pixel aspect ratio") << props.value("aspect_ratio")); - - if (props.contains("pix_fmt")) - new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Pixel format") << props.value("pix_fmt")); - - if (props.contains("colorspace")) - new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Colorspace") << ProfilesDialog::getColorspaceDescription(props.value("colorspace").toInt())); + m_view.clip_thumb->setMinimumSize(180 * KdenliveSettings::project_display_ratio(), 180); - - 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); - QPixmap framedPix(pix.width(), pix.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.drawPixmap(0, 0, pix); - p.end(); - - m_view.clip_thumb->setPixmap(framedPix); - if (t == IMAGE || t == VIDEO || t == PLAYLIST) m_view.tabWidget->removeTab(AUDIOTAB); + if (t == Image || t == Video || t == Playlist) + m_view.tabWidget->removeTab(AUDIOTAB); } else { m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(SLIDETAB); @@ -459,7 +466,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_thumb->setHidden(true); } - if (t != SLIDESHOW && t != COLOR) { + if (t != SlideShow && t != Color) { KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true); m_view.clip_filesize->setText(KIO::convertSize(f.size())); } else { @@ -468,8 +475,9 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg } 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 { + if (t != Image && t != Color && t != Text) { + m_view.clip_duration->setReadOnly(true); + } else { connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength())); connect(m_view.clip_duration, SIGNAL(textChanged(QString)), this, SLOT(slotModified())); } @@ -485,9 +493,16 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.marker_save->setToolTip(i18n("Save markers")); m_view.marker_load->setIcon(KIcon("document-open")); m_view.marker_load->setToolTip(i18n("Load markers")); - - // Check for Nepomuk metadata + 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(); @@ -498,7 +513,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg 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 &))); + connect(m_view.clip_license, SIGNAL(leftClickedUrl(QString)), this, SLOT(slotOpenUrl(QString))); } } else m_view.clip_license->setHidden(true); @@ -507,27 +522,59 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg #else m_view.clip_license->setHidden(true); #endif + +#else + +#ifdef USE_NEPOMUKCORE + + if (!url.isEmpty()) { + Nepomuk2::ResourceManager::instance()->init(); + Nepomuk2::Resource res( url.path() ); + // Check if file has a license + if (res.hasProperty(Nepomuk2::Vocabulary::NIE::license())) { + QString ltype = res.property(Nepomuk2::Vocabulary::NIE::licenseType()).toString(); + m_view.clip_license->setText(i18n("License: %1", res.property(Nepomuk2::Vocabulary::NIE::license()).toString())); + if (ltype.startsWith("http")) { + m_view.clip_license->setUrl(ltype); + connect(m_view.clip_license, SIGNAL(leftClickedUrl(QString)), this, SLOT(slotOpenUrl(QString))); + } + } + else m_view.clip_license->setHidden(true); + } + else m_view.clip_license->setHidden(true); #else m_view.clip_license->setHidden(true); #endif - + +#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.markers_list, SIGNAL(doubleClicked(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); + + m_view.metadata_list->resizeColumnToContents(0); + m_view.clip_vproperties->resizeColumnToContents(0); + m_view.clip_aproperties->resizeColumnToContents(0); adjustSize(); } // Used for multiple clips editing -ClipProperties::ClipProperties(QList cliplist, Timecode tc, QMap commonproperties, QWidget * parent) : +ClipProperties::ClipProperties(const QList &cliplist, const Timecode &tc, const QMap &commonproperties, QWidget * parent) : QDialog(parent), m_clip(NULL), m_tc(tc), @@ -561,7 +608,7 @@ ClipProperties::ClipProperties(QList cliplist, Timecode tc, QMap if (commonproperties.contains("force_progressive") && !commonproperties.value("force_progressive").isEmpty()) { m_view.clip_force_progressive->setChecked(true); m_view.clip_progressive->setEnabled(true); - m_view.clip_progressive->setValue(commonproperties.value("force_progressive").toInt()); + m_view.clip_progressive->setCurrentIndex(commonproperties.value("force_progressive").toInt()); } if (commonproperties.contains("force_tff") && !commonproperties.value("force_tff").isEmpty()) { @@ -661,7 +708,9 @@ ClipProperties::ClipProperties(QList cliplist, Timecode tc, QMap if (commonproperties.value("out").toInt() > 0) { m_view.clip_force_out->setChecked(true); m_view.clip_out->setText(m_tc.getTimecodeFromFrames(commonproperties.value("out").toInt())); - } else m_view.clip_out->setText(KdenliveSettings::image_duration()); + } else { + m_view.clip_out->setText(KdenliveSettings::image_duration()); + } } else { m_view.clip_force_out->setHidden(true); m_view.clip_out->setHidden(true); @@ -671,9 +720,58 @@ ClipProperties::ClipProperties(QList cliplist, Timecode tc, QMap ClipProperties::~ClipProperties() { QAbstractItemDelegate *del1 = m_view.clip_vproperties->itemDelegate(); - if (del1) delete del1; + delete del1; QAbstractItemDelegate *del2 = m_view.clip_aproperties->itemDelegate(); - if (del2) delete del2; + delete del2; +} + + +void ClipProperties::loadVideoProperties(const QMap &props) +{ + m_view.clip_vproperties->clear(); + 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")); + + if (props.contains("fps")) { + 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")); + + if (props.contains("pix_fmt")) + new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Pixel format") << props.value("pix_fmt")); + + if (props.contains("colorspace")) + new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Colorspace") << ProfilesDialog::getColorspaceDescription(props.value("colorspace").toInt())); +} + +void ClipProperties::slotGotThumbnail(const QString &id, const 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() @@ -681,10 +779,27 @@ void ClipProperties::slotApplyProperties() if (m_clip != NULL) { QMap props = properties(); emit applyNewClipProperties(m_clip->getId(), m_clip->currentProperties(props), props, needsTimelineRefresh(), needsTimelineReload()); + QTimer::singleShot(1000, this, SLOT(slotReloadVideoProperties())); + if (props.contains("force_aspect_num")) + QTimer::singleShot(1000, this, SLOT(slotReloadVideoThumb())); } m_view.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); } +void ClipProperties::slotReloadVideoProperties() +{ + if (m_clip == NULL) + return; + loadVideoProperties(m_clip->properties()); +} + +void ClipProperties::slotReloadVideoThumb() +{ + if (m_clip == NULL) + return; + emit requestThumb(QString('?' + m_clip->getId()), QList() << m_clip->getClipThumbFrame()); +} + void ClipProperties::disableClipId(const QString &id) { if (m_clip && m_view.buttonBox->button(QDialogButtonBox::Ok)->isEnabled()) { @@ -724,6 +839,21 @@ void ClipProperties::slotEnableLumaFile(int state) m_view.label_softness->setEnabled(enable); } +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; @@ -732,8 +862,9 @@ void ClipProperties::slotFillMarkersList(DocClipBase *clip) 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())); } } @@ -741,9 +872,11 @@ void ClipProperties::slotAddMarker() { CommentedTime marker(GenTime(), i18n("Marker")); QPointer d = new MarkerDialog(m_clip, marker, - m_tc, i18n("Add Marker"), this); + m_tc, i18n("Add 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); } delete d; } @@ -765,16 +898,57 @@ 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); } } 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); +} + +void ClipProperties::slotDeleteAnalysis() +{ + QTreeWidgetItem *current = m_view.analysis_list->currentItem(); + if (current) emit editAnalysis(m_clip->getId(), current->text(0), QString()); +} + +void ClipProperties::slotSaveAnalysis() +{ + const 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() +{ + const 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 @@ -782,12 +956,11 @@ const QString &ClipProperties::clipId() const return m_clip->getId(); } - QMap ClipProperties::properties() { QMap props; QLocale locale; - CLIPTYPE t = UNKNOWN; + ClipType t = Unknown; if (m_clip != NULL) { t = m_clip->clipType(); m_old_props = m_clip->properties(); @@ -797,7 +970,7 @@ QMap ClipProperties::properties() int aspectDenominator = m_view.clip_ar_den->value(); if (m_view.clip_force_ar->isChecked()) { if (aspectNumerator != m_old_props.value("force_aspect_num").toInt() || - aspectDenominator != m_old_props.value("force_aspect_den").toInt()) { + aspectDenominator != m_old_props.value("force_aspect_den").toInt()) { props["force_aspect_num"] = QString::number(aspectNumerator); props["force_aspect_den"] = QString::number(aspectDenominator); props["force_aspect_ratio"].clear(); @@ -825,9 +998,9 @@ QMap ClipProperties::properties() m_clipNeedsRefresh = true; } - int progressive = m_view.clip_progressive->value(); + int progressive = m_view.clip_progressive->currentIndex(); if (m_view.clip_force_progressive->isChecked()) { - if (progressive != m_old_props.value("force_progressive").toInt()) { + if (!m_old_props.contains("force_progressive") || progressive != m_old_props.value("force_progressive").toInt()) { props["force_progressive"] = QString::number(progressive); } } else if (m_old_props.contains("force_progressive") && !m_old_props.value("force_progressive").isEmpty()) { @@ -836,7 +1009,7 @@ QMap ClipProperties::properties() int fieldOrder = m_view.clip_fieldorder->currentIndex(); if (m_view.clip_force_fieldorder->isChecked()) { - if (fieldOrder != m_old_props.value("force_tff").toInt()) { + if (!m_old_props.contains("force_tff") || fieldOrder != m_old_props.value("force_tff").toInt()) { props["force_tff"] = QString::number(fieldOrder); } } else if (m_old_props.contains("force_tff") && !m_old_props.value("force_tff").isEmpty()) { @@ -908,7 +1081,7 @@ QMap ClipProperties::properties() if (m_old_props.value("description") != m_view.clip_description->text()) props["description"] = m_view.clip_description->text(); - if (t == COLOR) { + if (t == Color) { QString new_color = m_view.clip_color->color().name(); if (new_color != QString('#' + m_old_props.value("colour").right(8).left(6))) { m_clipNeedsRefresh = true; @@ -918,7 +1091,7 @@ QMap ClipProperties::properties() if (duration != m_clip->duration().frames(m_fps)) { props["out"] = QString::number(duration - 1); } - } else if (t == IMAGE) { + } else if (t == Image) { if ((int) m_view.image_transparency->isChecked() != m_old_props.value("transparency").toInt()) { props["transparency"] = QString::number((int)m_view.image_transparency->isChecked()); //m_clipNeedsRefresh = true; @@ -927,7 +1100,7 @@ QMap ClipProperties::properties() if (duration != m_clip->duration().frames(m_fps)) { props["out"] = QString::number(duration - 1); } - } else if (t == SLIDESHOW) { + } else if (t == SlideShow) { QString value = QString::number((int) m_view.slide_loop->isChecked()); if (m_old_props.value("loop") != value) props["loop"] = value; value = QString::number((int) m_view.slide_crop->isChecked()); @@ -1009,7 +1182,7 @@ bool ClipProperties::needsTimelineReload() const } -void ClipProperties::parseFolder() +void ClipProperties::parseFolder(bool reloadThumb) { QString path = m_view.clip_path->text(); bool isMime = !(path.contains('%')); @@ -1029,15 +1202,29 @@ void ClipProperties::parseFolder() QStringList result = dir.entryList(QDir::Files); if (!isMime) { - // find pattern - QString filter = KUrl(m_view.clip_path->text()).fileName(); + 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)) entries << path; + 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; } @@ -1052,22 +1239,23 @@ 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() { - if (m_clip->maxDuration() == GenTime()) return; - int duration = m_tc.getFrameCount(m_view.clip_duration->text()); + if (m_clip->maxDuration() == GenTime()) + return; + const int duration = m_tc.getFrameCount(m_view.clip_duration->text()); if (duration > m_clip->maxDuration().frames(m_fps)) { m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration())); } @@ -1075,7 +1263,7 @@ void ClipProperties::slotCheckMaxLength() void ClipProperties::slotUpdateDurationFormat(int ix) { - bool framesFormat = ix == 1; + bool framesFormat = (ix == 1); if (framesFormat) { // switching to frames count, update widget m_view.slide_duration_frames->setValue(m_tc.getFrameCount(m_view.slide_duration->text())); @@ -1097,10 +1285,11 @@ void ClipProperties::slotUpdateDurationFormat(int ix) void ClipProperties::slotDeleteProxy() { - QString proxy = m_clip->getProperty("proxy"); - if (proxy.isEmpty()) return; - emit deleteProxy(proxy); - if (m_proxyContainer) delete m_proxyContainer; + const QString proxy = m_clip->getProperty("proxy"); + if (proxy.isEmpty()) + return; + emit deleteProxy(proxy); + delete m_proxyContainer; } void ClipProperties::slotOpenUrl(const QString &url)