Commit b997d242 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

[Kdenlive Settings] Remove "preview volume" option

This was used in a different way back in time, but now it does not make
sense to have this option in the settings anymore. The UI element in the
settings is a duplicate of the volume slider in the monitors hamburger
menu, but in the current implementation both options are not properly
syncronized.
parent bc3198ef
......@@ -1190,11 +1190,6 @@ void KdenliveSettingsDialog::updateSettings()
pCore->getMonitor(Kdenlive::ClipMonitor)->getControllerProxy()->colorsChanged();
}
if (m_configSdl.kcfg_volume->value() != KdenliveSettings::volume()) {
KdenliveSettings::setVolume(m_configSdl.kcfg_volume->value());
resetConsumer = true;
}
if (m_configMisc.kcfg_tabposition->currentIndex() != KdenliveSettings::tabposition()) {
KdenliveSettings::setTabposition(m_configMisc.kcfg_tabposition->currentIndex());
}
......
......@@ -2,6 +2,14 @@
<ui version="4.0">
<class>ConfigSdl_UI</class>
<widget class="QWidget" name="ConfigSdl_UI">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>458</width>
<height>460</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<widget class="KMessageWidget" name="kmessagewidget">
......@@ -25,6 +33,27 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_gpu">
<property name="text">
<string>GPU processing (Movit library):</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_gpu_accel">
<property name="text">
<string>Enable - restart Kdenlive to apply</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_audio_backend">
<property name="text">
......@@ -67,44 +96,31 @@
<item row="5" column="1">
<widget class="QComboBox" name="kcfg_audio_device"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_preview_volume">
<property name="text">
<string>Preview volume:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QSpinBox" name="kcfg_volume">
<property name="suffix">
<string>%</string>
</property>
<property name="maximum">
<number>200</number>
</property>
<property name="value">
<number>100</number>
<item row="6" column="0" colspan="2">
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Monitor for fullscreen output:</string>
</property>
</widget>
</item>
<item row="8" column="1">
<item row="7" column="1">
<widget class="QComboBox" name="fullscreen_monitor"/>
</item>
<item row="9" column="0">
<item row="8" column="0">
<widget class="QLabel" name="label_monitor_background">
<property name="text">
<string>Monitor background color:</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="8" column="1">
<widget class="KColorButton" name="kcfg_window_background">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
......@@ -121,35 +137,35 @@
</property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<item row="9" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="11" column="0">
<item row="10" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>External display (Blackmagic card):</string>
</property>
</widget>
</item>
<item row="11" column="1">
<item row="10" column="1">
<widget class="QCheckBox" name="kcfg_external_display">
<property name="text">
<string>Enable</string>
</property>
</widget>
</item>
<item row="12" column="0">
<item row="11" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Output device:</string>
</property>
</widget>
</item>
<item row="12" column="1">
<item row="11" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="kcfg_blackmagic_output_device">
......@@ -177,35 +193,7 @@
</item>
</layout>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_gpu_accel">
<property name="text">
<string>Enable - restart Kdenlive to apply</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_gpu">
<property name="text">
<string>GPU processing (Movit library):</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="13" column="1">
<item row="12" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......
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