Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r103 - branches/iVL
|
From: <cod...@go...> - 2008-08-07 19:14:37
|
Author: M0...@gm...
Date: Thu Aug 7 12:13:54 2008
New Revision: 103
Modified:
branches/iVL/.project
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLiloOsList.module
Log:
- Fixing BUG where gparted is not propperly embedding
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Aug 7 12:13:54 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=FrmLilo
+Startup=MdlCore
Version=0.0.30
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Aug 7 12:13:54 2008
@@ -15,6 +15,8 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PUBLIC sVidMode AS String
+PUBLIC sLiloTrgt AS String
PUBLIC SUB Form_Open()
@@ -22,9 +24,10 @@
' FMain.tvPlan["Conf0"].Selected = TRUE
' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
' FMain.tvPlan["Inst2"].Picture = MdlCore.sDonePic
-
+ ME.sVidMode = "Standard"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
MdlLiloOsList.LIST_LILO_OS_CHOICES()
+
END
PUBLIC SUB YNLiloBox_Click()
@@ -60,8 +63,9 @@
.LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width +
2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left))
.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8,
MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +
2, .tlFbMode.top, .tlBanner.Width - (.tlFbMode.Width + .tlFbMode.Left))
- .tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text)
+ 36)
- .LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
+ .TabStrip1.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *
5)
+ '.tlBanner2.Move(.tlFbMode.left, .FBResolution.top
+ .FBResolution.Height + 16, MdlObjSizer.get_object_width(.tlBanner2.Text)
+ 36)
+ '.LiloAppendBox.Move(.tlBanner2.left, .tlBanner2.top
+ .tlBanner2.Height + 4, .ClientWidth - (.LiloAppendBox.x) * 2)
END WITH
END
@@ -70,5 +74,13 @@
MdlLiloOsList.LIST_LILO_OS_CHOICES
'ME.Hide
'FrmLiloOsList.Show
+
+END
+
+PUBLIC SUB FBResolution_Click()
+
+ ME.sVidMode = Trim(ME.FBResolution.Text)
+ MdlLiloOsList.LIST_LILO_OS_CHOICES()
+
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Thu Aug 7 12:13:54 2008
@@ -23,14 +23,6 @@
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
- { LiloAppendBox TextBox
- MoveScaled(1,26,57,3)
- Text = ("")
- }
- { tlBanner2 TextLabel
- MoveScaled(1,20,58,3)
- Text = ("Lilo optional parameters: You may add any lilo boot options
here. ")
- }
{ tlTarGet TextLabel
MoveScaled(1,10,10,3.125)
Text = ("Target")
@@ -44,7 +36,7 @@
Text = ("Button1")
}
{ TabStrip1 TabStrip
- MoveScaled(1,26,61,32)
+ MoveScaled(1,20,61,32)
Index = 0
Text = ("Tab 0")
Index = 0
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Thu Aug 7 12:13:54 2008
@@ -20,7 +20,7 @@
DIM sTitle AS String
- DIM sTitle1 AS String
+ DIM sTitle1, sTitle2 AS String
DIM aHandle AS NEW Pointer[]
DIM iHandle AS Integer
DIM i AS Integer = 0
@@ -39,27 +39,28 @@
sTitle = "/dev/hda - GParted"
sTitle1 = "/dev/sda - GParted"
-
+ sTitle2 = "GParted"
'aHandle = Desktop.Find(sTitle)
aHandle = Desktop.Find(sTitle)
- IF aHandle = "" THEN
- aHandle = Desktop.Find(sTitle1)
- END IF
-
- IF Left(sTitle, 2) = "0x" THEN
- iHandle = Val("&" & Mid$(sTitle, 3))
- ELSE IF Left(sTitle) = "&" THEN
- iHandle = Val(sTitle)
- ELSE
+ ' ' ' IF aHandle = "" THEN
+ ' ' ' aHandle = Desktop.Find(sTitle1)
+ ' ' ' END IF
+ ' ' '
+ ' ' ' IF Left(sTitle, 2) = "0x" THEN
+ ' ' ' iHandle = Val("&" & Mid$(sTitle, 3))
+ ' ' ' ELSE IF Left(sTitle) = "&" THEN
+ ' ' ' iHandle = Val(sTitle)
+ ' ' ' ELSE
'Message.Info(aHandle[0])
+
+ IF aHandle.Count = 0 THEN
+ aHandle = Desktop.Find(sTitle1)
+ END IF
IF aHandle.Count = 0 THEN
- REPEAT
- WAIT 2
- aHandle = Desktop.Find(sTitle)
- INC i
- UNTIL
- i = 10 OR aHandle.Count > 0
+ aHandle = Desktop.Find(sTitle2) ' gparted cannot find drives, but it
loaded ;)
+ END IF
+
IF aHandle.Count = 0 THEN
Message("Setup is unable to successfully run gparted on this
system. This may be a sign of \n" &
"a bad install media. Setup cannot continue.")
@@ -71,7 +72,7 @@
ENDIF
iHandle = aHandle[0]
- ENDIF
+ 'ENDIF
'TRY embEmbedder.Embed(iHandle)
TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 12:13:54 2008
@@ -38,6 +38,8 @@
x = 4
y = 4
+ FrmLilo.TabStrip1.Count = 1
+
cbarr = NEW Object[]
SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
sFatList = Trim(sFatList)
@@ -102,8 +104,15 @@
END WITH
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
+
.Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
+ IF FrmLilo.sVidMode <> "Standard" THEN
+ .Enabled = TRUE
.text = "splash=silent"
+ ELSE
+ .Enabled = FALSE
+ .Text = "not available"
+ END IF
.Height = 27
END WITH
|
