feat(theme): implement UTF-8 checkbox and radiobox

Author: slook

libs/pyTermTk/TermTk/TTkTheme/draw_ascii.py

@@ -82,8 +82,8 @@ class TTkTheme():
        'X',' ','X',
        'X','X','X'))
 
-    combobox = {'( )','(x)'}
-    checkbox = {'[ ]','[x]','[/]'}
+    radiobox = (' ','X')
+    checkbox = (' ','X','/')
 
     hscroll = ('<','-','X','>')
     vscroll = ('^','|','X','v')

libs/pyTermTk/TermTk/TTkTheme/draw_utf8.py

@@ -138,8 +138,8 @@ class TTkTheme():
         └─┘    ╘═╛    ╚═╝    └─┘
     '''
 
-    combobox = {'◯','◉'}
-    checkbox = {'□','▣','◪'}
+    radiobox = ('◯','◉')
+    checkbox = ('□','▣','◪')
 
     hscroll = ('◀','┄','▓','▶')
     vscroll = ('▲','┊','▓','▼')

libs/pyTermTk/TermTk/TTkTheme/theme.py

@@ -50,6 +50,8 @@ class TTkTheme():
     menuBar   = draw_utf8.TTkTheme.menuBar
     tab       = draw_utf8.TTkTheme.tab
     braille   = draw_utf8.TTkTheme.braille
+    radiobox  = draw_utf8.TTkTheme.radiobox
+    checkbox  = draw_utf8.TTkTheme.checkbox
     unicodeWideOverflowCh = draw_utf8.TTkTheme.unicodeWideOverflowCh
     progressbarBlocks = draw_utf8.TTkTheme.progressbarBlocks
 
@@ -85,6 +87,8 @@ def loadTheme(theme):
         TTkTheme.menuBar   = theme['draw'].TTkTheme.menuBar
         TTkTheme.tab       = theme['draw'].TTkTheme.tab
         TTkTheme.braille   = theme['draw'].TTkTheme.braille
+        TTkTheme.radiobox  = theme['draw'].TTkTheme.radiobox
+        TTkTheme.checkbox  = theme['draw'].TTkTheme.checkbox
         TTkTheme.unicodeWideOverflowCh = theme['draw'].TTkTheme.unicodeWideOverflowCh
         TTkTheme.progressbarBlocks = theme['draw'].TTkTheme.progressbarBlocks
 

libs/pyTermTk/TermTk/TTkWidgets/checkbox.py

@@ -210,9 +210,10 @@ def paintEvent(self, canvas: TTkCanvas) -> None:
         canvas.drawText(pos=(0,0), color=borderColor ,text="[ ]")
         canvas.drawText(pos=(3,0), color=textColor ,text=self._text)
         text = {
-            TTkK.Checked :   "X",
-            TTkK.Unchecked : " ",
-            TTkK.PartiallyChecked: "/"}.get(self._checkStatus, " ")
+            TTkK.Unchecked :       TTkCfg.theme.checkbox[0],  # ' ' or '□'
+            TTkK.Checked :         TTkCfg.theme.checkbox[1],  # 'X' or '▣'
+            TTkK.PartiallyChecked: TTkCfg.theme.checkbox[2]   # '/' or '◪'
+        }.get(self._checkStatus, " ")
         canvas.drawText(pos=(1,0), color=xColor ,text=text)
 
     def _pressEvent(self) -> bool:

libs/pyTermTk/TermTk/TTkWidgets/radiobutton.py

@@ -183,9 +183,9 @@ def paintEvent(self, canvas):
         canvas.drawText(pos=(0,0), color=borderColor ,text="( )")
         canvas.drawText(pos=(3,0), color=textColor ,text=self._text)
         if self._checked:
-            canvas.drawText(pos=(1,0), color=xColor ,text="X")
+            canvas.drawText(pos=(1,0), color=xColor ,text=TTkCfg.theme.radiobox[1])  # 'X' or '◉'
         else:
-            canvas.drawText(pos=(1,0), color=xColor ,text=" ")
+            canvas.drawText(pos=(1,0), color=xColor ,text=TTkCfg.theme.radiobox[0])  # ' ' or '◯'
 
     def _checkEvent(self):
         # Uncheck the radio already checked;