1j01/textual-paint
1
1
Fork 0
mirror of https://github.com/1j01/textual-paint.git synced 2024-09-11 15:56:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ASCII-only mode test failures

Browse Source
This commit is contained in:
Isaiah Odhner 2023-09-13 23:40:49 -04:00
parent 3b247cde1a
commit 9280dcdb92
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/textual_paint/icons.py
View File

@ -1,8 +1,11 @@
"""Icons for message boxes, as `Static` widget factories, and for the `Header`, as `Text`. Also, title bar icons as markup.
"""Icons for message boxes, as `Static` widget factories, and for the `Header`, as `Text`. Also, title bar icons as markup "factories".
Reusing widget instances doesn't work, for obvious reasons in the case of multiple dialogs open at once,
and reasons mysterious to me in the case of closing and re-opening a single dialog.
The use of functions is also important because args.ascii_only can change while running pytest.
The PaintApp is constructed many times, but all in a single process.
Some of these icons are designed inside Textual Paint itself,
and saved as `*._rich_console_markup` as a way to export the markup for embedding in the source code.
The warning and header icons I did by hand in markup.
@ -236,11 +239,13 @@ def get_paint_icon() -> Static:
# windows_icon_markup = "[#000000][b]≈[/][/][#0000ff on #ff0000]▀[/][#00aa00 on #ffff00]▀[/]" # trying to add the trailing flag effect
# windows_icon_markup = "[#000000]⣿[/][#0000ff on #ff0000]▀[/][#00aa00 on #ffff00]▀[/]" # ah, that's brilliant! that worked way better than I expected
windows_icon_markup = "[not bold][#000000]⣿[/][#0000ff on #ff0000]▀[/][#00aa00 on #ffff00]▀[/][/]" # prevent bold on dots
if args.ascii_only:
# windows_icon_markup = "[#000000]::[/][#0000ff on #ff0000]~[/][#00aa00 on #ffff00]~[/]" # not very convincing
# windows_icon_markup = "[#000000]::[/][#ff0000 on #0000ff]x[/][#ffff00 on #00aa00]x[/]"
# windows_icon_markup = "[#000000]::[/][#ff0000 on #0000ff]m[/][#ffff00 on #00aa00]m[/]" # probably the most balanced top/bottom split character (i.e. most dense while occupying only the top or only the bottom)
windows_icon_markup = "[#000000 not bold]::[/][bold #ff0000 on #0000ff]m[/][bold #ffff00 on #00aa00]m[/]" # prevent bold on dots, but definitely not the m's, it's better if they bleed into a blob
# windows_icon_markup_ascii = "[#000000]::[/][#0000ff on #ff0000]~[/][#00aa00 on #ffff00]~[/]" # not very convincing
# windows_icon_markup_ascii = "[#000000]::[/][#ff0000 on #0000ff]x[/][#ffff00 on #00aa00]x[/]"
# windows_icon_markup_ascii = "[#000000]::[/][#ff0000 on #0000ff]m[/][#ffff00 on #00aa00]m[/]" # probably the most balanced top/bottom split character (i.e. most dense while occupying only the top or only the bottom)
windows_icon_markup_ascii = "[#000000 not bold]::[/][bold #ff0000 on #0000ff]m[/][bold #ffff00 on #00aa00]m[/]" # prevent bold on dots, but definitely not the m's, it's better if they bleed into a blob
def get_windows_icon_markup() -> str:
return windows_icon_markup_ascii if args.ascii_only else windows_icon_markup
# The Paint Help window's icon is a document with a yellow question mark.
# I can almost represent that with emoji, but this causes issues
@ -254,10 +259,12 @@ if args.ascii_only:
# Just don't use emoji for it.
help_icon_markup = "📄[#ffff00]?[/]"
# help_icon_markup = "[#ffffff]🭌[/][#ffff00]?[/]" # also works nicely
if args.ascii_only:
help_icon_markup = "[#aaaaaa on #ffffff]=[/][#ffff00]?[/]"
help_icon_markup_ascii = "[#aaaaaa on #ffffff]=[/][#ffff00]?[/]"
# Honorable mentions: 🯄 ˀ̣
def get_help_icon_markup() -> str:
return help_icon_markup_ascii if args.ascii_only else help_icon_markup
# header_icon_markup = "[on white][blue]\\\\[/][red]|[/][yellow]/[/][/]"
# header_icon_markup = "[black]..,[/]\n[blue]\\\\[/][on white][red]|[/][yellow]/[/][/]\n[black on rgb(192,192,192)]\\[_][/]"
# trying different geometries for the page going behind the cup of brushes:
@ -295,6 +302,6 @@ __all__ = [
"get_question_icon",
"get_paint_icon",
"header_icon_text",
"windows_icon_markup",
"help_icon_markup",
"get_windows_icon_markup",
"get_help_icon_markup",
]

6
src/textual_paint/paint.py
View File

@ -53,7 +53,7 @@ from textual_paint.graphics_primitives import (bezier_curve_walk,
polyline_walk,
quadratic_curve_walk)
from textual_paint.icons import (get_paint_icon, get_question_icon,
get_warning_icon, header_icon_text, help_icon_markup, windows_icon_markup)
get_warning_icon, header_icon_text, get_help_icon_markup, get_windows_icon_markup)
from textual_paint.localization.i18n import get as _
from textual_paint.localization.i18n import load_language, remove_hotkey
from textual_paint.menus import Menu, MenuBar, MenuItem, Separator
@ -1625,7 +1625,7 @@ Columns: {len(palette) // 2}
elif button.has_class("no"):
do_the_paste()
title = windows_icon_markup + " " + _("Paint")
title = get_windows_icon_markup() + " " + _("Paint")
self.message_box(title, message, "yes/no/cancel", handle_button, icon_widget=get_question_icon())
else:
do_the_paste()
@ -2144,7 +2144,7 @@ Columns: {len(palette) // 2}
# This works in English, but probably sounds weird in other languages.
title = _("Paint") + " " + _("Help")
title = help_icon_markup + " " + title
title = get_help_icon_markup() + " " + title
def handle_button(button: Button) -> None:
window.close()
window = DialogWindow(