Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r513 - Finished up to installation summary.
|
From: <cod...@go...> - 2009-03-19 15:05:29
|
Author: M0...@gm...
Date: Thu Mar 19 07:58:45 2009
New Revision: 513
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step8.pot
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/Step6.class
branches/speedy/Step8.class
branches/speedy/Step8.form
Log:
Finished up to installation summary.
Fixed minor problems in partition selection and swap listing.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Mar 19 07:58:45 2009
@@ -10,19 +10,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:245 FMain0.class:246 FMain0Old.class:233
+#: FMain.class:245 FMain0.class:245 FMain0Old.class:233
msgid "Process Overview"
msgstr ""
-#: FMain.class:287 FMain0.class:288 FMain0Old.class:271
+#: FMain.class:287 FMain0.class:287 FMain0Old.class:271
msgid "Back"
msgstr ""
-#: FMain.class:298 FMain0.class:299 FMain0Old.class:282
+#: FMain.class:298 FMain0.class:298 FMain0Old.class:282
msgid "Next"
msgstr ""
-#: FMain.class:309 FMain0.class:310 FMain0Old.class:293
+#: FMain.class:309 FMain0.class:309 FMain0Old.class:293
msgid "Quit"
msgstr ""
@@ -94,7 +94,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:130
+#: MdlStartUp.module:47 Step8.class:135
msgid "Software Selection"
msgstr ""
@@ -102,7 +102,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:213
+#: MdlStartUp.module:49 Step8.class:218
msgid "Installation Summary"
msgstr ""
@@ -533,11 +533,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:434 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:467 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:434 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:467 Step7a.class:143
msgid "No"
msgstr ""
@@ -802,31 +802,35 @@
msgid "File System"
msgstr ""
-#: Step6.class:146
+#: Step6.class:142
+msgid "Swap"
+msgstr ""
+
+#: Step6.class:142
msgid "Not Used"
msgstr ""
-#: Step6.class:167 Step8.class:73
+#: Step6.class:183 Step8.class:73
msgid "Do not format"
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "You have already selected"
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "as your"
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "partition."
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:329
+#: Step6.class:362
msgid "Select which partitions to use for installation"
msgstr ""
@@ -842,7 +846,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:120
+#: Step7.class:126 Step8.class:125
msgid "Customized"
msgstr ""
@@ -850,7 +854,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:122
+#: Step7.class:144 Step8.class:127
msgid "Minimal"
msgstr ""
@@ -939,30 +943,34 @@
msgstr ""
#: Step8.class:88
+msgid "NO SWAP SPACE SELECTED"
+msgstr ""
+
+#: Step8.class:93
msgid "Swap Space"
msgstr ""
-#: Step8.class:101
+#: Step8.class:106
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:118
+#: Step8.class:123
msgid "Full"
msgstr ""
-#: Step8.class:125
+#: Step8.class:130
msgid "Installation Method"
msgstr ""
-#: Step8.class:131
+#: Step8.class:136
msgid "Major Components"
msgstr ""
-#: Step8.class:141
+#: Step8.class:146
msgid "Additional Software"
msgstr ""
-#: Step8.class:232
+#: Step8.class:237
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/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Thu Mar 19 07:58:45 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:246
+#: FMain0.class:245
msgid "Process Overview"
msgstr ""
-#: FMain0.class:288
+#: FMain0.class:287
msgid "Back"
msgstr ""
-#: FMain0.class:299
+#: FMain0.class:298
msgid "Next"
msgstr ""
-#: FMain0.class:310
+#: FMain0.class:309
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Thu Mar 19 07:58:45 2009
@@ -30,39 +30,43 @@
msgid "File System"
msgstr ""
-#: Step6.class:146
+#: Step6.class:142
+msgid "Swap"
+msgstr ""
+
+#: Step6.class:142
msgid "Not Used"
msgstr ""
-#: Step6.class:167
+#: Step6.class:183
msgid "Do not format"
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "You have already selected"
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "as your"
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "partition."
msgstr ""
-#: Step6.class:212
+#: Step6.class:228
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:329
+#: Step6.class:362
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:434
+#: Step6.class:467
msgid "Yes"
msgstr ""
-#: Step6.class:434
+#: Step6.class:467
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Thu Mar 19 07:58:45 2009
@@ -43,46 +43,50 @@
msgstr ""
#: Step8.class:88
+msgid "NO SWAP SPACE SELECTED"
+msgstr ""
+
+#: Step8.class:93
msgid "Swap Space"
msgstr ""
-#: Step8.class:101
+#: Step8.class:106
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:118
+#: Step8.class:123
msgid "Full"
msgstr ""
-#: Step8.class:120
+#: Step8.class:125
msgid "Customized"
msgstr ""
-#: Step8.class:122
+#: Step8.class:127
msgid "Minimal"
msgstr ""
-#: Step8.class:125
+#: Step8.class:130
msgid "Installation Method"
msgstr ""
-#: Step8.class:130
+#: Step8.class:135
msgid "Software Selection"
msgstr ""
-#: Step8.class:131
+#: Step8.class:136
msgid "Major Components"
msgstr ""
-#: Step8.class:141
+#: Step8.class:146
msgid "Additional Software"
msgstr ""
-#: Step8.class:213
+#: Step8.class:218
msgid "Installation Summary"
msgstr ""
-#: Step8.class:232
+#: Step8.class:237
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/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Thu Mar 19 07:58:45 2009
@@ -5,7 +5,7 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HBox2 HBox
- MoveScaled(12,1,63,8)
+ MoveScaled(12,1,63,7.25)
Background = Color.SelectedBackground
{ Panel2 Panel
MoveScaled(1,3,4,2)
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Thu Mar 19 07:58:45 2009
@@ -5,7 +5,7 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HBox2 HBox
- MoveScaled(12,1,63,8)
+ MoveScaled(12,1,63,7.25)
Background = Color.SelectedBackground
{ Panel2 Panel
MoveScaled(1,3,4,2)
@@ -13,7 +13,6 @@
}
{ PictureBox1 PictureBox
MoveScaled(7,1,46,5)
- Picture = Picture["import/FMain1/installer.png"]
Stretch = True
}
{ Panel3 Panel
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Thu Mar 19 07:58:45 2009
@@ -130,6 +130,22 @@
gvPartListing[irow, 5].BackColor = Color.LightGray
gvPartListing[irow, 6].BackColor = Color.LightGray
+ ' ---------------------- make distinction from swap
partitions to regular mountable ones ------------------
+
+ cbMntPoint = NEW ComboBox(gvPartListing.Parent)
AS "MountPointSel"
+ WITH cbMntPoint
+ .Move(gvPartListing[irow, 2].left, gvPartListing[irow,
2].top)
+ .Width = gvPartListing[irow, 2].Width
+ .Height = gvPartListing[irow, 2].Height
+ .ReadOnly = TRUE
+ .tag = gvPartListing[irow, 0].Text
+ .List = [("Swap"), ("Not Used")]
+ END WITH
+ objMntPoints.Add(cbMntPoint)
+
+ ' ---- continue----
+
+
ELSE
gvPartListing[irow, 5].Text = Trim(SFS)
gvPartListing[irow, 5].ForeColor = Color.White
@@ -228,6 +244,8 @@
x = LAST.x
y = LAST.y
+
+
IF LAST.text <> ("Not Used") THEN
IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
@@ -258,6 +276,15 @@
NEXT
END IF
+ ' find out if are good to go yet
+ FOR EACH cb IN objMntPoints
+ IF cb.Text = "/" THEN
+ ClsGlobal.fRunningMainForm.btnext.enabled = TRUE
+ RETURN
+ END IF
+ ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
+ NEXT
+
@@ -315,7 +342,13 @@
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 & ","
+ 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
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Thu Mar 19 07:58:45 2009
@@ -84,7 +84,12 @@
' summarize swap partitions
sSwaps = Split(Trim(ClsGlobal.sWapPartList), ",")
- IF sSwaps THEN
+ IF sSwaps.Count <= 0 THEN
+ .Add("Swaps", ("NO SWAP SPACE SELECTED"),, "Part")
+ PRINT "No swap space selected for installation.!"
+
+
+ ELSE 'IF sSwaps THEN
.Add("Swaps", ("Swap Space"),, "Part")
END IF
FOR i = 0 TO sSwaps.Max
Modified: branches/speedy/Step8.form
==============================================================================
--- branches/speedy/Step8.form (original)
+++ branches/speedy/Step8.form Thu Mar 19 07:58:45 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,64,64)
+ MoveScaled(0,0,64,51)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
|
