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

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

Author: m0e.lnx
Date: Mon Sep 29 13:31:11 2008
New Revision: 189

Modified:
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/.lang/en_US.po
    branches/iVL/FMain.class
    branches/iVL/FrmEmbUsrAdd.class
    branches/iVL/FrmInstallSys.form
    branches/iVL/FrmLilo.class
    branches/iVL/FrmNetConf.class
    branches/iVL/FrmRootPass.class
    branches/iVL/FrmRootPass.form
    branches/iVL/FrmZoneSet.class
    branches/iVL/FrmZoneSet.form
    branches/iVL/MdlCore.module
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlInstallSys.module

Log:
- Fixed problem with overall progressbar (re-coded sub to get the correct  
total package count to be installed)
- Fixed object positioning / sizing on zone set step and root password  
setting.
- Fixed issue with root password verification  box displaying real text and  
not encoded password
- Re-aligned navigation status on left panel.






Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Mon Sep 29 13:31:11 2008
@@ -91,11 +91,11 @@
  msgstr ""

  #: MdlCore.module:511
-msgid "System Administrator"
+msgid "Regional Settings"
  msgstr ""

  #: MdlCore.module:512
-msgid "Network Configuration"
+msgid "System Administrator"
  msgstr ""

  #: MdlCore.module:513
@@ -103,6 +103,10 @@
  msgstr ""

  #: MdlCore.module:514
+msgid "Network Configuration"
+msgstr ""
+
+#: MdlCore.module:515
  msgid "Hardware Configuration"
  msgstr ""


Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po	(original)
+++ branches/iVL/.lang/en_US.po	Mon Sep 29 13:31:11 2008
@@ -76,25 +76,30 @@
  msgid "Current Status"
  msgstr "Current Status"

-#: FrmHostPrep.class:139 FrmInstallSys.class:226 FrmLilo.class:203
-#: FrmPartScheme.class:121 FrmPkgSel.class:99 FrmPkgsel2.class:86
-#: FrmSelISO.class:236 FrmSummary.class:87
+#: FrmHostPrep.class:139 FrmLilo.class:203 FrmPartScheme.class:121
+#: FrmPkgSel.class:99 FrmPkgsel2.class:86 FrmSelISO.class:236
+#: FrmSummary.class:87
  msgid "TextLabel1"
  msgstr "-"

-#: FrmInstallSys.class:183
+#: FrmInstallSys.class:50
+#, fuzzy
+msgid "Current Step"
+msgstr "Current Step "
+
+#: FrmInstallSys.class:170
  msgid "Vectorlinux is currently being installed to your system... Please  
wait"
  msgstr "Vectorlinux is currently being installed to your system... Please  
wait"

-#: FrmInstallSys.class:192
+#: FrmInstallSys.class:179
  msgid "Installing ..."
  msgstr "Installing ..."

-#: FrmInstallSys.class:206
+#: FrmInstallSys.class:193
  msgid "Total progress"
  msgstr "Total progress"

-#: FrmInstallSys.class:211
+#: FrmInstallSys.class:198
  msgid "Current Step "
  msgstr "Current Step "

@@ -353,27 +358,50 @@
  msgid "To install them all, just click next"
  msgstr ""

-#: FrmRootPass.class:46
-msgid "Set Root Password"
-msgstr "Set Root Password"
+#: FrmRootPass.class:6
+#, fuzzy
+msgid "System Administrator Password"
+msgstr "System Administrator"

-#: FrmRootPass.class:50 FrmUserAdd.class:131
-msgid "Enter Password"
-msgstr "Enter Password"
+#: FrmRootPass.class:13
+msgid "Most other every-day taks do not require administrative  
priviledges."
+msgstr ""
+
+#: FrmRootPass.class:13
+msgid ""
+"For added security, use a password that is easy for you to remember, but "
+"hard for others to guess"
+msgstr ""

-#: FrmRootPass.class:55
+#: FrmRootPass.class:69
+msgid " About the root account "
+msgstr ""
+
+#: FrmRootPass.class:73
  msgid ""
-"Choose a password for the root account. You must enter the Root Password "
-"twice to ensure accuracy."
+"The linux root account is pre-assigned to be used as the system "
+"administrator's account. This account is used to perform system-wide  
changes "
+"such as software upgrades, managing user accounts etc. \n"
+"\n"
+"Most other operations do not require administrative priviledges.\n"
+"The root password must be entered twice for ensured accuracy. When  
choosing "
+"a root password, think of something easy for you to remember, but hard  
for "
+"others to guess."
  msgstr ""
