Merge pull request #111 from ryanbugden/master

Typos & UI fixes

Author: typemytype

DesignspaceEditor2.roboFontExt/lib/designspaceEditor/parsers/variableFontsParser.py

@@ -113,7 +113,7 @@ def storeVariableFonts(text, operator):
     Store variable fonts as objects from a string for a given operator and
     store the variable fonts string representation in the operator lib.
     """
-    parsed = parseVariableFonts(text, operator.writerClass.variableFontDescriptorClas)
+    parsed = parseVariableFonts(text, operator.writerClass.variableFontDescriptorClass)
     operator.lib[variableFontsLibKey] = text
     operator.variableFonts.clear()
     operator.variableFonts.extend(parsed)

DesignspaceEditor2.roboFontExt/lib/designspaceEditor/tools.py

@@ -8,6 +8,7 @@
 from mojo.extensions import getExtensionDefault, ExtensionBundle
 
 
+
 def holdRecursionDecorator(func):
     """
     A decorator preventing calling the same method inside itself.
@@ -137,17 +138,44 @@ def __exit__(self, type, value, traceback):
 )
 
 
-def symbolImage(symbolName, color, flipped=False):
+def symbolImage(symbolName, color, flipped=False, pointSize=18.0, weight="light", scale="medium"):
     if osVersionCurrent >= osVersion12_0:
         image = AppKit.NSImage.imageWithSystemSymbolName_accessibilityDescription_(symbolName, "")
         if isinstance(color, tuple):
             color = AppKit.NSColor.colorWithCalibratedRed_green_blue_alpha_(*color)
         else:
             color = symbolColorMap[color]()
 
-        configuration = AppKit.NSImageSymbolConfiguration.configurationWithHierarchicalColor_(
-            color
+        pointSize = float(pointSize)
+
+        scales = {
+            "small": AppKit.NSImageSymbolScaleSmall,
+            "medium": AppKit.NSImageSymbolScaleMedium,
+            "large": AppKit.NSImageSymbolScaleLarge,
+        }
+        scale = scales.get(scale, AppKit.NSImageSymbolScaleMedium)
+
+        weights = {
+            "ultraLight": AppKit.NSFontWeightUltraLight,
+            "thin":       AppKit.NSFontWeightThin,
+            "light":      AppKit.NSFontWeightLight,
+            "regular":    AppKit.NSFontWeightRegular,
+            "medium":     AppKit.NSFontWeightMedium,
+            "semibold":   AppKit.NSFontWeightSemibold,
+            "bold":       AppKit.NSFontWeightBold,
+            "heavy":      AppKit.NSFontWeightHeavy,
+            "black":      AppKit.NSFontWeightBlack,
+        }
+        weight = weights.get(weight, AppKit.NSFontWeightRegular)
+                    
+        baseConfig = AppKit.NSImageSymbolConfiguration.configurationWithHierarchicalColor_(color)
+        newConfig = AppKit.NSImageSymbolConfiguration.configurationWithPointSize_weight_scale_(
+            pointSize,
+            weight,
+            scale
         )
+        # newConfig = AppKit.NSImageSymbolConfiguration.configurationWithScale_(scale)
+        configuration = baseConfig.configurationByApplyingConfiguration_(newConfig)
         image = image.imageWithSymbolConfiguration_(configuration)
     else:
         # older systems

DesignspaceEditor2.roboFontExt/lib/designspaceEditor/ui.py

@@ -89,7 +89,7 @@ def _instantiateFont(self, path):
     def updateFonts(self, fonts=None):
         if fonts is None:
             fonts = AllFonts()
-        super().udpateFonts([font.asDefcon() for font in fonts])
+        super().updateFonts([font.asDefcon() for font in fonts])
 
     # axes
 
@@ -947,9 +947,9 @@ def build(self):
             visibleByDefault=tabItem not in ["Notes"],
         ) for tabItem in self.tabItems]
 
-        other_extensions = []
+        otherExtensions = []
         if self.hasPreplatorSupport:
-            other_extensions.append(
+            otherExtensions.append(
                 dict(
                     itemIdentifier="prepolator",
                     label="Prepolator",
@@ -958,18 +958,18 @@ def build(self):
                     )
                 )
         if self.hasBatchSupport:
-            other_extensions.append(
+            otherExtensions.append(
                 dict(
                     itemIdentifier="batch",
                     label="Batch",
                     callback=self.toolbarBatch,
                     imageObject=symbolImage("arrow.right.filled.filter.arrow.right", (1, 0, 1, 1))
                     )
                 )
-        if other_extensions:
+        if otherExtensions:
             toolbarItems.append(dict(itemIdentifier=AppKit.NSToolbarSpaceItemIdentifier))
 
-        toolbarItems.extend(other_extensions)
+        toolbarItems.extend(otherExtensions)
 
         toolbarItems.extend([
             dict(itemIdentifier=AppKit.NSToolbarSpaceItemIdentifier,