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

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

Author: M0E.lnx
Date: Thu Nov  6 06:19:44 2008
New Revision: 265

Modified:
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/FrmSummary.class
    branches/iVL/MdlInstallCustom.module

Log:
Fixed bug with new package selection listings

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Nov  6 06:19:44 2008
@@ -66,15 +66,15 @@
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:257
+#: FrmSummary.class:259
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:267
+#: FrmSummary.class:269
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:277
+#: FrmSummary.class:279
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Thu Nov  6 06:19:44 2008
@@ -192,16 +192,17 @@

          'OLD CODE BASED ON THE CHECKBOX OBJECTS
          i = 0
-        irow = 0
+        'irow = 0
          'INC GridView2.Rows.Count
                  REPEAT
                    IF FrmUsrPkgSel.GridView1[i, 0].Picture =  
FrmUsrPkgSel.pYes THEN
                    INC GridView2.Rows.Count
                      GridView2[irow, 0].Text = FrmUsrPkgSel.GridView1[i,  
1].Text
+                    INC irow
                    END IF
                    INC i
-                  INC irow
-                UNTIL i = FrmUsrPkgSel.GridView1.Rows.count - 1
+
+                UNTIL i = FrmUsrPkgSel.GridView1.Rows.Count

              ' ' '
              ' ' '

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Nov  6 06:19:44 2008
@@ -484,7 +484,7 @@

    DIM SPkg AS String
    DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
-  DIM i AS Integer
+  DIM i, ii AS Integer
    DIM iRet AS Integer

    FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
@@ -551,9 +551,18 @@
          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
-
+
+        REPEAT
+          IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+            INC irs
+          END IF
+          INC ii
+          UNTIL ii = FrmUsrPkgSel.GridView1.Rows.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