Index: tolbase/lib/toltk/tolconfig_gui.tcl
===================================================================
--- tolbase/lib/toltk/tolconfig_gui.tcl	(revision 543fdce3b1d9b7d6825dba15c7c5c33d8f909fb1)
+++ tolbase/lib/toltk/tolconfig_gui.tcl	(revision 21beb268dac8b7537eb448bb1ea0a6d4f27d8094)
@@ -1,3 +1,5 @@
+package require BWidget
 package require wtree
+package require msgcat
 
 namespace eval ::TolConfigGUI {
@@ -60,10 +62,16 @@
 proc ::TolConfigGUI::FillTreeConfig { } {
   variable win
+  variable tree
   variable treeInfo
 
   array unset treeInfo
   set treeInfo(node,) root
+  $tree item delete all
   FillTree TolConfigManager::Config "" [ ::TolConfig::GetConfig ]
 
+}
+
+proc ::TolConfigGUI::AcceptConfig { } {
+  puts AcceptConfig
 }
 
@@ -73,11 +81,14 @@
 
   set win .tolconfig
-
-  if { [ winfo exists $win ] } {
-    raise $win
-  } else {
-    toplevel $win
-    wm state $win withdrawn
-    set tree $win.tree
+  if { ![ winfo exists $win ] } {
+    Dialog $win -title [ mc "Tol configuration"] \
+        -modal local
+    $win add -text Ok
+    $win add -text Cancel
+    
+    set f [ $win getframe ]
+    grid rowconfigure $f 0 -weight 1
+    grid columnconfigure $f 0 -weight 1
+    set tree $f.tree
     wtree  $tree
     $tree configure -table no -filter yes -columns {
@@ -85,9 +96,12 @@
       { {text} -tags STATUS -label "Value" -editable yes }
     }
-    grid $tree -row 1 -column 0 -sticky "snew"
+    grid $tree -row 0 -column 0 -sticky "snew"
     grid rowconfigure $win 1 -weight 1
     grid columnconfigure $win 0 -weight 1
-    FillTreeConfig
-    wm state $win normal
+  }
+  FillTreeConfig
+  set ans [ $win draw ]
+  if { $ans == 0 } {
+    AcceptConfig
   }
 }