m_view.buttonInfo->setDown(true);
} else m_view.advanced_params->hide();
- m_view.rescale_size->setInputMask("0099\\x0099");
- m_view.rescale_size->setText("320x240");
-
+ m_view.rescale_keep->setChecked(KdenliveSettings::rescalekeepratio());
+ connect(m_view.rescale_width, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleWidth(int)));
+ connect(m_view.rescale_height, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleHeight(int)));
+ m_view.rescale_keep->setIcon(KIcon("insert-link"));
+ m_view.rescale_keep->setToolTip(i18n("Preserve aspect ratio"));
+ connect(m_view.rescale_keep, SIGNAL(clicked()), this, SLOT(slotSwitchAspectRatio()));
connect(m_view.buttonRender, SIGNAL(clicked()), this, SLOT(slotPrepareExport()));
connect(m_view.buttonGenerateScript, SIGNAL(clicked()), this, SLOT(slotGenerateScript()));
connect(m_view.buttonClose, SIGNAL(clicked()), this, SLOT(hide()));
connect(m_view.buttonClose2, SIGNAL(clicked()), this, SLOT(hide()));
connect(m_view.buttonClose3, SIGNAL(clicked()), this, SLOT(hide()));
- connect(m_view.rescale, SIGNAL(toggled(bool)), m_view.rescale_size, SLOT(setEnabled(bool)));
+ connect(m_view.rescale, SIGNAL(toggled(bool)), m_view.rescale_box, SLOT(setEnabled(bool)));
connect(m_view.destination_list, SIGNAL(activated(int)), this, SLOT(refreshCategory()));
connect(m_view.out_file, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateButtons()));
connect(m_view.out_file, SIGNAL(urlSelected(const KUrl &)), this, SLOT(slotUpdateButtons(const KUrl &)));
m_view.buttonRender->setEnabled(false);
m_view.buttonGenerateScript->setEnabled(false);
- m_view.rescale_size->setEnabled(false);
+ m_view.rescale_box->setEnabled(false);
m_view.guides_box->setVisible(false);
m_view.open_dvd->setVisible(false);
m_view.create_chapter->setVisible(false);
int width;
int height;
if (m_view.rescale->isChecked() && m_view.rescale->isEnabled()) {
- width = m_view.rescale_size->text().section('x', 0, 0).toInt();
- height = m_view.rescale_size->text().section('x', 1, 1).toInt();
+ width = m_view.rescale_width->value();
+ height = m_view.rescale_height->value();
} else {
width = m_profile.width;
height = m_profile.height;
if (m_profile.description.contains("pal", Qt::CaseInsensitive) || m_profile.description.contains("25", Qt::CaseInsensitive) || m_profile.description.contains("50", Qt::CaseInsensitive)) m_view.format_selection->setCurrentIndex(0);
else m_view.format_selection->setCurrentIndex(1);
m_view.scanning_list->setCurrentIndex(0);
+ m_view.rescale_width->setValue(KdenliveSettings::defaultrescalewidth());
+ if (!m_view.rescale_keep->isChecked()) {
+ m_view.rescale_height->blockSignals(true);
+ m_view.rescale_height->setValue(KdenliveSettings::defaultrescaleheight());
+ m_view.rescale_height->blockSignals(false);
+ }
refreshView();
}
if (params.contains(" s=") || destination == "audioonly") {
// profile has a fixed size, do not allow resize
m_view.rescale->setEnabled(false);
- m_view.rescale_size->setEnabled(false);
+ m_view.rescale_box->setEnabled(false);
} else {
m_view.rescale->setEnabled(true);
- m_view.rescale_size->setEnabled(true);
+ m_view.rescale_box->setEnabled(true);
}
KUrl url = filenameWithExtension(m_view.out_file->url(), extension);
m_view.out_file->setUrl(url);
} else m_view.errorLabel->setHidden(true);
}
+void RenderWidget::slotUpdateRescaleWidth(int val)
+{
+ KdenliveSettings::setDefaultrescalewidth(val);
+ if (!m_view.rescale_keep->isChecked()) return;
+ m_view.rescale_height->blockSignals(true);
+ m_view.rescale_height->setValue(val * m_profile.height / m_profile.width + 0.5);
+ KdenliveSettings::setDefaultrescaleheight(m_view.rescale_height->value());
+ m_view.rescale_height->blockSignals(false);
+}
+
+void RenderWidget::slotUpdateRescaleHeight(int val)
+{
+ KdenliveSettings::setDefaultrescaleheight(val);
+ if (!m_view.rescale_keep->isChecked()) return;
+ m_view.rescale_width->blockSignals(true);
+ m_view.rescale_width->setValue(val * m_profile.width / m_profile.height + 0.5);
+ KdenliveSettings::setDefaultrescaleheight(m_view.rescale_width->value());
+ m_view.rescale_width->blockSignals(false);
+}
+
+void RenderWidget::slotSwitchAspectRatio()
+{
+ KdenliveSettings::setRescalekeepratio(m_view.rescale_keep->isChecked());
+ if (m_view.rescale_keep->isChecked()) slotUpdateRescaleWidth(m_view.rescale_width->value());
+}
+
<rect>
<x>0</x>
<y>0</y>
- <width>392</width>
- <height>535</height>
+ <width>365</width>
+ <height>553</height>
</rect>
</property>
<property name="windowTitle">
<attribute name="title">
<string>Render Project</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_6">
<property name="text">
</property>
</widget>
</item>
- <item row="0" column="2" colspan="9">
+ <item row="0" column="2" colspan="8">
<widget class="KComboBox" name="destination_list"/>
</item>
<item row="1" column="0" colspan="2">
</property>
</widget>
</item>
- <item row="1" column="2" colspan="9">
+ <item row="1" column="2" colspan="8">
<widget class="KUrlRequester" name="out_file"/>
</item>
<item row="2" column="0">
</property>
</widget>
</item>
- <item row="2" column="2" colspan="4">
+ <item row="2" column="2" colspan="3">
<widget class="KComboBox" name="format_selection">
<item>
<property name="text">
</item>
</widget>
</item>
- <item row="2" column="8">
- <widget class="QToolButton" name="buttonEdit">
- <property name="text">
- <string>E</string>
+ <item row="2" column="5" colspan="3">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
- </item>
- <item row="2" column="9">
- <widget class="QToolButton" name="buttonSave">
- <property name="text">
- <string>S</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>124</width>
+ <height>23</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="2" column="10">
- <widget class="QToolButton" name="buttonDelete">
- <property name="text">
- <string>D</string>
- </property>
- </widget>
+ <item row="2" column="8" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QToolButton" name="buttonFavorite">
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="buttonEdit">
+ <property name="text">
+ <string>E</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="buttonSave">
+ <property name="text">
+ <string>S</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="buttonDelete">
+ <property name="text">
+ <string>D</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="3" column="0" colspan="11">
+ <item row="3" column="0" colspan="10">
<widget class="QSplitter" name="splitter_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
- <item row="4" column="2" colspan="3">
+ <item row="4" column="2" colspan="4">
<widget class="KComboBox" name="scanning_list">
<item>
<property name="text">
</item>
</widget>
</item>
- <item row="4" column="5" colspan="6">
+ <item row="4" column="6" colspan="4">
<widget class="QCheckBox" name="export_audio">
<property name="text">
<string>Export audio</string>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="2">
- <widget class="QCheckBox" name="rescale">
- <property name="text">
- <string>Rescale</string>
- </property>
- </widget>
+ <item row="5" column="0" colspan="10">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="rescale">
+ <property name="text">
+ <string>Rescale</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="rescale_box">
+ <property name="title">
+ <string/>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="KIntNumInput" name="rescale_width">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>x</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="KIntNumInput" name="rescale_height">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QToolButton" name="rescale_keep">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="5" column="2" colspan="3">
- <widget class="KRestrictedLine" name="rescale_size">
+ <item row="6" column="0" colspan="10">
+ <widget class="QCheckBox" name="open_dvd">
<property name="text">
- <string/>
- </property>
- <property name="validChars">
- <string/>
+ <string>Open Dvd wizard after rendering</string>
</property>
</widget>
</item>
- <item row="5" column="5" colspan="6">
- <widget class="QCheckBox" name="tc_overlay">
+ <item row="7" column="0" colspan="10">
+ <widget class="QCheckBox" name="create_chapter">
<property name="text">
- <string>Timecode overlay</string>
+ <string>Create chapter file based on guides</string>
</property>
</widget>
</item>
- <item row="9" column="0" colspan="11">
+ <item row="8" column="0" colspan="10">
<widget class="QCheckBox" name="open_browser">
<property name="text">
<string>Open browser window after export</string>
</property>
</widget>
</item>
- <item row="10" column="0" colspan="11">
+ <item row="9" column="0" colspan="4">
<widget class="QCheckBox" name="play_after">
<property name="text">
<string>Play after render</string>
</property>
</widget>
</item>
- <item row="11" column="0" colspan="11">
+ <item row="9" column="4" colspan="6">
+ <widget class="QCheckBox" name="tc_overlay">
+ <property name="text">
+ <string>Timecode overlay</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0" colspan="10">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="render_full">
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
- <item row="12" column="0" colspan="11">
+ <item row="11" column="0" colspan="10">
<widget class="QGroupBox" name="guides_box">
<property name="title">
<string/>
</layout>
</widget>
</item>
- <item row="14" column="0" colspan="2">
+ <item row="12" column="0">
+ <widget class="QLabel" name="errorLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="0" colspan="3">
<widget class="QPushButton" name="buttonRender">
<property name="text">
<string>Render to File</string>
</property>
</widget>
</item>
- <item row="14" column="2">
+ <item row="13" column="3" colspan="4">
<widget class="QPushButton" name="buttonGenerateScript">
<property name="text">
<string>Generate Script</string>
</property>
</widget>
</item>
- <item row="14" column="3" colspan="6">
+ <item row="13" column="7" colspan="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
- <item row="14" column="9" colspan="2">
+ <item row="13" column="9">
<widget class="KPushButton" name="buttonClose">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="11">
- <widget class="QCheckBox" name="open_dvd">
- <property name="text">
- <string>Open Dvd wizard after rendering</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0" colspan="11">
- <widget class="QCheckBox" name="create_chapter">
- <property name="text">
- <string>Create chapter file based on guides</string>
- </property>
- </widget>
- </item>
- <item row="2" column="7">
- <widget class="QToolButton" name="buttonFavorite">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="2" column="6">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>124</width>
- <height>23</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="13" column="0" colspan="11">
- <widget class="QLabel" name="errorLabel">
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
+ <customwidget>
+ <class>KIntNumInput</class>
+ <extends>QWidget</extends>
+ <header>knuminput.h</header>
+ </customwidget>
<customwidget>
<class>KTextEdit</class>
<extends>QTextEdit</extends>
<header>ktextedit.h</header>
</customwidget>
- <customwidget>
- <class>KRestrictedLine</class>
- <extends>KLineEdit</extends>
- <header>krestrictedline.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>