Make new "tree-info.txt" file not in revision control for locally approved clients...

[ypp-sc-tools.db-test.git] / yarrg / dictionary-manager

diff --git a/yarrg/dictionary-manager b/yarrg/dictionary-manager
index 623e07dc0f5431d3d33b22c075183fb5a615444c..2231266edc8f0e0ef441067a7e5ffd276ba52ba6 100755 (executable)
--- a/yarrg/dictionary-manager
+++ b/yarrg/dictionary-manager
@@ -450,14 +450,14 @@ proc required/pixmap {} {
     set col 0; foreach {colname coldesc rows} $alloptions {
        debug "INIT $col $colname \"$coldesc\""
        label .pe.grid.t$col -text $colname
     set col 0; foreach {colname coldesc rows} $alloptions {
        debug "INIT $col $colname \"$coldesc\""
        label .pe.grid.t$col -text $colname

-       listbox .pe.grid.l$col
+       listbox .pe.grid.l$col -height -1

        foreach {rowname rowdesc} $rows {
            debug "INIT $col $colname \"$coldesc\" $rowname \"$rowdesc\""
            .pe.grid.l$col insert end $rowdesc
        }
        bind .pe.grid.l$col <<ListboxSelect>> [list pixmap_select $col]
        grid .pe.grid.t$col -column $col -row 0
        foreach {rowname rowdesc} $rows {
            debug "INIT $col $colname \"$coldesc\" $rowname \"$rowdesc\""
            .pe.grid.l$col insert end $rowdesc
        }
        bind .pe.grid.l$col <<ListboxSelect>> [list pixmap_select $col]
        grid .pe.grid.t$col -column $col -row 0

-       grid .pe.grid.l$col -column $col -row 1
+       grid .pe.grid.l$col -column $col -row 1 -sticky ns

        incr col
     }
     pixmap_maybe_ok
        incr col
     }
     pixmap_maybe_ok


@@ -509,6 +509,12 @@ proc upload_init {} {
     if {$privacy_setting} {
        package require http
        ::http::config -urlencoding utf-8
     if {$privacy_setting} {
        package require http
        ::http::config -urlencoding utf-8

+       set ua [::http::config -useragent]
+       debug "USERAGENT OLD \"$ua\""
+       set ua [exec ./database-info-fetch useragentstringmap $ua \
+                   dictionary-manager 2>@ stderr]
+       ::http::config -useragent $ua
+       debug "USERAGENT NEW \"$ua\""

     }
 }
 
     }
 }