Merge pull request #20880 from CastagnaIT/libass_fonts

[Subtitles] Show font family name's to subtitle fonts list

1 files changed, 15 insertions, 48 deletions

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 47940fca91..36b2f7fa47 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -517,26 +517,23 @@
           </constraints>
           <control type="spinner" format="integer" delayed="true"/>
         </setting>
-        <setting id="subtitles.font" type="string" label="14089" help="36185">
+        <setting id="subtitles.fontname" type="string" label="14089" help="36185">
           <level>1</level>
-          <default>arial.ttf</default>
+          <default>DEFAULT</default>
           <constraints>
-            <options>fonts</options>
+            <options>subtitlesfonts</options>
           </constraints>
           <control type="list" format="string" />
         </setting>
-        <setting id="subtitles.charset" type="string" parent="subtitles.font" label="735" help="36189">
+        <setting id="subtitles.charset" type="string" parent="subtitles.fontname" label="735" help="36189">
           <level>1</level>
           <default>DEFAULT</default>
           <constraints>
             <options>charsets</options>
           </constraints>
-          <dependencies>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
-          </dependencies>
           <control type="list" format="string" />
         </setting>
-        <setting id="subtitles.fontsize" type="integer" parent="subtitles.font" label="289" help="36186">
+        <setting id="subtitles.fontsize" type="integer" parent="subtitles.fontname" label="289" help="36186">
           <level>3</level>
           <default>42</default>
           <constraints>
@@ -545,11 +542,11 @@
             <maximum>74</maximum>
           </constraints>
           <dependencies>
-            <dependency type="update" setting="subtitles.font" />
+            <dependency type="update" setting="subtitles.fontname" />
           </dependencies>
           <control type="list" format="string" />
         </setting>
-        <setting id="subtitles.style" type="integer" parent="subtitles.font" label="736" help="36187">
+        <setting id="subtitles.style" type="integer" parent="subtitles.fontname" label="736" help="36187">
           <level>3</level>
           <default>0</default> <!-- FONT_STYLE_NORMAL -->
           <constraints>
@@ -560,62 +557,40 @@
               <option label="741">3</option> <!-- FONT_STYLE_BOLD | FONT_STYLE_ITALICS -->
             </options>
           </constraints>
-          <dependencies>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
-          </dependencies>
           <control type="list" format="string" />
         </setting>
-        <setting id="subtitles.colorpick" type="string" parent="subtitles.font" label="737" help="36188">
+        <setting id="subtitles.colorpick" type="string" parent="subtitles.fontname" label="737" help="36188">
           <level>3</level>
           <default>FFFFFFFF</default> <!-- White -->
-          <dependencies>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
-          </dependencies>
           <control type="colorbutton" />
         </setting>
-        <setting id="subtitles.opacity" type="integer" parent="subtitles.font" label="752" help="36295">
+        <setting id="subtitles.opacity" type="integer" parent="subtitles.fontname" label="752" help="36295">
           <level>3</level>
           <default>100</default>
-          <dependencies>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
-          </dependencies>
           <control type="slider" format="percentage" range="0,100" />
         </setting>
-        <setting id="subtitles.bordersize" type="integer" parent="subtitles.font" label="39159">
+        <setting id="subtitles.bordersize" type="integer" parent="subtitles.fontname" label="39159">
           <level>3</level>
           <default>30</default>
           <dependencies>
-            <dependency type="enable">
-              <and>
-                <condition on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font"/>
-                <condition setting="subtitles.backgroundtype" operator="!is">2</condition>
-              </and>
-            </dependency>
+            <dependency type="enable" setting="subtitles.backgroundtype" operator="!is">2</dependency>
           </dependencies>
           <control type="slider" format="percentage" range="0,100" />
         </setting>
-        <setting id="subtitles.bordercolorpick" type="string" parent="subtitles.font" label="39160">
+        <setting id="subtitles.bordercolorpick" type="string" parent="subtitles.fontname" label="39160">
           <level>3</level>
           <default>FF000000</default> <!-- Black -->
           <dependencies>
-            <dependency type="enable">
-              <and>
-                <condition on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font"/>
-                <condition setting="subtitles.backgroundtype" operator="!is">2</condition>
-              </and>
-            </dependency>
+            <dependency type="enable" setting="subtitles.backgroundtype" operator="!is">2</dependency>
           </dependencies>
           <control type="colorbutton" />
         </setting>
-        <setting id="subtitles.blur" type="integer" parent="subtitles.font" label="39173">
+        <setting id="subtitles.blur" type="integer" parent="subtitles.fontname" label="39173">
           <level>3</level>
           <default>0</default>
-          <dependencies>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
-          </dependencies>
           <control type="slider" format="percentage" range="0,100" />
         </setting>
-        <setting id="subtitles.backgroundtype" type="integer" parent="subtitles.font" label="39165" help="39169">
+        <setting id="subtitles.backgroundtype" type="integer" parent="subtitles.fontname" label="39165" help="39169">
           <level>3</level>
           <default>0</default>
           <constraints>
@@ -626,9 +601,6 @@
               <option label="39168">3</option> <!-- SUBTITLE_BACKGROUNDTYPE_SQUAREBOX -->
             </options>
           </constraints>
-          <dependencies>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
-          </dependencies>
           <control type="list" format="integer" />
         </setting>
         <setting id="subtitles.bgcolorpick" type="string" parent="subtitles.backgroundtype" label="745" help="36228">
@@ -641,7 +613,6 @@
                 <condition setting="subtitles.backgroundtype">3</condition>
               </or>
             </dependency>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
           </dependencies>
           <control type="colorbutton" />
         </setting>
@@ -655,7 +626,6 @@
                 <condition setting="subtitles.backgroundtype">3</condition>
               </or>
             </dependency>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
           </dependencies>
           <control type="slider" format="percentage" range="0,100" />
         </setting>
@@ -669,7 +639,6 @@
                 <condition setting="subtitles.backgroundtype">2</condition>
               </or>
             </dependency>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
           </dependencies>
           <control type="colorbutton" />
         </setting>
@@ -683,7 +652,6 @@
                 <condition setting="subtitles.backgroundtype">2</condition>
               </or>
             </dependency>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
           </dependencies>
           <control type="slider" format="percentage" range="0,100" />
         </setting>
@@ -697,7 +665,6 @@
                 <condition setting="subtitles.backgroundtype">2</condition>
               </or>
             </dependency>
-            <dependency type="enable" on="property" name="HasSubtitlesFontExtensions" setting="subtitles.font" />
           </dependencies>
           <control type="slider" format="percentage" range="0,100" />
         </setting>