Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r284 - branches/iVL
|
From: <cod...@go...> - 2008-11-11 20:31:04
|
Author: M0E.lnx
Date: Tue Nov 11 12:30:11 2008
New Revision: 284
Modified:
branches/iVL/FMain.class
branches/iVL/FrmLangSel.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmSelISO.class
branches/iVL/MdlNav.module
Log:
reverted old navigation scheme
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 12:30:11 2008
@@ -179,37 +179,9 @@
END
-PUBLIC SUB btnext_Click()
- DIM frmLast AS Form
-
- 'Message(pnlwinhost.Children.Type)
- 'frmTemp = FrmCurr
-' FrmCurr.Close
-'frmlast = FrmCurr
- IF FrmCurr.name = "FrmLangSel" THEN
- ME.Button1_Click()
- RETURN
- ELSE
- 'END IF
- 'FrmCurr = pnlwinhost.
-'ME.pnlwinhost.Children.Clear
-frmNext = MdlNav.Forward(FrmCurr.Name) '.Reparent(ME.pnlwinhost)
-FrmCurr.Close
-frmNext.Reparent(ME.pnlwinhost)
- 'frmlast.Hide
- 'MdlNav.Forward(FrmCurr.Name).Show()
- 'frmlast.Close
- 'frmlast.Close
-END IF
- 'MdlNav.Forward(FrmCurr.Text).Reparent(ME.pnlwinhost)
- 'MdlNav.Forward(FrmCurr.Text).Show
-
-
-END
-
-PUBLIC SUB btnext_Click_old()
+PUBLIC SUB btnext_Click()
DIM sISONAME AS String
DIM sDev AS String
DIM sLang AS String
@@ -256,7 +228,8 @@
MdlSetup.GO_WITH_SELECTED(sDev, "")
END IF
frmNext = FrmPartScheme
-
+
+
CASE "FrmPartScheme"
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Tue Nov 11 12:30:11 2008
@@ -80,8 +80,6 @@
PUBLIC SUB lbLangSel_Select()
FMain.btnext.Enabled = TRUE
- ClsInstall.sLANG = LAST.current.Key
- System.Language = ClsInstall.sLANG
'Message(LAST.current.key)
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Nov 11 12:30:11 2008
@@ -36,9 +36,6 @@
PUBLIC SUB Form_Open()
-
- MdlSetup.GO_WITH_SELECTED(ClsInstall.sDev, ClsInstall.sISOname)
-
ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>"
FMain.FrmCurr = ME
FMain.tvPlan["Prep2"].Selected = TRUE
@@ -62,8 +59,7 @@
("Select this option if you already have a linux installation that you
wish to overwrite or if a linux partition scheme exists in your hard
disk.") & Space(1)&
"<b>" & ("This option will overwrite any existing data in the selected
partitions") & "</b><br><br>" &
"<i>" & ("Use this option if you already prepared your partitions using
the VectorLinux installer") & "</i> "
- ClsInstall.bUseGparted = FALSE
- 'FMain.frmNext = FrmPartSel
+ FMain.frmNext = FrmPartSel
END
@@ -72,8 +68,7 @@
ME.tlChoiceExp.Text = "<h3>" & rbEditPartitions.Text & "</h3><br>" &
("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux installation.") & Space(1)&
("This option is the safest choice if you have other existing
installations that you wish to keep.")
- ClsInstall.bUseGparted = TRUE
- 'FMain.frmNext = FrmDiskPart
+ FMain.frmNext = FrmDiskPart
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Nov 11 12:30:11 2008
@@ -59,14 +59,14 @@
ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
ME.tlBanner.Adjust
ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
-
+ MdlPartSel.DISPLAY_PARTITION_OPTIONS
ME.cbDoWin.Value = FALSE
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
-MdlPartSel.DISPLAY_PARTITION_OPTIONS
+
END
PUBLIC SUB Form_Hide()
@@ -116,9 +116,7 @@
PUBLIC SUB cbDoWin_Click()
- 'ClsPartSel.bDoWin = cbDoWin.Value
- IF LAST.value = TRUE THEN ClsPartSel.bDoWin = TRUE
- IF LAST.value = FALSE OR IF LAST.value = NULL THEN ClsPartSel.bDoWin =
FALSE
+ ClsPartSel.bDoWin = cbDoWin.Value
' ' IF ClsPartSel.bDoWin = TRUE THEN
' ' FMain.frmNext = FrmWinDrives
' ' ELSE
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Nov 11 12:30:11 2008
@@ -30,14 +30,10 @@
IF lstInstallableImg.Find(("No Installable Media Found")) = -1
IF InStr(Trim(lstInstallableImg.Text), ".iso") OR
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
sLocation = Left(lstInstallableImg.Text,
InStr(lstInstallableImg.Text, " ") - 1)
- ClsInstall.sISOname = sLocation
- ClsInstall.sDev = Trim(Right(lstInstallableImg.Text,
Len(lstInstallableImg.Text) - InStr(lstInstallableImg.Text, "/")))
-
+
ELSE
ipos1 = RInStr(ME.lstInstallableImg.Text, "/")
sLocation = Right(ME.lstInstallableImg.Text,
Len(ME.lstInstallableImg.Text) - ipos1)
- ClsInstall.sDev = sLocation
- ClsInstall.sISOname = ""
END IF
'function to read the file
ME.DESCRIBE_DISTRO(sLocation)
@@ -48,7 +44,6 @@
'Message(Left(FrmSelISO.lstInstallableImg.text,
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4))
-'ClsInstall.sDev = sLocation
END
Modified: branches/iVL/MdlNav.module
==============================================================================
--- branches/iVL/MdlNav.module (original)
+++ branches/iVL/MdlNav.module Tue Nov 11 12:30:11 2008
@@ -17,38 +17,9 @@
PUBLIC FUNCTION Forward(sTrFCurrent AS String) AS Form
DIM fRet AS Form
- DIM sISONAME, sDev, sLang AS String
-
SELECT CASE sTrFCurrent
-
CASE "FrmSelISO"
fRet = FrmPartScheme
- CASE "FrmPartScheme"
- IF ClsInstall.bUseGparted = TRUE THEN
- Fret = FrmDiskPart
- ELSE
- fRet = FrmPartSel
- END IF
- CASE "FrmPartsel"
- IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
- Message.Error(("You must select a \"/\" partition. This is the
target where the system will install to"))
- RETURN
- END IF
- MdlPartSel.SET_LINUX_PARTITION_TYPES()
- IF ClsPartSel.bDoWin = TRUE THEN
- fRet = FrmWinDrives
- ELSE
- fRet = FrmPkgSel
- END IF
- CASE "FrmDiskPart"
- 'IF MdlSetup.CHECK_IF_REBOOT_NEEDED() = TRUE THEN
- ' now need to reboot
- fRet = FrmPartSel
- 'case
-
-' END IF
-
-
END SELECT
RETURN fRet
|
