v0.6: compacted UI

This commit is contained in:
Luxferre
2024-10-12 19:09:06 +03:00
parent 3846afaf10
commit 0c65598156
+21 -21
View File
@@ -591,7 +591,7 @@ foreach opt $wa_opts {
ttk::entry $txtid -width 8 -textvariable $boundvar ttk::entry $txtid -width 8 -textvariable $boundvar
pack $lblid -side left -fill x -padx 5 pack $lblid -side left -fill x -padx 5
pack $txtid -side right pack $txtid -side right
grid $elpref -column $col -row $row -sticky nwe grid $elpref -column $col -row $row -sticky nwe -pady 5
} elseif {([lindex $valopt 0] eq "bool")} { # create a checkbox entry } elseif {([lindex $valopt 0] eq "bool")} { # create a checkbox entry
set chkid ".tabbar.nopts.opts.chk$offs" set chkid ".tabbar.nopts.opts.chk$offs"
ttk::checkbutton $chkid -text $name -variable $boundvar -onvalue 1 -offvalue 0 ttk::checkbutton $chkid -text $name -variable $boundvar -onvalue 1 -offvalue 0
@@ -634,25 +634,25 @@ foreach weap $wa_weapons {
set boundvar_prob "wsc_data($proboffs)" set boundvar_prob "wsc_data($proboffs)"
set groupid ".tabbar.weap.$offs" set groupid ".tabbar.weap.$offs"
ttk::labelframe $groupid -text $wname -labelanchor nw ttk::labelframe $groupid -text $wname -labelanchor nw
ttk::label "$groupid.ammolbl" -text "Ammo" ttk::label "$groupid.ammolbl" -text "A"
ttk::entry "$groupid.ammotxt" -textvariable $boundvar_ammo -width 4 ttk::entry "$groupid.ammotxt" -textvariable $boundvar_ammo -width 4
grid "$groupid.ammolbl" -column 0 -row 0 -sticky nsw grid "$groupid.ammolbl" -column 0 -row 0 -sticky nsw
grid "$groupid.ammotxt" -column 1 -row 0 -sticky nw grid "$groupid.ammotxt" -column 1 -row 0 -sticky nw
ttk::label "$groupid.powerlbl" -text "Power" ttk::label "$groupid.powerlbl" -text "P"
ttk::entry "$groupid.powertxt" -textvariable $boundvar_power -width 4 ttk::entry "$groupid.powertxt" -textvariable $boundvar_power -width 4
grid "$groupid.powerlbl" -column 0 -row 1 -sticky nsw grid "$groupid.powerlbl" -column 2 -row 0 -sticky nsw
grid "$groupid.powertxt" -column 1 -row 1 -sticky nw grid "$groupid.powertxt" -column 3 -row 0 -sticky nw
ttk::label "$groupid.delaylbl" -text "Delay" ttk::label "$groupid.delaylbl" -text "D"
ttk::entry "$groupid.delaytxt" -textvariable $boundvar_delay -width 4 ttk::entry "$groupid.delaytxt" -textvariable $boundvar_delay -width 4
grid "$groupid.delaylbl" -column 0 -row 2 -sticky nsw grid "$groupid.delaylbl" -column 4 -row 0 -sticky nsw
grid "$groupid.delaytxt" -column 1 -row 2 -sticky nw grid "$groupid.delaytxt" -column 5 -row 0 -sticky nw
ttk::label "$groupid.problbl" -text "Probability" ttk::label "$groupid.problbl" -text "Pr"
ttk::entry "$groupid.probtxt" -textvariable $boundvar_prob -width 4 ttk::entry "$groupid.probtxt" -textvariable $boundvar_prob -width 4
grid "$groupid.problbl" -column 0 -row 3 -sticky nsw grid "$groupid.problbl" -column 6 -row 0 -sticky nsw
grid "$groupid.probtxt" -column 1 -row 3 -sticky nw grid "$groupid.probtxt" -column 7 -row 0 -sticky nw
grid $groupid -column $col -row $row -sticky news -padx 5 -pady 3 grid $groupid -column $col -row $row -sticky news -padx 5 -pady 3
incr col incr col
if {$col > 10} { if {$col > 4} {
set col 0 set col 0
incr row incr row
} }
@@ -662,15 +662,14 @@ foreach weap $wa_weapons {
ttk::frame .tabbar.extopts ttk::frame .tabbar.extopts
.tabbar add .tabbar.extopts -text "Extended options (v3)" .tabbar add .tabbar.extopts -text "Extended options (v3)"
# Extended option checkboxes in the first tab # Second extended options tabframe
set eflpref ".tabbar.nopts.eflags" ttk::frame .tabbar.extflags
ttk::labelframe $eflpref -text "Extended option flags (v3)" .tabbar add .tabbar.extflags -text "Extended option flags (v3)"
grid $eflpref -row 1 -column 0 -sticky nw -padx 5 -pady 5 -columnspan 8
# Extended option textboxes in the first tab # Extended option textboxes in the first tab
set etpref ".tabbar.nopts.etxts" set etpref ".tabbar.nopts.etxts"
ttk::labelframe $etpref -text "Extended option parameters (v3)" ttk::labelframe $etpref -text "Extended option parameters (v3)"
grid $etpref -row 2 -column 0 -sticky nw -padx 5 -pady 5 -columnspan 8 grid $etpref -row 2 -column 0 -sticky nw -padx 5 -pady 5 -columnspan 5
set row 0 set row 0
set col 0 set col 0
@@ -694,18 +693,18 @@ foreach opt $wa_ext_opts {
ttk::entry $txtid -width 8 -textvariable $boundvar ttk::entry $txtid -width 8 -textvariable $boundvar
pack $lblid -side left -fill x -padx 5 pack $lblid -side left -fill x -padx 5
pack $txtid -side right pack $txtid -side right
grid $elpref -column $txtcol -row $txtrow -sticky nwe grid $elpref -column $txtcol -row $txtrow -sticky nwe -pady 5
incr txtcol incr txtcol
if {$txtcol > 5} { if {$txtcol > 4} {
set txtcol 0 set txtcol 0
incr txtrow incr txtrow
} }
} elseif {([lindex $valopt 0] eq "bool")} { # create a checkbox entry } elseif {([lindex $valopt 0] eq "bool")} { # create a checkbox entry
set chkid ".tabbar.nopts.eflags.chk$offs" set chkid ".tabbar.extflags.chk$offs"
ttk::checkbutton $chkid -text $name -variable $boundvar -onvalue 1 -offvalue 0 ttk::checkbutton $chkid -text $name -variable $boundvar -onvalue 1 -offvalue 0
grid $chkid -column $chkcol -row $chkrow -sticky nw grid $chkid -column $chkcol -row $chkrow -sticky nw
incr chkcol incr chkcol
if {$chkcol > 4} { if {$chkcol > 3} {
set chkcol 0 set chkcol 0
incr chkrow incr chkrow
} }
@@ -854,3 +853,4 @@ grid $verpref.verlbl -column 0 -row 1 -sticky nws -padx 5 -pady 5
grid $verpref.vertxt -column 1 -row 1 -sticky nw -padx 5 -pady 5 grid $verpref.vertxt -column 1 -row 1 -sticky nw -padx 5 -pady 5
grid $verpref -column 0 -row 1 -sticky nw -padx 5 -pady 5 grid $verpref -column 0 -row 1 -sticky nw -padx 5 -pady 5