Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r521 - minor bugfixes.. populated boot manager stage
|
From: <cod...@go...> - 2009-03-23 21:26:13
|
Author: M0...@gm...
Date: Mon Mar 23 14:24:23 2009
New Revision: 521
Modified:
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/MdlBootMngr.module
branches/speedy/Step6.class
Log:
minor bugfixes.. populated boot manager stage
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Mon Mar 23 14:24:23 2009
@@ -24,7 +24,7 @@
END
PUBLIC SUB StartUp()
-
+ MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
END
PUBLIC SUB OnExit()
@@ -39,6 +39,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ .tlSep.Text = "<b>" & tlsep.Text & "</b>"
END WITH
END
@@ -46,6 +47,9 @@
PUBLIC SUB Form_Resize()
ME.HBox2.Width = ME.Frame1.Width - (ME.HBox2.Left * 2)
+ ME.hbox3.Width = ME.Frame2.Width - (ME.HBox3.Left * 2)
+ ME.HBox5.Width = ME.Frame2.Width - (ME.hbox5.Left * 2)
+ ME.HBox6.Width = ME.Width
END
@@ -57,5 +61,11 @@
("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
("unless you are fully aware of what you are doing."))
END IF
+
+END
+
+PUBLIC SUB tlLiloTarget_DblClick()
+
+ Balloon("This is a test" & "<br>" & "This is another string"
& "<br><br><br><br><br><br>" & "to see if the baloon has been fixed",
cbLiloTarget)
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Mon Mar 23 14:24:23 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,72,47)
+ MoveScaled(0,0,84,67)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
@@ -47,5 +47,98 @@
Text = ("None (Experts Only)")
}
}
+ }
+ { Frame2 Frame
+ MoveScaled(0,14,84,11)
+ Expand = True
+ Text = ("Boot menu options")
+ { HBox3 HBox
+ MoveScaled(1,2,70,3.5)
+ Spacing = 4
+ Padding = 2
+ { tlLiloTarget TextLabel
+ MoveScaled(1,0,16.25,3)
+ AutoResize = True
+ Text = ("Target")
+ Alignment = Align.Left
+ Border = Border.Plain
+ }
+ { cbLiloTarget ComboBox
+ MoveScaled(11,0,16,3)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ { HBox4 HBox
+ MoveScaled(29,1,8,1)
+ AutoResize = True
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(36,0,15,3)
+ AutoResize = True
+ Text = ("Video Resolution")
+ Alignment = Align.Right
+ Border = Border.Plain
+ }
+ { cbVidRes ComboBox
+ MoveScaled(52,0,17,3)
+ Text = ("ComboBox2")
+ }
+ }
+ { HBox5 HBox
+ MoveScaled(1,6,78,3.5)
+ Spacing = 4
+ Padding = 2
+ { tlTimeOUt TextLabel
+ MoveScaled(-1,0,16.25,3)
+ AutoResize = True
+ Text = ("Prompt Time Out")
+ Alignment = Align.Left
+ }
+ { SbTimeOut SpinBox
+ MoveScaled(17,0,8,3)
+ }
+ { TextLabel2 TextLabel
+ MoveScaled(26,0,8,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Seconds")
+ Alignment = Align.Left
+ }
+ { HBox7 HBox
+ MoveScaled(39,1,5,1)
+ Visible = False
+ }
+ { tlBootDef TextLabel
+ MoveScaled(46,0,15,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Boot Default")
+ Alignment = Align.Right
+ }
+ { cbBootDef ComboBox
+ MoveScaled(61,0,17,3)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ }
+ }
+ { HBox6 HBox
+ MoveScaled(16,25,44,3)
+ Expand = True
+ { tlSep TextLabel
+ MoveScaled(5,0,36,3)
+ Expand = True
+ Text = ("OPERATING SYSTEMS DETECTED")
+ Alignment = Align.Center
+ Border = Border.Etched
+ }
+ }
+ { TsOSListing TabStrip
+ MoveScaled(1,31,70,32)
+ Expand = True
+ Arrangement = Arrange.Row
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
}
}
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Mon Mar 23 14:24:23 2009
@@ -33,7 +33,6 @@
MoveScaled(1,2,26,35)
Arrangement = Arrange.Vertical
Orientation = Align.Left
- Resizable = False
{ HBox5 HBox
MoveScaled(2,-1,21,3)
{ TextLabel1 TextLabel
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Mon Mar 23 14:24:23 2009
@@ -32,7 +32,6 @@
MoveScaled(1,2,26,35)
Arrangement = Arrange.Vertical
Orientation = Align.Left
- Resizable = False
{ HBox5 HBox
MoveScaled(2,-1,21,3)
{ TextLabel1 TextLabel
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Mon Mar 23 14:24:23 2009
@@ -84,6 +84,14 @@
END
PUBLIC SUB populate_linux_entry(sLinuxRoot AS String, objTabStrip AS
TabStrip)
+ DIM i AS Integer
+ IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
+ i = 0
+ WITH objTabStrip
+ .Index = i
+ .Text = "VectorLinux"
+ END WITH
+ END IF
END
@@ -110,7 +118,7 @@
IF Len(sOutcome) <= 0 THEN CONTINUE
' will only list the linux if one is present
populate_linux_entry(Trim(sPartList[i]), objTabStrip)
-
+ 'END IF
NEXT
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Mon Mar 23 14:24:23 2009
@@ -124,6 +124,7 @@
'NEXT
' add partition to the gridview
INC ME.gvPartListing.Rows.Count
+ ME.gvPartListing.Rows[irow].Height = 24
ME.gvPartListing[irow, 0].text = Trim(sDisks[i]) &
Trim(sPartNo)
ME.gvPartListing[irow, 1].Text = Trim(sSize)
IF sFs LIKE "linux-swap" THEN
@@ -253,9 +254,8 @@
'IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
- IF LAST.text <> ("Swap") THEN
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
- 'END IF
+ IF LAST.TEXT <> ("Swap") THEN
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
STOP EVENT
RETURN
|
