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();
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);
}
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"));
QMap <QString, QString> ClipProperties::properties()
{
QMap <QString, QString> props;
+ QLocale locale;
CLIPTYPE t = UNKNOWN;
if (m_clip != NULL) {
t = m_clip->clipType();
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()) {
void ClipProperties::slotDeleteProxy()
{
QString proxy = m_clip->getProperty("proxy");
- QFile::remove(proxy);
- QMap <QString, QString> 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;
}