Skip to content
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

Gruvbox theme: Add true color version. #998

Closed
wants to merge 2 commits into from
Closed

Gruvbox theme: Add true color version. #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff4f91
config: Enable option for color depth of 24bit.
rht Apr 18, 2021
9ab7b69
themes: Add gruvbox_dark24 color theme (true color).
rht Apr 18, 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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ footlinks=disabled
maximum-footlinks=3
# Notify defaults to 'disabled', but can be set to 'enabled' to display notifications (see next section).
notify=enabled
# Color depth defaults to 256, but can be set to 1 (for monochrome) or 16.
# Color depth defaults to 256, but can be set to 1 (for monochrome), or 16 or 24bit.
neiljp marked this conversation as resolved.
Show resolved Hide resolved
color-depth=256
```

Expand Down
2 changes: 1 addition & 1 deletion tests/config/test_themes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


expected_complete_themes = {
'zt_dark', 'gruvbox_dark', 'zt_light', 'zt_blue',
'zt_dark', 'gruvbox_dark', 'zt_light', 'zt_blue', 'gruvbox_dark24'
}


Expand Down
10 changes: 7 additions & 3 deletions zulipterminal/cli/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def parse_args(argv: List[str]) -> argparse.Namespace:
action="store_true",
help='list all the color themes.')
parser.add_argument('--color-depth',
choices=['1', '16', '256'],
choices=['1', '16', '256', '24bit'],
help="Force the color depth "
f"(default {DEFAULT_SETTINGS['color-depth']}).")
notify_group = parser.add_mutually_exclusive_group()
Expand Down Expand Up @@ -388,7 +388,11 @@ def main(options: Optional[List[str]]=None) -> None:
if args.color_depth:
zterm['color-depth'] = (args.color_depth, 'on command line')

color_depth = int(zterm['color-depth'][0])
color_depth_str = zterm['color-depth'][0]
if color_depth_str == '24bit':
color_depth = 2 ** 24
rht marked this conversation as resolved.
Show resolved Hide resolved
else:
color_depth = int(color_depth_str)

if args.notify:
zterm['notify'] = (args.notify, 'on command line')
Expand Down Expand Up @@ -422,7 +426,7 @@ def main(options: Optional[List[str]]=None) -> None:
valid_settings = {
'autohide': ['autohide', 'no_autohide'],
'notify': ['enabled', 'disabled'],
'color-depth': ['1', '16', '256']
'color-depth': ['1', '16', '256', '24bit']
}
boolean_settings: Dict[str, bool] = dict()
for setting, valid_values in valid_settings.items():
Expand Down
109 changes: 109 additions & 0 deletions zulipterminal/config/themes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@
LIGHTMAGENTA = 'h132' # neutral_purple
LIGHTMAGENTABOLD = f"{LIGHTMAGENTA}, bold"

# Colors used in gruvbox_dark24
BLACK24 = '#1d2021' # dark0_hard
WHITE24 = '#a89984' # light4
WHITEBOLD24 = f"{WHITE24}, bold"
DARKBLUE24 = '#076678' # faded_blue
DARKRED24 = '#9d0006' # faded_red
LIGHTBLUE24 = '#83a598' # bright_blue
LIGHTBLUEBOLD24 = f"{LIGHTBLUE24}, bold"
YELLOW24 = '#d79921' # neutral_yellow
YELLOWBOLD24 = f"{YELLOW24}, bold"
LIGHTGREEN24 = '#b8bb26' # bright_green
LIGHTRED24 = '#fb4934' # bright_red
LIGHTREDBOLD24 = f"{LIGHTRED24}, bold"
GRAY24 = '#928374' # gray_244
LIGHTMAGENTA24 = '#b16286' # neutral_purple
LIGHTMAGENTABOLD24 = f"{LIGHTMAGENTA24}, bold"

THEME_ALIASES = {
'default': 'zt_dark',
'gruvbox': 'gruvbox_dark',
Expand Down Expand Up @@ -282,6 +299,98 @@
('area:error', 'white', 'dark red',
None, WHITE, DARKRED),
],
'gruvbox_dark24': [
# default colorscheme on 16 colors, gruvbox colorscheme
# on 24 bit color (true color)
(None, 'white', 'black',
None, WHITE24, BLACK24),
('selected', 'black', 'white',
None, BLACK24, WHITE24),
('msg_selected', 'black', 'white',
None, BLACK24, WHITE24),
('header', 'dark cyan', 'dark blue',
None, 'dark cyan', DARKBLUE24),
('general_narrow', 'white', 'dark blue',
None, WHITE24, DARKBLUE24),
('general_bar', 'white', 'black',
None, WHITE24, BLACK24),
('name', 'yellow, bold', 'black',
None, YELLOWBOLD24, BLACK24),
('unread', 'light magenta', 'black',
None, LIGHTMAGENTA24, BLACK24),
('user_active', 'light green', 'black',
None, LIGHTGREEN24, BLACK24),
('user_idle', 'yellow', 'black',
None, YELLOW24, BLACK24),
('user_offline', 'white', 'black',
None, WHITE24, BLACK24),
('user_inactive', 'white', 'black',
None, WHITE24, BLACK24),
('title', 'white, bold', 'black',
None, WHITEBOLD24, BLACK24),
('column_title', 'white, bold', 'black',
None, WHITEBOLD24, BLACK24),
('time', 'light blue', 'black',
None, LIGHTBLUE24, BLACK24),
('bar', 'white', 'dark gray',
None, WHITE24, GRAY24),
('popup_contrast', 'black', 'dark gray',
None, BLACK24, GRAY24),
('msg_emoji', 'light magenta', 'black',
None, LIGHTMAGENTA24, BLACK24),
('reaction', 'light magenta, bold', 'black',
None, LIGHTMAGENTABOLD24, BLACK24),
('reaction_mine', 'black', 'light magenta',
None, BLACK24, LIGHTMAGENTA24),
('msg_mention', 'light red, bold', 'black',
None, LIGHTREDBOLD24, BLACK24),
('msg_link', 'light blue', 'black',
None, LIGHTBLUE24, BLACK24),
('msg_link_index', 'light blue, bold', 'black',
None, LIGHTBLUEBOLD24, BLACK24),
('msg_quote', 'brown', 'black',
None, 'brown', BLACK24),
('msg_code', 'black', 'white',
None, BLACK24, WHITE24),
('msg_bold', 'white, bold', 'black',
None, WHITEBOLD24, BLACK24),
('msg_time', 'black', 'white',
None, BLACK24, WHITE24),
('footer', 'white', 'dark red',
None, WHITE24, DARKRED24),
('starred', 'light red, bold', 'black',
None, LIGHTREDBOLD24, BLACK24),
('popup_category', 'light blue, bold', 'black',
None, LIGHTBLUE24, BLACK24),
('unread_count', 'yellow', 'black',
None, YELLOW24, BLACK24),
('table_head', 'white, bold', 'black',
None, WHITEBOLD24, BLACK24),
('filter_results', 'black', 'light green',
None, BLACK24, LIGHTGREEN24),
('edit_topic', 'black', 'dark gray',
None, BLACK24, GRAY24),
('edit_tag', 'black', 'dark gray',
None, BLACK24, GRAY24),
('edit_author', 'yellow', 'black',
None, YELLOW24, BLACK24),
('edit_time', 'light blue', 'black',
None, LIGHTBLUE24, BLACK24),
('current_user', 'white', 'black',
None, WHITE24, BLACK24),
('muted', 'light blue', 'black',
None, LIGHTBLUE24, BLACK24),
('popup_border', 'white', 'black',
None, WHITE24, BLACK24),
('area:help', 'black', 'light green',
None, BLACK24, LIGHTGREEN24),
('area:msg', 'black', 'light red',
None, BLACK24, LIGHTRED24),
('area:stream', 'black', 'light blue',
None, BLACK24, LIGHTBLUE24),
('area:error', 'white', 'dark red',
None, WHITE24, DARKRED24),
],
'zt_light': [
(None, 'black', 'white'),
('selected', 'black', 'light green'),
Expand Down