Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r280 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-11 16:07:38
|
Author: M0E.lnx
Date: Tue Nov 11 08:06:50 2008
New Revision: 280
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/ClsLilo.class
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLiloOsList.module
Log:
- Fixed bug where the LILO os list was adding a TUI option even when the
option was set to false
- Added auto-width to the left panel.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 11 08:06:50 2008
@@ -14,91 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:188
+#: FMain.class:191
msgid "Restart"
msgstr ""
-#: FMain.class:236
+#: FMain.class:239
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:238
+#: FMain.class:241
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:238
+#: FMain.class:241
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:252
+#: FMain.class:255
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:307
+#: FMain.class:310
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:308
+#: FMain.class:311
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:319
+#: FMain.class:322
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:333
+#: FMain.class:336
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "Yes"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "No"
msgstr ""
-#: FMain.class:366
+#: FMain.class:369
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:370
+#: FMain.class:373
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:383
+#: FMain.class:386
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:383
+#: FMain.class:386
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:606
+#: FMain.class:609
msgid "Back"
msgstr ""
-#: FMain.class:618
+#: FMain.class:621
msgid "Exit Installation"
msgstr ""
-#: FMain.class:630
+#: FMain.class:633
msgid "Next"
msgstr ""
-#: FMain.class:644
+#: FMain.class:647
msgid "Button1"
msgstr ""
Modified: branches/iVL/ClsLilo.class
==============================================================================
--- branches/iVL/ClsLilo.class (original)
+++ branches/iVL/ClsLilo.class Tue Nov 11 08:06:50 2008
@@ -15,3 +15,5 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+STATIC PUBLIC sRootInstall AS String
+STATIC PUBLIC bCliOpt AS Boolean
\ No newline at end of file
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Nov 11 08:06:50 2008
@@ -1 +1,2 @@
-
+- Fixed bug where the LILO os list was adding a TUI option even when the
option was set to false
+- Added auto-width to the left panel.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 08:06:50 2008
@@ -94,6 +94,7 @@
'Message(iWidth)
FMain.btnext.Enabled = FALSE ' disable the button until a language is
selected
IF ERROR THEN Message(Error.Text & "<br>" & Error.Where)
+ME.AUTOSIZE_LEFT_PANE()
END
PUBLIC SUB AUTOSIZE_LEFT_PANE()
@@ -111,7 +112,9 @@
'Message(iWidth)
'ME.tvPlan.Width = iWidth + (iWidth / 5)
ME.tvPlan.Width = iWidth + 6
- ME.Frame1.Width = iWidth + 12
+ 'ME.Frame1.Width = iWidth + 12
+ ME.SidePanel1.Width = iWidth + 64
+ 'me.SidePane
END
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Tue Nov 11 08:06:50 2008
@@ -20,7 +20,9 @@
PUBLIC SUB Form_Open()
-
+ IF Application.Args[1] = "-C" THEN
+ FMain.btnext.Enabled = TRUE
+ END IF
ME.tlBanner.Text = "<h3>" & tlBanner.text & "</h3>"
'ClsPartSel.sRoot = "/dev/sdb1" '
FMain.FrmCurr = ME
@@ -161,9 +163,9 @@
PUBLIC SUB Form_Menu()
- 'MdlConfLilo.GENERATE_LILO_DOT_CONF()
+MdlConfLilo.GENERATE_LILO_DOT_CONF()
' MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
- 'MdlConfLilo.WRITE_LILO_DOT_CONF()
+MdlConfLilo.WRITE_LILO_DOT_CONF()
END
@@ -174,5 +176,11 @@
FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
ME.sVidMode = "Standard"
+
+END
+
+PUBLIC SUB Form_MouseWheel()
+
+
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Tue Nov 11 08:06:50 2008
@@ -50,7 +50,7 @@
}
{ sbTimer SpinBox
MoveScaled(20,16,9,3)
- Value = 3
+ Value = 10
}
{ tlTimoutSec TextLabel
MoveScaled(30,16,7,3)
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Nov 11 08:06:50 2008
@@ -66,7 +66,8 @@
- 'message(sOut)
+ message(sOut)
+ RETURN
' Now we want to write the actual file to the root partition
IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf") THEN
IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist") THEN
KILL ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist"
@@ -277,7 +278,7 @@
'FOR EACH cbox IN MdlPartSel.oMountPoints
' IF cbox.text = "/" AND cbox.tag = ClsPartSel.sRoot THEN
' IF MdlLiloOsList.bVlCliOption = TRUE THEN
- IF bInc.tag = ClsPartSel.sRoot AND MdlLiloOsList.bVlCliOption =
TRUE THEN
+ IF bInc.tag = ClsLilo.sRootInstall AND MdlLiloOsList.bVlCliOption
= TRUE THEN
sCliSection = Replace(sSection, "append = \"" &
sEntryApnd & "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, "label = " & sEntryLbl & "-tui")
sCliSection = sCliSection & gb.NewLine
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Tue Nov 11 08:06:50 2008
@@ -228,6 +228,7 @@
DIM sShortAddr AS String
DIM iwidth AS Integer = FrmLilo.TabStrip1.Width
DIM cb AS ComboBox
+ DIM tb AS TextBox
x = 4
y = 4
@@ -241,6 +242,7 @@
cbarr = NEW Object[]
+ 'ME.bVlCliOption = FALSE
SHELL "fdisk -l |grep -E \'83 *Linux\' | cut -f 1 -d \' \'" TO sLinuxList
'sLinuxList = Trim(sLinuxList)
@@ -274,7 +276,7 @@
ENDIF
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
- .text = "<b>" & ("Operating system installed in ") &
arrLinux[i] & "</b> "
+ .text = "<b>" & ("Operating system installed in") & Space(1)
& arrLinux[i] & "</b> "
.Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
'.BackColor = Color.SelectedBackground
.Alignment = Align.Normal
@@ -374,18 +376,33 @@
FOR EACH cb IN MdlPartSel.oMountPoints
IF cb.text = "/" AND cb.tag = arrLinux[i] THEN
+ ClsLilo.sRootInstall = cb.Tag
+ 'FrmLilo.cbDefBoot.Add("Linux-tui")
'IF arrLinux[i] = ClsPartSel.sRoot THEN
cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
WITH cbInclude
- .Value = FALSE
- .text = ("Add option to boot this Operating system
into Text mode")
+ .Value = TRUE
+ .text = ("Add option to boot this Operating system
into Text mode.")
.Width = MdlObjSizer.get_object_width(.text) + 36
.Height = 27
.Move(4, tl.top + tl.Height + 4)
-
.tag = arrLinux[i]
.Background = Color.Background
+ 'Message(.tag)
+ 'FOR EACH tb IN txtNames
+ 'Message(tb.tag & "<br>" & tb.Text)
+ 'message
+ 'IF Trim(tb.tag) = Trim(.tag) THEN
+ 'Message(tb.tag)
+ ' IF FrmLilo.cbDefBoot.Find(Trim(tb.Text
& "-tui")) = -1 THEN
+ 'FrmLilo.cbDefBoot.Add(tb.text & "-tui")
+ ' FrmLilo.cbDefBoot.Add(Trim(tb.text)
& "-tui")
+ ' END IF
+ 'FrmLilo.cbDefBoot.Add("Linux-tui")
+' END IF
+' NEXT
END WITH
+ 'FrmLilo.cbDefBoot.Add("Linux-tui")
ME.iVlTag = FrmLilo.TabStrip1.Index - 1
END IF
NEXT
@@ -452,7 +469,12 @@
PUBLIC SUB VlCliOption_click()
DIM tb AS TextBox
- bVlCliOption = LAST.value
+ 'bVlCliOption = LAST
+ IF LAST.value = TRUE THEN
+ bVlCliOption = TRUE
+ ELSE
+ bVlCliOption = FALSE
+ END IF
FOR EACH tb IN ME.txtNames
IF tb.tag = LAST.tag THEN
@@ -489,6 +511,7 @@
PUBLIC SUB NameBox_keyrelease()
LAST.text = Replace(LAST.text, " ", "")
+ 'FrmLilo.TabStrip1.text = LAST.text
ME.list_boot_options
|
