Merge pull request #3727 from OpenShot/fix-font-dialog

Fixing a few issues with the title editor

Author: jonoomph

src/windows/title_editor.py

@@ -94,6 +94,7 @@ def __init__(self, edit_file_path=None, duplicate=False):
 
         self.font_weight = 'normal'
         self.font_style = 'normal'
+        self.font_size_pixel = 20
 
         self.new_title_text = ""
         self.sub_title_text = ""
@@ -279,8 +280,17 @@ def load_svg_template(self):
         for i in range(0, self.text_fields):
             if len(self.tspan_node[i].childNodes) > 0:
                 text = self.tspan_node[i].childNodes[0].data
+                ar = self.tspan_node[i].attributes["style"].value.split(";")
                 title_text.append(text)
 
+                # Set font size (for possible font dialog)
+                fs = self.find_in_list(ar, "font-size:")
+                fs_value = ar[fs][10:]
+                if fs_value.endswith("px"):
+                    self.qfont.setPixelSize(float(fs_value[:-2]))
+                elif fs_value.endswith("pt"):
+                    self.qfont.setPointSizeF(float(fs_value[:-2]))
+
                 # Create Label
                 label = QLabel()
                 label_line_text = _("Line %s:") % str(i + 1)
@@ -414,6 +424,7 @@ def btnFont_clicked(self):
             self.font_family = fontinfo.family()
             self.font_style = fontinfo.styleName()
             self.font_weight = fontinfo.weight()
+            self.font_size_pixel = fontinfo.pixelSize()
             self.set_font_style()
 
             # Something changed, so update temp SVG
@@ -432,7 +443,7 @@ def update_font_color_button(self):
         """Updates the color shown on the font color button"""
 
         # Loop through each TEXT element
-        for node in self.text_node:
+        for node in self.text_node + self.tspan_node:
 
             # Get the value in the style attribute
             s = node.attributes["style"].value
@@ -449,6 +460,14 @@ def update_font_color_button(self):
                 # If the color was in an invalid format, try the next text element
                 log.debug('Failed to parse {} as color value'.format(txt))
 
+            # Look up color if needed
+            # Some colors are located in a different node
+            if color.startswith("url(#") and self.xmldoc.getElementsByTagName("defs").length == 1:
+                color_ref_id = color[5:-1]
+                ref_color = self.get_ref_color(color_ref_id)
+                if ref_color:
+                    color = ref_color
+
             opacity = self.find_in_list(ar, "opacity:")
 
             try:
@@ -485,6 +504,31 @@ def update_font_color_button(self):
             color.setAlphaF(opacity)
             self.font_color_code = color
 
+    def get_ref_color(self, id):
+        """Get the color value from a reference id (i.e. linearGradient3267)"""
+        found_color = ""
+        for ref_node in self.xmldoc.getElementsByTagName("defs")[0].childNodes:
+            if ref_node.attributes and "id" in ref_node.attributes:
+                ref_node_id = ref_node.attributes["id"].value
+                if id == ref_node_id:
+                    # Found a matching color reference
+                    if "xlink:href" in ref_node.attributes:
+                        # look up color reference again
+                        xlink_ref_id = ref_node.attributes["xlink:href"].value[1:]
+                        return self.get_ref_color(xlink_ref_id)
+                    if "href" in ref_node.attributes:
+                        # look up color reference again
+                        xlink_ref_id = ref_node.attributes["href"].value[1:]
+                        return self.get_ref_color(xlink_ref_id)
+                    elif ref_node.childNodes:
+                        for stop_node in ref_node.childNodes:
+                            if "stop" == stop_node.nodeName:
+                                # get color from stop
+                                ar = stop_node.attributes["style"].value.split(";")
+                                sc = self.find_in_list(ar, "stop-color:")
+                                return ar[sc][11:]
+        return found_color
+
     def update_background_color_button(self):
         """Updates the color shown on the background color button"""
 
@@ -545,9 +589,8 @@ def update_background_color_button(self):
 
     def set_font_style(self):
         '''sets the font properties'''
-
         # Loop through each TEXT element
-        for text_child in self.text_node:
+        for text_child in self.text_node + self.tspan_node:
             # set the style elements for the main text node
             s = text_child.attributes["style"].value
             # split the text node so we can access each part
@@ -558,40 +601,20 @@ def set_font_style(self):
             # ignoring font-weight, as not sure what it represents in Qt.
             fs = self.find_in_list(ar, "font-style:")
             ff = self.find_in_list(ar, "font-family:")
+            fp = self.find_in_list(ar, "font-size:")
             if fs:
                 ar[fs] = "font-style:" + self.font_style
             if ff:
                 ar[ff] = "font-family:" + self.font_family
+            if fp:
+                ar[fp] = "font-size:%spx" % self.font_size_pixel
             # rejoin the modified parts
             t = ";"
             self.title_style_string = t.join(ar)
 
             # set the text node
             text_child.setAttribute("style", self.title_style_string)
 
-        # Loop through each TSPAN
-        for tspan_child in self.tspan_node:
-            # set the style elements for the main text node
-            s = tspan_child.attributes["style"].value
-            # split the text node so we can access each part
-            ar = s.split(";")
-            # we need to find each element that we are changing, shouldn't assume
-            # they are in the same position in any given template.
-
-            # ignoring font-weight, as not sure what it represents in Qt.
-            fs = self.find_in_list(ar, "font-style:")
-            ff = self.find_in_list(ar, "font-family:")
-            if fs:
-                ar[fs] = "font-style:" + self.font_style
-            if ff:
-                ar[ff] = "font-family:" + self.font_family
-            # rejoin the modified parts
-            t = ";"
-            self.title_style_string = t.join(ar)
-
-            # set the text node
-            tspan_child.setAttribute("style", self.title_style_string)
-
     def set_bg_style(self, color, alpha):
         '''sets the background color'''
 
@@ -620,7 +643,7 @@ def set_bg_style(self, color, alpha):
     def set_font_color_elements(self, color, alpha):
 
         # Loop through each TEXT element
-        for text_child in self.text_node:
+        for text_child in self.text_node + self.tspan_node:
 
             # SET TEXT PROPERTIES
             s = text_child.attributes["style"].value
@@ -641,21 +664,6 @@ def set_font_color_elements(self, color, alpha):
             t = ";"
             text_child.setAttribute("style", t.join(ar))
 
-            # Loop through each TSPAN
-            for tspan_child in self.tspan_node:
-
-                # SET TSPAN PROPERTIES
-                s = tspan_child.attributes["style"].value
-                # split the text node so we can access each part
-                ar = s.split(";")
-                fill = self.find_in_list(ar, "fill:")
-                if fill is None:
-                    ar.append("fill:" + color)
-                else:
-                    ar[fill] = "fill:" + color
-                t = ";"
-                tspan_child.setAttribute("style", t.join(ar))
-
     def accept(self):
         app = get_app()
         _ = app._tr