[Vectorlinux-devel] [vinstall-ng commit] r27 - in trunk: . .lang

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

Author: easuter
Date: Wed Sep 12 10:57:26 2007
New Revision: 27

Modified:
   trunk/.lang/.pot
   trunk/.lang/frmPartitions.pot
   trunk/.project
   trunk/.settings
   trunk/Functions.module
   trunk/Global.class
   trunk/Utils.module
   trunk/cDiskInfo.class
   trunk/frmPartSelect.class
   trunk/frmPartitions.class
   trunk/frmPartitions.form

Log:
Changes:
=09
- Functions.module: Corrected bug in getFreePartSpace's NTFS
	implementation (used bytes where being identified as unused
	bytes).

- Utils.module: Subroutine Parse_fdisk renamed to ProcessDiskInfo
	since fdisk parsing is now only one of many things done in this
	sub.
	---
	Added code to ProcessDiskInfo to gather information about
	unallocated bytes on each disk drive.

- frmPartSelect.class: The "Units" column in gridDisk replaced with
	"Unallocated". This column now displays the unallocated
	(unpartitioned) space of each disk drive.



Modified: trunk/.lang/.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/.lang/.pot	(original)
+++ trunk/.lang/.pot	Wed Sep 12 10:57:26 2007
@@ -292,7 +292,7 @@
 msgid "Advanced selection"
 msgstr ""
=20
-#: frmPackages.class:147 frmPartitions.class:266
+#: frmPackages.class:147 frmPartitions.class:265
 msgid "Manual"
 msgstr ""
=20
@@ -373,7 +373,7 @@
 "</ul>\n"
 msgstr ""
=20
-#: frmPartitions.class:217
+#: frmPartitions.class:216
 msgid ""
 "<center><h3><b>Available partitioning modes:</b></h3></center>\n"
 "\n"
@@ -384,8 +384,8 @@
 "disk for VL. <font color=3D\"#FF0000\">WARNING: this option will DELETE "
 "everything on your hard disk, or offer a choice if there are multiple disk=
s. "
 "You have been WARNED.</font></li>\n"
-"<li><b>Free space:</b> using available free (unpartitioned) disk space.</"
-"li>\n"
+"<li><b>Unpartitioned space:</b> using available free (unpartitioned) disk =
"
+"space.</li>\n"
 "</ul>\n"
 "<b><u>Manual partitioning:</u></b> You have full control of partitioning.\=
n"
 "<ul>\n"
@@ -402,39 +402,39 @@
 "</ul>\n"
 msgstr ""
=20
-#: frmPartitions.class:229
+#: frmPartitions.class:228
 msgid "Partitioning mode"
 msgstr ""
=20
-#: frmPartitions.class:244
+#: frmPartitions.class:243
 msgid "Automatic"
 msgstr ""
=20
-#: frmPartitions.class:251
+#: frmPartitions.class:250
 msgid "Full disk"
 msgstr ""
=20
-#: frmPartitions.class:259
-msgid "Free space"
+#: frmPartitions.class:258
+msgid "Unpartitioned space"
 msgstr ""
=20
-#: frmPartitions.class:273
+#: frmPartitions.class:272
 msgid "GParted"
 msgstr ""
=20
-#: frmPartitions.class:281
+#: frmPartitions.class:280
 msgid "cfdisk"
 msgstr ""
=20
-#: frmPartitions.class:288
+#: frmPartitions.class:287
 msgid "Others"
 msgstr ""
=20
-#: frmPartitions.class:295
+#: frmPartitions.class:294
 msgid "Preset strategies"
 msgstr ""
=20
-#: frmPartitions.class:303
+#: frmPartitions.class:302
 msgid "No partitioning"
 msgstr ""
=20

Modified: trunk/.lang/frmPartitions.pot
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/.lang/frmPartitions.pot	(original)
+++ trunk/.lang/frmPartitions.pot	Wed Sep 12 10:57:26 2007
@@ -14,47 +14,47 @@
 "Content-Type: text/plain; charset=3DUTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
