sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #16 from dnarvaez/xocolor

Browse Source 
Improve XOColor fallback logic
This commit is contained in:
walterbender 2013-05-02 11:59:14 -07:00
commit 17cd3e33bc
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sugar3/graphics/xocolor.py
View File

@ -225,29 +225,23 @@ def _parse_string(color_string):
return None return None
def is_valid(color_string):
return (_parse_string(color_string) != None)
class XoColor: class XoColor:
def __init__(self, color_string=None): def __init__(self, color_string=None):
if color_string == None: parsed_color = None
randomize = True
elif not is_valid(color_string): if color_string is None:
logging.debug('Color string is not valid: %s, '
'fallback to default', color_string)
client = GConf.Client.get_default() client = GConf.Client.get_default()
color_string = client.get_string('/desktop/sugar/user/color') color_string = client.get_string('/desktop/sugar/user/color')
randomize = is_valid(color_string)
else:
randomize = False
if randomize: if color_string is not None:
parsed_color = _parse_string(color_string)
if parsed_color is None:
n = int(random.random() * (len(colors) - 1)) n = int(random.random() * (len(colors) - 1))
[self.stroke, self.fill] = colors[n] [self.stroke, self.fill] = colors[n]
else: else:
[self.stroke, self.fill] = _parse_string(color_string) [self.stroke, self.fill] = parsed_color
def __cmp__(self, other): def __cmp__(self, other):
if isinstance(other, XoColor): if isinstance(other, XoColor):