|
From: <cod...@go...> - 2009-02-25 16:24:25
|
Author: M0...@gm...
Date: Wed Feb 25 08:17:55 2009
New Revision: 504
Added:
branches/speedy/images/hdd.png (contents, props changed)
branches/speedy/images/info.png (contents, props changed)
branches/speedy/images/package.png (contents, props changed)
branches/speedy/images/task-due.png (contents, props changed)
branches/speedy/images/tlz.png (contents, props changed)
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
branches/speedy/ClsGlobal.class
branches/speedy/Step6.class
branches/speedy/Step8.class
Log:
Finished installation summary for full installation
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 25 08:17:55 2009
@@ -10,23 +10,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr ""
-
-#: FMain.class:245 FMain0.class:246 FMain0Old.class:233
+#: FMain0Old.class:233 FMain0.class:246 FMain.class:245
msgid "Process Overview"
msgstr ""
-#: FMain.class:287 FMain0.class:288 FMain0Old.class:271
+#: FMain0Old.class:271 FMain0.class:288 FMain.class:287
msgid "Back"
msgstr ""
-#: FMain.class:298 FMain0.class:299 FMain0Old.class:282
+#: FMain0Old.class:282 FMain0.class:299 FMain.class:298
msgid "Next"
msgstr ""
-#: FMain.class:309 FMain0.class:310 FMain0Old.class:293
+#: FMain0Old.class:293 FMain0.class:310 FMain.class:309
msgid "Quit"
msgstr ""
@@ -54,7 +50,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47
+#: MdlStartUp.module:47 Step8.class:121
msgid "Software Selection"
msgstr ""
@@ -62,7 +58,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:116
+#: MdlStartUp.module:49 Step8.class:190
msgid "Installation Summary"
msgstr ""
@@ -98,6 +94,10 @@
msgid "Final Configuration"
msgstr ""
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr ""
+
#: Step0.class:20
msgid "Localization Settings"
msgstr ""
@@ -216,7 +216,7 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143
+#: Step1.class:433 Step3a1a.class:169 Step3a1.class:22 Step7a.class:143
msgid "WARNING:"
msgstr ""
@@ -340,99 +340,6 @@
msgid "Stop"
msgstr ""
-#: Step3.class:28
-msgid "Disc Partitioning Options"
-msgstr ""
-
-#: Step3.class:31
-msgid "Select the partitioning method you would like to use"
-msgstr ""
-
-#: Step3.class:153
-msgid "Automatic"
-msgstr ""
-
-#: Step3.class:163
-msgid ""
-"Automatically resize your partitions and / or create the correct disk
space "
-"for VectorLinux."
-msgstr ""
-
-#: Step3.class:170
-msgid "Manually resize my partitions "
-msgstr ""
-
-#: Step3.class:180
-msgid "Use the partitioning tool to prepare your system partitions."
-msgstr ""
-
-#: Step3.class:187
-msgid "My hard drive is already partitioned"
-msgstr ""
-
-#: Step3.class:197
-msgid "Install VectorLinux to existing partitions on my hard drive"
-msgstr ""
-
-#: Step3a.class:19
-msgid "Automatic Partitioning Options"
-msgstr ""
-
-#: Step3a.class:20
-msgid "Select one of the following options"
-msgstr ""
-
-#: Step3a.class:22
-msgid "Allow VectorLinux to use an entire hard disk in your system."
-msgstr ""
-
-#: Step3a.class:22
-msgid "This option will wipe out any data on the disk you select."
-msgstr ""
-
-#: Step3a.class:24
-msgid ""
-"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
-msgstr ""
-
-#: Step3a.class:24
-msgid "This option will not harm any data on your hard drive"
-msgstr ""
-
-#: Step3a.class:26
-msgid ""
-"Resize your existing partitions to make room for a VectorLinux partition "
-"scheme"
-msgstr ""
-
-#: Step3a.class:26
-msgid "This option will not harm any existing data on your hard drive"
-msgstr ""
-
-#: Step3a.class:122
-msgid "Use unpartitioned space on my hard disk (creates new partitions)"
-msgstr ""
-
-#: Step3a.class:144
-msgid "Use free space on existing partitions for VectorLinux"
-msgstr ""
-
-#: Step3a.class:168
-msgid "Use entire disk"
-msgstr ""
-
-#: Step3a1.class:20
-msgid "Use Entire Hard Disk for VectorLinux"
-msgstr ""
-
-#: Step3a1.class:22
-msgid "All existing data in the device you select here will be destroyed."
-msgstr ""
-
-#: Step3a1.class:68
-msgid "Total Disc Size"
-msgstr ""
-
#: Step3a1a.class:21
msgid "Create Linux Partition Scheme in"
msgstr ""
@@ -493,11 +400,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169 Step6.class:446 Step7a.class:143
+#: Step3a1a.class:169 Step6.class:499 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:446 Step7a.class:143
+#: Step3a1a.class:169 Step6.class:499 Step7a.class:143
msgid "No"
msgstr ""
@@ -509,6 +416,18 @@
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr ""
+
#: Step3a2.class:25
msgid "Install VectorLinux to free space on disk"
msgstr ""
@@ -581,6 +500,87 @@
msgid "Claim free space from existing partitions"
msgstr ""
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr ""
+
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:122
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:144
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr ""
+
+#: Step3a.class:168
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:153
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:163
+msgid ""
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
+msgstr ""
+
+#: Step3.class:170
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:180
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:187
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:197
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
#: Step4.class:23
msgid "Automatic Disc Partitioning"
msgstr ""
@@ -697,7 +697,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:167 Step8.class:58
+#: Step6.class:167 Step8.class:71
msgid "Do not format"
msgstr ""
@@ -717,38 +717,10 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:341
+#: Step6.class:394
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step7.class:19
-msgid "Select Installation Mode"
-msgstr ""
-
-#: Step7.class:108
-msgid "Full Install"
-msgstr ""
-
-#: Step7.class:118
-msgid "Install everthing in the image (Fully Automated)"
-msgstr ""
-
-#: Step7.class:126
-msgid "Customized"
-msgstr ""
-
-#: Step7.class:136
-msgid "Select the components you wish to install (Advanced)"
-msgstr ""
-
-#: Step7.class:144
-msgid "Minimal"
-msgstr ""
-
-#: Step7.class:154
-msgid "Install the most minimal working confuguration (For older hardware)"
-msgstr ""
-
#: Step7a.class:27 Step7b.class:23
msgid "Customize Your VectorLinux Installation"
msgstr ""
@@ -805,23 +777,71 @@
"include in your installation."
msgstr ""
-#: Step8.class:59
+#: Step7.class:19
+msgid "Select Installation Mode"
+msgstr ""
+
+#: Step7.class:108
+msgid "Full Install"
+msgstr ""
+
+#: Step7.class:118
+msgid "Install everthing in the image (Fully Automated)"
+msgstr ""
+
+#: Step7.class:126 Step8.class:111
+msgid "Customized"
+msgstr ""
+
+#: Step7.class:136
+msgid "Select the components you wish to install (Advanced)"
+msgstr ""
+
+#: Step7.class:144 Step8.class:113
+msgid "Minimal"
+msgstr ""
+
+#: Step7.class:154
+msgid "Install the most minimal working confuguration (For older hardware)"
+msgstr ""
+
+#: Step8.class:72
msgid "Not Formatted"
msgstr ""
-#: Step8.class:59
+#: Step8.class:72
msgid "Mount to"
msgstr ""
-#: Step8.class:61
+#: Step8.class:74
msgid "Format to"
msgstr ""
-#: Step8.class:61
+#: Step8.class:74
msgid "and mount to"
msgstr ""
-#: Step8.class:135
+#: Step8.class:86
+msgid "Swap Space"
+msgstr ""
+
+#: Step8.class:109
+msgid "Full"
+msgstr ""
+
+#: Step8.class:116
+msgid "Installation Method"
+msgstr ""
+
+#: Step8.class:122
+msgid "Major Components"
+msgstr ""
+
+#: Step8.class:132
+msgid "Additional Software"
+msgstr ""
+
+#: Step8.class:209
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/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Wed Feb 25 08:17:55 2009
@@ -54,15 +54,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:341
+#: Step6.class:394
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:446
+#: Step6.class:499
msgid "Yes"
msgstr ""
-#: Step6.class:446
+#: Step6.class:499
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Wed Feb 25 08:17:55 2009
@@ -14,31 +14,63 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:58
+#: Step8.class:71
msgid "Do not format"
msgstr ""
-#: Step8.class:59
+#: Step8.class:72
msgid "Not Formatted"
msgstr ""
-#: Step8.class:59
+#: Step8.class:72
msgid "Mount to"
msgstr ""
-#: Step8.class:61
+#: Step8.class:74
msgid "Format to"
msgstr ""
-#: Step8.class:61
+#: Step8.class:74
msgid "and mount to"
msgstr ""
+#: Step8.class:86
+msgid "Swap Space"
+msgstr ""
+
+#: Step8.class:109
+msgid "Full"
+msgstr ""
+
+#: Step8.class:111
+msgid "Customized"
+msgstr ""
+
+#: Step8.class:113
+msgid "Minimal"
+msgstr ""
+
#: Step8.class:116
+msgid "Installation Method"
+msgstr ""
+
+#: Step8.class:121
+msgid "Software Selection"
+msgstr ""
+
+#: Step8.class:122
+msgid "Major Components"
+msgstr ""
+
+#: Step8.class:132
+msgid "Additional Software"
+msgstr ""
+
+#: Step8.class:190
msgid "Installation Summary"
msgstr ""
-#: Step8.class:135
+#: Step8.class:209
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 Wed Feb 25 08:17:55 2009
@@ -13,3 +13,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+Maintainer=root
+Add...@lo...
+License=General Public Licence
+UseRelease=1
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Wed Feb 25 08:17:55 2009
@@ -52,6 +52,7 @@
STATIC PUBLIC fboot AS String
STATIC PUBLIC sVitalPartList AS String
+STATIC PUBLIC sWapPartList AS String
STATIC PUBLIC sMiscMountList AS String
STATIC PUBLIC sFullDiscToWipe AS String
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Wed Feb 25 08:17:55 2009
@@ -286,11 +286,21 @@
PUBLIC SUB read_partition_selection()
-
+
+
DIM cbox, cb AS ComboBox
- DIM sFormat AS String
+ 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
+
FOR EACH cb IN objFS
IF cbox.tag = cb.Tag THEN
sFormat = Trim(cb.Text)
@@ -299,38 +309,16 @@
sFormat = ""
END IF
NEXT
- ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & cbox.Text & "-" & sFormat & ","
-
- ' SELECT CASE cbox.Text
- ' CASE "/"
- ' ClsGlobal.sRoot = cbox.Tag
- ' ClsGlobal.froot = sFormat
- ' CASE "/home"
- ' ClsGlobal.shome = cbox.Tag
- ' ClsGlobal.fhome = sFormat
- ' CASE "/usr"
- ' ClsGlobal.susr = cbox.Tag
- ' ClsGlobal.fusr = sFormat
- ' CASE "/opt"
- ' ClsGlobal.sopt = cbox.Tag
- ' ClsGlobal.fopt = sFormat
- ' CASE "/var"
- ' ClsGlobal.svar = cbox.Tag
- ' ClsGlobal.fvar = sFormat
- ' CASE "/tmp"
- ' ClsGlobal.stmp = cbox.Tag
- ' ClsGlobal.ftmp = sFormat
- ' CASE "/boot"
- ' ClsGlobal.sboot = cbox.Tag
- ' ClsGlobal.fboot = sFormat
- ' CASE ELSE
- ' ClsGlobal.sMiscMountList = ClsGlobal.sMiscMountList &
cbox.Tag & "," & Trim(cbox.Text) & ";"
- ' END SELECT
+ 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
+ ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
+ END IF
+ NEXT
+
END
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Wed Feb 25 08:17:55 2009
@@ -14,9 +14,20 @@
' 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 PicInfo AS Picture
+PRIVATE PicTask AS Picture
+PRIVATE PicDisk AS Picture
+PRIVATE PicPackage AS Picture
+PRIVATE PicTlz AS Picture
+
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ PicInfo = Picture.load("images/info.png")
+ PicTask = Picture.load("images/task-due.png")
+ PicDisk = Picture.load("images/hdd.png")
+ PicPackage = Picture.Load("images/package.png")
+ PicTlz = Picture.Load("images/tlz.png")
'ME.SUMMARIZE_DISTRO_INFO()
'ME.SUMMARIZE_PARTITION_SELECTION()
@@ -30,10 +41,10 @@
PUBLIC SUB SUMMARIZE_DISTRO_INFO()
WITH ME.TreeView1
- .Add("DistroInfo", "Distribution", MdlStartUp.pCategory)
- .Add("Distro0", "Name",, "DistroInfo")
+ .Add("DistroInfo", ("Distribution"), MdlStartUp.pCategory)
+ .Add("Distro0", ("Name"), PicInfo, "DistroInfo")
.Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0")
- .Add("Distro1", "Version",, "DistroInfo")
+ .Add("Distro1", ("Version"), PicInfo, "DistroInfo")
.Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1")
END WITH
@@ -42,36 +53,98 @@
PUBLIC SUB SUMMARIZE_PARTITION_SELECTION()
DIM i AS Integer
DIM sList AS String
- DIM sArr, sEntry AS String[]
- DIM sPart, sMntPnt, sFs AS String
+ DIM sArr, sEntry, sSwaps AS String[]
+ DIM sPart, sMntPnt, sFs, sSwap, sSize AS String
+
WITH ME.TreeView1
- .Add("Part", "Partitions to be used", MdlStartUp.pCategory)
+ .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])
+ sSize = Trim(sEntry[1])
+ sMntPnt = Trim(sEntry[2])
+ sFs = Trim(sEntry[3])
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, sPart & " -- " & sSize, PicDisk, "Part")
+ .add("Part." & i & "." & i, sFs & sMntPnt, PicTask, "Part." & i)
'.Add("Part." & i & "." & i, sMntPnt,, "Part." & i)
'.Add("Part." & i & "." & i & "." & i, sFs,, "Part." & i & "." &
i)
END IF
NEXT
+ ' summarize swap partitions
+ sSwaps = Split(Trim(ClsGlobal.sWapPartList), ",")
+ IF sSwaps THEN
+ .Add("Swaps", ("Swap Space"),, "Part")
+ END IF
+ FOR i = 0 TO sSwaps.Max
+ sSwap = Trim(sSwaps[i])
+ IF sSwap THEN
+ 'sSwap = Left(sSwap, InStr(sSwap,"-"))
+
+ .Add("Swaps" & i, Left(sSwap, InStr(sSwap, "-") - 1) &
Space(1) & " -- " & Right(sSwap, Len(sSwap) - InStr(sSwap, "-")),
PicDisk, "Swaps")
+ END IF
+ NEXT
END WITH
END
+PUBLIC SUB SUMMARIZE_INSTALL_TYPE()
+
+ DIM sInsType, sList, sPkg, sBulkList, sBulk AS String
+ DIM sBulks, sPkgs AS String[]
+ DIM i AS Integer
+
+ SELECT CASE ClsGlobal.iInstallMethod
+ CASE 0
+ sInsType = ("Full")
+ CASE 1
+ sInsType = ("Customized")
+ CASE 2
+ sInsType = ("Minimal")
+ END SELECT
+
+ ME.TreeView1.Add("Install Type", ("Installation Method"),
MdlStartUp.pCategory)
+ ME.TreeView1.Add("Install Type.1", sInsType, PicInfo, "Install Type")
+
+ ' if installation is customized... provide details
+ IF ClsGlobal.iInstallMethod = 1 THEN
+ ME.TreeView1.Add("Software", ("Software Selection"),
MdlStartUp.pCategory)
+ ME.TreeView1.Add("Bulks", ("Major Components"),, "Software")
+
+ sBulkList = ClsGlobal.sBulkListToInstall
+ sBulks = Split(sBulkList, ",")
+ FOR i = 0 TO sBulks.Max
+ sBulk = Trim(sBulks[i])
+ IF sBulk THEN
+ ME.TreeView1.Add(sBulk, sBulk, PicTlz, "Bulks")
+ END IF
+ NEXT
+ ME.TreeView1.Add("Pkgs", ("Additional Software"),, "Software")
+
+ sList = ClsGlobal.sPkgListToInstall
+ sPkgs = Split(sList, ",")
+ FOR i = 0 TO sPkgs.Max
+ sPkg = Trim(sPkgs[i])
+ IF sPkg THEN
+ ME.TreeView1.Add(sPkg, sPkg, PicPackage, "Pkgs")
+ END IF
+ NEXT
+
+ END IF
+
+
+END
+
PUBLIC SUB OnExit()
@@ -83,6 +156,7 @@
ME.TreeView1.Clear()
ME.SUMMARIZE_DISTRO_INFO()
ME.SUMMARIZE_PARTITION_SELECTION()
+ ME.SUMMARIZE_INSTALL_TYPE()
END
Added: branches/speedy/images/hdd.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/info.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/package.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/task-due.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/tlz.png
==============================================================================
Binary file. No diff available.
|