=20
-#: frmPartitions.class:217
-msgid "<center><h3><b>Available partitioning modes:</b></h3></center>\n\n<b=
><u>Automatic partitioning:</u></b> The installer will handle all partition =
related decisions for you:\n<ul>\n<li><b>Full disk:</b> Choose this option i=
f you want to use your entire hard disk for VL. <font color=3D\"#FF0000\">WA=
RNING: this option will DELETE everything on your hard disk, or offer a choi=
ce if there are multiple disks. You have been WARNED.</font></li>\n<li><b>Fr=
ee space:</b> using available free (unpartitioned) disk space.</li>\n</ul>\n=
<b><u>Manual partitioning:</u></b> You have full control of partitioning.\n<=
ul>\n<li><b>Using gparted</b> (the advanced graphical partitioner).</li>\n<l=
i><b>Using cfdisk</b> (the traditional partition tool).</li>\n</ul>\n<b><u>O=
ther partitioning:</u></b>\n<ul>\n<li><b>Preset strategies:</b> auto allocat=
es partitions according to most common usage strategy intended for this comp=
uter.</li>\n<li><b>No partitioning:</b> If you wish to use existing Linux an=
d swap partitions. <font color=3D\"#FF0000\">WARNING: The existing Linux par=
titions will be OVERWRITTEN. You have been WARNED.</font></li>\n</ul>\n"
+#: frmPartitions.class:216
+msgid "<center><h3><b>Available partitioning modes:</b></h3></center>\n\n<b=
><u>Automatic partitioning:</u></b> The installer will handle all partition =
related decisions for you:\n<ul>\n<li><b>Full disk:</b> Choose this option i=
f you want to use your entire hard disk for VL. <font color=3D\"#FF0000\">WA=
RNING: this option will DELETE everything on your hard disk, or offer a choi=
ce if there are multiple disks. You have been WARNED.</font></li>\n<li><b>Un=
partitioned space:</b> using available free (unpartitioned) disk space.</li>=
\n</ul>\n<b><u>Manual partitioning:</u></b> You have full control of partiti=
oning.\n<ul>\n<li><b>Using gparted</b> (the advanced graphical partitioner).=
</li>\n<li><b>Using cfdisk</b> (the traditional partition tool).</li>\n</ul>=
\n<b><u>Other partitioning:</u></b>\n<ul>\n<li><b>Preset strategies:</b> aut=
o allocates partitions according to most common usage strategy intended for =
this computer.</li>\n<li><b>No partitioning:</b> If you wish to use existing=
 Linux and swap partitions. <font color=3D\"#FF0000\">WARNING: The existing =
Linux partitions will be OVERWRITTEN. You have been WARNED.</font></li>\n</u=
l>\n"
 msgstr ""
=20
-#: frmPartitions.class:229
+#: frmPartitions.class:228
 msgid "Partitioning mode"
 msgstr ""
=20
-#: frmPartitions.class:244
+#: frmPartitions.class:243
 msgid "Automatic"
 msgstr ""
=20
-#: frmPartitions.class:251
+#: frmPartitions.class:250
 msgid "Full disk"
 msgstr ""
=20
-#: frmPartitions.class:259
-msgid "Free space"
+#: frmPartitions.class:258
+msgid "Unpartitioned space"
 msgstr ""
=20
-#: frmPartitions.class:266
+#: frmPartitions.class:265
 msgid "Manual"
 msgstr ""
=20
-#: frmPartitions.class:273
+#: frmPartitions.class:272
 msgid "GParted"
 msgstr ""
=20
-#: frmPartitions.class:281
+#: frmPartitions.class:280
 msgid "cfdisk"
 msgstr ""
=20
-#: frmPartitions.class:288
+#: frmPartitions.class:287
 msgid "Others"
 msgstr ""
