Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r114 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-08-11 22:02:50
|
Author: M0...@gm...
Date: Mon Aug 11 15:02:20 2008
New Revision: 114
Added:
branches/iVL/ToDo
Removed:
branches/iVL/Order
branches/iVL/install-pkg
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/FrmPkgsel2.class
branches/iVL/FrmPkgsel2.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlCore.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlPkgSel.module
Log:
- Made left panel wider (to avoid unnecessary scroll bar (due to rants in
the forum))
- Added descriptions to the CUSTOM install package selection window.
This will now display each package's description when the user moves the
mouse over it
- Added initrd label and textbox for initrd option on LILO config window
- Removed "feature" that updated the tab.text property in the lilo config
window. This is because
we will need a stable referral point so we can come back and mount these
partitions and then copy
their kernels/initrd's and popperly address them.
- Began gathering information from the LILO window to create
lilo.conf "sections"
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Aug 11 15:02:20 2008
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:271
+#: FMain.class:272
msgid "Process Overview"
msgstr ""
-#: FMain.class:290
+#: FMain.class:291
msgid "Next"
msgstr ""
-#: FMain.class:296
+#: FMain.class:297
msgid "Back"
msgstr ""
-#: FMain.class:302
+#: FMain.class:303
msgid "Exit"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Aug 11 15:02:20 2008
@@ -1,6 +1,6 @@
# Gambas Project File 2.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmLilo
Version=0.0.33
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Aug 11 15:02:20 2008
@@ -67,12 +67,13 @@
END WITH
'ME.TreeView1.BackColor = Color.Transparent
ME.AUTOSIZE_LEFT_PANE
-WITH FrmLilo
-.Reparent(Fmain.pnlWinHost)
-.Width = Fmain.pnlWinHost.Width
-.Height = Fmain.pnlWinHost.Height
-.Show
-END WITH
+' ' '
+' ' ' WITH FrmLilo
+' ' ' .Reparent(Fmain.pnlWinHost)
+' ' ' .Width = Fmain.pnlWinHost.Width
+' ' ' .Height = Fmain.pnlWinHost.Height
+' ' ' .Show
+' ' ' END WITH
END
@@ -83,7 +84,7 @@
ME.tvPlan.MoveFirst()
REPEAT
IF MdlObjSizer.get_object_width(tvPlan.Item.Text) > iWidth THEN
- iWidth = MdlObjSizer.get_object_width(tvPlan.item.Text)
+ iWidth = MdlObjSizer.get_object_width(tvPlan.item.Text) + 24
END IF
UNTIL ME.tvPlan.MoveBelow()
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Mon Aug 11 15:02:20 2008
@@ -37,14 +37,11 @@
ME.TabStrip1.Index = 0
-ME.Maximized = TRUE
+'ME.Maximized = TRUE
FBResolution_Click()
FBResolution.text = "Standard"
-END
-
-
-
+END
@@ -56,6 +53,7 @@
.LiloTarget.Enabled = FALSE
.FBResolution.Enabled = FALSE
.TabStrip1.Enabled = FALSE
+ .sbTimer.Enabled = FALSE
END WITH
ELSE
WITH ME
@@ -63,6 +61,7 @@
'.LiloAppendBox.Enabled = TRUE
.LiloTarget.Enabled = TRUE
.FBResolution.Enabled = TRUE
+ .sbTimer.Enabled = TRUE
END WITH
END IF
@@ -137,5 +136,11 @@
PUBLIC SUB tlBanner_MouseDown()
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ MdlConfLilo.WRITE_LILO_DOT_CONF
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Mon Aug 11 15:02:20 2008
@@ -12,17 +12,17 @@
Text = ("Don't Install Lilo")
}
{ TabStrip1 TabStrip
- MoveScaled(1,38,61,28)
+ MoveScaled(2,27,61,28)
Index = 0
Text = ("Tab 0")
Index = 0
}
{ tlList TextLabel
- MoveScaled(1,26,57,6)
+ MoveScaled(1,19,57,6)
Text = ("TextLabel1")
}
{ LiloTarget ComboBox
- MoveScaled(13,9,31,3.125)
+ MoveScaled(13,9,19,3)
Text = ("")
ReadOnly = True
List = []
@@ -32,25 +32,26 @@
Text = ("Target")
}
{ tlFbMode TextLabel
- MoveScaled(1,14,18,3.125)
+ MoveScaled(33,9,18,3.125)
Text = ("Video Resolution")
}
{ FBResolution ComboBox
- MoveScaled(20,14,21,3.125)
+ MoveScaled(52,9,21,3.125)
Text = ("")
ReadOnly = True
List = [("Standard"), ("Bootsplash Med"), ("Bootsplash High"),
("Bootsplash Extra high")]
}
{ tlTimeOUt TextLabel
- MoveScaled(1,20,18,3.125)
+ MoveScaled(1,14,18,3.125)
Text = ("Prompt Timeout")
Alignment = Align.Normal
}
{ sbTimer SpinBox
- MoveScaled(20,20,9,3)
+ MoveScaled(20,14,9,3)
+ Value = 3
}
{ tlTimoutSec TextLabel
- MoveScaled(30,20,7,3.125)
+ MoveScaled(30,14,7,3.125)
Text = ("Seconds")
Alignment = Align.Normal
}
Modified: branches/iVL/FrmPkgsel2.class
==============================================================================
--- branches/iVL/FrmPkgsel2.class (original)
+++ branches/iVL/FrmPkgsel2.class Mon Aug 11 15:02:20 2008
@@ -22,7 +22,7 @@
.tlbanner.Adjust
'.tlbanner.Border = Border.Plain
'.tlbanner.Width = MdlObjSizer.get_object_width(.tlbanner.Text)
-
+ .Maximized = TRUE
END WITH
FMain.FrmCurr = ME
FMain.btback.Enabled = TRUE
@@ -30,13 +30,15 @@
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.btback.ForeColor = Color.Black
MdlPkgSel.LIST_PACKAGE_SELECTION()
+
END
PUBLIC SUB Form_Resize()
WITH ME
.tlbanner.Width = .ClientWidth - 16
- .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height *
1.5), .tlbanner.Width - 4, .ClientHeight - (.tlbanner.Height *
4)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+ .scrPkgs.Move(.tlbanner.Left, .tlbanner.top + (.tlbanner.Height +
8), .tlbanner.Width - 4, .ClientHeight - (.tlbanner.Height *
4.5)) ', .tlbanner.Width - 8, .ClientHeight - .tlbanner.height - 8)
+ .frmDesc.Move(.scrPkgs.Left, scrPkgs.top + scrPkgs.Height + 8,
scrPkgs.Width, .ClientH - (.tlbanner.Height + .scrPkgs.Height + 24))
END WITH
@@ -56,11 +58,7 @@
END
-PUBLIC SUB scrPkgs_MouseDown()
-
-
-END
PUBLIC SUB Form_Hide()
Modified: branches/iVL/FrmPkgsel2.form
==============================================================================
--- branches/iVL/FrmPkgsel2.form (original)
+++ branches/iVL/FrmPkgsel2.form Mon Aug 11 15:02:20 2008
@@ -8,7 +8,19 @@
Text = ("TextLabel1")
}
{ scrPkgs ScrollView
- MoveScaled(1,8,50,22)
+ MoveScaled(0,7,60,32)
Expand = True
+ }
+ { frmDesc Frame
+ MoveScaled(1,41,59,18)
+ Background = Color.LightBackground
+ Text = ("")
+ { tlPkgDesc TextLabel
+ MoveScaled(1,2,56,13)
+ Background = Color.LightBackground
+ Text = ("")
+ Alignment = Align.Left
+ Transparent = True
+ }
}
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Mon Aug 11 15:02:20 2008
@@ -51,7 +51,71 @@
PUBLIC SUB WRITE_LILO_DOT_CONF()
DIM sFile AS String
-DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd AS String
+DIM tb AS TextBox
+DIM sShortAddr AS String
+DIM sMatchTag AS String
+DIM bInc AS CheckBox
+DIM cb AS CheckBox
+DIM sEntryLbl, sEntryApnd, sEntryRoot, sEntryInitrd, sSection AS String
+DIM i AS Integer
+DIM sCliSection AS String
+ FOR i = 0 TO FrmLilo.TabStrip1.Count - 2
+ WITH FrmLilo.TabStrip1
+ .Index = i
+ sShortAddr = Right(.text, Len(.text) - InStr(.text, "-"))
+ sMatchTag = "/dev" &/ sShortAddr
+ FOR EACH bInc IN MdlLiloOsList.bIncluded
+ IF bInc.tag = sMatchTag THEN
+ IF bInc.value = TRUE THEN ' include this OS
+
+ ' collect the information about this one entry now
+ sEntryRoot = sMatchTag
+ FOR EACH tb IN MdlLiloOsList.txtNames
+ IF tb.tag = sMatchTag THEN
+ sEntryLbl = tb.Text
+ END IF
+ NEXT
+ FOR EACH tb IN MdlLiloOsList.txtInitrds
+ IF tb.tag = sMatchTag THEN
+ sEntryInitrd = tb.Text
+ END IF
+ NEXT
+ FOR EACH tb IN MdlLiloOsList.txtAppends
+ IF tb.tag = sMatchTag
+ sEntryApnd = tb.Text
+ END IF
+ NEXT
+
+ ' now put it all in one variable
+ sSection = "image = /boot/tamu/vmlinuz-" & sShortAddr
& gb.NewLine &
+ "root = " & sMatchTag & gb.NewLine &
+ "label = " & sEntryLbl & gb.NewLine &
+ "append = \"" & sEntryApnd & "\"" & gb.NewLine &
+ "initrd = " & sEntryInitrd & gb.NewLine &
+ "read-only"
+ 'Message(sSection)
+
+
+ FOR EACH cb IN MdlLiloOsList.bVlCliOption
+ IF cb.Tag = sMatchTag THEN
+ IF cb.Value = TRUE THEN
+ sCliSection = Replace(sSection, "append = \"" &
sEntryApnd & "\"", "append = \"2 splash=silent\"")
+ sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, label = sEntryLbl & "-tui")
+ END IF
+ END IF
+ NEXT
+
+sFile = sFile & gb.NewLine & sSection & gb.NewLine
+
+ END IF
+ END IF
+
+ NEXT
+ 'Message(FrmLilo.TabStrip1.text)
+ END WITH
+ NEXT
+Message.Delete(sFile)
+
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Mon Aug 11 15:02:20 2008
@@ -212,7 +212,7 @@
FMain.tvPlan["Prep0"].Selected = TRUE
'Balloon("Scanning drives for media ... please wait", fmain.pnlWinHost)
-RETURN
+'RETURN
FrmSelISO.tlDistroDesc.Text = "<b>Scanning system for installable media.
Please wait ...</b>"
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Mon Aug 11 15:02:20 2008
@@ -19,9 +19,11 @@
PRIVATE sText AS String
PUBLIC txtAppends AS Object[]
PUBLIC txtNames AS Object[]
+PUBLIC txtInitrds AS Object[]
PUBLIC iAppendLeft AS Integer
PUBLIC cbWins AS Object[]
PUBLIC bVlCliOption AS Boolean
+PUBLIC bIncluded AS Object[]
PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
DIM sFatList AS String
@@ -125,6 +127,8 @@
txtAppends = NEW Object[]
txtNames = NEW Object[]
+txtInitrds = NEW Object[]
+bIncluded = NEW Object[]
'FrmLilo.TabStrip1.Count = 1
cbarr = NEW Object[]
@@ -169,8 +173,9 @@
.Height = 27
.Value = TRUE
.Move(4, tl.top + tl.Height + 4,
MdlObjSizer.get_object_width(.text) + 24)
+ .tag = arrLinux[i]
END WITH
-
+ ME.bIncluded.Add(cbInclude)
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "Label"
WITH tl
@@ -192,33 +197,46 @@
END WITH
txtNames.Add(txtAppnd)
+
+ tl = NEW TextLabel(FrmLilo.TabStrip1) AS "InitdLbl"
+ WITH tl
+ .text = "Initial Ram Disk"
+ .Move(txtAppnd.Left + txtAppnd.Width + 8, txtAppnd.top,
MdlObjSizer.get_object_width(.text))
+ .Height = 27
+ .Alignment = Align.Normal
+ END WITH
+
+ txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "initrdBox"
+ WITH txtAppnd
+ .text = "initrd-" & sShortAddr
+ .Move(tl.Left + tl.Width + 4, tl.top, 250, 27)
+ .tag = arrLinux[i]
+ END WITH
+ ME.txtInitrds.Add(txtAppnd)
+
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
+
ME.iAppendLeft = .x + .Width + 4
+
END WITH
txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
WITH txtAppnd
.Move(tl.Left + tl.Width + 8, tl.top,
FrmLilo.TabStrip1.Width - (tl.Width * 1.5))
- '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left *
4)
- ' IF FrmLilo.sVidMode <> "Standard" THEN
- ' .Enabled = TRUE
- ' .text = .text & " splash=silent"
- ' '.Width = FrmLilo.TabStrip1.Width - tl.Width - (tl.left
* 4)
- ' ELSE
- ' '.Enabled = FALSE
- ' '.Text = "not available in \'Standard\' Resolution
mode"
- ' .Text = .text & Replace(.text, "splash=silent", "")
- ' ' .Width = FrmLilo.TabStrip1.Width - tl.Width -
(tl.left * 2)
- ' END IF
+
.Height = 27
+ .tag = arrLinux[i]
txtAppends.Add(txtAppnd)
END WITH
+
+
+
' Add an option to boot the recently installed OS to CLI mode
ClsPartSel.sRoot = "/dev/hda1"
@@ -231,6 +249,7 @@
.Width = MdlObjSizer.get_object_width(.text) + 36
.Height = 27
.Move(4, tl.top + tl.Height + 12)
+ .tag = arrLinux[i]
END WITH
END IF
@@ -278,16 +297,6 @@
PUBLIC SUB NameBox_keyrelease()
- DIM tx AS TextBox
- FOR EACH tx IN txtNames
- IF tx.tag = LAST.tag THEN
- tx.text = Replace(LAST.text, " ", "")
- FrmLilo.TabStrip1.Current.text = LAST.text
- END IF
-
-
- NEXT
-
END
Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module (original)
+++ branches/iVL/MdlPkgSel.module Mon Aug 11 15:02:20 2008
@@ -73,6 +73,7 @@
DIM i, y AS Integer
DIM sRawFile AS String[]
DIM sLine AS String
+
' THis one is kind of tricky.. it will read the whole PACKAGES.TXT
y = 4
@@ -97,7 +98,7 @@
.x = 4
.y = y
.Height = 27
- .Width = MdlObjSizer.get_object_width(.Text) * 2
+ .Width = MdlObjSizer.get_object_width(.Text) * 1.5
.Value = TRUE
END WITH
ME.Pkgs.Add(cb)
@@ -111,15 +112,58 @@
PUBLIC SUB Packages_click()
+
+
IF ClsPkgSel.arrPkgs THEN
ClsPkgSel.arrPkgs.Clear
END IF
ME.GET_USER_PKG_SELECTION()
-
+
+ ' Now display a description here
+
+
+ 'PRINT sDump
END
+PUBLIC SUB Packages_enter()
+
+DIM sSearch AS String
+DIM sDump AS String
+DIM sArr AS String[]
+DIM i AS Integer
+DIM sDesc AS String
+
+
+
+
+ sSearch = Right(LAST.tag, Len(LAST.tag) - InStr(LAST.tag, "/"))
+
+ ' IF InStr(sSearch, "-") = < 3 THEN
+
+ sSearch = Left(sSearch, InStr(sSearch, "-") - 1)
+
+
+ ' ELSE
+ 'sSearch = Left(sSearch, InStr(sSearch, "-") - InStr(sSearch, "-") -
1) ' this will not work
+ 'end if
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT |
grep -m 8 \'" & sSearch & ":\' | cut -f2- -d \':\'" TO sDump
+ sArr = Split(sDump, "\n")
+ FOR i = 0 TO sArr.count - 1
+ IF InStr(sArr[i], ":") = FALSE THEN
+ sDesc = sDesc & sArr[i]
+ END IF
+ NEXT
+
+ sDesc = Trim(sDesc)
+
+ FrmPkgsel2.tlPkgDesc.Text = sDesc
+
+
+END
+
+
@@ -129,6 +173,8 @@
ClsPkgSel.arrBulks.Clear
END IF
ME.GET_USER_BULK_SELECTION
+
+ PRINT LAST.tag
END
Added: branches/iVL/ToDo
==============================================================================
--- (empty file)
+++ branches/iVL/ToDo Mon Aug 11 15:02:20 2008
@@ -0,0 +1,11 @@
++ Lilo Config Window
+ * Find all other linuxes installed - DONE
+ * Create a lilo entry for each (each tab will make one one lilo entry)
- DONE
+ * Copy all kernels and initrds to /boot/tamu ??? -HELP ME!!!
+ + /boot/tamu/initrd-hda1
+ + /boot/tamu/vmlinux-hda1
+ * Read the tabstrip to create the lilo.conf
+ * Store lilo.conf to /etc
+ * Run lilo.
+
+
\ No newline at end of file
|
