setAttribute(Qt::WA_DeleteOnClose, true);
setFont(KGlobalSettings::toolBarFont());
m_view.setupUi(this);
+
+ // force transparency is only for group properties, so hide it
+ m_view.clip_force_transparency->setHidden(true);
+ m_view.clip_transparency->setHidden(true);
+
KUrl url = m_clip->fileURL();
m_view.clip_path->setText(url.path());
m_view.clip_description->setText(m_clip->description());
QMap <QString, QString> 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) {
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();
+
+ if (props.contains("proxy") && props.value("proxy") != "-") {
+ KFileItem f(KFileItem::Unknown, KFileItem::Unknown, KUrl(props.value("proxy")), true);
+ QFrame* line = new QFrame();
+ line->setFrameShape(QFrame::HLine);
+ line->setFrameShadow(QFrame::Sunken);
+ 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->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 == 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);
+ }
+ else {
+ m_view.tab_video->layout()->addWidget(line);
+ m_view.tab_video->layout()->addWidget(m_proxyContainer);
+ }
+ }
+
if (t != AUDIO && t != AV) {
m_view.clip_force_aindex->setEnabled(false);
}
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());
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);
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"));
m_view.clip_duration->setValidator(tc.validator());
m_view.clip_duration->setText(tc.getTimecode(m_clip->duration()));
if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true);
- else connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength()));
+ else {
+ connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength()));
+ connect(m_view.clip_duration, SIGNAL(textChanged(QString)), this, SLOT(slotModified()));
+ }
// markers
m_view.marker_new->setIcon(KIcon("document-new"));
setFont(KGlobalSettings::toolBarFont());
m_view.setupUi(this);
QString title = windowTitle();
- title.append(" " + i18np("(%1 clip)", "(%1 clips)", cliplist.count()).arg(cliplist.count()));
+ title.append(" " + i18np("(%1 clip)", "(%1 clips)", cliplist.count()));
setWindowTitle(title);
QMap <QString, QString> props = cliplist.at(0)->properties();
m_old_props = commonproperties;
if (commonproperties.contains("full_luma") && !commonproperties.value("full_luma").isEmpty()) {
m_view.clip_full_luma->setChecked(true);
}
+
+ if (commonproperties.contains("transparency")) {
+ // image transparency checkbox
+ int transparency = commonproperties.value("transparency").toInt();
+ if (transparency == 0) {
+ m_view.clip_force_transparency->setChecked(true);
+ }
+ else if (transparency == 1) {
+ m_view.clip_force_transparency->setChecked(true);
+ m_view.clip_transparency->setCurrentIndex(1);
+ }
+ }
+ else {
+ m_view.clip_force_transparency->setHidden(true);
+ m_view.clip_transparency->setHidden(true);
+ }
+
+ connect(m_view.clip_force_transparency, SIGNAL(toggled(bool)), m_view.clip_transparency, SLOT(setEnabled(bool)));
connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar_num, SLOT(setEnabled(bool)));
connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar_den, SLOT(setEnabled(bool)));
connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), m_view.clip_progressive, SLOT(setEnabled(bool)));
QMap <QString, QString> ClipProperties::properties()
{
QMap <QString, QString> props;
+ QLocale locale;
CLIPTYPE t = UNKNOWN;
if (m_clip != NULL) {
t = m_clip->clipType();
m_clipNeedsRefresh = true;
}
} else {
- if (m_old_props.contains("force_aspect_num")) {
+ if (m_old_props.contains("force_aspect_num") && !m_old_props.value("force_aspect_num").isEmpty()) {
props["force_aspect_num"].clear();
m_clipNeedsRefresh = true;
}
- if (m_old_props.contains("force_aspect_den")) {
+ if (m_old_props.contains("force_aspect_den") && !m_old_props.value("force_aspect_den").isEmpty()) {
props["force_aspect_den"].clear();
m_clipNeedsRefresh = true;
}
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")) {
+ } else if (m_old_props.contains("force_fps") && !m_old_props.value("force_fps").isEmpty()) {
props["force_fps"].clear();
m_clipNeedsRefresh = true;
}
if (progressive != m_old_props.value("force_progressive").toInt()) {
props["force_progressive"] = QString::number(progressive);
}
- } else if (m_old_props.contains("force_progressive")) {
+ } else if (m_old_props.contains("force_progressive") && !m_old_props.value("force_progressive").isEmpty()) {
props["force_progressive"].clear();
}
if (fieldOrder != m_old_props.value("force_tff").toInt()) {
props["force_tff"] = QString::number(fieldOrder);
}
- } else if (m_old_props.contains("force_tff")) {
+ } else if (m_old_props.contains("force_tff") && !m_old_props.value("force_tff").isEmpty()) {
props["force_tff"].clear();
}
if (threads != m_old_props.value("threads").toInt()) {
props["threads"] = QString::number(threads);
}
- } else if (m_old_props.contains("threads")) {
+ } else if (m_old_props.contains("threads") && !m_old_props.value("threads").isEmpty()) {
props["threads"].clear();
}
if (vindex != m_old_props.value("video_index").toInt()) {
props["video_index"] = QString::number(vindex);
}
- } else if (m_old_props.contains("video_index")) {
+ } else if (m_old_props.contains("video_index") && !m_old_props.value("video_index").isEmpty()) {
props["video_index"].clear();
}
if (aindex != m_old_props.value("audio_index").toInt()) {
props["audio_index"] = QString::number(aindex);
}
- } else if (m_old_props.contains("audio_index")) {
+ } else if (m_old_props.contains("audio_index") && !m_old_props.value("audio_index").isEmpty()) {
props["audio_index"].clear();
}
props["force_colorspace"] = QString::number(colorspace);
m_clipNeedsRefresh = true;
}
- } else if (m_old_props.contains("force_colorspace")) {
+ } else if (m_old_props.contains("force_colorspace") && !m_old_props.value("force_colorspace").isEmpty()) {
props["force_colorspace"].clear();
m_clipNeedsRefresh = true;
}
if (m_view.clip_full_luma->isChecked()) {
props["full_luma"] = QString::number(1);
m_clipNeedsRefresh = true;
- } else if (m_old_props.contains("full_luma")) {
+ } else if (m_old_props.contains("full_luma") && !m_old_props.value("full_luma").isEmpty()) {
props["full_luma"].clear();
m_clipNeedsRefresh = true;
}
+
+ if (m_view.clip_force_transparency->isChecked()) {
+ QString transp = QString::number(m_view.clip_transparency->currentIndex());
+ if (transp != m_old_props.value("transparency")) props["transparency"] = transp;
+ }
// If we adjust several clips, return now
if (m_clip == NULL) {
}
}
+void ClipProperties::slotDeleteProxy()
+{
+ QString proxy = m_clip->getProperty("proxy");
+ if (proxy.isEmpty()) return;
+ emit deleteProxy(proxy);
+ if (m_proxyContainer) delete m_proxyContainer;
+}
+
#include "clipproperties.moc"
+
projects / kdenlive / blobdiff