-"Choose a password for the root account. You must enter the Root Password "
-"twice to ensure accuracy."

-#: FrmRootPass.class:60
+#: FrmRootPass.class:79 MdlCore.module:511
+msgid "System Administrator"
+msgstr "System Administrator"
+
+#: FrmRootPass.class:90
  msgid "Re-Enter Password"
  msgstr "Re-Enter Password"

-#: FrmRootPass.class:76
+#: FrmRootPass.class:101 FrmUserAdd.class:131
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: FrmRootPass.class:106
  msgid "Set Password"
  msgstr "Set Password"

@@ -441,7 +469,7 @@
  msgid "Select the windows partitions you would like to mount during boot"
  msgstr "Select the windows partitions you would like to mount during boot"

-#: FrmZoneSet.class:87
+#: FrmZoneSet.class:91
  msgid ""
  "Choose how\n"
  "your hardware clock is set up.\n"
@@ -455,23 +483,23 @@
  "the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
  "Choose localtime since most PCs are setup this way."

-#: FrmZoneSet.class:92
+#: FrmZoneSet.class:96
  msgid "Choose the correct timezone for the area in which you live."
  msgstr "Choose the correct timezone for the area in which you live."

-#: FrmZoneSet.class:101
+#: FrmZoneSet.class:105
  msgid "ComboBox1"
  msgstr "-"

-#: FrmZoneSet.class:103
+#: FrmZoneSet.class:107
  msgid "LocalTime"
  msgstr "LocalTime"

-#: FrmZoneSet.class:103
+#: FrmZoneSet.class:107
  msgid "UTC"
  msgstr "UTC"

-#: FrmZoneSet.class:109
+#: FrmZoneSet.class:113
  msgid "Set TimeZone"
  msgstr "Set TimeZone"

@@ -563,10 +591,6 @@
  msgid "Boot Menu Options"
  msgstr "Boot Menu Options"

-#: MdlCore.module:511
-msgid "System Administrator"
-msgstr "System Administrator"
-
  #: MdlCore.module:512
  msgid "Network Configuration"
  msgstr "Network Configuration"
@@ -660,7 +684,7 @@
  msgid "Unable to install kernels. "
  msgstr "Unable to install kernels. "

-#: MdlInstallCustom.module:90 MdlInstallSys.module:336
+#: MdlInstallCustom.module:90
  msgid ""
  "Vectorlinux is now installed in your system. Please click next to  
configure "
  "it."
@@ -680,15 +704,15 @@
  msgid " is installed"
  msgstr " is installed"

-#: MdlInstallCustom.module:261
+#: MdlInstallCustom.module:263
  msgid "Calculating package count ... Please wait"
  msgstr "Calculating package count ... Please wait"

-#: MdlInstallCustom.module:294
+#: MdlInstallCustom.module:311
  msgid "Total packages to be installed = "
  msgstr "Total packages to be installed = "

-#: MdlInstallCustom.module:326
+#: MdlInstallCustom.module:343
  msgid "Error while installing "
  msgstr "Error while installing "

@@ -708,38 +732,59 @@
  msgid "Do not mount"
  msgstr "Do not mount"

-#: MdlInstallSys.module:337
-msgid ""
-"packages have been installed in your system. Please click next to  
configure "
+#: MdlInstallSys.module:336
+#, fuzzy
+msgid "Vectorlinux is now installed in your system. Please click"
+msgstr ""
+"Vectorlinux is now installed in your system. Please click next to  
configure "
  "it."
+
+#: MdlInstallSys.module:336
+msgid "to configure it."
+msgstr ""
+
+#: MdlInstallSys.module:337
+#, fuzzy
+msgid "Packages have been installed in your system. Please click"
  msgstr ""
  "packages have been installed in your system. Please click next to  
configure "
  "it."

-#: MdlInstallSys.module:516
+#: MdlInstallSys.module:433
+#, fuzzy
+msgid "Installing"
+msgstr "Installing ..."
+
+#: MdlInstallSys.module:520
  msgid "Vectorlinux is now being installed. Please wait..."
  msgstr "Vectorlinux is now being installed. Please wait..."

-#: MdlInstallSys.module:559
-msgid "There has been an error extracting "
+#: MdlInstallSys.module:563
+#, fuzzy
+msgid "There has been an error extracting"
  msgstr "There has been an error extracting "

