Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r102 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-08-07 18:23:36
|
Author: M0...@gm...
Date: Thu Aug 7 10:40:01 2008
New Revision: 102
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.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/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
Log:
- Added the swap line to the current fstab to enable swap while installing
- Trying new lilo OS choices model
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/ClsGlobal.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/ClsPartSel.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/ClsWinDrives.class
+# /home/moises/area-51/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmDiskPart.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmLicense.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmPartScheme.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmPartSel.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmPkgSel.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmSelISO.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmSummary.class
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/FrmWinDrives.class
+# /home/moises/area-51/projects/installer/FrmWinDrives.class
# 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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlDiskPart.module
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlObjSizer.module
+# /home/moises/area-51/projects/installer/MdlObjSizer.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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlPkgSel.module
+# /home/moises/area-51/projects/installer/MdlPkgSel.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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlSummarize.module
+# /home/moises/area-51/projects/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 Thu Aug 7 10:40:01 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/MdlWinDrives.module
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Aug 7 10:40:01 2008
@@ -24,7 +24,7 @@
' FMain.tvPlan["Inst2"].Picture = MdlCore.sDonePic
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
-
+MdlLiloOsList.LIST_LILO_OS_CHOICES()
END
PUBLIC SUB YNLiloBox_Click()
@@ -67,8 +67,8 @@
END
PUBLIC SUB Button1_Click()
-
- ME.Hide
- FrmLiloOsList.Show
+MdlLiloOsList.LIST_LILO_OS_CHOICES
+ 'ME.Hide
+ 'FrmLiloOsList.Show
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Thu Aug 7 10:40:01 2008
@@ -1,14 +1,14 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,63,41)
+ MoveScaled(0,0,64,61)
Text = ("")
{ tlBanner TextLabel
MoveScaled(0,0,58,4.5)
Text = ("Configure and install lilo (Linux Boot Loader)")
}
{ LiloTarget ComboBox
- MoveScaled(13,10,39,3.1667)
+ MoveScaled(13,10,39,3.125)
Text = ("")
ReadOnly = True
List = []
@@ -18,29 +18,35 @@
Text = ("Don't Install Lilo")
}
{ FBResolution ComboBox
- MoveScaled(20,15,32,3.1667)
+ MoveScaled(20,15,32,3.125)
Text = ("")
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
{ LiloAppendBox TextBox
- MoveScaled(1,27,45,3)
+ MoveScaled(1,26,57,3)
Text = ("")
}
{ tlBanner2 TextLabel
- MoveScaled(1,21,58,3)
+ MoveScaled(1,20,58,3)
Text = ("Lilo optional parameters: You may add any lilo boot options
here. ")
}
{ tlTarGet TextLabel
- MoveScaled(1,10,10,3.1667)
+ MoveScaled(1,10,10,3.125)
Text = ("Target")
}
{ tlFbMode TextLabel
- MoveScaled(1,15,18,3.1667)
+ MoveScaled(1,15,18,3.125)
Text = ("Video Resolution")
}
{ Button1 Button
- MoveScaled(47,34,7,2)
+ MoveScaled(55,57,7,2)
Text = ("Button1")
+ }
+ { TabStrip1 TabStrip
+ MoveScaled(1,26,61,32)
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
}
}
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Aug 7 10:40:01 2008
@@ -166,6 +166,9 @@
"# Swap partitions\n" &
"# The 'sw' option means auto activating with 'swapon -a'.\n"
IF ClsPartSel.sSwap THEN
+ ' take a second here to throw the swap line to the current running system
+ SHELL "echo \'" & ClsPartSel.sSwap & Space(5) & "none" & Space(5)
& "swap" & Space(5) & "sw" & Space(5) & "0" & Space(5) & "0" & "\' >>
/etc/fstab" WAIT
+ 'write the same line to the future fstab
sFstab = sFstab & gb.NewLine &
ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5)
& "sw" & Space(5) & "0" & Space(5) & "0"
END IF
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Aug 7 10:40:01 2008
@@ -31,6 +31,10 @@
DIM svmLinuz AS String
DIM cbLiloItem AS CheckBox
DIM x, y AS Integer
+ DIM ibtX AS Integer
+ DIM txtAppnd AS TextBox
+ DIM cbInclude AS CheckBox
+ DIM tl AS TextLabel
x = 4
y = 4
@@ -61,23 +65,74 @@
' now check for a vmlinuz
IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
- cbLiloItem = NEW CheckBox(FrmLiloOsList.scrlOsList) AS "OsList"
- WITH cbLiloItem
- .x = x
- .y = y
- IF sLiloDesc <> "Linux" THEN
- .Text = sLiloDesc & Space(1) & "Linux" & Space(1) & "on"
& Space(1) & arrLinux[i]
- ELSE
- .Text = sLiloDesc
- END IF
- .tag = arrLinux[i]
- .Height = 27
- .Width = MdlObjSizer.get_object_width(.text) + 36 ' allow
room for the checkbox
- .Value = TRUE
-
- END WITH
- cbarr.Add(cbLiloItem)
- y = y + cbLiloItem.Height + 4
+ FrmLilo.TabStrip1.Count = i + 1
+ FrmLilo.TabStrip1[i].text = sLiloDesc & " Linux"
+
+ cbInclude = NEW CheckBox(FrmLilo.TabStrip1) AS "IncludeOS"
+ WITH cbInclude
+ .text = "Include this operating system in the boot menu"
+ .Height = 27
+ .Value = TRUE
+ .Move(4, 4, MdlObjSizer.get_object_width(.text) + 24)
+ END WITH
+
+
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "Label"
+ WITH tl
+ .text = "Name"
+ .Move(cbInclude.left, cbInclude.top + cbInclude.Height +
4, MdlObjSizer.get_object_width(.text))
+ .Height = 27
+ .Alignment = Align.Normal
+ .BackColor = Color.Default
+ END WITH
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "NameBox"
+ WITH txtAppnd
+ .Width = tl.Width * 4
+ .text = sLiloDesc
+ .Height = tl.Height
+ .x = tl.left + tl.Width + 8
+ .y = tl.Top
+ END WITH
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "AppndLbl"
+ WITH tl
+ .text = "Kernel boot options"
+ .Move(4, txtAppnd.top + txtAppnd.Height + 4,
MdlObjSizer.get_object_width(.text))
+ .Height = 27
+ .Alignment = Align.Normal
+ END WITH
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
+ WITH txtAppnd
+ .Move(tl.Left + tl.Width + 8, tl.top, tl.Width)
+ .text = "splash=silent"
+ .Height = 27
+ END WITH
+
+
+ ' ' '
+ ' ' ' 'Message.Info(FrmLilo.TabStrip1.Count)
+ ' ' ' FrmLilo.TabStrip1[FrmLilo.TabStrip1.Count].text =
sLiloDesc
+ ' ' ' RETURN
+ ' ' ' cbLiloItem = NEW CheckBox(FrmLiloOsList.scrlOsList)
AS "OsList"
+ ' ' '
+ ' ' '
+ ' ' ' WITH cbLiloItem
+ ' ' ' .x = x
+ ' ' ' .y = y
+ ' ' ' IF sLiloDesc <> "Linux" THEN
+ ' ' ' .Text = sLiloDesc & Space(1) & "Linux" & Space(1)
& "on" & Space(1) & arrLinux[i]
+ ' ' ' ELSE
+ ' ' ' .Text = sLiloDesc
+ ' ' ' END IF
+ ' ' '
+ ' ' ' .tag = arrLinux[i]
+ ' ' ' .Height = 27
+ ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 36 '
allow room for the checkbox
+ ' ' ' .Value = TRUE
+ ' ' '
+ ' ' ' END WITH
+ ' ' '
+ ' ' ' cbarr.Add(cbLiloItem)
+ ' ' ' y = y + cbLiloItem.Height + 4
END IF
@@ -90,14 +145,8 @@
END
PUBLIC SUB OsList_click()
- DIM iH AS Integer = 28
- DIM box AS CheckBox
-
-
-
-
-
-
+
+
END
|
