Changeset e70625a in tol

Timestamp:

Feb 2, 2012, 8:31:53 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

a4a32ef

Parents:

23f300d

Message:

refs #1191, se corrige un error en el empaquetado de -customgui y el título de la ventana de diálogo de proceso de tareas de instalación

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4054 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/toltk/tolpkg_gui.tcl (modified) (8 diffs)

tolbase/lib/toltk/tolpkg_gui.tcl

@@ -901 +901 @@
         -command [ list ::TolPkgGUI::InstallPackages $listNEW ]
   } elseif { [ llength $listNEW ] > 1 } {
-    $w add command -label [ mc "Install selected" ] \
+    $w add command -label [ mc "Install selected" ]... \
         -command [ list ::TolPkgGUI::InstallPackages $listNEW ]
   }
-  $w add command -label "[ mc {Install ZIP} ]..." \
+  $w add command -label [ mc "Install ZIP" ]... \
       -command "::TolPkgGUI::InstallZip"
   # update list
@@ -912 +912 @@
         -command [ list ::TolPkgGUI::UpdatePackageVersion $listUPD ]
   } elseif { [ llength $listUPD ] > 1 } {
-    $w add command -label [ mc "Update selected" ] \
+    $w add command -label [ mc "Update selected" ]... \
         -command [ list ::TolPkgGUI::UpdatePackageVersion $listUPD ]
   }
-  $w add command -label [ mc "Update all" ] \
+  $w add command -label [ mc "Update all" ]... \
       -command "::TolPkgGUI::UpdatePackageVersion" \
       -state [ EntryState nodesInfo(update) ]
@@ -924 +924 @@
         -command [ list ::TolPkgGUI::UpgradePackages $listUPG ]
   } elseif { [ llength $listUPG ] > 1 } {
-    $w add command -label [ mc "Upgrade selected" ] \
+    $w add command -label [ mc "Upgrade selected" ]... \
         -command [ list ::TolPkgGUI::UpgradePackages $listUPG ]
   }
-  $w add command -label [ mc "Upgrade all" ] \
+  $w add command -label [ mc "Upgrade all" ]... \
       -command "::TolPkgGUI::UpgradePackages" \
       -state [ EntryState nodesInfo(upgrade) ]
@@ -1084 +1084 @@
         -relief flat -borderwidth 1 -highlightthickness 0 \
         -selectbackground #c3c3ff
+    frame $f.cgui
     ProgressBar $f.pbar
     $w add -text Ok 
@@ -1092 +1093 @@
     grid columnconfigure $f 0 -weight 1
     grid rowconfigure $f 1 -weight 1
-    if { $DlgProcessData(-customgui) ne "" } {
-      eval $DlgProcessData(-customgui) $f 3
-    }
   } else {
+    wm title $w $DlgProcessData(-title)
     set f [ DlgProcessGetFrame ]
+  }
+  if { $DlgProcessData(-customgui) ne "" } {
+    grid $f.cgui -row 3 -column 0 -sticky snew
+    eval $DlgProcessData(-customgui) $f.cgui
+  } else {
+    grid remove $f.cgui
+    grid rowconfigure $f 3 -weight 0
   }
   $f.pbar configure -maximum 1 \
@@ -1118 +1124 @@
   set DlgProcessData(state) ""
   $w draw
+  foreach wc [ winfo children $f.cgui ] {
+    destroy $wc
+  }
 }
 
@@ -1483 +1492 @@
 }
 
-proc ::TolPkgGUI::CreateSelectDir { f row } {
+proc ::TolPkgGUI::CreateSelectDir { f } {
   set varname [ DlgProcessGetVariableName "directory" ]
   upvar \#0 $varname var
@@ -1491 +1500 @@
     trace add variable $varname write ::TolPkgGUI::OnChangeDirectory
   }
-  frame $f.fdir
-  label $f.fdir.lb -text [ mc "Output directory" ]:
-  entry $f.fdir.ent -textvariable $varname
-  button $f.fdir.btn -image folder_yellow_16 \
+  label $f.lb -text [ mc "Output directory" ]:
+  entry $f.ent -textvariable $varname
+  button $f.btn -image folder_yellow_16 \
       -command "::TolPkgGUI::ChooseDir $varname"
-  grid $f.fdir.lb -row 0 -column 0 -sticky w
-  grid $f.fdir.ent -row 0 -column 1 -sticky ew
-  grid $f.fdir.btn -row 0 -column 2 -sticky ew
-  grid columnconfigure $f.fdir 1 -weight 1
-  grid $f.fdir -row $row -column 0 -sticky ew
+  grid $f.lb -row 0 -column 0 -sticky w
+  grid $f.ent -row 0 -column 1 -sticky ew
+  grid $f.btn -row 0 -column 2 -sticky ew
+  grid columnconfigure $f 1 -weight 1
   if { $var eq "" } {
     set var [ pwd ]