From ab740f0be8ad0ae3468dff7093b0e846f0b9d5b1 Mon Sep 17 00:00:00 2001 From: Sergey Kalinin Date: Thu, 30 Oct 2025 13:10:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20=D1=84?= =?UTF-8?q?=D0=BE=D0=BA=D1=83=D1=81=D0=B0=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B5=D0=B6=D0=BD=D0=B5=D0=B5=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B4=D0=B8?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +++- debian/changelog | 2 +- lib/editor.tcl | 2 +- lib/procedure.tcl | 11 ++++++++--- projman.tcl | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 28889f8..bd6d4c1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ debian/projman.substvars debian/files debian/projman.debhelper.log debian/*.tmp -*.tmp \ No newline at end of file +debian/errors +*.tmp +errors \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 05c1a10..50326e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ projman (2.0.0-alpha19) stable; urgency=medium + * Добавлена передача сигналов для закрытия запущенного процесса * Изменил виджет текста в окне псевдо-терминала. Добавил подстановку имени файла к командную строку по шаблону %f * Добавлен диалог настроек * Добавил псевдо-терминал - * Исправлен changelog * Добавлен диалог при открытии файлов отличных от текстовых * Добавлен просмотр файлов изображений (png, bmp, gif, ppm, pgm) * Исправлена процедура опреления типа файла diff --git a/lib/editor.tcl b/lib/editor.tcl index dc592a0..cfa315c 100644 --- a/lib/editor.tcl +++ b/lib/editor.tcl @@ -1602,7 +1602,7 @@ namespace eval Editor { set frmText [ttk::frame $w.frmText2 -border 1] $w.panelTxt add $frmText -weight 1 # focus -force $frmText.t.t - Execute $fileFullPath $frmText + Execute $fileFullPath $frmText $w } } diff --git a/lib/procedure.tcl b/lib/procedure.tcl index 48a89b9..4a57d3e 100644 --- a/lib/procedure.tcl +++ b/lib/procedure.tcl @@ -827,7 +827,7 @@ proc MakeTGZ {} { } ## MAKE PROJ PROCEDURE (RUNNING PROJECT) ## -proc Execute {filePath w} { +proc Execute {filePath w activeEditor} { global activeProject cfgVariables if {$activeProject == ""} { set answer [tk_messageBox\ @@ -858,8 +858,8 @@ proc Execute {filePath w} { pack $w.frame.yscroll -side left -fill y bind $w.frame.text [list Run $w $filePath] - bind $w.frame.text [list destroy $w] - bind $w.frame.text [list destroy $w] + bind $w.frame.text [list CloseExecuteDialog $w $activeEditor] + bind $w.frame.text [list CloseExecuteDialog $w $activeEditor] # focus -force $w.frmBtn.btnOk # $noteBook raise $node # insert debug data into text widget # @@ -877,6 +877,11 @@ proc Execute {filePath w} { focus -force $w.frame.text.t } +proc CloseExecuteDialog {w activeEditor} { + destroy $w + focus $activeEditor.frmText.t.t +} + proc Run {w filePath} { # Получаем индекс конца последней строки set endIndex [$w.frame.text index "end-1c"]; # или "end-1l lineend" diff --git a/projman.tcl b/projman.tcl index 18e7299..d937268 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish8.6 "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: alpha19 -# Build: 29102025214442 +# Build: 30102025125227 ###################################################### # определим текущую версию, релиз и т.д.