Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r492 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-12 19:57:04
|
Author: M0...@gm...
Date: Thu Feb 12 11:44:33 2009
New Revision: 492
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/MdlMain.module
branches/speedy/Step1.class
branches/speedy/Step3.class
branches/speedy/Step3a.class
branches/speedy/Step3a1a.class
branches/speedy/Step3a1a.form
branches/speedy/Step3a2.class
branches/speedy/Step6.class
Log:
Autopartitioning ready for testing
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Feb 12 11:44:33 2009
@@ -30,6 +30,14 @@
msgid "Quit"
msgstr ""
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr ""
+
+#: MdlMain.module:33
+msgid "to"
+msgstr ""
+
#: Step0.class:20
msgid "Localization Settings"
msgstr ""
@@ -62,67 +70,67 @@
msgid "on"
msgstr ""
-#: Step1.class:130
+#: Step1.class:132
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "Found"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "in partition"
msgstr ""
-#: Step1.class:190
+#: Step1.class:192
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:203
+#: Step1.class:205
msgid "Scanning"
msgstr ""
-#: Step1.class:213
+#: Step1.class:215
msgid "in"
msgstr ""
-#: Step1.class:241
+#: Step1.class:243
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:334
+#: Step1.class:336
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:337
+#: Step1.class:339
msgid "VERSION"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414 Step3a1.class:22 Step3a1a.class:81
+#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:466
+#: Step1.class:468
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:484
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:505
+#: Step1.class:507
msgid "Search Again"
msgstr ""
-#: Step1.class:529
+#: Step1.class:531
msgid "Check Installation media before installing"
msgstr ""
@@ -242,33 +250,33 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:110 Step3a1.class:157
+#: Step3.class:135 Step3a.class:111 Step3a1.class:157
msgid "TextLabel1"
msgstr ""
-#: Step3.class:150
+#: Step3.class:153
msgid "Automatic"
msgstr ""
-#: Step3.class:160
+#: Step3.class:163
msgid ""
"Automatically resize your partitions and / or create the correct disk
space "
"for VectorLinux."
msgstr ""
-#: Step3.class:167
+#: Step3.class:170
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:177
+#: Step3.class:180
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:184
+#: Step3.class:187
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:194
+#: Step3.class:197
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
@@ -307,15 +315,15 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:121
+#: Step3a.class:122
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:143
+#: Step3a.class:144
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:167
+#: Step3a.class:168
msgid "Use entire disk"
msgstr ""
@@ -339,41 +347,75 @@
msgid "Create Linux Partition Scheme in"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid "There has been an error deleting"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid ""
"Please make sure the drive or partition is not being used by some other "
"program"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:56
+msgid ""
+"Error deleting existing partitions... Please try another partitioning
method"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Vectorlinux has detected an existing swap partition in your system."
+msgstr ""
+
+#: Step3a1a.class:82
+msgid ""
+"Would you like to let VectorLinux use this partition or create a new one?"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr ""
+
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "to continue"
+msgstr ""
+
+#: Step3a1a.class:169
msgid "All existing data in"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "is about to be deleted."
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:81 Step6.class:385
+#: Step3a1a.class:169 Step6.class:385
msgid "Yes"
msgstr ""
-#: Step3a1a.class:81 Step6.class:385
+#: Step3a1a.class:169 Step6.class:385
msgid "No"
msgstr ""
-#: Step3a1a.class:84
+#: Step3a1a.class:173
msgid "Preparing hard disk for new partitioning structure. Please wait"
msgstr ""
-#: Step3a1a.class:89
+#: Step3a1a.class:193
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Thu Feb 12 11:44:33 2009
@@ -14,3 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr ""
+
+#: MdlMain.module:33
+msgid "to"
+msgstr ""
+
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Thu Feb 12 11:44:33 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:130
+#: Step1.class:132
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "Found"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "in partition"
msgstr ""
-#: Step1.class:190
+#: Step1.class:192
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:203
+#: Step1.class:205
msgid "Scanning"
msgstr ""
-#: Step1.class:213
+#: Step1.class:215
msgid "in"
msgstr ""
-#: Step1.class:241
+#: Step1.class:243
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:334
+#: Step1.class:336
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:337
+#: Step1.class:339
msgid "VERSION"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "WARNING:"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:466
+#: Step1.class:468
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:484
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:505
+#: Step1.class:507
msgid "Search Again"
msgstr ""
-#: Step1.class:529
+#: Step1.class:531
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Thu Feb 12 11:44:33 2009
@@ -22,31 +22,31 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132
+#: Step3.class:135
msgid "TextLabel1"
msgstr ""
-#: Step3.class:150
+#: Step3.class:153
msgid "Automatic"
msgstr ""
-#: Step3.class:160
+#: Step3.class:163
msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
msgstr ""
-#: Step3.class:167
+#: Step3.class:170
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:177
+#: Step3.class:180
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:184
+#: Step3.class:187
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:194
+#: Step3.class:197
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Thu Feb 12 11:44:33 2009
@@ -46,19 +46,19 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:110
+#: Step3a.class:111
msgid "TextLabel1"
msgstr ""
-#: Step3a.class:121
+#: Step3a.class:122
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:143
+#: Step3a.class:144
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:167
+#: Step3a.class:168
msgid "Use entire disk"
msgstr ""
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Thu Feb 12 11:44:33 2009
@@ -18,43 +18,75 @@
msgid "Create Linux Partition Scheme in"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid "There has been an error deleting"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid "Please make sure the drive or partition is not being used by some
other program"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:56
+msgid "Error deleting existing partitions... Please try another
partitioning method"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Vectorlinux has detected an existing swap partition in your system."
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Would you like to let VectorLinux use this partition or create a
new one?"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr ""
+
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "to continue"
+msgstr ""
+
+#: Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "All existing data in"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "is about to be deleted."
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "Yes"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "No"
msgstr ""
-#: Step3a1a.class:84
+#: Step3a1a.class:173
msgid "Preparing hard disk for new partitioning structure. Please wait"
msgstr ""
-#: Step3a1a.class:89
+#: Step3a1a.class:193
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Thu Feb 12 11:44:33 2009
@@ -15,6 +15,29 @@
' 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 FORMAT_THIS_PARTITION(sPartition AS String, sFilesystem AS
String) AS Integer
+
+ DIM hproc AS Process
+ DIM sFlags AS String
+
+ SELECT CASE sFilesystem
+ CASE "reiserfs"
+ sFlags = "-f"
+ END SELECT
+
+ WAIT 1
+ PRINT " --+ Formatting " & sPartition & " to " & sFilesystem
+ SHELL "umount -f " & sPartition
+ hproc = SHELL "mkfs." & LCase(sFilesystem) & Space(1) & sFlags &
Space(1) & sPartition WAIT
+ IF hproc.Value > 0 THEN Message.Error(("Unable to format") & Space(1)
& sPartition & Space(1) & ("to") & Space(1) & sFilesystem)
+ RETURN hproc.Value
+
+END
+
+
+
+
PUBLIC SUB NAVIGATION_LOCKDOWN()
WITH FMain
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Thu Feb 12 11:44:33 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)
+
+ PRINT " --- Use " & ClsGlobal.sSourceName & Space(1) & "from " &
ClsGlobal.sSourceAddr & " for installation source"
TRY MKDIR "/mnt/source"
' mount the media and get ready for testing
IF Right(sname, Len(".iso")) LIKE ".iso" THEN ' this is an iso image...
doing hosted install i'm afraid
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Thu Feb 12 11:44:33 2009
@@ -41,17 +41,20 @@
ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone
ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
IF ME.rbAutoPart.Value = TRUE THEN
- 'no module for auto partition written yet
- 'Message("Not ready yet")
+ ClsGlobal.bAutoPartition = TRUE
+ PRINT " ---> Use built-in auto partition tools for partitioning"
RETURN "Step3a"
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
- 'Message("Gparted module not present yet")
+ PRINT " ---> Embed GParted for partitioning"
+ ClsGlobal.bAutoPartition = FALSE
RETURN "Step5"
END IF
IF ME.rbPrePartitioned.Value = TRUE THEN
' Use existing partitions
+ PRINT " ---> Install to pre-partitioned hard drive"
+ ClsGlobal.bAutoPartition = FALSE
RETURN "Step6"
END IF
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Thu Feb 12 11:44:33 2009
@@ -43,6 +43,7 @@
PUBLIC FUNCTION GetNext() AS String
IF ME.rbEntireDisk.Value = TRUE THEN
+
RETURN "Step3a1"
ELSE IF ME.rbunpartitioned.Value = TRUE THEN
RETURN "Step3a2"
Modified: branches/speedy/Step3a1a.class
==============================================================================
--- branches/speedy/Step3a1a.class (original)
+++ branches/speedy/Step3a1a.class Thu Feb 12 11:44:33 2009
@@ -14,11 +14,13 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PRIVATE sStatus AS String
PRIVATE hproc AS Process
-
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & ("Create Linux Partition Scheme in") &
Space(1) & ClsGlobal.sFullDiscToWipe & "</h2>"
+ ME.MovieBox1.Path = "images/throbber.gif"
+ ME.MovieBox1.Playing = FALSE
@@ -51,6 +53,7 @@
("Please make sure the drive or partition is not being
used by some other program"))
'BREAK
PRINT " \\- FAILED!"
+ sStatus = ("Error deleting existing partitions...
Please try another partitioning method")
RETURN
END IF
@@ -62,14 +65,99 @@
PUBLIC SUB CREATE_NEW_PARTITIONS()
- DIM lRunningSwap, lNeededSwap, lTotalRAM AS Long
- DIM sDump AS String
+ DIM lRunningSwap, lNeededSwap, lTotalRAM, lTotalFreekb AS Long
+ DIM sDump, sSwapList, sSwapPart, sRootpart, sDrive AS String
+ DIM sResults, sPartedDetails AS String[]
+ DIM sPartedOutput AS String
+ DIM sFreeStart, sFreeEnd, sFreeTotal AS String
+
+ sDrive = Trim(ClsGlobal.sFullDiscToWipe)
' First determine how much swap we need
SHELL "free | grep \"^Swap\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
- sDump = Trim(sDump)
- Message("Total RAM " & sDump)
+ sDump = Trim(sDump)
+ IF sDump THEN
+ ' swap exists
+ SELECT CASE Message.Question(("Vectorlinux has detected an
existing swap partition in your system.") & "<br>" &
+ ("Would you like to let VectorLinux use this partition or
create a new one?"), ("Use Existing"), ("Create New"))
+ CASE 1
+ ' use existing partition
+ SHELL "probepart | grep \"^/dev\" | grep -i \"linux
swap\" | tr -s \' \',\"\" | cut -f 1 -d \' \'" TO sSwapList
+ sSwapList = Trim(sSwapList)
+ sResults = Split(sSwapList, "\n")
+ sSwapPart = sResults[0]
+ PRINT " --- Use existing swap partition " & sSwapPart
+ ClsGlobal.sTargetSwap = sSwapPart ' set the address to the
swap partition.
+ 'Message("Using swap " & sSwapPart)
+ END SELECT
+ ELSE ' no swap found
+ ' we take care of this outside this if
+ END IF
+
+
+
+ IF NOT sSwapPart THEN
+ 'detect ram
+ PRINT " - Calculating system ram"
+ SHELL "free | grep \"^Mem\" |tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
+ sDump = Trim(sDump)
+ lTotalRAM = sDump
+ PRINT " -\\- " & lTotalRAM & " KB found"
+ PRINT " - Determining amount of swap space needed "
+ IF lTotalRAM <= 524288 THEN
+ lNeededSwap = lTotalRAM * 2
+ ELSE
+ lNeededSwap = lTotalRAM
+ END IF
+ PRINT " -\\- " & lNeededSwap & " KB needed for swap"
+
+ ' now create partitions for swap and /
+ SHELL "parted " & sDrive & " unit kb print free | grep -i \"free
space\"" TO sPartedOutput
+ sPartedOutput = Trim(sPartedOutput)
+ 'Number Start End Size Type File system Flags
+ sPartedDetails = Split(sPartedOutput, Space(1))
+ lTotalFreekb = Left(sPartedDetails[2], Len(sPartedDetails[2])
- 2)
+ 'Message.Info("Total free space size on " & sDrive & " = " &
lTotalFreekb)
+ ' create primary partition for /
+ PRINT " --- Creating / partition at " & sDrive & "1 ... Size
= " & (lTotalFreekb - lNeededSwap) & " Kb as reiserfs"
+ SHELL "parted " & sDrive & " unit kb mkpart primary reiserfs " &
sPartedDetails[0] & Space(1) & (lTotalFreekb - lNeededSwap) & "kb 1 >
/dev/null" WAIT
+ ' get the free space again to create the right size swap
partition with the remainder of the free space
+ SHELL "parted " & sDrive & " unit kb print free | grep -i \"free
space\"" TO sPartedOutput
+ sPartedOutput = Trim(sPartedOutput)
+ 'Message(sPartedOutput)
+ 'Number Start End Size Type File system Flags
+ sPartedDetails = Split(sPartedOutput, Space(1))
+ 'Message("Start " & Trim(sPartedDetails[0]) & " End " &
Trim(sPartedDetails[2]))
+ PRINT " --- Creating swap partition at " & sDrive & "2 ... Size
= " & lNeededSwap & " Kb"
+ SHELL "parted " & sDrive & " mkpartfs primary linux-swap " &
Trim(sPartedDetails[0]) & " " & Trim(sPartedDetails[2]) & " 1 > /dev/null "
WAIT
+
+ ClsGlobal.sTargetRoot = sDrive & "1"
+ ClsGlobal.sTargetSwap = sDrive & "2"
+
+
+ ELSE
+ ' only create a / partition... we'll be using a shared swap area
+ SHELL "parted " & sDrive & " unit gb print free | grep -i \"free
space\"" TO sPartedOutput
+ sPartedOutput = Trim(sPartedOutput)
+ 'Number Start End Size Type File system Flags
+ sPartedDetails = Split(sPartedOutput, Space(1))
+ PRINT " --- Create / partition " & sDrive & "1 Size = " &
Trim(sPartedDetails[4]) & " preformatted to reiserfs"
+ SHELL "parted " & sDrive & " mkpart primary reiserfs " &
Trim(sPartedDetails[0]) & Space(1) & Trim(sPartedDetails[2]) WAIT
+ IF MdlMain.FORMAT_THIS_PARTITION(sDrive & "1", "reiserfs") > 0
THEN
+ sStatus = ("Failed to format partitions, please try another
partitioning method")
+ RETURN
+ END IF
+
+ ClsGlobal.sTargetRoot = sDrive & "1"
+ 'SHELL "mkfs.reiserfs -q " & sDrive & "1" WAIT
+ 'Message(sPartedDetails[0])
+ 'Message(sPartedDetails[1])
+ 'Message(sPartedDetails[2])
+
+ END IF
+
+ sStatus = ("Partitioning stage complete. Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue")
END
@@ -81,9 +169,25 @@
("This step cannot be undone. Are you sure you want to continue?"),
("Yes"), ("No"))
CASE 1
'Message("Yes")
+
ME.tlWarning.Text = ("Preparing hard disk for new partitioning
structure. Please wait")
+ ME.MovieBox1.Playing = TRUE
+ WITH ClsGlobal.fRunningMainForm
+ .btnext.enabled = FALSE
+ .btback.enabled = FALSE
+ .btquit.enabled = FALSE
+ END WITH
ME.DESTROY_CURRENT_DATA()
ME.CREATE_NEW_PARTITIONS()
+ ME.tlWarning.Text = sStatus '("Hard drive partitioned
successfully. Click") & Space(1) & ClsGlobal.fRunningMainForm.btnext.text &
Space(1) & ("to continue.")
+ ME.MovieBox1.Playing = FALSE
+ ME.MovieBox1.Enabled = FALSE
+ WITH ClsGlobal.fRunningMainForm
+ .btnext.enabled = TRUE
+ .btback.enabled = TRUE
+ .btquit.enabled = TRUE
+ END WITH
+
CASE 2
'Message("No")
ME.tlWarning.Text = ("Operation cancelled by user. No changes have
been made to the system")
@@ -101,6 +205,6 @@
PUBLIC FUNCTION GetNext() AS String
-
+ RETURN "Step7"
END
Modified: branches/speedy/Step3a1a.form
==============================================================================
--- branches/speedy/Step3a1a.form (original)
+++ branches/speedy/Step3a1a.form Thu Feb 12 11:44:33 2009
@@ -23,13 +23,18 @@
}
{ HPanel2 HPanel
MoveScaled(1,6,69,36)
+ Expand = True
{ tlWarning TextLabel
MoveScaled(1,1,12,3)
Expand = True
Text = ("")
}
+ { HBox2 HBox
+ MoveScaled(2,6,6,3)
+ Expand = True
+ }
{ MovieBox1 MovieBox
- MoveScaled(19,7,25,19)
+ MoveScaled(20,8,25,25)
Expand = True
}
}
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Thu Feb 12 11:44:33 2009
@@ -322,7 +322,7 @@
ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
ME.MovieBox1.Playing = FALSE
- ' set the flaf for partition reading
+ ' set the flag for partition reading
ClsGlobal.bAutoPartition = TRUE
ClsGlobal.sTargetRoot = sRootPart
ClsGlobal.sTargetSwap = sSwapPart
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Thu Feb 12 11:44:33 2009
@@ -38,7 +38,7 @@
sFmtAs = gvPartListing[n, 5].Text
END IF
END IF
- Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
+ 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
NEXT
|