=20
-#: frmPartitions.class:295
+#: frmPartitions.class:294
 msgid "Preset strategies"
 msgstr ""
=20
-#: frmPartitions.class:303
+#: frmPartitions.class:302
 msgid "No partitioning"
 msgstr ""
=20

Modified: trunk/.project
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/.project	(original)
+++ trunk/.project	Wed Sep 12 10:57:26 2007
@@ -2,7 +2,7 @@
 Title=3DVL-gui-installer
 Startup=3DMain
 Icon=3Dvl_logo_icon2.png
-Version=3D0.0.238
+Version=3D0.0.254
 Library=3Dgb.qt
 Library=3Dgb.qt.ext
 TabSize=3D3

Modified: trunk/.settings
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/.settings	(original)
+++ trunk/.settings	Wed Sep 12 10:57:26 2007
@@ -2,7 +2,7 @@
 Count=3D0
=20
 [FFind]
-SearchIn=3D"Module"
+SearchIn=3D"Sub"
 CaseSensitive=3DTrue
 SearchWord=3DFalse
 SearchComment=3DFalse

Modified: trunk/Functions.module
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/Functions.module	(original)
+++ trunk/Functions.module	Wed Sep 12 10:57:26 2007
@@ -232,6 +232,7 @@
 DIM sTemp2 AS String
 DIM sFreeBlocks AS String
 DIM sBlockSize AS String
+DIM sUsedBlocks AS String
 DIM arrTemp AS NEW String[]
 DIM iFreeBytes AS Long
=20
@@ -281,21 +282,22 @@
    SHELL "ntfsresize --info --force --no-progress-bar " & sDevice TO sTemp
    sTemp =3D Trim$(sTemp)
    arrTemp =3D Split(sTemp, Chr$(10))
-   PRINT arrTemp[10]
    'It would be a lot easier to use an expression in the output of ntfsresi=
ze to identify the number of free bytes, but that is not i18n ready!
    'So "chomp" away portions of the string until the first integer is found=
 (this will be the free space value)
    sTemp =3D arrTemp[10]
    WHILE Len(sTemp) > 0
       sTemp2 =3D Trim$(Left$(sTemp, InStr(sTemp, Space$(1))))
       IF IsInteger(Val(sTemp2)) OR IsLong(Val(sTemp2)) THEN=20
-         sFreeBlocks =3D CLng(Val(sTemp2))
+         sUsedBlocks =3D CLng(Val(sTemp2))
          BREAK
       ELSE=20
          sTemp =3D Trim$(Mid$(sTemp, InStr(sTemp, Space$(1))))
       ENDIF
    WEND     =20
-   sBlockSize =3D Trim$(Mid$(Left$(arrTemp[3], RInStr(arrTemp[3], Space$(1)=
)), InStr(arrTemp[3], ":") + 1))
-   iFreeBytes =3D CLng(sFreeBlocks) * CLng(sBlockSize)
+   'sBlockSize =3D Trim$(Mid$(Left$(arrTemp[3], RInStr(arrTemp[3], Space$(1=
))), InStr(arrTemp[3], ":") + 1))
+   sTemp =3D Trim$(Mid$(arrTemp[5], InStr(arrTemp[5], ":") + 1)) 'Get total=
 partition size
+   sTemp2 =3D Trim$(Left(sTemp, InStr(sTemp, Space$(1))))
+   iFreeBytes =3D CLng(sTemp2) - CLng(sUsedBlocks)
 ELSE=20
    iFreeBytes =3D 0
 ENDIF=20

Modified: trunk/Global.class
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/Global.class	(original)
+++ trunk/Global.class	Wed Sep 12 10:57:26 2007
@@ -31,7 +31,7 @@
 ' 3 =3D No extras
 STATIC PUBLIC enumPARTMODE AS Long 'Partitioning mode.
 ' 0 =3D Full disk
