From: Christian Heller Date: Thu, 7 Aug 2025 03:01:13 +0000 (+0200) Subject: Rename _LogWidget to _HistoryWidget, its .log to .history, for less confusion with... X-Git-Url: https://plomlompom.com/repos/booking/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/todos?a=commitdiff_plain;ds=inline;p=ircplom Rename _LogWidget to _HistoryWidget, its .log to .history, for less confusion with Logger etc. --- diff --git a/ircplom/client_tui.py b/ircplom/client_tui.py index cccf707..d3182d9 100644 --- a/ircplom/client_tui.py +++ b/ircplom/client_tui.py @@ -117,9 +117,9 @@ class _ClientWindowsManager: 'Log msg to stram.' if stream == STREAM_GLOB: for win in self.windows: - win.log.append(msg) + win.history.append(msg) else: - self.window(stream).log.append(msg) + self.window(stream).history.append(msg) def update(self, **kwargs) -> bool: 'Apply settings in kwargs, follow represntation update triggres.' diff --git a/ircplom/tui_base.py b/ircplom/tui_base.py index 3218827..72a2247 100644 --- a/ircplom/tui_base.py +++ b/ircplom/tui_base.py @@ -31,8 +31,8 @@ _KEYBINDINGS = { 'KEY_RIGHT': ('window.prompt.move_cursor', 'right'), 'KEY_UP': ('window.prompt.scroll', 'up'), 'KEY_DOWN': ('window.prompt.scroll', 'down'), - 'KEY_PGUP': ('window.log.scroll', 'up'), - 'KEY_PGDOWN': ('window.log.scroll', 'down'), + 'KEY_PGUP': ('window.history.scroll', 'up'), + 'KEY_PGDOWN': ('window.history.scroll', 'down'), 'esc:91:49:59:51:68': ('window', 'left'), 'esc:91:49:59:51:67': ('window', 'right'), 'KEY_F1': ('window.paste',), @@ -90,7 +90,7 @@ class _ScrollableWidget(_Widget, ABC): self._scroll(up=direction == 'up') -class _LogWidget(_ScrollableWidget): +class _HistoryWidget(_ScrollableWidget): _view_size: _YX _y_pgscroll: int @@ -285,7 +285,7 @@ class PromptWidget(_ScrollableWidget): class Window(_Widget): - 'Widget filling entire screen with sub-widgets like .prompt, .log.' + 'Widget filling entire screen with sub-widgets like .prompt, .history.' _y_status: int prompt: PromptWidget @@ -293,7 +293,8 @@ class Window(_Widget): super().__init__(**kwargs) self.idx = idx self._term = term - self.log = _LogWidget(wrap=self._term.wrap, write=self._term.write) + self.history = _HistoryWidget(wrap=self._term.wrap, + write=self._term.write) self.prompt = self.__annotations__['prompt'](write=self._term.write) if hasattr(self._term, 'size'): self.set_geometry() @@ -303,12 +304,12 @@ class Window(_Widget): if self._term.size.y < _MIN_HEIGHT or self._term.size.x < _MIN_WIDTH: bad_yx = _YX(-1, -1) super().set_geometry(bad_yx) - self.log.set_geometry(bad_yx) + self.history.set_geometry(bad_yx) self.prompt.set_geometry(bad_yx) return False super().set_geometry(_YX(0, 0)) self._y_status = self._term.size.y - 2 - self.log.set_geometry(_YX(self._y_status, self._term.size.x)) + self.history.set_geometry(_YX(self._y_status, self._term.size.x)) self.prompt.set_geometry(_YX(self._term.size.y - 1, self._term.size.x)) return True @@ -335,7 +336,7 @@ class Window(_Widget): return False title_box = f'{self.status_title}]' status_line = title_box + '=' * (self._term.size.x - len(title_box)) - self.log.draw() + self.history.draw() self._term.write(status_line, self._y_status) self.prompt.draw() return True @@ -351,7 +352,7 @@ class Window(_Widget): if self.tainted: self.draw() return - for widget in [w for w in (self.log, self.prompt) if w.tainted]: + for widget in [w for w in (self.history, self.prompt) if w.tainted]: widget.draw() @@ -369,8 +370,8 @@ class BaseTui(QueueMixin): self._windows: list[Window] = [] self._new_window() self._log = Logger( - lambda msg: # pylint: disable=unnecessary-lambda # to keep … - self.window.log.append(msg)) # … up-to-date _what_ window's .log + lambda msg: # pylint: disable=unnecessary-lambda # to keep up-to… + self.window.history.append(msg)) # …-date _what_ window's .history self._set_screen() signal(SIGWINCH, lambda *_: self._set_screen()) @@ -410,7 +411,7 @@ class BaseTui(QueueMixin): method_name_prefix = 'cmd__' base = 'self' for path in (base, f'{base}.window', f'{base}.window.prompt', - f'{base}.window.log'): + f'{base}.window.history'): for cmd_method_name in [name for name in dir(eval(path)) if name.startswith(method_name_prefix)]: path_prefix = f'{path}.'