Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r528 - - More work in the bootloader section
|
From: <cod...@go...> - 2009-04-08 21:53:08
|
Author: M0...@gm...
Date: Wed Apr 8 13:51:49 2009
New Revision: 528
Removed:
branches/speedy/Conf0Old.class
branches/speedy/Conf0Old.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
Log:
- More work in the bootloader section
- Will use debian tools for menu.lst
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Apr 8 13:51:49 2009
@@ -38,113 +38,91 @@
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:373
+#: Conf0.class:222 MdlBootMngr.module:373
msgid "Standard"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67
+#: Conf0.class:222
msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:377
+#: Conf0.class:222 MdlBootMngr.module:377
msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:379
+#: Conf0.class:222 MdlBootMngr.module:379
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:352 Conf0Old.class:166
+#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Step7a.class:143
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0.class:332
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0.class:332
+msgid ""
+"You may not be able to start your VectorLinux installation. Do not
choose "
+"this option"
+msgstr ""
+
+#: Conf0.class:332
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0.class:395
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:368
+#: Conf0.class:411
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:376 Conf0Old.class:192
+#: Conf0.class:420
msgid "LILO"
msgstr ""
-#: Conf0.class:381
+#: Conf0.class:426
msgid "GRUB"
msgstr ""
-#: Conf0.class:386
+#: Conf0.class:432
msgid "NONE"
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:441
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:405 Conf0Old.class:224
+#: Conf0.class:451
msgid "Target"
msgstr ""
-#: Conf0.class:417 Conf0Old.class:238
+#: Conf0.class:463
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:436 Conf0Old.class:257
+#: Conf0.class:482
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:446 Conf0Old.class:270
+#: Conf0.class:493
msgid "Seconds"
msgstr ""
-#: Conf0.class:452 Conf0Old.class:278
+#: Conf0.class:499
msgid "Boot Default"
msgstr ""
-#: Conf0.class:474 Conf0Old.class:308
-msgid "Tab 0"
+#: Conf0.class:518
+msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0Old.class:88 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
-#: Step7a.class:143
-msgid "WARNING:"
-msgstr ""
-
-#: Conf0Old.class:88
-msgid "Selecting this option will bypass your boot manager configuration."
-msgstr ""
-
-#: Conf0Old.class:88
-msgid ""
-"You may not be able to start your VectorLinux installation. Do not
choose "
-"this option"
-msgstr ""
-
-#: Conf0Old.class:88
-msgid "unless you are fully aware of what you are doing."
-msgstr ""
-
-#: Conf0Old.class:184
-msgid "Select bootloader to be used"
-msgstr ""
-
-#: Conf0Old.class:198
-msgid "Grub"
-msgstr ""
-
-#: Conf0Old.class:203
-msgid ""
-"Select this option if you want to configure your system boot manager "
-"manually at a later time"
-msgstr ""
-
-#: Conf0Old.class:205
-msgid "None (Experts Only)"
-msgstr ""
-
-#: Conf0Old.class:213
-msgid "Boot menu options"
-msgstr ""
-
-#: Conf0Old.class:297
-msgid "OPERATING SYSTEMS DETECTED"
+#: Conf0.class:534
+msgid "Tab 0"
msgstr ""
#: FMain.class:253 FMain0.class:253
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Wed Apr 8 13:51:49 2009
@@ -54,51 +54,71 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:352
+#: Conf0.class:332
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0.class:332
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0.class:332
+msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
+msgstr ""
+
+#: Conf0.class:332
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0.class:395
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:368
+#: Conf0.class:411
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:376
+#: Conf0.class:420
msgid "LILO"
msgstr ""
-#: Conf0.class:381
+#: Conf0.class:426
msgid "GRUB"
msgstr ""
-#: Conf0.class:386
+#: Conf0.class:432
msgid "NONE"
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:441
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:405
+#: Conf0.class:451
msgid "Target"
msgstr ""
-#: Conf0.class:417
+#: Conf0.class:463
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:436
+#: Conf0.class:482
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:446
+#: Conf0.class:493
msgid "Seconds"
msgstr ""
-#: Conf0.class:452
+#: Conf0.class:499
msgid "Boot Default"
msgstr ""
-#: Conf0.class:474
+#: Conf0.class:518
+msgid "DETECTED OPERATING SYSTEMS."
+msgstr ""
+
+#: Conf0.class:534
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Wed Apr 8 13:51:49 2009
@@ -220,6 +220,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
.cbVidRes.List = [("Standard"), ("Bootplash Med"), ("Bootsplash
High"), ("Bootsplash Extra High")]
+ .TLoSlIST.Text = "<b>" & UCase(.TLoSlIST.Text) & "</b>"
END WITH
'ME.Fake_Names()
ME.List_Other_Linuxes(ME.TsOsList)
@@ -303,5 +304,45 @@
hbox1.Width = hbox1.Parent.Width - (hbox1.Left * 2)
hbox2.Width = hbox2.Parent.Width - (hbox2.Left * 2)
hbox3.Width = hbox3.Parent.Width - (hbox3.Left * 2)
+
+END
+
+PUBLIC SUB Toggle_window_controls(bval AS Boolean)
+
+ DIM obj AS Object
+ 'DIM rb AS RadioButton
+
+ FOR EACH obj IN ME.Children
+ IF obj.Name <> "HPanel2" THEN
+ TRY obj.enabled = bval
+ END IF
+ NEXT
+ 'FOR EACH obj IN ME.HPanel2.Children
+ ' TRY obj.enabled = TRUE
+ 'NEXT
+END
+
+
+PUBLIC SUB rbNone_Click()
+
+ IF LAST.value = TRUE THEN
+ Message.Warning("<b>" & ("WARNING:") & "</b><br>" &
+ ("Selecting this option will bypass your boot manager configuration.")
& "<br>" &
+ ("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
+ ("unless you are fully aware of what you are doing."))
+ END IF
+ ME.Toggle_window_controls(FALSE)
+
+END
+
+PUBLIC SUB rbGrub_Click()
+
+ ME.Toggle_window_controls(TRUE)
+
+END
+
+PUBLIC SUB rbLilo_Click()
+
+ ME.Toggle_window_controls(TRUE)
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Wed Apr 8 13:51:49 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,84,51)
+ MoveScaled(0,0,84,54)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
@@ -28,16 +28,19 @@
{ HBox2 HBox
MoveScaled(1,3,71,3.5)
Expand = True
- { RadioButton1 RadioButton
+ { rbLilo RadioButton
MoveScaled(1,1,12,3.5)
+ Expand = True
Text = ("LILO")
}
- { RadioButton2 RadioButton
+ { rbGrub RadioButton
MoveScaled(16,1,14,3.5)
+ Expand = True
Text = ("GRUB")
}
- { RadioButton3 RadioButton
+ { rbNone RadioButton
MoveScaled(42,1,17,3.5)
+ Expand = True
Text = ("NONE")
}
}
@@ -84,6 +87,7 @@
}
{ SpinBox1 SpinBox
MoveScaled(18,0,6,3.5)
+ Value = 5
}
{ TextLabel3 TextLabel
MoveScaled(25,0,11,3.5)
@@ -103,8 +107,19 @@
}
}
}
+ { HBox5 HBox
+ MoveScaled(1,27,58,3.5)
+ Expand = True
+ { TLoSlIST TextLabel
+ MoveScaled(6,0,39,4)
+ Expand = True
+ Text = ("DETECTED OPERATING SYSTEMS.")
+ Alignment = Align.Center
+ Border = Border.Raised
+ }
+ }
{ HBox4 HBox
- MoveScaled(1,28,74,20)
+ MoveScaled(1,31,74,20)
Expand = True
Padding = 2
{ TsOsList TabStrip
|
