[Kdenlive Settings] Move Monitor bg color to colors tab

src/dialogs/kdenlivesettingsdialog.cpp

@@ -1171,8 +1171,8 @@ void KdenliveSettingsDialog::updateSettings()
         fullReset = true;
     }
 
-    if (m_configSdl.kcfg_window_background->color() != KdenliveSettings::window_background()) {
-        KdenliveSettings::setWindow_background(m_configSdl.kcfg_window_background->color());
+    if (m_configColors.kcfg_window_background->color() != KdenliveSettings::window_background()) {
+        KdenliveSettings::setWindow_background(m_configColors.kcfg_window_background->color());
         emit updateMonitorBg();
     }
 

src/ui/configcolors_ui.ui

@@ -12,7 +12,7 @@
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="label_3">
+    <widget class="QLabel" name="label_audio_thumbs">
      <property name="text">
       <string>Audio thumbnail colors:</string>
      </property>
@@ -32,13 +32,13 @@
     <widget class="KColorButton" name="kcfg_overlayColor"/>
    </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="label_monitor_overlay">
      <property name="text">
       <string>Monitor overlay color:</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -51,6 +51,16 @@
      </property>
     </spacer>
    </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_monitor_bg">
+     <property name="text">
+      <string>Monitor background color:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="KColorButton" name="kcfg_window_background"/>
+   </item>
   </layout>
  </widget>
  <customwidgets>

src/ui/configsdl_ui.ui

@@ -113,59 +113,35 @@
    <item row="7" column="1">
     <widget class="QComboBox" name="fullscreen_monitor"/>
    </item>
-   <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="8" column="1">
-    <widget class="KColorButton" name="kcfg_window_background">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="defaultColor">
-      <color>
-       <red>180</red>
-       <green>180</green>
-       <blue>180</blue>
-      </color>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0" colspan="2">
+   <item row="8" column="0" colspan="2">
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="9" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>External display (Blackmagic card):</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="9" column="1">
     <widget class="QCheckBox" name="kcfg_external_display">
      <property name="text">
       <string>Enable</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="0">
+   <item row="10" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>Output device:</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="1">
+   <item row="10" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QComboBox" name="kcfg_blackmagic_output_device">
@@ -193,7 +169,7 @@
      </item>
     </layout>
    </item>
-   <item row="12" column="1">
+   <item row="11" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -209,11 +185,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KColorButton</class>
-   <extends>QPushButton</extends>
-   <header>kcolorbutton.h</header>
-  </customwidget>
   <customwidget>
    <class>KMessageWidget</class>
    <extends>QFrame</extends>