Add "family" and "style" properties to pango producer. Deprecate

[mlt] / src / modules / gtk2 / producer_pango.yml

diff --git a/src/modules/gtk2/producer_pango.yml b/src/modules/gtk2/producer_pango.yml
index b63982d93916929b006644a2dfcea3fd2bafae38..3358adb1dad49b5f7d5aaae382b34e5bf986e4bc 100644 (file)
--- a/src/modules/gtk2/producer_pango.yml
+++ b/src/modules/gtk2/producer_pango.yml
@@ -2,7 +2,7 @@ schema_version: 0.1
 type: producer
 identifier: pango
 title: Pango
-version: 1
+version: 2
 copyright: Ushodaya Enterprises Limited
 creator: Dan Dennedy
 license: LGPLv2.1
@@ -53,7 +53,10 @@ parameters:
   - identifier: fgcolour
     title: Foreground color
     type: string
-    description: an RGBA colour specification of the text (i.e. 0xrrggbbaa)
+    description: >
+      A color value is a hexadecimal representation of RGB plus alpha channel 
+      as 0xrrggbbaa. Colors can also be the words: white, black, red, green,
+      or blue. You can also use a HTML-style color values #rrggbb or #aarrggbb.
     readonly: no
     mutable: yes
     widget: color
@@ -61,17 +64,44 @@ parameters:
   - identifier: bgcolour
     title: Background color
     type: string
-    description: an RGBA colour of the background rectangle (i.e. 0xrrggbbaa)
+    description: >
+      A color value is a hexadecimal representation of RGB plus alpha channel 
+      as 0xrrggbbaa. Colors can also be the words: white, black, red, green,
+      or blue. You can also use a HTML-style color values #rrggbb or #aarrggbb.
     readonly: no
     mutable: yes
     widget: color
     
+  - identifier: olcolour
+    title: Outline color
+    type: string
+    description: >
+      A color value is a hexadecimal representation of RGB plus alpha channel 
+      as 0xrrggbbaa. Colors can also be the words: white, black, red, green,
+      or blue. You can also use a HTML-style color values #rrggbb or #aarrggbb.
+    readonly: no
+    mutable: yes
+    widget: color
+    
+  - identifier: outline
+    title: Outline Width
+    type: string
+    description: >
+      The width of the outline in pixels.
+    readonly: no
+    default: 0
+    minimum: 0
+    maximum: 3
+    mutable: yes
+    widget: spinner
+    
   - identifier: align
     title: Paragraph alignment
     type: string
     description: >
       left, centre, right (also, numbers 0, 1 and 2 can be used respectively)
     readonly: no
+    default: left
     mutable: yes
     widget: combo
 
@@ -96,12 +126,46 @@ parameters:
     widget: textbox
 
   - identifier: font
+    deprecated: yes
     title: Font
     type: string
     description: >
       The default typeface to use when not using markup. 
       FreeType2 renders at 72 dpi.
-    default: Sans 48
+      This property is deprecated. Use family, size and style instead.
+    readonly: no
+    mutable: yes
+    widget: combo
+    
+  - identifier: family
+    title: Font family
+    type: string
+    description: >
+      The default typeface to use when not using markup. 
+    default: Sans
+    readonly: no
+    mutable: yes
+    widget: combo
+    
+  - identifier: size
+    title: Font size
+    type: integer
+    description: >
+      The size in pixels of the font to use when not using markup. 
+    default: 48
+    readonly: no
+    mutable: yes
+    widget: spinner
+    
+  - identifier: style
+    title: Font style
+    type: string
+    description: >
+      The style of the font to use when not using markup.
+    values:
+      - normal
+      - italic
+    default: normal
     readonly: no
     mutable: yes
     widget: combo
@@ -110,6 +174,8 @@ parameters:
     title: Font weight
     type: integer
     description: The weight of the font.
+    minimum: 100
+    maximum: 1000
     default: 400
     readonly: no
     mutable: yes