1j01/textual-paint
1
1
Fork 0
mirror of https://github.com/1j01/textual-paint.git synced 2024-12-21 22:01:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename Save As dialog IDs to match Open dialog IDs

Browse Source 
It's a bit verbose, but for Open, I wanted the _dialog part since "open"
can be both a verb and an adjective, and I didn't like it reading as an
adjective. It doesn't technically disambiguate it, but it reads better.

Verb "[to] open", noun "[dialog to] open", adjective "[part of the dialog to] open"
Adjective "[is] open", noun "[dialog that is] open", adjective "[part of the dialog that is] open"

Anyways this commit just makes it consistent.
Perhaps I could use classes more in place of IDs.
This commit is contained in:
Isaiah Odhner 2023-04-15 22:34:24 -04:00
parent 73d8f04329
commit da3d3b0f06
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
paint.py
View File

@ -712,13 +712,13 @@ class PaintApp(App):
title="Save As", title="Save As",
) )
window.content.mount( window.content.mount(
DirectoryTree(id="save_as_directory_tree", path="/"), DirectoryTree(id="save_as_dialog_directory_tree", path="/"),
Input(id="save_as_filename_input", placeholder="Filename"), Input(id="save_as_dialog_filename_input", placeholder="Filename"),
Button("Save", id="save_as_save_button", variant="primary"), Button("Save", id="save_as_dialog_save_button", variant="primary"),
Button("Cancel", id="save_as_cancel_button"), Button("Cancel", id="save_as_dialog_cancel_button"),
) )
self.mount(window) self.mount(window)
self.expand_directory_tree(window.content.query_one("#save_as_directory_tree")) self.expand_directory_tree(window.content.query_one("#save_as_dialog_directory_tree"))
def expand_directory_tree(self, tree: DirectoryTree) -> None: def expand_directory_tree(self, tree: DirectoryTree) -> None:
"""Expand the directory tree to the target directory, either the folder of the open file or the current working directory.""" """Expand the directory tree to the target directory, either the folder of the open file or the current working directory."""
@ -1088,8 +1088,8 @@ class PaintApp(App):
self.selected_tool = Tool[button_id[len("tool_button_") :]] self.selected_tool = Tool[button_id[len("tool_button_") :]]
elif button_id.startswith("color_button_"): elif button_id.startswith("color_button_"):
self.selected_color = button_id[len("color_button_") :] self.selected_color = button_id[len("color_button_") :]
elif button_id == "save_as_save_button": elif button_id == "save_as_dialog_save_button":
name = self.query_one("#save_as_filename_input", Input).value name = self.query_one("#save_as_dialog_filename_input", Input).value
if name: if name:
if self.directory_tree_selected_path: if self.directory_tree_selected_path:
name = os.path.join(self.directory_tree_selected_path, name) name = os.path.join(self.directory_tree_selected_path, name)
@ -1102,7 +1102,7 @@ class PaintApp(App):
else: else:
on_save_confirmed() on_save_confirmed()
elif button_id == "save_as_cancel_button": elif button_id == "save_as_dialog_cancel_button":
self.query_one("#save_as_dialog", Window).close() self.query_one("#save_as_dialog", Window).close()
def on_tree_node_highlighted(self, event: DirectoryTree.FileSelected) -> None: def on_tree_node_highlighted(self, event: DirectoryTree.FileSelected) -> None:
@ -1117,7 +1117,7 @@ class PaintApp(App):
elif event.node.parent: elif event.node.parent:
self.directory_tree_selected_path = event.node.parent.data.path self.directory_tree_selected_path = event.node.parent.data.path
name = os.path.basename(event.node.data.path) name = os.path.basename(event.node.data.path)
self.query_one("#save_as_filename_input, #open_dialog_filename_input", Input).value = name self.query_one("#save_as_dialog_filename_input, #open_dialog_filename_input", Input).value = name
else: else:
self.directory_tree_selected_path = None self.directory_tree_selected_path = None