pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a “name” column to /bookmarks.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-03-12 08:33:31 +01:00
parent 507c45982d
commit ae172f84dd
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
poezio/tabs/bookmarkstab.py
View file

@ -25,7 +25,7 @@ class BookmarksTab(Tab):
self.new_bookmarks = [] self.new_bookmarks = []
self.removed_bookmarks = [] self.removed_bookmarks = []
self.header_win = windows.ColumnHeaderWin( self.header_win = windows.ColumnHeaderWin(
('room@server/nickname', 'password', 'autojoin', 'storage')) ('name', 'room@server/nickname', 'password', 'autojoin', 'storage'))
self.bookmarks_win = windows.BookmarksWin( self.bookmarks_win = windows.BookmarksWin(
self.bookmarks, self.height - 4, self.width, 1, 0) self.bookmarks, self.height - 4, self.width, 1, 0)
self.help_win = windows.HelpText('Ctrl+Y: save, Ctrl+G: cancel, ' self.help_win = windows.HelpText('Ctrl+Y: save, Ctrl+G: cancel, '
@ -107,10 +107,12 @@ class BookmarksTab(Tab):
def resize(self): def resize(self):
self.need_resize = False self.need_resize = False
self.header_win.resize_columns({ self.header_win.resize_columns({
'name':
self.width // 4,
'room@server/nickname': 'room@server/nickname':
self.width // 3, self.width // 4,
'password': 'password':
self.width // 3, self.width // 6,
'autojoin': 'autojoin':
self.width // 6, self.width // 6,
'storage': 'storage':

33
poezio/windows/bookmark_forms.py
View file

@ -11,6 +11,21 @@ from poezio.theming import to_curses_attr, get_theme
from poezio.common import safeJID from poezio.common import safeJID
class BookmarkNameInput(FieldInput, Input):
def __init__(self, field):
FieldInput.__init__(self, field)
Input.__init__(self)
self.text = field.name
self.pos = len(self.text)
self.color = get_theme().COLOR_NORMAL_TEXT
def save(self):
self._field.name = self.get_text()
def get_help_message(self):
return 'Edit the text'
class BookmarkJIDInput(FieldInput, Input): class BookmarkJIDInput(FieldInput, Input):
def __init__(self, field): def __init__(self, field):
FieldInput.__init__(self, field) FieldInput.__init__(self, field)
@ -24,7 +39,6 @@ class BookmarkJIDInput(FieldInput, Input):
def save(self): def save(self):
jid = safeJID(self.get_text()) jid = safeJID(self.get_text())
self._field.jid = jid.bare self._field.jid = jid.bare
self._field.name = jid.bare
self._field.nick = jid.resource self._field.nick = jid.resource
def get_help_message(self): def get_help_message(self):
@ -143,7 +157,8 @@ class BookmarksWin(Win):
self._bookmarks = list(bookmarks) self._bookmarks = list(bookmarks)
self.lines = [] self.lines = []
for bookmark in sorted(self._bookmarks, key=lambda x: x.jid): for bookmark in sorted(self._bookmarks, key=lambda x: x.jid):
self.lines.append((BookmarkJIDInput(bookmark), self.lines.append((BookmarkNameInput(bookmark),
BookmarkJIDInput(bookmark),
BookmarkPasswordInput(bookmark), BookmarkPasswordInput(bookmark),
BookmarkAutojoinWin(bookmark), BookmarkAutojoinWin(bookmark),
BookmarkMethodInput(bookmark))) BookmarkMethodInput(bookmark)))
@ -164,7 +179,8 @@ class BookmarksWin(Win):
self._current_input = 0 self._current_input = 0
def add_bookmark(self, bookmark): def add_bookmark(self, bookmark):
self.lines.append((BookmarkJIDInput(bookmark), self.lines.append((BookmarkNameInput(bookmark),
BookmarkJIDInput(bookmark),
BookmarkPasswordInput(bookmark), BookmarkPasswordInput(bookmark),
BookmarkAutojoinWin(bookmark), BookmarkAutojoinWin(bookmark),
BookmarkMethodInput(bookmark))) BookmarkMethodInput(bookmark)))
@ -318,12 +334,11 @@ class BookmarksWin(Win):
self._win.erase() self._win.erase()
y = -self.scroll_pos y = -self.scroll_pos
for i in range(len(self.lines)): for i in range(len(self.lines)):
self.lines[i][0].resize(1, self.width // 3, y + 1, 0) self.lines[i][0].resize(1, self.width // 4, y + 1, 0)
self.lines[i][1].resize(1, self.width // 3, y + 1, self.width // 3) self.lines[i][1].resize(1, self.width // 4, y + 1, self.width // 4)
self.lines[i][2].resize(1, self.width // 6, y + 1, self.lines[i][2].resize(1, self.width // 6, y + 1, 3 * self.width // 6)
2 * self.width // 3) self.lines[i][3].resize(1, self.width // 6, y + 1, 4 * self.width // 6)
self.lines[i][3].resize(1, self.width // 6, y + 1, self.lines[i][4].resize(1, self.width // 6, y + 1, 5 * self.width // 6)
5 * self.width // 6)
y += 1 y += 1
self._refresh() self._refresh()
for i, inp in enumerate(self.lines): for i, inp in enumerate(self.lines):