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

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

Author: M0...@gm...
Date: Sun Jul 20 16:47:00 2008
New Revision: 63

Modified:
   branches/iVL/.lang/FMain.pot
   branches/iVL/FMain.class
   branches/iVL/FMain.form
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlSummarize.module

Log:
Begin summarizing install. Preparing the way for package installation

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Sun Jul 20 16:47:00 2008
@@ -14,23 +14,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:192
+#: FMain.class:198
 msgid "Process Overview"
 msgstr ""

-#: FMain.class:205
-msgid "Vector Linux Install"
+#: FMain.class:211
+msgid "VectorLinux Install"
 msgstr ""

-#: FMain.class:215
+#: FMain.class:221
 msgid "Next"
 msgstr ""

-#: FMain.class:221
+#: FMain.class:227
 msgid "Back"
 msgstr ""

-#: FMain.class:227
+#: FMain.class:233
 msgid "Exit"
 msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Sun Jul 20 16:47:00 2008
@@ -155,8 +155,14 @@
             ELSE
               ' now we are ready to summarize
               Message("Going for a simple install")
+              MdlSummarize.SUMMARIZE_INSTALL
               frmNext = FrmSummary
             END IF
+    CASE "FrmPkgsel2"
+      ' summarize the build
+        MdlSummarize.SUMMARIZE_INSTALL
+        frmNext = FrmSummary
+        'frmNext = install
   END SELECT



Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form	(original)
+++ branches/iVL/FMain.form	Sun Jul 20 16:47:00 2008
@@ -16,24 +16,24 @@
     Font = Font["+6"]
     Background = Color.SelectedBackground
     Foreground = Color.SelectedForeground
-    Text = ("Vector Linux Install")
+    Text = ("VectorLinux Install")
     Alignment = Align.Center
   }
   { pnlWinHost VBox
     MoveScaled(28,9,66,56)
   }
   { btnext Button
-    MoveScaled(89,69,8,3.3333)
+    MoveScaled(89,69,8,3.1667)
     Text = ("Next")
     Picture = Picture["icon:/16/right"]
   }
   { btback Button
-    MoveScaled(28,67,8,3.3333)
+    MoveScaled(28,67,8,3.1667)
     Text = ("Back")
     Picture = Picture["icon:/16/left"]
   }
   { btQuit Button
-    MoveScaled(54,67,11,3.3333)
+    MoveScaled(54,67,11,3.1667)
     Text = ("Exit")
     Picture = Picture["icon:/16/cancel"]
   }

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Sun Jul 20 16:47:00 2008
@@ -56,7 +56,7 @@
           ' create header labels
           tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
             WITH tl
-              .Text = "PARTITION"
+              .Text = "<b>PARTITION</b>"
               .Height = 27
               .x = x
               .y = y
@@ -66,7 +66,7 @@
             icol2 = x + tl.Width + 4
           tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
             WITH tl
-              .text = "MOUNT POINT"
+              .text = "<b>MOUNT POINT</b>"
               .Height = 27
               .x = icol2
               .y = y
@@ -75,7 +75,7 @@
               icol3 = tl.x + tl.Width + 4
           tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
             WITH tl
-              .text = "FILESYSTEM"
+              .text = "<b>FILESYSTEM</b>"
               .Height = 27
               .x = icol3
               .y = y

Modified: branches/iVL/MdlSummarize.module
==============================================================================
--- branches/iVL/MdlSummarize.module	(original)
+++ branches/iVL/MdlSummarize.module	Sun Jul 20 16:47:00 2008
@@ -17,6 +17,47 @@

 PUBLIC SUB SUMMARIZE_INSTALL()

+DIM sText AS String
+
+
+  sText = "PARTITIONING LAYOUT:<br>" &
+  ClsPartSel.sRoot & " = / (" & ClsPartSel.fRoot & ")<br>"
+  '"/ = " & ClsPartSel.sRoot & " <br>"
+    IF ClsPartSel.sHome THEN
+      sText = sText & ClsPartSel.sHome & " = /home (" & 
ClsPartSel.fhome & ")<br>"
+    END IF
+    IF ClsPartSel.sOpt THEN
+      sText = sText & ClsPartSel.sOpt & " = /opt (" & ClsPartSel.fOpt & ")<br>"
+    END IF
+    IF ClsPartSel.sUsr THEN
+      sText = sText & ClsPartSel.sUsr & " = /usr (" & ClsPartSel.fUsr & ")<br>"
+    END IF
+    IF ClsPartSel.sTmp THEN
+      sText = sText & ClsPartSel.sTmp & " = /tmp (" & ClsPartSel.fTmp & ")<br>"
+    END IF
+    IF ClsPartSel.sVar THEN
+      sText = sText & ClsPartSel.sVar & " = /var (" & ClsPartSel.sVar & ")<br>"
+    END IF
+
+    sText = sText & "<br><br><br><br>"
+
+    IF ClsWinDrives.sWinDrives THEN
+    sText = sText & "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME.<br>"
+      'list all the windows partitions here
+    END IF
+
+    IF ClsPkgSel.bCustom = TRUE THEN
+      sText = sText & "INSTALL TYPE: Custom<br>"
+    ELSE
+      sText = sText & "INSTALL TYPE: Full<br>"
+    END IF
+
+
+
+
+
+  FrmSummary.tlSummary.Text = sText
+


 END