py3 fixes in text UI
This commit is contained in:
parent
031b911dce
commit
555fe4373e
35
gui/text.py
35
gui/text.py
|
@ -44,7 +44,7 @@ class ElectrumGui:
|
||||||
curses.use_default_colors()
|
curses.use_default_colors()
|
||||||
curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLUE)
|
curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLUE)
|
||||||
curses.init_pair(2, curses.COLOR_WHITE, curses.COLOR_CYAN)
|
curses.init_pair(2, curses.COLOR_WHITE, curses.COLOR_CYAN)
|
||||||
curses.init_pair(3, curses.COLOR_BLACK, curses.COLOR_WHITE);
|
curses.init_pair(3, curses.COLOR_BLACK, curses.COLOR_WHITE)
|
||||||
self.stdscr.keypad(1)
|
self.stdscr.keypad(1)
|
||||||
self.stdscr.border(0)
|
self.stdscr.border(0)
|
||||||
self.maxy, self.maxx = self.stdscr.getmaxyx()
|
self.maxy, self.maxx = self.stdscr.getmaxyx()
|
||||||
|
@ -202,14 +202,15 @@ class ElectrumGui:
|
||||||
l = l.encode("utf-8")
|
l = l.encode("utf-8")
|
||||||
self.stdscr.addstr(i+5, 5, l, curses.color_pair(3))
|
self.stdscr.addstr(i+5, 5, l, curses.color_pair(3))
|
||||||
|
|
||||||
def print_list(self, list, firstline = None):
|
def print_list(self, lst, firstline = None):
|
||||||
self.maxpos = len(list)
|
lst = list(lst)
|
||||||
|
self.maxpos = len(lst)
|
||||||
if not self.maxpos: return
|
if not self.maxpos: return
|
||||||
if firstline:
|
if firstline:
|
||||||
firstline += " "*(self.maxx -2 - len(firstline))
|
firstline += " "*(self.maxx -2 - len(firstline))
|
||||||
self.stdscr.addstr( 1, 1, firstline )
|
self.stdscr.addstr( 1, 1, firstline )
|
||||||
for i in range(self.maxy-4):
|
for i in range(self.maxy-4):
|
||||||
msg = list[i] if i < len(list) else ""
|
msg = lst[i] if i < len(lst) else ""
|
||||||
msg += " "*(self.maxx - 2 - len(msg))
|
msg += " "*(self.maxx - 2 - len(msg))
|
||||||
m = msg[0:self.maxx - 2]
|
m = msg[0:self.maxx - 2]
|
||||||
m = m.encode(self.encoding)
|
m = m.encode(self.encoding)
|
||||||
|
@ -224,14 +225,15 @@ class ElectrumGui:
|
||||||
def main_command(self):
|
def main_command(self):
|
||||||
c = self.stdscr.getch()
|
c = self.stdscr.getch()
|
||||||
print(c)
|
print(c)
|
||||||
|
cc = curses.unctrl(c).decode()
|
||||||
if c == curses.KEY_RIGHT: self.tab = (self.tab + 1)%self.num_tabs
|
if c == curses.KEY_RIGHT: self.tab = (self.tab + 1)%self.num_tabs
|
||||||
elif c == curses.KEY_LEFT: self.tab = (self.tab - 1)%self.num_tabs
|
elif c == curses.KEY_LEFT: self.tab = (self.tab - 1)%self.num_tabs
|
||||||
elif c == curses.KEY_DOWN: self.pos +=1
|
elif c == curses.KEY_DOWN: self.pos +=1
|
||||||
elif c == curses.KEY_UP: self.pos -= 1
|
elif c == curses.KEY_UP: self.pos -= 1
|
||||||
elif c == 9: self.pos +=1 # tab
|
elif c == 9: self.pos +=1 # tab
|
||||||
elif curses.unctrl(c) in ['^W', '^C', '^X', '^Q']: self.tab = -1
|
elif cc in ['^W', '^C', '^X', '^Q']: self.tab = -1
|
||||||
elif curses.unctrl(c) in ['^N']: self.network_dialog()
|
elif cc in ['^N']: self.network_dialog()
|
||||||
elif curses.unctrl(c) == '^S': self.settings_dialog()
|
elif cc == '^S': self.settings_dialog()
|
||||||
else: return c
|
else: return c
|
||||||
if self.pos<0: self.pos=0
|
if self.pos<0: self.pos=0
|
||||||
if self.pos>=self.maxpos: self.pos=self.maxpos - 1
|
if self.pos>=self.maxpos: self.pos=self.maxpos - 1
|
||||||
|
@ -252,10 +254,11 @@ class ElectrumGui:
|
||||||
|
|
||||||
def edit_str(self, target, c, is_num=False):
|
def edit_str(self, target, c, is_num=False):
|
||||||
# detect backspace
|
# detect backspace
|
||||||
|
cc = curses.unctrl(c).decode()
|
||||||
if c in [8, 127, 263] and target:
|
if c in [8, 127, 263] and target:
|
||||||
target = target[:-1]
|
target = target[:-1]
|
||||||
elif not is_num or curses.unctrl(c) in '0123456789.':
|
elif not is_num or cc in '0123456789.':
|
||||||
target += curses.unctrl(c)
|
target += cc
|
||||||
return target
|
return target
|
||||||
|
|
||||||
|
|
||||||
|
@ -280,8 +283,8 @@ class ElectrumGui:
|
||||||
|
|
||||||
def run_contacts_tab(self, c):
|
def run_contacts_tab(self, c):
|
||||||
if c == 10 and self.contacts:
|
if c == 10 and self.contacts:
|
||||||
out = self.run_popup('Adress', ["Copy", "Pay to", "Edit label", "Delete"]).get('button')
|
out = self.run_popup('Address', ["Copy", "Pay to", "Edit label", "Delete"]).get('button')
|
||||||
key = self.contacts.keys()[self.pos%len(self.contacts.keys())]
|
key = list(self.contacts.keys())[self.pos%len(self.contacts.keys())]
|
||||||
if out == "Pay to":
|
if out == "Pay to":
|
||||||
self.tab = 1
|
self.tab = 1
|
||||||
self.str_recipient = key
|
self.str_recipient = key
|
||||||
|
@ -289,7 +292,7 @@ class ElectrumGui:
|
||||||
elif out == "Edit label":
|
elif out == "Edit label":
|
||||||
s = self.get_string(6 + self.pos, 18)
|
s = self.get_string(6 + self.pos, 18)
|
||||||
if s:
|
if s:
|
||||||
self.wallet.labels[address] = s
|
self.wallet.labels[key] = s
|
||||||
|
|
||||||
def run_banner_tab(self, c):
|
def run_banner_tab(self, c):
|
||||||
self.show_message(repr(c))
|
self.show_message(repr(c))
|
||||||
|
@ -370,7 +373,7 @@ class ElectrumGui:
|
||||||
if getchar: c = self.stdscr.getch()
|
if getchar: c = self.stdscr.getch()
|
||||||
|
|
||||||
def run_popup(self, title, items):
|
def run_popup(self, title, items):
|
||||||
return self.run_dialog(title, map(lambda x: {'type':'button','label':x}, items), interval=1, y_pos = self.pos+3)
|
return self.run_dialog(title, list(map(lambda x: {'type':'button','label':x}, items)), interval=1, y_pos = self.pos+3)
|
||||||
|
|
||||||
def network_dialog(self):
|
def network_dialog(self):
|
||||||
if not self.network:
|
if not self.network:
|
||||||
|
@ -416,7 +419,7 @@ class ElectrumGui:
|
||||||
def run_dialog(self, title, items, interval=2, buttons=None, y_pos=3):
|
def run_dialog(self, title, items, interval=2, buttons=None, y_pos=3):
|
||||||
self.popup_pos = 0
|
self.popup_pos = 0
|
||||||
|
|
||||||
self.w = curses.newwin( 5 + len(items)*interval + (2 if buttons else 0), 50, y_pos, 5)
|
self.w = curses.newwin( 5 + len(list(items))*interval + (2 if buttons else 0), 50, y_pos, 5)
|
||||||
w = self.w
|
w = self.w
|
||||||
out = {}
|
out = {}
|
||||||
while True:
|
while True:
|
||||||
|
@ -424,7 +427,7 @@ class ElectrumGui:
|
||||||
w.border(0)
|
w.border(0)
|
||||||
w.addstr( 0, 2, title)
|
w.addstr( 0, 2, title)
|
||||||
|
|
||||||
num = len(items)
|
num = len(list(items))
|
||||||
|
|
||||||
numpos = num
|
numpos = num
|
||||||
if buttons: numpos += 2
|
if buttons: numpos += 2
|
||||||
|
@ -447,7 +450,7 @@ class ElectrumGui:
|
||||||
if len(value)<20:
|
if len(value)<20:
|
||||||
value += ' '*(20-len(value))
|
value += ' '*(20-len(value))
|
||||||
|
|
||||||
if item.has_key('value'):
|
if 'value' in item:
|
||||||
w.addstr( 2+interval*i, 2, label)
|
w.addstr( 2+interval*i, 2, label)
|
||||||
w.addstr( 2+interval*i, 15, value, curses.A_REVERSE if self.popup_pos%numpos==i else curses.color_pair(1) )
|
w.addstr( 2+interval*i, 15, value, curses.A_REVERSE if self.popup_pos%numpos==i else curses.color_pair(1) )
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue