X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipproperties.cpp;h=991666340ad4d06ca4433574d84a162694cb3952;hb=0ecaca991853809ccb21f4232a7edfee3e660237;hp=3b595938cece956bb849a952679dae3e8535dea1;hpb=67202227a6d1c64ac1112273db86c6329843358a;p=kdenlive diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index 3b595938..99166634 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -27,8 +27,23 @@ #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; @@ -65,7 +80,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg QMap props = m_clip->properties(); m_view.clip_force_out->setHidden(true); m_view.clip_out->setHidden(true); - + // 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) { @@ -198,13 +213,13 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg connect(m_view.clip_force_colorspace, SIGNAL(toggled(bool)), m_view.clip_colorspace, SLOT(setEnabled(bool))); if (props.contains("audiocodec")) - QTreeWidgetItem *item = new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Audio codec") << props.value("audiocodec")); + new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Audio codec") << props.value("audiocodec")); if (props.contains("channels")) - QTreeWidgetItem *item = new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Channels") << props.value("channels")); + new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Channels") << props.value("channels")); if (props.contains("frequency")) - QTreeWidgetItem *item = new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Frequency") << props.value("frequency")); + new QTreeWidgetItem(m_view.clip_aproperties, QStringList() << i18n("Frequency") << props.value("frequency")); CLIPTYPE t = m_clip->clipType(); @@ -217,13 +232,17 @@ 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); connect(pb, SIGNAL(clicked()), this, SLOT(slotDeleteProxy())); m_proxyContainer->setLayout(l); - if (t == AUDIO) { + if (t == IMAGE) { + m_view.tab_image->layout()->addWidget(line); + m_view.tab_image->layout()->addWidget(m_proxyContainer); + } + else if (t == AUDIO) { m_view.tab_audio->layout()->addWidget(line); m_view.tab_audio->layout()->addWidget(m_proxyContainer); } @@ -241,6 +260,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); @@ -265,7 +287,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()); @@ -274,7 +295,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); @@ -390,7 +410,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_vproperties->setStyleSheet(QString("QTreeWidget { background-color: transparent;}")); if (props.contains("videocodec")) - QTreeWidgetItem *item = new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Video codec") << props.value("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")); @@ -399,6 +419,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")); @@ -407,12 +434,23 @@ 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); + 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); } else { m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(SLIDETAB); @@ -428,8 +466,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 { @@ -444,17 +481,48 @@ 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")); + + // 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); 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(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(); } @@ -471,7 +539,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; @@ -610,8 +678,10 @@ ClipProperties::~ClipProperties() 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); } @@ -654,26 +724,39 @@ void ClipProperties::slotEnableLumaFile(int state) m_view.label_softness->setEnabled(enable); } -void ClipProperties::slotFillMarkersList() +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) { + emit addMarker(m_clip->getId(), d->newMarker()); } - 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() @@ -683,19 +766,23 @@ 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()); + emit addMarker(m_clip->getId(), d.newMarker()); } - 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()); - - QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); + 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; + } + } + for (int i = 0; i < toDelete.count(); i++) + emit addMarker(m_clip->getId(), toDelete.at(i)); } const QString &ClipProperties::clipId() const @@ -707,6 +794,7 @@ const QString &ClipProperties::clipId() const QMap ClipProperties::properties() { QMap props; + QLocale locale; CLIPTYPE t = UNKNOWN; if (m_clip != NULL) { t = m_clip->clipType(); @@ -737,7 +825,7 @@ QMap ClipProperties::properties() double fps = m_view.clip_framerate->value(); if (m_view.clip_force_framerate->isChecked()) { if (fps != m_old_props.value("force_fps").toDouble()) { - props["force_fps"] = QString::number(fps); + props["force_fps"] = locale.toString(fps); m_clipNeedsRefresh = true; } } else if (m_old_props.contains("force_fps") && !m_old_props.value("force_fps").isEmpty()) { @@ -953,7 +1041,7 @@ void ClipProperties::parseFolder() QString filter = KUrl(m_view.clip_path->text()).fileName(); QString ext = filter.section('.', -1); filter = filter.section('%', 0, -2); - QString regexp = "^" + filter + "\\d+\\." + ext + "$"; + QString regexp = '^' + filter + "\\d+\\." + ext + '$'; QRegExp rx(regexp); QStringList entries; foreach(const QString & path, result) { @@ -1018,13 +1106,16 @@ void ClipProperties::slotUpdateDurationFormat(int ix) void ClipProperties::slotDeleteProxy() { QString proxy = m_clip->getProperty("proxy"); - QFile::remove(proxy); - QMap props; - props.insert("proxy", QString()); - emit applyNewClipProperties(m_clip->getId(), m_clip->properties(), props, false, true); + if (proxy.isEmpty()) return; + emit deleteProxy(proxy); if (m_proxyContainer) delete m_proxyContainer; } +void ClipProperties::slotOpenUrl(const QString &url) +{ + new KRun(KUrl(url), this); +} + #include "clipproperties.moc"