diff options
Diffstat (limited to 'poezio/windows')
-rw-r--r-- | poezio/windows/image.py | 2 | ||||
-rw-r--r-- | poezio/windows/info_bar.py | 16 | ||||
-rw-r--r-- | poezio/windows/info_wins.py | 2 | ||||
-rw-r--r-- | poezio/windows/inputs.py | 2 | ||||
-rw-r--r-- | poezio/windows/muc.py | 4 | ||||
-rw-r--r-- | poezio/windows/roster_win.py | 14 | ||||
-rw-r--r-- | poezio/windows/text_win.py | 14 |
7 files changed, 27 insertions, 27 deletions
diff --git a/poezio/windows/image.py b/poezio/windows/image.py index 79ecf7d9..3b29f326 100644 --- a/poezio/windows/image.py +++ b/poezio/windows/image.py @@ -71,7 +71,7 @@ class ImageWin(Win): def __init__(self) -> None: self._image: Optional[Image.Image] = None Win.__init__(self) - if config.get('image_use_half_blocks'): + if config.getbool('image_use_half_blocks'): self._display_avatar: Callable[[int, int], None] = self._display_avatar_half_blocks else: self._display_avatar = self._display_avatar_full_blocks diff --git a/poezio/windows/info_bar.py b/poezio/windows/info_bar.py index c53ed68a..8c2dd1a1 100644 --- a/poezio/windows/info_bar.py +++ b/poezio/windows/info_bar.py @@ -31,11 +31,11 @@ class GlobalInfoBar(Win): self.addstr(0, 0, "[", to_curses_attr(theme.COLOR_INFORMATION_BAR)) - show_names = config.get('show_tab_names') - show_nums = config.get('show_tab_numbers') - use_nicks = config.get('use_tab_nicks') - show_inactive = config.get('show_inactive_tabs') - unique_prefix_tab_names = config.get('unique_prefix_tab_names') + show_names = config.getboom('show_tab_names') + show_nums = config.getbool('show_tab_numbers') + use_nicks = config.getbool('use_tab_nicks') + show_inactive = config.getbool('show_inactive_tabs') + unique_prefix_tab_names = config.getbool('unique_prefix_tab_names') if unique_prefix_tab_names: unique_prefixes = [None] * len(self.core.tabs) @@ -110,13 +110,13 @@ class VerticalGlobalInfoBar(Win): self._win.erase() sorted_tabs = [tab for tab in self.core.tabs if tab] theme = get_theme() - if not config.get('show_inactive_tabs'): + if not config.getbool('show_inactive_tabs'): sorted_tabs = [ tab for tab in sorted_tabs if tab.vertical_color != theme.COLOR_VERTICAL_TAB_NORMAL ] nb_tabs = len(sorted_tabs) - use_nicks = config.get('use_tab_nicks') + use_nicks = config.getbool('use_tab_nicks') if nb_tabs >= height: # TODO: As sorted_tabs filters out gap tabs this ensures pos is # always set, preventing UnboundLocalError. Now is this how this @@ -133,7 +133,7 @@ class VerticalGlobalInfoBar(Win): sorted_tabs = sorted_tabs[-height:] else: sorted_tabs = sorted_tabs[pos - height // 2:pos + height // 2] - asc_sort = (config.get('vertical_tab_list_sort') == 'asc') + asc_sort = (config.getstr('vertical_tab_list_sort') == 'asc') for y, tab in enumerate(sorted_tabs): color = tab.vertical_color if asc_sort: diff --git a/poezio/windows/info_wins.py b/poezio/windows/info_wins.py index cd775e33..5278e3b8 100644 --- a/poezio/windows/info_wins.py +++ b/poezio/windows/info_wins.py @@ -172,7 +172,7 @@ class ConversationInfoWin(InfoWin): # resource can now be a Resource: user is in the roster and online # or resource is None: user is in the roster but offline self._win.erase() - if config.get('show_jid_in_conversations'): + if config.getbool('show_jid_in_conversations'): self.write_contact_jid(jid) self.write_contact_information(contact) self.write_resource_information(resource) diff --git a/poezio/windows/inputs.py b/poezio/windows/inputs.py index b3601913..16c5c633 100644 --- a/poezio/windows/inputs.py +++ b/poezio/windows/inputs.py @@ -601,7 +601,7 @@ class HistoryInput(Input): self.current_completed = '' self.key_func['^R'] = self.toggle_search self.search = False - if config.get('separate_history'): + if config.getbool('separate_history'): # pylint: disable=assigning-non-slot self.history: List[str] = [] diff --git a/poezio/windows/muc.py b/poezio/windows/muc.py index 05fe683e..0e95ac1b 100644 --- a/poezio/windows/muc.py +++ b/poezio/windows/muc.py @@ -65,14 +65,14 @@ class UserList(Win): def refresh(self, users: List[User]) -> None: log.debug('Refresh: %s', self.__class__.__name__) - if config.get('hide_user_list'): + if config.getbool('hide_user_list'): return # do not refresh if this win is hidden. if len(users) < self.height: self.pos = 0 elif self.pos >= len(users) - self.height and self.pos != 0: self.pos = len(users) - self.height self._win.erase() - asc_sort = (config.get('user_list_sort').lower() == 'asc') + asc_sort = (config.getstr('user_list_sort').lower() == 'asc') if asc_sort: y, _ = self._win.getmaxyx() y -= 1 diff --git a/poezio/windows/roster_win.py b/poezio/windows/roster_win.py index 74de7eef..1db86630 100644 --- a/poezio/windows/roster_win.py +++ b/poezio/windows/roster_win.py @@ -99,13 +99,13 @@ class RosterWin(Win): # This is a search if roster.contact_filter is not roster.DEFAULT_FILTER: self.roster_cache = [] - sort = config.get('roster_sort', 'jid:show') or 'jid:show' + sort = config.getstr('roster_sort') or 'jid:show' for contact in roster.get_contacts_sorted_filtered(sort): self.roster_cache.append(contact) else: - show_offline = config.get('roster_show_offline') - sort = config.get('roster_sort') or 'jid:show' - group_sort = config.get('roster_group_sort') or 'name' + show_offline = config.getbool('roster_show_offline') + sort = config.getstr('roster_sort') or 'jid:show' + group_sort = config.getstr('roster_group_sort') or 'name' self.roster_cache = [] # build the cache for group in roster.get_groups(group_sort): @@ -155,9 +155,9 @@ class RosterWin(Win): self.height] options = { - 'show_roster_sub': config.get('show_roster_subscriptions'), - 'show_s2s_errors': config.get('show_s2s_errors'), - 'show_roster_jids': config.get('show_roster_jids') + 'show_roster_sub': config.getbool('show_roster_subscriptions'), + 'show_s2s_errors': config.getbool('show_s2s_errors'), + 'show_roster_jids': config.getbool('show_roster_jids') } for item in roster_view: diff --git a/poezio/windows/text_win.py b/poezio/windows/text_win.py index ac60dee7..2ddf7082 100644 --- a/poezio/windows/text_win.py +++ b/poezio/windows/text_win.py @@ -29,7 +29,7 @@ class TextWin(Win): def __init__(self, lines_nb_limit: Optional[int] = None) -> None: Win.__init__(self) if lines_nb_limit is None: - lines_nb_limit = config.get('max_lines_in_memory') + lines_nb_limit = config.getint('max_lines_in_memory') self.lines_nb_limit: int = lines_nb_limit self.pos = 0 # Each new message is built and kept here. @@ -119,8 +119,8 @@ class TextWin(Win): lines = self.built_lines[-self.height:] else: lines = self.built_lines[-self.height - self.pos:-self.pos] - with_timestamps = config.get("show_timestamps") - nick_size = config.get("max_nick_length") + with_timestamps = config.getbool("show_timestamps") + nick_size = config.getint("max_nick_length") self._win.move(0, 0) self._win.erase() offset = 0 @@ -167,8 +167,8 @@ class TextWin(Win): def rebuild_everything(self, room: TextBuffer) -> None: self.built_lines = [] - with_timestamps = config.get('show_timestamps') - nick_size = config.get('max_nick_length') + with_timestamps = config.getbool('show_timestamps') + nick_size = config.getint('max_nick_length') for message in room.messages: self.build_new_message( message, @@ -310,8 +310,8 @@ class TextWin(Win): Find a message, and replace it with a new one (instead of rebuilding everything in order to correct a message) """ - with_timestamps = config.get('show_timestamps') - nick_size = config.get('max_nick_length') + with_timestamps = config.getbool('show_timestamps') + nick_size = config.getint('max_nick_length') for i in range(len(self.built_lines) - 1, -1, -1): current = self.built_lines[i] if current is not None and current.msg.identifier == old_id: |