From: <cod...@go...> - 2008-10-01 19:58:04
|
Author: m0e.lnx Date: Wed Oct 1 12:56:12 2008 New Revision: 197 Added: branches/iVL/DevLog branches/iVL/DevNotes 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/FrmLicense.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/FMain.class branches/iVL/FrmLilo.class branches/iVL/FrmLilo.form branches/iVL/FrmNetConf.class branches/iVL/FrmRootPass.class branches/iVL/FrmRootPass.form branches/iVL/MdlConfLilo.module branches/iVL/MdlInstallSys.module branches/iVL/MdlNetConf.module Log: - Fixed combobox sizes in lilo setup form. - Moved binding mount of /proc and /dev to it's own sub in MdlConfLIlo instead of the forms open() event This sub will get executed only if the user chooses to install/setup lilo and right before setting it up. - FrmRootPass Eliminated message "Password is set". Will only display error message if passwords do not match. - Fixed problem with tabstrip width in netconf window Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Wed Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/.project +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/ClsGlobal.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/ClsPartSel.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/ClsWinDrives.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FMain.class +# /home/remote/area-51/projects/installer/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -30,27 +30,27 @@ msgid "You must select a \"/\" partition. This is the target where the system will install to" msgstr "" -#: FMain.class:300 +#: FMain.class:301 msgid "Skipping lilo setup" msgstr "" -#: FMain.class:404 +#: FMain.class:405 msgid "Process Overview" msgstr "" -#: FMain.class:424 +#: FMain.class:425 msgid "Next" msgstr "" -#: FMain.class:430 +#: FMain.class:431 msgid "Back" msgstr "" -#: FMain.class:436 +#: FMain.class:437 msgid "Exit Installation" msgstr "" -#: FMain.class:452 +#: FMain.class:453 msgid "Button1" msgstr "" Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Wed Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmDiskPart.class +# /home/remote/area-51/projects/installer/FrmDiskPart.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmLicense.pot ============================================================================== --- branches/iVL/.lang/FrmLicense.pot (original) +++ branches/iVL/.lang/FrmLicense.pot Wed Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmLicense.class +# /home/remote/area-51/projects/installer/FrmLicense.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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmPartScheme.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmPartSel.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmPkgSel.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmSelISO.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmSummary.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/FrmWinDrives.class +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlCore.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlDiskPart.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlObjSizer.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlPartSel.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlPkgSel.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlSetup.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlSummarize.module +# /home/remote/area-51/projects/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 Oct 1 12:56:12 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/installer/MdlWinDrives.module +# /home/remote/area-51/projects/installer/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/DevLog ============================================================================== --- (empty file) +++ branches/iVL/DevLog Wed Oct 1 12:56:12 2008 @@ -0,0 +1,6 @@ +- Fixed combobox sizes in lilo setup form. +- Moved binding mount of /proc and /dev to it's own sub in MdlConfLIlo instead of the forms open() event + This sub will get executed only if the user chooses to install/setup lilo and right before setting it up. +- FrmRootPass Eliminated message "Password is set". Will only display error message if passwords do not match. +- Fixed problem with tabstrip width in netconf window + Added: branches/iVL/DevNotes ============================================================================== --- (empty file) +++ branches/iVL/DevNotes Wed Oct 1 12:56:12 2008 @@ -0,0 +1,20 @@ +ISSUES / PROBLEMS +* Embedding the vasmCC useradd.gambas module results in the installer trying to create user accounts + on the running environment, not the resulting installation - THIS IS VERY BAD +* Positioning of the following objects in frmNetconf must be fixed to keep keep them from overlaping their lables to the left + - combobox to select config method + - textboxes for static IP settings. + \- wireless settings section must be moved to the right if this happens + + + + + + +LOCALIZATION NOTES +How to set localizations for different window managers + +GNOME - set LANG and LC_CALL +XFCE4 - set LANG and LC_CALL +LXDE - set LANG and LC_CALL (Translations are limited for lxde) +KDE - set LANG and LC_CALL. Also set KDE_LANG to the desired language. Modified: branches/iVL/FMain.class ============================================================================== --- branches/iVL/FMain.class (original) +++ branches/iVL/FMain.class Wed Oct 1 12:56:12 2008 @@ -291,7 +291,8 @@ IF FrmLilo.YNLiloBox.Value = FALSE THEN ' Now that lilo has been setup, write it to the config - MdlConfLilo.GENERATE_LILO_DOT_CONF + MdlConfLilo.PERFORM_BINDING() + MdlConfLilo.GENERATE_LILO_DOT_CONF() MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS() MdlConfLilo.WRITE_LILO_DOT_CONF() MdlConfLilo.EXECUTE_LILO() Modified: branches/iVL/FrmLilo.class ============================================================================== --- branches/iVL/FrmLilo.class (original) +++ branches/iVL/FrmLilo.class Wed Oct 1 12:56:12 2008 @@ -19,7 +19,7 @@ PUBLIC sLiloTrgt AS String PUBLIC SUB Form_Open() - DIM sOut AS String + ME.tlBanner.Text = "<h3>" & tlBanner.text & "</h3>" 'ClsPartSel.sRoot = "/dev/sdb1" ' @@ -37,17 +37,7 @@ ME.TabStrip1.Index = MdlLiloOsList.iVltag MdlLiloOsList.bVlCliOption = TRUE ' ' ' -SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT -SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT - -SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT -SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT - 'SHELL "touch " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" -sOut = "#!/bin/bash \n" & -"/sbin/config-stage1 gui-installer" -File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut) -'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" -SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" +' 'ME.Maximized = TRUE @@ -92,6 +82,8 @@ PUBLIC SUB Form_Resize() + DIM cbleft, cbwidth AS Integer + WITH ME .tlTarGet.Alignment = Align.Normal .tlFbMode.Alignment = Align.Normal @@ -102,16 +94,20 @@ .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height * 1.5), MdlObjSizer.get_object_width(.tlTarGet.Text)) .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top, (.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left)) .tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width + 32, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text)) - .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width + 4, .tlFbMode.top, .tlBanner.Width - .FBResolution.Left * 1.30) + + .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width + 4, .tlFbMode.top, .ClientWidth - (.FBResolution.Left + (.FBResolution.Width * 0.75))) + cbleft = .FBResolution.Left + cbwidth = .FBResolution.Width .tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 12, MdlObjSizer.get_object_width(.tlTimeOUt.Text)) .sbTimer.Move(.tlTimeOUt.Left + .tlTimeOUt.Width + 4, .tlTimeOUt.top, 60) .tlTimoutSec.Move(.sbTimer.Left + .sbTimer.Width + 4, .sbTimer.top, MdlObjSizer.get_object_width(.tlTimoutSec.text)) .tlDefBoot.Move(.tlFbMode.Left, .sbTimer.top, MdlObjSizer.get_object_width(.tlDefBoot.text), 27) - .cbDefBoot.Move(.tlDefBoot.Left + .tlDefBoot.Width + 4, .tlDefBoot.top, .tlBanner.Width - .cbDefBoot.Left * 1.3) + + .cbDefBoot.Move(cbleft, .tlDefBoot.top, cbwidth, 21) .tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height + 12, .tlBanner.Width) - .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height * 6)) + .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height + 8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height * 8)) END WITH Modified: branches/iVL/FrmLilo.form ============================================================================== --- branches/iVL/FrmLilo.form (original) +++ branches/iVL/FrmLilo.form Wed Oct 1 12:56:12 2008 @@ -1,7 +1,7 @@ # Gambas Form File 2.0 { Form Form - MoveScaled(0,0,74,69) + MoveScaled(0,0,86,69) Text = ("") { tlBanner TextLabel MoveScaled(1,1,58,4) Modified: branches/iVL/FrmNetConf.class ============================================================================== --- branches/iVL/FrmNetConf.class (original) +++ branches/iVL/FrmNetConf.class Wed Oct 1 12:56:12 2008 @@ -31,8 +31,10 @@ PUBLIC SUB Form_Open() + DIM cb AS ComboBox FMain.FrmCurr = ME + WITH FMain .tvPlan["Conf3"].Picture = MdlCore.sDonePic .tvPlan["Conf4"].Picture = MdlCore.sNowPic @@ -47,7 +49,10 @@ IF ERROR THEN Message(Error.text & "\n" & Error.where) - + WAIT + FOR EACH cb IN MdlNetConf.objCombos + cb.Refresh + NEXT END @@ -74,9 +79,11 @@ .tlSecDNS.Move(.tlPrimaryDNS.Left, .tlPrimaryDNS.top + .tlPrimaryDNS.Height + 4, MdlObjSizer.get_object_width(.tlSecDNS.text)) .txtSecDNS.Move(itxtboxleft, .tlSecDNS.top) ' now move the frame - .frmNetDevices.Move(.tlSecDNS.Left, .tlSecDNS.top + .tlSecDNS.Height + 8) - .frmNetDevices.Width = .ClientWidth - (.frmNetDevices.Left * 2) - .TSNetDevices.Width = .ClientWidth - (.frmNetDevices.left * 5) + .frmNetDevices.Move(.tlSecDNS.Left, .tlSecDNS.top + .tlSecDNS.Height + 8, .ClientWidth - (.frmNetDevices.Left * 2), .ClientH - .frmNetDevices.top - 32) + + .TSNetDevices.Move(8, 20, .frmNetDevices.Width - (.TSNetDevices.Left * 2)) + .TSNetDevices.Height = .frmNetDevices.Height - (.TSNetDevices.y * 2) + END WITH END Modified: branches/iVL/FrmRootPass.class ============================================================================== --- branches/iVL/FrmRootPass.class (original) +++ branches/iVL/FrmRootPass.class Wed Oct 1 12:56:12 2008 @@ -35,13 +35,14 @@ IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN 'Message("chroot /mnt/target /sbin/passwdx root " & ME.tbPasswd1.Text) SHELL "chroot /mnt/target /sbin/passwdx root " & ME.tbPasswd1.Text WAIT - Message("Root password Set.") + 'Message("Root password Set.") ME.tbPasswd1.Clear ME.tbPasswd2.Clear ELSE - Message("Passwords do not match") + Message.Error(("Passwords do not match. Please enter the same password twice for accuracy.")) ME.tbPasswd1.Clear ME.tbPasswd2.Clear + ME.tbPasswd1.SetFocus ENDIF ENDIF END @@ -52,7 +53,7 @@ WITH ME .tlbanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2)) - .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - .hrSep.Height * 2, .tlBanner.Width) + .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width) .Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height * 4) .tlAboutRoot.Move(4, 24, .Frame1.Width - (.tlAboutRoot.Left * 2), .Frame1.Height - .tlAboutRoot.top - 8) .tlPass1.Move(.Frame1.left, .Frame1.top + .Frame1.Height + 24, MdlObjSizer.get_object_width(.tlPass1.text), 21) @@ -62,8 +63,8 @@ ELSE itxtLeft = .tlPass2.Left + .tlPass2.Width + 8 END IF - .tbPasswd1.Move(itxtLeft, .tlPass1.top, 160, 21) - .tbPasswd2.Move(itxtLeft, .tlPass2.top, 160, 21) + .tbPasswd1.Move(itxtLeft, .tlPass1.top, 200, 21) + .tbPasswd2.Move(itxtLeft, .tlPass2.top, 200, 21) END WITH Modified: branches/iVL/FrmRootPass.form ============================================================================== --- branches/iVL/FrmRootPass.form (original) +++ branches/iVL/FrmRootPass.form Wed Oct 1 12:56:12 2008 @@ -12,11 +12,11 @@ } } { tlBanner TextLabel - MoveScaled(2,1,62,3.4286) + MoveScaled(2,1,62,3.3333) Text = ("System Administrator") } { tbPasswd2 TextBox - MoveScaled(31,37,21,3.4286) + MoveScaled(31,37,21,3.3333) Text = ("") Password = True } @@ -25,7 +25,7 @@ Text = ("Re-Enter Password") } { tbPasswd1 TextBox - MoveScaled(29,31,21,3.4286) + MoveScaled(29,31,21,3.3333) Text = ("") Password = True } @@ -38,6 +38,6 @@ Text = ("Set Password") } { hrSep Separator - MoveScaled(39,5,15,1) + MoveScaled(2,5,15,1) } } Modified: branches/iVL/MdlConfLilo.module ============================================================================== --- branches/iVL/MdlConfLilo.module (original) +++ branches/iVL/MdlConfLilo.module Wed Oct 1 12:56:12 2008 @@ -282,3 +282,21 @@ END +PUBLIC SUB PERFORM_BINDING() + + DIM sOut AS String + +SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT +SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT + +SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT +SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT + 'SHELL "touch " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" +sOut = "#!/bin/bash \n" & +"/sbin/config-stage1 gui-installer" +File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut) +'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" +SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" + +END + Modified: branches/iVL/MdlInstallSys.module ============================================================================== --- branches/iVL/MdlInstallSys.module (original) +++ branches/iVL/MdlInstallSys.module Wed Oct 1 12:56:12 2008 @@ -355,8 +355,8 @@ FrmInstallSys.pbInstallProg.Value = 1 FrmInstallSys.pbInstallProg2.Value = 1 'Message.Info("Vectorlinux is now installed in your system. Please click next to configure it.") - FrmInstallSys.tlBanner.Text = ("Vectorlinux is now installed in your system. Please click") & Space(1) & FMain.btnext.text & Space(1) & ("to configure it.") - FrmInstallSys.tlCurrPkg.Text = ("Packages have been installed in your system. Please click") & Space(1) & FMain.btnext.text & Space(1) & ("to configure it.") + FrmInstallSys.tlBanner.Text = "<h3>" & ("Vectorlinux is now installed in your system. Please click") & Space(1) & FMain.btnext.text & Space(1) & ("to configure it.") & "</h3>" + FrmInstallSys.tlCurrPkg.Text = "<h3>" & ("Packages have been installed in your system. Please click") & Space(1) & FMain.btnext.text & Space(1) & ("to configure it.") & "</h3>" WITH FMain .btQuit.Enabled = TRUE .btQuit.ForeColor = Color.Black Modified: branches/iVL/MdlNetConf.module ============================================================================== --- branches/iVL/MdlNetConf.module (original) +++ branches/iVL/MdlNetConf.module Wed Oct 1 12:56:12 2008 @@ -28,6 +28,7 @@ PUBLIC objcbWifi AS Object[] PUBLIC objtxtWifiKey AS Object[] PUBLIC objcbWifiessid AS Object[] +PUBLIC objIntTypes AS Object[] @@ -66,6 +67,7 @@ objcbWifi = NEW Object[] objtxtWifiKey = NEW Object[] objcbWifiessid = NEW Object[] + objIntTypes = NEW Object[] SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo \"$res\" | tr -s \' \'" TO seths @@ -156,7 +158,7 @@ .ReadOnly = TRUE .tag = sDev END WITH - + objIntTypes.Add(tb) 'add a box here to enable/disable the interface bCb = NEW CheckBox(FrmNetConf.TSNetDevices) AS "bEnableInterface" ' enable/disable interface box WITH bCb @@ -188,8 +190,9 @@ .Height = 21 .ReadOnly = TRUE .list = ["DHCP", "STATIC"] + .tag = sDev - 'y = .top + .Height + 4 + '.ReadOnly = TRUE 'itop = y icbleft = .Left END WITH @@ -274,6 +277,26 @@ .Move(x + cb.Width + 12, y - .Height - 4) .Alignment = Align.Normal END WITH + + tl = NEW TextLabel(FrmNetConf.TSNetDevices) + WITH tl + + .Move(12, y + 8) + IF sType = ("Wired") THEN + .Width = .Parent.Width - (.left * 2) + ELSE + .Width = 250 + END IF + .text = "<b>" & ("Dynamic Host Control Protocol") & "</b><br>" & ("Automatic settings via DHCP.") & "<br><br>" & ("This will work if you use a cable or DSL modem on a home network.") & "<br>" & ("If in doubt, choose this option") + .Adjust + '.border = Border.Raised + .Height = 21 * 6 + .Tag = LAST.tag + + + + END WITH + END IF @@ -297,23 +320,39 @@ IF ERROR THEN Message(Error.text & gb.newline & Error.where) KILL "/tmp/iwdump" + END + + + PUBLIC SUB MethodSel_Click() DIM frmDetails AS Frame DIM txtbox AS TextBox DIM cb AS CheckBox DIM tl AS TextLabel - DIM itxtleft, itxtwidth, imandnsleft, imandnstxtleft AS Integer + DIM itxtleft, itxtwidth, imandnsleft, imandnstxtleft, itlwidth AS Integer IF LAST.text = "STATIC" THEN frmDetails = NEW Frame(FrmNetConf.TSNetDevices) AS "STaticDetails" WITH frmDetails .Move(ileft, itop + 8) .text = (" Static IP Address Settings ") - .Width = 300 '.Parent.Width - (.left * 2.5) + FOR EACH txtbox IN objIntTypes + IF txtbox.tag = LAST.tag THEN + IF txtbox.text = ("Wired") THEN + .Width = FrmNetConf.TSNetDevices.Width - (ileft * 3) + ELSE + .Width = 300 + END IF + END IF + NEXT + + + '.Width = 300 '.Parent.Width - (.left * 2.5) .Height = 130 .tag = LAST.tag + END WITH objFrames.Add(frmDetails) 'populate the frame for this @@ -399,16 +438,30 @@ NEXT ' create a text label that says the thing will get automatically configured + tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DetailLbl" WITH tl '.Move(LAST.left - (LAST.width / 2), LAST.top + LAST.height + 12) .Move(8, LAST.top + LAST.height + 12) + FOR EACH txtbox IN objIntTypes + IF txtbox.tag = LAST.tag THEN + IF txtbox.text = ("Wired") THEN + itlwidth = FrmNetConf.TSNetDevices.Width - (tl.left * 2) + ELSE + itlwidth = 250 + END IF + END IF + NEXT .text = "<b>" & ("Dynamic Host Control Protocol") & "</b><br>" & ("Automatic settings via DHCP.") & "<br><br>" & ("This will work if you use a cable or DSL modem on a home network.") & "<br>" & ("If in doubt, choose this option") .Adjust .border = Border.Raised - .Width = 230 'MdlObjSizer.get_object_width(.text) - .Height = 21 * 4 + .Width = itlwidth + '.Width = 230 'MdlObjSizer.get_object_width(.text) + .Height = 21 * 6 .Tag = LAST.tag + .Visible = TRUE + .Raise + END WITH objtlDetails.Add(tl) |