refactor(gui): 合并顶部 Y 偏移到设备栏组件
This commit is contained in:
1 parent
e9b003f906
commit
18b75ceda4
2 files changed
+19
-13
No files matched your search
@@ -1,4 +1,4 @@
|
|||||||
"""GUI 顶部设备选择栏(设备下拉 + 刷新设备 + 扫描 WiFi + WiFi ADB 按钮)。
|
"""GUI 顶部设备选择栏(设备下拉 + 刷新设备 + 扫描 WiFi + WiFi ADB 按钮 + Y偏移)。
|
||||||
|
|
||||||
从 ``gui/gui_app.py`` 抽出。包括 5 个互相耦合的闭包:
|
从 ``gui/gui_app.py`` 抽出。包括 5 个互相耦合的闭包:
|
||||||
- ``refresh_devices``: 刷新 adb 设备列表
|
- ``refresh_devices``: 刷新 adb 设备列表
|
||||||
@@ -16,7 +16,7 @@ import tkinter as tk
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from tkinter import ttk
|
from tkinter import ttk
|
||||||
from tkinter.constants import LEFT, X
|
from tkinter.constants import LEFT, X
|
||||||
from typing import Callable
|
from typing import Callable, Optional
|
||||||
|
|
||||||
from gui.gui_core import find_adb_executable, list_adb_devices
|
from gui.gui_core import find_adb_executable, list_adb_devices
|
||||||
from gui.components.wifi_adb_dialog import open_wifi_adb_dialog
|
from gui.components.wifi_adb_dialog import open_wifi_adb_dialog
|
||||||
@@ -43,8 +43,12 @@ def setup_top_device_bar(
|
|||||||
*,
|
*,
|
||||||
root: tk.Misc,
|
root: tk.Misc,
|
||||||
on_line: Callable[[str], None],
|
on_line: Callable[[str], None],
|
||||||
|
y_var: Optional[tk.IntVar] = None,
|
||||||
) -> TopDeviceBarHandles:
|
) -> TopDeviceBarHandles:
|
||||||
"""构建顶部设备选择栏 + WiFi 工具按钮。"""
|
"""构建顶部设备选择栏 + WiFi 工具按钮 + (可选)Y偏移 Spinbox。
|
||||||
|
|
||||||
|
若提供 ``y_var``,会在所有按钮之后追加 "Y偏移:" 标签 + Spinbox(范围 -200..200)。
|
||||||
|
"""
|
||||||
# 用 list 持有 adb_exe 让闭包可以原地更新(替代 nonlocal)
|
# 用 list 持有 adb_exe 让闭包可以原地更新(替代 nonlocal)
|
||||||
adb_exe_box = [find_adb_executable()]
|
adb_exe_box = [find_adb_executable()]
|
||||||
devices = list_adb_devices(adb_exe_box[0])
|
devices = list_adb_devices(adb_exe_box[0])
|
||||||
@@ -121,6 +125,13 @@ def setup_top_device_bar(
|
|||||||
)
|
)
|
||||||
wifi_adb_btn.pack(side=LEFT, padx=(0, 20))
|
wifi_adb_btn.pack(side=LEFT, padx=(0, 20))
|
||||||
|
|
||||||
|
# 可选的 Y偏移 Spinbox(放在所有按钮之后)
|
||||||
|
if y_var is not None:
|
||||||
|
ttk.Label(top, text="Y偏移:").pack(side=LEFT)
|
||||||
|
ttk.Spinbox(top, from_=-200, to=200, textvariable=y_var, width=6).pack(
|
||||||
|
side=LEFT, padx=(0, 12)
|
||||||
|
)
|
||||||
|
|
||||||
return TopDeviceBarHandles(
|
return TopDeviceBarHandles(
|
||||||
device_var=device_var,
|
device_var=device_var,
|
||||||
refresh_devices=refresh_devices,
|
refresh_devices=refresh_devices,
|
||||||
|
|||||||
+5
-10
@@ -60,9 +60,9 @@ def main():
|
|||||||
import tkinter as tk
|
import tkinter as tk
|
||||||
from tkinter import ttk
|
from tkinter import ttk
|
||||||
try:
|
try:
|
||||||
from ttkbootstrap.constants import LEFT, BOTH, X
|
from ttkbootstrap.constants import X
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from tkinter.constants import LEFT, BOTH, X # type: ignore[assignment]
|
from tkinter.constants import X # type: ignore[assignment]
|
||||||
|
|
||||||
q, _log_writer, on_line, runner = setup_log_pipeline()
|
q, _log_writer, on_line, runner = setup_log_pipeline()
|
||||||
|
|
||||||
@@ -70,10 +70,6 @@ def main():
|
|||||||
top = ttk.Frame(root)
|
top = ttk.Frame(root)
|
||||||
top.pack(fill=X, padx=12, pady=10)
|
top.pack(fill=X, padx=12, pady=10)
|
||||||
|
|
||||||
_top_bar = setup_top_device_bar(top, root=root, on_line=on_line)
|
|
||||||
device_var = _top_bar.device_var
|
|
||||||
refresh_devices = _top_bar.refresh_devices
|
|
||||||
|
|
||||||
# 配置区(提前读取配置,供后续使用)
|
# 配置区(提前读取配置,供后续使用)
|
||||||
cfg = read_config()
|
cfg = read_config()
|
||||||
|
|
||||||
@@ -82,10 +78,9 @@ def main():
|
|||||||
y_var = _vars_["y_var"]
|
y_var = _vars_["y_var"]
|
||||||
theme_getter = lambda: str(gui_theme_var.get() or "litera")
|
theme_getter = lambda: str(gui_theme_var.get() or "litera")
|
||||||
|
|
||||||
ttk.Label(top, text="Y偏移:").pack(side=LEFT)
|
_top_bar = setup_top_device_bar(top, root=root, on_line=on_line, y_var=y_var)
|
||||||
ttk.Spinbox(top, from_=-200, to=200, textvariable=y_var, width=6).pack(
|
device_var = _top_bar.device_var
|
||||||
side=LEFT, padx=(0, 12)
|
refresh_devices = _top_bar.refresh_devices
|
||||||
)
|
|
||||||
|
|
||||||
_left_area = setup_left_config_area(
|
_left_area = setup_left_config_area(
|
||||||
root,
|
root,
|
||||||
|
|||||||
Reference in new issue
Block a user