Author: M0E.lnx
Date: Sun Jul 13 18:41:16 2008
New Revision: 38
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/FrmPartSel.class
branches/iVL/MdlPartSel.module
Log:
More work in the partition selection virtual objects.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Sun Jul 13 18:41:16 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/new-inst/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Sun Jul 13 18:41:16 2008
@@ -16,6 +16,19 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PUBLIC sRootAddr AS String
+PUBLIC sRootFrmt AS String
+PUBLIC sHomeAddr AS String
+PUBLIC sHomeFrmt AS String
+PUBLIC sUsrAddr AS String
+PUBLIC sUsrFrmt AS String
+PUBLIC sVarAddr AS String
+PUBLIC sVarFrmt AS String
+PUBLIC sTmpAddr AS String
+PUBLIC sTrmFrmt AS String
+PUBLIC sOptAddr AS String
+PUBLIC sOptFrmt AS String
+
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Sun Jul 13 18:41:16 2008
@@ -113,12 +113,14 @@
.y = y
.ReadOnly = TRUE
.Width = tl.Width
+ .Add("Do not format")
.Add("XFS")
.Add("ReiserFS")
.Add("Ext2")
.Add("Ext3")
.Add("JFS")
- .Add("Do not format")
+
+
END WITH
oFsTypes.Add(cb)
@@ -192,10 +194,22 @@
DIM sdropdwn AS ComboBox
DIM sTag AS String = LAST.tag
DIM sText AS String = Trim(LAST.text)
-
+
+ FOR EACH sdropdwn IN oMountPoints
+ IF LAST.text <> "Not Used" AND LAST.text = sdropdwn.Text AND
LAST.tag <> sdropdwn.tag THEN
+ Message.Error("You have already select a " & LAST.text & "
partition. Please " &
+ "select only one")
+ LAST.text = "Not Used"
+ END IF
+ STOP EVENT
+ NEXT
+
+
+
IF sText = "Not Used" THEN
FOR EACH sdropdwn IN oFsTypes
IF sdropdwn.Tag = sTag THEN
+ sdropdwn.Text = "Do not format"
sdropdwn.Enabled = FALSE
ELSE
sdropdwn.Enabled = TRUE
@@ -208,6 +222,13 @@
END IF
NEXT
END IF
+ IF LAST.text <> "Not Used" THEN
+ FOR EACH sdropdwn IN oFsTypes
+ IF sdropdwn.tag = LAST.tag THEN
+ sdropdwn.Text = "XFS"
+ END IF
+ NEXT
+ END IF
END
@@ -219,7 +240,9 @@
FOR EACH cb IN oMountPoints
IF cb.tag = LAST.tag AND cb.text = "/" THEN
Message.Error("The / partition MUST be formatted no matter
what. Please select a filesystem for this partition")
- RETURN
+ 'default it to xfs
+ LAST.text = "XFS"
+ STOP EVENT
END IF
NEXT
END IF
|
