Commit f960577d authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix clip transcode incorrect label

BUG: 407808
parent 257806a3
Pipeline #3750 passed with stage
in 19 minutes and 32 seconds
......@@ -26,5 +26,5 @@ Wav 48000Hz=-vn -ar 48000 %1.wav;Extract audio as WAV file;audio
Remux with MKV=-vcodec copy -acodec copy -sn %1.mkv
DVD PAL 4:3=-f dvd -r 25 -vf scale=720:576 -aspect 4:3 -minrate 0 -maxrate 8000k -muxrate 10080000 -g 15 -bufsize 1835008 -packetsize 2048 -trellis 1 -me_range 63 -acodec ac3 -ab 192k -ar 48000 -vcodec mpeg2video -vb 5000k %1.vob;Dvd PAL
DVD PAL 16:9=-f dvd -r 25 -vf scale=720:576 -aspect 16:9 -minrate 0 -maxrate 8000k -muxrate 10080000 -g 15 -bufsize 1835008 -packetsize 2048 -trellis 1 -me_range 63 -acodec ac3 -ab 192k -ar 48000 -vcodec mpeg2video -vb 5000k %1.vob;Dvd PAL wide
DVD NTSC 4:3=-f dvd -r 23.976 -vf scale=720:480 -aspect 4:3 -minrate 0 -maxrate 9000k -muxrate 10080000 -g 18 -bufsize 1835008 -packetsize 2048 -trellis 1 -me_range 63 -acodec ac3 -ab 192k -ar 48000 -vcodec mpeg2video -vb 6000k %1.vob;Dvd PAL
DVD NTSC 16:9=-f dvd -r 23.976 -vf scale=720:480 -aspect 16:9 -minrate 0 -maxrate 9000k -muxrate 10080000 -g 18 -bufsize 1835008 -packetsize 2048 -trellis 1 -me_range 63 -acodec ac3 -ab 192k -ar 48000 -vcodec mpeg2video -vb 6000k %1.vob;Dvd PAL wide
\ No newline at end of file
DVD NTSC 4:3=-f dvd -r 23.976 -vf scale=720:480 -aspect 4:3 -minrate 0 -maxrate 9000k -muxrate 10080000 -g 18 -bufsize 1835008 -packetsize 2048 -trellis 1 -me_range 63 -acodec ac3 -ab 192k -ar 48000 -vcodec mpeg2video -vb 6000k %1.vob;Dvd NTSC
DVD NTSC 16:9=-f dvd -r 23.976 -vf scale=720:480 -aspect 16:9 -minrate 0 -maxrate 9000k -muxrate 10080000 -g 18 -bufsize 1835008 -packetsize 2048 -trellis 1 -me_range 63 -acodec ac3 -ab 192k -ar 48000 -vcodec mpeg2video -vb 6000k %1.vob;Dvd NTSC wide
......@@ -66,6 +66,7 @@ ClipTranscode::ClipTranscode(QStringList urls, const QString &params, QStringLis
}
urls_list->setHidden(true);
connect(source_url, SIGNAL(textChanged(QString)), this, SLOT(slotUpdateParams()));
ffmpeg_params->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
} else {
label_source->setHidden(true);
source_url->setHidden(true);
......@@ -76,6 +77,7 @@ ClipTranscode::ClipTranscode(QStringList urls, const QString &params, QStringLis
for (int i = 0; i < m_urls.count(); ++i) {
urls_list->addItem(m_urls.at(i));
}
urls_list->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
}
if (!params.isEmpty()) {
label_profile->setHidden(true);
......@@ -112,7 +114,7 @@ ClipTranscode::ClipTranscode(QStringList urls, const QString &params, QStringLis
connect(&m_transcodeProcess, &QProcess::readyReadStandardOutput, this, &ClipTranscode::slotShowTranscodeInfo);
connect(&m_transcodeProcess, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &ClipTranscode::slotTranscodeFinished);
ffmpeg_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
//ffmpeg_params->setMaximumHeight(QFontMetrics(font()).lineSpacing() * 5);
adjustSize();
}
......
......@@ -6,45 +6,64 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<height>633</height>
<width>574</width>
<height>802</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_source">
<property name="text">
<string>Source</string>
<item row="11" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="2" colspan="2">
<widget class="QProgressBar" name="job_progress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="KUrlRequester" name="source_url"/>
<item row="3" column="2" colspan="2">
<widget class="KComboBox" name="profile_list"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_dest">
<property name="text">
<string>Destination</string>
<item row="11" column="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Abort</set>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="KUrlRequester" name="dest_url"/>
</item>
<item row="5" column="0" colspan="3">
<item row="5" column="0" colspan="4">
<widget class="QLabel" name="ffmpeg_label">
<property name="text">
<string>FFmpeg parameters</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="auto_add">
<property name="text">
<string>Add clip to project</string>
<item row="2" column="0" colspan="4">
<widget class="QListWidget" name="urls_list">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
</widget>
</item>
......@@ -55,34 +74,50 @@
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QPushButton" name="button_start">
<item row="0" column="1" colspan="3">
<widget class="KUrlRequester" name="source_url"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_dest">
<property name="text">
<string comment="@action:button start transcode">Start</string>
<string>Destination</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_profile">
<property name="text">
<string>Profile</string>
<item row="8" column="0" colspan="4">
<widget class="QTextEdit" name="log_text">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="KComboBox" name="profile_list"/>
<item row="0" column="0">
<widget class="QLabel" name="label_source">
<property name="text">
<string>Source</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="6" column="0" colspan="4">
<widget class="QPlainTextEdit" name="ffmpeg_params">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Abort</set>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="2">
<item row="9" column="3">
<widget class="QCheckBox" name="auto_close">
<property name="text">
<string>Close after transcode</string>
......@@ -92,27 +127,7 @@
</property>
</widget>
</item>
<item row="11" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="1" colspan="2">
<widget class="QProgressBar" name="job_progress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<item row="4" column="0" colspan="4">
<widget class="QLabel" name="transcode_info">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
......@@ -122,45 +137,30 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QListWidget" name="urls_list">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
<item row="11" column="0">
<widget class="QPushButton" name="button_start">
<property name="text">
<string comment="@action:button start transcode">Start</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="3">
<widget class="QTextEdit" name="log_text">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="readOnly">
<bool>true</bool>
<item row="3" column="0">
<widget class="QLabel" name="label_profile">
<property name="text">
<string>Profile</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QPlainTextEdit" name="ffmpeg_params">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="readOnly">
<bool>true</bool>
<item row="9" column="0" colspan="3">
<widget class="QCheckBox" name="auto_add">
<property name="text">
<string>Add clip to project</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3">
<widget class="KUrlRequester" name="dest_url"/>
</item>
</layout>
</widget>
<customwidgets>
......@@ -171,7 +171,7 @@
</customwidget>
<customwidget>
<class>KUrlRequester</class>
<extends>QFrame</extends>
<extends>QWidget</extends>
<header>kurlrequester.h</header>
<container>1</container>
</customwidget>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment