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

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

Author: M0E.lnx
Date: Thu Nov  6 11:21:36 2008
New Revision: 268

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmPkgSel.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/FMain.class
    branches/iVL/FrmSummary.class

Log:
Fixed bug in installation summary caused by the new Bulk selection window

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov  6 11:21:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/remote/devel/installer/FMain.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	Thu Nov  6 11:21:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/remote/devel/installer/FrmPkgSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -16,6 +16,18 @@

  #: FrmPkgSel.class:25
  msgid "Choose your installation mode"
+msgstr ""
+
+#: FrmPkgSel.class:40
+msgid "Package"
+msgstr ""
+
+#: FrmPkgSel.class:41
+msgid "Description"
+msgstr ""
+
+#: FrmPkgSel.class:42
+msgid "Size"
  msgstr ""

  #: FrmPkgSel.class:70

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Nov  6 11:21:36 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/remote/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -62,19 +62,19 @@
  msgid "BULK PACKAGES"
  msgstr ""

-#: FrmSummary.class:190
+#: FrmSummary.class:200
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

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

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

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


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Nov  6 11:21:36 2008
@@ -246,7 +246,7 @@
            IF ClsPkgSel.bCustom = TRUE THEN
                'get the list of selected bulks only

-              MdlPkgSel.GET_USER_BULK_SELECTION()
+              'MdlPkgSel.GET_USER_BULK_SELECTION()
                'frmNext = FrmPkgsel2
                frmNext = FrmUsrPkgSel
              ELSE

Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Thu Nov  6 11:21:36 2008
@@ -174,15 +174,25 @@
            GridView2.MoveTo(1, 0)
                irow = 1
              ' add bulk packages
-            FOR EACH cb IN MdlPkgSel.Bulks
-              IF cb.Value = TRUE THEN
-                INC ME.GridView2.Rows.Count
-                  GridView2[irow, 0].text = File.BaseName(cb.Tag)
-
-                  INC irow
-              END IF
-
-            NEXT
+                REPEAT
+                  IF FrmPkgSel.scrlInstallOpts[i, 0].Picture =  
FrmPkgSel.pyes THEN
+                    INC GridView2.Rows.Count
+                    GridView2[irow, 0].text = FrmPkgSel.scrlInstallOpts[i,  
1].Text
+                    INC irow
+                  ENDIF
+                  INC i
+                UNTIL i = FrmPkgSel.scrlInstallOpts.Rows.Count
+
+
+            ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
+            ' ' '   IF cb.Value = TRUE THEN
+            ' ' '     INC ME.GridView2.Rows.Count
+            ' ' '       GridView2[irow, 0].text = File.BaseName(cb.Tag)
+            ' ' '
+            ' ' '       INC irow
+            ' ' '   END IF
+            ' ' '
+            ' ' ' NEXT
          INC GridView2.Rows.Count
          'irow = irow + 1 ' move the selection to the next line
            GridView2[irow, 0].BackColor = Color.SelectedBackground