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

Fix ambiguous widget name

parent 5f958b35
Pipeline #212958 passed with stage
in 9 minutes and 20 seconds
......@@ -222,10 +222,10 @@ RenderPresetDialog::RenderPresetDialog(QWidget *parent, RenderPresetModel *prese
parameters->setPlainText(preset->params());
parameters->setReadOnly(false);
helpButton->setEnabled(false);
extension->setText(preset->extension());
preset_extension->setText(preset->extension());
} else {
formatCombo->setCurrentText(preset->getParam(QStringLiteral("f")));
extension->setText(preset->extension());
preset_extension->setText(preset->extension());
QString width = preset->getParam(QStringLiteral("width"));
QString height = preset->getParam(QStringLiteral("height"));
QString size = preset->getParam(QStringLiteral("s"));
......@@ -446,7 +446,7 @@ RenderPresetDialog::RenderPresetDialog(QWidget *parent, RenderPresetModel *prese
QString speeds_list_str = speeds_list->toPlainText().replace('\n', ';').simplified();
std::unique_ptr<RenderPresetModel> newPreset(new RenderPresetModel(newPresetName, newGroupName, parameters->toPlainText().simplified(),
extension->text().simplified(), QString::number(default_vbitrate->value()),
preset_extension->text().simplified(), QString::number(default_vbitrate->value()),
QString::number(default_vquality->value()), QString::number(aBitrate->value()),
QString::number(aQuality->value()), speeds_list_str, m_manualPreset));
......@@ -459,9 +459,9 @@ RenderPresetDialog::RenderPresetDialog(QWidget *parent, RenderPresetModel *prese
connect(formatCombo, &QComboBox::currentTextChanged, [this](const QString &format) {
if (format == QLatin1String("matroska")) {
extension->setText(QStringLiteral("mkv"));
preset_extension->setText(QStringLiteral("mkv"));
} else {
extension->setText(format);
preset_extension->setText(format);
}
slotUpdateParams();
});
......
......@@ -77,7 +77,7 @@
</widget>
</item>
<item row="4" column="3" colspan="2">
<widget class="QLineEdit" name="extension">
<widget class="QLineEdit" name="preset_extension">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -156,7 +156,7 @@
<x>0</x>
<y>0</y>
<width>536</width>
<height>471</height>
<height>501</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
......@@ -173,8 +173,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>519</width>
<height>730</height>
<width>503</width>
<height>640</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
......@@ -1094,7 +1094,8 @@
<string>Enable manual editing</string>
</property>
<property name="icon">
<iconset theme="data-warning"/>
<iconset theme="data-warning">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</item>
......
Supports Markdown
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