From: <cod...@go...> - 2008-12-22 18:59:15
|
Author: M0...@gm... Date: Mon Dec 22 10:57:50 2008 New Revision: 437 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/FrmNetConf.class branches/iVL/MdlNetConf.module branches/iVL/installer.gambas Log: - Cleaned out detected wifi devices from network configuration - Removed extra empty tab from network tabstrip - Updated binary Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Mon Dec 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/.project +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/ClsGlobal.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/ClsPartSel.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/ClsWinDrives.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FMain.class +# /home/moe/devel/installer/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Mon Dec 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmDiskPart.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmPartScheme.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmPartSel.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmPkgSel.class +# /home/moe/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 Mon Dec 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmSelISO.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmSummary.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/FrmWinDrives.class +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlCore.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlDiskPart.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlObjSizer.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlPartSel.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlPkgSel.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlSetup.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlSummarize.module +# /home/moe/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 22 10:57:50 2008 @@ -1,4 +1,4 @@ -# /home/vluser/devel/installer/MdlWinDrives.module +# /home/moe/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 22 10:57:50 2008 @@ -2,7 +2,7 @@ # Compiled with Gambas 2.9.0 Title=VectorLinux Installer Startup=MdlCore -Version=0.1.28 +Version=0.1.15 Library=gb.gtk Library=gb.form Library=gb.debug Modified: branches/iVL/FrmNetConf.class ============================================================================== --- branches/iVL/FrmNetConf.class (original) +++ branches/iVL/FrmNetConf.class Mon Dec 22 10:57:50 2008 @@ -41,18 +41,37 @@ END +PUBLIC SUB cleanup_tabstrip() + + DIM i AS Integer + TSNetDevices.Index = 0 + 'Message(TSNetDevices.Count) + 'RETURN + FOR i = 0 TO TSNetDevices.Count + TSNetDevices.Index = i + IF TSNetDevices.Text = "" THEN + TSNetDevices[i].Delete + RETURN + END IF + NEXT + 'WITH ME.TSNetDevices + + +END + + PUBLIC SUB Form_Open() DIM cb AS ComboBox FMain.FrmCurr = ME ME.tlHostNameLbl.Alignment = Align.Normal - ' WITH FMain - ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic - ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic - ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic - ' .tvPlan["Conf4"].Selected = TRUE - ' END WITH + WITH FMain + .tvPlan["Conf3"].Picture = MdlCore.sDonePic + .tvPlan["Conf2"].Picture = MdlCore.sDonePic + .tvPlan["Conf4"].Picture = MdlCore.sNowPic + .tvPlan["Conf4"].Selected = TRUE + END WITH ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME() @@ -71,6 +90,7 @@ ' ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1) FMain.btnext.Enabled = TRUE MdlCore.warn_status_off() + ME.cleanup_tabstrip END @@ -151,12 +171,12 @@ FMain.FrmCurr = ME ME.tlHostNameLbl.Alignment = Align.Normal ' - ' WITH FMain - ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic - ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic - ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic - ' .tvPlan["Conf4"].Selected = TRUE - ' END WITH + WITH FMain + .tvPlan["Conf3"].Picture = MdlCore.sDonePic + .tvPlan["Conf2"].Picture = MdlCore.sDonePic + .tvPlan["Conf4"].Picture = MdlCore.sNowPic + .tvPlan["Conf4"].Selected = TRUE + END WITH Modified: branches/iVL/MdlNetConf.module ============================================================================== --- branches/iVL/MdlNetConf.module (original) +++ branches/iVL/MdlNetConf.module Mon Dec 22 10:57:50 2008 @@ -62,7 +62,7 @@ objIntTypes = NEW Object[] 'SHELL "res=$(ifconfig -a | grep ^eth0 | grep -v ^lo); echo \"$res\" | tr -s \' \'\"\" " TO seths - SHELL "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo \"$res\" | tr -s \' \'\"\" " TO seths + SHELL "res=$(ifconfig -a | grep ^eth | grep -v ^lo | grep -v ^wl); echo \"$res\" | tr -s \' \'\"\" " TO seths seths = Trim(seths) IF seths = "" THEN ' WARN IF NO NETWORK HARDWARE CAN BE DETECTED AND EXIT WITHOUT ERROR @@ -184,7 +184,10 @@ 'FrmNetConf.TSNetDevices.Count = FrmNetConf.TSNetDevices.Count - 1 NEXT + END + + Modified: branches/iVL/installer.gambas ============================================================================== Binary files. No diff available. |