-' 1 =3D Free space
+' 1 =3D Unpartitioned space
 ' 2 =3D GParted
 ' 3 =3D cfdisk
 ' 4 =3D Preset strategies

Modified: trunk/Utils.module
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/Utils.module	(original)
+++ trunk/Utils.module	Wed Sep 12 10:57:26 2007
@@ -56,20 +56,22 @@
 ENDIF
=20
 ' Parse what fdisk has to say:
-Parse_fdisk(sTemp)
-'Get filesystem data
-'getFileSystems()
+ProcessDiskInfo(sTemp)
+
=20
 END
=20
-PUBLIC SUB Parse_fdisk(sTemp AS String)
-' Parse what fdisk has to say:
+PUBLIC SUB ProcessDiskInfo(sTemp AS String)
+' Parse what fdisk has to say, including other commands for useful hard-dri=
ve/partition information
 DIM vDI AS NEW cDiskInfo
 DIM vPI AS NEW cPartInfo
 DIM arrTemp1 AS NEW String[]
 DIM arrTemp2 AS NEW String[]
 DIM arrTemp3 AS NEW String[]
 DIM sTemp2 AS String
+DIM iDisk AS Long
+DIM iPart AS Long
+DIM iDiskUsedBytes AS Long
 DIM pos AS Long
 DIM n AS Long, m AS Long
 DIM pcounter AS Long
@@ -79,7 +81,7 @@
    message.Info("Working in Simulation Mode..." & gb.NewLine & sTemp)
 ENDIF
=20
-' Parse it:
+' Parse fdisk
 arrTemp1 =3D Split(sTemp, Chr$(10))
 FOR n =3D 0 TO arrTemp1.Max
    pos =3D InStr(arrTemp1[n], "/dev/")
@@ -110,6 +112,7 @@
          vPI.ID =3D arrTemp2[4]
       ENDIF
      =20
+      'Get filesystem information from "disktype"
       IF Functions.getPartType(vPI.ID) =3D "Extended" THEN=20
          vPI.FileSystem =3D "Extended"
       ELSE IF Functions.getPartType(vPI.ID) =3D "HPFS/NTFS" THEN=20
@@ -121,7 +124,12 @@
          vPI.FileSystem =3D Trim$(Left$(arrTemp3[2], InStr(arrTemp3[2], Spa=
ce$(1))))
       ENDIF
      =20
-      vPI.FreeBytes =3D Functions.getFreePartSpace(vPI.Device, vPI.FileSyst=
em)
+      'Get free space information for each partition based on the filesyste=
m
+      IF vPI.FileSystem =3D "Blank" THEN=20
+         vPI.FreeBytes =3D vPI.Bytes
+      ELSE=20
+         vPI.FreeBytes =3D Functions.getFreePartSpace(vPI.Device, vPI.FileS=
ystem)
+      ENDIF
      =20
       Global.PartInfo.Push(vPI)
    ELSE IF pos > 1 ' Parse a disk drive.
@@ -133,10 +141,28 @@
       ELSE
          vDI.Bytes =3D Val(arrTemp2[3])
       ENDIF
+
       Global.DiskInfo.Push(vDI)
    ELSE ' Nothing.
    END IF
 NEXT
+
+'Get unallocated space on the hard-drives (it would be cool to have this in=
 the main FOR loop...
+'but its only possible after knowing each partiton's size)
+FOR iDisk =3D 0 TO Global.DiskInfo.Max
+   iDiskUsedBytes =3D 0 'Reset the used-bytes counter
+   FOR iPart =3D 0 TO Global.PartInfo.Max
+      IF InStr(Global.PartInfo[iPart].Device, Global.DiskInfo[iDisk].Device=
) THEN
+         IF Global.PartInfo[iPart].FileSystem <> "Extended" THEN 'Ignore ex=
tended partitions, only account for primary and logical ones
+            iDiskUsedBytes =3D iDiskUsedBytes + Global.PartInfo[iPart].Byte=
s
+         ENDIF
+      ENDIF=20
+   NEXT=20
+   Global.DiskInfo[iDisk].UnallocatedBytes =3D Global.DiskInfo[iDisk].Bytes=
 - iDiskUsedBytes
