[Vectorlinux-devel] [vinstall-ng commit] r80 - in branches/iVL: . .lang

[<cod...@go...>]

Author: uelsk8s
Date: Fri Jul 25 11:29:21 2008
New Revision: 80

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.pot
   branches/iVL/.lang/ClsPartSel.pot
   branches/iVL/.lang/ClsWinDrives.pot
   branches/iVL/.lang/FMain.pot
   branches/iVL/.lang/FrmDiskPart.pot
   branches/iVL/.lang/FrmLicense.pot
   branches/iVL/.lang/FrmPartScheme.pot
   branches/iVL/.lang/FrmPartSel.pot
   branches/iVL/.lang/FrmPkgSel.pot
   branches/iVL/.lang/FrmSelISO.pot
   branches/iVL/.lang/FrmSummary.pot
   branches/iVL/.lang/FrmWinDrives.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlPkgSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/.lang/MdlSummarize.pot
   branches/iVL/.lang/MdlWinDrives.pot
   branches/iVL/MdlInstallSys.module

Log:
added progressbar code to install packages sub

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /root/new-install/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /root/new-install/ClsGlobal.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot	(original)
+++ branches/iVL/.lang/ClsPartSel.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /root/new-install/ClsPartSel.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot	(original)
+++ branches/iVL/.lang/ClsWinDrives.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /root/new-install/ClsWinDrives.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /root/new-install/FMain.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /root/new-install/FrmDiskPart.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot	(original)
+++ branches/iVL/.lang/FrmLicense.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmLicense.class
+# /root/new-install/FrmLicense.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /root/new-install/FrmPartScheme.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /root/new-install/FrmPartSel.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot	(original)
+++ branches/iVL/.lang/FrmPkgSel.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /root/new-install/FrmPkgSel.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /root/new-install/FrmSelISO.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /root/new-install/FrmSummary.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /root/new-install/FrmWinDrives.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /root/new-install/MdlCore.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot	(original)
+++ branches/iVL/.lang/MdlDiskPart.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /root/new-install/MdlDiskPart.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot	(original)
+++ branches/iVL/.lang/MdlObjSizer.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /root/new-install/MdlObjSizer.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot	(original)
+++ branches/iVL/.lang/MdlPartSel.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /root/new-install/MdlPartSel.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot	(original)
+++ branches/iVL/.lang/MdlPkgSel.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /root/new-install/MdlPkgSel.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /root/new-install/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot	(original)
+++ branches/iVL/.lang/MdlSummarize.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /root/new-install/MdlSummarize.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Fri Jul 25 11:29:21 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /root/new-install/MdlWinDrives.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Fri Jul 25 11:29:21 2008
@@ -193,7 +193,7 @@
     ELSE
       ME.PERFORM_FULL_INSTALL()
         're-direct to packages for now
-      'ME.INSTALL_PACKAGES()
+      ME.INSTALL_PACKAGES()
     END IF

 END
@@ -287,7 +287,7 @@
                     REPEAT
                       WAIT 2
                            UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
-                            PRINT CStr(iCurrSize) & "/" & 
CStr(iTotalSize) & " = " & iVal & "%"
+


                     UNTIL
@@ -341,7 +341,7 @@
   IF iVal > FrmInstallSys.pbInstallProg.Value THEN
     FrmInstallSys.pbInstallProg.Value = iVal
   END IF
-
+  PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " & 
iVal & "%"
 END


@@ -358,6 +358,7 @@
     DIM sTlzDesc AS String
     DIM iTlzSize AS Integer
     DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
+    DIM sTargetSize AS Variant

     sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))

@@ -369,11 +370,16 @@
                sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) - 
InStr(sFile[i + 1], ":")))
                sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove 
the ./ from the location line
                iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) - 
InStr(sFile[i + 3], ":")))
-              iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
-              iTlzSize = Trim(iTlzSize)
+              'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
+              'iTlzSize = Trim(iTlzSize)
+              FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName & " ..."
+              FrmInstallSys.pbInstallProg.Value = 0.0

               PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
                   ' install each package
+               SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " 
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+               sTargetSize = Trim(CStr(sTargetSize))
+


               sDump = ""
@@ -382,7 +388,8 @@
                 WAIT 1
                   IF hproc.State = Process.Running THEN
                     REPEAT
-                      WAIT 2
+                      WAIT 1
+                      UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize)
                           ' figure out the progress again
                     UNTIL
                       hproc.State = Process.Stopped