Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r302 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-19 18:37:06
|
Author: M0...@gm...
Date: Wed Nov 19 10:34:27 2008
New Revision: 302
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/FrmNetConf.class
branches/iVL/FrmNetConf.form
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
- Fixed bugs in LILO setup step
- Fixed syntax errors in generated lilo.conf
- Optimized Network and Install windows for 800x600 resolutions
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,91 +18,91 @@
msgid "Restart"
msgstr ""
-#: FMain.class:242
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr ""
-
-#: FMain.class:244
-msgid "Please wait while setup analyses your current partition setup."
-msgstr ""
-
-#: FMain.class:244
-msgid "This may take a while ..."
-msgstr ""
-
-#: FMain.class:258
-msgid "You must select a \"/\" partition. This is the target where the
system will install to"
-msgstr ""
-
-#: FMain.class:313
+#: FMain.class:220
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:314
+#: FMain.class:221
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:321
+#: FMain.class:228
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:344
-msgid "Skipping lilo setup"
-msgstr ""
-
-#: FMain.class:358
+#: FMain.class:241
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "Yes"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "No"
msgstr ""
-#: FMain.class:391
+#: FMain.class:274
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:395
+#: FMain.class:278
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:410
+#: FMain.class:293
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:410
+#: FMain.class:293
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:662
+#: FMain.class:352
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr ""
+
+#: FMain.class:354
+msgid "Please wait while setup analyses your current partition setup."
+msgstr ""
+
+#: FMain.class:354
+msgid "This may take a while ..."
+msgstr ""
+
+#: FMain.class:368
+msgid "You must select a \"/\" partition. This is the target where the
system will install to"
+msgstr ""
+
+#: FMain.class:454
+msgid "Skipping lilo setup"
+msgstr ""
+
+#: FMain.class:772
msgid "Back"
msgstr ""
-#: FMain.class:674
+#: FMain.class:784
msgid "Exit Installation"
msgstr ""
-#: FMain.class:686
+#: FMain.class:796
msgid "Next"
msgstr ""
-#: FMain.class:700
+#: FMain.class:810
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Nov 19 10:34:27 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 19 10:34:27 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.172
+Version=0.0.192
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Nov 19 10:34:27 2008
@@ -1,2 +1,3 @@
-- 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.
+- Fixed bugs in LILO setup step
+- Fixed syntax errors in generated lilo.conf
+- Optimized Network and Install windows for 800x600 resolutions
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Nov 19 10:34:27 2008
@@ -202,15 +202,125 @@
END IF
- IF Application.Args[1] = "-C" THEN
+ IF Application.Args[1] = "-C" THEN
' navigation for configuration
SELECT CASE FrmCurr.Name
CASE "FrmPartSel"
- frmNext = FrmLilo
+ frmNext = FrmLiloSetup
+
+ CASE FrmInstallSys
+ frmNext = FrmLiloSetup
+ CASE "FrmLiloSetup"
+
+ IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
+ IF FrmLiloSetup.cbBootDefault.Te ' FMain.tvPlan["Inst0"].Picture
= MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3xt = "" THEN
+ Message.Warning(("Please select a default operating system
to boot before proceeding"))
+ Balloon.Info(("Select an entry from this list"),
FrmLiloSetup.cbBootDefault)
+ STOP EVENT
+ RETURN
+ END IF
+ 'Run the setup
+ MdlLilo.TRIGGER_LILO_SETUP()
+ ELSE
+ FrmLiloSetup.tlBanner.Text = "<b>" & ("Skipping boot loaded setup")
& "</b>"
+ END IF
+ SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
+ frmNext = FrmZoneSet
+
+ CASE "FrmZoneSet"
+ 'MdlZoneSet.TIME_ZONES()
+ MdlZoneSet.SET_ZONE(Trim(FrmZoneSet.lbTmZone.text))
+ MdlZoneSet.WRITE_CONF()
+ frmNext = FrmRootPass
+
+ CASE "FrmRootPass"
+ IF FrmRootPass.tbPasswd1.Text <> FrmRootPass.tbPasswd2.Text THEN
+ Balloon.Error(("Passwords do not match. Please enter the same
password twice"), FrmRootPass.tbPasswd2)
+ FrmRootPass.tbPasswd2.SelectAll
+ RETURN
+ END IF
+ FrmRootPass.Button1_Click()
+ frmNext = FrmUserAdd
+
+
+ CASE "FrmUserAdd"
+
+ IF MdlUsrAdd.iUsrAccts = 0 THEN
+ 'IF FrmUserAdd.tbUsername.text = "" THEN
+ IF MdlUsrAdd.CREATE_USER_ON_A_SNAP() = FALSE THEN
+ SELECT CASE Message.Question(("You have not created any user
accounts for this system yet. There is not enough information") & "<br>" &
+ ("to create an account here. It is recommended that you create
at least one.") & "<br>" &
+ "<br>" & ("Would you like to continue anyway?"), ("Yes"),
("No"))
+
+ CASE 2
+ RETURN
+ END SELECT
+ ELSE IF MdlUsrAdd.CREATE_USER_ON_A_SNAP() = TRUE THEN
+ FrmUserAdd.Button1_Click()
+ END IF
+ END IF
+
+ SHELL "cp /mnt/target/etc/modules.conf >/etc/modules.conf" WAIT
+ SHELL "ifconfig eth0 up" WAIT
+ SHELL "chmod 700 /mnt/target/home/*"
+ frmNext = FrmNetConf
+
+
+ CASE "FrmNetConf"
+ IF Trim(FrmNetConf.txtHostName.Text) = "" THEN
+ Balloon.Error(("Please specify a hostname for this computer"),
FrmNetConf.txtHostName)
+ RETURN
+ END IF
+ IF Trim(FrmNetConf.tbDomain.Text) = "" THEN
+ Balloon.Error(("Please specify the domain this computer belongs
to"), FrmNetConf.tbDomain)
+ RETURN
+ END IF
+
+ IF MdlNetConf.ifaceCnt = 0 THEN
+ MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.Text,
FrmNetConf.tbDomain.Text)
+ ELSE ' IF MdlNetConf > 0 THEN
+ MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text,
FrmNetConf.tbDomain.Text)
+ MdlNetConf.SET_DNS_ADDRESSES()
+ MdlNetConf.WRITE_INET()
+ END IF
+
+
+ ' CONFIGURE X QUIETLY HERE
+ Message.Warning(("VectorLinux will now try to detect and
configure your graphics hardware.") & "<br>" &
+ ("Your screen may flicker or go blank for a few seconds during
this process."))
+
+ MdlXconf.QUIET_XORG_CONFIGURATION()
+
+ frmNext = FrmDone
+
+ CASE "FrmDone"
+ 'offer to reboot here
+
+ SHELL ["sed", "-i", "'/^$/d'", "/root/gui.log"] WAIT
+ SHELL ["sed", "-i", "'/^(installer/d'", "/root/gui.log"] WAIT
+ COPY "/root/gui.log" TO "/mnt/target/var/log/setup/gui.log"
+ ME.END_INSTALLER()
+ 'frmNext = FrmAlsaConf
+' frmNext = FrmLilo ' this is already done
+
+ CASE "FrmAlsaConf"
+
+ frmNext = FrmXconf
+
END SELECT
- 'FrmCurr.Hide
- frmNext.Reparent(FrmCurr.Parent)
+ ' ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+ ' .tvPlan["Conf4"].Selected = TRUE
+ ' END WITH FrmCurr.Hide
+ ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+ ' .tvPlan["Conf4"].Selected = TRUE
+ ' END WITH
+ frmNext.Reparent(FrmCurr.Parent)
frmNext.Show
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Nov 19 10:34:27 2008
@@ -48,12 +48,16 @@
FMain.FrmCurr = ME
-' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
+ ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
+' ME.tlCurrPkg2.Text
+ ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
' FMain.tvPlan["Inst1"].Selected = TRUE
- 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
- ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
- ME.tlCurrPkg2.Text = "<b>" & tlCurrPkg2.Text & "</b>"
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3= "<b>" &
tlCurrPkg2.Text & "</b>"
ME.tlCurrStepLbl.Text = ("Current Step")
@@ -72,7 +76,13 @@
FrmCredits.Reparent(ME.embCredits)
FrmCredits.Show
+ ' temporaryli allow this
+ 'FMain.btnext.Enabled = TRUE
+ ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Wed Nov 19 10:34:27 2008
@@ -7,11 +7,13 @@
{ HPanel1 HPanel
MoveScaled(1,1,94,10)
{ tlBanner TextLabel
- MoveScaled(0,0,63,7)
+ MoveScaled(0,0,63,5)
+ Expand = True
Text = ("Vectorlinux is currently being installed to your system...
Please wait")
}
{ hrsep Separator
- MoveScaled(0,6,48,2)
+ MoveScaled(0,5,48,2)
+ Expand = True
}
}
{ HPanel2 HPanel
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Wed Nov 19 10:34:27 2008
@@ -26,8 +26,16 @@
' FMain.FrmCurr = ME
FMain.tvPlan["Conf0"].Selected = TRUE
FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
- FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
-
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ ' ' '
+ ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
+ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
+ ' ' ' FMain.tvPlan[" Conf0 "].Selected = TRUE"
+ ' ' ' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
+ ' ' ' FMain.tvPlan["Inst1"].Picture = MdlCore.sDoneP>"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
ME.list_video_modes()
FMain.FrmCurr = ME
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Wed Nov 19 10:34:27 2008
@@ -7,9 +7,9 @@
{ HPanel1 HPanel
MoveScaled(1,1,71,6)
{ tlBanner TextLabel
- MoveScaled(1,1,21,3)
+ MoveScaled(1,1,30,3)
Expand = True
- Text = ("Bootloaded Setup")
+ Text = ("Boot Manager Configuration")
}
{ Separator1 Separator
MoveScaled(2,4,22,1)
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Wed Nov 19 10:34:27 2008
@@ -52,7 +52,7 @@
.tvPlan["Conf4"].Picture = MdlCore.sNowPic
.tvPlan["Conf4"].Selected = TRUE
END WITH
-
+
ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()
MdlNetConf.LIST_NETWORK_INTERFACES()
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Wed Nov 19 10:34:27 2008
@@ -1,11 +1,11 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,114,74)
+ MoveScaled(0,0,91,74)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
- MoveScaled(1,1,94,7)
+ MoveScaled(1,1,86,7)
{ tlBanner TextLabel
MoveScaled(1,0,45,4)
Expand = True
@@ -18,7 +18,7 @@
}
}
{ HPanel2 HPanel
- MoveScaled(1,8,92,4)
+ MoveScaled(1,8,87,4)
{ tlHostNameLbl TextLabel
MoveScaled(0,0,15,3)
Text = ("Computer Name")
@@ -29,17 +29,13 @@
Text = ("")
MaxLength = 24
}
- { Panel3 Panel
- MoveScaled(45,0,4,3)
- Arrangement = Arrange.Horizontal
- }
{ tlDomainName TextLabel
- MoveScaled(49,0,9,3)
+ MoveScaled(45,0,9,3)
Text = ("Domain")
Alignment = Align.Normal
}
{ tbDomain TextBox
- MoveScaled(59,0,29,3)
+ MoveScaled(56,0,29,3)
Text = ("")
MaxLength = 24
}
@@ -52,10 +48,10 @@
}
}
{ Panel2 Panel
- MoveScaled(1,16,93,6)
+ MoveScaled(1,16,80,6)
{ txtPrimaryDNS TextBox txtManDNSBoxes
Name = "txtPrimaryDNS"
- MoveScaled(26,0,18.125,3)
+ MoveScaled(26,0,18,3)
Enabled = False
Text = ("192.168.1.254")
}
@@ -66,7 +62,7 @@
}
{ txtSecDNS TextBox txtManDNSBoxes
Name = "txtSecDNS"
- MoveScaled(26,3,18.125,3)
+ MoveScaled(26,3,18,3)
Enabled = False
Text = ("")
}
@@ -77,17 +73,14 @@
}
}
{ HBox1 HBox
- MoveScaled(1,24,94,1)
+ MoveScaled(1,24,84,1)
{ Separator1 Separator
MoveScaled(3,0,35,1)
Expand = True
}
}
- { HPanel5 HPanel
- MoveScaled(1,26,95,1)
- }
{ Panel1 Panel
- MoveScaled(1,29,105,42)
+ MoveScaled(1,27,88,42)
Expand = True
Arrangement = Arrange.Horizontal
{ TSNetDevices TabStrip
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 19 10:34:27 2008
@@ -54,7 +54,7 @@
END SELECT
sOutput = "# VESA framebuffer console @ 1024x768x64k \n" &
-"vga = " & sVga & "<br>" &
+"vga = " & sVga & "\n" &
"# Normal VGA console n" &
"#vga = normal \n" &
"#VESA framebuffer console @ 1024 x768x64k \n" &
@@ -164,18 +164,18 @@
NEXT
- sSection = "image = " & sBootPath &/ sKernel & "<br>" &
- "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "<br>" &
- "label = " & sLabel & "<br>" &
- "append = " & sAppend & "<br>" &
- "initrd = " & sBootPath &/ sInitrd & "<br>" &
- "read only" & "<br>"
+ sSection = "image = " & sBootPath &/ sKernel & "\n" &
+ "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
+ "label = " & sLabel & "\n" &
+ "append = \"" & sAppend & "\"" & "\n" &
+ "initrd = " & sBootPath &/ sInitrd & "\n" &
+ "read only" & "\n"
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
sClisection = sSection
sClisection = Replace(sClisection, "append = " &
sAppend, "append = 2 splash=verbose vga=791")
- sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "<br>"
+ sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "\n"
ELSE
sClisection = ""
END IF
@@ -189,9 +189,9 @@
IF tb.Tag = chbox.tag THEN
sTag = Right(tb.Tag, Len(tb.Tag) -
InStr(tb.Tag, "/") + 1)
- sWinSection = "other = " & sTag & "<br>"
& 'Right(tb.tag, Len(tb.Tag) - InStr(tb.Tag, "/")) & "<br>" &
- "label = " & tb.Text & "<br>" &
- "table = " & Left(sTag, 8) & "<br>"
+ sWinSection = "other = " & sTag & "\n"
& 'Right(tb.tag, Len(tb.Tag) - InStr(tb.Tag, "/")) & "<br>" &
+ "label = " & tb.Text & "\n" &
+ "table = " & Left(sTag, 8) & "\n"
ELSE
sWinSection = ""
END IF
@@ -203,7 +203,7 @@
'Message(sSection)
- sOsEntries = sOsEntries & "<br>" & sSection & "<br>" &
sClisection & "<br>" & sWinSection
+ sOsEntries = sOsEntries & "\n" & sSection & "\n" & sClisection
& "\n" & sWinSection
' IF sClisection THEN Message(sClisection)
'sSection = "image=" & "boot" &/ tb.Text
@@ -668,37 +668,43 @@
END
-
-
-PUBLIC SUB OsNameTxtBox_KeyPress()
-
- DIM sOld AS String
- DIM iKey AS Integer
- sOld = LAST.Text
- iKey = FrmLiloSetup.cbBootDefault.Find(sOld)
-
- IF iKey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
-
- 'FrmLiloSetup.tsLIloTabs.Text = LAST.text
-
- 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
- 'IF FrmLiloSetup.cbBootDefault.Find(sOld) <> -1 THEN
FrmLiloSetup.cbBootDefault.Remove
-
- 'Message(sOld)
+PUBLIC SUB OsNameTxtBox_LostFocus()
+ FrmLiloSetup.cbBootDefault.Clear()
+ ME.LIST_DEFAULT_BOOT_OPTIONS()
END
-PUBLIC SUB OsNameTxtBox_KeyRelease()
- DIM iKey AS Integer
-
- iKey = FrmLiloSetup.cbBootDefault.Find(Left(LAST.Text, Len(LAST.text) -
1))
- IF ikey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
- FrmLiloSetup.cbBootDefault.Add(LAST.text)
-
- FrmLiloSetup.tsLIloTabs.Text = LAST.text
- 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
-
-
-
-END
+
+' PUBLIC SUB OsNameTxtBox_KeyPress()
+'
+' DIM sOld AS String
+' DIM iKey AS Integer
+' 'sOld = Left(LAST.Text, Len(LAST.text) - 1)
+' 'iKey = FrmLiloSetup.cbBootDefault.Find(sOld)
+'
+' 'IF iKey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
+' 'FrmLiloSetup.cbBootDefault.Clear()
+' 'ME.LIST_DEFAULT_BOOT_OPTIONS
+' 'FrmLiloSetup.tsLIloTabs.Text = LAST.text
+' 'IF FrmLiloSetup.cbBootDefault.Find(sOld) <> -1 THEN
FrmLiloSetup.cbBootDefault.Remove(FrmLiloSetup.cbBootDefault.Find(sOld))
+' 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
+' 'Message(sOld)
+'
+'
+' END
+
+ PUBLIC SUB OsNameTxtBox_KeyRelease()
+' DIM iKey AS Integer
+'
+' iKey = FrmLiloSetup.cbBootDefault.Find(Left(LAST.Text, Len(LAST.text)
- 1))
+' IF ikey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
+' FrmLiloSetup.cbBootDefault.Add(LAST.text)
+FrmLiloSetup.cbBootDefault.Clear()
+ME.LIST_DEFAULT_BOOT_OPTIONS()
+ FrmLiloSetup.tsLIloTabs.Text = LAST.text
+' 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
+'
+'
+'
+ END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
