From 8b0b20568dea7f84643ca09236c73e9c2f7fca17 Mon Sep 17 00:00:00 2001 From: Joe R Date: Sat, 13 May 2023 19:39:33 -0400 Subject: [PATCH] Copied extended solid color choice list to Kivy. --- pysollib/kivy/menubar.py | 62 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/pysollib/kivy/menubar.py b/pysollib/kivy/menubar.py index 30c3b375..a1498807 100644 --- a/pysollib/kivy/menubar.py +++ b/pysollib/kivy/menubar.py @@ -855,14 +855,49 @@ class OptionsMenuDialog(LMenuDialog): key = 'table' self.addRadioNode( tv, rg1, - _('Blue'), + _('Azure'), self.menubar.tkopt.color_vars[key], '#0082df', self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Black'), + self.menubar.tkopt.color_vars[key], '#000000', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Blue'), + self.menubar.tkopt.color_vars[key], '#0000ff', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Bright Green'), + self.menubar.tkopt.color_vars[key], '#00ff00', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Brown'), + self.menubar.tkopt.color_vars[key], '#684700', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Cyan'), + self.menubar.tkopt.color_vars[key], '#00ffff', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Grey'), + self.menubar.tkopt.color_vars[key], '#888888', + self.menubar.mOptTableColor) self.addRadioNode( tv, rg1, _('Green'), self.menubar.tkopt.color_vars[key], '#008200', self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Magenta'), + self.menubar.tkopt.color_vars[key], '#ff00ff', + self.menubar.mOptTableColor) self.addRadioNode( tv, rg1, _('Navy'), @@ -878,11 +913,36 @@ class OptionsMenuDialog(LMenuDialog): _('Orange'), self.menubar.tkopt.color_vars[key], '#f79600', self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Pink'), + self.menubar.tkopt.color_vars[key], '#ff92fc', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Purple'), + self.menubar.tkopt.color_vars[key], '#8300ff', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Red'), + self.menubar.tkopt.color_vars[key], '#ff0000', + self.menubar.mOptTableColor) self.addRadioNode( tv, rg1, _('Teal'), self.menubar.tkopt.color_vars[key], '#008286', self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('White'), + self.menubar.tkopt.color_vars[key], '#ffffff', + self.menubar.mOptTableColor) + self.addRadioNode( + tv, rg1, + _('Yellow'), + self.menubar.tkopt.color_vars[key], '#ffff00', + self.menubar.mOptTableColor) rg1 = tv.add_node( LTreeNode(text=_('Tiles')), rg)