Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r83 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-07-26 05:25:26
|
Author: M0E.lnx
Date: Fri Jul 25 22:24:35 2008
New Revision: 83
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmLicense.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartFrmt.module
branches/iVL/MdlPartSel.module
Log:
- Fixed progress bars for overall and current packages
- Fixed bug in mount point selection click
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/ClsGlobal.class
+# /root/gui-installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/ClsPartSel.class
+# /root/gui-installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/ClsWinDrives.class
+# /root/gui-installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FMain.class
+# /root/gui-installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:250
+#: FMain.class:251
msgid "Process Overview"
msgstr ""
-#: FMain.class:273
+#: FMain.class:274
msgid "Next"
msgstr ""
-#: FMain.class:279
+#: FMain.class:280
msgid "Back"
msgstr ""
-#: FMain.class:285
+#: FMain.class:286
msgid "Exit"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmDiskPart.class
+# /root/gui-installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot (original)
+++ branches/iVL/.lang/FrmLicense.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmLicense.class
+# /root/gui-installer/FrmLicense.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmPartScheme.class
+# /root/gui-installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmPartSel.class
+# /root/gui-installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmPkgSel.class
+# /root/gui-installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmSelISO.class
+# /root/gui-installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmSummary.class
+# /root/gui-installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/FrmWinDrives.class
+# /root/gui-installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlCore.module
+# /root/gui-installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlDiskPart.module
+# /root/gui-installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlObjSizer.module
+# /root/gui-installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlPartSel.module
+# /root/gui-installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlPkgSel.module
+# /root/gui-installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlSetup.module
+# /root/gui-installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlSummarize.module
+# /root/gui-installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Fri Jul 25 22:24:35 2008
@@ -1,4 +1,4 @@
-# /root/iVL/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Jul 25 22:24:35 2008
@@ -42,7 +42,7 @@
SHELL "mount " & ClsPartSel.sRoot & Space(1) &
ClsGlobal.sTargetMnt WAIT 'moun the root partition first
IF ClsPartSel.sHome THEN
SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
- SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & ClsPartSel.fhome WAIT 'mount the
home partition if defined
+ SHELL "mount " & ClsPartSel.sHome & Space(1) &
ClsGlobal.sTargetMnt &/ "home -t " & LCase(ClsPartSel.fhome)
WAIT 'mount the home partition if defined
END IF
IF ClsPartSel.sUsr THEN
@@ -91,6 +91,14 @@
DIM sWinMntPnt AS String
DIM sFstab AS String
+ ' make the changes show up on the steps now
+ WITH FMain
+ .tvPlan["Inst2"].Selected = TRUE
+ .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+ .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ END WITH
+
+
FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"
sFstab = "# /etc/fstab: static file system information.\n" &
@@ -198,9 +206,9 @@
FrmInstallSys.tlCurrPkg.Text = "Vectorlinux is now
installing ... Please wait"
ME.PERFORM_FULL_INSTALL()
're-direct to packages for now
- FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
- ME.INSTALL_REQUIRED_PACKAGES()
- ME.INSTALL_PACKAGES()
+ 'FrmInstallSys.tlCurrPkg.Text = "Installing Additional
software... Please wait"
+ 'ME.INSTALL_REQUIRED_PACKAGES()
+ 'ME.INSTALL_PACKAGES()
END IF
END
@@ -256,8 +264,8 @@
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
- Message.Info("Total packages = " & iPkgCnt)
- RETURN
+ 'Message.Info("Total packages = " & iPkgCnt)
+ 'RETURN
' make sure the progress is revealed at the main window
WITH FMain
.tvPlan["Inst1"].Picture = MdlCore.sDonePic
@@ -298,6 +306,7 @@
sDump = ""
sErr = ""
MdlCore.LOCK_GUI()
+ 'inc iPkgNum
hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " |
tar -xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
WAIT 2
@@ -329,7 +338,8 @@
FrmInstallSys.tlBanner.Text = "Finished intalling Bulks"
' now to the packages individually
-
+ FrmInstallSys.tlBanner.Text = "Installing additional software."
+ ME.INSTALL_PACKAGES
END
@@ -401,9 +411,7 @@
' install each package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & "
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
sTargetSize = Trim(CStr(sTargetSize))
-
-
-
+
sDump = ""
sErr = ""
hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
FOR READ
@@ -435,7 +443,9 @@
FrmInstallSys.tlBanner.Text = "Installation phase complete.
Ready for configuration"
FrmInstallSys.pbInstallProg.Value = 1
MdlCore.unlock_gui()
-
+
+ FrmInstallSys.tlBanner.Text = "Installing default system
configuration and required software."
+ ME.INSTALL_REQUIRED_PACKAGES
END
PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer
@@ -448,33 +458,47 @@
DIM sTlzName AS String
DIM sTlzDesc AS String
DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
-
+ DIM iTlzTotal AS Integer = 0
+ DIM iCurrTlz AS Integer '= 0
+ MdlCore.LOCK_GUI()
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT"))
SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sRawFile
sFile = Split(sRawFile, "\n")
'SHELL "ls /mnt/cdrom/packages/required/*.t?z" TO sFile
+ iTlzTotal = sFile.Count
+
FOR i = 0 TO sFile.count - 1
sLine = Trim(sFile[i])
+ INC iPkgNum
'IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
- sTlzName = Trim(Right(sLine, Len(sLine) - InStr(sLine, "/")))
- sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], "/")))
+ sTlzPath = Trim(sLine)
+ 'sTlzName = Trim(Right(sLine, Len(sLine) - RInStr(sLine, "/")))
+ 'sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], "/")))
'sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
'END IF
' now install the package with the information we already have
PRINT sTlzName & sTlzPath
sDump = ""
sErr = ""
- FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName & " ..."
- FrmInstallSys.pbInstallProg.Value = 0.0
- hproc = SHELL "install-pkg " & sTlzName & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ FrmInstallSys.tlCurrPkg.Text = "Installing " &
File.Name(sTlzPath) & " ..."
+ 'FrmInstallSys.pbInstallProg.Value = 0.0
+
+ 'figure out the progress again
+ ' for this one we will need to count the
packages, and base our progress on the number of packages
+ ' installed vs the total number of packags
+ iCurrTlz = i
+ FrmInstallSys.pbInstallProg.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iTlzTotal, iCurrTlz)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ hproc = SHELL "install-pkg " & sTlzPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
WAIT 1
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- ' figure out the progress again
UNTIL
hproc.State = Process.Stopped
+' INC iPkgNum
END IF
+
NEXT
Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module (original)
+++ branches/iVL/MdlPartFrmt.module Fri Jul 25 22:24:35 2008
@@ -96,6 +96,7 @@
FMain.tvPlan["Inst1"].Selected = TRUE
FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Inst2"].Picture = MdlCore.sToDopic
'Umount the volume first
@@ -172,7 +173,10 @@
RETURN 0
END IF
END IF
-
+ ' turn swap on if available
+ IF ClsPartSel.sSwap THEN
+ SHELL "swapon -a " WAIT
+ END IF
END
PUBLIC SUB process_read()
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Fri Jul 25 22:24:35 2008
@@ -127,8 +127,7 @@
.y = y
.Height = tl.Height
.Width = tl.Width
- .ReadOnly = TRUE
- .tag = Trim(sPartList[i])
+ .ReadOnly = TRUE
.Add("Not Used")
.Add("/")
.Add("/home")
@@ -160,16 +159,17 @@
.Add("Ext2")
.Add("Ext3")
.Add("JFS")
+ '.Add("swap")
IF
InStr(Trim(FrmSelISO.lstInstallableImg.Text), .Tag) THEN
.Enabled = FALSE
ELSE
.Enabled = TRUE
END IF
- FOR EACH cb IN oFsTypes
- IF cb.Tag = .Tag THEN
- cb.Enabled = FALSE
- END IF
- NEXT
+ ' FOR EACH cb IN oFsTypes
+ ' IF cb.Tag = .Tag THEN
+ ' cb.Enabled = FALSE
+ ' END IF
+ ' NEXT
END WITH
@@ -192,7 +192,9 @@
END IF
SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \' |
grep -e /dev" TO sSwapList
+
sSwapList = Trim(sSwapList)
+ IF sSwapList <> "" THEN
'Message.Info(sSwapList)
IF InStr(sSwapList, gb.NewLine) THEN
'several swap partitions found
@@ -201,9 +203,14 @@
spart = Trim(sSwapList)
'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) |
cut -f 2 -d \' \'" TO vSwapSize
SHELL " export sw=$(probepart | grep -i \" *swap$\") && echo
$sw | cut -f 4 -d \' \'" TO vSwapSize
-
- iswapsize = CInt(vSwapSize)
- iswapsize = Round(iswapsize / 1024 / 1024, -2)
+ Message(CStr(vSwapSize))
+ IF vSwapSize <> "" THEN
+ 'vSwapSize = Trim(CStr(vSwapSize))
+ Message.Info(vSwapSize)
+ iswapsize = CInt(vSwapSize)
+
+ iswapsize = Round(iswapsize / 1024 / 1024, -2)
+ END IF
'now create the swap label and combo box
tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "swlabel"
WITH tl
@@ -236,7 +243,7 @@
'Message.Info("Swap total = " & iswapsize)
END IF
-
+END IF
FOR EACH cb IN MdlPartSel.oMountPoints
IF cb.width > iWidth THEN
iWidth = cb.Width
@@ -258,20 +265,12 @@
PUBLIC SUB MountPoints_CLick()
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
+ 'DIM sTag AS String = LAST.tag
+ 'DIM sText AS String = Trim(LAST.text)
+
+
- ' set the variable to the global class
- SELECT CASE LCase(LAST.text)
+ SELECT CASE LAST.text
CASE "/"
ClsPartSel.sRoot = LCase(LAST.tag)
CASE "/home"
@@ -285,53 +284,130 @@
CASE "/var"
ClsPartSel.sVar = LCase(LAST.tag)
CASE "Swap"
-
- END SELECT
-
-
+ ClsPartSel.sSwap = LCase(LAST.tag)
+ 'Message("Swap Flag")
+ FOR EACH sdropdwn IN oFsTypes
+ IF sdropdwn.Tag = LAST.tag THEN
+ sdropdwn.Add("Swap")
+ sdropdwn.Text = "Swap"
+ sdropdwn.Enabled = FALSE
+ ELSE
+ sdropdwn.Enabled = TRUE
+ IF sdropdwn.Find("Swap") <> -1 THEN
+ sdropdwn.Remove(sdropdwn.Find("Swap"))
+ END IF
+ END IF
+ NEXT
+
+ END SELECT
- IF sText = "Not Used" THEN
- FOR EACH sdropdwn IN oFsTypes
- IF sdropdwn.Tag LIKE sTag THEN
- sdropdwn.Enabled = FALSE
- sdropdwn.Text = "Do not format"
-
- ELSE IF sText = "Swap" THEN
- IF sdropdwn.Tag = sTag THEN
- sdropdwn.Enabled = FALSE
- sdropdwn.Text = "Swap"
- END IF
- ELSE
- sdropdwn.Enabled = TRUE
- END IF
- NEXT
- 'ELSE
-
- ELSE
- FOR EACH sdropdwn IN oFsTypes
- IF sdropdwn.Tag = sTag THEN
- sdropdwn.Enabled = TRUE
- END IF
- NEXT
- END IF
- IF LAST.text <> "Not Used" AND LAST.text <> "Swap" THEN
- FOR EACH sdropdwn IN oFsTypes
- IF sdropdwn.tag = LAST.tag THEN
- sdropdwn.Text = "XFS"
- 'Balloon.Info("Select which filesystem to use with this
partition", sdropdwn)
- ' Balloon("Select which filesystem to use with this partition", sdropdwn)
+
+ ' 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"
+ ' STOP EVENT
+ ' ELSE
+ '
+ '
+ '
+ ' ' set the variable to the global class
+ ' SELECT CASE Trim(LCase(LAST.text))
+ ' CASE "/"
+ ' ClsPartSel.sRoot = LCase(LAST.tag)
+ ' CASE "/home"
+ ' ClsPartSel.sHome = LCase(LAST.tag)
+ ' CASE "/usr"
+ ' ClsPartSel.sUsr = LCase(LAST.tag)
+ ' CASE "/opt"
+ ' ClsPartSel.sOpt = LCase(LAST.tag)
+ ' CASE "/tmp"
+ ' ClsPartSel.sTmp = LCase(LAST.tag)
+ ' CASE "/var"
+ ' ClsPartSel.sVar = LCase(LAST.tag)
+ ' CASE "Swap"
+ ' ClsPartSel.sSwap = LCase(LAST.tag)
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF Trim(sdropdwn.Tag) = LAST.tag THEN
+ ' sdropdwn.Enabled = FALSE
+ ' sdropdwn.Text = "Swap"
+ ' END IF
+ ' NEXT
+ '
+ ' END SELECT
+ ' END IF
+ ' NEXT
+
+
+ 'Message(sTag)
+ '
+ ' SELECT CASE sText
+ ' CASE "Not Used"
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.Tag = sTag THEN
+ ' sdropdwn.Enabled = FALSE
+ ' sdropdwn.Text = "Do not format"
+ ' END IF
+ ' NEXT
+ ' CASE "Swap"
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.Tag = sTag THEN
+ ' sdropdwn.Enabled = FALSE
+ ' sdropdwn.Text = "Swap"
+ ' END IF
+ ' NEXT
+ ' CASE ELSE
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.Tag = sTag THEN
+ ' sdropdwn.Enabled = TRUE
+ ' END IF
+ ' NEXT
+ ' END SELECT
+ '
+ ' IF sText = "Not Used" THEN
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.Tag LIKE sTag THEN
+ ' sdropdwn.Enabled = FALSE
+ ' sdropdwn.Text = "Do not format"
+ '
+ '
+ ' ELSE IF sText = "Swap" THEN
+ ' IF sdropdwn.Tag = sTag THEN
+ ' sdropdwn.Enabled = FALSE
+ ' sdropdwn.Text = "Swap"
+ ' END IF
+ ' ELSE
+ ' sdropdwn.Enabled = TRUE
+ ' END IF
+ ' NEXT
+ ' 'ELSE
+ '
+ ' ELSE
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.Tag = sTag THEN
+ ' sdropdwn.Enabled = TRUE
+ ' END IF
+ ' NEXT
+ ' END IF
+ ' IF LAST.text <> "Not Used" AND LAST.text <> "Swap" THEN
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.tag = LAST.tag THEN
+ ' sdropdwn.Text = "XFS"
+ ' 'Balloon.Info("Select which filesystem to use with this
partition", sdropdwn)
+ ' ' Balloon("Select which filesystem to use with this partition", sdropdwn)
- END IF
- NEXT
- ELSE IF LAST.text = "Swap" THEN
- FOR EACH sdropdwn IN oFsTypes
- IF sdropdwn.tag = LAST.tag THEN
- sdropdwn.Enabled = FALSE
- sdropdwn.Text = "Swap"
- END IF
- NEXT
- END IF
+' END IF
+ ' NEXT
+ ' ELSE IF LAST.text = "Swap" THEN
+ ' FOR EACH sdropdwn IN oFsTypes
+ ' IF sdropdwn.tag = LAST.tag THEN
+ ' sdropdwn.Enabled = FALSE
+ ' sdropdwn.Text = "Swap"
+ ' END IF
+ ' NEXT
+ ' END IF
'send the value to the form public value
ME.SET_SELECTED_PARTITION(LAST.tag, LAST.text)
@@ -363,7 +439,7 @@
NEXT
-
+ 'Message(LAST.tag)
END
PUBLIC SUB SET_SELECTED_PARTITION(SPartition AS String, sMountPoint AS String)
|