-#: MdlInstallSys.module:571
+#: MdlInstallSys.module:575
  msgid "Finished intalling Bulks"
  msgstr "Finished intalling Bulks"

-#: MdlInstallSys.module:674
+#: MdlInstallSys.module:678
  msgid "Installation phase complete. Ready for configuration"
  msgstr "Installation phase complete. Ready for configuration"

-#: MdlInstallSys.module:677
+#: MdlInstallSys.module:681
  msgid "Installing default system configuration and required software."
  msgstr "Installing default system configuration and required software."

-#: MdlInstallSys.module:707
+#: MdlInstallSys.module:711
  msgid "Installing Required Packages ..."
  msgstr "Installing Required Packages ..."

+#: MdlInstallSys.module:764
+#, fuzzy
+msgid "Installing Final configuration files..."
+msgstr "Installing default system configuration and required software."
+
  #: MdlLiloOsList.module:67
  msgid "Windows installation found in "
  msgstr ""
@@ -939,3 +984,13 @@
  #: MdlZoneSet.module:28
  msgid "localtime"
  msgstr "localtime"
+
+#~ msgid "Set Root Password"
+#~ msgstr "Set Root Password"
+
+#~ msgid ""
+#~ "Choose a password for the root account. You must enter the Root  
Password "
+#~ "twice to ensure accuracy."
+#~ msgstr ""
+#~ "Choose a password for the root account. You must enter the Root  
Password "
+#~ "twice to ensure accuracy."

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Mon Sep 29 13:31:11 2008
@@ -313,7 +313,7 @@
         frmNext = FrmRootPass

      CASE "FrmRootPass"
-
+      FrmRootPass.Button1_Click()
         frmNext = FrmUserAdd



Modified: branches/iVL/FrmEmbUsrAdd.class
==============================================================================
--- branches/iVL/FrmEmbUsrAdd.class	(original)
+++ branches/iVL/FrmEmbUsrAdd.class	Mon Sep 29 13:31:11 2008
@@ -17,6 +17,13 @@

  PUBLIC SUB Form_Open()

+  WITH FMain
+    .FrmCurr = ME
+    .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+    .tvPlan["Conf3"].picture = MdlCore.sNowPic
+    .tvPlan["Conf3"].Selected = TRUE
+  END WITH
+

    ME.EMBED_VASMCC_MODULE()
    'btAddUser.Visible = FALSE

Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form	(original)
+++ branches/iVL/FrmInstallSys.form	Mon Sep 29 13:31:11 2008
@@ -33,7 +33,7 @@
    { tmCredits #Timer
      #X = 486
      #Y = 30
-    Delay = 30
+    Delay = 50
    }
    { scrlCredits ScrollView
      MoveScaled(2,48,84,5)

Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Mon Sep 29 13:31:11 2008
@@ -35,7 +35,7 @@
  ME.tlList.Adjust
  ME.TabStrip1.Index = MdlLiloOsList.iVltag
  MdlLiloOsList.bVlCliOption = TRUE
-
+' ' '
  SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
  SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT

@@ -96,7 +96,7 @@
      .tlFbMode.Alignment = Align.Normal
      .tlBanner.Move(4, 4)
      .tlBanner.Width = .ClientWidth - (.tlBanner.x * 2)
-    .YNLiloBox.Move(.tlBanner.left, .tlBanner.Top + (.tlBanner.Height +  
1.5), MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 28)
+    .YNLiloBox.Move(.tlBanner.left, .tlBanner.Top + (.tlBanner.Height +  
1.5), MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 21)
      .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height *  
1.5), MdlObjSizer.get_object_width(.tlTarGet.Text))
      .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top,  
(.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left))
      .tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width +  
32, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text))

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Mon Sep 29 13:31:11 2008
@@ -33,13 +33,17 @@
  PUBLIC SUB Form_Open()
      FMain.FrmCurr = ME

+    WITH FMain
+    .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+    .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+    .tvPlan["Conf4"].Selected = TRUE
+  END WITH
+
      ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()
      MdlNetConf.LIST_NETWORK_INTERFACES
      cbUseManDNS.Value = FALSE
      tlBanner.text = "<h2>" & tlBanner.text & "</h2>"
