diff --git a/lib/function.tcl b/lib/function.tcl index c703376..29a593e 100644 --- a/lib/function.tcl +++ b/lib/function.tcl @@ -765,7 +765,7 @@ proc AddToplevel {lbl img {win_name .add}} { grid $win_name.lbl -row 0 -column 0 -sticky nsw -padx 0 -pady 1 -rowspan 2 grid $frm -row 0 -column 1 -sticky nw -padx 2 -pady 2 grid $frm_btn -row 1 -column 1 -sticky sew -padx 0 -pady 0 - pack $frm_btn.btn_ok $frm_btn.btn_cancel -side right -padx 5 -pady 5 + pack $frm_btn.btn_cancel $frm_btn.btn_ok -side right -padx 5 -pady 5 #pack $frm_btn.btn_ok -side right -padx 2 return $frm @@ -2338,3 +2338,4 @@ proc Del::inet {tree host profile_name} { + diff --git a/lib/gui.tcl b/lib/gui.tcl index 5a78468..5292543 100644 --- a/lib/gui.tcl +++ b/lib/gui.tcl @@ -28,7 +28,7 @@ wm positionfrom . user #ttk::style configure Custom.Treeview -foreground red #ttk::style configure Custom.Treeview -rowheight 20 -ttk::style theme use black +ttk::style theme use dark # Панель инсрументов set frm_tool [ttk::frame .frm_tool] @@ -98,3 +98,4 @@ pack $frm_tree $frm_work -side left -expand true -fill both #.panel add $frm_tool -weight 1 .panel add $frm_tree -weight 1 .panel add $frm_work -weight 1 + diff --git a/lib/ttk_theme_black.tcl b/lib/ttk_theme_dark.tcl similarity index 95% rename from lib/ttk_theme_black.tcl rename to lib/ttk_theme_dark.tcl index 39acbf1..87f6442 100644 --- a/lib/ttk_theme_black.tcl +++ b/lib/ttk_theme_dark.tcl @@ -8,11 +8,11 @@ package require Tk -namespace eval ttk::theme::black { +namespace eval ttk::theme::dark { variable version 0.0.1 variable dir [file dirname [info script]] - package provide ttk::theme::black $version + package provide ttk::theme::dark $version # NB: These colors must be in sync with the ones in black.rdb @@ -31,7 +31,7 @@ namespace eval ttk::theme::black { -foreground "#ffffff" } - ttk::style theme create black -parent clam -settings { + ttk::style theme create dark -parent clam -settings { # ----------------------------------------------------------------- # Theme defaults @@ -111,7 +111,7 @@ namespace eval ::tablelist:: { proc blackTheme {} { variable themeDefaults - array set colors [array get ttk::theme::black::colors] + array set colors [array get ttk::theme::dark::colors] array set themeDefaults [list \ -background "#000000" \ @@ -137,3 +137,4 @@ namespace eval ::tablelist:: { -arrowstyle sunken10x9 ] } } +