From: <cod...@go...> - 2008-09-08 21:28:40
|
Author: M0...@gm... Date: Mon Sep 8 14:26:59 2008 New Revision: 162 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/.project branches/iVL/FMain.class branches/iVL/FrmUserAdd.class branches/iVL/FrmUserAdd.form branches/iVL/MdlLiloOsList.module Log: - Fixed resizing on the user add window - Added code to bypass lilo installation / setup on user request Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/.project +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/ClsGlobal.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/ClsPartSel.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/ClsWinDrives.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FMain.class +# /home/moe/projects/installer/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -14,19 +14,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:328 +#: FMain.class:334 msgid "Process Overview" msgstr "" -#: FMain.class:348 +#: FMain.class:354 msgid "Next" msgstr "" -#: FMain.class:354 +#: FMain.class:360 msgid "Back" msgstr "" -#: FMain.class:360 +#: FMain.class:366 msgid "Exit" msgstr "" Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmDiskPart.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmLicense.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmPartScheme.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmPartSel.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmPkgSel.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmSelISO.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmSummary.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/FrmWinDrives.class +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlCore.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlDiskPart.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlObjSizer.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlPartSel.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlPkgSel.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlSetup.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlSummarize.module +# /home/moe/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 Mon Sep 8 14:26:59 2008 @@ -1,4 +1,4 @@ -# /home/remote/area-51/projects/installer/MdlWinDrives.module +# /home/moe/projects/installer/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.project ============================================================================== --- branches/iVL/.project (original) +++ branches/iVL/.project Mon Sep 8 14:26:59 2008 @@ -1,6 +1,6 @@ # Gambas Project File 2.0 Title=VectorLinux Installer -Startup=FrmUserAdd +Startup=FrmZoneSet Version=0.0.54 Library=gb.gtk Library=gb.form Modified: branches/iVL/FMain.class ============================================================================== --- branches/iVL/FMain.class (original) +++ branches/iVL/FMain.class Mon Sep 8 14:26:59 2008 @@ -245,12 +245,18 @@ frmNext = FrmLilo CASE "FrmLilo" + 'make sure lilo has not been bypassed + IF FrmLilo.YNLiloBox.Value = FALSE THEN + ' Now that lilo has been setup, write it to the config MdlConfLilo.GENERATE_LILO_DOT_CONF MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS() MdlConfLilo.WRITE_LILO_DOT_CONF() MdlConfLilo.EXECUTE_LILO() - + ELSE + ' lilo installation / setup has been skipped + FrmLilo.tlBanner.Text = "<b>Skipping lilo setup</b>" + END IF 'frmNext = FrmLiloOsList frmNext = FrmZoneSet @@ -267,7 +273,7 @@ CASE "FrmUserAdd" - frmNext = FrmLilo +' frmNext = FrmLilo ' this is already done END SELECT Modified: branches/iVL/FrmUserAdd.class ============================================================================== --- branches/iVL/FrmUserAdd.class (original) +++ branches/iVL/FrmUserAdd.class Mon Sep 8 14:26:59 2008 @@ -68,14 +68,14 @@ .TextLabel1.Move(4, 12, .Frame1.Width - (.TextLabel1.Left * 2)) .TextLabel2.Move(4, .TextLabel1.top + .TextLabel1.Height + 16, 130) - .tbUsername.Move(.TextLabel2.Left + .TextLabel2.Width + 4, .TextLabel2.top, 150) - '.tbUsername.Move(.tTextLabel2.left + .TextLabel2.Width + 4, .TextLabel2.top, 150) - - .TextLabel3.Move(4, .tbPasswd1.top + .tbPasswd1.Height + 4, 130) - .tbPasswd1.Move(.TextLabel3.Left + .TextLabel3.Width + 4, .TextLabel3.Top) - .tbPasswd2.Move(.tbPasswd1.left, .TextLabel3.top, .tbPasswd1.Width) - .TextLabel4.Move(4, .tbPasswd2.top + .tbPasswd2.Height + 4, .TextLabel1.Width) + .tbUsername.Move(.TextLabel2.left + .TextLabel2.Width + 4, .TextLabel2.top, 150) + .TextLabel3.Move(4, .TextLabel2.top + .TextLabel2.Height + 4, 130) + .tbPasswd1.Move(.TextLabel3.left + .TextLabel3.Width + 4, .TextLabel3.top, 150) + .TextLabel4.Move(4, .TextLabel3.top + .TextLabel3.Height + 4, 130) + .tbPasswd2.Move(.TextLabel4.left + .TextLabel4.Width + 4, .TextLabel4.top, 150) + .Button1.Move(.TextLabel4.left, .TextLabel4.top + .TextLabel4.Height + 8, MdlObjSizer.get_object_width(.button1.text) + 24) + END WITH Modified: branches/iVL/FrmUserAdd.form ============================================================================== --- branches/iVL/FrmUserAdd.form (original) +++ branches/iVL/FrmUserAdd.form Mon Sep 8 14:26:59 2008 @@ -11,33 +11,33 @@ Text = ("Choose a unique name for each user. Enter the password for twice for accuracy. You can make as many users as you want, and when you are finished click next to continue.") } { TextLabel2 TextLabel - MoveScaled(2,17,12,2) + MoveScaled(2,17,12,3) Text = ("Username") } { tbUsername TextBox - MoveScaled(14,17,15,2) + MoveScaled(14,17,15,3) Text = ("") } { TextLabel3 TextLabel - MoveScaled(2,20,16,2) + MoveScaled(2,20,16,3) Text = ("Enter Password") } { tbPasswd1 TextBox - MoveScaled(16,20,16,2) + MoveScaled(16,20,16,3) Text = ("") Password = True } { TextLabel4 TextLabel - MoveScaled(2,23,14,2) + MoveScaled(2,23,14,3) Text = ("ReEnter Password") } { tbPasswd2 TextBox - MoveScaled(16,23,16,2) + MoveScaled(16,23,16,3) Text = ("") Password = True } { Button1 Button - MoveScaled(45,29,14,1) + MoveScaled(2,27,14,1) Text = ("Create User") } } Modified: branches/iVL/MdlLiloOsList.module ============================================================================== --- branches/iVL/MdlLiloOsList.module (original) +++ branches/iVL/MdlLiloOsList.module Mon Sep 8 14:26:59 2008 @@ -84,7 +84,7 @@ .MaxLength = 15 .Height = 27 .Width = MdlObjSizer.get_object_width(.text) * 2 - .Move(tl.left + tl.Width + 8, tl.top) + .Move(tl.left + tl.Width + 8, tl.top) .BackColor = Color.Background END WITH |