From 0b3ef66125f6a53eb22a4c248da9b02b76f5d0d1 Mon Sep 17 00:00:00 2001 From: LocoAgent Date: Wed, 5 Aug 2026 14:17:57 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BA=D0=BD=D0=BE=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D1=81=D1=87=D1=91=D1=82=D0=B0=20=D0=9F=D0=9F?= =?UTF-8?q?-127:=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?= =?UTF-8?q?=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B5=D0=B7=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=E2=80=94=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D1=80=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D1=8F=D0=B3=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC=D0=BE=D0=B5=20(980x8?= =?UTF-8?q?20,=20minsize,=20resizable),=20=D0=BF=D0=BE=D0=BB=D0=B5=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=20?= =?UTF-8?q?=D0=B2=D1=8B=D1=88=D0=B5=20(12=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?= =?UTF-8?q?)=20=D0=B8=20=D1=81=D0=BE=20=D1=81=D0=BA=D1=80=D0=BE=D0=BB?= =?UTF-8?q?=D0=BB=D0=B1=D0=B0=D1=80=D0=BE=D0=BC=20(=D0=BF=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D0=B8=208=20=D0=B8=209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dokogen/ui.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dokogen/ui.py b/dokogen/ui.py index 0b6b32f..6996260 100644 --- a/dokogen/ui.py +++ b/dokogen/ui.py @@ -2221,7 +2221,9 @@ class DokoGenApp: # grab_set + lift — чтобы окно не уходило на задний план w = tk.Toplevel(dialog) w.title(f"🧮 Авторасчёт показателя {num} — {name[:60]}") - w.geometry("980x760") + w.geometry("980x820") + w.minsize(760, 560) + w.resizable(True, True) w.transient(dialog) w.lift() w.focus_force() @@ -2280,8 +2282,13 @@ class DokoGenApp: e_div = _row("Снижение выплат от дивидендов ΔДИВ (руб.):", 'div', '0') e_vso = _row("Снижение выплат сторонних организаций ΔВСО (руб.):", 'vso', '0') e_ns = _row("Снижение сборов ΔНС (руб.):", 'ns', '0') - result = tk.Text(frm, height=8, wrap=tk.WORD, state=tk.NORMAL) - result.pack(fill=tk.BOTH, expand=True, pady=(8, 0)) + result_frame = ttk.Frame(frm) + result_frame.pack(fill=tk.BOTH, expand=True, pady=(8, 0)) + result = tk.Text(result_frame, height=12, wrap=tk.WORD, state=tk.NORMAL) + result_scroll = ttk.Scrollbar(result_frame, orient=tk.VERTICAL, command=result.yview) + result.configure(yscrollcommand=result_scroll.set) + result.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) + result_scroll.pack(side=tk.RIGHT, fill=tk.Y) else: ttk.Label(frm, text="Показатель 8 — ущерб субъекту КИИ", font=('Arial', 10, 'bold')).pack(anchor=tk.W) @@ -2336,8 +2343,13 @@ class DokoGenApp: "ПП-127 требует усреднение за прошедший пятилетний период: " "при неполных данных результат методологически некорректен — заполните все 5 лет.", foreground='#8a6d00', wraplength=900, justify=tk.LEFT).pack(anchor=tk.W) - result = tk.Text(frm, height=8, wrap=tk.WORD, state=tk.NORMAL) - result.pack(fill=tk.BOTH, expand=True, pady=(8, 0)) + result_frame = ttk.Frame(frm) + result_frame.pack(fill=tk.BOTH, expand=True, pady=(8, 0)) + result = tk.Text(result_frame, height=12, wrap=tk.WORD, state=tk.NORMAL) + result_scroll = ttk.Scrollbar(result_frame, orient=tk.VERTICAL, command=result.yview) + result.configure(yscrollcommand=result_scroll.set) + result.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) + result_scroll.pack(side=tk.RIGHT, fill=tk.Y) def _calc(): lines = []