From 97393f2419dfc6ccad6f0300fd2c0e01eb552674 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 8 Aug 2010 17:20:00 +0100
Subject: [PATCH] where-vessels: UI for rounding down sizes

---
 yarrg/where-vessels | 82 ++++++++++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 31 deletions(-)

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 97e5e6c..3c85552 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -474,6 +474,9 @@ proc make-control-grid-entry {cw kind ix ekind args} {
     manyset $props rows inrow
 
     set ew $cw.$ix
+
+    debug "MAKE-CONTROL-GRID-ENTRY $cw $kind $ix $ekind $rows $inrow $ew"
+
     eval [list $ekind $ew] $args
 
     switch -exact $kind {
@@ -494,6 +497,43 @@ proc make-control-grid-entry {cw kind ix ekind args} {
     return $ew
 }
 
+proc control-tickbox-flip {varsvn values} {
+    upvar #0 $varsvn vars
+    foreach val $values {
+	set vars($val) [expr {!$vars($val)}]
+    }
+    redraw-needed c.-tickbox-flip $varsvn $values
+}
+
+proc populate-control-grid-tickboxes {cw rows inrow varsvn values
+				    label_kind valvn default_get label_get} {
+    debug "POPULATE-CONTROL-GRID-TICKBOXES $cw $rows $inrow $varsvn\
+             [list $values] $label_kind $valvn"
+
+    upvar #0 $varsvn vars
+    upvar 1 $valvn val
+    set count [llength $values]
+
+    begin-control-grid $cw $count $rows $inrow
+
+    for {set ix 0} {$ix < $count} {incr ix} {
+	set val [lindex $values $ix]
+	set vars($val) [uplevel 1 $default_get]
+	set ew [make-control-grid-entry $cw ix $ix checkbutton \
+		    -variable ${varsvn}($val) \
+		    -font fixed \
+		    -command [list redraw-needed c.-g.-tickbox $cw $val]]
+	$ew configure -$label_kind [uplevel 1 $label_get]
+	switch -exact $label_kind {
+	    image { $ew configure -height 16 }
+	}
+    }
+    [make-control-grid-entry $cw final invert button] \
+	configure \
+	-text flip -command [list control-tickbox-flip $varsvn $values] \
+	-padx 0 -pady 0
+}
+
 #---------- smashing ----------
 
 set smash_subclass 0
@@ -558,7 +598,7 @@ proc make-smashers {} {
 
     set cw [make-smasher size "Size\nround down" frame]
     populate-control-grid-tickboxes $cw 2 0 smash_size $vc_codes \
-	image val { return 0 } { return $vc_code2abbrev($val) }
+	image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} }
 }
 
 #---------- filtering ----------
@@ -612,41 +652,21 @@ proc filter-says-yes/xabbre {codel} {
     return [regexp -- $filter_xabbre $xabbrev]
 }
 
-proc filter-tickbox-flip {fil} {
-    upvar #0 filter_$fil vars
-    set values [filter-values/$fil]
-    foreach val $values {
-	set vars($val) [expr {!$vars($val)}]
-    }
-    redraw-needed
-}
-
 proc make-tickbox-filter {fil label rows inrow} {
-    upvar #0 filter_$fil vars
     set values [filter-values/$fil]
-    set count [llength $values]
-    set noicons [catch { info args filter-icon/$fil }]
+
+    if {![catch { info args filter-icon/$fil }]} {
+	set label_get { filter-icon/$fil $val }
+	set label_kind image
+    } else {
+	set label_get { filter-map/$fil $val }
+	set label_kind text
+    }
 
     set fw [make-filter $fil $label frame]
-    begin-control-grid $fw $count $rows $inrow
 
-    for {set ix 0} {$ix < $count} {incr ix} {
-	set val [lindex $values $ix]
-	set vars($val) [filter-default/$fil $val]
-	set ew [make-control-grid-entry $fw ix $ix checkbutton \
-		    -variable filter_${fil}($val) \
-		    -font fixed \
-		    -command [list redraw-needed tickbox-filter $fil $val]]
-	if {!$noicons} {
-	    $fw.$ix configure -image [filter-icon/$fil $val] -height 16
-	} else {
-	    $fw.$ix configure -text [filter-map/$fil $val]
-	}
-    }
-    [make-control-grid-entry $fw final invert button] \
-	configure \
-	-text flip -command [list filter-tickbox-flip $fil] \
-	-padx 0 -pady 0
+    populate-control-grid-tickboxes $fw $rows $inrow filter_$fil $values \
+	 $label_kind val { filter-default/$fil $val } $label_get
 }
 
 proc entry-filter-changed {fw fil n1 n2 op} {
-- 
2.30.2