Новая сборка

lib/files.tcl

@@ -33,7 +33,7 @@ namespace eval FileOper {
         lappend cmd $fileFullPath
         catch $cmd pipe 
         # puts $pipe
-        if [regexp -nocase -- {(\w+)/([[:alnum:]-]+); charset=([[:alnum:]-]+)} $pipe m fType fExt fCharset] {
+        if [regexp -nocase -- {(\w+)/([\w\-_\.]+); charset=([[:alnum:]-]+)} $pipe m fType fExt fCharset] {
             puts "$fType $fExt $fCharset"
         }
         switch $opt {

lib/git.tcl

@@ -120,6 +120,7 @@ namespace eval Git {
     
     proc Status {} {
         global cfgVariables activeProject
+        cd $activeProject
         set cmd exec
         lappend cmd $cfgVariables(gitCommand)
         lappend cmd "status"
@@ -127,6 +128,7 @@ namespace eval Git {
         lappend cmd "--"
         lappend cmd $activeProject
         catch $cmd pipe
+        puts $cmd
         if [regexp -nocase -- {^fatal:} $pipe match] {
             return 
         }
@@ -605,9 +607,9 @@ namespace eval Git {
 
         # Git repo status
         foreach { word } [Git::Status] {
-            # puts $word
+            puts $word
-            if [regexp -nocase -- {([\w\s])([\s\w?]+)\s../(.+?)} $word match v1 v2 fileName] {
+            if [regexp -nocase -- {([\w\s\?])([\s\w\\*\?]+)\s(.+?)} $word match v1 v2 fileName] {
-                # puts "$v1 $v2 $fileName"
+                puts "$v1 $v2 $fileName"
                 # $fr.unindexed.t delete 1.0 end
                 if {$v1 ne " "} {
                     $fr.body.lCommit insert end $fileName
@@ -625,7 +627,8 @@ namespace eval Git {
             Git::DialogUpdate $Git::fr
         }
         bind $fr.body.lBox <Return> "Git::CommitAdd $fr"
-        bind $fr.body.lBox <Double-Button-1> "catch {Git::CommitAdd $fr; $fr.body.t delete 0.0 end; $fr.body.tCommit delete 0.0 end}"
+        bind $fr.body.lBox <Double-Button-1> \
+            "catch {Git::CommitAdd $fr; $fr.body.t delete 0.0 end; $fr.body.tCommit delete 0.0 end}"
         bind $fr.body.lBox <Button-1><ButtonRelease-1> "Git::ListBoxPress $fr"
         bind $fr.body.lBox <KeyRelease> "Git::Key %K $fr"
 

lib/gui.tcl

@@ -70,7 +70,7 @@ if [info exists cfgVariables(theme)] {
 }
 
 ttk::frame .frmMenu -border 0 -relief raised
-ttk::frame .frmBody -border 1 -relief raised
+ttk::frame .frmBody -border 0 -relief raised
 ttk::frame .frmStatus -border 0 -relief raised 
 pack .frmMenu -side top -padx 1 -fill x
 pack .frmBody -side top -padx 1 -fill both -expand true
@@ -122,7 +122,7 @@ pack $frmTool.btn_tree $frmTool.btn_search $frmTool.btn_git -side top -padx 1 -p
 # #pack $frmTool.lbl_logo -side bottom -padx 5 -pady 5
 # 
 # # Дерево с полосами прокрутки
-set frmTree [ttk::frame .frmBody.frmTree]
+set frmTree [ttk::frame .frmBody.frmTree -border 0]
 
 set tree [ttk::treeview $frmTree.tree -show tree \
     -xscrollcommand [list .frmBody.frmTree.h set] \
@@ -135,7 +135,7 @@ ttk::scrollbar $frmTree.h -orient horizontal -command [list $frmTree.tree xview]
 ttk::scrollbar $frmTree.v -orient vertical -command [list $frmTree.tree yview]
 
 bind $tree <Double-ButtonPress-1> {Tree::DoublePressItem $tree}
-bind $tree  <ButtonRelease-1> {Tree::PressItem $tree; break}
+bind $tree  <ButtonRelease-1> {Tree::PressItem $tree; 	break}
 
 grid $tree -row 0 -column 0 -sticky nsew
 grid $frmTree.v -row 0 -column 1 -sticky nsew

projman.tcl

@@ -10,7 +10,7 @@ exec wish "$0" -- "$@"
 ######################################################
 # Version: 2.0.0
 # Release: alpha
-# Build: 11112022131048
+# Build: 15112022153646
 ######################################################
 
 # определим текущую версию, релиз и т.д.

theme/black.tcl

@@ -61,7 +61,7 @@ namespace eval ttk::theme::black {
         -selectbackground $colors(-selectbg) \
         -selectforeground $colors(-selectfg) \
         -selectborderwidth 0 \
-        -font TkDefaultFont \
+        -font "{Droid Sans Mono} 9" \
         ;
 
     $styleCmd map "." \
@@ -74,17 +74,17 @@ namespace eval ttk::theme::black {
 
     # ttk widgets.
     $styleCmd configure TButton \
-        -width -8 -padding {5 1} -relief raised
+        -width -8 -padding {5 1} -relief link
-    $styleCmd configure TMenubutton \
+    $styleCmd configure TMenubutton\
-        -width -11 -padding {5 1} -relief raised
+        -relief flat -arrowsize 0
     $styleCmd configure TCheckbutton \
-        -indicatorbackground "#ffffff" -indicatormargin {1 1 4 1}
+        -indicatorbackground $colors(-lighter) -indicatormargin {1 1 4 1}
     $styleCmd configure TRadiobutton \
-        -indicatorbackground "#ffffff" -indicatormargin {1 1 4 1}
+        -indicatorbackground $colors(-lighter) -indicatormargin {1 1 4 1}
 
     $styleCmd configure TEntry \
-        -fieldbackground white -foreground black \
+        -fieldbackground gray20 -foreground black \
-        -padding {2 0}
+        -padding {2 0} -border -1
     $styleCmd configure TCombobox \
         -fieldbackground white -foreground black \
         -padding {2 0}
@@ -92,8 +92,11 @@ namespace eval ttk::theme::black {
         -fieldbackground white -foreground black \
         -padding {2 0}
 
+    $styleCmd configure TNotebook \
+        -border -1
     $styleCmd configure TNotebook.Tab \
-        -padding {6 2 6 2}
+        -padding {6 2 6 2} \
+        -border -1
 
     $styleCmd map TNotebook.Tab -background [list \
         selected $colors(-lighter)]
@@ -105,14 +108,16 @@ namespace eval ttk::theme::black {
 
     $styleCmd configure TreeCtrl \
         -background gray30 -itembackground {gray60 gray50} \
-        -itemfill white -itemaccentfill yellow
+        -itemfill white -itemaccentfill yellow -border -1
 
-    $styleCmd map Treeview \
+    $styleCmd map Treeview\
-        -background [list selected $colors(-selectbg)] \
+        -background [list selected $colors(-lighter)] \
         -foreground [list selected $colors(-selectfg)]
+        # -background [list selected $colors(-selectbg)] \
 
-    $styleCmd configure Treeview -fieldbackground $colors(-lighter)
+    $styleCmd configure Treeview -fieldbackground gray25
   }
+  puts [ttk::style element names]
 }
 
 # A few tricks for Tablelist.

theme/ttk_theme_dark.tcl

@@ -84,6 +84,8 @@ namespace eval ttk::theme::dark {
         ttk::style configure TSpinbox \
             -fieldbackground $colors(-lightframe) \
             -foreground #ffffff
+
+        ttk::style configure TScrollbar -relief flat -border 0
         
         # ttk::style configure TNotebook 
             # -bordercolor $colors(-frame)