Skip to content

Commit

Permalink
Version 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Paco8
Paco8 committed Mar 7, 2021
1 parent 0875d32 commit d6cd9af
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 29 deletions.
2 changes: 1 addition & 1 deletion kodi/addon.xml-k18
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<summary lang="en_GB">Ttml2Ssa Library.</summary>
<description lang="en_GB">Ttml2Ssa is a library that allows other addons to convert TTML/XML/DFXP/VTT/SRT subtitles to SRT and SSA/ASS formats. It also provides a configuration window where the user can adjust the SSA/ASS style and other options.</description>
<platform>all</platform>
<license>GPL-2.0-or-later</license>
<license>LGPL-2.1-or-later</license>
<website>https://github.com/Paco8/ttml2ssa</website>
<source>https://github.com/Paco8/ttml2ssa</source>
<assets>
Expand Down
2 changes: 1 addition & 1 deletion kodi/addon.xml-k19
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<summary lang="en_GB">Ttml2Ssa Library.</summary>
<description lang="en_GB">Ttml2Ssa is a library that allows other addons to convert TTML/XML/DFXP/VTT/SRT subtitles to SRT and SSA/ASS formats. It also provides a configuration window where the user can adjust the SSA/ASS style and other options.</description>
<platform>all</platform>
<license>GPL-2.0-or-later</license>
<license>LGPL-2.1-or-later</license>
<website>https://github.com/Paco8/ttml2ssa</website>
<source>https://github.com/Paco8/ttml2ssa</source>
<assets>
Expand Down
4 changes: 2 additions & 2 deletions kodi/settings.xml-k18
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<setting label="32000" type="lsep"/>
<setting label="32001" type="text" id="fontname" default="Arial"/>
<setting label="32002" type="number" id="fontsize" default="50"/>
<setting label="32003" type="text" id="primarycolor" default="00EEEEEE"/>
<setting label="32003" type="text" id="primarycolor" default="white"/>
<setting label="32004" type="text" id="backcolor" default="40000000"/>
<setting label="32005" type="text" id="outlinecolor" default="00000000"/>
<setting label="32005" type="text" id="outlinecolor" default="black"/>
<setting label="32006" type="enum" id="borderstyle" lvalues="32007|32008"/>
<setting label="32009" type="number" id="outline" default="2"/>
<setting label="32010" type="number" id="shadow" default="3"/>
Expand Down
46 changes: 23 additions & 23 deletions kodi/settings.xml-k19
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,42 +19,42 @@
</group>
<group id="2" label="32000">
<setting id="fontname" type="string" label="32001" help="">
<level>0</level>
<level>1</level>
<default>Arial</default>
<control type="edit" format="string">
<heading>32001</heading>
</control>
</setting>
<setting id="fontsize" type="integer" label="32002" help="">
<level>0</level>
<level>1</level>
<default>50</default>
<control type="edit" format="integer">
<heading>32002</heading>
</control>
</setting>
<setting id="primarycolor" type="string" label="32003" help="">
<level>0</level>
<default>00EEEEEE</default>
<level>1</level>
<default>white</default>
<control type="edit" format="string">
<heading>32003</heading>
</control>
</setting>
<setting id="backcolor" type="string" label="32004" help="">
<level>0</level>
<level>1</level>
<default>40000000</default>
<control type="edit" format="string">
<heading>32004</heading>
</control>
</setting>
<setting id="outlinecolor" type="string" label="32005" help="">
<level>0</level>
<default>00000000</default>
<level>1</level>
<default>black</default>
<control type="edit" format="string">
<heading>32005</heading>
</control>
</setting>
<setting id="borderstyle" type="integer" label="32006" help="">
<level>0</level>
<level>1</level>
<default>0</default>
<constraints>
<options>
Expand All @@ -65,45 +65,45 @@
<control type="spinner" format="string"/>
</setting>
<setting id="outline" type="integer" label="32009" help="">
<level>0</level>
<level>1</level>
<default>2</default>
<control type="edit" format="integer">
<heading>32009</heading>
</control>
</setting>
<setting id="shadow" type="integer" label="32010" help="">
<level>0</level>
<level>1</level>
<default>3</default>
<control type="edit" format="integer">
<heading>32010</heading>
</control>
</setting>
<setting id="bold" type="boolean" label="32011" help="">
<level>0</level>
<level>1</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="italic" type="boolean" label="32012" help="">
<level>0</level>
<level>1</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="marginv" type="integer" label="32013" help="">
<level>0</level>
<level>2</level>
<default>40</default>
<control type="edit" format="integer">
<heading>32013</heading>
</control>
</setting>
<setting id="marginl" type="integer" label="32014" help="">
<level>0</level>
<level>2</level>
<default>40</default>
<control type="edit" format="integer">
<heading>32014</heading>
</control>
</setting>
<setting id="marginr" type="integer" label="32015" help="">
<level>0</level>
<level>2</level>
<default>40</default>
<control type="edit" format="integer">
<heading>32015</heading>
Expand All @@ -114,22 +114,22 @@
<category id="misc" label="32100" help="">
<group id="1">
<setting id="allow_italics" type="boolean" label="32101" help="">
<level>0</level>
<level>1</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="allow_top_pos" type="boolean" label="32102" help="">
<level>0</level>
<level>1</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="cosmetic_filter" type="boolean" label="32103" help="">
<level>0</level>
<level>2</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="fix_amazon" type="boolean" label="32108" help="">
<level>0</level>
<level>2</level>
<default>true</default>
<dependencies>
<dependency type="enable">
Expand All @@ -139,17 +139,17 @@
<control type="toggle"/>
</setting>
<setting id="language_filter" type="boolean" label="32104" help="">
<level>0</level>
<level>2</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="timestamp manipulation" type="boolean" label="32106" help="">
<level>0</level>
<level>3</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="fix_collisions" type="boolean" label="32107" help="">
<level>0</level>
<level>3</level>
<default>true</default>
<dependencies>
<dependency type="enable">
Expand All @@ -159,7 +159,7 @@
<control type="toggle"/>
</setting>
<setting id="min_sep" type="integer" label="32105" help="">
<level>0</level>
<level>3</level>
<default>200</default>
<dependencies>
<dependency type="enable">
Expand Down
13 changes: 11 additions & 2 deletions src/ttml2ssa.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

class Ttml2Ssa(object):

VERSION = '0.2.11'
VERSION = '0.3.0'

TIME_BASES = [
'media',
Expand Down Expand Up @@ -612,13 +612,22 @@ def string_to_color(self, text):
color_names = {
# In BBGGRR
'WHITE': 'FFFFFF',
'BLANCO': 'FFFFFF',
'GRAY': '808080',
'GREY': '808080',
'GRIS': '808080',
'YELLOW': '00FFFF',
'AMARILLO': '00FFFF',
'RED': '0000FF',
'ROJO': '0000FF',
'GREEN': '00FF00',
'VERDE': '00FF00',
'BLUE': 'FF0000',
'AZUL': 'FF0000',
'BROWN': '2A2AA5',
'BLACK': '000000'
'MARRON': '2A2AA5',
'BLACK': '000000',
'NEGRO': '000000'
}
if text in color_names:
text = color_names[text]
Expand Down

0 comments on commit d6cd9af

Please sign in to comment.