Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r516 - Fixed bug in installation summary (partition listing)
|
From: <cod...@go...> - 2009-03-20 18:17:04
|
Author: M0...@gm...
Date: Fri Mar 20 10:33:33 2009
New Revision: 516
Added:
branches/speedy/Conf0.class
branches/speedy/Conf0.form
Removed:
branches/speedy/FMain0Old.class
branches/speedy/FMain0Old.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/Step6.class
branches/speedy/Step8.class
Log:
Fixed bug in installation summary (partition listing)
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Mar 20 10:33:33 2009
@@ -14,23 +14,68 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:253 FMain0.class:253 FMain0Old.class:233
+#: Conf0.class:58 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Step7a.class:143
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0.class:58
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0.class:58
+msgid ""
+"You may not be able to start your VectorLinux installation. Do not
choose "
+"this option"
+msgstr ""
+
+#: Conf0.class:58
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0.class:92
+msgid "System Bootloader Configuration"
+msgstr ""
+
+#: Conf0.class:110
+msgid "Select bootloader to be used"
+msgstr ""
+
+#: Conf0.class:119
+msgid "LILO"
+msgstr ""
+
+#: Conf0.class:125
+msgid "Grub"
+msgstr ""
+
+#: Conf0.class:130
+msgid ""
+"Select this option if you want to configure your system boot manager "
+"manually at a later time"
+msgstr ""
+
+#: Conf0.class:132
+msgid "None (Experts Only)"
+msgstr ""
+
+#: FMain.class:254 FMain0.class:254
msgid "Process Overview"
msgstr ""
-#: FMain.class:294 FMain0.class:294
+#: FMain.class:295 FMain0.class:295
msgid "Help"
msgstr ""
-#: FMain.class:307 FMain0.class:307 FMain0Old.class:271
+#: FMain.class:308 FMain0.class:308
msgid "Back"
msgstr ""
-#: FMain.class:318 FMain0.class:318 FMain0Old.class:282
+#: FMain.class:319 FMain0.class:319
msgid "Next"
msgstr ""
-#: FMain.class:329 FMain0.class:329 FMain0Old.class:293
+#: FMain.class:330 FMain0.class:330
msgid "Quit"
msgstr ""
@@ -102,7 +147,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:135
+#: MdlStartUp.module:47 Step8.class:139
msgid "Software Selection"
msgstr ""
@@ -110,7 +155,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:218
+#: MdlStartUp.module:49 Step8.class:222
msgid "Installation Summary"
msgstr ""
@@ -264,10 +309,6 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433 Step3a1.class:22 Step3a1a.class:186 Step7a.class:143
-msgid "WARNING:"
-msgstr ""
-
#: Step1.class:433
msgid "This process can take a long time to complete."
msgstr ""
@@ -541,11 +582,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:467 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:503 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:467 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:503 Step7a.class:143
msgid "No"
msgstr ""
@@ -794,51 +835,51 @@
msgid "Restart Now"
msgstr ""
-#: Step6.class:66
+#: Step6.class:68
msgid "Partition"
msgstr ""
-#: Step6.class:67
+#: Step6.class:69
msgid "Size"
msgstr ""
-#: Step6.class:68
+#: Step6.class:70
msgid "Mount Point"
msgstr ""
-#: Step6.class:69
+#: Step6.class:71
msgid "File System"
msgstr ""
-#: Step6.class:142
+#: Step6.class:144
msgid "Swap"
msgstr ""
-#: Step6.class:142
+#: Step6.class:144
msgid "Not Used"
msgstr ""
-#: Step6.class:183 Step8.class:73
+#: Step6.class:185 Step8.class:74
msgid "Do not format"
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "You have already selected"
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "as your"
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "partition."
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:362
+#: Step6.class:398
msgid "Select which partitions to use for installation"
msgstr ""
@@ -854,7 +895,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:125
+#: Step7.class:126 Step8.class:129
msgid "Customized"
msgstr ""
@@ -862,7 +903,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:127
+#: Step7.class:144 Step8.class:131
msgid "Minimal"
msgstr ""
@@ -926,19 +967,19 @@
"include in your installation."
msgstr ""
-#: Step8.class:44
+#: Step8.class:45
msgid "Distribution"
msgstr ""
-#: Step8.class:62
+#: Step8.class:63
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:74
+#: Step8.class:75
msgid "Not Formatted"
msgstr ""
-#: Step8.class:74
+#: Step8.class:75
msgid "Mount to"
msgstr ""
@@ -950,35 +991,35 @@
msgid "and mount to"
msgstr ""
-#: Step8.class:88
+#: Step8.class:92
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:93
+#: Step8.class:97
msgid "Swap Space"
msgstr ""
-#: Step8.class:106
+#: Step8.class:110
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:123
+#: Step8.class:127
msgid "Full"
msgstr ""
-#: Step8.class:130
+#: Step8.class:134
msgid "Installation Method"
msgstr ""
-#: Step8.class:136
+#: Step8.class:140
msgid "Major Components"
msgstr ""
-#: Step8.class:146
+#: Step8.class:150
msgid "Additional Software"
msgstr ""
-#: Step8.class:237
+#: Step8.class:241
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/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Fri Mar 20 10:33:33 2009
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:253
+#: FMain.class:254
msgid "Process Overview"
msgstr ""
-#: FMain.class:294
+#: FMain.class:295
msgid "Help"
msgstr ""
-#: FMain.class:307
+#: FMain.class:308
msgid "Back"
msgstr ""
-#: FMain.class:318
+#: FMain.class:319
msgid "Next"
msgstr ""
-#: FMain.class:329
+#: FMain.class:330
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Fri Mar 20 10:33:33 2009
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:253
+#: FMain0.class:254
msgid "Process Overview"
msgstr ""
-#: FMain0.class:294
+#: FMain0.class:295
msgid "Help"
msgstr ""
-#: FMain0.class:307
+#: FMain0.class:308
msgid "Back"
msgstr ""
-#: FMain0.class:318
+#: FMain0.class:319
msgid "Next"
msgstr ""
-#: FMain0.class:329
+#: FMain0.class:330
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Mar 20 10:33:33 2009
@@ -14,59 +14,59 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step6.class:66
+#: Step6.class:68
msgid "Partition"
msgstr ""
-#: Step6.class:67
+#: Step6.class:69
msgid "Size"
msgstr ""
-#: Step6.class:68
+#: Step6.class:70
msgid "Mount Point"
msgstr ""
-#: Step6.class:69
+#: Step6.class:71
msgid "File System"
msgstr ""
-#: Step6.class:142
+#: Step6.class:144
msgid "Swap"
msgstr ""
-#: Step6.class:142
+#: Step6.class:144
msgid "Not Used"
msgstr ""
-#: Step6.class:183
+#: Step6.class:185
msgid "Do not format"
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "You have already selected"
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "as your"
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "partition."
msgstr ""
-#: Step6.class:228
+#: Step6.class:230
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:362
+#: Step6.class:398
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:467
+#: Step6.class:503
msgid "Yes"
msgstr ""
-#: Step6.class:467
+#: Step6.class:503
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Fri Mar 20 10:33:33 2009
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:44
+#: Step8.class:45
msgid "Distribution"
msgstr ""
-#: Step8.class:62
+#: Step8.class:63
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:73
+#: Step8.class:74
msgid "Do not format"
msgstr ""
-#: Step8.class:74
+#: Step8.class:75
msgid "Not Formatted"
msgstr ""
-#: Step8.class:74
+#: Step8.class:75
msgid "Mount to"
msgstr ""
@@ -42,51 +42,51 @@
msgid "and mount to"
msgstr ""
-#: Step8.class:88
+#: Step8.class:92
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:93
+#: Step8.class:97
msgid "Swap Space"
msgstr ""
-#: Step8.class:106
+#: Step8.class:110
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:123
+#: Step8.class:127
msgid "Full"
msgstr ""
-#: Step8.class:125
+#: Step8.class:129
msgid "Customized"
msgstr ""
-#: Step8.class:127
+#: Step8.class:131
msgid "Minimal"
msgstr ""
-#: Step8.class:130
+#: Step8.class:134
msgid "Installation Method"
msgstr ""
-#: Step8.class:135
+#: Step8.class:139
msgid "Software Selection"
msgstr ""
-#: Step8.class:136
+#: Step8.class:140
msgid "Major Components"
msgstr ""
-#: Step8.class:146
+#: Step8.class:150
msgid "Additional Software"
msgstr ""
-#: Step8.class:218
+#: Step8.class:222
msgid "Installation Summary"
msgstr ""
-#: Step8.class:237
+#: Step8.class:241
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/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Fri Mar 20 10:33:33 2009
@@ -7,7 +7,7 @@
Library=gb.form
Library=gb.desktop
Library=gb.gtk.ext
-Arguments="es_ES.utf8"
+Arguments="en_US"
TabSize=2
Translate=1
Language=en_US
Added: branches/speedy/Conf0.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf0.class Fri Mar 20 10:33:33 2009
@@ -0,0 +1,61 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+'=====================================================================================
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Conf1"
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ END WITH
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ ME.HBox2.Width = ME.Frame1.Width - (ME.HBox2.Left * 2)
+
+END
+
+PUBLIC SUB rbNone_Click()
+
+ IF LAST.value = TRUE THEN
+ Message.Warning("<b>" & ("WARNING:") & "</b><br>" &
+ ("Selecting this option will bypass your boot manager configuration.")
& "<br>" &
+ ("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
+ ("unless you are fully aware of what you are doing."))
+END IF
+
+END
Added: branches/speedy/Conf0.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf0.form Fri Mar 20 10:33:33 2009
@@ -0,0 +1,51 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,72,44)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("System Bootloader Configuration")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,34,1)
+ Visible = False
+ Expand = True
+ }
+ { Frame1 Frame
+ MoveScaled(0,6,55,7)
+ Expand = True
+ Text = ("Select bootloader to be used")
+ { HBox2 HBox
+ MoveScaled(1,3,52,3)
+ Expand = True
+ { rbLilo RadioButton
+ MoveScaled(1,0,11,3)
+ Expand = True
+ Text = ("LILO")
+ }
+ { rbGrub RadioButton
+ MoveScaled(14,0,10,3)
+ Expand = True
+ Text = ("Grub")
+ }
+ { rbNone RadioButton
+ MoveScaled(26,0,16,3)
+ ToolTip = ("Select this option if you want to configure your
system boot manager manually at a later time")
+ Expand = True
+ Text = ("None (Experts Only)")
+ }
+ }
+ }
+}
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Fri Mar 20 10:33:33 2009
@@ -4,6 +4,7 @@
MoveScaled(0,0,146.25,85.625)
Text = ("")
Arrangement = Arrange.Vertical
+ Padding = 2
{ HBox2 HBox
MoveScaled(12,1,63,7.25)
Background = Color.SelectedBackground
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Fri Mar 20 10:33:33 2009
@@ -4,6 +4,7 @@
MoveScaled(0,0,146.25,85.625)
Text = ("")
Arrangement = Arrange.Vertical
+ Padding = 2
{ HBox2 HBox
MoveScaled(12,1,63,7.25)
Background = Color.SelectedBackground
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Mar 20 10:33:33 2009
@@ -29,23 +29,25 @@
PUBLIC SUB OnExit()
- DIM n AS Integer
- DIM sFmtAs, sList, sPartAddr AS String
+ ' DIM n AS Integer
+ ' DIM sFmtAs, sList, sPartAddr AS String
ClsGlobal.sVitalPartList = ""
- FOR n = 1 TO gvPartListing.Rows.Count - 1
- IF gvPartListing[n, 2].Text THEN
- sPartAddr = gvPartListing[n, 2].Text
- IF gvPartListing[n, 4].Text THEN
- sFmtAs = gvPartListing[n, 4].Text
- ELSE
- sFmtAs = gvPartListing[n, 5].Text
- END IF
- END IF
- sList = sList & sPartAddr & "," & sFmtAs & ";"
- 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
-
- NEXT
- ME.read_partition_selection
+ ClsGlobal.sWapPartList = ""
+ read_partition_selection()
+ ' FOR n = 1 TO gvPartListing.Rows.Count - 1
+ ' IF gvPartListing[n, 2].Text THEN
+ ' sPartAddr = gvPartListing[n, 2].Text
+ ' IF gvPartListing[n, 4].Text THEN
+ ' sFmtAs = gvPartListing[n, 4].Text
+ ' ELSE
+ ' sFmtAs = gvPartListing[n, 5].Text
+ ' END IF
+ ' END IF
+ ' sList = sList & sPartAddr & "," & sFmtAs & ";"
+ ' 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
+ '
+ ' NEXT
+ ' ME.read_partition_selection
'Message(ClsGlobal.sVitalPartList)
' sList = Trim(Left(sList, Len(sList) - 1))
'ClsGlobal.sVitalPartList = Trim(sList)
@@ -316,46 +318,80 @@
DIM cbox, cb AS ComboBox
- DIM sFormat, sSize AS String
- DIM i AS Integer
- FOR EACH cbox IN objMntPoints
- IF cbox.Text <> ("Not Used") THEN
- i = 2
- REPEAT
- IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN
- sSize = Trim(gvPartListing[i, 1].Text)
- END IF
- INC i
- UNTIL sSize OR i = gvPartListing.Rows.Count
+ DIM sPart, sFormat, sSize, sMntPoint AS String
+ DIM i, irow AS Integer
+
+
+ ' ================= get the list of vital partitions
=====================
+ FOR irow = 2 TO gvPartListing.Rows.count - 1
+ IF Trim(gvPartListing[irow, 2].Text) THEN
+ IF Trim(gvPartListing[irow, 2].Text) <> ("Not Used") AND
Trim(gvPartListing[irow, 2].Text) <> ("Swap") THEN
+ sPart = Trim(gvPartListing[irow, 0].Text)
+ sSize = Trim(gvPartListing[irow, 1].Text)
+ sMntPoint = Trim(gvPartListing[irow, 2].Text)
+ sFormat = Trim(gvPartListing[irow, 4].Text)
- FOR EACH cb IN objFS
- IF cbox.tag = cb.Tag THEN
- sFormat = Trim(cb.Text)
- BREAK
- ELSE
- sFormat = ""
- END IF
- NEXT
- ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
- END IF
- NEXT
+ ' Message(gvPartListing[irow, 0].Text & " - (" &
gvPartListing[irow, 1].Text & ") - " & gvPartListing[irow, 2].Text)
+ ' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList &
cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
+ ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart & "-" &
sSize & "-" & sMntPoint & "-" & sFormat & "|"
-FOR i = 2 TO gvPartListing.Rows.count - 1
- IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN
- FOR EACH cbox IN objMntPoints
- IF cbox.tag = gvPartListing[i, 0].Text THEN
- IF cbox.text <> ("Not Used") THEN
- ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
- END IF
- END IF
- NEXT
END IF
- NEXT
-
-
-END
-
-
+ END IF
+
+ NEXT
+
+ ' =========== get list of swap partitions selected .(if any)
=====================
+
+ FOR irow = 2 TO gvPartListing.Rows.count - 1
+ IF Trim(gvPartListing[irow, 2].Text) = ("Swap") THEN
+ sPart = Trim(gvPartListing[irow, 0].Text)
+ sSize = Trim(gvPartListing[irow, 1].Text)
+ ' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
+ ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & spart & "-" &
sSize & "|"
+ END IF
+ NEXT
+
+
+ 'Message(ClsGlobal.sVitalPartList)
+'
+' FOR EACH cbox IN objMntPoints
+' IF cbox.Text <> ("Not Used") THEN
+' i = 2
+' REPEAT
+' IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN
+' sSize = Trim(gvPartListing[i, 1].Text)
+' END IF
+' INC i
+' UNTIL sSize OR i = gvPartListing.Rows.Count
+'
+' FOR EACH cb IN objFS
+' IF cbox.tag = cb.Tag THEN
+' sFormat = Trim(cb.Text)
+' BREAK
+' ELSE
+' sFormat = ""
+' END IF
+' NEXT
+' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
+' END IF
+' NEXT
+'
+' FOR i = 2 TO gvPartListing.Rows.count - 1
+' IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN
+' FOR EACH cbox IN objMntPoints
+' IF cbox.tag = gvPartListing[i, 0].Text THEN
+' IF cbox.text <> ("Not Used") THEN
+' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
+' END IF
+' END IF
+' NEXT
+' END IF
+' NEXT
+'
+'
+ END
+'
+'
PUBLIC SUB Form_Open()
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Fri Mar 20 10:33:33 2009
@@ -34,7 +34,8 @@
END
PUBLIC FUNCTION GetNext() AS String
- RETURN "Step9"
+ 'RETURN "Step9"
+ RETURN "Conf0"
END
@@ -61,7 +62,7 @@
WITH ME.TreeView1
.Add("Part", ("Partitions to be used"), MdlStartUp.pCategory)
IF ClsGlobal.bAutoPartition = FALSE THEN
- sArr = Split(ClsGlobal.sVitalPartList, ",")
+ sArr = Split(ClsGlobal.sVitalPartList, "|")
FOR i = 0 TO sArr.Max
sList = Trim(sArr[i])
IF sList THEN
@@ -72,8 +73,11 @@
sFs = Trim(sEntry[3])
IF sfs LIKE ("Do not format") THEN
sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) &
("Mount to") & Space(1)
+ ELSE IF sfs = ("Format to") & Space(1) & sFs & Space(1) &
("and mount to") & Space(1)
+ ELSE IF Len(sFS) <= 0 THEN
+ sFs = "(" & ("Not Formatted") & ")" & Space(1) & ("Mount
to") & Space(1)
ELSE
- sfs = ("Format to") & Space(1) & sFs & Space(1) & ("and
mount to") & Space(1)
+ sFs = ("Format to") & Space(1) & sFs & Space(1) & ("and
mount to") & Space(1)
END IF
.Add("Part." & i, sPart & " -- " & sSize, PicDisk, "Part")
.add("Part." & i & "." & i, sFs & sMntPnt, PicTask, "Part." & i)
@@ -83,7 +87,7 @@
NEXT
' summarize swap partitions
- sSwaps = Split(Trim(ClsGlobal.sWapPartList), ",")
+ sSwaps = Split(Trim(ClsGlobal.sWapPartList), "|")
IF sSwaps.Count <= 0 THEN
.Add("Swaps", ("NO SWAP SPACE SELECTED"),, "Part")
PRINT "No swap space selected for installation.!"
|