+   PRINT global.DiskInfo[iDisk].UnallocatedBytes
+NEXT=20
+
+
=20
 ' 4 debug:
 IF Global.DebugMode =3D TRUE THEN

Modified: trunk/cDiskInfo.class
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cDiskInfo.class	(original)
+++ trunk/cDiskInfo.class	Wed Sep 12 10:57:26 2007
@@ -3,3 +3,4 @@
 ' Structure for drive information array:
 PUBLIC Device AS String
 PUBLIC Bytes AS Long
+PUBLIC UnallocatedBytes AS Long

Modified: trunk/frmPartSelect.class
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/frmPartSelect.class	(original)
+++ trunk/frmPartSelect.class	Wed Sep 12 10:57:26 2007
@@ -24,9 +24,9 @@
 gridDisk.Columns.Count =3D 4
 'gridDisk.Rows.Count =3D MaxDisks
 gridDisk.Rows.Count =3D 32
-gridDisk.Columns[0].Width =3D 0.4 * gridDisk.ClientWidth
+gridDisk.Columns[0].Width =3D 0.35 * gridDisk.ClientWidth
 gridDisk.Columns[1].Width =3D 0.25 * gridDisk.ClientWidth
-gridDisk.Columns[2].Width =3D 0.2 * gridDisk.ClientWidth
+gridDisk.Columns[2].Width =3D 0.25 * gridDisk.ClientWidth
 gridDisk.Columns[3].Width =3D 0.15 * gridDisk.ClientWidth
=20
 'Center gridDisk titles alignment:
@@ -37,7 +37,7 @@
 'Setup gridDisk titles:
 gridDisk[0, 0].Text =3D "Drive"
 gridDisk[0, 1].Text =3D "Size"
-gridDisk[0, 2].Text =3D "Units"
+gridDisk[0, 2].Text =3D "Unallocated"
 gridDisk[0, 3].Text =3D "Sel."
=20
 'Set gridDisk cell alignment; left for text, right for numbers, fill in gri=
dDisk data:
@@ -46,11 +46,11 @@
    gridDisk.Rows[m].Height =3D 20
    gridDisk[m, 0].Text =3D Global.DiskInfo[m - 1].Device
    gridDisk[m, 1].Alignment =3D Align.Right
-   gridDisk[m, 1].Text =3D Global.DiskInfo[m - 1].Bytes
-   arrTemp =3D Split(Functions.AutoUnits(Global.DiskInfo[m - 1].Bytes), " "=
, "", TRUE)
-   gridDisk[m, 1].Text =3D arrTemp[0]
-   gridDisk[m, 2].Alignment =3D Align.Left
-   gridDisk[m, 2].Text =3D arrTemp[1]
+   gridDisk[m, 1].Text =3D Functions.AutoUnits(Global.DiskInfo[m - 1].Bytes=
)
+   'arrTemp =3D Split(Functions.AutoUnits(Global.DiskInfo[m - 1].Bytes), " =
", "", TRUE)
+   'gridDisk[m, 1].Text =3D arrTemp[0]
+   gridDisk[m, 2].Alignment =3D Align.Right
+   gridDisk[m, 2].Text =3D Functions.AutoUnits(Global.DiskInfo[m - 1].Unall=
ocatedBytes)
    gridDisk[m, 3].Alignment =3D Align.Center
 NEXT
=20

Modified: trunk/frmPartitions.class
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/frmPartitions.class	(original)
+++ trunk/frmPartitions.class	Wed Sep 12 10:57:26 2007
@@ -173,4 +173,3 @@
 Global.flagBUTTExec =3D FALSE
