Browse Source

Make board view easier to read

And gracefully refresh it.

Change-Id: Ide12ca8f6fe98dceac63ca6522e961743e77b402
changes/55/438655/2
James E. Blair 4 years ago
parent
commit
e3e6290eac
2 changed files with 109 additions and 18 deletions
  1. +36
    -0
      boartty/mywid.py
  2. +73
    -18
      boartty/view/board.py

+ 36
- 0
boartty/mywid.py View File

@ -629,3 +629,39 @@ class SearchSelectButton(TextButton):
return
self.update(dialog.key, dialog.value)
self._emit('changed')
class ListUpdateManager(object):
""" Manage dynamic updates to a list. """
def __init__(self, widget):
self.widget = widget
def _updateSlot(self, i, item):
# Ensure that the row at i is the given item. If the row
# already exists somewhere in the list, delete all rows
# between i and the row and then update the row. If the row
# does not exist, insert the row at position i.
slot = None
while True:
if i >= len(self.widget.contents):
break
slot = self.widget.contents[i]
if (slot == item):
break
self.widget.contents.remove(slot)
slot = None
if not slot:
self.widget.contents.insert(i, item)
if not self.widget.selectable() and item[0].selectable():
self.widget.set_focus(i)
else:
slot[0].update(item[0])
return i+1
def update(self, items):
i = 0
for item in items:
i = self._updateSlot(i, item)
while i < len(self.widget.contents):
slot = self.widget.contents[i]
self.widgets.contents.remove(slot)

+ 73
- 18
boartty/view/board.py View File

@ -33,6 +33,57 @@ from boartty.view import mouse_scroll_decorator
# |+------+------+|
# +---------------+
class LanePile(urwid.Pile):
def __init__(self, lane):
self.key = lane.key
self.manager = mywid.ListUpdateManager(self)
#self, LaneRow,
#lambda x: (LaneRow(x), (urwid.widget.WEIGHT, 1)))
super(LanePile, self).__init__([])
def update(self, lane):
pass #self.title.set_text(lane.worklist.title)
def __eq__(self, other):
if isinstance(other, LanePile):
return self.key == other.key
return False
class TitleRow(urwid.Text):
def __init__(self, title):
super(TitleRow, self).__init__(title)
self.title = title
def update(self, other):
self.title = other.title
self.set_text(self.title)
def __eq__(self, other):
if isinstance(other, TitleRow):
return self.title == other.title
return False
class LaneRow(mywid.TextButton):
def __init__(self, item, board_view):
super(LaneRow, self).__init__(item.title, on_press=self.open)
self.key = item.key
self.board_view = board_view
self.title = item.title
self.story_key = item.dereferenced_story_key
def update(self, other):
self.title = other.title
self.story_key = other.story_key
self.text.set_text(self.title)
def __eq__(self, other):
if isinstance(other, LaneRow):
return self.key == other.key
return False
def open(self, *args):
self.board_view.openItem(self.story_key)
class BoardView(urwid.WidgetWrap, mywid.Searchable):
def getCommands(self):
return [
@ -85,7 +136,14 @@ class BoardView(urwid.WidgetWrap, mywid.Searchable):
self.listbox.body.append(board_info)
self.listbox.body.append(urwid.Divider())
self.listbox_board_start = len(self.listbox.body)
lane_columns = urwid.Columns([], dividechars=1)
self.listbox.body.append(lane_columns)
self.lane_manager = mywid.ListUpdateManager(lane_columns)
self.refresh()
self.listbox.set_focus(1)
def refresh(self):
with self.app.db.getSession() as session:
@ -95,25 +153,22 @@ class BoardView(urwid.WidgetWrap, mywid.Searchable):
self.app.status.update(title=self.title)
self.title_label.set_text(('story-data', board.title))
self.description_label.set_text(('story-data', board.description))
columns = []
for lane in board.lanes:
items = []
self.log.debug("Display lane %s", lane)
items.append(urwid.Text(lane.worklist.title))
self.worklist_keys.add(lane.worklist.key)
lanes = [
(LanePile(x), (urwid.widget.WEIGHT, 1, False))
for x in board.lanes
]
self.lane_manager.update(lanes)
for i, lane in enumerate(board.lanes):
lane_pile = self.lane_manager.widget.contents[i][0]
items = [
(TitleRow(lane.worklist.title), (urwid.widget.WEIGHT, 1))
]
for item in lane.worklist.items:
self.log.debug("Display item %s", item)
items.append(mywid.TextButton(item.title,
on_press=self.openItem,
user_data=item.dereferenced_story_key))
pile = urwid.Pile(items)
columns.append(pile)
columns = urwid.Columns(columns)
for x in self.listbox.body[self.listbox_board_start:]:
self.listbox.body.remove(x)
self.listbox.body.append(columns)
def openItem(self, widget, story_key):
items.append((TitleRow(u''), (urwid.widget.WEIGHT, 1)))
items.append((LaneRow(item, self), (urwid.widget.WEIGHT, 1)))
lane_pile.manager.update(items)
def openItem(self, story_key):
self.log.debug("Open story %s", story_key)
self.app.openStory(story_key)


Loading…
Cancel
Save