Add new font families and weights

This commit is contained in:
Robin Dunn
2020-03-13 10:42:08 -07:00
parent f55917037e
commit 1f33298627
2 changed files with 41 additions and 11 deletions

View File

@@ -268,15 +268,24 @@ SM_DRAW_FANCY_TICKS = 1024
SM_MOUSE_TRACK = 1
""" Flag to allow the left/right click of the mouse to change the :class:`SpeedMeter` value interactively. """
fontfamily = list(range(70, 78))
familyname = ["default", "decorative", "roman", "script", "swiss", "modern", "teletype"]
fontfamily = [wx.FONTFAMILY_DEFAULT, wx.FONTFAMILY_DECORATIVE, wx.FONTFAMILY_ROMAN,
wx.FONTFAMILY_SCRIPT, wx.FONTFAMILY_SWISS, wx.FONTFAMILY_MODERN,
wx.FONTFAMILY_TELETYPE, wx.FONTFAMILY_UNKNOWN]
familyname = ["default", "decorative", "roman", "script", "swiss", "modern",
"teletype", "unknown"]
weights = list(range(90, 93))
weightsname = ["normal", "light", "bold"]
weights = [ wx.FONTWEIGHT_INVALID, wx.FONTWEIGHT_THIN, wx.FONTWEIGHT_EXTRALIGHT,
wx.FONTWEIGHT_LIGHT, wx.FONTWEIGHT_NORMAL, wx.FONTWEIGHT_MEDIUM,
wx.FONTWEIGHT_SEMIBOLD, wx.FONTWEIGHT_BOLD, wx.FONTWEIGHT_EXTRABOLD,
wx.FONTWEIGHT_HEAVY, wx.FONTWEIGHT_EXTRAHEAVY]
weightsname = ["invalid", "thin", "extra-light", "normal", "medium", "semi-bold",
"bold", "extra-bold", "heavy", "extra-heavy"]
styles = [90, 93, 94]
styles = [ wx.FONTSTYLE_NORMAL, wx.FONTSTYLE_ITALIC, wx.FONTSTYLE_SLANT]
stylesname = ["normal", "italic", "slant"]
#----------------------------------------------------------------------
# BUFFERENDWINDOW Class
# This Class Has Been Taken From The wxPython Wiki, And Slightly

View File

@@ -69,12 +69,33 @@ if sys.platform == "win32":
else:
_greekEncoding = str(wx.FONTENCODING_ISO8859_7)
_families = {"fixed" : wx.FONTFAMILY_TELETYPE, "default" : wx.FONTFAMILY_DEFAULT,
"decorative" : wx.FONTFAMILY_DECORATIVE, "roman" : wx.FONTFAMILY_ROMAN,
"script" : wx.FONTFAMILY_SCRIPT, "swiss" : wx.FONTFAMILY_SWISS,
"modern" : wx.FONTFAMILY_MODERN}
_styles = {"normal" : wx.FONTSTYLE_NORMAL, "slant" : wx.FONTSTYLE_SLANT, "italic" : wx.FONTSTYLE_ITALIC}
_weights = {"normal" : wx.FONTWEIGHT_NORMAL, "light" : wx.FONTWEIGHT_LIGHT, "bold" : wx.FONTWEIGHT_BOLD}
_families = { "fixed" : wx.FONTFAMILY_TELETYPE,
"default" : wx.FONTFAMILY_DEFAULT,
"decorative" : wx.FONTFAMILY_DECORATIVE,
"roman" : wx.FONTFAMILY_ROMAN,
"script" : wx.FONTFAMILY_SCRIPT,
"swiss" : wx.FONTFAMILY_SWISS,
"modern" : wx.FONTFAMILY_MODERN,
"teletype" : wx.FONTFAMILY_TELETYPE,
"unknown" : wx.FONTFAMILY_UNKNOWN }
_styles = { "normal" : wx.FONTSTYLE_NORMAL,
"slant" : wx.FONTSTYLE_SLANT,
"italic" : wx.FONTSTYLE_ITALIC }
_weights = {"normal" : wx.FONTWEIGHT_NORMAL,
"light" : wx.FONTWEIGHT_LIGHT,
"bold" : wx.FONTWEIGHT_BOLD,
"invalid" : wx.FONTWEIGHT_INVALID,
"thin" : wx.FONTWEIGHT_THIN,
"extra-light" : wx.FONTWEIGHT_EXTRALIGHT,
"medium" : wx.FONTWEIGHT_MEDIUM,
"semi-bold" : wx.FONTWEIGHT_SEMIBOLD,
"extra-bold" : wx.FONTWEIGHT_EXTRABOLD,
"heavy" : wx.FONTWEIGHT_HEAVY,
"extra-heavy" : wx.FONTWEIGHT_EXTRAHEAVY,
}
# The next three classes: Renderer, SizeRenderer and DCRenderer are
# what you will need to override to extend the XML language. All of