summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b869a8a)
svn path=/trunk/kdenlive/; revision=5486
connect(m_view.guide_start, SIGNAL(activated(int)), this, SLOT(slotCheckEndGuidePosition()));
connect(m_view.format_selection, SIGNAL(activated(int)), this, SLOT(refreshView()));
connect(m_view.guide_start, SIGNAL(activated(int)), this, SLOT(slotCheckEndGuidePosition()));
connect(m_view.format_selection, SIGNAL(activated(int)), this, SLOT(refreshView()));
+ connect(m_view.tc_overlay, SIGNAL(toggled(bool)), m_view.tc_type, SLOT(setEnabled(bool)));
m_view.buttonRender->setEnabled(false);
m_view.buttonGenerateScript->setEnabled(false);
m_view.buttonRender->setEnabled(false);
m_view.buttonGenerateScript->setEnabled(false);
m_view.create_chapter->setVisible(false);
m_view.open_browser->setVisible(false);
m_view.error_box->setVisible(false);
m_view.create_chapter->setVisible(false);
m_view.open_browser->setVisible(false);
m_view.error_box->setVisible(false);
+ m_view.tc_type->setEnabled(false);
m_view.splitter->setStretchFactor(1, 5);
m_view.splitter->setStretchFactor(0, 2);
m_view.splitter->setStretchFactor(1, 5);
m_view.splitter->setStretchFactor(0, 2);
QStringList overlayargs;
if (m_view.tc_overlay->isChecked()) {
QString filterFile = KStandardDirs::locate("appdata", "metadata.properties");
QStringList overlayargs;
if (m_view.tc_overlay->isChecked()) {
QString filterFile = KStandardDirs::locate("appdata", "metadata.properties");
- overlayargs << "meta.attr.timecode=1" << "meta.attr.timecode.markup=#timecode";
+ overlayargs << "meta.attr.timecode=1" << "meta.attr.timecode.markup=#" + QString(m_view.tc_type->currentIndex() ? "frame" : "timecode");
overlayargs << "-attach" << "data_feed:attr_check" << "-attach";
overlayargs << "data_show:" + filterFile << "_loader=1" << "dynamic=1";
}
overlayargs << "-attach" << "data_feed:attr_check" << "-attach";
overlayargs << "data_show:" + filterFile << "_loader=1" << "dynamic=1";
}
renderProps.insert("renderrescalewidth", QString::number(m_view.rescale_width->value()));
renderProps.insert("renderrescaleheight", QString::number(m_view.rescale_height->value()));
renderProps.insert("rendertcoverlay", QString::number(m_view.tc_overlay->isChecked()));
renderProps.insert("renderrescalewidth", QString::number(m_view.rescale_width->value()));
renderProps.insert("renderrescaleheight", QString::number(m_view.rescale_height->value()));
renderProps.insert("rendertcoverlay", QString::number(m_view.tc_overlay->isChecked()));
+ renderProps.insert("rendertctype", QString::number(m_view.tc_type->currentIndex()));
renderProps.insert("renderratio", QString::number(m_view.rescale_keep->isChecked()));
renderProps.insert("renderplay", QString::number(m_view.play_after->isChecked()));
renderProps.insert("renderratio", QString::number(m_view.rescale_keep->isChecked()));
renderProps.insert("renderplay", QString::number(m_view.play_after->isChecked()));
// can also override profiles installed by KNewStuff
fileList.removeAll("customprofiles.xml");
foreach(const QString &filename, fileList)
// can also override profiles installed by KNewStuff
fileList.removeAll("customprofiles.xml");
foreach(const QString &filename, fileList)
- parseFile(exportFolder + filename, true);
+ parseFile(exportFolder + filename, true);
if (QFile::exists(exportFolder + "customprofiles.xml")) parseFile(exportFolder + "customprofiles.xml", true);
if (!meta.isEmpty()) {
if (QFile::exists(exportFolder + "customprofiles.xml")) parseFile(exportFolder + "customprofiles.xml", true);
if (!meta.isEmpty()) {
if (props.contains("renderrescalewidth")) m_view.rescale_width->setValue(props.value("renderrescalewidth").toInt());
if (props.contains("renderrescaleheight")) m_view.rescale_height->setValue(props.value("renderrescaleheight").toInt());
if (props.contains("rendertcoverlay")) m_view.tc_overlay->setChecked(props.value("rendertcoverlay").toInt());
if (props.contains("renderrescalewidth")) m_view.rescale_width->setValue(props.value("renderrescalewidth").toInt());
if (props.contains("renderrescaleheight")) m_view.rescale_height->setValue(props.value("renderrescaleheight").toInt());
if (props.contains("rendertcoverlay")) m_view.tc_overlay->setChecked(props.value("rendertcoverlay").toInt());
+ if (props.contains("rendertctype")) m_view.tc_type->setCurrentIndex(props.value("rendertctype").toInt());
if (props.contains("renderratio")) m_view.rescale_keep->setChecked(props.value("renderratio").toInt());
if (props.contains("renderplay")) m_view.play_after->setChecked(props.value("renderplay").toInt());
if (props.contains("renderratio")) m_view.rescale_keep->setChecked(props.value("renderratio").toInt());
if (props.contains("renderplay")) m_view.play_after->setChecked(props.value("renderplay").toInt());
- <width>387</width>
- <height>652</height>
+ <width>389</width>
+ <height>631</height>
</rect>
</property>
<property name="windowTitle">
</rect>
</property>
<property name="windowTitle">
</property>
</widget>
</item>
</property>
</widget>
</item>
- <item row="10" column="4" colspan="6">
- <widget class="QCheckBox" name="tc_overlay">
- <property name="text">
- <string>Timecode overlay</string>
- </property>
- </widget>
- </item>
- <item row="11" column="0" colspan="10">
+ <item row="12" column="0" colspan="10">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="render_full">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="render_full">
</item>
</layout>
</item>
</item>
</layout>
</item>
- <item row="12" column="0" colspan="10">
+ <item row="13" column="0" colspan="10">
<widget class="QGroupBox" name="guides_box">
<property name="title">
<string/>
<widget class="QGroupBox" name="guides_box">
<property name="title">
<string/>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="15" column="0" colspan="3">
+ <item row="16" column="0" colspan="3">
<widget class="QPushButton" name="buttonRender">
<property name="text">
<string>Render to File</string>
</property>
</widget>
</item>
<widget class="QPushButton" name="buttonRender">
<property name="text">
<string>Render to File</string>
</property>
</widget>
</item>
- <item row="15" column="3" colspan="4">
+ <item row="16" column="3" colspan="4">
<widget class="QPushButton" name="buttonGenerateScript">
<property name="text">
<string>Generate Script</string>
</property>
</widget>
</item>
<widget class="QPushButton" name="buttonGenerateScript">
<property name="text">
<string>Generate Script</string>
</property>
</widget>
</item>
- <item row="15" column="7" colspan="2">
+ <item row="16" column="7" colspan="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
</property>
</spacer>
</item>
- <item row="15" column="9">
+ <item row="16" column="9">
<widget class="KPushButton" name="buttonClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
<widget class="KPushButton" name="buttonClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
- <item row="16" column="0" colspan="10">
+ <item row="17" column="0" colspan="10">
<widget class="QGroupBox" name="errorBox">
<property name="title">
<string/>
<widget class="QGroupBox" name="errorBox">
<property name="title">
<string/>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="14" column="0" colspan="10">
+ <item row="15" column="0" colspan="10">
<widget class="QCheckBox" name="proxy_render">
<property name="text">
<string>Render using proxy clips</string>
<widget class="QCheckBox" name="proxy_render">
<property name="text">
<string>Render using proxy clips</string>
</property>
</widget>
</item>
</property>
</widget>
</item>
+ <item row="11" column="0" colspan="3">
+ <widget class="QCheckBox" name="tc_overlay">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Overlay</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="3" colspan="5">
+ <widget class="KComboBox" name="tc_type">
+ <item>
+ <property name="text">
+ <string>hh:mm:ss:ff</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Frames</string>
+ </property>
+ </item>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
</layout>
</widget>
<widget class="QWidget" name="tab_2">