Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r523 - More work in the boot manager section
|
From: <cod...@go...> - 2009-03-24 21:36:19
|
Author: M0...@gm...
Date: Tue Mar 24 14:23:30 2009
New Revision: 523
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
branches/speedy/Step8.class
Log:
More work in the boot manager section
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Mar 24 14:23:30 2009
@@ -14,30 +14,30 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:62 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:63 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:119
+#: Conf0.class:120
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:137
+#: Conf0.class:138
msgid "Select bootloader to be used"
msgstr ""
@@ -63,39 +63,39 @@
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:177
+#: Conf0.class:179
msgid "Target"
msgstr ""
-#: Conf0.class:185
+#: Conf0.class:186
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:196
+#: Conf0.class:199
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:203
+#: Conf0.class:206
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:215
+#: Conf0.class:218
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:227
+#: Conf0.class:230
msgid "Seconds"
msgstr ""
-#: Conf0.class:240
+#: Conf0.class:243
msgid "Boot Default"
msgstr ""
-#: Conf0.class:259
+#: Conf0.class:262
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:270
+#: Conf0.class:273
msgid "Tab 0"
msgstr ""
@@ -163,6 +163,10 @@
msgid "Select the location to which we will resize"
msgstr ""
+#: MdlBootMngr.module:110
+msgid "Installation found in"
+msgstr ""
+
#: MdlMain.module:33
msgid "Unable to format"
msgstr ""
@@ -187,7 +191,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:139
+#: MdlStartUp.module:47 Step8.class:142
msgid "Software Selection"
msgstr ""
@@ -195,7 +199,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:222
+#: MdlStartUp.module:49 Step8.class:225
msgid "Installation Summary"
msgstr ""
@@ -899,7 +903,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:190 Step8.class:74
+#: Step6.class:190 Step8.class:77
msgid "Do not format"
msgstr ""
@@ -935,7 +939,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:129
+#: Step7.class:126 Step8.class:132
msgid "Customized"
msgstr ""
@@ -943,7 +947,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:131
+#: Step7.class:144 Step8.class:134
msgid "Minimal"
msgstr ""
@@ -1015,51 +1019,51 @@
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Not Formatted"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Mount to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "Format to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "and mount to"
msgstr ""
-#: Step8.class:92
+#: Step8.class:95
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:97
+#: Step8.class:100
msgid "Swap Space"
msgstr ""
-#: Step8.class:110
+#: Step8.class:113
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:127
+#: Step8.class:130
msgid "Full"
msgstr ""
-#: Step8.class:134
+#: Step8.class:137
msgid "Installation Method"
msgstr ""
-#: Step8.class:140
+#: Step8.class:143
msgid "Major Components"
msgstr ""
-#: Step8.class:150
+#: Step8.class:153
msgid "Additional Software"
msgstr ""
-#: Step8.class:241
+#: Step8.class:244
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 24 14:23:30 2009
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:62
+#: Conf0.class:63
msgid "WARNING:"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:119
+#: Conf0.class:120
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:137
+#: Conf0.class:138
msgid "Select bootloader to be used"
msgstr ""
@@ -58,39 +58,39 @@
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:177
+#: Conf0.class:179
msgid "Target"
msgstr ""
-#: Conf0.class:185
+#: Conf0.class:186
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:196
+#: Conf0.class:199
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:203
+#: Conf0.class:206
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:215
+#: Conf0.class:218
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:227
+#: Conf0.class:230
msgid "Seconds"
msgstr ""
-#: Conf0.class:240
+#: Conf0.class:243
msgid "Boot Default"
msgstr ""
-#: Conf0.class:259
+#: Conf0.class:262
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:270
+#: Conf0.class:273
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Tue Mar 24 14:23:30 2009
@@ -14,3 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: MdlBootMngr.module:110
+msgid "Installation found in"
+msgstr ""
+
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Tue Mar 24 14:23:30 2009
@@ -22,71 +22,71 @@
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:74
+#: Step8.class:77
msgid "Do not format"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Not Formatted"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Mount to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "Format to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "and mount to"
msgstr ""
-#: Step8.class:92
+#: Step8.class:95
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:97
+#: Step8.class:100
msgid "Swap Space"
msgstr ""
-#: Step8.class:110
+#: Step8.class:113
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:127
+#: Step8.class:130
msgid "Full"
msgstr ""
-#: Step8.class:129
+#: Step8.class:132
msgid "Customized"
msgstr ""
-#: Step8.class:131
+#: Step8.class:134
msgid "Minimal"
msgstr ""
-#: Step8.class:134
+#: Step8.class:137
msgid "Installation Method"
msgstr ""
-#: Step8.class:139
+#: Step8.class:142
msgid "Software Selection"
msgstr ""
-#: Step8.class:140
+#: Step8.class:143
msgid "Major Components"
msgstr ""
-#: Step8.class:150
+#: Step8.class:153
msgid "Additional Software"
msgstr ""
-#: Step8.class:222
+#: Step8.class:225
msgid "Installation Summary"
msgstr ""
-#: Step8.class:241
+#: Step8.class:244
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/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Mar 24 14:23:30 2009
@@ -1,5 +1,5 @@
# Gambas Project File 2.0
-# Compiled with Gambas 2.11.1
+# Compiled with Gambas 2.12
Title=VectorLinux Installer
Startup=MdlStartUp
Version=0.0.2
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Tue Mar 24 14:23:30 2009
@@ -24,7 +24,7 @@
END
PUBLIC SUB StartUp()
- MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
+ 'MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
END
PUBLIC SUB OnExit()
@@ -50,6 +50,7 @@
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))
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Tue Mar 24 14:23:30 2009
@@ -29,7 +29,6 @@
Text = ("Select bootloader to be used")
{ HBox2 HBox
MoveScaled(1,3,52,3)
- Expand = True
{ rbLilo RadioButton
MoveScaled(1,0,11,3)
Expand = True
@@ -54,14 +53,15 @@
Text = ("Boot menu options")
{ HBox3 HBox
MoveScaled(1,2,70,3.5)
+ Expand = True
Spacing = 4
Padding = 2
{ tlLiloTarget TextLabel
MoveScaled(1,0,16.25,3)
+ Expand = True
AutoResize = True
Text = ("Target")
Alignment = Align.Left
- Border = Border.Plain
}
{ cbLiloTarget ComboBox
MoveScaled(11,0,16,3)
@@ -70,17 +70,19 @@
}
{ HBox4 HBox
MoveScaled(29,1,8,1)
+ Expand = True
AutoResize = True
}
{ TextLabel1 TextLabel
MoveScaled(36,0,15,3)
+ Expand = True
AutoResize = True
Text = ("Video Resolution")
Alignment = Align.Right
- Border = Border.Plain
}
{ cbVidRes ComboBox
MoveScaled(52,0,17,3)
+ Expand = True
Text = ("ComboBox2")
}
}
@@ -133,10 +135,10 @@
Border = Border.Etched
}
}
- { TsOSListing TabStrip
- MoveScaled(1,31,70,32)
+ { TsOsListing TabStrip
+ 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 24 14:23:30 2009
@@ -82,17 +82,40 @@
END
-PUBLIC SUB populate_linux_entry(sLinuxRoot AS String, objTabStrip AS
TabStrip)
+PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
DIM i AS Integer
+ DIM tb AS TextBox
+ DIM tl AS TextLabel
+ DIM cb AS CheckBox
+
+ IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
+ 'Message(sLinux)
IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
i = 0
WITH objTabStrip
.Index = i
.Text = "VectorLinux"
END WITH
+ ELSE
+ i = objTabStrip.Count - 1
+ WITH objTabStrip
+ .Index = i
+ .Text = sLinux
+ END WITH
END IF
+ tl = NEW TextLabel(objTabStrip) AS "Banner"
+ WITH tl
+ .Text = ("Installation found in") & Space(1) & sLinuxRoot
+ .Height = 24
+ .Width = 200
+ .Expand = TRUE
+ .Border = Border.Plain
+ '.AutoResize = TRUE
+ .Move(4, 4)
+ END WITH
+
END
@@ -105,19 +128,25 @@
DIM sOutcome AS String
+ 'Message(ClsGlobal.sRoot)
+' Message(Trim(sPartList[i]))
- ' First, and foremost, we will ist the recently isntalled VectorLinux
- populate_linux_entry(ClsGlobal.sRoot, objTabStrip) ' This will list
the newly isntall VL OS
+ ' 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
' 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)
- IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ... YAY!.
+ IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ...
sPartList = Split(sDump, gb.NewLine)
FOR i = 0 TO sPartList.Max
- sOutcome = ME.Find_Linux(Trim(sPartList[i]))
- IF Len(sOutcome) <= 0 THEN CONTINUE
- ' will only list the linux if one is present
- populate_linux_entry(Trim(sPartList[i]), objTabStrip)
+ 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]))
+ ' will only list the linux IF one IS present
+ IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+ populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
+ END IF
'END IF
NEXT
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Tue Mar 24 14:23:30 2009
@@ -71,6 +71,9 @@
sSize = Trim(sEntry[1])
sMntPnt = Trim(sEntry[2])
sFs = Trim(sEntry[3])
+ ' set partition addresses to global class
+ IF sMntPnt = "/" THEN ClsGlobal.sRoot = sPart
+ IF sMntPnt = "/home" THEN ClsGlobal.shome = sPart
IF sfs LIKE ("Do not format") THEN
sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) &
("Mount to") & Space(1)
ELSE IF sfs = ("Format to") & Space(1) & sFs & Space(1) &
("and mount to") & Space(1)
|
