Make deinterlace/decomb behave similar to nlmeans/hqdn3d

I.e. use a dropdown to select between the filters instead of a radio
button.

1 files changed, 47 insertions, 96 deletions

diff --git a/gtk/src/ghb-3.14.ui b/gtk/src/ghb-3.14.ui
index 7164d39b7..3dd55d58d 100644
--- a/gtk/src/ghb-3.14.ui
+++ b/gtk/src/ghb-3.14.ui
@@ -3066,92 +3066,31 @@ SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkGrid" id="table10">
+                                  <object class="GtkGrid" id="table14">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="column_spacing">5</property>
                                     <child>
-                                      <object class="GtkLabel" id="label86">
+                                      <object class="GtkLabel" id="PictureDeinterlaceFilterLabel">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">start</property>
-                                        <property name="label" translatable="yes">Detelecine:</property>
+                                        <property name="label" translatable="yes">Deinterlace Filter:</property>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">0</property>
+                                        <property name="top_attach">1</property>
                                         <property name="left_attach">0</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="PictureDetelecine">
+                                      <object class="GtkComboBox" id="PictureDeinterlaceFilter">
                                         <property name="valign">GTK_ALIGN_CENTER</property>
                                         <property name="width_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip_text" translatable="yes">This filter removes 'combing' artifacts that are the result of telecining.
-
-Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps.</property>
-                                        <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="top_attach">0</property>
-                                        <property name="left_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="PictureDetelecineCustom">
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">Custom detelecine filter string format
-
-JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
-                                        <property name="width_chars">8</property>
-                                        <property name="primary_icon_activatable">False</property>
-                                        <property name="secondary_icon_activatable">False</property>
-                                        <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="top_attach">1</property>
-                                        <property name="left_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="PictureDecombDeinterlace">
-                                        <property name="label" translatable="yes">Decomb</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">Choose decomb or deinterlace filter options.
-
-The decomb filter selectively deinterlaces frames that appear to be interlaced.
-This will preserve quality in frames that are not interlaced.
-
-The classic deinterlace filter is applied to all frames.
-Frames that are not interlaced will suffer some quality degradation.</property>
-                                        <property name="halign">start</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
-                                      </object>
-                                      <packing>
-                                        <property name="top_attach">2</property>
-                                        <property name="left_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="PictureDeinterlaceDecomb">
-                                        <property name="label" translatable="yes">Deinterlace</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
                                         <property name="tooltip_text" translatable="yes">Choose decomb or deinterlace filter options.
 
 The decomb filter selectively deinterlaces frames that appear to be interlaced.
@@ -3159,115 +3098,127 @@ This will preserve quality in frames that are not interlaced.
 
 The classic deinterlace filter is applied to all frames.
 Frames that are not interlaced will suffer some quality degradation.</property>
-                                        <property name="halign">start</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">PictureDecombDeinterlace</property>
-                                        <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
+                                        <signal name="changed" handler="deint_filter_changed_cb" swapped="no"/>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">2</property>
+                                        <property name="top_attach">1</property>
                                         <property name="left_attach">1</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel" id="PictureDecombLabel">
+                                      <object class="GtkLabel" id="PictureDeinterlacePresetLabel">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">start</property>
-                                        <property name="label" translatable="yes">Decomb:</property>
+                                        <property name="label" translatable="yes">Deinterlace Preset:</property>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">3</property>
+                                        <property name="top_attach">2</property>
                                         <property name="left_attach">0</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="PictureDecomb">
+                                      <object class="GtkComboBox" id="PictureDeinterlacePreset">
                                         <property name="valign">GTK_ALIGN_CENTER</property>
                                         <property name="width_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip_text" translatable="yes">The decomb filter selectively deinterlaces frames that appear to be interlaced.
-This will preserve quality in frames that are not interlaced.</property>
+                                        <property name="tooltip_text" translatable="yes"> The decomb filter selectively deinterlaces frames that appear to be interlaced.
+This will preserve quality in frames that are not interlaced.
+
+The classic deinterlace filter is applied to all frames.
+Frames that are not interlaced will suffer some quality degradation.</property>
                                         <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">3</property>
+                                        <property name="top_attach">2</property>
                                         <property name="left_attach">1</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" id="PictureDecombCustom">
+                                      <object class="GtkEntry" id="PictureDeinterlaceCustom">
                                         <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">Custom decomb filter string format
+                                        <property name="tooltip_text" translatable="yes">Custom denoise filter string format
 
-Mode:SpatialMetric:MotionThresh:SpatialThresh:BlockThresh:BlockWidth:
-BlockHeight:MagnitudeThres:VarianceThres:LaplacianThresh:DilationThresh:
-ErosionThresh:NoiseThresh:MaxSearchDistance:PostProcessing:Parity</property>
+SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>
                                         <property name="width_chars">8</property>
                                         <property name="primary_icon_activatable">False</property>
                                         <property name="secondary_icon_activatable">False</property>
                                         <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">4</property>
+                                        <property name="top_attach">3</property>
                                         <property name="left_attach">1</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="padding">2</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkGrid" id="table10">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="column_spacing">5</property>
                                     <child>
-                                      <object class="GtkLabel" id="PictureDeinterlaceLabel">
+                                      <object class="GtkLabel" id="label86">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="halign">start</property>
-                                        <property name="label" translatable="yes">Deinterlace:</property>
+                                        <property name="label" translatable="yes">Detelecine:</property>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">5</property>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">0</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkComboBox" id="PictureDeinterlace">
+                                      <object class="GtkComboBox" id="PictureDetelecine">
                                         <property name="valign">GTK_ALIGN_CENTER</property>
                                         <property name="width_request">100</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip_text" translatable="yes">The classic deinterlace filter is applied to all frames.
-Frames that are not interlaced will suffer some quality degradation.</property>
+                                        <property name="tooltip_text" translatable="yes">This filter removes 'combing' artifacts that are the result of telecining.
+
+Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps.</property>
                                         <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">5</property>
+                                        <property name="top_attach">0</property>
                                         <property name="left_attach">1</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" id="PictureDeinterlaceCustom">
+                                      <object class="GtkEntry" id="PictureDetelecineCustom">
                                         <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">Custom deinterlace filter string format
+                                        <property name="tooltip_text" translatable="yes">Custom detelecine filter string format
 
-YadifMode:YadifParity:McdintMode:McdeintQp</property>
+JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
                                         <property name="width_chars">8</property>
                                         <property name="primary_icon_activatable">False</property>
                                         <property name="secondary_icon_activatable">False</property>
                                         <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
                                       </object>
                                       <packing>
-                                        <property name="top_attach">6</property>
+                                        <property name="top_attach">1</property>
                                         <property name="left_attach">1</property>
                                         <property name="width">1</property>
                                         <property name="height">1</property>
@@ -3278,7 +3229,7 @@ YadifMode:YadifParity:McdintMode:McdeintQp</property>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
                                     <property name="padding">2</property>
-                                    <property name="position">2</property>
+                                    <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>