From: <cod...@go...> - 2008-12-17 20:54:00
|
Author: M0...@gm... Date: Wed Dec 17 12:42:07 2008 New Revision: 423 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/MdlInstallCustom.module branches/iVL/MdlNetConf.module Log: New attempt to kill bug in netconf Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/installer/FMain.class +# /home/vlmaster/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/installer/FrmPkgSel.class +# /home/vlmaster/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/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 Wed Dec 17 12:42:07 2008 @@ -1,4 +1,4 @@ -# /home/moe/devel/installer/MdlWinDrives.module +# /home/vlmaster/devel/installer/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/MdlInstallCustom.module ============================================================================== --- branches/iVL/MdlInstallCustom.module (original) +++ branches/iVL/MdlInstallCustom.module Wed Dec 17 12:42:07 2008 @@ -149,7 +149,7 @@ sLabel = Left(sLabel, RInStr(sLabel, "\'") - 1) sKernNo = Right(sKernNo) ' this is the number of the kernel SHELL " cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep ^HD_KERNEL_" & sKernNo TO sFoundOut - sFoundOut = Trim(Replace(sFoundOut, "\'", "")) + sFoundOut = Trim(sFoundOut) sKernName = Right(sFoundOut, Len(sFoundOut) - InStr(sFoundOut, "\'")) sKernName = Left(sKernName, RInStr(sKernName, "\'") - 1) 'Message.Info(sLabel & " - " & sKernName) Modified: branches/iVL/MdlNetConf.module ============================================================================== --- branches/iVL/MdlNetConf.module (original) +++ branches/iVL/MdlNetConf.module Wed Dec 17 12:42:07 2008 @@ -82,7 +82,7 @@ seths = Trim(seths) - IF seths = "" THEN + 'IF seths = "" THEN WITH FrmNetConf .cbUseManDNS.Enabled = FALSE .tlPrimaryDNS.Enabled = FALSE @@ -99,16 +99,14 @@ FrmNetConf.TSNetDevices.Text = "Ethernet" ME.ifaceCnt = 0 RETURN - END IF +' END IF sDevList = Split(seths, gb.NewLine) 'Message(seths) ME.ifaceCnt = sDevList.Count - - - FOR i = 0 TO sDevList.count - 1 + FOR i = 0 TO sDevList.count - 1 'Message(sDevList[i]) sLine = Split(sDevList[i], " ") sDev = sLine[0] @@ -139,176 +137,9 @@ sStatus = ("Unplugged") END IF - ' ' ' 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 - ' ' ' 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 + ' LIST WIRED NETWORKIN ONLY + WITH FrmNetConf.TSNetDevices + 'PRINT .Count .index = i @@ -400,14 +231,12 @@ END WITH - 'END IF -' END IF - + + + END WITH ' STOP JACKING WITH TABSTRIP + +' END IF - - END WITH - END IF - NEXT FrmNetConf.TSNetDevices[FrmNetConf.TSNetDevices.count - 1].Delete ' Ugly hack to delete the trailing blank tab @@ -416,6 +245,564 @@ 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 |