Avoid handling account as numeric field in settings
parent
4cedfedc21
commit
980815d075
|
@ -172,6 +172,8 @@ class SettingsPane:
|
||||||
|
|
||||||
'''
|
'''
|
||||||
mode = self.order_mode
|
mode = self.order_mode
|
||||||
|
tracker = mode.current_pp
|
||||||
|
alloc = tracker.alloc
|
||||||
|
|
||||||
# an account switch request
|
# an account switch request
|
||||||
if key == 'account':
|
if key == 'account':
|
||||||
|
@ -207,25 +209,19 @@ class SettingsPane:
|
||||||
# load the new account's allocator
|
# load the new account's allocator
|
||||||
alloc = tracker.alloc
|
alloc = tracker.alloc
|
||||||
|
|
||||||
else:
|
|
||||||
tracker = mode.current_pp
|
|
||||||
alloc = tracker.alloc
|
|
||||||
|
|
||||||
size_unit = alloc.size_unit
|
|
||||||
|
|
||||||
# WRITE any settings to current pp's allocator
|
# WRITE any settings to current pp's allocator
|
||||||
try:
|
|
||||||
if key == 'size_unit':
|
if key == 'size_unit':
|
||||||
# implicit re-write of value if input
|
# implicit re-write of value if input
|
||||||
# is the "text name" of the units.
|
# is the "text name" of the units.
|
||||||
# yah yah, i know this is badd..
|
# yah yah, i know this is badd..
|
||||||
alloc.size_unit = value
|
alloc.size_unit = value
|
||||||
else:
|
|
||||||
|
elif key != 'account': # numeric fields entry
|
||||||
value = puterize(value)
|
value = puterize(value)
|
||||||
if key == 'limit':
|
if key == 'limit':
|
||||||
pp = mode.current_pp.live_pp
|
pp = mode.current_pp.live_pp
|
||||||
|
|
||||||
if size_unit == 'currency':
|
if alloc.size_unit == 'currency':
|
||||||
dsize = pp.dsize
|
dsize = pp.dsize
|
||||||
if dsize > value:
|
if dsize > value:
|
||||||
log.error(
|
log.error(
|
||||||
|
@ -254,13 +250,12 @@ class SettingsPane:
|
||||||
log.error(f'Unknown setting {key}')
|
log.error(f'Unknown setting {key}')
|
||||||
raise ValueError
|
raise ValueError
|
||||||
|
|
||||||
|
# don't log account "change" case since it'll be submitted
|
||||||
|
# on every mouse interaction.
|
||||||
log.info(f'settings change: {key}: {value}')
|
log.info(f'settings change: {key}: {value}')
|
||||||
|
|
||||||
except ValueError:
|
|
||||||
log.error(f'Invalid value for `{key}`: {value}')
|
|
||||||
|
|
||||||
# READ out settings and update the status UI / settings widgets
|
# READ out settings and update the status UI / settings widgets
|
||||||
suffix = {'currency': ' $', 'units': ' u'}[size_unit]
|
suffix = {'currency': ' $', 'units': ' u'}[alloc.size_unit]
|
||||||
limit = alloc.limit()
|
limit = alloc.limit()
|
||||||
|
|
||||||
# TODO: a reverse look up from the position to the equivalent
|
# TODO: a reverse look up from the position to the equivalent
|
||||||
|
@ -269,7 +264,7 @@ class SettingsPane:
|
||||||
|
|
||||||
step_size, currency_per_slot = alloc.step_sizes()
|
step_size, currency_per_slot = alloc.step_sizes()
|
||||||
|
|
||||||
if size_unit == 'currency':
|
if alloc.size_unit == 'currency':
|
||||||
step_size = currency_per_slot
|
step_size = currency_per_slot
|
||||||
|
|
||||||
self.step_label.format(
|
self.step_label.format(
|
||||||
|
|
Loading…
Reference in New Issue