Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r379 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-08 20:02:24
|
Author: M0...@gm...
Date: Mon Dec 8 11:42:11 2008
New Revision: 379
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/FMain.class
branches/iVL/FrmDone.class
branches/iVL/FrmImportAccts.class
branches/iVL/FrmLangSel.class
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmNetConf.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmZoneSet.class
branches/iVL/MdlResetSettings.module
branches/iVL/installer.gambas
Log:
- Fixed debugging references to /etc/skel and user.home in user import
module
- Fixed some reverse navigation after installation is complete.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/.project
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vlmaster/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,107 +18,95 @@
msgid "Restart"
msgstr ""
-#: FMain.class:229
-msgid "Please select a default operating system to boot before proceeding"
-msgstr ""
-
-#: FMain.class:230
-msgid "Select an entry from this list"
-msgstr ""
-
-#: FMain.class:238
-msgid "Skipping boot loaded setup"
-msgstr ""
-
-#: FMain.class:251
-msgid "Passwords do not match. Please enter the same password twice"
+#: FMain.class:363
+msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:266
-msgid "You have not created any user accounts for this system yet. There
is not enough information"
+#: FMain.class:365
+msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:266
-msgid "to create an account here. It is recommended that you create at
least one."
+#: FMain.class:365
+msgid "This may take a while ..."
msgstr ""
-#: FMain.class:266
-msgid "Would you like to continue anyway?"
+#: FMain.class:385
+msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:266
-msgid "Yes"
+#: FMain.class:447
+msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:266
-msgid "No"
+#: FMain.class:448
+msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:284
-msgid "Please specify a hostname for this computer"
+#: FMain.class:457
+msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:288
-msgid "Please specify the domain this computer belongs to"
+#: FMain.class:483
+msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:303
-msgid "VectorLinux will now try to detect and configure your graphics
hardware."
+#: FMain.class:499
+msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FMain.class:303
-msgid "Your screen may flicker or go blank for a few seconds during this
process."
+#: FMain.class:504
+msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:366
-msgid "Please wait while setup attampts to run the partitioning utility"
+#: FMain.class:517
+msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:368
-msgid "Please wait while setup analyses your current partition setup."
+#: FMain.class:517
+msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:368
-msgid "This may take a while ..."
+#: FMain.class:517
+msgid "Yes"
msgstr ""
-#: FMain.class:388
-msgid "You must select a \"/\" partition. This is the target where the
system will install to"
+#: FMain.class:517
+msgid "No"
msgstr ""
-#: FMain.class:460
-msgid "Skipping boot loader setup"
+#: FMain.class:535
+msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:486
-msgid "Skipping lilo setup"
+#: FMain.class:535
+msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:502
-msgid "Please enter the root password. For your security purposes, do not
leave this blank"
+#: FMain.class:535
+msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:520
-msgid "Setup has detected existing directories in the partition you
selected for /home."
+#: FMain.class:553
+msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:520
-msgid "Would you like to import these user accounts into your new
Operating System"
+#: FMain.class:557
+msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:823
+#: FMain.class:811
msgid "Back"
msgstr ""
-#: FMain.class:834
+#: FMain.class:822
msgid "Exit Installation"
msgstr ""
-#: FMain.class:845
+#: FMain.class:833
msgid "Next"
msgstr ""
-#: FMain.class:859
+#: FMain.class:847
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /home/vlmaster/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -38,15 +38,15 @@
msgid "Choose your optional components to install."
msgstr ""
-#: FrmPkgSel.class:200
+#: FrmPkgSel.class:197
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:210
+#: FrmPkgSel.class:207
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:215
+#: FrmPkgSel.class:212
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlCore.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlDiskPart.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPartSel.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSetup.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /home/vlmaster/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 Mon Dec 8 11:42:11 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/vlmaster/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Dec 8 11:42:11 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.16
+Version=0.1.12
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -12,12 +12,12 @@
Library=gb.gtk.ext
Description=GUI installer for Vector linux
Authors=M0E-lnx\nuelsk8s
+Arguments=""
TabSize=2
Translate=1
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Dec 8 11:42:11 2008
@@ -210,124 +210,121 @@
END IF
- IF Application.Args[1] = "-C" THEN
- ' navigation for configuration
- SELECT CASE FrmCurr.Name
- CASE "FrmPartSel"
- MdlPartSel.SET_LINUX_PARTITION_TYPES()
- frmNext = FrmLiloSetup
- IF ERROR THEN Message.Error(Error.Where & "<br>" &
Error.Text)
- CASE "FrmInstallSys"
- frmNext = FrmLiloSetup
- CASE "FrmLiloSetup"
-
- IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
- IF FrmLiloSetup.cbBootDefault.Text = "" THEN '
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)
- FMain.btnext.Enabled = TRUE
- 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
-
-
- frmNext.Reparent(FrmCurr.Parent)
- frmNext.Show
+ ''' IF Application.Args[1] = "-C" THEN
+' ' ' ' navigation for configuration
+' ' ' SELECT CASE FrmCurr.Name
+' ' ' CASE "FrmPartSel"
+' ' ' MdlPartSel.SET_LINUX_PARTITION_TYPES()
+' ' ' frmNext = FrmLiloSetup
+' ' ' IF ERROR THEN Message.Error(Error.Where & "<br>" &
Error.Text)
+' ' ' CASE "FrmInstallSys"
+' ' ' frmNext = FrmLiloSetup
+' ' ' CASE "FrmLiloSetup"
+' ' '
+' ' ' IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
+' ' ' IF FrmLiloSetup.cbBootDefault.Text = "" THEN
+' ' ' Message.Warning(("Please select a default operating
system to boot before proceeding"))
+' ' ' Balloon.Info(("Select an entry from this list"),
FrmLiloSetup.cbBootDefault)
+' ' ' FMain.btnext.Enabled = TRUE
+' ' ' 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 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
+' ' '
+' ' '
+' ' ' frmNext.Reparent(FrmCurr.Parent)
+' ' ' frmNext.Show
- ELSE
+ '''ELSE
IF ERROR THEN Message(Error.Where & "<br>" & Error.Text)
@@ -623,7 +620,7 @@
END IF
END IF
-END IF
+'''END IF
tvPlan.Refresh()
ClsGlobal.sBackNav.Add(FrmCurr)
'FMain.tlStatus.Text = ""
@@ -639,18 +636,7 @@
UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
END IF
- ' ' ' ' '
- ' ' ' ' ' SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) &
("has been installed on your computer. Additional system configuration")
& "<br>" &
- ' ' ' ' ' ("will take place after you reboot your system.Part
of this process must be done in text mode.") & "<br><br>" &
- ' ' ' ' ' ("Would you like to reboot your computer now?"),
("Yes"), ("No"))
- ' ' ' ' ' CASE 1
- ' ' ' ' ' SHELL "shutdown -r now"
- ' ' ' ' ' CASE ELSE
- ' ' ' ' ' RETURN
- ' ' ' ' ' Message.Info(("The VectorLinux installer will now exit.
Enjoy your new operating system"))
- ' ' ' ' ' QUIT ' dirty quit event
- ' ' ' ' ' 'STOP EVENT
- ' ' ' ' ' END SELECT
+
END
@@ -664,7 +650,6 @@
DIM frm AS Form
-
iKey = ClsGlobal.sBackNav.Find(FrmCurr)
IF iKey <> -1 THEN
frm = ClsGlobal.sBackNav[iKey - 1]
@@ -676,6 +661,9 @@
frm.Show
ClsGlobal.sBackNav.Add(frm)
END IF
+
+
+
END
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Mon Dec 8 11:42:11 2008
@@ -69,3 +69,9 @@
END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
+
+END
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Mon Dec 8 11:42:11 2008
@@ -256,3 +256,9 @@
' ME.pbLogin.Picture.Clear
END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
+
+END
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Mon Dec 8 11:42:11 2008
@@ -70,8 +70,6 @@
WITH ME
.tlBanner.Move(8, 4, MdlObjSizer.get_object_width(.tlBanner.text))
.Separator1.Move(8, .tlBanner.top + .tlBanner.Height
- .Separator1.Height, .ClientWidth - (.Separator1.Left * 2))
- '.GridView1.Move(8, .tlBanner.top + .tlBanner.Height + 4)
- '.GridView1.Resize((ME.Width / 3), ME.Height - (.tlBanner.Height * 2))
.lbLangSel.Move(8, .tlBanner.top + .tlBanner.Height + 4)
.lbLangSel.Resize((ME.Width / 3), ME.Height - (.tlBanner.Height * 2))
END WITH
@@ -87,25 +85,14 @@
-' ' ' PUBLIC SUB lbLangSel_KeyPress()
-' ' '
-' ' ' DIM i AS Integer
-' ' ' IF Key.text > "z" OR Key.text < " " THEN RETURN
-' ' ' i = LAST.index
-' ' ' DO
-' ' ' INC i
-' ' ' IF i > LAST.count - 1 THEN i = 0
-' ' ' IF i = LAST.index THEN RETURN
-' ' ' IF LAST[i].text LIKE Key.Text & "*" THEN
-' ' ' LAST.index = i
-' ' ' RETURN
-' ' ' END IF
-' ' ' LOOP
-' ' '
-' ' ' END
-
PUBLIC SUB lblangsel_Click()
+
+END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
END
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Mon Dec 8 11:42:11 2008
@@ -131,3 +131,9 @@
END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
+
+END
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Mon Dec 8 11:42:11 2008
@@ -144,3 +144,10 @@
END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
+
+
+END
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Mon Dec 8 11:42:11 2008
@@ -143,10 +143,7 @@
PUBLIC SUB Form_Hide()
-' IF ClsPkgSel.bCustom = FALSE THEN
-'
-' ' FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
-' END IF
+
END
PUBLIC SUB Form_Show()
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Mon Dec 8 11:42:11 2008
@@ -82,13 +82,14 @@
END
PUBLIC SUB Form_Show()
-FMain.FrmCurr = ME
-
- WITH FMain
- .tvPlan["Conf1"].Picture = MdlCore.sDonePic
- .tvPlan["Conf2"].picture = MdlCore.sNowPic
- .tvPlan["Conf2"].Selected = TRUE
- END WITH
+' FMain.FrmCurr = ME
+'
+' WITH FMain
+' .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+' .tvPlan["Conf2"].picture = MdlCore.sNowPic
+' .tvPlan["Conf2"].Selected = TRUE
+' END WITH
+ME.Form_Open()
END
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Mon Dec 8 11:42:11 2008
@@ -96,13 +96,14 @@
PUBLIC SUB Form_Show()
- Fmain.frmcurr = ME
- ME.tlbanner.Text = "<h3>" & ("Timezone configuration") & "</h3>"
- WITH FMain
- .tvPlan["Conf0"].Picture = MdlCore.sDonePic
- .tvPlan["Conf1"].picture = MdlCore.sNowPic
- .tvPlan["Conf1"].Selected = TRUE
- END WITH
-
+ME.Form_Open()
+ ' Fmain.frmcurr = ME
+ ' ME.tlbanner.Text = "<h3>" & ("Timezone configuration") & "</h3>"
+ ' WITH FMain
+ ' .tvPlan["Conf0"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf1"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf1"].Selected = TRUE
+ ' END WITH
+ '
END
Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module (original)
+++ branches/iVL/MdlResetSettings.module Mon Dec 8 11:42:11 2008
@@ -19,12 +19,10 @@
PUBLIC SUB LIST_RESETABLE_SETTINGS()
DIM sFile, sDesc, sSkellPath, stargetPath AS String
DIM i AS Integer
-
- 'ClsGlobal.sTargetMnt = "/"
- 'sSkellPath = ClsGlobal.sTargetMnt &/ "etc" &/ "skel"
- sSkellPath = "/etc/skel"
- stargetPath = User.Home
- 'stargetPath = ClsGlobal.sTargetMnt &/ "home" &/
Trim(FrmImportAccts.cbAccntList.Text)
+
+ sSkellPath = ClsGlobal.sTargetMnt &/ "etc" &/ "skel"
+ stargetPath = ClsGlobal.sTargetMnt &/ "home" &/
Trim(FrmImportAccts.cbAccntList.Text)
+
i = 0
pYes = FrmPkgSel.pYes
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
