Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r525 - Repositioned objects in bootloader window and added object[] to store objects
|
From: <cod...@go...> - 2009-03-31 21:40:57
|
Author: M0...@gm...
Date: Tue Mar 31 14:31:31 2009
New Revision: 525
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/Step8.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
branches/speedy/Step8.class
Log:
Repositioned objects in bootloader window and added object[] to store
objects
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Mar 31 14:31:31 2009
@@ -14,88 +14,88 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:64 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:72 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:121
+#: Conf0.class:129
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:139
+#: Conf0.class:147
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:147
+#: Conf0.class:155
msgid "LILO"
msgstr ""
-#: Conf0.class:153
+#: Conf0.class:161
msgid "Grub"
msgstr ""
-#: Conf0.class:158
+#: Conf0.class:166
msgid ""
"Select this option if you want to configure your system boot manager "
"manually at a later time"
msgstr ""
-#: Conf0.class:160
+#: Conf0.class:168
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:168
+#: Conf0.class:176
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:180
+#: Conf0.class:187
msgid "Target"
msgstr ""
-#: Conf0.class:187
+#: Conf0.class:193
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:200
+#: Conf0.class:206
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:207
+#: Conf0.class:212
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:219
+#: Conf0.class:224
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:231
+#: Conf0.class:237
msgid "Seconds"
msgstr ""
-#: Conf0.class:244
+#: Conf0.class:250
msgid "Boot Default"
msgstr ""
-#: Conf0.class:263
+#: Conf0.class:268
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:275
+#: Conf0.class:279
msgid "Tab 0"
msgstr ""
@@ -163,30 +163,34 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:114
+#: MdlBootMngr.module:119
msgid "Installation found in"
msgstr ""
-#: MdlBootMngr.module:132
+#: MdlBootMngr.module:137
msgid "Include in boot menu"
msgstr ""
-#: MdlBootMngr.module:151
+#: MdlBootMngr.module:157
msgid "Name"
msgstr ""
-#: MdlBootMngr.module:167
+#: MdlBootMngr.module:175
msgid "Initial RAM disk image"
msgstr ""
-#: MdlBootMngr.module:184
+#: MdlBootMngr.module:198
msgid "Kernel boot options"
msgstr ""
-#: MdlBootMngr.module:209
+#: MdlBootMngr.module:224
msgid "Add option to boot this operating system into text mode"
msgstr ""
+#: MdlBootMngr.module:318
+msgid "None"
+msgstr ""
+
#: MdlMain.module:33
msgid "Unable to format"
msgstr ""
@@ -211,7 +215,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:142
+#: MdlStartUp.module:47 Step8.class:145
msgid "Software Selection"
msgstr ""
@@ -219,7 +223,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:225
+#: MdlStartUp.module:49 Step8.class:228
msgid "Installation Summary"
msgstr ""
@@ -923,7 +927,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:190 Step8.class:77
+#: Step6.class:190 Step8.class:80
msgid "Do not format"
msgstr ""
@@ -959,7 +963,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:132
+#: Step7.class:126 Step8.class:135
msgid "Customized"
msgstr ""
@@ -967,7 +971,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:134
+#: Step7.class:144 Step8.class:137
msgid "Minimal"
msgstr ""
@@ -1031,59 +1035,59 @@
"include in your installation."
msgstr ""
-#: Step8.class:45
+#: Step8.class:48
msgid "Distribution"
msgstr ""
-#: Step8.class:63
+#: Step8.class:66
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Not Formatted"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Mount to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "Format to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "and mount to"
msgstr ""
-#: Step8.class:95
+#: Step8.class:98
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:100
+#: Step8.class:103
msgid "Swap Space"
msgstr ""
-#: Step8.class:113
+#: Step8.class:116
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:130
+#: Step8.class:133
msgid "Full"
msgstr ""
-#: Step8.class:137
+#: Step8.class:140
msgid "Installation Method"
msgstr ""
-#: Step8.class:143
+#: Step8.class:146
msgid "Major Components"
msgstr ""
-#: Step8.class:153
+#: Step8.class:156
msgid "Additional Software"
msgstr ""
-#: Step8.class:244
+#: Step8.class:247
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Tue Mar 31 14:31:31 2009
@@ -14,83 +14,83 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:64
+#: Conf0.class:72
msgid "WARNING:"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:121
+#: Conf0.class:129
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:139
+#: Conf0.class:147
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:147
+#: Conf0.class:155
msgid "LILO"
msgstr ""
-#: Conf0.class:153
+#: Conf0.class:161
msgid "Grub"
msgstr ""
-#: Conf0.class:158
+#: Conf0.class:166
msgid "Select this option if you want to configure your system boot
manager manually at a later time"
msgstr ""
-#: Conf0.class:160
+#: Conf0.class:168
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:168
+#: Conf0.class:176
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:180
+#: Conf0.class:187
msgid "Target"
msgstr ""
-#: Conf0.class:187
+#: Conf0.class:193
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:200
+#: Conf0.class:206
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:207
+#: Conf0.class:212
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:219
+#: Conf0.class:224
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:231
+#: Conf0.class:237
msgid "Seconds"
msgstr ""
-#: Conf0.class:244
+#: Conf0.class:250
msgid "Boot Default"
msgstr ""
-#: Conf0.class:263
+#: Conf0.class:268
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:275
+#: Conf0.class:279
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Tue Mar 31 14:31:31 2009
@@ -14,27 +14,31 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:114
+#: MdlBootMngr.module:119
msgid "Installation found in"
msgstr ""
-#: MdlBootMngr.module:132
+#: MdlBootMngr.module:137
msgid "Include in boot menu"
msgstr ""
-#: MdlBootMngr.module:151
+#: MdlBootMngr.module:157
msgid "Name"
msgstr ""
-#: MdlBootMngr.module:167
+#: MdlBootMngr.module:175
msgid "Initial RAM disk image"
msgstr ""
-#: MdlBootMngr.module:184
+#: MdlBootMngr.module:198
msgid "Kernel boot options"
msgstr ""
-#: MdlBootMngr.module:209
+#: MdlBootMngr.module:224
msgid "Add option to boot this operating system into text mode"
+msgstr ""
+
+#: MdlBootMngr.module:318
+msgid "None"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Tue Mar 31 14:31:31 2009
@@ -14,79 +14,79 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:45
+#: Step8.class:48
msgid "Distribution"
msgstr ""
-#: Step8.class:63
+#: Step8.class:66
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:77
+#: Step8.class:80
msgid "Do not format"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Not Formatted"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Mount to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "Format to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "and mount to"
msgstr ""
-#: Step8.class:95
+#: Step8.class:98
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:100
+#: Step8.class:103
msgid "Swap Space"
msgstr ""
-#: Step8.class:113
+#: Step8.class:116
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:130
+#: Step8.class:133
msgid "Full"
msgstr ""
-#: Step8.class:132
+#: Step8.class:135
msgid "Customized"
msgstr ""
-#: Step8.class:134
+#: Step8.class:137
msgid "Minimal"
msgstr ""
-#: Step8.class:137
+#: Step8.class:140
msgid "Installation Method"
msgstr ""
-#: Step8.class:142
+#: Step8.class:145
msgid "Software Selection"
msgstr ""
-#: Step8.class:143
+#: Step8.class:146
msgid "Major Components"
msgstr ""
-#: Step8.class:153
+#: Step8.class:156
msgid "Additional Software"
msgstr ""
-#: Step8.class:225
+#: Step8.class:228
msgid "Installation Summary"
msgstr ""
-#: Step8.class:244
+#: Step8.class:247
msgid "Your VectorLinux installation is about to be performed as follows.
If you need to make any changes, this is your last chance."
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Tue Mar 31 14:31:31 2009
@@ -16,8 +16,15 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'=====================================================================================
+
+
+
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step6"].Picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step5"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step4"].picture = MdlStartUp.pDone
+
RETURN "Conf1"
@@ -51,7 +58,8 @@
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
- ME.TsOsListing.Height = ME.ClientHeight - (ME.HBox6.top +
(ME.HBox6.Height + 12)) 'ME.Heigh - (ME.HBox6.top + (ME.HBox6.Height * 2))
+ 'ME.TsOsListing.Height = ME.ClientHeight - (ME.HBox6.top +
(ME.HBox6.Height + 12)) 'ME.Heigh - (ME.HBox6.top + (ME.HBox6.Height * 2))
+ ME.TsOsListing.Height = ClsGlobal.fRunningMainForm.pnlstack.height -
(ME.TsOsListing.Top + 230)
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Tue Mar 31 14:31:31 2009
@@ -57,15 +57,13 @@
Spacing = 4
Padding = 2
{ tlLiloTarget TextLabel
- MoveScaled(1,0,10,3)
- Expand = True
+ MoveScaled(1,0,16.25,3)
AutoResize = True
Text = ("Target")
Alignment = Align.Left
}
{ cbLiloTarget ComboBox
- MoveScaled(11,0,16,3)
- Expand = True
+ MoveScaled(11,0,22.5,3)
Text = ("ComboBox1")
}
{ HBox4 HBox
@@ -81,8 +79,7 @@
Alignment = Align.Right
}
{ cbVidRes ComboBox
- MoveScaled(52,0,17,3)
- Expand = True
+ MoveScaled(52,0,22.5,3)
Text = ("ComboBox2")
}
}
@@ -98,6 +95,7 @@
}
{ SbTimeOut SpinBox
MoveScaled(17,0,8,3)
+ Value = 5
}
{ TextLabel2 TextLabel
MoveScaled(26,0,8,3)
@@ -118,8 +116,7 @@
Alignment = Align.Right
}
{ cbBootDef ComboBox
- MoveScaled(61,0,17,3)
- Expand = True
+ MoveScaled(61,0,22.5,3)
Text = ("ComboBox1")
}
}
@@ -139,7 +136,6 @@
MoveScaled(1,29,81,36)
Expand = True
Arrangement = Arrange.Row
- AutoResize = True
Index = 0
Text = ("Tab 0")
Index = 0
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Tue Mar 31 14:31:31 2009
@@ -16,6 +16,11 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'====================================================================================================
+PUBLIC objinitrds AS Object[]
+PUBLIC objChecks AS Object[]
+PUBLIC objappends AS Object[]
+PUBLIC objNames AS Object[]
+
PUBLIC bScanned AS Boolean
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
@@ -134,6 +139,7 @@
.Height = 24
.Tag = sLinuxRoot
END WITH
+ objChecks.Add(cb)
hb = NEW HBox(objTabStrip) ' separator space
WITH hb
.Height = 12
@@ -160,8 +166,10 @@
WITH tb
.Expand = TRUE
.Height = .Parent.Height
+ .Text = sLinux ' default to the distro found
.Tag = sLinuxRoot
END WITH
+ objNames.Add(tb)
tl = NEW TextLabel(hb) ' initrd label
WITH tl
.text = ("Initial RAM disk image")
@@ -169,6 +177,7 @@
.Height = .Parent.Height
.Expand = TRUE
END WITH
+
comb = NEW ComboBox(hb) ' initrd selection combobox
WITH comb
.Height = .Parent.Height
@@ -176,6 +185,11 @@
.READonly = TRUE
.Tag = sLinuxRoot
END WITH
+ ' populate the initrd box
+ 'Message(sLinuxRoot)
+ ME.find_initrds_for_this_linux(sLinuxRoot, comb) ' populate initrd
selection
+
+ objinitrds.Add(comb)
hb = NEW HBox(objTabStrip) ' blank space separator
hb.Height = 8
hb.Expand = TRUE
@@ -195,6 +209,7 @@
.Expand = TRUE
.Tag = sLinuxRoot
END WITH
+ objappends.Add(tb)
' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
IF sLinuxRoot = ClsGlobal.sRoot THEN
@@ -211,12 +226,12 @@
.Expand = TRUE
.Tag = sLinuxRoot
END WITH
- hb = NEW HBox(objTabStrip)
- hb.Height = 4
- hb.Expand = TRUE
+ ' hb = NEW HBox(objTabStrip)
+ ' hb.Height = 4
+ ' hb.Expand = TRUE
END IF
-
+ objTabStrip.Refresh()
@@ -230,12 +245,17 @@
DIM i AS Integer
DIM sOutcome AS String
+ objappends = NEW Object[]
+ objChecks = NEW Object[]
+ objinitrds = NEW Object[]
+ objNames = NEW Object[]
+
bScanned = TRUE
'Message(ClsGlobal.sRoot)
' Message(Trim(sPartList[i]))
' First, and foremost, we will list the recently isntalled VectorLinux
- populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
+ 'populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
' Now list all other linuxes
=================================================
SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux |
tr -s \' \' | cut -f 1 -d \' \'" TO sDump
sDump = Trim(sDump)
@@ -245,20 +265,57 @@
sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
'IF Trim(ClsGlobal.sRoot) <> Trim(sPartList[i]) THEN
- sOutcome = ME.Find_Linux(Trim(sPartList[i]))
+ 'sOutcome = Find_Linux(Trim(sPartList[i]))
+ 'Message(sOutcome)
' will only list the linux IF one IS present
- IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
- INC objTabStrip.Count
+ 'IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+ 'IF Find_Linux(Trim(sPartList[i])) <> "None" THEN
+ sOutcome = Find_Linux(Trim(sPartList[i]))
+ IF sOutcome AND sOutcome <> "None" THEN
+ 'INC objTabStrip.Count
objTabStrip.Index = objTabStrip.Count - 1
populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
+ INC objTabStrip.Count
END IF
'END IF
NEXT
+ DEC objTabStrip.Count ' remove the trailing blank tab from the
tabstrip.
' now list all other Windows os's
============================================
+
+END
+
+
+PUBLIC SUB find_initrds_for_this_linux(sLinuxRoot AS String, object AS
ComboBox)
+
+ DIM sResults AS String
+ DIM slines AS String[]
+ DIM i AS Integer
+ DIM sAdd, sBootPath AS String
+ ' need to find the mounted address to this linux
+ sAdd = Replace(sLinuxRoot, "/dev/", "/mnt/")
+ IF sLinuxRoot = ClsGlobal.sRoot THEN
+ sBootPath = sadd &/ "boot"
+ ELSE
+ sBootPath = sAdd &/ "boot"
+ END IF
+ SHELL "ls " & sBootPath & " | grep initrd" TO sResults
+ sResults = Trim(sResults)
+ 'Message(sResults)
+ IF NOT sResults THEN ' initrds are not located in the /boot directory
+ SHELL "ls " & sadd & " | grep initrd" TO sResults
+ END IF
+
+ sResults = Trim(sResults)
+
+ slines = Split(sResults, "\n")
+ FOR i = 0 TO slines.Max
+ IF Len(Trim(slines[i])) > 0 THEN object.Add(Trim(slines[i]))
+ NEXT
+ object.Add(("None"))
END
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Tue Mar 31 14:31:31 2009
@@ -34,7 +34,10 @@
END
PUBLIC FUNCTION GetNext() AS String
- 'RETURN "Step9"
+
+ ClsGlobal.fRunningMainForm.listview1["Step4"].Picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pDone
+
RETURN "Conf0"
END
|
