Revert "fix: 5 UI improvements — relative paths, filename-only display, real-time config, multi-line status, maximize layout"
This reverts commit a196211708.
This commit is contained in:
+20
-68
@@ -6,7 +6,6 @@ consistent styling from gui/styles.py.
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import os
|
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
import customtkinter as ctk
|
import customtkinter as ctk
|
||||||
@@ -439,9 +438,7 @@ class ProgressIndicator(ctk.CTkFrame):
|
|||||||
class StatusDisplay(ctk.CTkFrame):
|
class StatusDisplay(ctk.CTkFrame):
|
||||||
"""Status display widget for operation results.
|
"""Status display widget for operation results.
|
||||||
|
|
||||||
Shows status messages in a multi-line, expandable text area that
|
Shows a status message with color-coded feedback.
|
||||||
uses the full available space. Messages are color-coded and
|
|
||||||
automatically wrapped.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, master, **kwargs):
|
def __init__(self, master, **kwargs):
|
||||||
@@ -455,19 +452,15 @@ class StatusDisplay(ctk.CTkFrame):
|
|||||||
self._create_widgets()
|
self._create_widgets()
|
||||||
|
|
||||||
def _create_widgets(self) -> None:
|
def _create_widgets(self) -> None:
|
||||||
"""Create the status display UI — multi-line expandable area."""
|
"""Create the status display UI."""
|
||||||
self.grid_rowconfigure(0, weight=1)
|
self._status_label = ctk.CTkLabel(
|
||||||
self.grid_columnconfigure(0, weight=1)
|
|
||||||
|
|
||||||
self._status_text = ctk.CTkTextbox(
|
|
||||||
self,
|
self,
|
||||||
|
text="Ready",
|
||||||
font=FONT_BODY,
|
font=FONT_BODY,
|
||||||
corner_radius=CORNER_RADIUS,
|
anchor="w",
|
||||||
state="disabled",
|
|
||||||
wrap="word",
|
|
||||||
)
|
)
|
||||||
self._status_text.grid(
|
self._status_label.pack(
|
||||||
row=0, column=0, sticky="nsew", padx=PADDING, pady=PADDING_SMALL
|
fill="x", padx=PADDING, pady=PADDING_SMALL
|
||||||
)
|
)
|
||||||
|
|
||||||
def set_status(self, message: str, status: str = "info") -> None:
|
def set_status(self, message: str, status: str = "info") -> None:
|
||||||
@@ -477,32 +470,20 @@ class StatusDisplay(ctk.CTkFrame):
|
|||||||
message: Status message text.
|
message: Status message text.
|
||||||
status: Status type for coloring ('info', 'success', 'error', 'warning').
|
status: Status type for coloring ('info', 'success', 'error', 'warning').
|
||||||
"""
|
"""
|
||||||
self._status_text.configure(state="normal")
|
self._status_label.configure(text=message)
|
||||||
self._status_text.delete("1.0", "end")
|
|
||||||
|
|
||||||
colors = {
|
colors = {
|
||||||
"info": INFO_COLOR,
|
"info": INFO_COLOR,
|
||||||
"success": SUCCESS_COLOR,
|
"success": SUCCESS_COLOR,
|
||||||
"error": DANGER_COLOR,
|
"error": DANGER_COLOR,
|
||||||
"warning": WARNING_COLOR,
|
"warning": WARNING_COLOR,
|
||||||
}
|
}
|
||||||
color = colors.get(status, INFO_COLOR)
|
self._status_label.configure(text_color=colors.get(status, INFO_COLOR))
|
||||||
|
|
||||||
self._status_text.insert("1.0", message)
|
|
||||||
# Tag the entire text with the color
|
|
||||||
self._status_text.tag_configure("status", foreground=color)
|
|
||||||
self._status_text.tag_add("status", "1.0", "end")
|
|
||||||
|
|
||||||
self._status_text.configure(state="disabled")
|
|
||||||
|
|
||||||
|
|
||||||
class FileSelector(ctk.CTkFrame):
|
class FileSelector(ctk.CTkFrame):
|
||||||
"""File selector widget with browse button and path display.
|
"""File selector widget with browse button and path display.
|
||||||
|
|
||||||
Stores the full absolute path internally but displays only the
|
Allows users to browse for files and displays the selected path.
|
||||||
filename in the entry field. Supports relative paths: the
|
|
||||||
``set_relative_path()`` / ``get_relative_path()`` methods work
|
|
||||||
with paths relative to a given base directory.
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
@@ -525,9 +506,7 @@ class FileSelector(ctk.CTkFrame):
|
|||||||
|
|
||||||
self._callback = callback
|
self._callback = callback
|
||||||
self._file_types = file_types or [("All files", "*")]
|
self._file_types = file_types or [("All files", "*")]
|
||||||
self._full_path: str = "" # absolute path (internal)
|
self._selected_path = ctk.StringVar(value="")
|
||||||
self._relative_path: str = "" # relative path (synced to Config)
|
|
||||||
self._display_text = ctk.StringVar(value="")
|
|
||||||
|
|
||||||
self._create_widgets(label_text)
|
self._create_widgets(label_text)
|
||||||
|
|
||||||
@@ -545,10 +524,10 @@ class FileSelector(ctk.CTkFrame):
|
|||||||
)
|
)
|
||||||
label.grid(row=0, column=0, sticky="w", padx=(PADDING, PADDING_SMALL))
|
label.grid(row=0, column=0, sticky="w", padx=(PADDING, PADDING_SMALL))
|
||||||
|
|
||||||
# Path entry — shows only the filename
|
# Path entry
|
||||||
self._entry = ctk.CTkEntry(
|
self._entry = ctk.CTkEntry(
|
||||||
self,
|
self,
|
||||||
textvariable=self._display_text,
|
textvariable=self._selected_path,
|
||||||
font=FONT_MONO,
|
font=FONT_MONO,
|
||||||
state="readonly",
|
state="readonly",
|
||||||
)
|
)
|
||||||
@@ -570,60 +549,33 @@ class FileSelector(ctk.CTkFrame):
|
|||||||
|
|
||||||
def _browse(self) -> None:
|
def _browse(self) -> None:
|
||||||
"""Open file dialog and set selected path."""
|
"""Open file dialog and set selected path."""
|
||||||
|
import customtkinter
|
||||||
from tkinter import filedialog
|
from tkinter import filedialog
|
||||||
|
|
||||||
file_path = filedialog.askopenfilename(
|
file_path = filedialog.askopenfilename(
|
||||||
title="Select file",
|
title=f"Select {self._selected_path.get() or 'file'}",
|
||||||
filetypes=self._file_types,
|
filetypes=self._file_types,
|
||||||
)
|
)
|
||||||
if file_path:
|
if file_path:
|
||||||
self.set_path(file_path)
|
self.set_path(file_path)
|
||||||
|
|
||||||
def set_path(self, path: str) -> None:
|
def set_path(self, path: str) -> None:
|
||||||
"""Set the selected file path (absolute or relative).
|
"""Set the selected file path.
|
||||||
|
|
||||||
Internally stores the absolute path and displays only the
|
|
||||||
filename.
|
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
path: Absolute or relative path to the selected file.
|
path: Absolute path to the selected file.
|
||||||
"""
|
"""
|
||||||
self._full_path = path
|
self._selected_path.set(path)
|
||||||
self._display_text.set(os.path.basename(path) if path else "")
|
|
||||||
if self._callback:
|
|
||||||
self._callback(path)
|
|
||||||
|
|
||||||
def set_relative_path(self, path: str) -> None:
|
|
||||||
"""Set a relative path (from config).
|
|
||||||
|
|
||||||
Resolves to absolute for internal storage, shows only filename.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
path: Relative path string.
|
|
||||||
"""
|
|
||||||
self._relative_path = path
|
|
||||||
# Resolve to absolute for internal use
|
|
||||||
if path:
|
|
||||||
self._full_path = path # caller should resolve before calling
|
|
||||||
self._display_text.set(os.path.basename(path) if path else "")
|
|
||||||
if self._callback:
|
if self._callback:
|
||||||
self._callback(path)
|
self._callback(path)
|
||||||
|
|
||||||
def get_path(self) -> str:
|
def get_path(self) -> str:
|
||||||
"""Get the currently selected file path (absolute).
|
"""Get the currently selected file path.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Selected file path string.
|
Selected file path string.
|
||||||
"""
|
"""
|
||||||
return self._full_path
|
return self._selected_path.get()
|
||||||
|
|
||||||
def get_relative_path(self) -> str:
|
|
||||||
"""Get the currently selected relative path.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Relative path string, or empty string.
|
|
||||||
"""
|
|
||||||
return self._relative_path
|
|
||||||
|
|
||||||
|
|
||||||
class LogDisplay(ctk.CTkFrame):
|
class LogDisplay(ctk.CTkFrame):
|
||||||
|
|||||||
Reference in New Issue
Block a user