From: <cod...@go...> - 2008-12-22 18:15:06
|
Author: M0...@gm... Date: Mon Dec 22 10:12:55 2008 New Revision: 436 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/FrmDone.class branches/iVL/MdlNetConf.module branches/iVL/installer.gambas Log: - Removed old Unused code in MdlNetconf - Moved next button renaming line to before the prompt. - Updated binary Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/installer/FMain.class +# /home/vluser/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:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,4 +1,4 @@ -# /home/moe/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 Mon Dec 22 10:12:55 2008 @@ -1,8 +1,8 @@ # Gambas Project File 2.0 # Compiled with Gambas 2.9.0 Title=VectorLinux Installer -Startup=FrmNetConf -Version=0.1.26 +Startup=MdlCore +Version=0.1.28 Library=gb.gtk Library=gb.form Library=gb.debug Modified: branches/iVL/FrmDone.class ============================================================================== --- branches/iVL/FrmDone.class (original) +++ branches/iVL/FrmDone.class Mon Dec 22 10:12:55 2008 @@ -52,6 +52,8 @@ FMain.btQuit.Enabled = FALSE ELSE 'Message.Info("Found /tmp/status") + FMain.btnext.Text = ("Restart") + FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) + 36 ME.tlBanner.Text = "<b>" & ("Installation is complete") & "</b>" sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your system. Your new system has been configured with the default factory settings.") & "<br><br>" & ("After reboot you can use vasm or vasmCC to fine tune your installation.") & "<br><br>" & @@ -60,7 +62,7 @@ ("If you installed from CD-ROM/R/RW media, please remove de disk before restarting.") FMain.btnext.Enabled = TRUE FMain.btQuit.Enabled = TRUE - FMain.btnext.Text = ("Restart") + ME.tlMsg.Text = sText ME.tmBgMon.Enabled = FALSE Modified: branches/iVL/MdlNetConf.module ============================================================================== --- branches/iVL/MdlNetConf.module (original) +++ branches/iVL/MdlNetConf.module Mon Dec 22 10:12:55 2008 @@ -175,15 +175,7 @@ END WITH iFrameTop = tl.top + tl.Height + 8 - - - - - - - - - + END WITH ' END JACKING WITH TABSTRIP ======================================================================== @@ -195,775 +187,6 @@ END - -' PUBLIC SUB LIST_NETWORK_INTERFACES() -' -' ' This SUB will detect network interfaces and offer setup options for each one of them -' DIM seths AS String -' DIM sDump AS String -' DIM sDevList AS String[] -' DIM sLine AS String[] -' DIM sDev AS String -' DIM sType, sStatus AS String -' DIM sDevAddr AS String -' DIM tl AS TextLabel -' DIM tb AS TextBox -' DIM cb AS ComboBox -' DIM bCb AS CheckBox -' DIM i, ii, y, x, cbwidth AS Integer -' DIM pTabPic AS picture -' DIM iwifiboxwidth, iwifiboxleft AS Integer -' DIM sApDump AS String -' 'DIM iwifix, iwifiy, iwifiboxwidth AS Integer -' -' MdlCore.WARN_STATUS(("Probing your networking hardware ... Please wait")) -' -' 'initiate the arrays -' objCombos = NEW Object[] -' objFrames = NEW Object[] -' objtlDetails = NEW Object[] -' objtxtIps = NEW Object[] -' objtxtNetMasks = NEW Object[] -' objtxtDNS = NEW Object[] -' objCheckboxes = NEW Object[] -' objcbWifi = NEW Object[] -' objtxtWifiKey = NEW Object[] -' objcbWifiessid = NEW Object[] -' objIntTypes = NEW Object[] -' -' ' SHELL "iwconfig &>/tmp/nics; cat /tmp/nics|grep ^e|grep \"no wireles\"|cut -d \' \' -f1 >/tmp/nowifi" WAIT -' ' SHELL "for i in $(cat /tmp/nowifi);do ifconfig -a | grep ^$i >>/tmp/nic;done" WAIT -' ' SHELL "cat /tmp/nic| tr -s \' \'\"\" " TO seths -' SHELL "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo \"$res\" | tr -s \' \'\"\" " TO seths -' 'SHELL "ifconfig -a | grep ^[a-z]|grep -v ^lo | tr -s \' \'\"\"" TO seths -' 'File.Save(Temp("eths"), Trim(seths)) -' 'Message(File.Load(Temp("eths"))) -' -' seths = Trim(seths) -' -' IF seths = "" THEN -' WITH FrmNetConf -' .cbUseManDNS.Enabled = FALSE -' .tlPrimaryDNS.Enabled = FALSE -' .tlSecDNS.Enabled = FALSE -' END WITH -' tl = NEW TextLabel(FrmNetConf.TSNetDevices) -' WITH tl -' .Width = 400 -' .Height = 200 -' .Alignment = Align.Normal -' .Text = "<b>" & ("No ethernet neworking devices found") & "</b>" -' .Move(30, 24) -' END WITH -' FrmNetConf.TSNetDevices.Text = "Ethernet" -' ME.ifaceCnt = 0 -' RETURN -' END IF -' -' -' -' sDevList = Split(seths, gb.NewLine) -' 'Message(seths) -' ME.ifaceCnt = sDevList.Count -' FOR i = 0 TO sDevList.count - 1 -' 'Message(sDevList[i]) -' sLine = Split(sDevList[i], " ") -' sDev = sLine[0] -' 'Message(sLine[1]) -' sDevAddr = sLine[4] ' This may be off depending on which box this runs one... needs careful testing -' ' try to detect wirelesss here -' sDump = "" -' SHELL "iwconfig " & sDev & " > /tmp/iwdump 2>&1" WAIT -' 'Message(File.Load("/tmp/iwdump")) -' sDump = Trim(File.Load("/tmp/iwdump")) -' IF InStr(sDump, "no wireless extensions") > 0 THEN -' sType = ("Wired") -' pTabPic = pWiredPic -' ELSE -' CONTINUE -' 'BREAK -' ' sType = ("Wireless") -' ' pTabPic = pWirelessPic -' END IF -' -' ' detect status -' SHELL "ifplugstatus | grep ^" & sDev & " | cut -f 2 -d \':\'" TO sStatus -' 'Message(sStatus) -' sStatus = Trim(sStatus) -' IF InStr(sStatus, "detected") THEN -' sStatus = ("Plugged-in") -' ELSE -' sStatus = ("Unplugged") -' END IF -' -' ' LIST WIRED NETWORKIN ONLY -' WITH FrmNetConf.TSNetDevices -' 'PRINT .Count -' -' -' .index = i -' '.text = Left(sDevList[i], 4) -' .text = sDev -' IF sDevList[i] <> "" THEN -' INC .Count -' END IF -' .picture = pTabPic -' ' populate it with the objects -' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevAddresses" -' WITH tl -' .Move(4, 16) -' .text = ("Hardware Address") -' .Height = 21 -' .Alignment = Align.Normal -' .Width = MdlObjSizer.get_object_width(.text) -' 'y = .top + .Height + 4 -' END WITH -' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" ' MAC Address box -' WITH tb -' .Move(tl.left + tl.Width + 8, tl.top) -' .text = DConv(sDevAddr) -' .ReadOnly = TRUE -' .Width = MdlObjSizer.get_object_width(.text) + 24 -' .Height = tl.Height -' x = .Left -' cbwidth = .Width -' iwifiboxwidth = .Width -' END WITH -' -' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevTYpeLbl" -' WITH tl -' .Move(x + tb.Width + 8, tb.top) -' .text = ("Interface Type") -' .Height = 21 -' .Width = MdlObjSizer.get_object_width(.text) -' .Alignment = Align.Normal -' END WITH -' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevType" ' Interface Type (wireless, wired) -' WITH tb -' .Move(tl.left + tl.width + 8, tl.top) -' .text = sType -' .Width = MdlObjSizer.get_object_width(.text) + 24 -' .Height = 21 -' .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 -' .Move(4, tb.top + tb.Height + 4) -' .text = ("Automatically activate this interface at start-up") -' .Value = TRUE -' .Height = 21 -' .Width = MdlObjSizer.get_object_width(.text) + 36 -' .tag = sDev -' y = .top + .Height + 8 -' objCheckboxes.Add(bCb) -' END WITH -' -' -' -' tl = NEW TextLabel(FrmNetConf.TSNetDevices) -' WITH tl -' .text = ("STATUS:") & " <b>" & sStatus & "</b>" -' .Width = MdlObjSizer.get_object_width(.text) -' .Height = 21 -' .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 WITH ' STOP JACKING WITH TABSTRIP -' -' ' END IF -' -' NEXT -' FrmNetConf.TSNetDevices[FrmNetConf.TSNetDevices.count - 1].Delete ' Ugly hack to delete the trailing blank tab -' -' IF ERROR THEN Message(Error.text & gb.newline & Error.where) -' -' -' IF Exist("/tmp/iwdump") THEN KILL "/tmp/iwdump" -' MdlCore.warn_status_off() -' -' ' ================================================================ -' ' ' -' ' ' -' ' ' ' -' ' ' ' -' ' ' ' -' ' ' ' -' ' ' ' IF sType <> ("Wireless") THEN -' ' ' ' -' ' ' ' ' WITH FrmNetConf.TSNetDevices -' ' ' ' ' ' PRINT .Count -' ' ' ' ' -' ' ' ' ' -' ' ' ' ' .index = i -' ' ' ' ' '.text = Left(sDevList[i], 4) -' ' ' ' ' .text = sDev -' ' ' ' ' IF sDevList[i] <> "" THEN -' ' ' ' ' INC .Count -' ' ' ' ' END IF -' ' ' ' ' .picture = pTabPic -' ' ' ' ' ' populate it with the objects -' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevAddresses" -' ' ' ' ' WITH tl -' ' ' ' ' .Move(4, 16) -' ' ' ' ' .text = ("Hardware Address") -' ' ' ' ' .Height = 21 -' ' ' ' ' .Alignment = Align.Normal -' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' ' 'y = .top + .Height + 4 -' ' ' ' ' END WITH -' ' ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" ' MAC Address box -' ' ' ' ' WITH tb -' ' ' ' ' .Move(tl.left + tl.Width + 8, tl.top) -' ' ' ' ' .text = DConv(sDevAddr) -' ' ' ' ' .ReadOnly = TRUE -' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' ' ' ' .Height = tl.Height -' ' ' ' ' x = .Left -' ' ' ' ' cbwidth = .Width -' ' ' ' ' iwifiboxwidth = .Width -' ' ' ' ' END WITH -' ' ' ' ' -' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevTYpeLbl" -' ' ' ' ' WITH tl -' ' ' ' ' .Move(x + tb.Width + 8, tb.top) -' ' ' ' ' .text = ("Interface Type") -' ' ' ' ' .Height = 21 -' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' ' .Alignment = Align.Normal -' ' ' ' ' END WITH -' ' ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevType" ' Interface Type (wireless, wired) -' ' ' ' ' WITH tb -' ' ' ' ' .Move(tl.left + tl.width + 8, tl.top) -' ' ' ' ' .text = sType -' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' ' ' ' .Height = 21 -' ' ' ' ' .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 -' ' ' ' ' .Move(4, tb.top + tb.Height + 4) -' ' ' ' ' .text = ("Automatically activate this interface at start-up") -' ' ' ' ' .Value = TRUE -' ' ' ' ' .Height = 21 -' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 36 -' ' ' ' ' .tag = sDev -' ' ' ' ' y = .top + .Height + 8 -' ' ' ' ' objCheckboxes.Add(bCb) -' ' ' ' ' END WITH -' ' ' ' ' ' Split the design here for wireless and wired devices -' ' ' ' ' 'IF sType = "Wireless" THEN -' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "ConfModeLbl" -' ' ' ' ' WITH tl -' ' ' ' ' .Move(4, y) -' ' ' ' ' .text = ("Setup Mode") -' ' ' ' ' .height = 21 -' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' ' .Alignment = Align.BottomLeft -' ' ' ' ' 'y = .top + .Height + 4 -' ' ' ' ' iLeft = .Left -' ' ' ' ' END WITH -' ' ' ' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" ' Setup Method combobox -' ' ' ' ' WITH cb -' ' ' ' ' .Move(x, y) -' ' ' ' ' .width = cbwidth -' ' ' ' ' .Height = 21 -' ' ' ' ' .ReadOnly = TRUE -' ' ' ' ' .list = ["DHCP", "STATIC"] -' ' ' ' ' -' ' ' ' ' .tag = sDev -' ' ' ' ' '.ReadOnly = TRUE -' ' ' ' ' 'itop = y -' ' ' ' ' icbleft = .Left -' ' ' ' ' END WITH -' ' ' ' ' y = cb.top + cb.Height + 4 -' ' ' ' ' itop = y -' ' ' ' ' objCombos.Add(cb) -' ' ' ' IF StYPE = ("Wireless") THEN -' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) -' ' ' ' WITH tl -' ' ' ' .text = ("Encryption type") -' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' .Height = 21 -' ' ' ' '.Move(x + cb.Width + 96, y - .Height - 8) -' ' ' ' .Move(ileft + 300 + 24, itop + 12) -' ' ' ' .Alignment = Align.BottomLeft -' ' ' ' '.Border = Border.Plain -' ' ' ' END WITH -' ' ' ' iWifix = tl.Left -' ' ' ' iwifiy = tl.Top -' ' ' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "cbWifiEnc" -' ' ' ' WITH cb -' ' ' ' .ReadOnly = TRUE -' ' ' ' .list = [("None"), "WPA", "WEP"] -' ' ' ' .Width = tb.Width -' ' ' ' .tag = sDev -' ' ' ' .Height = tl.Height -' ' ' ' .Move(tl.left + tl.Width + 12, tl.top) -' ' ' ' -' ' ' ' iwifiboxleft = .Left -' ' ' ' -' ' ' ' END WITH -' ' ' ' objcbWifi.Add(cb) -' ' ' ' -' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) -' ' ' ' WITH tl -' ' ' ' .text = ("Encryption key") -' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' .Height = 21 -' ' ' ' .Move(iwifix, iwifiy + .Height + 12) -' ' ' ' .Alignment = Align.Normal -' ' ' ' END WITH -' ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) -' ' ' ' WITH tb -' ' ' ' .text = "" -' ' ' ' .Width = iwifiboxwidth -' ' ' ' .Height = 21 -' ' ' ' .Password = TRUE -' ' ' ' .Move(iwifiboxleft, tl.Top) -' ' ' ' .Enabled = TRUE -' ' ' ' .tag = sDev -' ' ' ' END WITH WITH FrmNetConf.TSNetDevices -' ' ' ' PRINT .Count -' ' ' -' ' ' -' ' ' .index = i -' ' ' '.text = Left(sDevList[i], 4) -' ' ' .text = sDev -' ' ' IF sDevList[i] <> "" THEN -' ' ' INC .Count -' ' ' END IF -' ' ' .picture = pTabPic -' ' ' ' populate it with the objects -' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevAddresses" -' ' ' WITH tl -' ' ' .Move(4, 16) -' ' ' .text = ("Hardware Address") -' ' ' .Height = 21 -' ' ' .Alignment = Align.Normal -' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' 'y = .top + .Height + 4 -' ' ' END WITH -' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" ' MAC Address box -' ' ' WITH tb -' ' ' .Move(tl.left + tl.Width + 8, tl.top) -' ' ' .text = DConv(sDevAddr) -' ' ' .ReadOnly = TRUE -' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' ' .Height = tl.Height -' ' ' x = .Left -' ' ' cbwidth = .Width -' ' ' iwifiboxwidth = .Width -' ' ' END WITH -' ' ' -' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevTYpeLbl" -' ' ' WITH tl -' ' ' .Move(x + tb.Width + 8, tb.top) -' ' ' .text = ("Interface Type") -' ' ' .Height = 21 -' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' .Alignment = Align.Normal -' ' ' END WITH -' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevType" ' Interface Type (wireless, wired) -' ' ' WITH tb -' ' ' .Move(tl.left + tl.width + 8, tl.top) -' ' ' .text = sType -' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' ' .Height = 21 -' ' ' .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 -' ' ' .Move(4, tb.top + tb.Height + 4) -' ' ' .text = ("Automatically activate this interface at start-up") -' ' ' .Value = TRUE -' ' ' .Height = 21 -' ' ' .Width = MdlObjSizer.get_object_width(.text) + 36 -' ' ' .tag = sDev -' ' ' y = .top + .Height + 8 -' ' ' objCheckboxes.Add(bCb) -' ' ' END WITH -' ' ' ' Split the design here for wireless and wired devices -' ' ' 'IF sType = "Wireless" THEN -' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "ConfModeLbl" -' ' ' WITH tl -' ' ' .Move(4, y) -' ' ' .text = ("Setup Mode") -' ' ' .height = 21 -' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' .Alignment = Align.BottomLeft -' ' ' WITH FrmNetConf.TSNetDevices -' ' ' PRINT .Count -' ' -' ' -' ' .index = i -' ' '.text = Left(sDevList[i], 4) -' ' .text = sDev -' ' IF sDevList[i] <> "" THEN -' ' INC .Count -' ' END IF -' ' .picture = pTabPic -' ' ' populate it with the objects -' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevAddresses" -' ' WITH tl -' ' .Move(4, 16) -' ' .text = ("Hardware Address") -' ' .Height = 21 -' ' .Alignment = Align.Normal -' ' .Width = MdlObjSizer.get_object_width(.text) -' ' 'y = .top + .Height + 4 -' ' END WITH -' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" ' MAC Address box -' ' WITH tb -' ' .Move(tl.left + tl.Width + 8, tl.top) -' ' .text = DConv(sDevAddr) -' ' .ReadOnly = TRUE -' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' .Height = tl.Height -' ' x = .Left -' ' cbwidth = .Width -' ' iwifiboxwidth = .Width -' ' END WITH -' ' -' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevTYpeLbl" -' ' WITH tl -' ' .Move(x + tb.Width + 8, tb.top) -' ' .text = ("Interface Type") -' ' .Height = 21 -' ' .Width = MdlObjSizer.get_object_width(.text) -' ' .Alignment = Align.Normal -' ' END WITH -' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevType" ' Interface Type (wireless, wired) -' ' WITH tb -' ' .Move(tl.left + tl.width + 8, tl.top) -' ' .text = sType -' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' .Height = 21 -' ' .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 -' ' .Move(4, tb.top + tb.Height + 4) -' ' .text = ("Automatically activate this interface at start-up") -' ' .Value = TRUE -' ' .Height = 21 -' ' .Width = MdlObjSizer.get_object_width(.text) + 36 -' ' .tag = sDev -' ' y = .top + .Height + 8 -' ' objCheckboxes.Add(bCb) -' ' END WITH -' ' ' Split the design here for wireless and wired devices -' ' 'IF sType = "Wireless" THEN -' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "ConfModeLbl" -' ' WITH tl -' ' .Move(4, y) -' ' .text = ("Setup Mode") -' ' .height = 21 -' ' .Width = MdlObjSizer.get_object_width(.text) -' ' .Alignment = Align.BottomLeft -' ' 'y = .top + .Height + 4 -' ' iLeft = .Left -' ' END WITH -' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" ' Setup Method combobox -' ' WITH cb -' ' .Move(x, y) -' ' .width = cbwidth -' ' .Height = 21 -' ' .ReadOnly = TRUE -' ' .list = ["DHCP", "STATIC"] -' ' -' ' .tag = sDev -' ' '.ReadOnly = TRUE -' ' 'itop = y -' ' icbleft = .Left -' ' END WITH -' ' y = cb.top + cb.Height + 4 -' ' itop = y -' ' objCombos.Add(cb) -' ' 'y = .top + .Height + 4 -' ' ' iLeft = .Left -' ' ' END WITH -' ' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" ' Setup Method combobox -' ' ' WITH cb -' ' ' .Move(x, y) -' ' ' .width = cbwidth -' ' ' .Height = 21 -' ' ' .ReadOnly = TRUE -' ' ' .list = ["DHCP", "STATIC"] -' ' ' -' ' ' .tag = sDev -' ' ' '.ReadOnly = TRUE -' ' ' 'itop = y -' ' ' icbleft = .Left -' ' ' END WITH -' ' ' y = cb.top + cb.Height + 4 -' ' ' itop = y -' ' ' objCombos.Add(cb) -' ' ' WITH FrmNetConf.TSNetDevices -' ' ' PRINT .Count -' ' -' ' -' ' .index = i -' ' '.text = Left(sDevList[i], 4) -' ' .text = sDev -' ' IF sDevList[i] <> "" THEN -' ' INC .Count -' ' END IF -' ' .picture = pTabPic -' ' ' populate it with the objects -' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevAddresses" -' ' WITH tl -' ' .Move(4, 16) -' ' .text = ("Hardware Address") -' ' .Height = 21 -' ' .Alignment = Align.Normal -' ' .Width = MdlObjSizer.get_object_width(.text) -' ' 'y = .top + .Height + 4 -' ' END WITH -' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" ' MAC Address box -' ' WITH tb -' ' .Move(tl.left + tl.Width + 8, tl.top) -' ' .text = DConv(sDevAddr) -' ' .ReadOnly = TRUE -' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' .Height = tl.Height -' ' x = .Left -' ' cbwidth = .Width -' ' iwifiboxwidth = .Width -' ' END WITH -' ' -' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevTYpeLbl" -' ' WITH tl -' ' .Move(x + tb.Width + 8, tb.top) -' ' .text = ("Interface Type") -' ' .Height = 21 -' ' .Width = MdlObjSizer.get_object_width(.text) -' ' .Alignment = Align.Normal -' ' END WITH -' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevType" ' Interface Type (wireless, wired) -' ' WITH tb -' ' .Move(tl.left + tl.width + 8, tl.top) -' ' .text = sType -' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' .Height = 21 -' ' .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 -' ' .Move(4, tb.top + tb.Height + 4) -' ' .text = ("Automatically activate this interface at start-up") -' ' .Value = TRUE -' ' .Height = 21 -' ' .Width = MdlObjSizer.get_object_width(.text) + 36 -' ' .tag = sDev -' ' y = .top + .Height + 8 -' ' objCheckboxes.Add(bCb) -' ' END WITH -' ' ' Split the design here for wireless and wired devices -' ' 'IF sType = "Wireless" THEN -' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "ConfModeLbl" -' ' WITH tl -' ' .Move(4, y) -' ' .text = ("Setup Mode") -' ' .height = 21 -' ' .Width = MdlObjSizer.get_object_width(.text) -' ' .Alignment = Align.BottomLeft -' ' 'y = .top + .Height + 4 -' ' iLeft = .Left -' ' END WITH -' ' cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" ' Setup Method combobox -' ' WITH cb -' ' .Move(x, y) -' ' .width = cbwidth -' ' .Height = 21 -' ' .ReadOnly = TRUE -' ' .list = ["DHCP", "STATIC"] -' ' -' ' .tag = sDev -' ' '.ReadOnly = TRUE -' ' 'itop = y -' ' icbleft = .Left -' ' END WITH -' ' y = cb.top + cb.Height + 4 -' ' itop = y -' ' objCombos.Add(cb) -' ' -' ' ' ' objtxtWifiKey.Add(tb) -' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) -' ' ' ' WITH tl -' ' ' ' .text = ("Access Point") -' ' ' ' .Width = MdlObjSizer.get_object_width(.Text) -' ' ' ' .Height = 21 -' ' ' ' .Alignment = Align.Normal -' ' ' ' .Move(iWifix, tb.top + tb.Height + 4) -' ' ' ' '.Enabled = TRUE -' ' ' ' '.ReadOnly = FALSE -' ' ' ' END WITH -' ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) -' ' ' ' WITH tb -' ' ' ' .tag = sDev -' ' ' ' '.ReadOnly = TRUE -' ' ' ' .Width = iwifiboxwidth -' ' ' ' .Height = 21 -' ' ' ' .Move(iwifiboxleft, tl.Top) -' ' ' ' .ReadOnly = FALSE -' ' ' ' -' ' ' ' ' add the access points here -' ' ' ' END WITH -' ' ' ' objcbWifiessid.Add(tb) -' ' ' ' -' ' ' ' -' ' ' ' END IF -' ' ' ' -' ' ' ' -' ' ' ' IF sType = ("Wired") THEN -' ' ' ' -' ' ' ' ' ' WITH FrmNetConf.TSNetDevices -' ' ' ' ' ' PRINT .Count -' ' ' ' ' ' -' ' ' ' ' ' -' ' ' ' ' ' .index = i -' ' ' ' ' ' '.text = Left(sDevList[i], 4) -' ' ' ' ' ' .text = sDev -' ' ' ' ' ' IF sDevList[i] <> "" THEN -' ' ' ' ' ' INC .Count -' ' ' ' ' ' END IF -' ' ' ' ' ' .picture = pTabPic -' ' ' ' ' ' ' populate it with the objects -' ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevAddresses" -' ' ' ' ' ' WITH tl -' ' ' ' ' ' .Move(4, 16) -' ' ' ' ' ' .text = ("Hardware Address") -' ' ' ' ' ' .Height = 21 -' ' ' ' ' ' .Alignment = Align.Normal -' ' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' ' ' 'y = .top + .Height + 4 -' ' ' ' ' ' END WITH -' ' ' ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" ' MAC Address box -' ' ' ' ' ' WITH tb -' ' ' ' ' ' .Move(tl.left + tl.Width + 8, tl.top) -' ' ' ' ' ' .text = DConv(sDevAddr) -' ' ' ' ' ' .ReadOnly = TRUE -' ' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' ' ' ' ' .Height = tl.Height -' ' ' ' ' ' x = .Left -' ' ' ' ' ' cbwidth = .Width -' ' ' ' ' ' iwifiboxwidth = .Width -' ' ' ' ' ' END WITH -' ' ' ' ' ' -' ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DevTYpeLbl" -' ' ' ' ' ' WITH tl -' ' ' ' ' ' .Move(x + tb.Width + 8, tb.top) -' ' ' ' ' ' .text = ("Interface Type") -' ' ' ' ' ' .Height = 21 -' ' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' ' ' .Alignment = Align.Normal -' ' ' ' ' ' END WITH -' ' ' ' ' ' tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevType" ' Interface Type (wireless, wired) -' ' ' ' ' ' WITH tb -' ' ' ' ' ' .Move(tl.left + tl.width + 8, tl.top) -' ' ' ' ' ' .text = sType -' ' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 24 -' ' ' ' ' ' .Height = 21 -' ' ' ' ' ' .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 -' ' ' ' ' ' .Move(4, tb.top + tb.Height + 4) -' ' ' ' ' ' .text = ("Automatically activate this interface at start-up") -' ' ' ' ' ' .Value = TRUE -' ' ' ' ' ' .Height = 21 -' ' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) + 36 -' ' ' ' ' ' .tag = sDev -' ' ' ' ' ' y = .top + .Height + 8 -' ' ' ' ' ' objCheckboxes.Add(bCb) -' ' ' ' ' ' END WITH -' ' ' ' ' ' -' ' ' ' ' ' -' ' ' ' ' ' -' ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) -' ' ' ' ' ' WITH tl -' ' ' ' ' ' .text = ("STATUS:") & " <b>" & sStatus & "</b>" -' ' ' ' ' ' .Width = MdlObjSizer.get_object_width(.text) -' ' ' ' ' ' .Height = 21 -' ' ' ' ' ' .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 -' ' ' ' ' END IF -' ' ' ' -' ' ' ' -' ' ' ' -' ' ' ' END WITH -' ' ' ' END IF -' ' ' ' -' ' ' ' NEXT -' ' ' ' FrmNetConf.TSNetDevices[FrmNetConf.TSNetDevices.count - 1].Delete ' Ugly hack to delete the trailing blank tab -' ' ' ' -' ' ' ' IF ERROR THEN Message(Error.text & gb.newline & Error.where) -' ' ' ' -' ' ' ' -' ' ' ' IF Exist("/tmp/iwdump") THEN KILL "/tmp/iwdump" -' ' ' ' MdlCore.warn_status_off() -' -' END Modified: branches/iVL/installer.gambas ============================================================================== Binary files. No diff available. |