From: <cod...@go...> - 2008-11-17 15:05:42
|
Author: M0...@gm... Date: Mon Nov 17 07:03:50 2008 New Revision: 297 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/FMain.class branches/iVL/FrmNetConf.class branches/iVL/FrmNetConf.form branches/iVL/MdlNetConf.module branches/iVL/installer.gambas Log: Added code to handle machines without a network device Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Mon Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moe/projects/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/devel/installer/FMain.class +# /home/vluser/devel/installer/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -82,27 +82,27 @@ msgid "Please specify the domain this computer belongs to" msgstr "" -#: FMain.class:406 +#: FMain.class:408 msgid "VectorLinux will now try to detect and configure your graphics hardware." msgstr "" -#: FMain.class:406 +#: FMain.class:408 msgid "Your screen may flicker or go blank for a few seconds during this process." msgstr "" -#: FMain.class:658 +#: FMain.class:660 msgid "Back" msgstr "" -#: FMain.class:670 +#: FMain.class:672 msgid "Exit Installation" msgstr "" -#: FMain.class:682 +#: FMain.class:684 msgid "Next" msgstr "" -#: FMain.class:696 +#: FMain.class:698 msgid "Button1" msgstr "" Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Mon Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -1,4 +1,4 @@ -# /home/moises/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 Nov 17 07:03:50 2008 @@ -2,7 +2,7 @@ # Compiled with Gambas 2.9.0 Title=VectorLinux Installer Startup=MdlCore -Version=0.0.165 +Version=0.0.167 Library=gb.gtk Library=gb.form Library=gb.debug Modified: branches/iVL/FMain.class ============================================================================== --- branches/iVL/FMain.class (original) +++ branches/iVL/FMain.class Mon Nov 17 07:03:50 2008 @@ -394,11 +394,13 @@ RETURN END IF - - - MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text, FrmNetConf.tbDomain.Text) - MdlNetConf.SET_DNS_ADDRESSES() - MdlNetConf.WRITE_INET() + IF MdlNetConf.ifaceCnt = 0 THEN + MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.Text, FrmNetConf.tbDomain.Text) + ELSE ' IF MdlNetConf > 0 THEN + MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text, FrmNetConf.tbDomain.Text) + MdlNetConf.SET_DNS_ADDRESSES() + MdlNetConf.WRITE_INET() + END IF ' CONFIGURE X QUIETLY HERE Modified: branches/iVL/FrmNetConf.class ============================================================================== --- branches/iVL/FrmNetConf.class (original) +++ branches/iVL/FrmNetConf.class Mon Nov 17 07:03:50 2008 @@ -80,31 +80,31 @@ END -PUBLIC SUB Form_Resize() -DIM itxtboxleft AS Integer - - WITH ME - .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.left * 2)) - .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - 4, .tlBanner.Width) - .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8, MdlObjSizer.get_object_width(.tlHostNameLbl.text), 21) - .txtHostName.Move(.tlHostNameLbl.left + .tlHostNameLbl.Width + 4, .tlHostNameLbl.top) - .tlDomainName.Move(.txtHostName.Left + .txtHostName.Width + 24, .txtHostName.top, MdlObjSizer.get_object_width(.tlDomainName.Text)) - .tbDomain.Move(.tlDomainName.left + .tlDomainName.Width + 4, .tlDomainName.top, .txtHostName.Width) - .cbUseManDNS.Move(.tlHostNameLbl.Left, .tlHostNameLbl.top + .tlHostNameLbl.Height + 10, MdlObjSizer.get_object_width(.cbUseManDNS.text) + 24) - .tlPrimaryDNS.Move(.cbUseManDNS.left, .cbUseManDNS.top + .cbUseManDNS.Height + 4, MdlObjSizer.get_object_width(.tlPrimaryDNS.text)) - itxtboxleft = .tlPrimaryDNS.Left + .tlPrimaryDNS.Width + 24 - .txtPrimaryDNS.Move(itxtboxleft, .tlPrimaryDNS.Top) - .tlSecDNS.Move(.tlPrimaryDNS.Left, .tlPrimaryDNS.top + .tlPrimaryDNS.Height + 4, MdlObjSizer.get_object_width(.tlSecDNS.text)) - .txtSecDNS.Move(itxtboxleft, .tlSecDNS.top) - ' now move the frame - .frmNetDevices.Move(.tlSecDNS.Left, .tlSecDNS.top + .tlSecDNS.Height + 8, .ClientWidth - (.frmNetDevices.Left * 2), .ClientH - .frmNetDevices.top - 32) - - .TSNetDevices.Move(8, 20, .frmNetDevices.Width - (.TSNetDevices.Left * 2)) - .TSNetDevices.Height = .frmNetDevices.Height - (.TSNetDevices.y * 2) - - - END WITH -END +' PUBLIC SUB Form_Resize() +' DIM itxtboxleft AS Integer +' +' WITH ME +' .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.left * 2)) +' .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - 4, .tlBanner.Width) +' .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8, MdlObjSizer.get_object_width(.tlHostNameLbl.text), 21) +' .txtHostName.Move(.tlHostNameLbl.left + .tlHostNameLbl.Width + 4, .tlHostNameLbl.top) +' .tlDomainName.Move(.txtHostName.Left + .txtHostName.Width + 24, .txtHostName.top, MdlObjSizer.get_object_width(.tlDomainName.Text)) +' .tbDomain.Move(.tlDomainName.left + .tlDomainName.Width + 4, .tlDomainName.top, .txtHostName.Width) +' .cbUseManDNS.Move(.tlHostNameLbl.Left, .tlHostNameLbl.top + .tlHostNameLbl.Height + 10, MdlObjSizer.get_object_width(.cbUseManDNS.text) + 24) +' .tlPrimaryDNS.Move(.cbUseManDNS.left, .cbUseManDNS.top + .cbUseManDNS.Height + 4, MdlObjSizer.get_object_width(.tlPrimaryDNS.text)) +' itxtboxleft = .tlPrimaryDNS.Left + .tlPrimaryDNS.Width + 24 +' .txtPrimaryDNS.Move(itxtboxleft, .tlPrimaryDNS.Top) +' .tlSecDNS.Move(.tlPrimaryDNS.Left, .tlPrimaryDNS.top + .tlPrimaryDNS.Height + 4, MdlObjSizer.get_object_width(.tlSecDNS.text)) +' .txtSecDNS.Move(itxtboxleft, .tlSecDNS.top) +' ' now move the frame +' .frmNetDevices.Move(.tlSecDNS.Left, .tlSecDNS.top + .tlSecDNS.Height + 8, .ClientWidth - (.frmNetDevices.Left * 2), .ClientH - .frmNetDevices.top - 32) +' +' .TSNetDevices.Move(8, 20, .frmNetDevices.Width - (.TSNetDevices.Left * 2)) +' .TSNetDevices.Height = .frmNetDevices.Height - (.TSNetDevices.y * 2) +' +' +' END WITH +' END PUBLIC SUB cbUseManDNS_Click() Modified: branches/iVL/FrmNetConf.form ============================================================================== --- branches/iVL/FrmNetConf.form (original) +++ branches/iVL/FrmNetConf.form Mon Nov 17 07:03:50 2008 @@ -3,68 +3,105 @@ { Form Form MoveScaled(0,0,114,74) Text = ("") - { tlDomainName TextLabel - MoveScaled(47,8,9,3) - Text = ("Domain") - Alignment = Align.Normal - } - { txtHostName TextBox - MoveScaled(18,8,28,3) - Text = ("") - MaxLength = 24 - } - { tbDomain TextBox - MoveScaled(58,8,29,3) - Text = ("") - MaxLength = 24 - } - { frmNetDevices Frame - MoveScaled(1,20,85,49) - Text = ("") + Arrangement = Arrange.Vertical + { HPanel1 HPanel + MoveScaled(1,1,94,7) + { tlBanner TextLabel + MoveScaled(1,0,45,4) + Expand = True + Text = ("Network Configuration") + Alignment = Align.Normal + } + { hrSep Separator + MoveScaled(1,5,33,1) + Expand = True + } + } + { HPanel2 HPanel + MoveScaled(1,8,92,4) + { tlHostNameLbl TextLabel + MoveScaled(0,0,15,3) + Text = ("Computer Name") + Alignment = Align.Normal + } + { txtHostName TextBox + MoveScaled(16,0,28,3) + Text = ("") + MaxLength = 24 + } + { Panel3 Panel + MoveScaled(45,0,4,3) + Arrangement = Arrange.Horizontal + } + { tlDomainName TextLabel + MoveScaled(49,0,9,3) + Text = ("Domain") + Alignment = Align.Normal + } + { tbDomain TextBox + MoveScaled(59,0,29,3) + Text = ("") + MaxLength = 24 + } + } + { HPanel3 HPanel + MoveScaled(1,12,80,3) + { cbUseManDNS CheckBox + MoveScaled(0,0,39,3) + Text = ("Manual DNS Server Specification") + } + } + { Panel2 Panel + MoveScaled(1,16,93,6) + { txtPrimaryDNS TextBox txtManDNSBoxes + Name = "txtPrimaryDNS" + MoveScaled(26,0,18.1429,3) + Enabled = False + Text = ("192.168.1.254") + } + { tlPrimaryDNS TextLabel + MoveScaled(0,0,17,3) + Text = ("Primary DNS Server") + Alignment = Align.Normal + } + { txtSecDNS TextBox txtManDNSBoxes + Name = "txtSecDNS" + MoveScaled(26,3,18.1429,3) + Enabled = False + Text = ("") + } + { tlSecDNS TextLabel + MoveScaled(0,3,19,3) + Text = ("Secondary DNS Server") + Alignment = Align.Normal + } + } + { HBox1 HBox + MoveScaled(1,24,94,1) + { Separator1 Separator + MoveScaled(3,0,35,1) + Expand = True + } + } + { HPanel5 HPanel + MoveScaled(1,26,95,1) + } + { Panel1 Panel + MoveScaled(1,29,105,42) + Expand = True + Arrangement = Arrange.Horizontal { TSNetDevices TabStrip - MoveScaled(2,4,81,43) + MoveScaled(2,1,70,35) + Expand = True Index = 0 Text = ("Tab 0") Index = 0 } - } - { cbUseManDNS CheckBox - MoveScaled(1,12,39,3) - Text = ("Manual DNS Server Specification") - } - { tlPrimaryDNS TextLabel - MoveScaled(2,16,20,3) - Text = ("Primary DNS Server") - Alignment = Align.Normal - } - { txtPrimaryDNS TextBox txtManDNSBoxes - Name = "txtPrimaryDNS" - MoveScaled(24,16,18.2857,3) - Enabled = False - Text = ("192.168.1.254") - } - { tlSecDNS TextLabel - MoveScaled(44,15,21,3) - Text = ("Secondary DNS Server") - Alignment = Align.Normal - } - { txtSecDNS TextBox txtManDNSBoxes - Name = "txtSecDNS" - MoveScaled(68,15,18.2857,3) - Enabled = False - Text = ("") - } - { tlBanner TextLabel - MoveScaled(1,1,45,4) - Text = ("Network Configuration") - Alignment = Align.Normal - } - { hrSep Separator - MoveScaled(13,6,33,1) - } - { tlHostNameLbl TextLabel - MoveScaled(2,8,15,3) - Text = ("Computer Name") - Alignment = Align.Normal + { frmNetDevices Frame + MoveScaled(4,1,85,40) + Visible = False + Expand = True + Text = ("") + } } } Modified: branches/iVL/MdlNetConf.module ============================================================================== --- branches/iVL/MdlNetConf.module (original) +++ branches/iVL/MdlNetConf.module Mon Nov 17 07:03:50 2008 @@ -30,7 +30,7 @@ PUBLIC objcbWifiessid AS Object[] PUBLIC objIntTypes AS Object[] - +PUBLIC ifaceCnt AS Integer PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"] PRIVATE pWirelessPic AS picture = picture["images/wireless.png"] @@ -75,10 +75,34 @@ SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo \"$res\" | 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]) Modified: branches/iVL/installer.gambas ============================================================================== Binary files. No diff available. |