=20
 END
-

Modified: trunk/frmPartitions.form
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/frmPartitions.form	(original)
+++ trunk/frmPartitions.form	Wed Sep 12 10:57:26 2007
@@ -1,7 +1,7 @@
 # Gambas Form File 2.0
=20
 { Form Form
-  MoveScaled(4,6,90.5714,78.2857)
+  MoveScaled(4,6,90.5,78.25)
   Font =3D Font["Luxi Sans"]
   Background =3D &HFFFFFF&
   Text =3D ("")
@@ -18,7 +18,7 @@
       Background =3D &HDFFFFF&
       Padding =3D 10
       AutoResize =3D True
-      Text =3D ("<center><h3><b>Available partitioning modes:</b></h3></cen=
ter>\n\n<b><u>Automatic partitioning:</u></b> The installer will handle all =
partition related decisions for you:\n<ul>\n<li><b>Full disk:</b> Choose thi=
s option if you want to use your entire hard disk for VL. <font color=3D\"#F=
F0000\">WARNING: this option will DELETE everything on your hard disk, or of=
fer a choice if there are multiple disks. You have been WARNED.</font></li>\=
n<li><b>Free space:</b> using available free (unpartitioned) disk space.</li=
>\n</ul>\n<b><u>Manual partitioning:</u></b> You have full control of partit=
ioning.\n<ul>\n<li><b>Using gparted</b> (the advanced graphical partitioner)=
.</li>\n<li><b>Using cfdisk</b> (the traditional partition tool).</li>\n</ul=
>\n<b><u>Other partitioning:</u></b>\n<ul>\n<li><b>Preset strategies:</b> au=
to allocates partitions according to most common usage strategy intended for=
 this computer.</li>\n<li><b>No partitioning:</b> If you wish to use existin=
g Linux and swap partitions. <font color=3D\"#FF0000\">WARNING: The existing=
 Linux partitions will be OVERWRITTEN. You have been WARNED.</font></li>\n</=
ul>\n")
+      Text =3D ("<center><h3><b>Available partitioning modes:</b></h3></cen=
ter>\n\n<b><u>Automatic partitioning:</u></b> The installer will handle all =
partition related decisions for you:\n<ul>\n<li><b>Full disk:</b> Choose thi=
s option if you want to use your entire hard disk for VL. <font color=3D\"#F=
F0000\">WARNING: this option will DELETE everything on your hard disk, or of=
fer a choice if there are multiple disks. You have been WARNED.</font></li>\=
n<li><b>Unpartitioned space:</b> using available free (unpartitioned) disk s=
pace.</li>\n</ul>\n<b><u>Manual partitioning:</u></b> You have full control =
of partitioning.\n<ul>\n<li><b>Using gparted</b> (the advanced graphical par=
titioner).</li>\n<li><b>Using cfdisk</b> (the traditional partition tool).</=
li>\n</ul>\n<b><u>Other partitioning:</u></b>\n<ul>\n<li><b>Preset strategie=
s:</b> auto allocates partitions according to most common usage strategy int=
ended for this computer.</li>\n<li><b>No partitioning:</b> If you wish to us=
e existing Linux and swap partitions. <font color=3D\"#FF0000\">WARNING: The=
 existing Linux partitions will be OVERWRITTEN. You have been WARNED.</font>=
</li>\n</ul>\n")
     }
   }
   { VBox1 VBox
@@ -49,12 +49,12 @@
           Foreground =3D Color.ButtonForeground
           Text =3D ("Full disk")
         }
-        { btnFreeSpace Button
+        { btnUnpartSpace Button
           MoveScaled(1,9,23,5)
           Font =3D Font["Luxi Sans,14"]
           Background =3D Color.ButtonBackground
           Foreground =3D Color.ButtonForeground
-          Text =3D ("Free space")
+          Text =3D ("Unpartitioned space")
         }
       }
       { Frame2 Frame