Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r289 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-13 20:04:22
|
Author: M0E.lnx
Date: Thu Nov 13 12:02:35 2008
New Revision: 289
Modified:
branches/iVL/.lang/#project.pot
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/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/.project
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
Modified OS Detection @ LILO setup step
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsGlobal.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsPartSel.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsWinDrives.class
+# /home/vluser/devel/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 Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FMain.class
+# /home/vluser/devel/installer/FMain.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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartScheme.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartSel.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPkgSel.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSelISO.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSummary.class
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmWinDrives.class
+# /home/vluser/devel/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 Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlCore.module
+# /home/vluser/devel/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 Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlDiskPart.module
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlObjSizer.module
+# /home/vluser/devel/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 Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPartSel.module
+# /home/vluser/devel/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 Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPkgSel.module
+# /home/vluser/devel/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 Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,27 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:197
-msgid "Calculating package count ... Please wait"
-msgstr ""
-
-#: MdlSetup.module:253
-msgid "Total bulks to be installed = "
-msgstr ""
-
-#: MdlSetup.module:256
-msgid "Total pkgs to be installed = "
-msgstr ""
-
-#: MdlSetup.module:303
+#: MdlSetup.module:242
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:319
+#: MdlSetup.module:258
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:321
+#: MdlSetup.module:260
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSummarize.module
+# /home/vluser/devel/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 Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 13 12:02:35 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
-Version=0.0.158
+Startup=FrmLiloSetup
+Version=0.0.159
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -18,7 +18,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer2/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Thu Nov 13 12:02:35 2008
@@ -44,3 +44,9 @@
MdlLilo.GENERATE_LILO_DOT_CONF
END
+
+PUBLIC SUB cbTimeOutSec_MouseDown()
+
+
+
+END
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Thu Nov 13 12:02:35 2008
@@ -5,7 +5,7 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
- MoveScaled(1,1,71,7)
+ MoveScaled(1,1,71,6)
{ tlBanner TextLabel
MoveScaled(1,1,21,3)
Expand = True
@@ -16,64 +16,81 @@
Expand = True
}
}
- { HPanel2 HPanel
- MoveScaled(1,8,88,18)
+ { Panel1 Panel
+ MoveScaled(2,8,84,3)
+ Arrangement = Arrange.Horizontal
{ CheckBox1 CheckBox
- MoveScaled(1,2,20,3)
+ MoveScaled(0,0,20,3)
Expand = True
Text = ("Do not install LILO")
}
- { tlVidRes TextLabel
- MoveScaled(40,4,16,3)
+ { Panel2 Panel
+ MoveScaled(22,0,15,1)
Expand = True
+ Arrangement = Arrange.Horizontal
+ }
+ { tlVidRes TextLabel
+ MoveScaled(44,0,15,3)
Text = ("Video Resolution")
Alignment = Align.Normal
}
{ cbVideoRes ComboBox
- MoveScaled(57,4,22,3)
- Expand = True
- Text = ("ComboBox1")
+ MoveScaled(61,0,22,3)
+ Text = ("")
}
+ }
+ { Panel3 Panel
+ MoveScaled(1,11,88,3)
+ Arrangement = Arrange.Horizontal
{ tlLiloTarget TextLabel
- MoveScaled(1,5,7,3)
- Expand = True
+ MoveScaled(0,0,7,3)
Text = ("Target")
Alignment = Align.Normal
}
{ cbLIloTarget ComboBox
- MoveScaled(10,5,26,2)
+ MoveScaled(8,0,26,2)
+ Text = ("")
+ }
+ { Panel4 Panel
+ MoveScaled(35,1,5,2)
Expand = True
- Text = ("ComboBox1")
+ Arrangement = Arrange.Horizontal
}
{ cbDefBoot TextLabel
- MoveScaled(40,8,17,3)
- Expand = True
+ MoveScaled(45,0,11,3)
Text = ("Boot Default")
}
{ ComboBox1 ComboBox
- MoveScaled(58,8,21,3)
- Expand = True
- Text = ("ComboBox1")
+ MoveScaled(62,0,22,3)
+ Text = ("")
}
+ }
+ { PnlTop Panel
+ MoveScaled(1,16,88,3)
+ Arrangement = Arrange.Horizontal
{ tlTimeOut TextLabel
- MoveScaled(1,10,14,3)
- Expand = True
+ MoveScaled(0,0,14,3)
Text = ("Prompt Timeout")
Alignment = Align.Normal
}
{ SpinBox1 SpinBox
- MoveScaled(16,10,7,3)
- Expand = True
+ MoveScaled(15,0,7,3)
}
{ cbTimeOutSec TextLabel
- MoveScaled(24,10,8,3)
- Expand = True
+ MoveScaled(24,0,8,3)
Text = ("Seconds")
Alignment = Align.Normal
}
}
+ { HBox1 HBox
+ MoveScaled(1,19,88,2)
+ { Separator2 Separator
+ MoveScaled(0,1,83,1)
+ Expand = True
+ }
+ }
{ tsLIloTabs TabStrip
- MoveScaled(1,28,84,30)
+ MoveScaled(2,25,84,30)
Expand = True
Index = 0
Text = ("Tab 0")
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 13 12:02:35 2008
@@ -23,6 +23,7 @@
PUBLIC arrWinBootChecks AS Object[]
PUBLIC arrWinNameTxtBoxes AS Object[]
PUBLIC arrCbInitrds AS Object[]
+PUBLIC arriDLabels AS Object[]
PRIVATE i AS Integer ' used for object key
@@ -30,8 +31,9 @@
PUBLIC SUB GENERATE_LILO_DOT_CONF()
DIM tb AS TextBox
- DIM cb AS CheckBox
- DIM sSection AS String
+ DIM cb, chbox AS CheckBox
+
+ DIM sSection, sClisection AS String
DIM cbox AS ComboBox
DIM sLabel, sKernel, sInitrd, sAppend AS String
DIM sBootPath AS String
@@ -47,7 +49,7 @@
FOR EACH tb IN arrLinuxNametxtboxes
IF tb.Tag = cb.Tag THEN
sLabel = tb.Text
- sKernel = "vmlinuz-" & sLabel
+ sKernel = "vmlinuz-" & Right(tb.Tag, Len(tb.Tag) -
RInStr(tb.Tag, "/"))
END IF
NEXT
FOR EACH cbox IN arrCbInitrds
@@ -64,9 +66,23 @@
"append = " & sAppend & "<br>" &
"initrd = " & sBootPath &/ sInitrd & "<br>" &
"read only"
+ FOR EACH chbox IN ME.arrLinuxTextBoots
+ IF chbox.Value = TRUE THEN
+ IF chbox.tag = cb.Tag THEN
+ sClisection = sSection
+ sClisection = Replace(sClisection, "append = " &
sAppend, "append = 2 splash=verbose vga=791")
+ sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli")
+ ELSE
+ sClisection = ""
+ END IF
+
+ END IF
+ NEXT
+
+
Message(sSection)
-
+ IF sClisection THEN Message(sClisection)
'sSection = "image=" & "boot" &/ tb.Text
'Message(sSection)
END IF
@@ -86,7 +102,7 @@
PUBLIC SUB LIST_LINUX_OS()
DIM sDump, sLinuxPart, sPart, vmlinuz, kernel AS String
- DIM sOsDesc AS String
+ DIM sOsDesc, sInitrd, sKernelLoc AS String
DIM x, y, i, ii AS Integer
DIM sPartitions, sOs AS String[]
@@ -96,6 +112,7 @@
arrLinuxAppendtxtBoxes = NEW Object[]
arrLinuxTextBoots = NEW Object[]
arrCbInitrds = NEW Object[]
+ arriDLabels = NEW Object[]
@@ -107,23 +124,31 @@
sLinuxPart = Trim(sPartitions[i])
sPart = Right(sLinuxpart, Len(sLinuxPart) -
RInStr(sLinuxPart, "/"))
EXEC ["mount", "/dev/" & sPart, "/tmp/lilo_tmp"] WAIT
-
- IF IsDir("/tmp/lilo_tmp/boot") THEN
- FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
- IF Stat("/tmp/lilo_tmp/boot" &/
vmlinuz).Type <> 6
- sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
- sOsDesc =
Replace(vmlinuz, "vmlinuz", sOsDesc)
+
+ IF IsDir("/tmp/lilo_tmp/boot") THEN
+ 'FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
+ sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ 'Message(sOsDesc)
+ IF sOsDesc LIKE "vector" THEN
+ sKernelLoc = "/tmp/lilo_tmp/boot"
+ ELSE
+ sKernelLoc = "/tmp/lilo_tmp"
+ END IF
+ FOR EACH vmlinuz IN
Dir(sKernelLoc, "vmlinuz")
+ 'IF Stat("/tmp/lilo_tmp/boot" &/
vmlinuz).Type <> 6
+ 'sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ 'sOsDesc =
Replace(vmlinuz, "vmlinuz", sOsDesc)
'Message(Stat("/tmp/lilo_tmp" &/
vmlinuz).Type)
WITH FrmLiloSetup
.tsLIloTabs.Index
= .tsLIloTabs.Count - 1
- .tsLIloTabs.Text = sOsDesc &
Space(1) & "(" & sPart & ")"
+ .tsLIloTabs.Text = sOsDesc & "-" &
sPart
.tsLIloTabs.Count
= .tsLIloTabs.Count + 1
' populate the tabstrip here
ME.FILL_IN_LINUX_TAB(sOsDesc, "/dev" &/ sPart)
END WITH
- END IF
+ 'END IF
NEXT
END IF
@@ -152,7 +177,7 @@
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
.Index = .Count - 1
- .Text = "Windows" & Space(1) & "(" &
Right(sPartition, Len(sPartition) - RInStr(sPartition, "/")) & ")"
+ .Text = "Windows" & Space(1) & "-" &
Right(sPartition, Len(sPartition) - RInStr(sPartition, "/"))
.Count = .Count + 1
END WITH
' populate the tab
@@ -248,8 +273,15 @@
DIM hrsep AS Separator
DIM cbox AS ComboBox
DIM sDump AS String
+ DIM sInitrdLoc AS String
'DIM i AS Integer
'DIM sKernelStr AS String
+ IF sDesc LIKE "vector" THEN
+ sInitrdLoc = "/tmp/lilo_tmp/boot"
+ ELSE
+ sInitrdLoc = "/tmp/lilo_tmp"
+ END IF
+ 'Message(sInitrdLoc)
' hack just for testing here
@@ -261,11 +293,13 @@
tl = NEW TextLabel(FrmLiloSetup.tsLIloTabs) AS "osItroLabels"
WITH tl
.Move(x, y)
- .Text = "<h3>" & sDesc & Space(1) & ("installed in") & Space(1)
& sHostPart & "</h3>"
+ .Text = "<h3>" & sDesc & Space(1) & "Linux" & Space(1) &
("installed in") & Space(1) & sHostPart & "</h3>"
.Height = 21
.Width = MdlObjSizer.get_object_width(.Text) + 36
.Alignment = Align.Normal
+ .tag = i & sHostPart
END WITH
+ arriDLabels.Add(tl)
y = y + tl.Height + 4
hrsep = NEW Separator(FrmLiloSetup.tsLIloTabs) AS "Separators"
@@ -327,7 +361,7 @@
.Height = 21
.Tag = i & sHostPart
' BROWSE FOR INITRD IMAGES
- FOR EACH sDump IN
Dir("/tmp/lilo_tmp/boot/", "initrd*")
+ FOR EACH sDump IN
Dir(sInitrdLoc, "initrd*")
IF
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
NEXT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
