From 297d0f742023e987bf857d6ebb3ca5ca9a654b5e Mon Sep 17 00:00:00 2001 From: Sergey Kalinin Date: Mon, 27 Oct 2025 20:59:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=B2=20windows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/editor.tcl | 1 + lib/files.tcl | 6 +++++- lib/notebook.tcl | 4 +++- lib/tree.tcl | 9 ++++++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/editor.tcl b/lib/editor.tcl index b92dfe6..df01414 100644 --- a/lib/editor.tcl +++ b/lib/editor.tcl @@ -1515,6 +1515,7 @@ namespace eval Editor { ICO XPM } + # puts "$itemName" set fr $itemName if ![string match "*untitled*" $itemName] { set lblText $fileFullPath diff --git a/lib/files.tcl b/lib/files.tcl index ee0600a..d09afb3 100644 --- a/lib/files.tcl +++ b/lib/files.tcl @@ -395,6 +395,7 @@ namespace eval FileOper { proc Edit {fileFullPath {nbEditor .frmWork.nbEditor}} { global tree + puts "$fileFullPath" if {[file exists $fileFullPath] == 0} { return false } else { @@ -414,7 +415,9 @@ namespace eval FileOper { } set filePath [file dirname $fileFullPath] set fileName [file tail $fileFullPath] - regsub -all {\.|/|\\|\s} $fileFullPath "_" itemName + + regsub -all {\.|/|\\|\s|:} $fileFullPath "_" itemName + set itemName [string tolower $itemName] set itemName "$nbEditor.$itemName" set treeItemName [Tree::InsertItem $tree {} $fileFullPath "file" $fileName] @@ -437,6 +440,7 @@ namespace eval FileOper { focus -force $itemName.frmText.t.t .frmStatus.lblSize configure -text [GetFileAttr $fileFullPath "size"] .frmStatus.lblEncoding configure -text [GetFileMimeType $fileFullPath "charset"] + puts ">> $itemName" return $itemName } diff --git a/lib/notebook.tcl b/lib/notebook.tcl index af24975..3c9f9e6 100644 --- a/lib/notebook.tcl +++ b/lib/notebook.tcl @@ -13,7 +13,9 @@ namespace eval NB { proc InsertItem {nb item type} { switch $type { file { - regsub -all {\.|/|\\|\s} $item "_" itemName + set item [string tolower $item] + regsub -all {\.|/|\\|\s|:} $item "_" itemName + # puts "$item -> $itemName" if [winfo exists $nb.$itemName] { set fm $nb.$itemName } else { diff --git a/lib/tree.tcl b/lib/tree.tcl index 35ada20..2ff8bc8 100644 --- a/lib/tree.tcl +++ b/lib/tree.tcl @@ -18,7 +18,8 @@ namespace eval Tree { # puts "$tree $parent $item $type $text" switch $type { file { - regsub -all {\.|/|\\|\s} $item "_" subNode + regsub -all {\.|/|\\|\s|:} $item "_" subNode + set subNode [string tolower $subNode] # puts "Inserted tree node: $subNode" set fileExt [string trimleft [file extension $text] "."] #set fileName [string trimleft [file extension $text] "."] @@ -41,7 +42,8 @@ namespace eval Tree { } } directory { - regsub -all {\.|/|\\|\s} $item "_" subNode + regsub -all {\.|/|\\|\s|:} $item "_" subNode + set subNode [string tolower $subNode] # puts $subNode if {[string match {*debian*} [string tolower [file tail $item]]]} { set image [::FindImage debian] @@ -104,7 +106,7 @@ namespace eval Tree { set key [lindex [split $id "::"] 0] if {$values eq "" || $key eq ""} {return} - # puts "$key $tree $values" + puts "$key $tree $values" switch -regexp $key { directory { FileOper::ReadFolder $values @@ -112,6 +114,7 @@ namespace eval Tree { } file { set v [FileOper::Edit $values $nbEditor] + puts $v if {$v eq false} { $tree delete $id }