Mirrors/tg
2
0
Fork 0
mirror of https://github.com/paul-nameless/tg synced 2024-11-22 03:43:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename key to keys

Browse source
This commit is contained in:
Alexander Zveruk 2020-05-03 19:36:45 +03:00
parent e88793bff6
commit 48d9cfdee5
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
tg/controllers/__init__.py
View file

@ -35,49 +35,49 @@ class Controller:
while True:
repeat_factor, key = self.view.get_key(self.view.chats.h, self.view.chats.w)
log.info('Pressed key: %s', key)
if key == 'q':
repeat_factor, keys = self.view.get_keys(self.view.chats.h, self.view.chats.w)
log.info('Pressed keys: %s', keys)
if keys == 'q':
return 'QUIT'
elif key == ']':
elif keys == ']':
if self.model.next_chat():
self.refresh_chats()
elif key == '[':
elif keys == '[':
if self.model.prev_chat():
self.refresh_chats()
elif key == 'J':
elif keys == 'J':
if self.model.jump_next_msg():
self.refresh_msgs()
elif key == 'K':
elif keys == 'K':
if self.model.jump_prev_msg():
self.refresh_msgs()
elif key in ('j', '^B'):
elif keys in ('j', '^B'):
if self.model.next_msg(repeat_factor):
self.refresh_msgs()
elif key in ('k', '^C'):
elif keys in ('k', '^C'):
if self.model.prev_msg(repeat_factor):
self.refresh_msgs()
elif key == 'G':
elif keys == 'G':
if self.model.jump_bottom():
self.refresh_msgs()
elif key == '/':
elif keys == '/':
# search
pass
elif key == 'gg':
elif keys == 'gg':
# move to the top
pass
elif key == 'e':
elif keys == 'e':
# edit msg
pass
elif key == 'r':
elif keys == 'r':
# reply to this msg
# print to status line
pass
elif key == 'I':
elif keys == 'I':
# open vim or emacs to write long messages
pass
elif key == 'i':
elif keys == 'i':
# write new message
msg = self.view.get_input()
if msg:
@ -88,7 +88,7 @@ class Controller:
)
self.view.draw_status(f'Sent: {msg}')
elif key in ('h', '^D'):
elif keys in ('h', '^D'):
return 'BACK'
def handle_chats(self):
@ -99,11 +99,11 @@ class Controller:
self.refresh_chats()
while True:
repeat_factor, key = self.view.get_key(self.view.chats.h, self.view.chats.w)
log.info('Pressed key: %s', key)
if key == 'q':
repeat_factor, keys = self.view.get_keys(self.view.chats.h, self.view.chats.w)
log.info('Pressed keys: %s', keys)
if keys == 'q':
return
elif key in ('l', '^E'):
elif keys in ('l', '^E'):
rc = self.handle_msgs()
if rc == 'QUIT':
return
@ -111,17 +111,17 @@ class Controller:
self.view.msgs.resize(0.5)
self.refresh_chats()
elif key in ('j', '^B'):
elif keys in ('j', '^B'):
is_changed = self.model.next_chat(repeat_factor)
if is_changed:
self.refresh_chats()
elif key in ('k', '^C'):
elif keys in ('k', '^C'):
is_changed = self.model.prev_chat(repeat_factor)
if is_changed:
self.refresh_chats()
elif key == 'gg':
elif keys == 'gg':
is_changed = self.model.first_chat()
if is_changed:
self.refresh_chats()

2
tg/views/__init__.py
View file

@ -53,7 +53,7 @@ class View:
def draw_msgs(self, current, msgs):
self.msgs.draw(current, msgs)
def get_key(self, y, x):
def get_keys(self, y, x):
keys = repeat_factor = ''
for _ in range(MAX_KEYBINDING_LENGTH):