m_fps(fps),
m_count(0),
m_clipNeedsRefresh(false),
- m_clipNeedsReLoad(false),
- m_propsDelegate(NULL)
+ m_clipNeedsReLoad(false)
{
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());
m_view.clip_force_out->setHidden(true);
m_view.clip_out->setHidden(true);
- if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) {
+ // 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) {
+ m_view.clip_force_ar->setChecked(true);
+ m_view.clip_ar_num->setEnabled(true);
+ m_view.clip_ar_den->setEnabled(true);
+ m_view.clip_ar_num->setValue(props.value("force_aspect_num").toInt());
+ m_view.clip_ar_den->setValue(props.value("force_aspect_den").toInt());
+ }
+ // Legacy support for pixel aspect ratio
+ else if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) {
m_view.clip_force_ar->setChecked(true);
- m_view.clip_ar->setEnabled(true);
- m_view.clip_ar->setValue(props.value("force_aspect_ratio").toDouble());
- } else if (props.contains("aspect_ratio")) m_view.clip_ar->setValue(props.value("aspect_ratio").toDouble());
+ m_view.clip_ar_num->setEnabled(true);
+ m_view.clip_ar_den->setEnabled(true);
+ if (props.contains("frame_size")) {
+ int width = props.value("force_aspect_ratio").toDouble() * props.value("frame_size").section('x', 0, 0).toInt();
+ int height = props.value("frame_size").section('x', 1, 1).toInt();
+ if (width > 0 && height > 0) {
+ if ((width / height * 100) == 133) {
+ width = 4;
+ height = 3;
+ }
+ else if (int(width / height * 100) == 177) {
+ width = 16;
+ height = 9;
+ }
+ m_view.clip_ar_num->setValue(width);
+ m_view.clip_ar_den->setValue(height);
+ }
+ }
+ }
connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
- connect(m_view.clip_ar, SIGNAL(valueChanged(double)), this, SLOT(slotModified()));
+ connect(m_view.clip_ar_num, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
+ connect(m_view.clip_ar_den, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
if (props.contains("force_fps") && props.value("force_fps").toDouble() > 0) {
m_view.clip_force_framerate->setChecked(true);
connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
connect(m_view.clip_progressive, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
+ m_view.clip_fieldorder->addItem(i18n("Bottom first"), 0);
+ m_view.clip_fieldorder->addItem(i18n("Top first"), 1);
+ if (props.contains("force_tff")) {
+ m_view.clip_force_fieldorder->setChecked(true);
+ m_view.clip_fieldorder->setEnabled(true);
+ m_view.clip_fieldorder->setCurrentIndex(props.value("force_tff").toInt());
+ }
+ connect(m_view.clip_force_fieldorder, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
+ connect(m_view.clip_fieldorder, SIGNAL(currentIndexChanged(int)), this, SLOT(slotModified()));
+
if (props.contains("threads") && props.value("threads").toInt() != 1) {
m_view.clip_force_threads->setChecked(true);
m_view.clip_threads->setEnabled(true);
if (props.contains("video_max")) {
m_view.clip_vindex->setMaximum(props.value("video_max").toInt());
}
+
+ m_view.clip_colorspace->addItem(ProfilesDialog::getColorspaceDescription(601), 601);
+ m_view.clip_colorspace->addItem(ProfilesDialog::getColorspaceDescription(709), 709);
+ m_view.clip_colorspace->addItem(ProfilesDialog::getColorspaceDescription(240), 240);
+ if (props.contains("force_colorspace")) {
+ m_view.clip_force_colorspace->setChecked(true);
+ m_view.clip_colorspace->setEnabled(true);
+ m_view.clip_colorspace->setCurrentIndex(m_view.clip_colorspace->findData(props.value("force_colorspace").toInt()));
+ } else if (props.contains("colorspace")) {
+ m_view.clip_colorspace->setCurrentIndex(m_view.clip_colorspace->findData(props.value("colorspace").toInt()));
+ }
+ connect(m_view.clip_force_colorspace, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
+ connect(m_view.clip_colorspace, SIGNAL(currentIndexChanged(int)), this, SLOT(slotModified()));
+
+ if (props.contains("full_luma")) {
+ m_view.clip_full_luma->setChecked(true);
+ }
+ connect(m_view.clip_full_luma, SIGNAL(toggled(bool)), this, SLOT(slotModified()));
// Check for Metadata
QMap<QString, QString> meta = m_clip->metadata();
++i;
}
- connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar, 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_framerate, SIGNAL(toggled(bool)), m_view.clip_framerate, SLOT(setEnabled(bool)));
connect(m_view.clip_force_progressive, SIGNAL(toggled(bool)), m_view.clip_progressive, SLOT(setEnabled(bool)));
+ connect(m_view.clip_force_fieldorder, SIGNAL(toggled(bool)), m_view.clip_fieldorder, SLOT(setEnabled(bool)));
connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool)));
connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool)));
connect(m_view.clip_force_aindex, SIGNAL(toggled(bool)), m_view.clip_aindex, SLOT(setEnabled(bool)));
+ 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"));
m_view.image_type->addItem("BMP (*.bmp)", "bmp");
m_view.image_type->addItem("GIF (*.gif)", "gif");
m_view.image_type->addItem("TGA (*.tga)", "tga");
+ m_view.image_type->addItem("TIF (*.tif)", "tif");
m_view.image_type->addItem("TIFF (*.tiff)", "tiff");
m_view.image_type->addItem("Open EXR (*.exr)", "exr");
m_view.animation->addItem(i18n("None"), QString());
}
m_view.slide_duration->setText(tc.getTimecodeFromFrames(props.value("ttl").toInt()));
- m_view.slide_duration_format->addItem(i18n("hh:mm:ss::ff"));
+ m_view.slide_duration_format->addItem(i18n("hh:mm:ss:ff"));
m_view.slide_duration_format->addItem(i18n("Frames"));
connect(m_view.slide_duration_format, SIGNAL(activated(int)), this, SLOT(slotUpdateDurationFormat(int)));
m_view.slide_duration_frames->setHidden(true);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(COLORTAB);
-
-
- m_propsDelegate = new PropertiesViewDelegate(this);
- m_view.clip_vproperties->setItemDelegate(m_propsDelegate);
- m_view.clip_aproperties->setItemDelegate(m_propsDelegate);
+ PropertiesViewDelegate *del1 = new PropertiesViewDelegate(this);
+ PropertiesViewDelegate *del2 = new PropertiesViewDelegate(this);
+ m_view.clip_vproperties->setItemDelegate(del1);
+ 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;}"));
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()));
+ setWindowTitle(title);
QMap <QString, QString> props = cliplist.at(0)->properties();
m_old_props = commonproperties;
- if (commonproperties.contains("force_aspect_ratio") && !commonproperties.value("force_aspect_ratio").isEmpty() && commonproperties.value("force_aspect_ratio").toDouble() > 0) {
+ if (commonproperties.contains("force_aspect_num") && !commonproperties.value("force_aspect_num").isEmpty() && commonproperties.value("force_aspect_den").toInt() > 0) {
m_view.clip_force_ar->setChecked(true);
- m_view.clip_ar->setEnabled(true);
- m_view.clip_ar->setValue(commonproperties.value("force_aspect_ratio").toDouble());
+ m_view.clip_ar_num->setEnabled(true);
+ m_view.clip_ar_den->setEnabled(true);
+ m_view.clip_ar_num->setValue(commonproperties.value("force_aspect_num").toInt());
+ m_view.clip_ar_den->setValue(commonproperties.value("force_aspect_den").toInt());
}
if (commonproperties.contains("force_fps") && !commonproperties.value("force_fps").isEmpty() && commonproperties.value("force_fps").toDouble() > 0) {
m_view.clip_progressive->setValue(commonproperties.value("force_progressive").toInt());
}
+ if (commonproperties.contains("force_tff") && !commonproperties.value("force_tff").isEmpty()) {
+ m_view.clip_force_fieldorder->setChecked(true);
+ m_view.clip_fieldorder->setEnabled(true);
+ m_view.clip_fieldorder->setCurrentIndex(commonproperties.value("force_tff").toInt());
+ }
+
if (commonproperties.contains("threads") && !commonproperties.value("threads").isEmpty() && commonproperties.value("threads").toInt() != 1) {
m_view.clip_force_threads->setChecked(true);
m_view.clip_threads->setEnabled(true);
if (props.contains("video_max")) {
m_view.clip_vindex->setMaximum(props.value("video_max").toInt());
}
+
+ m_view.clip_colorspace->addItem(ProfilesDialog::getColorspaceDescription(601), 601);
+ m_view.clip_colorspace->addItem(ProfilesDialog::getColorspaceDescription(709), 709);
+ m_view.clip_colorspace->addItem(ProfilesDialog::getColorspaceDescription(240), 240);
+
+ if (commonproperties.contains("force_colorspace") && !commonproperties.value("force_colorspace").isEmpty() && commonproperties.value("force_colorspace").toInt() != 0) {
+ m_view.clip_force_colorspace->setChecked(true);
+ m_view.clip_colorspace->setEnabled(true);
+ m_view.clip_colorspace->setCurrentIndex(m_view.clip_colorspace->findData(commonproperties.value("force_colorspace").toInt()));
+ }
+
+ 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_ar, SIGNAL(toggled(bool)), m_view.clip_ar, SLOT(setEnabled(bool)));
+ 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)));
connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool)));
connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool)));
connect(m_view.clip_force_aindex, SIGNAL(toggled(bool)), m_view.clip_aindex, SLOT(setEnabled(bool)));
connect(m_view.clip_force_out, SIGNAL(toggled(bool)), m_view.clip_out, SLOT(setEnabled(bool)));
+ connect(m_view.clip_force_colorspace, SIGNAL(toggled(bool)), m_view.clip_colorspace, SLOT(setEnabled(bool)));
m_view.tabWidget->removeTab(METATAB);
m_view.tabWidget->removeTab(MARKERTAB);
ClipProperties::~ClipProperties()
{
- if (m_propsDelegate) delete m_propsDelegate;
+ QAbstractItemDelegate *del1 = m_view.clip_vproperties->itemDelegate();
+ if (del1) delete del1;
+ QAbstractItemDelegate *del2 = m_view.clip_aproperties->itemDelegate();
+ if (del2) delete del2;
}
void ClipProperties::slotApplyProperties()
m_old_props = m_clip->properties();
}
- double aspect = m_view.clip_ar->value();
+ int aspectNumerator = m_view.clip_ar_num->value();
+ int aspectDenominator = m_view.clip_ar_den->value();
if (m_view.clip_force_ar->isChecked()) {
- if (aspect != m_old_props.value("force_aspect_ratio").toDouble()) {
- props["force_aspect_ratio"] = QString::number(aspect);
+ if (aspectNumerator != m_old_props.value("force_aspect_num").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();
+ m_clipNeedsRefresh = true;
+ }
+ } else {
+ 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") && !m_old_props.value("force_aspect_den").isEmpty()) {
+ props["force_aspect_den"].clear();
m_clipNeedsRefresh = true;
}
- } else if (m_old_props.contains("force_aspect_ratio")) {
- props["force_aspect_ratio"].clear();
- m_clipNeedsRefresh = true;
}
double fps = m_view.clip_framerate->value();
props["force_fps"] = QString::number(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();
}
+ int fieldOrder = m_view.clip_fieldorder->currentIndex();
+ if (m_view.clip_force_fieldorder->isChecked()) {
+ if (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()) {
+ props["force_tff"].clear();
+ }
+
int threads = m_view.clip_threads->value();
if (m_view.clip_force_threads->isChecked()) {
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();
}
+
+ int colorspace = m_view.clip_colorspace->itemData(m_view.clip_colorspace->currentIndex()).toInt();
+ if (m_view.clip_force_colorspace->isChecked()) {
+ if (colorspace != m_old_props.value("force_colorspace").toInt()) {
+ props["force_colorspace"] = QString::number(colorspace);
+ m_clipNeedsRefresh = true;
+ }
+ } 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") && !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) {
if (duration != m_old_props.value("ttl").toInt()) {
m_clipNeedsRefresh = true;
props["ttl"] = QString::number(duration);
- props["out"] = QString::number(duration * m_count - 1);
+ props["length"] = QString::number(duration * m_count);
}
if (duration * m_count - 1 != m_old_props.value("out").toInt()) {
#include "clipproperties.moc"
+
projects / kdenlive / blobdiff