Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r503 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-24 23:09:35
|
Author: M0...@gm...
Date: Tue Feb 24 14:20:56 2009
New Revision: 503
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step8.pot
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step3a.form
branches/speedy/Step6.class
branches/speedy/Step7.form
branches/speedy/Step7b.class
branches/speedy/Step8.class
branches/speedy/Step8.form
Log:
Started working on summary treeview
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Feb 24 14:20:56 2009
@@ -62,7 +62,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:65
+#: MdlStartUp.module:49 Step8.class:116
msgid "Installation Summary"
msgstr ""
@@ -130,67 +130,113 @@
msgid "on"
msgstr ""
-#: Step1.class:131
+#: Step1.class:91
+msgid ""
+"No installable media was found on your system. Please insert an
installation "
+"CD"
+msgstr ""
+
+#: Step1.class:91
+msgid ""
+"or move your installation images (ISO) to the top of your partitions.
Then "
+"click"
+msgstr ""
+
+#: Step1.class:92
+msgid "No installable media found on your system."
+msgstr ""
+
+#: Step1.class:93
+msgid ""
+"Insert installation CD or move Installable (iso) images to the top
directory "
+"on your partitions and click"
+msgstr ""
+
+#: Step1.class:93
+msgid "to search for media again"
+msgstr ""
+
+#: Step1.class:98 Step2.class:198 Step5.class:166
+msgid "Click"
+msgstr ""
+
+#: Step1.class:98
+msgid "to begin installing"
+msgstr ""
+
+#: Step1.class:101
+msgid "Select Installation source from the list below"
+msgstr ""
+
+#: Step1.class:103
+msgid "to continue or click"
+msgstr ""
+
+#: Step1.class:103
+msgid "to search for installation media again"
+msgstr ""
+
+#: Step1.class:149
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:150
+#: Step1.class:168
msgid "Found"
msgstr ""
-#: Step1.class:150
+#: Step1.class:168
msgid "in partition"
msgstr ""
-#: Step1.class:191
+#: Step1.class:209
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:204
+#: Step1.class:222
msgid "Scanning"
msgstr ""
-#: Step1.class:214
+#: Step1.class:232
msgid "in"
msgstr ""
-#: Step1.class:242
+#: Step1.class:260
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:335
+#: Step1.class:353
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:338
+#: Step1.class:356
msgid "VERSION"
msgstr ""
-#: Step1.class:415
+#: Step1.class:433
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143
+#: Step1.class:433 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Step1.class:415
+#: Step1.class:433
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:468
-msgid "Select Installation Source"
+#: Step1.class:443
+msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:486
-msgid "Select Installation source from the list below"
+#: Step1.class:511
+msgid "Select Installation Source"
msgstr ""
-#: Step1.class:507
+#: Step1.class:550
msgid "Search Again"
msgstr ""
-#: Step1.class:537
+#: Step1.class:580
msgid "Check Installation media before installing"
msgstr ""
@@ -286,10 +332,6 @@
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:198 Step5.class:166
-msgid "Click"
-msgstr ""
-
#: Step2.class:198
msgid "to abort this process at any time"
msgstr ""
@@ -451,11 +493,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169 Step6.class:441 Step7a.class:143
+#: Step3a1a.class:169 Step6.class:446 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:441 Step7a.class:143
+#: Step3a1a.class:169 Step6.class:446 Step7a.class:143
msgid "No"
msgstr ""
@@ -651,31 +693,31 @@
msgid "File System"
msgstr ""
-#: Step6.class:141
+#: Step6.class:146
msgid "Not Used"
msgstr ""
-#: Step6.class:162
+#: Step6.class:167 Step8.class:58
msgid "Do not format"
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "You have already selected"
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "as your"
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "partition."
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:336
+#: Step6.class:341
msgid "Select which partitions to use for installation"
msgstr ""
@@ -683,27 +725,27 @@
msgid "Select Installation Mode"
msgstr ""
-#: Step7.class:107
+#: Step7.class:108
msgid "Full Install"
msgstr ""
-#: Step7.class:117
+#: Step7.class:118
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:125
+#: Step7.class:126
msgid "Customized"
msgstr ""
-#: Step7.class:135
+#: Step7.class:136
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:143
+#: Step7.class:144
msgid "Minimal"
msgstr ""
-#: Step7.class:153
+#: Step7.class:154
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
@@ -735,11 +777,11 @@
msgid "Are you sure you want to disable this conponent anyway?"
msgstr ""
-#: Step7a.class:169 Step7b.class:180
+#: Step7a.class:169 Step7b.class:183
msgid "Select All"
msgstr ""
-#: Step7a.class:175 Step7b.class:178
+#: Step7a.class:175 Step7b.class:181
msgid "Un-Select All"
msgstr ""
@@ -757,13 +799,29 @@
msgid "Reading software catalog... Please wait a moment"
msgstr ""
-#: Step7b.class:104
+#: Step7b.class:107
msgid ""
"Additional optional software available. Select which software packages
to "
"include in your installation."
msgstr ""
-#: Step8.class:84
+#: Step8.class:59
+msgid "Not Formatted"
+msgstr ""
+
+#: Step8.class:59
+msgid "Mount to"
+msgstr ""
+
+#: Step8.class:61
+msgid "Format to"
+msgstr ""
+
+#: Step8.class:61
+msgid "and mount to"
+msgstr ""
+
+#: Step8.class:135
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Tue Feb 24 14:20:56 2009
@@ -18,67 +18,107 @@
msgid "on"
msgstr ""
-#: Step1.class:131
+#: Step1.class:91
+msgid "No installable media was found on your system. Please insert an
installation CD"
+msgstr ""
+
+#: Step1.class:91
+msgid "or move your installation images (ISO) to the top of your
partitions. Then click"
+msgstr ""
+
+#: Step1.class:92
+msgid "No installable media found on your system."
+msgstr ""
+
+#: Step1.class:93
+msgid "Insert installation CD or move Installable (iso) images to the top
directory on your partitions and click"
+msgstr ""
+
+#: Step1.class:93
+msgid "to search for media again"
+msgstr ""
+
+#: Step1.class:98
+msgid "Click"
+msgstr ""
+
+#: Step1.class:98
+msgid "to begin installing"
+msgstr ""
+
+#: Step1.class:101
+msgid "Select Installation source from the list below"
+msgstr ""
+
+#: Step1.class:103
+msgid "to continue or click"
+msgstr ""
+
+#: Step1.class:103
+msgid "to search for installation media again"
+msgstr ""
+
+#: Step1.class:149
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:150
+#: Step1.class:168
msgid "Found"
msgstr ""
-#: Step1.class:150
+#: Step1.class:168
msgid "in partition"
msgstr ""
-#: Step1.class:191
+#: Step1.class:209
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:204
+#: Step1.class:222
msgid "Scanning"
msgstr ""
-#: Step1.class:214
+#: Step1.class:232
msgid "in"
msgstr ""
-#: Step1.class:242
+#: Step1.class:260
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:335
+#: Step1.class:353
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:338
+#: Step1.class:356
msgid "VERSION"
msgstr ""
-#: Step1.class:415
+#: Step1.class:433
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:415
+#: Step1.class:433
msgid "WARNING:"
msgstr ""
-#: Step1.class:415
+#: Step1.class:433
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:468
-msgid "Select Installation Source"
+#: Step1.class:443
+msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:486
-msgid "Select Installation source from the list below"
+#: Step1.class:511
+msgid "Select Installation Source"
msgstr ""
-#: Step1.class:507
+#: Step1.class:550
msgid "Search Again"
msgstr ""
-#: Step1.class:537
+#: Step1.class:580
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Tue Feb 24 14:20:56 2009
@@ -30,39 +30,39 @@
msgid "File System"
msgstr ""
-#: Step6.class:141
+#: Step6.class:146
msgid "Not Used"
msgstr ""
-#: Step6.class:162
+#: Step6.class:167
msgid "Do not format"
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "You have already selected"
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "as your"
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "partition."
msgstr ""
-#: Step6.class:207
+#: Step6.class:212
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:336
+#: Step6.class:341
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:441
+#: Step6.class:446
msgid "Yes"
msgstr ""
-#: Step6.class:441
+#: Step6.class:446
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Tue Feb 24 14:20:56 2009
@@ -18,27 +18,27 @@
msgid "Select Installation Mode"
msgstr ""
-#: Step7.class:107
+#: Step7.class:108
msgid "Full Install"
msgstr ""
-#: Step7.class:117
+#: Step7.class:118
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:125
+#: Step7.class:126
msgid "Customized"
msgstr ""
-#: Step7.class:135
+#: Step7.class:136
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:143
+#: Step7.class:144
msgid "Minimal"
msgstr ""
-#: Step7.class:153
+#: Step7.class:154
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Tue Feb 24 14:20:56 2009
@@ -30,15 +30,15 @@
msgid "Reading software catalog... Please wait a moment"
msgstr ""
-#: Step7b.class:104
+#: Step7b.class:107
msgid "Additional optional software available. Select which software
packages to include in your installation."
msgstr ""
-#: Step7b.class:178
+#: Step7b.class:181
msgid "Un-Select All"
msgstr ""
-#: Step7b.class:180
+#: Step7b.class:183
msgid "Select All"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Tue Feb 24 14:20:56 2009
@@ -14,11 +14,31 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:65
+#: Step8.class:58
+msgid "Do not format"
+msgstr ""
+
+#: Step8.class:59
+msgid "Not Formatted"
+msgstr ""
+
+#: Step8.class:59
+msgid "Mount to"
+msgstr ""
+
+#: Step8.class:61
+msgid "Format to"
+msgstr ""
+
+#: Step8.class:61
+msgid "and mount to"
+msgstr ""
+
+#: Step8.class:116
msgid "Installation Summary"
msgstr ""
-#: Step8.class:84
+#: Step8.class:135
msgid "Your VectorLinux installation is about to be performed as follows.
If you need to make any changes, this is your last chance."
msgstr ""
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Tue Feb 24 14:20:56 2009
@@ -44,6 +44,8 @@
' Store this information to make it available to the whole installer
program
ClsGlobal.sSourceName = Trim(sname)
ClsGlobal.sSourceAddr = Trim(sadd)
+ ClsGlobal.sDistroName = gvdistdetails[0, 1].Text
+ ClsGlobal.sDistroVer = gvdistdetails[1, 1].Text
PRINT " --- Use " & ClsGlobal.sSourceName & Space(1) & "from " &
ClsGlobal.sSourceAddr & " for installation source"
TRY MKDIR "/mnt/source"
@@ -84,6 +86,22 @@
ME.mvLooking.Playing = FALSE
ME.mvLooking.Visible = FALSE
+ IF ComboBox1.Count = 0 THEN
+ Message.Error(("No installable media was found on your system. Please
insert an installation CD") & gb.NewLine &
+ ("or move your installation images (ISO) to the top of your
partitions. Then click") & Space(1) & "\"" & btrescan.text & "\"")
+ ME.TextLabel2.Text = ("No installable media found on your system.")
+ ME.tlNext.Text = "<i>" & ("Insert installation CD or move Installable
(iso) images to the top directory on your partitions and click") & Space(1)
& "\"" & ME.btrescan.text & "\"" & ("to search for media again") & "</i>"
+ ME.gvDistDetails.Visible = FALSE
+ ClsGlobal.fRunningMainForm.btNext.enabled = FALSE
+ ELSE IF ComboBox1.Count = 1 THEN
+ ME.TextLabel2.Text = ("Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1) & ("to begin
installing") & Space(1)&
+ gvdistdetails[0, 1].Text & Space(1) & gvdistdetails[1, 1].Text
+ ME.tlNext.Text = ""
+ ELSE
+ ME.TextLabel2.Text = ("Select Installation source from the list below")
+ ME.tlNext.Text = ("Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1)&
+ ("to continue or click") & Space(1) & "\"" & ME.btRescan.Text & "\"" &
Space(1) & ("to search for installation media again")
+ END IF
END
@@ -420,6 +438,10 @@
END
PUBLIC SUB btRescan_Click()
+
+
+ ME.TextLabel2.Text = ("Searching your system for installable media")
+ ME.tlNext.Visible = FALSE
ME.mvLooking.Visible = TRUE
ME.ComboBox1.Clear()
ME.FIND_CD_INSTALL_MEDIA()
@@ -429,5 +451,25 @@
ME.mvLooking.Visible = FALSE
FMain.btNext.Enabled = ComboBox1.Count > 0
+ IF ComboBox1.Count = 0 THEN
+ Message.Error(("No installable media was found on your system. Please
insert an installation CD") & gb.NewLine &
+ ("or move your installation images (ISO) to the top of your
partitions. Then click") & Space(1) & "\"" & btrescan.text & "\"")
+ ME.TextLabel2.Text = ("No installable media found on your system.")
+ ME.tlNext.Text = "<i>" & ("Insert installation CD or move Installable
(iso) images to the top directory on your partitions and click") & Space(1)
& "\"" & ME.btrescan.text & "\"" & ("to search for media again") & "</i>"
+ ME.gvDistDetails.Visible = FALSE
+ ClsGlobal.fRunningMainForm.btNext.enabled = FALSE
+ ELSE IF ComboBox1.Count = 1 THEN
+ ME.TextLabel2.Text = ("Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1) & ("to begin
installing") & Space(1)&
+ gvdistdetails[0, 1].Text & Space(1) & gvdistdetails[1, 1].Text
+ ME.gvDistDetails.Visible = TRUE
+ ME.tlNext.Text = ""
+ ELSE
+ ME.TextLabel2.Text = ("Select Installation source from the list below")
+ ME.tlNext.Text = ("Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1)&
+ ("to continue or click") & Space(1) & "\"" & ME.btRescan.Text & "\"" &
Space(1) & ("to search for installation media again")
+ ME.gvDistDetails.Visible = TRUE
+ END IF
+
+ ME.tlNext.Visible = TRUE
END
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Tue Feb 24 14:20:56 2009
@@ -24,7 +24,7 @@
{ TextLabel2 TextLabel
MoveScaled(1,0,54,3)
Expand = True
- Text = ("Select Installation source from the list below")
+ Text = ("Searching your system for installable media")
}
{ HBox1 HBox
MoveScaled(1,3,54,3)
@@ -71,6 +71,11 @@
{ mvLooking MovieBox
MoveScaled(5,24,11,25)
Expand = True
+ }
+ { tlNext TextLabel
+ MoveScaled(2,26,45,6)
+ Expand = True
+ Text = ("")
}
}
}
Modified: branches/speedy/Step3a.form
==============================================================================
--- branches/speedy/Step3a.form (original)
+++ branches/speedy/Step3a.form Tue Feb 24 14:20:56 2009
@@ -68,7 +68,7 @@
Expand = True
}
{ rbEntireDisk RadioButton
- MoveScaled(2,17,34,3)
+ MoveScaled(2,18,34,3)
Expand = True
Text = ("Use entire disk")
}
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Tue Feb 24 14:20:56 2009
@@ -46,7 +46,7 @@
NEXT
ME.read_partition_selection
- Message(ClsGlobal.sVitalPartList)
+ 'Message(ClsGlobal.sVitalPartList)
' sList = Trim(Left(sList, Len(sList) - 1))
'ClsGlobal.sVitalPartList = Trim(sList)
'Message(ClsGlobal.sVitalPartList)
@@ -83,6 +83,9 @@
gvPartListing[0, 4].BackColor = Color.LightBackground
gvPartListing.Columns[4].Width = 150
gvPartListing[0, 4].Font.Bold = TRUE
+ gvPartListing[0, 5].BackColor = Color.LightBackground
+ gvPartListing.Columns[5].Width = 1
+ gvPartListing[0, 6].BackColor = Color.LightBackground
'gvPartListing[0, 5].BackColor = Color.LightBackground
'gvPartListing[0, 5].Font.Bold = TRUE
'gvPartListing[0, 5]
@@ -124,6 +127,8 @@
gvPartListing[irow, 2].BackColor = Color.LightGray
gvPartListing[irow, 3].BackColor = Color.LightGray
gvPartListing[irow, 4].BackColor = Color.LightGray
+ gvPartListing[irow, 5].BackColor = Color.LightGray
+ gvPartListing[irow, 6].BackColor = Color.LightGray
ELSE
gvPartListing[irow, 5].Text = Trim(SFS)
Modified: branches/speedy/Step7.form
==============================================================================
--- branches/speedy/Step7.form (original)
+++ branches/speedy/Step7.form Tue Feb 24 14:20:56 2009
@@ -23,6 +23,7 @@
}
{ HPanel2 HPanel
MoveScaled(2,8,69,27)
+ Expand = True
{ rbFullInstall RadioButton
MoveScaled(1,2,17,3)
Tag = "0"
Modified: branches/speedy/Step7b.class
==============================================================================
--- branches/speedy/Step7b.class (original)
+++ branches/speedy/Step7b.class Tue Feb 24 14:20:56 2009
@@ -61,7 +61,7 @@
ME.HBox3.Visible = FALSE
ME.HBox5.Visible = TRUE
ME.MovieBox1.Playing = TRUE
- WAIT 1
+ WAIT 0.1
irow = 2
IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN
@@ -70,8 +70,9 @@
ME.MovieBox1.Playing = TRUE
ME.MovieBox1.Refresh
sLine = Trim(sArr[i])
- sPkg = sLine
- SHELL "cat /mnt/source/PACKAGES.TXT | grep \"^" & sPkg & "\" | cut
-f 2 -d \':\' " TO sDescDump
+ sPkg = Trim(sLine)
+ IF sPkg THEN
+ SHELL "cat /mnt/source/PACKAGES.TXT | grep -i \"^" & sPkg & "\" |
cut -f 2 -d :" TO sDescDump
sDescDump = Trim(sDescDump)
IF sDescDump THEN
sDescArr = Split(sDescDump, "\n")
@@ -86,14 +87,16 @@
sShortDesc = ""
sDesc = ""
END IF
-
+ WAIT 0.1
+ 'Message(sPkg & "<br><br>" & sShortDesc)
gvOptions[irow, 0].Picture = PicYes
gvOptions[irow, 1].Text = sPkg
gvOptions[irow, 2].Text = Trim(sShortDesc)
gvOptions[irow, 3].Text = Trim(sDesc)
gvOptions[irow, 4].Text = "yes"
+ INC irow
INC gvOptions.Rows.Count
- INC irow
+ END IF
NEXT
ME.MovieBox1.Playing = FALSE
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Tue Feb 24 14:20:56 2009
@@ -17,6 +17,8 @@
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ 'ME.SUMMARIZE_DISTRO_INFO()
+ 'ME.SUMMARIZE_PARTITION_SELECTION()
END
PUBLIC FUNCTION GetNext() AS String
@@ -24,14 +26,63 @@
RETURN "Step9"
END
-PUBLIC SUB OnExit()
+
+PUBLIC SUB SUMMARIZE_DISTRO_INFO()
+ WITH ME.TreeView1
+ .Add("DistroInfo", "Distribution", MdlStartUp.pCategory)
+ .Add("Distro0", "Name",, "DistroInfo")
+ .Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0")
+ .Add("Distro1", "Version",, "DistroInfo")
+ .Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1")
+ END WITH
+END
+
+PUBLIC SUB SUMMARIZE_PARTITION_SELECTION()
+ DIM i AS Integer
+ DIM sList AS String
+ DIM sArr, sEntry AS String[]
+ DIM sPart, sMntPnt, sFs AS String
+
+ WITH ME.TreeView1
+ .Add("Part", "Partitions to be used", MdlStartUp.pCategory)
+ sArr = Split(ClsGlobal.sVitalPartList, ",")
+ FOR i = 0 TO sArr.Max
+ sList = Trim(sArr[i])
+ IF sList THEN
+ sEntry = Split(sList, "-")
+ sPart = Trim(sEntry[0])
+ sMntPnt = Trim(sEntry[1])
+ sFs = Trim(sEntry[2])
+ IF sfs LIKE ("Do not format") THEN
+ sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) &
("Mount to") & Space(1)
+ ELSE
+ sfs = ("Format to") & Space(1) & sFs & Space(1) & ("and
mount to") & Space(1)
+ END IF
+ .Add("Part." & i, sPart,, "Part")
+ .add("Part." & i & "." & i, sFs & sMntPnt,, "Part." & i)
+ '.Add("Part." & i & "." & i, sMntPnt,, "Part." & i)
+ '.Add("Part." & i & "." & i & "." & i, sFs,, "Part." & i & "." &
i)
+ END IF
+ NEXT
+
+
+ END WITH
END
-PUBLIC SUB StartUp()
+
+
+
+PUBLIC SUB OnExit()
+
+END
+PUBLIC SUB StartUp()
+ ME.TreeView1.Clear()
+ ME.SUMMARIZE_DISTRO_INFO()
+ ME.SUMMARIZE_PARTITION_SELECTION()
END
Modified: branches/speedy/Step8.form
==============================================================================
--- branches/speedy/Step8.form (original)
+++ branches/speedy/Step8.form Tue Feb 24 14:20:56 2009
@@ -27,8 +27,8 @@
Text = ("Your VectorLinux installation is about to be performed as
follows. If you need to make any changes, this is your last chance.")
}
}
- { gvSumm GridView
- MoveScaled(2,16,57,14)
+ { TreeView1 TreeView
+ MoveScaled(3,15,52,20)
Expand = True
}
}
|