-    ' FMain.tvPlan["Conf2"].picture = MdlCore.sNowPic
-    ' FMain.tvPlan["Conf2"].Selected = TRUE
-
+

    IF ERROR THEN Message(Error.text & "\n" & Error.where)


Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class	(original)
+++ branches/iVL/FrmRootPass.class	Mon Sep 29 13:31:11 2008
@@ -2,6 +2,29 @@

  PUBLIC SUB Form_Open()
    Fmain.frmcurr = ME
+  WITH ME
+    .tlbanner.text = "<h3>" & ("System Administrator Password") & "</h3>"
+    .tlBanner.Width = MdlObjSizer.get_object_width(.tlBanner.text)
+    .tlBanner.Height = 42
+    .tlBanner.Raise
+    .tlAboutRoot.text = ("The linux root account is pre-defined to be used  
as ths system administrator\'s account." &
+        "This account is used to perform system-wide changes such as  
adding / removing software, system-wide updates," &
+        "managing user accounts, etc.") & "<br><br>" & ("Most other  
every-day taks do not require administrative priviledges.")&
+        "<br><br>" & ("For added security, use a password that is easy for  
you to remember, but hard for others to guess")
+
+    .tlPass1.Alignment = Align.normal
+    .tlPass2.Alignment = Align.Normal
+    .tbPasswd1.Password = TRUE
+    .tbPasswd2.Password = TRUE
+    .tbPasswd1.SetFocus
+    .Button1.Visible = FALSE
+  END WITH
+
+    WITH FMain
+      .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+      .tvPlan["Conf2"].picture = MdlCore.sNowPic
+      .tvPlan["Conf2"].Selected = TRUE
+    END WITH
  END


@@ -21,4 +44,27 @@
        ME.tbPasswd2.Clear
      ENDIF
    ENDIF
+END
+
+PUBLIC SUB Form_Resize()
+
+    DIM itxtLeft AS Integer
+
+  WITH ME
+    .tlbanner.Move(4, 4)
+    .Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height * 4)
+    .tlAboutRoot.Move(4, 24, .Frame1.Width - (.tlAboutRoot.Left *  
2), .Frame1.Height - .tlAboutRoot.top - 8)
+    .tlPass1.Move(.Frame1.left, .Frame1.top + .Frame1.Height + 24,  
MdlObjSizer.get_object_width(.tlPass1.text), 21)
+    .tlPass2.Move(.tlPass1.Left, .tlPass1.top + .tlPass1.Height + 4,  
MdlObjSizer.get_object_width(.tlPass2.text), 21)
+      IF .tlPass1.Width > tlPass2.Width THEN
+      itxtLeft = .tlPass1.Left + .tlPass1.Width + 8
+      ELSE
+        itxtLeft = .tlPass2.Left + .tlPass2.Width + 8
+      END IF
+      .tbPasswd1.Move(itxtLeft, .tlPass1.top, 160, 21)
+      .tbPasswd2.Move(itxtLeft, .tlPass2.top, 160, 21)
+
+
+  END WITH
+
  END

Modified: branches/iVL/FrmRootPass.form
==============================================================================
--- branches/iVL/FrmRootPass.form	(original)
+++ branches/iVL/FrmRootPass.form	Mon Sep 29 13:31:11 2008
@@ -1,35 +1,40 @@
  # Gambas Form File 2.0

  { Form Form
-  MoveScaled(0,0,74,44)
+  MoveScaled(0,0,87,56)
    Text = ("")
    { Frame1 Frame
-    MoveScaled(1,1,62,31)
-    Text = ("Set Root Password")
-    { TextLabel2 TextLabel
-      MoveScaled(35,3,12,2)
-      Text = ("Enter Password")
-    }
-    { TextLabel1 TextLabel
-      MoveScaled(1,4,29,11)
-      Text = ("Choose a password for the root account. You must enter the  
Root Password twice to ensure accuracy.")
-    }
-    { TextLabel3 TextLabel
-      MoveScaled(35,9,14,2)
-      Text = ("Re-Enter Password")
-    }
-    { tbPasswd1 TextBox
-      MoveScaled(35,6,21,2)
-      Text = ("")
-      Password = True
-    }
-    { tbPasswd2 TextBox
-      MoveScaled(35,12,21,2)
-      Text = ("")
-    }
-    { Button1 Button
-      MoveScaled(50,28,11,2)
-      Text = ("Set Password")
-    }
+    MoveScaled(1,6,72,22)
+    Text = (" About the root account ")
+    { tlAboutRoot TextLabel
+      MoveScaled(2,3,67,16)
+      Text = ("The linux root account is pre-assigned to be used as the  
system administrator's account. This account is used to perform system-wide  
changes such as software upgrades, managing user accounts etc. \n\nMost  
other operations do not require administrative priviledges.\nThe root  
password must be entered twice for ensured accuracy. When choosing a root  
password, think of something easy for you to remember, but hard for others  
to guess.")
+    }
+  }
+  { tlBanner TextLabel
+    MoveScaled(2,1,62,4)
+    Text = ("System Administrator")
+  }
+  { tbPasswd2 TextBox
+    MoveScaled(31,35,21,3.5)
+    Text = ("")
+    Password = True
+  }
+  { tlPass2 TextLabel
+    MoveScaled(2,35,22,4)
+    Text = ("Re-Enter Password")
+  }
+  { tbPasswd1 TextBox
+    MoveScaled(29,29,21,3.5)
+    Text = ("")
+    Password = True
+  }
+  { tlPass1 TextLabel
+    MoveScaled(2,30,22,4)
+    Text = ("Enter Password")
+  }
+  { Button1 Button
+    MoveScaled(53,49,11,2)
+    Text = ("Set Password")
    }
  }

Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class	(original)
+++ branches/iVL/FrmZoneSet.class	Mon Sep 29 13:31:11 2008
@@ -18,6 +18,12 @@

  PUBLIC SUB Form_Open()
    Fmain.frmcurr = ME
+    WITH FMain
+      .tvPlan["Conf0"].Picture = MdlCore.sDonePic
+      .tvPlan["Conf1"].picture = MdlCore.sNowPic
+      .tvPlan["Conf1"].Selected = TRUE
+    END WITH
+

    MdlZoneSet.TIME_ZONES()
    ME.lbTmZone.Index = 9
@@ -36,7 +42,7 @@

    MdlZoneSet.SET_ZONE(ME.lbTmZone.Text)
    MdlZoneSet.WRITE_CONF()
-  Message("TimeZone " & ME.lbTmZone.Text & " Was set.")
+  'Message("TimeZone " & ME.lbTmZone.Text & " Was set.")

  END

@@ -45,9 +51,13 @@
    WITH ME
      .Frame1.Move(4, 4, .ClientWidth - (.Frame1.left * 2), .ClientHeight -  
(.Frame1.top * 2))
      .TextLabel1.Move(4, 18, .Frame1.Width - (.TextLabel1.Left * 2))
-    .cbHwClock.Move(.TextLabel1.left, .TextLabel1.top + .TextLabel1.Height  
+ 4, (.TextLabel1.width / 2))
+    .TextLabel1.Adjust
+    .cbHwClock.Move(.TextLabel1.left, .TextLabel1.top + .TextLabel1.Height  
+ 4, (.TextLabel1.width / 2), 21)
      .TextLabel2.Move(4, .cbHwClock.top + cbHwClock.Height +  
8, .TextLabel1.Width)
      .lbTmZone.Move(4, .TextLabel2.top + .TextLabel2.Height +  
4, .cbHwClock.Width)
+    .lbTmZone.Height = .Frame1.Height - (.TextLabel1.Height  
+ .cbHwClock.Height + (.TextLabel2.Height * 4))
+
+


    .TextLabel1.Adjust()

Modified: branches/iVL/FrmZoneSet.form
==============================================================================
--- branches/iVL/FrmZoneSet.form	(original)
+++ branches/iVL/FrmZoneSet.form	Mon Sep 29 13:31:11 2008
@@ -18,7 +18,7 @@
        MoveScaled(1,19,32,23)
      }
      { cbHwClock ComboBox
-      MoveScaled(1,11,34,3)
+      MoveScaled(1,11,34,3.5)
        Text = ("ComboBox1")
        ReadOnly = True
        List = [("LocalTime"), ("UTC")]

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Mon Sep 29 13:31:11 2008
@@ -508,10 +508,11 @@
    .Add("Inst1", ("Install Operating System"), sToDopic, "Inst")
    .Add("Conf", ("System Configuration"), sCatPic)
    .Add("Conf0", ("Boot Menu Options"), sToDopic, "Conf")
-  .Add("Conf1", ("System Administrator"), sToDopic, "Conf")
-  .Add("Conf2", ("Network Configuration"), sToDopic, "Conf")
+  .Add("Conf1", ("Regional Settings"), sToDopic, "Conf")
+  .Add("Conf2", ("System Administrator"), sToDopic, "Conf")
    .Add("Conf3", ("User Accounts"), sToDopic, "Conf")
-  .Add("Conf4", ("Hardware Configuration"), sToDopic, "Conf")
+  .Add("Conf4", ("Network Configuration"), sToDopic, "Conf")
+  .Add("Conf5", ("Hardware Configuration"), sToDoPic, "Conf")
  END WITH
  iLeftWidth = 0
  iWidth = 0

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Mon Sep 29 13:31:11 2008
@@ -250,8 +250,10 @@
  PUBLIC SUB CALCULATE_TOTAL_PACKAGES()

    DIM i AS Integer
+  DIM irs AS Integer
    DIM sOutput AS String
    DIM sOutArr AS String[]
+  DIM cb AS CheckBox

    'MdlPkgSel.GET_USER_BULK_SELECTION()
    'MdlPkgSel.GET_USER_PKG_SELECTION()
@@ -289,7 +291,22 @@
      i = i + 1
    END IF
    'Count user-selected stuff in
-  i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
+      'we will need to cycle through the arrays for th is for accuracy...
+        irs = 0
+        FOR EACH cb IN MdlPkgSel.Bulks
+          IF cb.value = TRUE THEN INC irs
+
+
+        NEXT
+        i = i + irs
+      ' now do the optional packages
+      irs = 0 ' reset the count
+        FOR EACH cb IN MdlPkgSel.Pkgs
+          IF cb.Value = TRUE THEN INC irs
+
+        NEXT
+      i = i + irs ' the count to the total
+  'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
    iPkgCnt = i
    PRINT ("Total packages to be installed = ") & i
  END

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Mon Sep 29 13:31:11 2008
@@ -68,6 +68,9 @@

      'ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' for testing only

+
+    MdlSetup.RUN_CREDITS() ' Begin scrolling credits
+
        IF ClsPkgSel.bCustom = TRUE THEN
          MdlInstallCustom.PERFORM_CUSTOM_INSTALL
        ELSE
@@ -274,6 +277,7 @@
    NEXT
    SHELL "swapon -a" WAIT

+
  END


@@ -333,8 +337,8 @@
    FrmInstallSys.pbInstallProg.Value = 1
    FrmInstallSys.pbInstallProg2.Value = 1
    'Message.Info("Vectorlinux is now installed in your system. Please click  
next to configure it.")
-  FrmInstallSys.tlBanner.Text = ("Vectorlinux is now installed in your  
system. Please click next to configure it.")
-  FrmInstallSys.tlCurrPkg.Text = ("packages have been installed in your  
system. Please click next to configure it.")
+  FrmInstallSys.tlBanner.Text = ("Vectorlinux is now installed in your  
system. Please click") & Space(1) & FMain.btnext.text & Space(1) & ("to  
configure it.")
+  FrmInstallSys.tlCurrPkg.Text = ("Packages have been installed in your  
system. Please click") & Space(1) & FMain.btnext.text & Space(1) & ("to  
configure it.")
    WITH FMain
      .btQuit.Enabled = TRUE
      .btQuit.ForeColor = Color.Black
@@ -408,7 +412,7 @@
    'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux"  
&/ "SETUP.CONF")
    DIM sLine AS String

-  MdlSetup.RUN_CREDITS() ' try this
+

       SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |  
grep ^BULK" TO sRawList
       '   sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
@@ -558,7 +562,7 @@
                        hproc.State = Process.Stopped
                            ' error check
                              IF InStr(sDump, "FAILED") > 0 THEN
-                              Message.Error(("There has been an error  
extracting ") & sPakDesc & gb.NewLine &
+                              Message.Error(("There has been an error  
extracting") & Space(1) & sPakDesc & gb.NewLine &
                                "<b>ERROR</b>" & gb.NewLine &
                                sErr)
                                RETURN 1
@@ -761,7 +765,7 @@
            sLinarr = Split(sRawList, ":")
            sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) -  
InStr(sLinarr[0], "\'"))
                ' now install the package
-              FrmInstallSys.tlCurrPkg.Text = "Installing Final  
configuration files..."
+              FrmInstallSys.tlCurrPkg.Text = ("Installing Final  
configuration files...")
                INC iPkgNum
                  'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &  
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
                  ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/  
sPkgPath)