Changeset 23f300d in tol

Timestamp:

Feb 1, 2012, 7:45:19 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

e70625a

Parents:

2a670e5

Message:

refs #1191,

• el backup a veces falla en windows 7, lo hemos deshabilitado
• el arbol se refrezca después de install/upgrade/update

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

Location:

tolbase/lib/toltk

Files:

• tolpkg.tcl (modified) (3 diffs)
• tolpkg_gui.tcl (modified) (10 diffs)

tolbase/lib/toltk/tolpkg.tcl

@@ -32 +32 @@
 
 proc ::TolPkg::BackupPackage { p {delete 0}} {
+  # backup is not working, some problem has being reported on Windows 7
+  return 1
   set path [ GetPkgDirectory $p ]
   if { [ file exists $path ] } {
@@ -44 +46 @@
 
 proc ::TolPkg::RestoreBackup { p { delete 0 } } {
+  # backup is not working, some problem has being reported on Windows 7
+  return 1
   set path [ GetPkgDirectory $p ]
   set bak "${path}.bak"
@@ -55 +59 @@
 
 proc ::TolPkg::DeleteBackup { p } {
+  # backup is not working, some problem has being reported on Windows 7
+  return 1
   set path [ GetPkgDirectory $p ]
   set bak "${path}.bak"

tolbase/lib/toltk/tolpkg_gui.tcl

@@ -985 +985 @@
 }
 
+proc ::TolPkgGUI::RefreshTree { } {
+  variable tree
+
+  $tree item delete all
+  FillTreeInfo $tree
+}
+
 proc ::TolPkgGUI::SyncServers { } {
   variable tree
   update
   ::TolPkg::UpdateRepositoryInfo
-  $tree item delete all
-  FillTreeInfo $tree
+  RefreshTree
 }
 
@@ -1062 +1068 @@
     -cmdlabelitem ""
     -customgui ""
+    -refreshtree 0
   }
   set DlgProcessData(-label) [ mc "You are about to process"]:
@@ -1220 +1227 @@
   }
   puts "InstallPackages: $InstallList"
-  DlgProcess $InstallList -title [ mc "Export packages" ] \
-      -label [ mc "You are about to export"]: \
+  DlgProcess $InstallList -title [ mc "Install packages" ] \
+      -label [ mc "You are about to install"]: \
       -beforestart ::TolPkgGUI::Installing \
-      -cmditem "InstallThisPackage"
+      -cmditem "InstallThisPackage" -refreshtree 1
   
 }
@@ -1242 +1249 @@
   variable DlgProcessData
   
-  DlgProcessStart 
+  DlgProcessStart
+  set hasProcessed 0
   foreach p $DlgProcessData(items) {
     if { $DlgProcessData(status) ne "working" } break
     DlgProcessItem $p
     DlgProcessAdvance
-  }
-  DlgProcessStop  
+    set hasProcessed 1
+  }
+  DlgProcessStop
+  if { $DlgProcessData(-refreshtree) && $hasProcessed } {
+    after idle ::TolPkgGUI::RefreshTree
+  }
 }
 
@@ -1286 +1298 @@
 
   set installZipData [ tk_getOpenFile -defaultextension .zip -multiple 1 \
-                           -parent $win -title [ mc "Select zip" ] \
+                           -parent $win -title [ mc "Select zip packages" ] \
                            -filetypes {{zip {.zip}}} ]
   if { $installZipData ne "" } {
@@ -1295 +1307 @@
         -label [ mc "You are about to install zip"]: \
         -beforestart ::TolPkgGUI::InstallingZip \
-        -cmditem InstallThisZip
+        -cmditem InstallThisZip -refreshtree 1
   }
 }
@@ -1342 +1354 @@
       -label [ mc "You are about to upgrade"]: \
       -beforestart ::TolPkgGUI::Upgrading \
-      -cmditem "InstallThisPackage"
+      -cmditem "InstallThisPackage" -refreshtree 1
 }
 
@@ -1377 +1389 @@
       -label [ mc "You are about to update"]: \
       -beforestart ::TolPkgGUI::Updating \
-      -cmditem "InstallThisPackage"
+      -cmditem "InstallThisPackage" -refreshtree 1
 }
 
 proc ::TolPkgGUI::ImportSyncInfo { } {
   Unimplemented "Import Sync Info"
+}
+
+proc ::TolPkgGUI::ExportSyncInfo { } {
+  Unimplemented "Export Sync Info"
 }
 
@@ -1390 +1406 @@
       -icon warning \
       -type ok -message [ mc "Unimplemented option" ]
-}
-
-proc ::TolPkgGUI::ExportSyncInfo { } {
-  Unimplemented "Export Sync Info"
 }
 
@@ -1447 +1459 @@
         -beforestart ::TolPkgGUI::Exporting \
         -customgui "CreateSelectDir" \
-        -cmditem "ExportThisPackage"
+        -cmditem "ExportThisPackage" -refreshtree 0
   }
 }