Skip to content

UI: Emphasize column titles to differentiate it from regular texts. #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

UI: Emphasize column titles to differentiate it from regular texts. #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b9403d
refactor: Allow symbol names to be more descriptive.
zee-bit Mar 19, 2021
954c847
themes: Add palettes for column titles in themes.
zee-bit Mar 17, 2021
e3cdae1
ui/views: Use bold column title for consistency with LineBox border.
zee-bit Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zulipterminal/config/symbols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
CHECK_MARK = '✓'
APPLICATION_TITLE_BAR_LINE = '═'
PINNED_STREAMS_DIVIDER = '-'
LIST_TITLE_BAR_LINE = '━'
COLUMN_TITLE_BAR_LINE = '━'
# NOTE: The '⏱' emoji needs an extra space while rendering. Otherwise, it
# appears to overlap its subsequent text.
TIME_MENTION_MARKER = '⏱ ' # Other tested options are: '⧗' and '⧖'.
Expand Down
7 changes: 7 additions & 0 deletions zulipterminal/config/themes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
'user_offline': '',
'user_inactive': '',
'title': 'bold',
'column_title': 'bold',
'time': '',
'bar': 'standout',
'popup_contrast': 'standout',
Expand Down Expand Up @@ -126,6 +127,8 @@
None, DEF['white'], DEF['black']),
('title', 'white, bold', 'black',
None, DEF['white:bold'], DEF['black']),
('column_title', 'white, bold', 'black',
None, DEF['white:bold'], DEF['black']),
('time', 'light blue', 'black',
None, DEF['light_blue'], DEF['black']),
('bar', 'white', 'dark gray',
Expand Down Expand Up @@ -216,6 +219,8 @@
None, WHITE, BLACK),
('title', 'white, bold', 'black',
None, WHITEBOLD, BLACK),
('column_title', 'white, bold', 'black',
None, WHITEBOLD, BLACK),
('time', 'light blue', 'black',
None, LIGHTBLUE, BLACK),
('bar', 'white', 'dark gray',
Expand Down Expand Up @@ -291,6 +296,7 @@
('user_offline', 'black', 'white'),
('user_inactive', 'black', 'white'),
('title', 'white, bold', 'dark gray'),
('column_title', 'black, bold', 'white'),
('time', 'dark blue', 'white'),
('bar', 'white', 'dark gray'),
('popup_contrast', 'white', 'dark gray'),
Expand Down Expand Up @@ -336,6 +342,7 @@
('user_offline', 'black', 'light blue'),
('user_inactive', 'black', 'light blue'),
('title', 'white, bold', 'dark blue'),
('column_title', 'black, bold', 'light blue'),
('time', 'dark blue', 'light blue'),
('bar', 'white', 'dark blue'),
('popup_contrast', 'white', 'dark blue'),
Expand Down
16 changes: 9 additions & 7 deletions zulipterminal/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from zulipterminal.config.keys import commands_for_random_tips, is_command_key
from zulipterminal.config.symbols import (
APPLICATION_TITLE_BAR_LINE,
LIST_TITLE_BAR_LINE,
COLUMN_TITLE_BAR_LINE,
)
from zulipterminal.helper import WSL, asynch
from zulipterminal.ui_tools.boxes import SearchBox, WriteBox
Expand Down Expand Up @@ -47,17 +47,19 @@ def left_column_view(self) -> Any:
def middle_column_view(self) -> Any:
self.middle_column = MiddleColumnView(self, self.model, self.write_box,
self.search_box)
return urwid.LineBox(self.middle_column, title='Messages',
tline=LIST_TITLE_BAR_LINE,
return urwid.LineBox(self.middle_column,
title='Messages', title_attr='column_title',
tline=COLUMN_TITLE_BAR_LINE,
bline='', trcorner='│', tlcorner='│')

def right_column_view(self) -> Any:
self.users_view = RightColumnView(View.RIGHT_WIDTH, self)
return urwid.LineBox(
self.users_view, title="Users",
tlcorner=LIST_TITLE_BAR_LINE,
tline=LIST_TITLE_BAR_LINE,
trcorner=LIST_TITLE_BAR_LINE,
self.users_view,
title="Users", title_attr='column_title',
tlcorner=COLUMN_TITLE_BAR_LINE,
tline=COLUMN_TITLE_BAR_LINE,
trcorner=COLUMN_TITLE_BAR_LINE,
lline='', blcorner='─', rline='',
bline='', brcorner=''
)
Expand Down
20 changes: 11 additions & 9 deletions zulipterminal/ui_tools/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
)
from zulipterminal.config.symbols import (
CHECK_MARK,
LIST_TITLE_BAR_LINE,
COLUMN_TITLE_BAR_LINE,
PINNED_STREAMS_DIVIDER,
STATUS_ACTIVE,
STATUS_IDLE,
Expand Down Expand Up @@ -805,10 +805,11 @@ def streams_view(self) -> Any:

self.view.stream_w = StreamsView(streams_btn_list, self.view)
w = urwid.LineBox(
self.view.stream_w, title="Streams",
tlcorner=LIST_TITLE_BAR_LINE,
tline=LIST_TITLE_BAR_LINE,
trcorner=LIST_TITLE_BAR_LINE,
self.view.stream_w,
title="Streams", title_attr='column_title',
tlcorner=COLUMN_TITLE_BAR_LINE,
tline=COLUMN_TITLE_BAR_LINE,
trcorner=COLUMN_TITLE_BAR_LINE,
blcorner='', rline='', lline='',
bline='', brcorner='─'
)
Expand All @@ -832,10 +833,11 @@ def topics_view(self, stream_button: Any) -> Any:
self.view.topic_w = TopicsView(topics_btn_list, self.view,
stream_button)
w = urwid.LineBox(
self.view.topic_w, title="Topics",
tlcorner=LIST_TITLE_BAR_LINE,
tline=LIST_TITLE_BAR_LINE,
trcorner=LIST_TITLE_BAR_LINE,
self.view.topic_w,
title="Topics", title_attr='column_title',
tlcorner=COLUMN_TITLE_BAR_LINE,
tline=COLUMN_TITLE_BAR_LINE,
trcorner=COLUMN_TITLE_BAR_LINE,
blcorner='', rline='', lline='',
bline='', brcorner='─'
)
Expand Down