diff --git a/debian/changelog b/debian/changelog index f7549f0..f11b11f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +projman (2.0.0-alpha19) stable; urgency=medium + + * Добавил псевдо-терминал + * Исправлен changelog + + -- Sergey Kalinin Wed, 29 Oct 2025 13:10:31 +0300 + projman (2.0.0-alpha18) stable; urgency=medium * Добавлен диалог при открытии файлов отличных от текстовых @@ -377,3 +384,4 @@ projman (2.0.0-alfa0) stable; urgency=medium + diff --git a/lib/files.tcl b/lib/files.tcl index 91c1456..67ab73a 100644 --- a/lib/files.tcl +++ b/lib/files.tcl @@ -312,18 +312,18 @@ namespace eval FileOper { } proc Save {} { - global nbEditor tree env activeProject + global nbEditor tree env activeProject dir if [info exists activeProject] { - set dir $activeProject + set dirProject $activeProject } else { - set dir $env(HOME) + set dirProject $env(HOME) } set nbEditorItem [$nbEditor select] # puts "Saved editor text: $nbEditorItem" if [string match "*untitled*" $nbEditorItem] { - set filePath [tk_getSaveFile -initialdir $dir -filetypes $::types -parent .] + set filePath [tk_getSaveFile -initialdir $dirProject -filetypes $::types -parent .] if {$filePath eq ""} { return } @@ -343,6 +343,9 @@ namespace eval FileOper { # puts "$f was saved" close $f ResetModifiedFlag $nbEditorItem $nbEditor + if {[file tail $filePath] eq "projman.ini"} { + Config::read $dir(cfg) + } } proc SaveAll {} { diff --git a/lib/gui.tcl b/lib/gui.tcl index 385e65b..ef7de71 100644 --- a/lib/gui.tcl +++ b/lib/gui.tcl @@ -145,11 +145,15 @@ grid .frmBody.panel -row 0 -column 1 -sticky nesw grid columnconfigure .frmBody .frmBody.panel -weight 1 grid rowconfigure .frmBody .frmBody.panel -weight 1 +# Панель инстурментов ttk::button $frmTool.btn_tree -command ToolBtnTreePress -image tree_24x24 ttk::button $frmTool.btn_search -command FileOper::FindInFiles -image search_24x24 ttk::button $frmTool.btn_git -command Git::Dialog -image git_24x24 +ttk::button $frmTool.btn_settings -command Settings -image settings_24x24 pack $frmTool.btn_tree $frmTool.btn_search $frmTool.btn_git -side top -padx 1 -pady 1 +pack $frmTool.btn_settings -side bottom -padx 1 -pady 10 + # #label $frmTool.lbl_logo -image tcl # pack $frmTool.btn_quit -side bottom -padx 5 -pady 5 # #pack $frmTool.lbl_logo -side bottom -padx 5 -pady 5 diff --git a/lib/image_library.tcl b/lib/image_library.tcl index 359b909..fd4f186 100644 --- a/lib/image_library.tcl +++ b/lib/image_library.tcl @@ -1926,5 +1926,24 @@ image create photo execute_11x11 -data { IHdpdGggR0lNUFeBDhcAAABHSURBVBjTjY/BDQAwCAKNUzleux1b2Y+PxgiRJ7kjalYBkADSRLwX SvCpZIKzlUlwdWMXJFw5Kzgi7mr5A/XyBI4wA9kzFHrskxvBNKQinAAAAABJRU5ErkJggg== } - - +image create photo settings_24x24 -data { + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABg2lDQ1BJQ0MgcHJvZmlsZQAAKJF9 + kT1Iw1AUhU9TpVIqDnYQUclQneyiIo5ahSJUCLVCqw4mL/2DJg1Jiouj4Fpw8Gex6uDirKuDqyAI + /oC4C06KLlLifUmhRYwPLu/jvHcO990HCI0K06yuWUDTbTOdTIjZ3KoYekUYw1QjiMrMMuYkKQXf + 9XWPAN/v4jzL/96fq1fNWwwIiMSzzDBt4g3i6U3b4LxPHGUlWSU+Jx43qUHiR64rHr9xLros8Myo + mUnPE0eJxWIHKx3MSqZGPEUcUzWd8oWsxyrnLc5apcZaffIXRvL6yjLXqYaQxCKWIEGEghrKqMBG + nHadFAtpOk/4+Addv0QuhVxlMHIsoAoNsusH/4Pfs7UKkxNeUiQBdL84zscoENoFmnXH+T52nOYJ + EHwGrvS2v9oAZj5Jr7e12BHQtw1cXLc1ZQ+43AEGngzZlF0pSCUUCsD7GX1TDui/BcJr3txa5zh9 + ADI0q9QNcHAIjBUpe93n3T2dc/v3Tmt+P5frcrXBnzRwAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI + WXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH6QodESQY6jzHvgAAABl0RVh0Q29tbWVudABDcmVhdGVk + IHdpdGggR0lNUFeBDhcAAAHySURBVEjHrZZPSFVREMZ/iomaBm1SApFHIEoL+6e7ROHTFkEbaWNb + 95YgSFiLyECIoJXtIkEXZqSrIoYwQiEScVOCguQylCzKpyFBm3PjvcO5f8L3wV3cufPNnHNmvjO3 + jAwws06gxTN/lTSfxq0gGx4BFz3bAVCdRizPmOBswFZlZg1HTmBm9UBVzOczafwyL9groAGYAJ4D + bcDDwPFE+AKMADPAdWAAaATOSfpdlMDM+oDZAvJPoC7jEf4CagveRySN/0tgZtXAKtBMabAH5CRt + RzUYyhj80D1pOA48KCzyQArhE9AlqVJSJXAeeJvC6TezY1GCXmAtxnEd6JD0LjJIWnWchRjOFtAj + 6bDcETaAS8DLgPNdSXnfKOkPMBzw/wC0S1oq0oEL8jpAWIw7A0nLAfOypO3/UfKJBBGG+AdBJZtZ + DhgMEK4mJL8WsN0ws8tFSnYimwRqAoQfQJukLW/1jcB7oClmF7ckPYkSbAK5hJXmXV9HNWoH7gCn + U9R9KrquR4GpBOca4L57smJM0n7UptNuu6XCOvDY76KbntMC8C1DsDzwxrPdlrTv62AFuOeu6lZJ + 3W5MPksIPgdckHTF1XAMeCrpRXAexPT6yYSddEj6eKSJJmk3IcFGqWby51AbSvpeqr+KPjcKC7GT + hfgXbteIc85F7RUAAAAASUVORK5CYII= +} diff --git a/lib/menu.tcl b/lib/menu.tcl index 94de67a..92643ea 100644 --- a/lib/menu.tcl +++ b/lib/menu.tcl @@ -76,7 +76,8 @@ proc GetEditMenu {m} { $m add separator $m add command -label [::msgcat::mc "Insert image"] -accelerator "Ctrl+I"\ -command ImageBase64Encode - + $m add separator + $m add command -label [::msgcat::mc "Settings"] -command Settings } proc GetViewMenu {m} { diff --git a/lib/msgs/ru.msg b/lib/msgs/ru.msg index bed78a8..bff7471 100644 --- a/lib/msgs/ru.msg +++ b/lib/msgs/ru.msg @@ -200,7 +200,7 @@ ::msgcat::mcset ru "Select directory" "Выбор директории" ::msgcat::mcset ru "Selected directory" "Директория" ::msgcat::mcset ru "Selection color" "Цвет выделения" -::msgcat::mcset ru "Settings" "Установки" +::msgcat::mcset ru "Settings" "Настройки" ::msgcat::mcset ru "Statusbar" "Строка статуса" ::msgcat::mcset ru "Show backup files" "Показывать временные файлы" ::msgcat::mcset ru "Show the Menu" "Показывать меню" diff --git a/lib/procedure.tcl b/lib/procedure.tcl index 65888ee..d947227 100644 --- a/lib/procedure.tcl +++ b/lib/procedure.tcl @@ -983,3 +983,11 @@ proc DebugInfo {widget file f} { $widget tag add error 0.0 0.end # $widget configure -state disabled } + +# Правка файла настроек +proc Settings {} { + global dir + + FileOper::Edit [file join $dir(cfg) projman.ini] + # Config::read $dir(cfg) +} diff --git a/projman.tcl b/projman.tcl index f9059d3..9dfc858 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish8.6 "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: alpha19 -# Build: 29102025130524 +# Build: 29102025200405 ###################################################### # определим текущую версию, релиз и т.д.