vectorlinux-devel — Vector Linux developer's list

[Vectorlinux-devel] [vinstall-ng commit] r447 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Wed Dec 31 06:40:20 2008
New Revision: 447

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/FrmMediaCheck.class
    branches/iVL/FrmMediaCheck.form
    branches/iVL/installer.gambas

Log:
- Fixed problem causing media checker to crash


Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 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	Wed Dec 31 06:40:20 2008
@@ -1,5 +1,5 @@
  # Gambas Project File 2.0
-# Compiled with Gambas 2.10.0
+# Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
  Version=0.1.16

Modified: branches/iVL/FrmMediaCheck.class
==============================================================================
--- branches/iVL/FrmMediaCheck.class	(original)
+++ branches/iVL/FrmMediaCheck.class	Wed Dec 31 06:40:20 2008
@@ -19,6 +19,7 @@

  PUBLIC SUB Form_Open()
  ME.MovieBox1.Path = "images/throbber.gif"
+ME.icon = picture["images/throbber.gif"]
  MdlVerifyMedia.iProcSig = 0
  ME.Height = ME.pnlTop.Top + ME.pnlTop.Height
  MdlCore.LOCK_GUI()

Modified: branches/iVL/FrmMediaCheck.form
==============================================================================
--- branches/iVL/FrmMediaCheck.form	(original)
+++ branches/iVL/FrmMediaCheck.form	Wed Dec 31 06:40:20 2008
@@ -3,7 +3,6 @@
  { Form Form
    MoveScaled(0,0,83,53)
    Text = ("")
-  Icon = Picture["images/throbber.gif"]
    Arrangement = Arrange.Vertical
    { pnlTop Panel
      MoveScaled(1,1,78,45)
@@ -27,9 +26,8 @@
        Text = ("")
      }
      { MovieBox1 MovieBox
-      MoveScaled(30,24,5,18.1429)
+      MoveScaled(30,24,5,18.125)
        Expand = True
-      Path = "/home/vluser/devel/installer/images/throbber.gif_old"
      }
      { ProgressBar1 ProgressBar
        MoveScaled(2,41,74,3)

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r446 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Dec 30 14:33:53 2008
New Revision: 446

Modified:
    branches/iVL/.project
    branches/iVL/FrmMediaCheck.class
    branches/iVL/FrmMediaCheck.form
    branches/iVL/installer.gambas

Log:
Fixed path to animated .gif

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Tue Dec 30 14:33:53 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.10.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.15
+Version=0.1.16
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmMediaCheck.class
==============================================================================
--- branches/iVL/FrmMediaCheck.class	(original)
+++ branches/iVL/FrmMediaCheck.class	Tue Dec 30 14:33:53 2008
@@ -18,6 +18,7 @@


  PUBLIC SUB Form_Open()
+ME.MovieBox1.Path = "images/throbber.gif"
  MdlVerifyMedia.iProcSig = 0
  ME.Height = ME.pnlTop.Top + ME.pnlTop.Height
  MdlCore.LOCK_GUI()

Modified: branches/iVL/FrmMediaCheck.form
==============================================================================
--- branches/iVL/FrmMediaCheck.form	(original)
+++ branches/iVL/FrmMediaCheck.form	Tue Dec 30 14:33:53 2008
@@ -27,9 +27,9 @@
        Text = ("")
      }
      { MovieBox1 MovieBox
-      MoveScaled(30,24,5,18.2857)
+      MoveScaled(30,24,5,18.1429)
        Expand = True
-      Path = "/home/vluser/devel/installer/images/throbber.gif"
+      Path = "/home/vluser/devel/installer/images/throbber.gif_old"
      }
      { ProgressBar1 ProgressBar
        MoveScaled(2,41,74,3)

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r443 - branches/iVL/.lang

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Dec 30 13:10:40 2008
New Revision: 443

Modified:
    branches/iVL/.lang/en_US.po

Log:
Corrected en_US.po

Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po	(original)
+++ branches/iVL/.lang/en_US.po	Tue Dec 30 13:10:40 2008
@@ -475,7 +475,7 @@
  msgstr ""

  #: FrmDone.class:60
-msgid "If you installed from  CD-ROM/R/RW media, please remove de disk  
before restarting."
+msgid "If you installed from  CD-ROM/R/RW media, please remove de disc  
before restarting."
  msgstr ""

  #: FMain.class:448
@@ -647,8 +647,8 @@
  msgstr "Modify my disk partitions to make room for new installation"

  #: FrmRootPass.class:19
-msgid "Most other every-day taks do not require administrative  
priviledges."
-msgstr "Most other every-day tasks do not require administrative  
priviledges."
+msgid "Most other every-day tasks do not require administrative  
privileges."
+msgstr "Most other every-day tasks do not require administrative  
privileges."

  #: FrmSummary.class:45
  msgid "Mount Point"
@@ -683,7 +683,7 @@
  msgstr "No Windows partitions detected"

  #: MdlNetConf.module:78
-msgid "No ethernet neworking devices found"
+msgid "No ethernet networking devices found"
  msgstr ""

  #: FrmSelISO.class:256
@@ -799,11 +799,11 @@
  msgstr ""

  #: FMain.class:356
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Please wait while setup analyses your current partition setup."
+msgid "Please wait while setup analyzes your current partition setup."
+msgstr "Please wait while setup analyzes your current partition setup."

  #: FMain.class:354
-msgid "Please wait while setup attampts to run the partitioning utility"
+msgid "Please wait while setup attempts to run the partitioning utility"
  msgstr "Please wait while setup attempts to run the partitioning utility"

  #: MdlNetConf.module:103
@@ -827,7 +827,7 @@
  msgstr "Primary DNS Server"

  #: FrmXconf.class:27
-msgid "Probe hardware to setup your Graphical Environment using your  
prefered settings"
+msgid "Probe hardware to setup your Graphical Environment using your  
preffered settings"
  msgstr ""

  #: FrmLilo.class:267 FrmLiloSetup.class:273
@@ -924,7 +924,7 @@

  #: FrmPartScheme.class:60
  msgid "Select this option if you already have a linux installation that  
you wish to overwrite or if a linux partition scheme exists in your hard  
disk."
-msgstr "Select this option if you already have a linux installation that  
you wish to overwrite or if a linux parition scheme exists in your hard  
disk."
+msgstr "Select this option if you already have a linux installation that  
you wish to overwrite or if a linux partition scheme exists in your hard  
disk."

  #: FrmPartScheme.class:70
  msgid "Select this option is you wish to create, move or resize partitions  
in order to make room for your new VectorLinux installation."
@@ -1059,8 +1059,8 @@
  msgstr "The linux root account is pre-assigned to be used as the system  
administrator's account. This account is used to perform system-wide  
changes such as software upgrades, managing user accounts etc. \n\nMost  
other operations do not require administrative priviledges.\nThe root  
password must be entered twice for ensured accuracy. When choosing a root  
password, think of something easy for you to remember, but hard for others  
to guess."

  #: MdlInstallCustom.module:48
-msgid "There as been an error while installing required system software. "
-msgstr "There as been an error while installing required system software. "
+msgid "There has been an error while installing required system software. "
+msgstr "There h as been an error while installing required system  
software. "

  #: MdlInstallSys.module:637
  msgid "There has been an error extracting"
@@ -1091,7 +1091,7 @@
  msgstr "This option will overwrite any existing data in the selected  
partitions"

  #: FrmAlsaConf.class:36
-msgid "This portion of the setup process allows you to sutup your  
soundcard for your new operating system."
+msgid "This portion of the setup process allows you to setup your  
soundcard for your new operating system."
  msgstr ""

  #: MdlUsrAdd.module:91
@@ -1455,8 +1455,8 @@
  msgstr "suggested setup for a typical Linux installation"

  #: FrmSelISO.class:79
-msgid "to begin installating"
-msgstr "to begin installating"
+msgid "to begin installation"
+msgstr "to begin installation"

  #: MdlInstallSys.module:372
  msgid "to configure it."

[Vectorlinux-devel] [vinstall-ng commit] r444 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Dec 30 13:18:23 2008
New Revision: 444

Modified:
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.project
    branches/iVL/MdlSetup.module
    branches/iVL/installer.gambas

Log:
Updated Binary, Bolded vec's name on credits

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Tue Dec 30 13:18:23 2008
@@ -26,15 +26,15 @@
  msgid "Total pkgs to be installed = "
  msgstr ""

-#: MdlSetup.module:318
+#: MdlSetup.module:319
  msgid "BROUGHT TO YOU BY"
  msgstr ""

-#: MdlSetup.module:334
+#: MdlSetup.module:337
  msgid "Activating swap space"
  msgstr ""

-#: MdlSetup.module:336
+#: MdlSetup.module:339
  msgid "Preparing filesystems"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Tue Dec 30 13:18:23 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.10.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.14
+Version=0.1.15
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Tue Dec 30 13:18:23 2008
@@ -295,6 +295,7 @@
                sFile[i] = "M0E-lnx  [ vpackager, vasmCC, GUI installer ]"
        ELSE IF Left(Trim(sFile[i]), Len("Uelsk8s")) = "Uelsk8s" THEN
            sFile[i] = "Uelks8s [ vlthemeswitch, ISO Master, Gui Installer ]"
+
        ELSE
          sFile[i] = sFile[i]
        END IF
@@ -323,6 +324,8 @@
                  sCredit[i] = "<b>" & "Uelsk8s" & "</b><br>" & "[ GUI  
Installer, ISO Master, vlthemeswitch ]"
                ELSE IF Left(sCredit[i], Len("Lost")) = "Lost" THEN
                  sCredit[i] = "Lost-n-LovinLinux" ' " Lost " & " & " & "  
LovinLinux ""
+              ELSE IF Left(sCredit[i], Len("Vector")) = "Vector" THEN
+                sCredit[i] = "<b>" & "Vector" & "</b><br>" & "[ Founder ]"
                END IF
              FrmCredits.TextLabel1.text = FrmCredits.TextLabel1.text &  
sCredit[i] & "<br><br><br>"
            NEXT

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r445 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Dec 30 13:36:39 2008
New Revision: 445

Modified:
    branches/iVL/MdlVerifyMedia.module
    branches/iVL/installer.gambas

Log:
Fixed bug when verifying from ISO

Modified: branches/iVL/MdlVerifyMedia.module
==============================================================================
--- branches/iVL/MdlVerifyMedia.module	(original)
+++ branches/iVL/MdlVerifyMedia.module	Tue Dec 30 13:36:39 2008
@@ -66,13 +66,13 @@
    sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/") + 1)
    IF InStr(sEntry, ".iso on") THEN
      ' this is an iso, we must mount the drive and then the ISO
-      sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/"))
+      'sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/"))
        sImage = Left(sEntry, InStr(sEntry, " "))
            ' perform the mounting
            EXEC ["mkdir", "/mnt/loop"] WAIT
            EXEC ["mkdir", "/mnt/source"] WAIT
            EXEC ["mount", sDevice, "/mnt/source"] WAIT
-          EXEC ["mount", "-o", "loop", "/mnt/source" &/  
sImage, "/mnt/loop"] WAIT
+          EXEC ["mount", "-o", "loop", "/mnt/source" &/  
Trim(sImage), "/mnt/loop"] WAIT
    ELSE ' Actual CD Media
        EXEC ["mkdir", "/mnt/source"] WAIT
        EXEC ["mount", sDevice, "/mnt/loop"] ' Mount it to loop, just to  
keep this consistant.

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r442 - in branches/iVL: . .lang images

[<cod...@go...>]

Author: M0...@gm...
Date: Tue Dec 30 13:01:20 2008
New Revision: 442

Added:
    branches/iVL/FrmMediaCheck.class
    branches/iVL/FrmMediaCheck.form
    branches/iVL/MdlVerifyMedia.module
    branches/iVL/images/throbber.gif   (contents, props changed)
Modified:
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/.project
    branches/iVL/FrmSelISO.class
    branches/iVL/FrmSelISO.form
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlCore.module

Log:
- Implemented installation media verifyer
- Attempt to fix cdrom detection problems

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Tue Dec 30 13:01:20 2008
@@ -26,35 +26,39 @@
  msgid "to begin installating"
  msgstr ""

-#: FrmSelISO.class:81
+#: FrmSelISO.class:83
  msgid "Unable to locate any installable media."
  msgstr ""

-#: FrmSelISO.class:87
+#: FrmSelISO.class:91
  msgid "Select installation media from the list below"
  msgstr ""

-#: FrmSelISO.class:116
+#: FrmSelISO.class:122
  msgid "Unable to identify distro."
  msgstr ""

-#: FrmSelISO.class:151
+#: FrmSelISO.class:157
  msgid "Minimum Disk Space Requirements"
  msgstr ""

-#: FrmSelISO.class:256
+#: FrmSelISO.class:270
  msgid "No installable images found."
  msgstr ""

-#: FrmSelISO.class:262
+#: FrmSelISO.class:276
  msgid "Select which VectorLinux version you wish to install from the list  
below"
  msgstr ""

-#: FrmSelISO.class:267
+#: FrmSelISO.class:281
  msgid "TextLabel1"
  msgstr ""

-#: FrmSelISO.class:272
+#: FrmSelISO.class:286
  msgid "Search Again"
+msgstr ""
+
+#: FrmSelISO.class:297
+msgid "Verify Installation Files"
  msgstr ""


Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Tue Dec 30 13:01:20 2008
@@ -18,99 +18,99 @@
  msgid "Working ... Please Wait"
  msgstr ""

-#: MdlCore.module:251
+#: MdlCore.module:259
  msgid "Scanning system for installable media. Please wait ..."
  msgstr ""

-#: MdlCore.module:267
+#: MdlCore.module:275
  msgid "No Installable Media Found"
  msgstr ""

-#: MdlCore.module:269
+#: MdlCore.module:277
  msgid "Setup was unable to find any installable media on your system.  
Please insert your VectorLinux "
  msgstr ""

-#: MdlCore.module:269
+#: MdlCore.module:277
  msgid "installation CD and click"
  msgstr ""

-#: MdlCore.module:269
+#: MdlCore.module:277
  msgid "to try again"
  msgstr ""

-#: MdlCore.module:430
+#: MdlCore.module:438
  msgid "Build Date: "
  msgstr ""

-#: MdlCore.module:430
+#: MdlCore.module:438
  msgid "MINIMUM REQUIREMENTS"
  msgstr ""

-#: MdlCore.module:435
+#: MdlCore.module:443
  msgid "Setup is unable to find SETUP.CONF in your install media. This  
could be symptoms of a bad burn or a bad ISO"
  msgstr ""

-#: MdlCore.module:508
+#: MdlCore.module:516
  msgid "Cannot find SETUP.CONF"
  msgstr ""

-#: MdlCore.module:516
+#: MdlCore.module:524
  msgid "Preparation"
  msgstr ""

-#: MdlCore.module:517
+#: MdlCore.module:525
  msgid "Language Selection"
  msgstr ""

-#: MdlCore.module:518
+#: MdlCore.module:526
  msgid "Find installation media"
  msgstr ""

-#: MdlCore.module:519
+#: MdlCore.module:527
  msgid "Disk Partitioning"
  msgstr ""

-#: MdlCore.module:520
+#: MdlCore.module:528
  msgid "Software Selection"
  msgstr ""

-#: MdlCore.module:522
+#: MdlCore.module:530
  msgid "Installation"
  msgstr ""

-#: MdlCore.module:523
+#: MdlCore.module:531
  msgid "Installation Summary"
  msgstr ""

-#: MdlCore.module:525
+#: MdlCore.module:533
  msgid "Install Operating System"
  msgstr ""

-#: MdlCore.module:526
+#: MdlCore.module:534
  msgid "System Configuration"
  msgstr ""

-#: MdlCore.module:527
+#: MdlCore.module:535
  msgid "Boot Menu Options"
  msgstr ""

-#: MdlCore.module:528
+#: MdlCore.module:536
  msgid "Regional Settings"
  msgstr ""

-#: MdlCore.module:529
+#: MdlCore.module:537
  msgid "System Administrator"
  msgstr ""

-#: MdlCore.module:530
+#: MdlCore.module:538
  msgid "User Accounts"
  msgstr ""

-#: MdlCore.module:531
+#: MdlCore.module:539
  msgid "Network Configuration"
  msgstr ""

-#: MdlCore.module:532
+#: MdlCore.module:540
  msgid "Final Hardware Configuration"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Tue Dec 30 13:01:20 2008
@@ -1,5 +1,5 @@
  # Gambas Project File 2.0
-# Compiled with Gambas 2.9.0
+# Compiled with Gambas 2.10.0
  Title=VectorLinux Installer
  Startup=MdlCore
  Version=0.1.14

Added: branches/iVL/FrmMediaCheck.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmMediaCheck.class	Tue Dec 30 13:01:20 2008
@@ -0,0 +1,87 @@
+' Gambas class file
+  '    This file is part of vinstall-ng
+
+'    vinstall-ng is free software: you can redistribute it and/or modify
+'    it under the terms of the GNU General Public License as published by
+'    the Free Software Foundation, either version 2 of the License, or
+'    (at your option) any later version.
+
+'    vinstall-ng  is distributed in the hope that it will be useful,
+'    but WITHOUT ANY WARRANTY; without even the implied warranty of
+'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'    GNU General Public License for more details.
+
+'    You should have received a copy of the GNU General Public License
+'    along with vinstall-ng.  If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC sEntry AS String
+
+
+PUBLIC SUB Form_Open()
+MdlVerifyMedia.iProcSig = 0
+ME.Height = ME.pnlTop.Top + ME.pnlTop.Height
+MdlCore.LOCK_GUI()
+FMain.Enabled = FALSE
+ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
+ME.tlVerifyDetails.Text = ("Verifying the installation files can help you  
avoid an unsuccessful install.") & "<br><br>" &
+("Keep in mind however, that this process can take a while (expect it to  
take just as Long as a real installation process)") & "<br><br>" &
+("Click") & Space(1) & btstart.Text & Space(1) & ("to begin. You may  
press") & Space(1) & btstop.Text & Space(1) & ("to stop the process" &
+Space(1) & "at any time.")
+'Message(sEntry)
+
+END
+
+
+
+
+PUBLIC SUB Form_Close()
+
+  WITH FMain
+    .btQuit.Enabled = TRUE
+    .btnext.Enabled = TRUE
+    .btnext.ForeColor = Color.Black
+    .btQuit.ForeColor = Color.Black
+    .Enabled = TRUE
+  END WITH
+
+END
+
+PUBLIC SUB tlVerifyDetails_MouseDown()
+
+
+
+END
+
+PUBLIC SUB btstart_Click()
+
+
+  'ME.ProgressBar1.Visible = TRUE
+  btstart.Enabled = FALSE
+  btstop.Enabled = TRUE
+  ME.ProgressBar1.Visible = TRUE
+  WAIT 1
+  MdlVerifyMedia.PERFORM_MEDIA_CHECK(sEntry)
+
+END
+
+PUBLIC SUB btClose_Click()
+
+  ME.Close
+
+END
+
+PUBLIC SUB btstop_Click()
+  LAST.Enabled = FALSE
+  MdlVerifyMedia.iProcSig = 225 ' send the error message
+  MdlVerifyMedia.hproc.Kill
+  MdlVerifyMedia.iProcSig = 225
+  FrmMediaCheck.btClose.Enabled = TRUE
+  FrmMediaCheck.btstart.Enabled = TRUE
+
+END
+
+PUBLIC SUB Form_Resize()
+
+
+
+END

Added: branches/iVL/FrmMediaCheck.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmMediaCheck.form	Tue Dec 30 13:01:20 2008
@@ -0,0 +1,56 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,83,53)
+  Text = ("")
+  Icon = Picture["images/throbber.gif"]
+  Arrangement = Arrange.Vertical
+  { pnlTop Panel
+    MoveScaled(1,1,78,45)
+    Expand = True
+    Arrangement = Arrange.Row
+    { tlBanner TextLabel
+      MoveScaled(1,1,32,4)
+      Background = Color.SelectedBackground
+      Foreground = Color.SelectedForeground
+      Expand = True
+      Text = ("VERIFY INSTALLATION FILES")
+      Alignment = Align.Center
+    }
+    { Separator1 Separator
+      MoveScaled(2,6,67,1)
+      Expand = True
+    }
+    { tlVerifyDetails TextLabel
+      MoveScaled(2,8,72,17)
+      Expand = True
+      Text = ("")
+    }
+    { MovieBox1 MovieBox
+      MoveScaled(30,24,5,18.2857)
+      Expand = True
+      Path = "/home/vluser/devel/installer/images/throbber.gif"
+    }
+    { ProgressBar1 ProgressBar
+      MoveScaled(2,41,74,3)
+      Visible = False
+      Expand = True
+    }
+  }
+  { Panel1 Panel
+    MoveScaled(1,46,79,4)
+    { btClose Button
+      MoveScaled(31,0,13,2)
+      Text = ("Close")
+    }
+    { btstop Button
+      MoveScaled(16,0,13,2)
+      Enabled = False
+      Text = ("Stop")
+    }
+    { btstart Button
+      MoveScaled(0,0,15,1)
+      Text = ("Start")
+    }
+  }
+}

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Tue Dec 30 13:01:20 2008
@@ -77,12 +77,16 @@
    IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) = -1 THEN
      tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'"  
& Space(1) & ("to begin installating") & Space(1)&
      Left(FrmSelISO.lstInstallableImg.text,  
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
+    FrmSelISO.btVerifyInstall.Enabled = TRUE
+    FrmSelISO.btVerifyInstall.ForeColor = Color.Black
    ELSE IF lstInstallableImg.Find(("No Installable Media Found")) <> -1 THEN
      tlBanner.Text = "<b>" & ("Unable to locate any installable media.")  
& "</b>"
      FMain.btnext.Enabled = FALSE
      FMain.btback.Enabled = FALSE
      FMain.btnext.ForeColor = Color.Gray
      FMain.btback.ForeColor = Color.Gray
+    FrmSelISO.btVerifyInstall.Enabled = FALSE
+    FrmSelISO.btVerifyInstall.ForeColor = Color.Gray
      ELSE
        tlBanner.text = "<b>" & ("Select installation media from the list  
below") & "</b>"
        WITH FMain
@@ -91,6 +95,8 @@
            .btnext.Enabled = TRUE
            .btnext.ForeColor = Color.Black
        END WITH
+      FrmSelISO.btVerifyInstall.Enabled = TRUE
+      FrmSelISO.btVerifyInstall.ForeColor = Color.Black
    END IF

  FMain.btnext.Enabled = TRUE
@@ -204,7 +210,8 @@
      '.lstInstallableImg.Move(4, .btResCan.top, .ClientWidth -  
((.lstInstallableImg.Left * 2) + .btResCan.Left))
     ' .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width -  
(.btResCan.Width + 24), 21)
      '.tlDistroDesc.Move(.lstInstallableImg.Left *  
2, .lstInstallableImg.top + .lstInstallableImg.Height + 48)
-    .tlDistroDesc.Move(4, .lstInstallableImg.top  
+ .lstInstallableImg.Height + 24, .ClientWidth - (.tlDistroDesc.left *  
2), .ClientHeight - (.tldistrodesc.top + .btrescan.height))
+    .tlDistroDesc.Move(4, .lstInstallableImg.top  
+ .lstInstallableImg.Height + 24, .ClientWidth - (.tlDistroDesc.left *  
2)) ', .ClientHeight - (.tldistrodesc.top + .btrescan.height))
+    .btVerifyInstall.Move(4, .tlDistroDesc.top + .tlDistroDesc.Height + 8,  
MdlObjSizer.get_object_width(.btVerifyInstall.Text) + 36, 21)
      '.FullScreen = TRUE
    END WITH

@@ -231,5 +238,11 @@
  PUBLIC SUB Form_Show()

    Form_Open()
+
+END
+
+PUBLIC SUB btVerifyInstall_Click()
+  FrmMediaCheck.sEntry = Trim(ME.lstInstallableImg.Text)
+  FrmMediaCheck.ShowDialog()

  END

Modified: branches/iVL/FrmSelISO.form
==============================================================================
--- branches/iVL/FrmSelISO.form	(original)
+++ branches/iVL/FrmSelISO.form	Tue Dec 30 13:01:20 2008
@@ -1,7 +1,7 @@
  # Gambas Form File 2.0

  { Form Form
-  MoveScaled(0,0,63,41)
+  MoveScaled(0,0,63,52)
    Text = ("")
    FullScreen = True
    { lstInstallableImg ComboBox
@@ -14,7 +14,7 @@
      Text = ("Select which VectorLinux version you wish to install from the  
list below")
    }
    { tlDistroDesc TextLabel
-    MoveScaled(1,16,60,23)
+    MoveScaled(1,15,60,27)
      Text = ("TextLabel1")
    }
    { btResCan Button
@@ -24,5 +24,11 @@
    }
    { hrSep Separator
      MoveScaled(2,7,43,1)
+  }
+  { btVerifyInstall Button
+    MoveScaled(1,43,26,3)
+    Enabled = False
+    Text = ("Verify Installation Files")
+    Picture = Picture["icon:/small/apply"]
    }
  }

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Tue Dec 30 13:01:20 2008
@@ -310,15 +310,6 @@
  EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetMnt &/ "dev"] WAIT


-' ' '
-' ' ' ' Mount home directory for user accounts
-' ' '   FOR EACH cbox IN MdlPartSel.oMountPoints
-' ' '       IF cbox.Text = "/home" THEN
-' ' '         EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt  
&/ "home"] WAIT
-' ' '       END IF
-' ' '   NEXT
-' ' '
-

  'We will run the commands neccisary to setup the newly installed system  
here
  EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"]  
WAIT

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Tue Dec 30 13:01:20 2008
@@ -137,7 +137,7 @@
  DIM sCmd AS String
  DIM sResults AS String
  DIM sList AS String
-DIM sDrives AS String[]
+DIM sDrives, sDumparr AS String[]
  DIM sDrive AS String
  DIM sMountPoint AS String
  DIM sDump AS String
@@ -151,6 +151,14 @@
  'sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f 2  
-d\':\'|xargs -n 2"
  sCmd = "probedisk|cut -d\'|\' -f1|cut -d\'/\' -f3"
  SHELL sCmd TO sList
+    ' additional check to make sure cdroms are detected
+      SHELL "cat /proc/sys/dev/cdrom/info | grep \"^drive name\" | cut -f  
2 -d\':\'|xargs -n 2" TO sDump
+        sDump = Trim(sDump)
+          sDumparr = Split(sdump, "\n")
+            FOR i = 0 TO sDumparr.count - 1
+              IF InStr(sList, Trim(sDumparr[i])) = FALSE THEN sList =  
sList & Space(1) & Trim(sDumparr[i])
+            NEXT
+
  sList = sList & Space(1) & sResults
  sList = Trim(sList)
  'PRINT sList

Added: branches/iVL/MdlVerifyMedia.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlVerifyMedia.module	Tue Dec 30 13:01:20 2008
@@ -0,0 +1,127 @@
+' Gambas module file
+'    This file is part of vinstall-ng
+
+'    vinstall-ng is free software: you can redistribute it and/or modify
+'    it under the terms of the GNU General Public License as published by
+'    the Free Software Foundation, either version 2 of the License, or
+'    (at your option) any later version.
+
+'    vinstall-ng  is distributed in the hope that it will be useful,
+'    but WITHOUT ANY WARRANTY; without even the implied warranty of
+'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'    GNU General Public License for more details.
+
+'    You should have received a copy of the GNU General Public License
+'    along with vinstall-ng.  If not, see <http://www.gnu.org/licenses/>.
+
+' <uel_sk8s> flog="/tmp/check-bulk.log"
+' <uel_sk8s>     lzmadec <$1 > /dev/null 2>&1
+' <uel_sk8s> if [ $? = 0 ]; then
+' <uel_sk8s>    echo "check-bulk $1 OK" >> $flog
+' <uel_sk8s>    exit 0
+' <uel_sk8s> else
+' <uel_sk8s>    echo "check-bulk $1 FAILED" >> $flog
+' <uel_sk8s>    exit 1
+' <uel_sk8s> fi
+
+PUBLIC hproc AS Process
+PUBLIC iProcSig AS Integer ' 225 will indicate stop now and dont continue
+
+PUBLIC FUNCTION VERIFY_BULK(sPathToBulk AS String) AS Integer
+
+  'DIM hproc AS Process
+  DIM iRetVal AS Integer
+
+  PRINT "Verifying " & sPathToBulk
+  'RETURN
+  'hproc = EXEC ["lzmadec", "< ", sPathToBulk, " >", "/dev/null"] WAIT
+  hproc = SHELL "lzmadec < " & sPathToBulk & " > /dev/null" ' WAIT
+    WAIT 1
+      IF hproc.State = Process.Running THEN
+        REPEAT
+          WAIT
+          FrmMediaCheck.MovieBox1.Playing = TRUE
+          FrmMediaCheck.btClose.Enabled = FALSE
+          FrmMediaCheck.btstart.Enabled = FALSE
+        UNTIL
+        iProcSig = 225 OR hproc.State = Process.Stopped
+      END IF
+
+  iRetVal = hproc.Value
+  RETURN iRetVal
+
+END
+
+PUBLIC SUB PERFORM_MEDIA_CHECK(sEntry AS String)
+  DIM sDevice AS String
+  DIM sImage AS String
+  DIM sBulkList AS String
+  DIM sArrBulks AS String[]
+  DIM sBulk AS String
+  DIM i, iBlkCnt, iRes AS Integer
+  DIM sBulkBasePath AS String = "/mnt/loop/veclinux"
+
+  FrmMediaCheck.ProgressBar1.Visible = TRUE
+
+  sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/") + 1)
+  IF InStr(sEntry, ".iso on") THEN
+    ' this is an iso, we must mount the drive and then the ISO
+      sDevice = Right(sEntry, Len(sEntry) - InStr(sEntry, "/"))
+      sImage = Left(sEntry, InStr(sEntry, " "))
+          ' perform the mounting
+          EXEC ["mkdir", "/mnt/loop"] WAIT
+          EXEC ["mkdir", "/mnt/source"] WAIT
+          EXEC ["mount", sDevice, "/mnt/source"] WAIT
+          EXEC ["mount", "-o", "loop", "/mnt/source" &/  
sImage, "/mnt/loop"] WAIT
+  ELSE ' Actual CD Media
+      EXEC ["mkdir", "/mnt/source"] WAIT
+      EXEC ["mount", sDevice, "/mnt/loop"] ' Mount it to loop, just to  
keep this consistant.
+
+  END IF
+
+    ' Get the list of bulks on this install
+      SHELL "cat " & sBulkBasePath &/ "SETUP.CONF" & Space(1) & "| grep  
\"^BULK\" | cut -f 1 -d \':\'" TO sBulkList
+      ' ^ That produces something like "BULK0='required/veclinux.tlz", so  
we need to strip it still
+          sBulkList = Trim(sBulkList)
+          sArrBulks = Split(sBulkList, "\n")
+          iBlkCnt = sArrBulks.Count - 1
+            FOR i = 0 TO sArrBulks.Count - 1
+              sBulk = Right(sArrBulks[i], Len(sArrBulks[i]) -  
InStr(sArrBulks[i], "\'"))
+                IF Exist(sBulkBasePath &/ sBulk) AND iProcSig <> 225 THEN
+                    FrmMediaCheck.ProgressBar1.Value = i / iBlkCnt
+                      IF ME.VERIFY_BULK(sBulkBasePath &/ sBulk) <> 0 AND  
iProcSig <> 225 THEN
+                        FrmMediaCheck.MovieBox1.Playing = FALSE
+                          Message.Error(sBulk & Space(1) & ("has failed  
the test!") & "<br>" &
+                          ("This could either mean your download or burn  
process was corrupted"))
+                        BREAK
+                      END IF
+                      'Message(ME.VERIFY_BULK(sBulkBasePath &/ sBulk))
+                    'Message(sBulk)
+                ELSE IF iProcSig = 225 THEN
+                  FrmMediaCheck.MovieBox1.Playing = FALSE
+                  'Message.Error("Process abort signal received from user")
+                  BREAK
+                  RETURN
+
+                END IF
+                WAIT 1
+            NEXT
+
+      EXEC ["umount", "/mnt/source"] WAIT
+      EXEC ["umount", "/mnt/loop"] WAIT
+
+  IF iProcSig = 225 THEN
+    Message.Error("Process stopped by user")
+    FrmMediaCheck.MovieBox1.Playing = FALSE
+    FrmMediaCheck.btstart.Enabled = TRUE
+    FrmMediaCheck.btClose.Enabled = TRUE
+    RETURN
+  END IF
+  Message.Info("All tests passed. You can continue to install safely")
+  FrmMediaCheck.MovieBox1.Playing = FALSE
+  FrmMediaCheck.btstop.Enabled = FALSE
+  FrmMediaCheck.btClose.Enabled = TRUE
+  FrmMediaCheck.btstart.Enabled = TRUE
+END
+
+

Added: branches/iVL/images/throbber.gif
==============================================================================
Binary file. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r441 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Wed Dec 24 08:16:00 2008
New Revision: 441

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/MdlConfLilo.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/installer.gambas

Log:
- Fixed bug with home partition not getting mounted
- Fixed "Do not format" string in /etc/fstab


Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 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	Wed Dec 24 08:16:00 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.15
+Version=0.1.14
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Wed Dec 24 08:16:00 2008
@@ -310,14 +310,14 @@
  EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetMnt &/ "dev"] WAIT


-
-' Mount home directory for user accounts
-  FOR EACH cbox IN MdlPartSel.oMountPoints
-      IF cbox.Text = "/home" THEN
-        EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt &/ "home"] WAIT
-      END IF
-  NEXT
-
+' ' '
+' ' ' ' Mount home directory for user accounts
+' ' '   FOR EACH cbox IN MdlPartSel.oMountPoints
+' ' '       IF cbox.Text = "/home" THEN
+' ' '         EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt  
&/ "home"] WAIT
+' ' '       END IF
+' ' '   NEXT
+' ' '


  'We will run the commands neccisary to setup the newly installed system  
here

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Wed Dec 24 08:16:00 2008
@@ -36,28 +36,40 @@


      '/DISABLED FOR TESTING INSTALL ONLY
-    SHELL "mount " & ClsPartSel.sRoot & Space(1) & ClsGlobal.sTargetMnt  
WAIT  'moun the root partition first
-    IF ClsPartSel.sHome THEN
-       SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
-       SHELL "mount " & ClsPartSel.sHome & Space(1) & ClsGlobal.sTargetMnt  
&/ "home -t " & LCase(ClsPartSel.fhome) WAIT 'mount the home partition if  
defined
-
-    END IF
-    IF ClsPartSel.sUsr THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
-      SHELL "mount " & ClsPartSel.sUsr & Space(1) & ClsGlobal.sTargetMnt  
&/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the user partition
-    END IF
-    IF ClsPartSel.sOpt THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
-      SHELL "mount " & ClsPartSel.sOpt & Space(1) & ClsGlobal.sTargetMnt  
&/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
-    END IF
-    IF ClsPartSel.sVar THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
-      SHELL "mount " & ClsPartSel.sVar & Space(1) & ClsGlobal.sTargetMnt  
&/ "var -t " & ClsPartSel.fVar WAIT
-    END IF
-    IF ClsPartSel.sTmp THEN
-      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
-      SHELL "mount " & ClsPartSel.sTmp & Space(1) & ClsGlobal.sTargetMnt  
&/ "tmp -t " & ClsPartSel.fTmp WAIT
-    END IF
+    'SHELL "mount " & ClsPartSel.sRoot & Space(1) & ClsGlobal.sTargetMnt  
WAIT  'moun the root partition first
+    EXEC ["mount", ClsPartSel.sRoot, ClsGlobal.sTargetMnt] WAIT
+
+      FOR EACH cb IN MdlPartSel.oMountPoints
+        IF cb.Text <> "/" THEN
+          IF cb.Text <> ("Not Used") THEN
+            EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+            EXEC ["mount", cb.Tag, ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+          END IF
+        END IF
+      NEXT
+
+    '
+    ' IF ClsPartSel.sHome THEN
+    '    SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
+    '    SHELL "mount " & ClsPartSel.sHome & Space(1) &  
ClsGlobal.sTargetMnt &/ "home -t " & LCase(ClsPartSel.fhome) WAIT 'mount  
the home partition if defined
+    '
+    ' END IF
+    ' IF ClsPartSel.sUsr THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
+    '   SHELL "mount " & ClsPartSel.sUsr & Space(1) & ClsGlobal.sTargetMnt  
&/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the user partition
+    ' END IF
+    ' IF ClsPartSel.sOpt THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
+    '   SHELL "mount " & ClsPartSel.sOpt & Space(1) & ClsGlobal.sTargetMnt  
&/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
+    ' END IF
+    ' IF ClsPartSel.sVar THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
+    '   SHELL "mount " & ClsPartSel.sVar & Space(1) & ClsGlobal.sTargetMnt  
&/ "var -t " & ClsPartSel.fVar WAIT
+    ' END IF
+    ' IF ClsPartSel.sTmp THEN
+    '   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+    '   SHELL "mount " & ClsPartSel.sTmp & Space(1) & ClsGlobal.sTargetMnt  
&/ "tmp -t " & ClsPartSel.fTmp WAIT
+    ' END IF


        IF ClsPkgSel.bCustom = TRUE THEN
@@ -66,9 +78,9 @@
          MdlInstallSys.PERFORM_FULL_INSTALL()
        END IF

-      FOR EACH cb IN MdlPartSel.oMountPoints
-        IF Left(cb.Text, Len("/mnt")) = "/mnt" THEN EXEC ["mkdir", "-p",  
ClsGlobal.sTargetMnt &/ cb.Text] WAIT
-      NEXT
+      ' FOR EACH cb IN MdlPartSel.oMountPoints
+      '   IF Left(cb.Text, Len("/mnt")) = "/mnt" THEN EXEC ["mkdir", "-p",  
ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+      ' NEXT
        MdlCore.warn_status_off
  END

@@ -148,10 +160,27 @@
               IF cb.tag = ClsPartSel.sRoot THEN
                  FOR EACH mt IN MdlPartSel.oFsTypes
                    IF mt.tag = cb.tag THEN
+                      IF mt.Text = ("Do not format") THEN
+                        SHELL "sfmt=$(parted " & sDrive & " print | grep  
^\'" & sBlank & spartNo & "\'); echo $sfmt | cut -f 6 -d \' \'" TO sRes
+                        sRes = Trim(sRes)
+                              ' Warn about inability to detect root  
partition format
+                                IF Len(sRes) = 0 THEN
+                                  Message.Warning(("Setup is unable to  
detect for current filesystem for your / partition.") & gb.NewLine &
+                                  ("Please return to the partitioning  
stage and select a filesystem for your / partition."))
+                                  RETURN 1
+                                END IF
+
+                            ' write the detected format to fstab
+                            sFstab = sFstab & "\n" &
+                            mt.Tag & Space(5) & "/" & Space(5) &  
Trim(sRes) & Space(5) & "defaults 0 1 \n"
+
+                      ELSE
+
                      sFstab = sFstab & "\n" &
                      mt.tag & Space(5) & Space(5) & "/" & Space(5) &  
Trim(mt.text) & Space(5) & "defaults 0 1" & "\n"

                    END IF
+                END IF
                  NEXT
               ELSE
              FOR EACH mt IN MdlPartSel.oFsTypes

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r440 - branches/iVL

[<cod...@go...>]

Author: uelsk8s
Date: Mon Dec 22 23:45:09 2008
New Revision: 440

Modified:
    branches/iVL/MdlConfLilo.module

Log:
fixed formatting of first reboot welcome dialog

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Mon Dec 22 23:45:09 2008
@@ -355,11 +355,9 @@
   sOut = "#!/bin/bash \n" &
   ". /sbin/vasm-functions \n" &
   "TEXT=\" \n" &
- "Vector Linux Has been Installed. \n" &
- "Welcome back. \n" &
- "We will now continue with final system configuration. \n" &
- "On the next screen you can setup the GUI or use one of the preconfigured  
settings. \n" &
- "any other system fine tuning can be done from VASM.  Enjoy AND happy  
Vectoring...\" \n" &
+ "Vector Linux Has been Installed. " &
+ "We will finalize video settings on the next few screens. " &
+ "Any other system fine tuning can be done via VASM.  \n\nEnjoy AND happy  
Vectoring...\" \n" &
   "$DCMD --backtitle \"$BACKTITLE\" --title \"CONGRATULATIONS\" " &
   "--msgbox \"$TEXT\" 0 0 2>/dev/NULL  \n" &
   "#cd / && sh /var/log/scripts/x11-fonts* \n " &

[Vectorlinux-devel] [vinstall-ng commit] r439 - branches/iVL/.lang

[<cod...@go...>]

Author: M0E.lnx
Date: Mon Dec 22 17:48:50 2008
New Revision: 439

Modified:
    branches/iVL/.lang/en_US.po

Log:
Fixed typos in en_US.po (Thanks Lagagnon)

Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po	(original)
+++ branches/iVL/.lang/en_US.po	Mon Dec 22 17:48:50 2008
@@ -187,8 +187,8 @@
  msgstr "Check this box if you have a Windows installation on your system  
or any other windows partition (FAT, FAT32, NTFS) that you want  
auto-mounted as soon as your computer starts"

  #: FrmUserAdd.class:505
-msgid "Choose a unique name for each user. Enter the password for twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue."
-msgstr "Choose a unique name for each user. Enter the password for twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue."
+msgid "Choose a unique name for each user. Enter the password twice for  
accuracy. You can make as many users as you want, and when you are finished  
click next to continue."
+msgstr "Choose a unique name for each user. Enter the password twice for  
accuracy. You can make as many users as you want, and when you are finished  
click next to continue."

  #: FrmZoneSet.class:146
  msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know  
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).  
Otherwise,\nChoose localtime since most PCs are setup this way."
@@ -827,7 +827,7 @@
  msgstr "Primary DNS Server"

  #: FrmXconf.class:27
-msgid "Probe hardware to setup your Graphical Environment using your  
preffered settings"
+msgid "Probe hardware to setup your Graphical Environment using your  
prefered settings"
  msgstr ""

  #: FrmLilo.class:267 FrmLiloSetup.class:273
@@ -924,10 +924,10 @@

  #: FrmPartScheme.class:60
  msgid "Select this option if you already have a linux installation that  
you wish to overwrite or if a linux partition scheme exists in your hard  
disk."
-msgstr "Select this option if you already have a linux installation that  
you wish to overwrite or if a linux parition scheme exists in your hard  
disk"
+msgstr "Select this option if you already have a linux installation that  
you wish to overwrite or if a linux parition scheme exists in your hard  
disk."

  #: FrmPartScheme.class:70
-msgid "Select this option is you wish to create, more or resize partitions  
in order to make room for your new VectorLinux installation."
+msgid "Select this option is you wish to create, move or resize partitions  
in order to make room for your new VectorLinux installation."
  msgstr "Select this option if you wish to create, move or resize  
partitions in order to make room for your new VectorLinux installation."

  #: FrmSelISO.class:262
@@ -947,7 +947,7 @@
  msgstr ""

  #: FrmUsrPkgSel.class:11
-msgid "Select your indivirual packages to install."
+msgid "Select your individual packages to install."
  msgstr "Select your individual packages to install"

  #: FrmLangSel.class:118
@@ -955,8 +955,8 @@
  msgstr "Select your language"

  #: FrmImportAccts.class:93
-msgid "Selected passwords dont match. Please enter the same password twice"
-msgstr ""
+msgid "Selected passwords don't match. Please enter the same password  
twice"
+msgstr "Selected passwords don't match. Please enter the same password  
twice"

  #: FrmRootPass.class:165
  msgid "Set Password"

[Vectorlinux-devel] [vinstall-ng commit] r438 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Mon Dec 22 13:39:31 2008
New Revision: 438

Modified:
    branches/iVL/FrmRootPass.class
    branches/iVL/FrmUserAdd.form

Log:
Fixed typos in frmrootpass and frmuseradd

Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class	(original)
+++ branches/iVL/FrmRootPass.class	Mon Dec 22 13:39:31 2008
@@ -13,10 +13,10 @@
      .tlBanner.Width = MdlObjSizer.get_object_width(.tlBanner.text)
      .tlBanner.Height = 42
      .tlBanner.Raise
-    .tlAboutRoot.text = ("The linux root account is pre-defined to be used  
as ths system administrator\'s account." &
+    .tlAboutRoot.text = ("The linux root account is pre-defined to be used  
as ths system administrator\'s account." & Space(1)&
          "This account is used to perform system-wide changes such as  
adding / removing software, system-wide updates," &
          "managing user accounts, etc.") & "<br><br>" & ("Most other  
every-day taks do not require administrative priviledges.")&
-        "<br><br>" & ("For added security, use a password that is easy for  
you to remember, but hard for others to guess")
+        "<br><br>" & ("For added security, use a password that is easy for  
you to remember, but hard for others to guess.")

      .tlPass1.Alignment = Align.normal
      .tlPass2.Alignment = Align.Normal

Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form	(original)
+++ branches/iVL/FrmUserAdd.form	Mon Dec 22 13:39:31 2008
@@ -5,7 +5,7 @@
    Text = ("")
    { tlExp TextLabel
      MoveScaled(1,9,55,6)
-    Text = ("Choose a unique name for each user. Enter the password for  
twice for accuracy. You can make as many users as you want, and when you  
are finished click next to continue.")
+    Text = ("Choose a unique name for each user. Enter the password twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue.")
    }
    { tbUsername TextBox
      MoveScaled(17,18,15,3)
@@ -100,7 +100,7 @@
      Alignment = Align.Normal
    }
    { frmUserList Frame
-    MoveScaled(35,16,18.8571,17)
+    MoveScaled(35,16,18.7778,17)
      Text = ("User Accounts")
      { LstUsers ScrollView
        MoveScaled(1,2,17,13)

[Vectorlinux-devel] [vinstall-ng commit] r437 - in branches/iVL: . .lang

[<cod...@go...>]

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.

[Vectorlinux-devel] [vinstall-ng commit] r436 - in branches/iVL: . .lang

[<cod...@go...>]

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.

[Vectorlinux-devel] [vinstall-ng commit] r435 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Mon Dec 22 08:48:13 2008
New Revision: 435

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:
Restored support for multiple network intefaces

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Mon Dec 22 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 08:48:13 2008
@@ -1,8 +1,8 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
-Startup=MdlCore
-Version=0.1.25
+Startup=FrmNetConf
+Version=0.1.26
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,7 +17,6 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Mon Dec 22 08:48:13 2008
@@ -47,12 +47,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

      ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()

@@ -150,13 +150,13 @@
    'ME.Form_Open()
        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 08:48:13 2008
@@ -61,7 +61,8 @@
  '     objcbWifiessid = NEW Object[]
       objIntTypes = NEW Object[]

-       SHELL "res=$(ifconfig -a | grep ^eth0 | grep -v ^lo); echo \"$res\"  
| tr -s \' \'\"\" " TO seths
+       '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
      seths = Trim(seths)

             IF seths = "" THEN  ' WARN IF NO NETWORK HARDWARE CAN BE  
DETECTED AND EXIT WITHOUT ERROR
@@ -128,24 +129,18 @@
              .Height = 21
              .Width = MdlObjSizer.get_object_width(.Text) + 16
              .Move(tl.Left + tl.Width + 4, tl.Top)
+            .Tag = sDev
              END WITH
-        ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' INTERFACE  
TYPE LABEL
-        ' ' ' ' '     WITH tl
-        ' ' ' ' '         .Text = ("Interface Type")
-        ' ' ' ' '         .Width = MdlObjSizer.get_object_width(.Text)
-        ' ' ' ' '         .Height = 21
-        ' ' ' ' '         .Alignment = Align.Normal
-        ' ' ' ' '         .Move(tb.Left + tb.Width + 4, tb.Top)
-        ' ' ' ' '     END WITH
-        ' ' ' ' '
-            y = y + tb.Top + tb.Height + 4
+
+ '           y = y + tb.Top + tb.Height + 4
          bcb = NEW CheckBox(FrmNetConf.TSNetDevices)  
AS "bEnableInterface"  '************ enabled / disabled checkbox  
**************************
            WITH bcb
              .Value = TRUE
                .Text = ("Automatically activate this interface at start-up")
                .Height = 21
                .Width = MdlObjSizer.get_object_width(.Text) + 36
-              .Move(4, y)
+              .Move(4, tb.top + tb.Height + 4)
+              .Tag = sDev
            END WITH
            ME.objCheckboxes.Add(bcb)
              y = bcb.top + bcb.Height + 8
@@ -166,6 +161,7 @@
                .Height = 21
                .Width = MdlObjSizer.get_object_width("STATIC") * 2
                .move(tl.Left + tl.Width + 4, y)
+              .Tag = sDev
              END WITH
              ME.objCombos.Add(cb)

@@ -192,7 +188,8 @@
  END WITH  ' END JACKING WITH TABSTRIP  
========================================================================


-
+          INC FrmNetConf.TSNetDevices.Count
+          'FrmNetConf.TSNetDevices.Count = FrmNetConf.TSNetDevices.Count -  
1

            NEXT
  END
@@ -978,9 +975,22 @@
    DIM tl AS TextLabel
    DIM itxtleft, itxtwidth, imandnsleft, imandnstxtleft, itlwidth AS Integer

+  IF iFrameTop < 101 THEN iFrameTop = 110
+
    IF NOT LAST.text THEN RETURN
-    iFrameTop = LAST.top + LAST.Height + 4
+    'iFrameTop = LAST.top + LAST.Height + 4
    IF LAST.text = "STATIC" THEN
+
+  ' ============== delete the label ======
+  FOR EACH tl IN objtlDetails
+    IF tl.Tag = LAST.tag THEN
+    objtlDetails.Remove(objtlDetails.Find(tl))
+    tl.Delete
+    END IF
+  NEXT
+'  == == = CREATE NEW frame ==
+
+
                  frmDetails = NEW Frame(FrmNetConf.TSNetDevices)  
AS "STaticDetails"
                    WITH frmDetails
                      '.Move(ileft, itop + 8)
@@ -1058,11 +1068,11 @@
                                END WITH


-                    FOR EACH tl IN objtlDetails
-                      IF tl.tag = LAST.tag THEN
-                        objtlDetails.Delete(objtlDetails.Find(tl))
-                      END IF
-                    NEXT
+                    ' FOR EACH tl IN objtlDetails
+                    '   IF tl.tag = LAST.tag THEN
+                    '     objtlDetails.Delete(objtlDetails.Find(tl))
+                    '   END IF
+                    ' NEXT

    ELSE
      'Message(LAST.text)
@@ -1074,7 +1084,7 @@
      NEXT
          ' create a text label that says the thing will get automatically  
configured

-        IF iFrameTop < 101 THEN iFrameTop = 101
+        IF iFrameTop < 101 THEN iFrameTop = 110

          tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DetailLbl"
            WITH tl

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r434 - in branches/iVL: . .lang

[<cod...@go...>]

Author: uelsk8s
Date: Sun Dec 21 01:56:57 2008
New Revision: 434

Added:
    branches/iVL/.lang/no.mo   (contents, props changed)
Modified:
    branches/iVL/.lang/FrmPartSel.pot
    branches/iVL/.lang/en_US.mo
    branches/iVL/.lang/en_US.po
    branches/iVL/.lang/es.mo
    branches/iVL/.lang/es.po
    branches/iVL/.lang/no.po
    branches/iVL/.lang/ru.mo
    branches/iVL/.lang/ru.po
    branches/iVL/.project
    branches/iVL/FrmPartSel.class
    branches/iVL/MdlNetConf.module
    branches/iVL/installer.gambas

Log:
fixed typo in frmprtsel detect only eth0 updated binary

Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Sun Dec 21 01:56:57 2008
@@ -43,7 +43,7 @@
  msgstr ""

  #: FrmPartSel.class:150
-msgid "but you should considear a higher value to make sure you have room  
to install additional software"
+msgid "but you should consider a higher value to make sure you have room  
to install additional software"
  msgstr ""

  #: FrmPartSel.class:150
@@ -59,7 +59,7 @@
  msgstr ""

  #: FrmPartSel.class:150
-msgid "Using a swap partition is suggested if your total RAM is less than  
1GB. Suggested ammount"
+msgid "Using a swap partition is suggested if your total RAM is less than  
1GB. Suggested amount"
  msgstr ""

  #: FrmPartSel.class:150
@@ -67,7 +67,7 @@
  msgstr ""

  #: FrmPartSel.class:150
-msgid "but can also be calculated as 2 times your ammount of RAM"
+msgid "but can also be calculated as 2 times your amount of RAM"
  msgstr ""

  #: FrmPartSel.class:181

Modified: branches/iVL/.lang/en_US.mo
==============================================================================
Binary files. No diff available.

Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po	(original)
+++ branches/iVL/.lang/en_US.po	Sun Dec 21 01:56:57 2008
@@ -38,7 +38,7 @@
  msgid "1600x1200"
  msgstr "-"

-#: FrmNetConf.class:246
+#: FrmNetConf.class:262
  msgid "192.168.1.254"
  msgstr "-"

@@ -74,10 +74,6 @@
  msgid "About the root account"
  msgstr ""

-#: MdlNetConf.module:280
-msgid "Access Point"
-msgstr "ESSID"
-
  #: FrmImportAccts.class:310
  msgid "Account"
  msgstr ""
@@ -106,11 +102,11 @@
  msgid "Allow user to mount / un-mount Removable HD Storage Devices"
  msgstr ""

-#: MdlNetConf.module:324
+#: MdlNetConf.module:1083
  msgid "Automatic settings via DHCP."
  msgstr "Automatic settings via DHCP."

-#: MdlNetConf.module:196
+#: MdlNetConf.module:145
  msgid "Automatically activate this interface at start-up"
  msgstr "Automatically activate this interface at start-up"

@@ -118,7 +114,7 @@
  msgid "BROUGHT TO YOU BY"
  msgstr ""

-#: FrmSummary.class:187
+#: FrmSummary.class:188
  msgid "BULK PACKAGES"
  msgstr ""

@@ -126,7 +122,7 @@
  msgid "BULK PACKAGES:"
  msgstr "BULK PACKAGES:"

-#: FMain.class:834
+#: FMain.class:835
  msgid "Back"
  msgstr "Back"

@@ -162,7 +158,7 @@
  msgid "Bootsplash Extra high"
  msgstr "Bootsplash Extra High"

-#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:83
+#: FrmLilo.class:262 FrmLiloSetup.class:36 MdlLilo.module:83
  msgid "Bootsplash High"
  msgstr "Bootsplash High"

@@ -174,7 +170,7 @@
  msgid "Build Date: "
  msgstr "Build Date: "

-#: FMain.class:870
+#: FMain.class:871
  msgid "Button1"
  msgstr "-"

@@ -190,7 +186,7 @@
  msgid "Check this box if you have a Windows installation on your system or  
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted  
as soon as your computer starts"
  msgstr "Check this box if you have a Windows installation on your system  
or any other windows partition (FAT, FAT32, NTFS) that you want  
auto-mounted as soon as your computer starts"

-#: FrmUserAdd.class:501
+#: FrmUserAdd.class:505
  msgid "Choose a unique name for each user. Enter the password for twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue."
  msgstr "Choose a unique name for each user. Enter the password for twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue."

@@ -210,7 +206,7 @@
  msgid "Choose your optional components to install."
  msgstr ""

-#: FrmUserAdd.class:573
+#: FrmUserAdd.class:577
  msgid "Clear Form"
  msgstr ""

@@ -226,7 +222,7 @@
  msgid "ComboBox1"
  msgstr "-"

-#: FrmNetConf.class:207
+#: FrmNetConf.class:223
  msgid "Computer Name"
  msgstr "Computer Name"

@@ -238,7 +234,7 @@
  msgid "Configure and install lilo (Linux Boot Loader)"
  msgstr "Configure and install lilo (Linux Boot Loader)"

-#: FrmUserAdd.class:567
+#: FrmUserAdd.class:571
  msgid "Create User"
  msgstr "Create User"

@@ -254,6 +250,10 @@
  msgid "Current Status"
  msgstr "Current Status"

+#: MdlNetConf.module:174
+msgid "Current Status:"
+msgstr ""
+
  #: FrmInstallSys.class:58
  msgid "Current Step"
  msgstr "Current Step"
@@ -302,11 +302,11 @@
  msgid "Do not install LILO"
  msgstr ""

-#: FrmSummary.class:124 MdlInstallSys.module:184 MdlWinDrives.module:124
+#: FrmSummary.class:124 MdlInstallSys.module:184 MdlWinDrives.module:125
  msgid "Do not mount"
  msgstr "Do not mount"

-#: FrmNetConf.class:219
+#: FrmNetConf.class:235
  msgid "Domain"
  msgstr ""

@@ -318,7 +318,7 @@
  msgid "Done"
  msgstr ""

-#: MdlNetConf.module:324
+#: MdlNetConf.module:1083
  msgid "Dynamic Host Control Protocol"
  msgstr "Dynamic Host Control Protocol"

@@ -326,15 +326,7 @@
  msgid "Elite user"
  msgstr ""

-#: MdlNetConf.module:261
-msgid "Encryption key"
-msgstr "Encryption Key"
-
-#: MdlNetConf.module:235
-msgid "Encryption type"
-msgstr "Encryption type"
-
-#: FrmRootPass.class:143 FrmUserAdd.class:587
+#: FrmRootPass.class:143 FrmUserAdd.class:591
  msgid "Enter Password"
  msgstr "Enter Password"

@@ -354,11 +346,11 @@
  msgid "Enter the same password twice"
  msgstr ""

-#: MdlInstallSys.module:524
+#: MdlInstallSys.module:528
  msgid "Error occurred while installing"
  msgstr ""

-#: MdlInstallCustom.module:348
+#: MdlInstallCustom.module:354
  msgid "Error while installing "
  msgstr "Error while installing "

@@ -370,7 +362,7 @@
  msgid "Error while installing system configuration. "
  msgstr "Error while installing system configuration. "

-#: FMain.class:845
+#: FMain.class:846
  msgid "Exit Installation"
  msgstr "Exit Installation"

@@ -378,11 +370,11 @@
  msgid "FILESYSTEM"
  msgstr "FYLESYSTEM"

-#: MdlInstallSys.module:819
+#: MdlInstallSys.module:500
  msgid "Failed to install"
  msgstr ""

-#: MdlInstallCustom.module:219
+#: MdlInstallCustom.module:225
  msgid "Failed to install. Installation will stop"
  msgstr ""

@@ -402,7 +394,7 @@
  msgid "Find installation media"
  msgstr "Find installation media"

-#: MdlInstallSys.module:645
+#: MdlInstallSys.module:649
  msgid "Finished intalling Bulks"
  msgstr "Finished intalling Bulks"

@@ -434,7 +426,7 @@
  msgid "GUI installer for Vector linux"
  msgstr "GUI installer for Vector linux"

-#: MdlNetConf.module:433
+#: MdlNetConf.module:1045
  msgid "Gateway Address"
  msgstr "Gateway Address"

@@ -458,11 +450,11 @@
  msgid "HAL"
  msgstr ""

-#: MdlNetConf.module:156
+#: MdlNetConf.module:117
  msgid "Hardware Address"
  msgstr "Hardware Address"

-#: FrmPartSel.class:186 FrmUserAdd.class:554
+#: FrmPartSel.class:186 FrmUserAdd.class:558
  msgid "Help"
  msgstr "Help"

@@ -470,7 +462,7 @@
  msgid "INSTALL TYPE:"
  msgstr "INSTALL TYPE:"

-#: MdlNetConf.module:388
+#: MdlNetConf.module:1000
  msgid "IP Address"
  msgstr "IP Address"

@@ -478,9 +470,9 @@
  msgid "IceWM settings, preferences, menu"
  msgstr ""

-#: MdlNetConf.module:324
-msgid "If in doubt, choose this option"
-msgstr "If in doubt, choose this option"
+#: MdlNetConf.module:1083
+msgid "If in doubt, choose this option."
+msgstr ""

  #: FrmDone.class:60
  msgid "If you installed from  CD-ROM/R/RW media, please remove de disk  
before restarting."
@@ -494,7 +486,7 @@
  msgid "Import Account"
  msgstr ""

-#: FrmImportAccts.class:398 FrmUserAdd.class:626
+#: FrmImportAccts.class:398 FrmUserAdd.class:630
  msgid "Import Existing User Accounts"
  msgstr ""

@@ -530,7 +522,7 @@
  msgid "Installation Summary"
  msgstr "Installation Summary"

-#: FrmSummary.class:293
+#: FrmSummary.class:294
  msgid "Installation Type"
  msgstr ""

@@ -546,11 +538,11 @@
  msgid "Installation is finished"
  msgstr ""

-#: MdlInstallSys.module:760
+#: MdlInstallSys.module:764
  msgid "Installation phase complete. Ready for configuration"
  msgstr "Installation phase complete. Ready for configuration"

-#: MdlInstallCustom.module:205 MdlInstallSys.module:486
+#: MdlInstallCustom.module:211 MdlInstallSys.module:486
  msgid "Installing"
  msgstr "Installing"

@@ -558,15 +550,15 @@
  msgid "Installing ..."
  msgstr "Installing ..."

-#: MdlInstallSys.module:805
+#: MdlInstallSys.module:809
  msgid "Installing Required Package ..."
  msgstr ""

-#: MdlInstallSys.module:763
+#: MdlInstallSys.module:767
  msgid "Installing default system configuration and required software."
  msgstr "Installing default system configuration and required software."

-#: MdlInstallCustom.module:265
+#: MdlInstallCustom.module:271
  msgid "Installing user-selected package"
  msgstr ""

@@ -574,10 +566,6 @@
  msgid "Installs all optional components in your VectorLinux media to your  
system"
  msgstr ""

-#: MdlNetConf.module:177
-msgid "Interface Type"
-msgstr "Interface Type"
-
  #: MdlDiskPart.module:46
  msgid "It is still possible to install VectorLinux on your system, but you  
need to pre-partition your disks first"
  msgstr "It is still possible to install VectorLinux on your system, but  
you need to pre-partition your disk first"
@@ -618,7 +606,7 @@
  msgid "LocalTime"
  msgstr "LocalTime"

-#: FrmUserAdd.class:580
+#: FrmUserAdd.class:584
  msgid "Login Name"
  msgstr ""

@@ -646,7 +634,7 @@
  msgid "MPlayer Multimedia Player Settings"
  msgstr ""

-#: FrmNetConf.class:235
+#: FrmNetConf.class:251
  msgid "Manual DNS Server Specification"
  msgstr "Manual DNS Server Specification"

@@ -670,7 +658,7 @@
  msgid "Name"
  msgstr "Name"

-#: FrmNetConf.class:192 MdlCore.module:531
+#: FrmNetConf.class:208 MdlCore.module:531
  msgid "Network Configuration"
  msgstr "Network Configuration"

@@ -678,7 +666,7 @@
  msgid "New Password"
  msgstr ""

-#: FMain.class:856
+#: FMain.class:857
  msgid "Next"
  msgstr "Next"

@@ -690,11 +678,11 @@
  msgid "No Installable Media Found"
  msgstr "No Installable Media Found"

-#: MdlWinDrives.module:141
+#: MdlWinDrives.module:142
  msgid "No Windows partitions detected"
  msgstr "No Windows partitions detected"

-#: MdlNetConf.module:95
+#: MdlNetConf.module:78
  msgid "No ethernet neworking devices found"
  msgstr ""

@@ -706,11 +694,11 @@
  msgid "No, I Do Not Agree"
  msgstr ""

-#: FrmSummary.class:101 MdlLilo.module:203 MdlNetConf.module:248
+#: FrmSummary.class:101 MdlLilo.module:203 MdlNetConf.module:1241
  msgid "None"
  msgstr "None"

-#: FrmSummary.class:53 MdlInstallSys.module:136 MdlPartSel.module:150
+#: FrmSummary.class:53 MdlInstallSys.module:136 MdlPartSel.module:147
  msgid "Not Used"
  msgstr "Not Used"

@@ -742,7 +730,7 @@
  msgid "Package"
  msgstr ""

-#: FrmSummary.class:178 FrmUsrPkgSel.class:16
+#: FrmSummary.class:179 FrmUsrPkgSel.class:16
  msgid "Package Name"
  msgstr ""

@@ -758,7 +746,7 @@
  msgid "Partition"
  msgstr ""

-#: FrmSummary.class:303
+#: FrmSummary.class:304
  msgid "Partition Selection Scheme"
  msgstr ""

@@ -790,7 +778,7 @@
  msgid "Please select an account name from the dropdown list."
  msgstr ""

-#: MdlPartSel.module:296
+#: MdlPartSel.module:299
  msgid "Please select only one "
  msgstr "Please select only one "

@@ -818,7 +806,7 @@
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr "Please wait while setup attempts to run the partitioning utility"

-#: MdlNetConf.module:134
+#: MdlNetConf.module:103
  msgid "Plugged-in"
  msgstr "Plugged-in"

@@ -834,7 +822,7 @@
  msgid "Preparing filesystems"
  msgstr ""

-#: FrmNetConf.class:251
+#: FrmNetConf.class:267
  msgid "Primary DNS Server"
  msgstr "Primary DNS Server"

@@ -842,10 +830,6 @@
  msgid "Probe hardware to setup your Graphical Environment using your  
preffered settings"
  msgstr ""

-#: MdlNetConf.module:60
-msgid "Probing your networking hardware ... Please wait"
-msgstr ""
-
  #: FrmLilo.class:267 FrmLiloSetup.class:273
  msgid "Prompt Timeout"
  msgstr "Prompt Timeout"
@@ -862,7 +846,7 @@
  msgid "Re-Enter Password"
  msgstr "Re-Enter Password"

-#: FrmUserAdd.class:594
+#: FrmUserAdd.class:598
  msgid "ReEnter Password"
  msgstr "ReEnter Password"

@@ -870,7 +854,7 @@
  msgid "Reading available software selection ... Please wait"
  msgstr ""

-#: FrmUserAdd.class:610
+#: FrmUserAdd.class:614
  msgid "Real Name"
  msgstr ""

@@ -890,10 +874,6 @@
  msgid "Restricted administrator (backup)"
  msgstr ""

-#: MdlNetConf.module:308
-msgid "STATUS:"
-msgstr "STATUS:"
-
  #: MdlCore.module:251
  msgid "Scanning system for installable media. Please wait ..."
  msgstr "Scanning system for installable media. Please wait ..."
@@ -906,7 +886,7 @@
  msgid "Search Again"
  msgstr "Search Again"

-#: FrmNetConf.class:264
+#: FrmNetConf.class:280
  msgid "Secondary DNS Server"
  msgstr "Secondary DNS Server"

@@ -914,7 +894,7 @@
  msgid "Seconds"
  msgstr "Seconds"

-#: FrmImportAccts.class:349 FrmUserAdd.class:539
+#: FrmImportAccts.class:349 FrmUserAdd.class:543
  msgid "Select"
  msgstr ""

@@ -982,7 +962,7 @@
  msgid "Set Password"
  msgstr "Set Password"

-#: MdlNetConf.module:209
+#: MdlNetConf.module:155
  msgid "Setup Mode"
  msgstr "Setup Mode"

@@ -1022,7 +1002,7 @@
  msgid "Skipping lilo setup"
  msgstr "Skipping lilo setup per user request"

-#: FrmSummary.class:313 FrmUsrPkgSel.class:147 MdlCore.module:520
+#: FrmSummary.class:314 FrmUsrPkgSel.class:147 MdlCore.module:520
  msgid "Software Selection"
  msgstr "Software Selection"

@@ -1034,11 +1014,11 @@
  msgid "Standard"
  msgstr "Standard"

-#: MdlNetConf.module:366
+#: MdlNetConf.module:988
  msgid "Static IP Address Settings"
  msgstr ""

-#: MdlNetConf.module:411
+#: MdlNetConf.module:1023
  msgid "Subnet Mask"
  msgstr "Subnet Mask"

@@ -1054,7 +1034,7 @@
  msgid "System Configuration"
  msgstr "System Configuration"

-#: FrmLilo.class:230 FrmLiloSetup.class:302 FrmNetConf.class:287
+#: FrmLilo.class:230 FrmLiloSetup.class:302 FrmNetConf.class:303
  msgid "Tab 0"
  msgstr "-"

@@ -1082,7 +1062,7 @@
  msgid "There as been an error while installing required system software. "
  msgstr "There as been an error while installing required system software. "

-#: MdlInstallSys.module:633
+#: MdlInstallSys.module:637
  msgid "There has been an error extracting"
  msgstr "There has been an error extracting"

@@ -1146,7 +1126,7 @@
  msgid "This user is allowed to print"
  msgstr ""

-#: MdlNetConf.module:324
+#: MdlNetConf.module:1083
  msgid "This will work if you use a cable or DSL modem on a home network."
  msgstr "This will work if you use a cable or DSL modem on a home network."

@@ -1178,7 +1158,7 @@
  msgid "Typically, you want to use the largest partition for this."
  msgstr "Typically, you want to use the largest partition for this."

-#: FrmSummary.class:214
+#: FrmSummary.class:215
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

@@ -1198,11 +1178,11 @@
  msgid "Unable to locate any installable media."
  msgstr ""

-#: MdlNetConf.module:136
+#: MdlNetConf.module:105
  msgid "Unplugged"
  msgstr "Unplugged"

-#: FrmUserAdd.class:545
+#: FrmUserAdd.class:549
  msgid "Use Picture ID for Login greeting"
  msgstr ""

@@ -1226,11 +1206,11 @@
  msgid "Used to store user documents, pictures, videos. Give yourself as  
much room as you want"
  msgstr "Used to store user documents, pictures, videos. Give yourself as  
much room as you want"

-#: FrmUserAdd.class:616 MdlCore.module:530
+#: FrmUserAdd.class:620 MdlCore.module:530
  msgid "User Accounts"
  msgstr "User Accounts"

-#: FrmImportAccts.class:370 FrmUserAdd.class:550
+#: FrmImportAccts.class:370 FrmUserAdd.class:554
  msgid "User Rights Management"
  msgstr ""

@@ -1251,8 +1231,8 @@
  msgstr ""

  #: FrmPartSel.class:150
-msgid "Using a swap partition is suggested if your total RAM is less than  
1GB. Suggested ammount"
-msgstr "Using a swap partition is suggested if your total RAM is less than  
1GB. Suggested ammount"
+msgid "Using a swap partition is suggested if your total RAM is less than  
1GB. Suggested amount"
+msgstr "Using a swap partition is suggested if your total RAM is less than  
1GB. Suggested amount"

  #: FrmHalSwitch.class:30
  msgid "VL-Hot"
@@ -1270,7 +1250,7 @@
  msgid "Vectorlinux is currently being installed to your system... Please  
wait"
  msgstr "Vectorlinux is currently being installed to your system... Please  
wait"

-#: MdlInstallSys.module:589
+#: MdlInstallSys.module:593
  msgid "Vectorlinux is now being installed. Please wait..."
  msgstr "Vectorlinux is now being installed. Please wait..."

@@ -1310,14 +1290,10 @@
  msgid "Windows installation found in"
  msgstr ""

-#: MdlNetConf.module:122
+#: MdlNetConf.module:96
  msgid "Wired"
  msgstr "Wired"

-#: MdlNetConf.module:125
-msgid "Wireless"
-msgstr "Wireless"
-
  #: MdlCore.module:28
  msgid "Working ... Please Wait"
  msgstr ""
@@ -1391,12 +1367,12 @@
  msgstr ""

  #: FrmPartSel.class:150
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr "but can also be calculated as 2 times your ammount of RAM"
+msgid "but can also be calculated as 2 times your amount of RAM"
+msgstr "but can also be calculated as 2 times your amount of RAM"

  #: FrmPartSel.class:150
-msgid "but you should considear a higher value to make sure you have room  
to install additional software"
-msgstr "but you should considear a higher value to make sure you have room  
to install additional software"
+msgid "but you should consider a higher value to make sure you have room  
to install additional software"
+msgstr "but you should consider a higher value to make sure you have room  
to install additional software"

  #: FrmPartSel.class:150
  msgid "by simply selecting a \"/\" value on this screen. The rest is  
optional. The following is a"
@@ -1406,7 +1382,7 @@
  msgid "checkbox."
  msgstr ""

-#: MdlInstallCustom.module:417
+#: MdlInstallCustom.module:423
  msgid "failed to install. Installation will stop now"
  msgstr ""

@@ -1462,7 +1438,7 @@
  msgid "localtime-copied-from"
  msgstr "localtime-copied-from"

-#: MdlPartSel.module:296
+#: MdlPartSel.module:299
  msgid "partition"
  msgstr ""


Modified: branches/iVL/.lang/es.mo
==============================================================================
Binary files. No diff available.

Modified: branches/iVL/.lang/es.po
==============================================================================
--- branches/iVL/.lang/es.po	(original)
+++ branches/iVL/.lang/es.po	Sun Dec 21 01:56:57 2008
@@ -10,1711 +10,1475 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
-
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "Instaladador Gráfico de VectorLinux"
-
-#: FMain.class:191 FrmDone.class:63
-msgid "Restart"
-msgstr "Reiniciar"
-
-#: FMain.class:354
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr ""
-"Por favor espere, el instalador intentará ejecutar la herramienta de "
-"particionado"
-
-#: FMain.class:356
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Por favor espere mientras el instalador analiza su particonado  
actual."
-
-#: FMain.class:356
-msgid "This may take a while ..."
-msgstr "Esto puede tardar unos minutos ..."
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
+msgstr "1 bit Mono "

-#: FMain.class:376
-msgid ""
-"You must select a \"/\" partition. This is the target where the system  
will "
-"install to"
-msgstr ""
-"Debes seleccionar una partición para \"/\" (raíz). Allí sera instalado  
el "
-"sistema operativo"
+#: FrmXconf.class:348
+msgid "1024x768"
+msgstr "-"

-#: FMain.class:448
-msgid "You have not selected any operating systems for your boot menu."
-msgstr ""
-"No haz seleccionado ningún sistema operativo para tu menú de arranque. "
+#: FrmXconf.class:348
+msgid "1280x1024"
+msgstr "-"

-#: FMain.class:448
-msgid "If you wish to bypass the bootloader setup, uncheck the"
-msgstr "Si deseas evitar la configuración del bootloader, deselecciona la "
+#: FrmXconf.class:348
+msgid "1280x800"
+msgstr "-"

-#: FMain.class:448
-msgid "checkbox."
-msgstr " casilla de verificación. "
+#: FrmXconf.class:348
+msgid "1440x900"
+msgstr "-"

-#: FMain.class:458
-msgid "Please select a default operating system to boot before proceeding"
-msgstr "Por favor selectione el sistema operativo que se iniciara por  
defecto"
+#: FrmXconf.class:335
+msgid "16 bit Pseudo Color"
+msgstr "-"

-#: FMain.class:459
-msgid "Select an entry from this list"
-msgstr "Seleccione una de esta opciones"
+#: FrmXconf.class:348
+msgid "1600x1200"
+msgstr "-"

-#: FMain.class:468
-msgid "Skipping boot loader setup"
-msgstr "Evitando la configuración del gestor de arranque (bootloader) "
+#: FrmNetConf.class:262
+msgid "192.168.1.254"
+msgstr "-"

-#: FMain.class:494
-msgid "Skipping lilo setup"
-msgstr "Salteando configuración de LILO"
+#: FrmXconf.class:348
+msgid "1920x1280"
+msgstr "-"

-#: FMain.class:510
-msgid ""
-"Please enter the root password. For your security purposes, do not leave "
-"this blank"
-msgstr ""
-"Por favor igresa tu contraseña para el usuario root. Para garantizar la "
-"seguridad de tu sistema, no la dejes en blanco "
+#: FrmXconf.class:335
+msgid "24 bit True Color"
+msgstr "-"

-#: FMain.class:515
-msgid "Passwords do not match. Please enter the same password twice"
-msgstr "Las contraseñas no coinciden. Por favor ingrese la misma  
contraseña "
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
+msgstr "-"

-#: FMain.class:529
-msgid ""
-"Setup has detected existing directories in the partition you selected for  
/"
-"home."
-msgstr ""
-"El software de instalación ha detectado directorios existentes en la "
-"partición seleccionada para /home. "
+#: FrmXconf.class:348
+msgid "640x480"
+msgstr "-"

-#: FMain.class:529
-msgid ""
-"Would you like to import these user accounts into your new Operating  
System"
-msgstr "Deseas importar esas cuentas de usuarios en tu Sistema Operativo? "
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
+msgstr "-"

-#: FMain.class:529 FrmImportAccts.class:60 FrmSummary.class:75
-#: FrmUserAdd.class:35
-msgid "Yes"
-msgstr "Sí"
+#: FrmXconf.class:348
+msgid "800x600"
+msgstr "-"

-#: FMain.class:529 FrmImportAccts.class:60 FrmSummary.class:73
-#: FrmUserAdd.class:35
-msgid "No"
-msgstr "No"
+#: FrmPartSel.class:150
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "Acerca del particionado en Linux"

-#: FMain.class:549
-msgid ""
-"You have not created any user accounts for this system yet. There is not "
-"enough information"
-msgstr ""
-"No haz creado cuentas de usuario para este sistema. No hay suficiente "
-"información "
+#: FrmRootPass.class:29
+msgid "About the root account"
+msgstr "Acerca de la cuenta del usuario root"

-#: FMain.class:549
-msgid ""
-"to create an account here. It is recommended that you create at least  
one."
-msgstr "para crear una cuenta aquí. Recomendamos que cree al menos una. "
+#: FrmImportAccts.class:310
+msgid "Account"
+msgstr "Cuenta "

-#: FMain.class:549
-msgid "Would you like to continue anyway?"
-msgstr "Quieres continuar de todos modos? "
+#: MdlSetup.module:334
+msgid "Activating swap space"
+msgstr "Activando la partición Swap"

-#: FMain.class:567
-msgid "Please specify a hostname for this computer"
-msgstr "Ingresa un Nombre de Doinio (Hostname) para este ordenador. "
+#: MdlLiloOsList.module:396
+msgid "Add option to boot this Operating system into Text mode."
+msgstr "Agregar una opción para iniciar este sistema operativo en Modo  
Texto. "

-#: FMain.class:572
-msgid "Please specify the domain this computer belongs to"
-msgstr "Por favor especifica el dominio al que pertenece esta computadora "
+#: MdlLilo.module:713
+msgid "Add option to boot this operating system into text mode"
+msgstr "Agregar una opción para iniciar este sistema operativo en Modo  
Texto. "

-#: FMain.class:834
-msgid "Back"
-msgstr "Regresar"
+#: FrmDone.class:60
+msgid "After reboot you can use vasm or vasmCC to fine tune your  
installation."
+msgstr "Luego de reiniciar, puedes utilizar Vasm o VasmCC para ultimar los  
detalles de la instalación "

-#: FMain.class:845
-msgid "Exit Installation"
-msgstr "Salir del Instalador "
+#: MdlUsrAdd.module:121
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
+msgstr "Permitir al usuario montar o desmontar Pendrives (USB Sticks)"

-#: FMain.class:856
-msgid "Next"
-msgstr "Siguiente"
+#: MdlUsrAdd.module:124
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
+msgstr "Permitir al usuario montar o desmontar Dispositivos de  
Almacenamiento Externos (HD Storage)"

-#: FMain.class:870
-msgid "Button1"
-msgstr "-"
+#: MdlNetConf.module:1083
+msgid "Automatic settings via DHCP."
+msgstr "Configuración automática utilizando DHCP"

-#: FrmAlsaConf.class:36
-msgid ""
-"This portion of the setup process allows you to sutup your soundcard for "
-"your new operating system."
-msgstr ""
-"Esta parte de la instlación te permite configurar tu tarjeta de sonido  
para "
-"tunuevo sistema operativo. "
+#: MdlNetConf.module:145
+msgid "Automatically activate this interface at start-up"
+msgstr "Activar esta interfaz automáticamente al arrancar"

-#: FrmAlsaConf.class:36
-msgid "Please use the setup program below to setup the sound system."
-msgstr ""
-"Pro favo utiliza el siguiente software para configurar el sistema de  
sonido. "
+#: MdlSetup.module:318
+msgid "BROUGHT TO YOU BY"
+msgstr "Créditos "

-#: FrmDiskPart.class:58
-msgid ""
-"When finished making changes, exit the partitioning application to "
-"continue ..."
-msgstr ""
-"Cuando finalices tus cambios, sal del particionador desde el menú o  
presiona "
-"Control + Q para continuar ... "
+#: FrmSummary.class:188
+msgid "BULK PACKAGES"
+msgstr "PAQUETES POR CATEGORIA"

-#: FrmDiskPart.class:120
-msgid "Disk Partitioning:"
-msgstr "Particionado de disco:"
+#: MdlSummarize.module:58
+msgid "BULK PACKAGES:"
+msgstr "Paquetes por categoría"

-#: FrmDone.class:49
-msgid "Configuration in progress"
-msgstr "Configuración en proceso "
+#: FMain.class:835
+msgid "Back"
+msgstr "Regresar"

-#: FrmDone.class:50
-msgid "is performing final system configuration. Please wait a moment."
-msgstr "está realizando la configuración final. Por favor espera un  
momento. "
+#: MdlResetSettings.module:41
+msgid "Bash init script"
+msgstr "Script de inicialización de Bash"

-#: FrmDone.class:55
-msgid "Installation is complete"
-msgstr "La instalación se ha completado "
+#: FrmLilo.class:284 FrmLiloSetup.class:252
+msgid "Boot Default"
+msgstr "Arranque por defecto"

-#: FrmDone.class:60
-msgid ""
-"has been installed to your system. Your new system has been configured  
with "
-"the default factory settings."
-msgstr ""
-"ha sido instalado en tu sistema. Tu ordenador ha sido configurado  
utilizando "
-"las opciones por defecto. "
+#: FrmLiloSetup.class:186
+msgid "Boot Manager Configuration"
+msgstr "Configuración del gestor de inicio (Boot Loader) "

-#: FrmDone.class:60
-msgid "After reboot you can use vasm or vasmCC to fine tune your  
installation."
-msgstr ""
-"Luego de reiniciar, puedes utilizar Vasm o VasmCC para ultimar los  
detalles "
-"de la instalación "
+#: MdlCore.module:527
+msgid "Boot Menu Options"
+msgstr "Opciones de arranque"

-#: FrmDone.class:60
-msgid ""
-"Your computer needs to be restarted so that you can use your new  
operating "
-"system. Click"
-msgstr ""
-"Su ordenador necesita ser reiniciado así puedes comenzar a utilizar tu  
nuevo "
-"sistema operativo. Haz click "
+#: MdlConfLilo.module:98
+msgid "Boot loader has been setup successfully"
+msgstr "El cargador de arranque ha sido configurado con éxito"

-#: FrmDone.class:60
-msgid "to restart your computer now or click"
-msgstr "para reiniciar su ordenador ahora o haga click. "
+#: MdlConfLilo.module:126 MdlLilo.module:127
+msgid "Bootsector of "
+msgstr "Sector de arranque de "

-#: FrmDone.class:60
-msgid "to restart your computer at a later time"
-msgstr "para reiniciar su ordenador luego. "
+#: FrmLiloSetup.class:66 MdlLilo.module:85
+msgid "Bootsplash Extra High"
+msgstr "Resolución del arranque gráfico (bootsplash) súper alta"

-#: FrmDone.class:60
-msgid ""
-"If you installed from  CD-ROM/R/RW media, please remove de disk before "
-"restarting."
-msgstr ""
-"Si haz instalado VectorLinux desde una unidad de CD / DVD, por favo  
retira "
-"el disco antes de reiniciar. "
+#: FrmLilo.class:262
+msgid "Bootsplash Extra high"
+msgstr "Resolución del arranque gráfico (bootsplash) súper alta"

-#: FrmDone.class:98
-msgid "Installation is finished"
-msgstr "La instalación ha finalizado "
+#: FrmLilo.class:262 FrmLiloSetup.class:36 MdlLilo.module:83
+msgid "Bootsplash High"
+msgstr "Resolución del arranque gráfico (bootsplash) alta"

-#: FrmHalSwitch.class:20
-msgid "Would you like to use Vl-Hot or HAL to manage your removable  
devices?"
-msgstr ""
-"Deseas utilizar HAL o VL-Hot para controlar tus dispositivos extraibles?"
+#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:81
+msgid "Bootsplash Med"
+msgstr "Resolución del arranque gráfico (bootsplash) media"

-#: FrmHalSwitch.class:25
-msgid "HAL"
-msgstr "-"
+#: MdlCore.module:430
+msgid "Build Date: "
+msgstr "Compilado el: "

-#: FrmHalSwitch.class:30
-msgid "VL-Hot"
+#: FMain.class:871
+msgid "Button1"
  msgstr "-"

-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr ""
-"Por favor espere mientras VectorLinux prepara su sistema para instalacion"
-
-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Estado Actual"
-
-#: FrmHostPrep.class:139 FrmLilo.class:236 FrmPartScheme.class:128
-#: FrmPkgSel.class:203 FrmPkgsel2.class:86 FrmSelISO.class:267
-#: FrmSummaryOld.class:87
-msgid "TextLabel1"
-msgstr "-"
+#: MdlSetup.module:216
+msgid "Calculating package count ... Please wait"
+msgstr "Calculando el número de paquetes ... Por favor espere"

-#: FrmImportAccts.class:33 FrmUserAdd.class:368
-msgid "Select picture for user Login"
-msgstr "Selecciona una imagen "
+#: MdlCore.module:508
+msgid "Cannot find SETUP.CONF"
+msgstr "No se pudo encontrar SETUP.CONF"

-#: FrmImportAccts.class:53
-msgid "Reset settings for"
-msgstr "Eliminar configuraciones existentes para "
+#: FrmPartSel.class:206
+msgid "Check this box if you have a Windows installation on your system or  
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted  
as soon as your computer starts"
+msgstr "Selecciona esta casilla si hay una instalación Windows en tu  
sistema o otra partición Windows (FAT, FAT32, NTFS) que quieras montar  
automáticamente al arrancar el ordenador"

-#: FrmImportAccts.class:60
-msgid "Would you like to continue adding new user accounts now?"
-msgstr "Quieres continuar agregando nuevas cuentas de usuario ahora? "
+#: FrmUserAdd.class:505
+msgid "Choose a unique name for each user. Enter the password for twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue."
+msgstr "Elige un nombre único para cada usuario. Es necesario ingresar las  
contraseñas dos veces. Puedes crear todas las cuentas de usuarios que  
desees"

-#: FrmImportAccts.class:84
-msgid "Please select an account name from the dropdown list."
-msgstr "Selecciona un nombre de cuenta de la lista. "
+#: FrmZoneSet.class:146
+msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know  
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).  
Otherwise,\nChoose localtime since most PCs are setup this way."
+msgstr "Elige como funciona el reloj de esta máquina. Si tienes dudas  
elige UTC/GMT"

-#: FrmImportAccts.class:89
-msgid "Password fields cannot be blank. Please enter a password for"
-msgstr ""
-"La contraseña no puede ser vacía, por favor ingresa una contraseña para "
+#: FrmZoneSet.class:134
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Selecciona la zona horaria del área donde vives"

-#: FrmImportAccts.class:93
-msgid "Selected passwords dont match. Please enter the same password twice"
-msgstr "Las contraseñas ingresadas no coinciden. "
+#: FrmPkgSel.class:26
+msgid "Choose your installation mode"
+msgstr "Selecciona el modo de instalación"

-#: FrmImportAccts.class:103
-msgid "User Unable to restore user account."
-msgstr "Imposible reestablecer la cuenta de usuario. "
+#: FrmPkgSel.class:91
+msgid "Choose your optional components to install."
+msgstr "Selecciona los componentes opcionales a instalar."

-#: FrmImportAccts.class:108 FrmUserAdd.class:149
-msgid "User account for"
-msgstr "Cuenta de usuario para "
+#: FrmUserAdd.class:577
+msgid "Clear Form"
+msgstr "Limpiar Formulario"

-#: FrmImportAccts.class:108
-msgid "successfully imported"
-msgstr "importado satisfactoriamente "
+#: FrmSelISO.class:79
+msgid "Click"
+msgstr "Haz click en"

-#: FrmImportAccts.class:310
-msgid "Account"
-msgstr "Cuenta "
+#: FrmXconf.class:322
+msgid "Color Depth"
+msgstr "Profundidad de color"

-#: FrmImportAccts.class:322
-msgid "New Password"
-msgstr "Nueva contraseña "
+#: FrmZoneSet.class:139
+msgid "ComboBox1"
+msgstr "-"

-#: FrmImportAccts.class:339
-msgid "Select login Image"
-msgstr "Selecciona una imagen para tu usuario "
+#: FrmNetConf.class:223
+msgid "Computer Name"
+msgstr "Nombre Local"

-#: FrmImportAccts.class:349 FrmUserAdd.class:539
-msgid "Select"
-msgstr "Seleciona"
+#: FrmDone.class:49
+msgid "Configuration in progress"
+msgstr "Configuración en proceso "

-#: FrmImportAccts.class:359
-msgid "Verify Password"
-msgstr "Verificar contraseña "
+#: FrmLilo.class:219
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Confuguración de LILO"

-#: FrmImportAccts.class:370 FrmUserAdd.class:550
-msgid "User Rights Management"
-msgstr "Administración de los Permisos de Usuario"
+#: FrmUserAdd.class:571
+msgid "Create User"
+msgstr "Agregar Usuario"

-#: FrmImportAccts.class:376
-msgid "Select Settings to reset"
-msgstr "Selecciona las configuraciones a sobreescribir "
+#: FrmUserAdd.class:60
+msgid "Create User Accounts"
+msgstr "Limiar cuentas de usuario"

-#: FrmImportAccts.class:383
-msgid "Import Account"
-msgstr "Importar cuenta de usuario "
+#: FrmUserAdd.class:116
+msgid "Creating user account ... Please wait"
+msgstr "Creando la cuenta de usuario ... Por favor espera "

-#: FrmImportAccts.class:390 FrmResetSettings.class:122
-msgid "Done"
-msgstr "Hecho "
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Estado Actual"

-#: FrmImportAccts.class:398 FrmUserAdd.class:626
-msgid "Import Existing User Accounts"
-msgstr "Importar cuentas de usuario existentes "
+#: MdlNetConf.module:174
+msgid "Current Status:"
+msgstr ""

  #: FrmInstallSys.class:58
  msgid "Current Step"
  msgstr "Este paso"

-#: FrmInstallSys.class:123
-msgid "Vectorlinux is currently being installed to your system... Please  
wait"
-msgstr "Por favor espere mientras VectorLinux se instala en su sistema"
-
-#: FrmInstallSys.class:138
-msgid "Installing ..."
-msgstr "Instalando..."
-
  #: FrmInstallSys.class:149
  msgid "Current Step "
  msgstr "Este paso"

-#: FrmInstallSys.class:171
-msgid "Total progress"
-msgstr "Progreso Total"
+#: FrmSummary.class:17 MdlSummarize.module:56
+msgid "Custom"
+msgstr "Personalizado "

-#: FrmLangSel.class:118
-msgid "Select your language"
-msgstr "Selecciona tu idioma"
+#: FrmPkgSel.class:218
+msgid "Custom Install"
+msgstr "Instalación Personalizada"

-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "Acuero de Licencia GPL "
+#: FrmPkgSel.class:37 FrmUsrPkgSel.class:17
+msgid "Description"
+msgstr "Descripción "

-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: MdlResetSettings.module:47
+msgid "Desktop icons, folders, launchers"
+msgstr "Iconos del escritorio, carpetas, launchers "

-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "Si, estoy de acuerdo "
+#: FrmPartSel.class:207
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detectar volúmenes con sistemas Windows"

-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No estoy de acuerdo "
+#: MdlCore.module:519
+msgid "Disk Partitioning"
+msgstr "Particionado de disco"

-#: FrmLilo.class:37
-msgid ""
-"The following Operating Systems have been detected on this computer.  
Choose "
-"your desired option"
-msgstr ""
-"los siguientes Sistemas Operativos han sido detectados en su ordenador. "
-"Selecciona la opción deseada"
+#: FrmPartScheme.class:113
+msgid "Disk Partitioning Options"
+msgstr "Opciones de particionado de disco"

-#: FrmLilo.class:37
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the  
default "
-"pre-set values, simply click"
-msgstr ""
-"para cada uno de ellos seleccionando cada pestaña. Para continuar con  
los "
-"valores seleccionados por defecto simplemente haz click en "
+#: FrmDiskPart.class:120
+msgid "Disk Partitioning:"
+msgstr "Particionado de disco:"

-#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:79
-msgid "Standard"
-msgstr "Estandar"
+#: MdlPartSel.module:143
+msgid "Do not format"
+msgstr "No Formatear"

-#: FrmLilo.class:219
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Confuguración de LILO"
+#: FrmLiloSetup.class:202
+msgid "Do not install LILO"
+msgstr "No instalar LILO "
+
+#: FrmSummary.class:124 MdlInstallSys.module:184 MdlWinDrives.module:125
+msgid "Do not mount"
+msgstr "No montar"
+
+#: FrmNetConf.class:235
+msgid "Domain"
+msgstr "Dominio "

  #: FrmLilo.class:224
  msgid "Don't Install Lilo"
  msgstr "No quiero instalar LILO"

-#: FrmLilo.class:230 FrmLiloSetup.class:302 FrmNetConf.class:287
-msgid "Tab 0"
-msgstr "-"
+#: FrmImportAccts.class:390 FrmResetSettings.class:122
+msgid "Done"
+msgstr "Hecho "

-#: FrmLilo.class:248 FrmLiloSetup.class:234
-msgid "Target"
-msgstr "-"
+#: MdlNetConf.module:1083
+msgid "Dynamic Host Control Protocol"
+msgstr "Dynamic Host Control Protocol (DHCP)"

-#: FrmLilo.class:254 FrmLiloSetup.class:213
-msgid "Video Resolution"
-msgstr "Resolucion de pantalla"
+#: MdlUsrAdd.module:118
+msgid "Elite user"
+msgstr "Usuario Privilegiado"

-#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:81
-msgid "Bootsplash Med"
-msgstr "Resolución del arranque gráfico (bootsplash) media"
+#: FrmRootPass.class:143 FrmUserAdd.class:591
+msgid "Enter Password"
+msgstr "Ingresa contraseña"

-#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:83
-msgid "Bootsplash High"
-msgstr "Resolución del arranque gráfico (bootsplash) alta"
+#: FrmRootPass.class:38
+msgid "Enter a Password for root."
+msgstr "Ingresa una contraseña para root."

-#: FrmLilo.class:262
-msgid "Bootsplash Extra high"
-msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
+#: FrmUserAdd.class:153
+msgid "Enter a password for"
+msgstr "Ingresa una contraseña para "

-#: FrmLilo.class:267 FrmLiloSetup.class:273
-msgid "Prompt Timeout"
-msgstr "Límite de espera "
+#: FrmUserAdd.class:124
+msgid "Enter the login name that this user will user to login to this  
system."
+msgstr "Ingresa el nombre de usuario que será utilizado para registrarse  
en el sistema."

-#: FrmLilo.class:278 FrmLiloSetup.class:284
-msgid "Seconds"
-msgstr "Segundos"
+#: FrmUserAdd.class:211
+msgid "Enter the same password twice"
+msgstr "Ingresa la misma contraseña dos veces "

-#: FrmLilo.class:284 FrmLiloSetup.class:252
-msgid "Boot Default"
-msgstr "Arranque por defecto"
+#: MdlInstallSys.module:528
+msgid "Error occurred while installing"
+msgstr "Ha ocurrido un error durante la instalación"

-#: FrmLiloSetup.class:66 MdlLilo.module:85
-msgid "Bootsplash Extra High"
-msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
+#: MdlInstallCustom.module:354
+msgid "Error while installing "
+msgstr "Error al instalar "

-#: FrmLiloSetup.class:186
-msgid "Boot Manager Configuration"
-msgstr "Configuración del gestor de inicio (Boot Loader) "
+#: MdlInstallCustom.module:73
+msgid "Error while installing required system software. "
+msgstr "Error al instalar el software base. "

-#: FrmLiloSetup.class:202
-msgid "Do not install LILO"
-msgstr "No instalar LILO "
+#: MdlInstallCustom.module:82
+msgid "Error while installing system configuration. "
+msgstr "Error al instalar la configuración del sistema. "

-#: FrmNetConf.class:192 MdlCore.module:531
-msgid "Network Configuration"
-msgstr "Configuración de red"
+#: FMain.class:846
+msgid "Exit Installation"
+msgstr "Salir del Instalador "

-#: FrmNetConf.class:207
-msgid "Computer Name"
-msgstr "Nombre Local"
+#: MdlPartSel.module:92
+msgid "FILESYSTEM"
+msgstr "Sistema de archivos"

-#: FrmNetConf.class:219
-msgid "Domain"
-msgstr "Dominio "
+#: MdlInstallSys.module:500
+msgid "Failed to install"
+msgstr "La instalación ha fallado"

-#: FrmNetConf.class:235
-msgid "Manual DNS Server Specification"
-msgstr "Configuración Manual de servidores de nombres (DNS)"
+#: MdlInstallCustom.module:225
+msgid "Failed to install. Installation will stop"
+msgstr "La instalación ha fallado. "

-#: FrmNetConf.class:246
-msgid "192.168.1.254"
+#: FrmXconf.class:342
+msgid "Fbdev"
  msgstr "-"

-#: FrmNetConf.class:251
-msgid "Primary DNS Server"
-msgstr "Servidor de nombres primario (DNS)"
+#: FrmSummary.class:43
+msgid "Filesystem"
+msgstr "Sistema de Archivos"

-#: FrmNetConf.class:264
-msgid "Secondary DNS Server"
-msgstr "Servidor de nombres (DNS) secundario"
+#: MdlCore.module:532
+msgid "Final Hardware Configuration"
+msgstr "Configuración final de Hardware "

-#: FrmPartScheme.class:60
-msgid ""
-"Select this option if you already have a linux installation that you wish  
to "
-"overwrite or if a linux partition scheme exists in your hard disk."
-msgstr ""
-"Selecciona esta opción si ya dispones de una instalación de Linux que "
-"quieras sobreescribir o si las particines Linux ya existen en tu disco  
duro."
+#: MdlCore.module:518
+msgid "Find installation media"
+msgstr "Buscar medio de instalación"

-#: FrmPartScheme.class:60
-msgid "This option will overwrite any existing data in the selected  
partitions"
-msgstr "Esta opción sobreescribirá los datos de las particiones  
seleccionadas"
+#: MdlInstallSys.module:649
+msgid "Finished intalling Bulks"
+msgstr "Instalación de paquetes finalizada"

-#: FrmPartScheme.class:60
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-msgstr ""
-"Usa esta opción si ya haz preparado tus particiones utilizando el  
instalador "
-"de VectorLinux"
+#: MdlConfLilo.module:131 MdlLilo.module:129
+msgid "Floppy"
+msgstr "Disco Flexible "

-#: FrmPartScheme.class:70
-msgid ""
-"Select this option is you wish to create, more or resize partitions in  
order "
-"to make room for your new VectorLinux installation."
-msgstr ""
-"Selecciona esta opción si deseas crear o redimensionar particiones para "
-"conseguir espacio para tu nueva instalación de VectorLinux."
+#: FrmRootPass.class:19
+msgid "For added security, use a password that is easy for you to  
remember, but hard for others to guess"
+msgstr "Por motivos de seguridad, deberías utilizar una clave fácil de  
recordar, pero difícil de adivinar"

-#: FrmPartScheme.class:70
-msgid ""
-"This option is the safest choice if you have other existing  
installations "
-"that you wish to keep."
-msgstr "Esta opción es la más segura si quieres conservar otras  
instalaciones."
+#: FrmSummary.class:47
+msgid "Format ?"
+msgstr "Formatear? "

-#: FrmPartScheme.class:113
-msgid "Disk Partitioning Options"
-msgstr "Opciones de particionado de disco"
+#: FrmSummary.class:21 MdlSummarize.module:69
+msgid "Full"
+msgstr "Completa"

-#: FrmPartScheme.class:118
-msgid "Use existing disk partitions"
-msgstr "Utilizar las particiones existentes en mi disco duro"
+#: FrmPkgSel.class:213
+msgid "Full Install"
+msgstr "Instalacion Completa"

-#: FrmPartScheme.class:123
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modificaré mi disco duro para hacer lugar para la nueva  
instalación"
+#: MdlResetSettings.module:37
+msgid "GTK Tookit theme Settings"
+msgstr "Configuración del tema GTK "

-#: FrmPartSel.class:150
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "Acerca del particionado en Linux"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "Instaladador Gráfico de VectorLinux"

-#: FrmPartSel.class:150
-msgid ""
-"Linux is a modular operating system. This means that is has the ability  
to "
-"store system and"
-msgstr ""
-"Linux es un sistema operativo modular. Esto significa que tiene la  
capacidad "
-"de alojar el sistema y"
+#: MdlNetConf.module:1045
+msgid "Gateway Address"
+msgstr "Dirección de Puerta de Enlace (GW)"

-#: FrmPartSel.class:150
-msgid ""
-"user data separately for added data security. You may install the system  
to "
-"a single partition"
-msgstr ""
-"datos del usuario separadamente para incrementar la seguridad de sus  
datos. "
-"Puedes instalar el sistema en una única partición"
+#: MdlDiskPart.module:53
+msgid "Gparted was not found on this system. Please install gparted and  
try again"
+msgstr "No se encontró Gparted en el sistema.  Por favor, instala Gparted  
y prueba de nuevo"

-#: FrmPartSel.class:150
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.  
The "
-"following is a"
-msgstr ""
-"simplemente seleccionando un valor para \"/\" en esta pantalla. El resto  
es "
-"opcional. Lo siguiente es un"
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
+msgstr "Configuración de la interfaz gráfica de usuario "

-#: FrmPartSel.class:150
-msgid "suggested setup for a typical Linux installation"
-msgstr "configuración recomendada para una instalación típica de Linux"
+#: MdlResetSettings.module:45
+msgid "Graphical inteface preferences"
+msgstr "Preferencias de interface gráfica "

-#: FrmPartSel.class:150
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
+#: FrmUserAdd.class:433
+msgid "Groups are a way of administering permissions for your users. You  
grant the user"
+msgstr "Los Grupos son un método para administrar los permisos de los  
usuarios. Le garantizas a cada usuario"
+
+#: FrmHalSwitch.class:25
+msgid "HAL"
+msgstr "-"
+
+#: MdlNetConf.module:117
+msgid "Hardware Address"
+msgstr "Dirección MAC"
+
+#: FrmPartSel.class:186 FrmUserAdd.class:558
+msgid "Help"
+msgstr "Ayuda"
+
+#: MdlSummarize.module:56
+msgid "INSTALL TYPE:"
+msgstr "Tipo de instalación:"
+
+#: MdlNetConf.module:1000
+msgid "IP Address"
+msgstr "Dirección IP"
+
+#: MdlResetSettings.module:49
+msgid "IceWM settings, preferences, menu"
+msgstr "Configuraciones de IceWM, preferencias, menú "
+
+#: MdlNetConf.module:1083
+msgid "If in doubt, choose this option."
  msgstr ""
-"Utilizada para almacenar los datos del sistema. Esta instalación en "
-"particular requiere un mínimo de"

-#: FrmPartSel.class:150
-msgid "for this"
-msgstr "para esto"
+#: FrmDone.class:60
+msgid "If you installed from  CD-ROM/R/RW media, please remove de disk  
before restarting."
+msgstr "Si haz instalado VectorLinux desde una unidad de CD / DVD, por  
favo retira el disco antes de reiniciar. "
+
+#: FMain.class:448
+msgid "If you wish to bypass the bootloader setup, uncheck the"
+msgstr "Si deseas evitar la configuración del bootloader, deselecciona la "

-#: FrmPartSel.class:150
-msgid ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
-msgstr ""
-"pero deberías considerar un valor más alto para asegurarte espacio para "
-"software adicional que desees instlar luego"
+#: FrmImportAccts.class:383
+msgid "Import Account"
+msgstr "Importar cuenta de usuario "

-#: FrmPartSel.class:150
-msgid "in case you wish to."
-msgstr "en caso que lo desees."
+#: FrmImportAccts.class:398 FrmUserAdd.class:630
+msgid "Import Existing User Accounts"
+msgstr "Importar cuentas de usuario existentes "

-#: FrmPartSel.class:150
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much  
room "
-"as you want"
-msgstr ""
-"Utilizada para almacenar los ficheros del usuario, documentos, imágenes, "
-"videos, etc. Puedes asignar tanto espacio como desees"
+#: MdlLilo.module:621
+msgid "Include in boot menu"
+msgstr "Incluir en el menú de arranque "

-#: FrmPartSel.class:150
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Normalmente querrías utilizar tu partición más grande para esto."
+#: MdlLilo.module:533 MdlLiloOsList.module:149
+msgid "Include this installation in the boot menu"
+msgstr "Incluir esta instalación en el menú de arranque"

-#: FrmPartSel.class:150
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-msgstr ""
-"Utilizar una partición Swap es recomendado si tu cantidad de memoria RAM  
es "
-"inferior a 1GB. El monto sugerido "
+#: MdlLiloOsList.module:302
+msgid "Include this operating system in the boot menu"
+msgstr "Incluir este sistema operativo en el menú de arranque"

-#: FrmPartSel.class:150
-msgid "for this is"
-msgstr "para esto es"
+#: MdlLiloOsList.module:334
+msgid "Initial Ram Disk"
+msgstr "Disco Ram inicial"

-#: FrmPartSel.class:150
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr ""
-"pero también puede ser calculada duplicando el tamaño de tu memoria RAM"
+#: MdlLilo.module:657
+msgid "Initrd"
+msgstr "-"

-#: FrmPartSel.class:181
-msgid "Please select the partitions you wish to use and how to use them"
-msgstr ""
-"For favor, seleccione las secciones del disco que desea usar, y también  
como "
-"usarlas"
+#: MdlCore.module:525
+msgid "Install Operating System"
+msgstr "Copiar Archivos"

-#: FrmPartSel.class:186 FrmUserAdd.class:554
-msgid "Help"
-msgstr "Ayuda"
+#: MdlCore.module:522
+msgid "Installation"
+msgstr "Instalación "

-#: FrmPartSel.class:206
-msgid ""
-"Check this box if you have a Windows installation on your system or any "
-"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
-"soon as your computer starts"
-msgstr ""
-"Selecciona esta casilla si hay una instalación Windows en tu sistema o  
otra "
-"partición Windows (FAT, FAT32, NTFS) que quieras montar automáticamente  
al "
-"arrancar el ordenador"
+#: FrmSummary.class:14 MdlCore.module:523
+msgid "Installation Summary"
+msgstr "Resumen del proceso"

-#: FrmPartSel.class:207
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detectar volúmenes con sistemas Windows"
+#: FrmSummary.class:294
+msgid "Installation Type"
+msgstr "Tipo de instalación"

-#: FrmPkgSel.class:26
-msgid "Choose your installation mode"
-msgstr "Selecciona el modo de instalación"
+#: MdlInstallCustom.module:106
+msgid "Installation complete"
+msgstr "Instalación completa "

-#: FrmPkgSel.class:36
-msgid "Package"
-msgstr "Paquete "
+#: FrmDone.class:55
+msgid "Installation is complete"
+msgstr "La instalación se ha completado "

-#: FrmPkgSel.class:37 FrmUsrPkgSel.class:17
-msgid "Description"
-msgstr "Descripción "
+#: FrmDone.class:98
+msgid "Installation is finished"
+msgstr "La instalación ha finalizado "

-#: FrmPkgSel.class:38 FrmSummary.class:41 FrmUsrPkgSel.class:19
-msgid "Size"
-msgstr "Tamaño"
+#: MdlInstallSys.module:764
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Fase de instalación completada.  Vamos a por la configuración"

-#: FrmPkgSel.class:81
-msgid ""
-"Installs all optional components in your VectorLinux media to your system"
-msgstr "Instala todos los componentes disponibles en el CD de  
instalación. "
+#: MdlInstallCustom.module:211 MdlInstallSys.module:486
+msgid "Installing"
+msgstr "Instalando"

-#: FrmPkgSel.class:91
-msgid "Choose your optional components to install."
-msgstr "Selecciona los componentes opcionales a instalar."
+#: FrmInstallSys.class:138
+msgid "Installing ..."
+msgstr "Instalando..."

-#: FrmPkgSel.class:213
-msgid "Full Install"
-msgstr "Instalacion Completa"
+#: MdlInstallSys.module:809
+msgid "Installing Required Package ..."
+msgstr "Instalando paquetes requeridos ..."

-#: FrmPkgSel.class:218
-msgid "Custom Install"
-msgstr "Instalación Personalizada"
+#: MdlInstallSys.module:767
+msgid "Installing default system configuration and required software."
+msgstr "Instalando el software necesario y las configuraciones por  
defecto."

-#: FrmPkgsel2.class:21
-#, fuzzy
-msgid "Select your individual packages to install."
-msgstr "Selecciona paquetes individuales para su instalación."
+#: MdlInstallCustom.module:271
+msgid "Installing user-selected package"
+msgstr "Instalando paquetes selecionados por el usuario"

-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "Para instalarlos todos, simplemente presiona Sigiente"
+#: FrmPkgSel.class:81
+msgid "Installs all optional components in your VectorLinux media to your  
system"
+msgstr "Instala todos los componentes disponibles en el CD de  
instalación. "

-#: FrmResetSettings.class:112
-msgid "Select which settings to reset"
-msgstr "Selecciona las configuraciones para sobreescribir "
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you  
need to pre-partition your disks first"
+msgstr "Es posible instalar VectorLinux entu sistema, pero derías  
particionar el disco primero"

-#: FrmRootPass.class:12
-msgid "System Administrator Password"
-msgstr "Contraseña del administrador del sistema"
+#: MdlResetSettings.module:33
+msgid "KDE Settings (Menu, Window decorations, etc)"
+msgstr "Configuraciones de KDE (Menú, decoraciones de ventanas, etc.)"

-#: FrmRootPass.class:19
-msgid "Most other every-day taks do not require administrative  
priviledges."
-msgstr "Las tareas diarias no requieren privilegios de administrador"
+#: MdlLilo.module:690 MdlLiloOsList.module:359
+msgid "Kernel boot options"
+msgstr "Opciones de arranque de kernel"

-#: FrmRootPass.class:19
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
-msgstr ""
-"Por motivos de seguridad, deberías utilizar una clave fácil de recordar, "
-"pero difícil de adivinar"
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "Acuero de Licencia GPL "

-#: FrmRootPass.class:29
-msgid "About the root account"
-msgstr "Acerca de la cuenta del usuario root"
+#: MdlLiloOsList.module:158
+msgid "Label"
+msgstr "Etiqueta"

-#: FrmRootPass.class:38
-msgid "Enter a Password for root."
-msgstr "Ingresa una contraseña para root."
+#: MdlCore.module:517
+msgid "Language Selection"
+msgstr "Selección de idioma"

-#: FrmRootPass.class:49
-msgid ""
-"Passwords do not match. Please enter the same password twice for  
accuracy."
-msgstr ""
-"Las contraseñas no coinciden. Por favor ingrese la misma contraseña dos "
-"veces para estar seguros de que es la que Usted verdaderamente desea."
+#: MdlConfLilo.module:94
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo ha devuelto un error.  Por favor, lee más abajo"

-#: FrmRootPass.class:124 MdlCore.module:529
-msgid "System Administrator"
-msgstr "Administrador del sistema"
+#: FrmPartSel.class:150
+msgid "Linux is a modular operating system. This means that is has the  
ability to store system and"
+msgstr "Linux es un sistema operativo modular. Esto significa que tiene la  
capacidad de alojar el sistema y"

-#: FrmRootPass.class:137
-msgid ""
-"The linux root account is pre-assigned to be used as the system "
-"administrator's account. This account is used to perform system-wide  
changes "
-"such as software upgrades, managing user accounts etc. \n"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The root password must be entered twice for ensured accuracy. When  
choosing "
-"a root password, think of something easy for you to remember, but hard  
for "
-"others to guess."
-msgstr ""
-"La cuenta root en los sistemas Linux está diseñada como la cuenta del "
-"administrador del sistema. Es utilizada para realizar tareas de "
-"mantenimiento del sistema globales, tales como actualizaciones de  
software, "
-"gestionar los permisos o crear nuevos usuarios, etc. \n"
-"\n"
-"La mayoría de las otras operaciones no requieren privilegios de "
-"administrador.\n"
-"La contraseña para el usuario root deberá ser ingresada dos veces para "
-"asegurar que es la contraseña deseada. Al elegir la contraseña de "
-"administrador, piensa en algo fácil de recordar, pero al mismo tiempo "
-"difícil de adivinar para los otros. "
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Cargando Gparted ... Por favor espere"

-#: FrmRootPass.class:143 FrmUserAdd.class:587
-msgid "Enter Password"
-msgstr "Ingresa contraseña"
+#: FrmZoneSet.class:141
+msgid "LocalTime"
+msgstr "Hora Local"

-#: FrmRootPass.class:148
-msgid "Re-Enter Password"
-msgstr "Vuelva a ingresar la contraseña"
+#: FrmUserAdd.class:584
+msgid "Login Name"
+msgstr "Nombre de usuario"

-#: FrmRootPass.class:165
-msgid "Set Password"
-msgstr "Define tu contraseña"
+#: FrmUserAdd.class:132
+msgid "Login name field contains illegal characters. Please use only  
lowercase letters and numbers"
+msgstr "Tu nombre de usuario contiene caracteres ilegales. Por favor  
utiliza solo letras minúsculas y números"

-#: FrmSelISO.class:30 MdlCore.module:267
-msgid "No Installable Media Found"
-msgstr "No se encontró ningún medio instalable"
+#: MdlConfLilo.module:119 MdlLilo.module:35
+msgid "MBR of"
+msgstr "MBR de "

-#: FrmSelISO.class:79
-msgid "Click"
-msgstr "Haz click en"
+#: MdlCore.module:430
+msgid "MINIMUM REQUIREMENTS"
+msgstr "Requerimientos mínimos del sistema"

-#: FrmSelISO.class:79
-msgid "to begin installating"
-msgstr "para comenzar la instalación"
+#: MdlPartSel.module:82
+msgid "MOUNT POINT"
+msgstr "Punto de montaje"

-#: FrmSelISO.class:81
-msgid "Unable to locate any installable media."
-msgstr "No se ha podido encontrar un medio de ...
 
[truncated message content]

[Vectorlinux-devel] [vinstall-ng commit] r433 - in branches/iVL: . .lang

[<cod...@go...>]

Author: uelsk8s
Date: Fri Dec 19 01:23:45 2008
New Revision: 433

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/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
moved alsaconf back to before reboot updated binary

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/.project
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/ClsGlobal.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/ClsPartSel.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/ClsWinDrives.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FMain.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmDiskPart.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmPartScheme.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmPartSel.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmPkgSel.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmSelISO.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmSummary.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/FrmWinDrives.class
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlCore.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlDiskPart.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlObjSizer.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlPartSel.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlPkgSel.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlSetup.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlSummarize.module
+# /root/gui-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	Fri Dec 19 01:23:45 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer-trunk/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Dec 19 01:23:45 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.23
+Version=0.1.24
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Fri Dec 19 01:23:45 2008
@@ -334,7 +334,7 @@
  "/sbin/vlsetup" & gb.NewLine &
  "/sbin/vhwconf" & gb.NewLine &
  "cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &  
gb.NewLine &
-"#/sbin/valsaconf-quiet" & gb.NewLine &
+"/sbin/valsaconf-quiet" & gb.NewLine &
  "cd / && for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &  
gb.NewLine &
  "rm -r /root/.mc 2>/dev/null" & gb.NewLine &
  "for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh  
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
@@ -356,16 +356,17 @@
   ". /sbin/vasm-functions \n" &
   "TEXT=\" \n" &
   "Vector Linux Has been Installed. \n" &
- " \n" &
- "Welcome back. We will now continue with final system configuration. \n" &
- "this includes setting up sound, configuring the GUI, and choosing  
services \n" &
- "to run at boot time.  Enjoy AND happy Vectoring...\" \n" &
+ "Welcome back. \n" &
+ "We will now continue with final system configuration. \n" &
+ "On the next screen you can setup the GUI or use one of the preconfigured  
settings. \n" &
+ "any other system fine tuning can be done from VASM.  Enjoy AND happy  
Vectoring...\" \n" &
   "$DCMD --backtitle \"$BACKTITLE\" --title \"CONGRATULATIONS\" " &
   "--msgbox \"$TEXT\" 0 0 2>/dev/NULL  \n" &
- "cd / && sh /var/log/scripts/x11-fonts* \n " &
-  "alsaconf \n " &
+ "#cd / && sh /var/log/scripts/x11-fonts* \n " &
+ "#alsaconf \n " &
+ "alsactl store \n " &
   "/sbin/vxconf \n" &
-  "/sbin/vsrvset \n" &
+ "#/sbin/vsrvset \n" &
   "#/sbin/config-stage1 gui-installer" & gb.NewLine

  EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r432 - branches/iVL

[<cod...@go...>]

Author: uelsk8s
Date: Thu Dec 18 14:38:04 2008
New Revision: 432

Modified:
    branches/iVL/.project
    branches/iVL/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
moved alsaconf after reboot updated binary

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec 18 14:38:04 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.22
+Version=0.1.23
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,6 +17,7 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
+ExecPath=/root/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Thu Dec 18 14:38:04 2008
@@ -334,7 +334,7 @@
  "/sbin/vlsetup" & gb.NewLine &
  "/sbin/vhwconf" & gb.NewLine &
  "cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &  
gb.NewLine &
-"/sbin/valsaconf-quiet" & gb.NewLine &
+"#/sbin/valsaconf-quiet" & gb.NewLine &
  "cd / && for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &  
gb.NewLine &
  "rm -r /root/.mc 2>/dev/null" & gb.NewLine &
  "for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh  
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
@@ -351,20 +351,22 @@
  SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT


-
+'this is the script that runs after reboot.
   sOut = "#!/bin/bash \n" &
   ". /sbin/vasm-functions \n" &
   "TEXT=\" \n" &
   "Vector Linux Has been Installed. \n" &
   " \n" &
- "On the next screen you will have the option to configure the GUI. \n" &
- "Enjoy AND happy Vectoring...\" \n" &
+ "Welcome back. We will now continue with final system configuration. \n" &
+ "this includes setting up sound, configuring the GUI, and choosing  
services \n" &
+ "to run at boot time.  Enjoy AND happy Vectoring...\" \n" &
   "$DCMD --backtitle \"$BACKTITLE\" --title \"CONGRATULATIONS\" " &
   "--msgbox \"$TEXT\" 0 0 2>/dev/NULL  \n" &
   "cd / && sh /var/log/scripts/x11-fonts* \n " &
+  "alsaconf \n " &
   "/sbin/vxconf \n" &
+  "/sbin/vsrvset \n" &
   "#/sbin/config-stage1 gui-installer" & gb.NewLine
-

  EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT
  EXEC ["chmod", "700", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "init"] WAIT

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r429 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec 18 13:54:56 2008
New Revision: 429

Modified:
    branches/iVL/MdlNetConf.module

Log:
Reverted back to 426

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Thu Dec 18 13:54:56 2008
@@ -34,55 +34,37 @@

  PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"]
  PRIVATE pWirelessPic AS picture = picture["images/wireless.png"]
-
-
+PRIVATE iFrameTop AS Integer

  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")))
+  DIM sDevAddr, sEths, sDump, sDev, sType, sStatus, sApDump AS String
+  DIM sDevList, sLine AS String[]
+  DIM i, ii, y, x AS Integer
+  DIM tl AS TextLabel
+  DIM tb AS TextBox
+  DIM cb AS ComboBox
+  DIM bcb AS CheckBox
+  DIM ptabpic AS Picture
+
+  ' INITIATE THE ARRAYS

-      seths = Trim(seths)
-
-      IF seths = "" THEN
+     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 "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'\"\" " TO seths
+    seths = Trim(seths)
+
+           IF seths = "" THEN  ' WARN IF NO NETWORK HARDWARE CAN BE  
DETECTED AND EXIT WITHOUT ERROR
            WITH FrmNetConf
              .cbUseManDNS.Enabled = FALSE
              .tlPrimaryDNS.Enabled = FALSE
@@ -100,10 +82,8 @@
                  ME.ifaceCnt = 0
              RETURN
        END IF
-
-
-
-      sDevList = Split(seths, gb.NewLine)
+'
+          sDevList = Split(seths, gb.NewLine)
        'Message(seths)
        ME.ifaceCnt = sDevList.Count
               FOR i = 0 TO sDevList.count - 1
@@ -112,21 +92,9 @@
            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
-
+            'Message(sDevAddr)
+          sType = ("Wired") ' Not detecting wireless, so lets just leave  
it at this
+
                      ' detect status
                        SHELL "ifplugstatus | grep ^" & sDev & " | cut -f 2  
-d \':\'" TO sStatus
                        'Message(sStatus)
@@ -136,678 +104,872 @@
                            ELSE
                              sStatus = ("Unplugged")
                            END IF
-
-                  ' LIST WIRED NETWORKIN ONLY
- WITH FrmNetConf.TSNetDevices
-            'PRINT .Count
-
+                          'Message(sDev & gb.NewLine & sDevAddr &  
gb.NewLine & sStatus)
+' BEGIN POPULATING TABSTRIP.  
=========================================================================
+
+WITH FrmNetConf.TSNetDevices
+  .Index = i
+  .Text = sDev
+
+        ' **************** tabs strip objects
+          tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' MACK ADDRESS LABEL
+            WITH tl
+              .Text = ("Hardware Address")
+              .Width = MdlObjSizer.get_object_width(.Text)
+              .Height = 21
+              .Alignment = Align.Normal
+              .Move(4, 16)
+            END WITH
+              'y = y + tl.Top + tl.Height + 4
+        tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" '  
MAC ADDRESS BOX
+            WITH tb
+            .Text = sDevAddr
+            .ReadOnly = TRUE
+            .Height = 21
+            .Width = MdlObjSizer.get_object_width(.Text) + 16
+            .Move(tl.Left + tl.Width + 4, tl.Top)
+            END WITH
+        ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' INTERFACE  
TYPE LABEL
+        ' ' ' ' '     WITH tl
+        ' ' ' ' '         .Text = ("Interface Type")
+        ' ' ' ' '         .Width = MdlObjSizer.get_object_width(.Text)
+        ' ' ' ' '         .Height = 21
+        ' ' ' ' '         .Alignment = Align.Normal
+        ' ' ' ' '         .Move(tb.Left + tb.Width + 4, tb.Top)
+        ' ' ' ' '     END WITH
+        ' ' ' ' '
+            y = y + tb.Top + tb.Height + 4
+        bcb = NEW CheckBox(FrmNetConf.TSNetDevices)  
AS "bEnableInterface"  '************ enabled / disabled checkbox  
**************************
+          WITH bcb
+            .Value = TRUE
+              .Text = ("Automatically activate this interface at start-up")
+              .Height = 21
+              .Width = MdlObjSizer.get_object_width(.Text) + 36
+              .Move(4, y)
+          END WITH
+          ME.objCheckboxes.Add(bcb)
+            y = bcb.top + bcb.Height + 8

-            .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
+        tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+          WITH tl
+            .Text = ("Setup Mode")
+            .Alignment = Align.Normal
+            .Height = 21
+            .Width = MdlObjSizer.get_object_width(.Text)
+            .Move(24, y) ' indent this a little
+          END WITH
+
+        cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" '  
*******************************
+            WITH cb
+              .ReadOnly = TRUE
+              .list = ["DHCP", "STATIC"]
+              .Height = 21
+              .Width = MdlObjSizer.get_object_width("STATIC") * 2
+              .move(tl.Left + tl.Width + 4, y)
+            END WITH
+            ME.objCombos.Add(cb)
+
+        tl = NEW  
TextLabel(FrmNetConf.TSNetDevices) '***********************************************************
+            WITH tl
+              .Text = ("Current Status:") & Space(1) & "<b>" & sStatus  
& "</b>"
+              .Alignment = Align.Normal
+              .Height = 21
+              .Width = MdlObjSizer.get_object_width(.Text)
+              .Move(cb.Left + cb.Width + 4, y)
+            END WITH
+            iFrameTop = tl.top + tl.Height + 8

-                    .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 WITH  ' END JACKING WITH TABSTRIP  
========================================================================

+
+
+
+          NEXT
  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
+'          '              ' '          ' ...
 
[truncated message content]

[Vectorlinux-devel] [vinstall-ng commit] r430 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec 18 14:22:19 2008
New Revision: 430

Modified:
    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/installer.gambas

Log:
Fully restored back to useable stage.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/ClsGlobal.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/ClsPartSel.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/ClsWinDrives.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FMain.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmDiskPart.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmPartScheme.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmPartSel.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmPkgSel.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmSelISO.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmSummary.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/FrmWinDrives.class
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlCore.module
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlDiskPart.module
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlObjSizer.module
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlPartSel.module
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlPkgSel.module
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlSetup.module
+# /home/vlmaster/devel/installer-trunk/MdlSetup.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,27 +14,27 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: MdlSetup.module:154
+#: MdlSetup.module:216
  msgid "Calculating package count ... Please wait"
  msgstr ""

-#: MdlSetup.module:210
+#: MdlSetup.module:272
  msgid "Total bulks to be installed = "
  msgstr ""

-#: MdlSetup.module:213
+#: MdlSetup.module:275
  msgid "Total pkgs to be installed = "
  msgstr ""

-#: MdlSetup.module:256
+#: MdlSetup.module:318
  msgid "BROUGHT TO YOU BY"
  msgstr ""

-#: MdlSetup.module:272
+#: MdlSetup.module:334
  msgid "Activating swap space"
  msgstr ""

-#: MdlSetup.module:274
+#: MdlSetup.module:336
  msgid "Preparing filesystems"
  msgstr ""


Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot	(original)
+++ branches/iVL/.lang/MdlSummarize.pot	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlSummarize.module
+# /home/vlmaster/devel/installer-trunk/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	Thu Dec 18 14:22:19 2008
@@ -1,4 +1,4 @@
-# /home/vlmaster/devel/installer/MdlWinDrives.module
+# /home/vlmaster/devel/installer-trunk/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec 18 14:22:19 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.20
+Version=0.1.21
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r431 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec 18 14:31:18 2008
New Revision: 431

Modified:
    branches/iVL/.project
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlLilo.module
    branches/iVL/installer.gambas

Log:
updated binary, fixed shell typos

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec 18 14:31:18 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.21
+Version=0.1.22
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Dec 18 14:31:18 2008
@@ -440,7 +440,8 @@


    sDump = ""
-  SHELL "echo \"\" > /tmp/installdump" WAIT
+  'SHELL "echo \"\" > /tmp/installdump" WAIT
+  EXEC ["rm", "/tmp/installdump"] WAIT
    sErr = ""

    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |  
grep " & File.Name(sPackagePath) & " | cut -f 2 -d :" TO vSize

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Dec 18 14:31:18 2008
@@ -413,7 +413,7 @@
                      INC ClsGlobal.iPkgNum
                      'ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt &/ "packages"  
&/ sPkgPath &/ sPkgName)
                          ' move the process here locally
-                        SHELL "echo \"\" /tmp/installdump" WAIT
+                        SHELL "echo \"\" > /tmp/installdump" WAIT
                            'hproc = SHELL "installpkg " &  
ClsGlobal.sSourceMnt &/ "packages" &/ sPkgPath &/ sPkgName & " -R " &  
ClsGlobal.sTargetMnt & " 2> /tmp/installdump"
                            hproc = EXEC ["installpkg", ClsGlobal.sSourceMnt  
&/ "packages" &/ sPkgPath &/ sPkgName, "-R", ClsGlobal.sTargetMnt]
                        WAIT

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Thu Dec 18 14:31:18 2008
@@ -38,7 +38,7 @@
              IF Exist("/usr/bin/ms-sys") THEN
              'dd if=/dev/hda of=/boot/MBR.$( date '+%m%d%y') bs=512 count=1

-            SHELL "dd if=/dev/" & Trim(sTarget) & "  
of=/mnt/target/boot/MBR.$( date +\'%m%d%y\') bs=512 count=1" WAIT
+            SHELL "dd if=/" & Trim(sTarget) & " of=/mnt/target/boot/MBR.$(  
date +\'%m%d%y\') bs=512 count=1" WAIT

              SHELL "/usr/bin/ms-sys -z " & Trim(sTarget) WAIT
            ELSE

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r428 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec 18 12:52:17 2008
New Revision: 428

Modified:
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlLilo.module
    branches/iVL/MdlNetConf.module
    branches/iVL/MdlPartFrmt.module
    branches/iVL/MdlSetup.module

Log:
reverted to fix broken shell command

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Dec 18 12:52:17 2008
@@ -552,106 +552,106 @@
  END


-                    ' PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
-                    '
-                    '   'Will need to read SETUP.CONF to determine what to  
do here
-                    '
-                    '   DIM sFile AS String[]
-                    '   DIM sEntry AS String[]
-                    '   DIM stlzList AS String[]
-                    '   DIM sTlz AS String
-                    '   DIM sPak AS String
-                    '   DIM sPakPath AS String
-                    '   DIM sPakSize AS Variant
-                    '   DIM sTargetSize AS Variant
-                    '   DIM iTotalSize AS Integer
-                    '   DIM iCurrSize AS Variant
-                    '   DIM sPakDesc AS String
-                    '   DIM i AS Integer
-                    '   DIM ii AS Integer
-                    '   DIM sLine AS String
-                    '   DIM sBulkPath AS String
-                    '   DIM sConfPath AS String
-                    '   DIM sOptPkgPath AS String
-                    '   DIM iVal AS Float
-                    '   DIM sBasePath AS String = ClsGlobal.sSourceMnt  
&/ "veclinux"
-                    '
-                    '       WITH FrmInstallSys
-                    '         .Resize(FMain.pnlWinHost.Width,  
FMain.pnlWinHost.Height)
-                    '       END WITH
-                    '   ClsGlobal.iPkgCnt =  
MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
-                    '     'Message.Info("Total packages = " & iPkgCnt)
-                    '   'RETURN
-                    '   ' make sure the progress is revealed at the main  
window
-                    '     WITH FMain
-                    '     .tvPlan["Inst1"].Picture = MdlCore.sDonePic
-                    '     .tvPlan["Inst2"].Selected = TRUE
-                    '     .tvPlan["Inst2"].Picture = MdlCore.sNowPic
-                    '     END WITH
-                    '
-                    '   MdlSetup.SHOW_PROGRESS_CONTROLS()
-                    '   FrmInstallSys.tlBanner.Text = ("Vectorlinux is now  
being installed. Please wait...")
-                    '   ClsGlobal.sTargetMnt = "/mnt/target"
-                    '     sFile =  
Split(File.Load(Temp$("SETUP.CONF")), "\n")
-                    '       FOR i = 0 TO sFile.count - 1
-                    '         sLine = Trim(sFile[i])
-                    '           IF Left(sLine, Len("BULK") + 1)  
LIKE "BULK" & "*[0-9]*" THEN
-                    '             sLine = Right(sLine, Len(sLine) -  
InStr(sLine, "\'"))
-                    '             sLine = Left(sLine, Len(sLine) - 1)
-                    '               sPak = Right(sLine, Len(sLine) -  
InStr(sLine, "\'"))
-                    '               sPak = Left(sPak, Len(sPak) - 1)
-                    '               sEntry = Split(sPak, ":")
-                    '                 sPakPath = sEntry[0]
-                    '                 sPakSize = sEntry[1]
-                    '                 sPakDesc = sEntry[2]
-                    '                   'PRINT sBasePath &/ sPakPath & "  
= " & sPakDesc & " size= " & CStr(sPakSize)
-                    '                       ' figure out the sizing and  
the progrss meter
-                    '                         SHELL "export gsize=$(df|  
grep " & ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO  
sTargetSize
-                    '                           'Message(CStr(sTargetSize))
-                    '                           sTargetSize =  
Trim(CStr(sTargetSize))
-                    '                           sPakSize =  
Trim(CStr(sPakSize)) '
-                    '
-                    '                         'RETURN
-                    '                 FrmInstallSys.tlCurrPkg.Text  
= "Installing " & sPakDesc & " ..."
-                    '                 FrmInstallSys.pbInstallProg.Value =  
0.0
-                    '
-                    '                 PRINT "Installing " & sPakDesc & "  
Total size (KB) = " & CStr(sPakSize)
-                    '                 sDump = ""
-                    '                 sErr = ""
-                    '                   MdlCore.LOCK_GUI()
-                    '                   'inc iPkgNum
-                    '               hproc = SHELL "lzmadec <" & sBasePath  
&/ sPakPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " || echo  
\'FAILED\' 2> /tmp/installdump" 'FOR READ
-                    '
-                    '                 WAIT 2
-                    '                   IF hproc.State = Process.Running  
THEN
-                    '                     REPEAT
-                    '                       WAIT 2
-                    '                             
UPDATE_STEP_PROGRESS(sTargetSize, sPakSize, ClsGlobal.iPkgNum)
-                    '                     UNTIL
-                    '                       hproc.State = Process.Stopped
-                    '                           ' error check
-                    '                             sDump =  
File.Load("/tmp/installdump")
-                    '                             IF  
InStr(sDump, "FAILED") > 0 THEN
-                    '                               Message.Error(("There  
has been an error extracting") & Space(1) & sPakDesc & gb.NewLine &
-                    '                               "<b>ERROR</b>" &  
gb.NewLine &
-                    '                               sErr)
-                    '                               RETURN 1
-                    '                             ELSE
-                    '                                
FrmInstallSys.pbInstallProg.Value = 1
-                    '                   END IF
-                    '                 PRINT sPak & " is installed... "
-                    '                 INC ClsGlobal.iPkgNum
-                    '                                
FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
-                    '                             END IF
-                    '            'PRINT "Needs to install " & sPak
-                    '           END IF
-                    '     NEXT
-                    '   FrmInstallSys.tlBanner.Text = ("Finished intalling  
Bulks")
-                    '
-                    '         ' now to the packages individually
-                    '         ' FrmInstallSys.tlBanner.Text = "Installing  
additional software."
-                    '   ' ME.INSTALL_PACKAGES
-                    ' END
+PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
+
+  'Will need to read SETUP.CONF to determine what to do here
+
+  DIM sFile AS String[]
+  DIM sEntry AS String[]
+  DIM stlzList AS String[]
+  DIM sTlz AS String
+  DIM sPak AS String
+  DIM sPakPath AS String
+  DIM sPakSize AS Variant
+  DIM sTargetSize AS Variant
+  DIM iTotalSize AS Integer
+  DIM iCurrSize AS Variant
+  DIM sPakDesc AS String
+  DIM i AS Integer
+  DIM ii AS Integer
+  DIM sLine AS String
+  DIM sBulkPath AS String
+  DIM sConfPath AS String
+  DIM sOptPkgPath AS String
+  DIM iVal AS Float
+  DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
+
+      WITH FrmInstallSys
+        .Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
+      END WITH
+  ClsGlobal.iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+    'Message.Info("Total packages = " & iPkgCnt)
+  'RETURN
+  ' make sure the progress is revealed at the main window
+    WITH FMain
+    .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+    .tvPlan["Inst2"].Selected = TRUE
+    .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+    END WITH
+
+  MdlSetup.SHOW_PROGRESS_CONTROLS()
+  FrmInstallSys.tlBanner.Text = ("Vectorlinux is now being installed.  
Please wait...")
+  ClsGlobal.sTargetMnt = "/mnt/target"
+    sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
+      FOR i = 0 TO sFile.count - 1
+        sLine = Trim(sFile[i])
+          IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
+            sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+            sLine = Left(sLine, Len(sLine) - 1)
+              sPak = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
+              sPak = Left(sPak, Len(sPak) - 1)
+              sEntry = Split(sPak, ":")
+                sPakPath = sEntry[0]
+                sPakSize = sEntry[1]
+                sPakDesc = sEntry[2]
+                  'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "  
size= " & CStr(sPakSize)
+                      ' figure out the sizing and the progrss meter
+                        SHELL "export gsize=$(df| grep " &  
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
+                          'Message(CStr(sTargetSize))
+                          sTargetSize = Trim(CStr(sTargetSize))
+                          sPakSize = Trim(CStr(sPakSize)) '
+
+                        'RETURN
+                FrmInstallSys.tlCurrPkg.Text = "Installing " & sPakDesc  
& " ..."
+                FrmInstallSys.pbInstallProg.Value = 0.0
+
+                PRINT "Installing " & sPakDesc & " Total size (KB) = " &  
CStr(sPakSize)
+                sDump = ""
+                sErr = ""
+                  MdlCore.LOCK_GUI()
+                  'inc iPkgNum
+              hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " | tar  
-xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump" 'FOR READ
+
+                WAIT 2
+                  IF hproc.State = Process.Running THEN
+                    REPEAT
+                      WAIT 2
+                           UPDATE_STEP_PROGRESS(sTargetSize, sPakSize,  
ClsGlobal.iPkgNum)
+                    UNTIL
+                      hproc.State = Process.Stopped
+                          ' error check
+                            sDump = File.Load("/tmp/installdump")
+                            IF InStr(sDump, "FAILED") > 0 THEN
+                              Message.Error(("There has been an error  
extracting") & Space(1) & sPakDesc & gb.NewLine &
+                              "<b>ERROR</b>" & gb.NewLine &
+                              sErr)
+                              RETURN 1
+                            ELSE
+                              FrmInstallSys.pbInstallProg.Value = 1
+                  END IF
+                PRINT sPak & " is installed... "
+                INC ClsGlobal.iPkgNum
+                              FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+                            END IF
+           'PRINT "Needs to install " & sPak
+          END IF
+    NEXT
+  FrmInstallSys.tlBanner.Text = ("Finished intalling Bulks")
+
+        ' now to the packages individually
+        ' FrmInstallSys.tlBanner.Text = "Installing additional software."
+  ' ME.INSTALL_PACKAGES
+END


  PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float,  
iCurrPkg AS Integer)

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Thu Dec 18 12:52:17 2008
@@ -38,7 +38,7 @@
              IF Exist("/usr/bin/ms-sys") THEN
              'dd if=/dev/hda of=/boot/MBR.$( date '+%m%d%y') bs=512 count=1

-            SHELL "dd if=/" & Trim(sTarget) & " of=/mnt/target/boot/MBR.$(  
date +\'%m%d%y\') bs=512 count=1" WAIT
+            SHELL "dd if=/dev/" & Trim(sTarget) & "  
of=/mnt/target/boot/MBR.$( date +\'%m%d%y\') bs=512 count=1" WAIT

              SHELL "/usr/bin/ms-sys -z " & Trim(sTarget) WAIT
            ELSE

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Thu Dec 18 12:52:17 2008
@@ -34,37 +34,55 @@

  PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"]
  PRIVATE pWirelessPic AS picture = picture["images/wireless.png"]
-PRIVATE iFrameTop AS Integer

-PUBLIC SUB LIST_NETWORK_INTERFACES()
-
-  DIM sDevAddr, sEths, sDump, sDev, sType, sStatus, sApDump AS String
-  DIM sDevList, sLine AS String[]
-  DIM i, ii, y, x AS Integer
-  DIM tl AS TextLabel
-  DIM tb AS TextBox
-  DIM cb AS ComboBox
-  DIM bcb AS CheckBox
-  DIM ptabpic AS Picture
-
-  ' 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[]
+
+PUBLIC SUB LIST_NETWORK_INTERFACES()

-       SHELL "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'\"\" " TO seths
-    seths = Trim(seths)
+  ' 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"))

-           IF seths = "" THEN  ' WARN IF NO NETWORK HARDWARE CAN BE  
DETECTED AND EXIT WITHOUT ERROR
+    '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
@@ -82,8 +100,10 @@
                  ME.ifaceCnt = 0
              RETURN
        END IF
-'
-          sDevList = Split(seths, gb.NewLine)
+
+
+
+      sDevList = Split(seths, gb.NewLine)
        'Message(seths)
        ME.ifaceCnt = sDevList.Count
               FOR i = 0 TO sDevList.count - 1
@@ -92,9 +112,21 @@
            sDev = sLine[0]
              'Message(sLine[1])
             sDevAddr = sLine[4] ' This may be off depending on which box  
this runs one... needs careful testing
-            'Message(sDevAddr)
-          sType = ("Wired") ' Not detecting wireless, so lets just leave  
it at this
-
+                ' 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)
@@ -104,872 +136,678 @@
                            ELSE
                              sStatus = ("Unplugged")
                            END IF
-                          'Message(sDev & gb.NewLine & sDevAddr &  
gb.NewLine & sStatus)
-' BEGIN POPULATING TABSTRIP.  
=========================================================================
-
-WITH FrmNetConf.TSNetDevices
-  .Index = i
-  .Text = sDev
-
-        ' **************** tabs strip objects
-          tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' MACK ADDRESS LABEL
-            WITH tl
-              .Text = ("Hardware Address")
-              .Width = MdlObjSizer.get_object_width(.Text)
-              .Height = 21
-              .Alignment = Align.Normal
-              .Move(4, 16)
-            END WITH
-              'y = y + tl.Top + tl.Height + 4
-        tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" '  
MAC ADDRESS BOX
-            WITH tb
-            .Text = sDevAddr
-            .ReadOnly = TRUE
-            .Height = 21
-            .Width = MdlObjSizer.get_object_width(.Text) + 16
-            .Move(tl.Left + tl.Width + 4, tl.Top)
-            END WITH
-        ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' INTERFACE  
TYPE LABEL
-        ' ' ' ' '     WITH tl
-        ' ' ' ' '         .Text = ("Interface Type")
-        ' ' ' ' '         .Width = MdlObjSizer.get_object_width(.Text)
-        ' ' ' ' '         .Height = 21
-        ' ' ' ' '         .Alignment = Align.Normal
-        ' ' ' ' '         .Move(tb.Left + tb.Width + 4, tb.Top)
-        ' ' ' ' '     END WITH
-        ' ' ' ' '
-            y = y + tb.Top + tb.Height + 4
-        bcb = NEW CheckBox(FrmNetConf.TSNetDevices)  
AS "bEnableInterface"  '************ enabled / disabled checkbox  
**************************
-          WITH bcb
-            .Value = TRUE
-              .Text = ("Automatically activate this interface at start-up")
-              .Height = 21
-              .Width = MdlObjSizer.get_object_width(.Text) + 36
-              .Move(4, y)
-          END WITH
-          ME.objCheckboxes.Add(bcb)
-            y = bcb.top + bcb.Height + 8
-
-        tl = NEW TextLabel(FrmNetConf.TSNetDevices)
-          WITH tl
-            .Text = ("Setup Mode")
-            .Alignment = Align.Normal
-            .Height = 21
-            .Width = MdlObjSizer.get_object_width(.Text)
-            .Move(24, y) ' indent this a little
-          END WITH
-
-        cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" '  
*******************************
-            WITH cb
-              .ReadOnly = TRUE
-              .list = ["DHCP", "STATIC"]
-              .Height = 21
-              .Width = MdlObjSizer.get_object_width("STATIC") * 2
-              .move(tl.Left + tl.Width + 4, y)
-            END WITH
-            ME.objCombos.Add(cb)
-
-        tl = NEW  
TextLabel(FrmNetConf.TSNetDevices) '***********************************************************
-            WITH tl
-              .Text = ("Current Status:") & Space(1) & "<b>" & sStatus  
& "</b>"
-              .Alignment = Align.Normal
-              .Height = 21
-              .Width = MdlObjSizer.get_object_width(.Text)
-              .Move(cb.Left + cb.Width + 4, y)
-            END WITH
-            iFrameTop = tl.top + tl.Height + 8
+
+                  ' 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)


-END WITH  ' END JACKING WITH TABSTRIP  
========================================================================
+  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()

-
-
-
-          NEXT
  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 hardwar...
 
[truncated message content]

[Vectorlinux-devel] [vinstall-ng commit] r427 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec 18 11:08:02 2008
New Revision: 427

Modified:
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.project
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlLilo.module
    branches/iVL/MdlPartFrmt.module
    branches/iVL/MdlSetup.module
    branches/iVL/installer.gambas

Log:
debugging installation process

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Thu Dec 18 11:08:02 2008
@@ -14,27 +14,27 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: MdlSetup.module:216
+#: MdlSetup.module:154
  msgid "Calculating package count ... Please wait"
  msgstr ""

-#: MdlSetup.module:272
+#: MdlSetup.module:210
  msgid "Total bulks to be installed = "
  msgstr ""

-#: MdlSetup.module:275
+#: MdlSetup.module:213
  msgid "Total pkgs to be installed = "
  msgstr ""

-#: MdlSetup.module:318
+#: MdlSetup.module:256
  msgid "BROUGHT TO YOU BY"
  msgstr ""

-#: MdlSetup.module:334
+#: MdlSetup.module:272
  msgid "Activating swap space"
  msgstr ""

-#: MdlSetup.module:336
+#: MdlSetup.module:274
  msgid "Preparing filesystems"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec 18 11:08:02 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.14
+Version=0.1.20
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Dec 18 11:08:02 2008
@@ -552,106 +552,106 @@
  END


-PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
-
-  'Will need to read SETUP.CONF to determine what to do here
-
-  DIM sFile AS String[]
-  DIM sEntry AS String[]
-  DIM stlzList AS String[]
-  DIM sTlz AS String
-  DIM sPak AS String
-  DIM sPakPath AS String
-  DIM sPakSize AS Variant
-  DIM sTargetSize AS Variant
-  DIM iTotalSize AS Integer
-  DIM iCurrSize AS Variant
-  DIM sPakDesc AS String
-  DIM i AS Integer
-  DIM ii AS Integer
-  DIM sLine AS String
-  DIM sBulkPath AS String
-  DIM sConfPath AS String
-  DIM sOptPkgPath AS String
-  DIM iVal AS Float
-  DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
-
-      WITH FrmInstallSys
-        .Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
-      END WITH
-  ClsGlobal.iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
-    'Message.Info("Total packages = " & iPkgCnt)
-  'RETURN
-  ' make sure the progress is revealed at the main window
-    WITH FMain
-    .tvPlan["Inst1"].Picture = MdlCore.sDonePic
-    .tvPlan["Inst2"].Selected = TRUE
-    .tvPlan["Inst2"].Picture = MdlCore.sNowPic
-    END WITH
-
-  MdlSetup.SHOW_PROGRESS_CONTROLS()
-  FrmInstallSys.tlBanner.Text = ("Vectorlinux is now being installed.  
Please wait...")
-  ClsGlobal.sTargetMnt = "/mnt/target"
-    sFile = Split(File.Load(Temp$("SETUP.CONF")), "\n")
-      FOR i = 0 TO sFile.count - 1
-        sLine = Trim(sFile[i])
-          IF Left(sLine, Len("BULK") + 1) LIKE "BULK" & "*[0-9]*" THEN
-            sLine = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
-            sLine = Left(sLine, Len(sLine) - 1)
-              sPak = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
-              sPak = Left(sPak, Len(sPak) - 1)
-              sEntry = Split(sPak, ":")
-                sPakPath = sEntry[0]
-                sPakSize = sEntry[1]
-                sPakDesc = sEntry[2]
-                  'PRINT sBasePath &/ sPakPath & " = " & sPakDesc & "  
size= " & CStr(sPakSize)
-                      ' figure out the sizing and the progrss meter
-                        SHELL "export gsize=$(df| grep " &  
ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
-                          'Message(CStr(sTargetSize))
-                          sTargetSize = Trim(CStr(sTargetSize))
-                          sPakSize = Trim(CStr(sPakSize)) '
-
-                        'RETURN
-                FrmInstallSys.tlCurrPkg.Text = "Installing " & sPakDesc  
& " ..."
-                FrmInstallSys.pbInstallProg.Value = 0.0
-
-                PRINT "Installing " & sPakDesc & " Total size (KB) = " &  
CStr(sPakSize)
-                sDump = ""
-                sErr = ""
-                  MdlCore.LOCK_GUI()
-                  'inc iPkgNum
-              hproc = SHELL "lzmadec <" & sBasePath &/ sPakPath & " | tar  
-xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump" 'FOR READ
-
-                WAIT 2
-                  IF hproc.State = Process.Running THEN
-                    REPEAT
-                      WAIT 2
-                           UPDATE_STEP_PROGRESS(sTargetSize, sPakSize,  
ClsGlobal.iPkgNum)
-                    UNTIL
-                      hproc.State = Process.Stopped
-                          ' error check
-                            sDump = File.Load("/tmp/installdump")
-                            IF InStr(sDump, "FAILED") > 0 THEN
-                              Message.Error(("There has been an error  
extracting") & Space(1) & sPakDesc & gb.NewLine &
-                              "<b>ERROR</b>" & gb.NewLine &
-                              sErr)
-                              RETURN 1
-                            ELSE
-                              FrmInstallSys.pbInstallProg.Value = 1
-                  END IF
-                PRINT sPak & " is installed... "
-                INC ClsGlobal.iPkgNum
-                              FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
-                            END IF
-           'PRINT "Needs to install " & sPak
-          END IF
-    NEXT
-  FrmInstallSys.tlBanner.Text = ("Finished intalling Bulks")
-
-        ' now to the packages individually
-        ' FrmInstallSys.tlBanner.Text = "Installing additional software."
-  ' ME.INSTALL_PACKAGES
-END
+                    ' PUBLIC SUB PERFORM_FULL_INSTALL_OLD() AS Integer
+                    '
+                    '   'Will need to read SETUP.CONF to determine what to  
do here
+                    '
+                    '   DIM sFile AS String[]
+                    '   DIM sEntry AS String[]
+                    '   DIM stlzList AS String[]
+                    '   DIM sTlz AS String
+                    '   DIM sPak AS String
+                    '   DIM sPakPath AS String
+                    '   DIM sPakSize AS Variant
+                    '   DIM sTargetSize AS Variant
+                    '   DIM iTotalSize AS Integer
+                    '   DIM iCurrSize AS Variant
+                    '   DIM sPakDesc AS String
+                    '   DIM i AS Integer
+                    '   DIM ii AS Integer
+                    '   DIM sLine AS String
+                    '   DIM sBulkPath AS String
+                    '   DIM sConfPath AS String
+                    '   DIM sOptPkgPath AS String
+                    '   DIM iVal AS Float
+                    '   DIM sBasePath AS String = ClsGlobal.sSourceMnt  
&/ "veclinux"
+                    '
+                    '       WITH FrmInstallSys
+                    '         .Resize(FMain.pnlWinHost.Width,  
FMain.pnlWinHost.Height)
+                    '       END WITH
+                    '   ClsGlobal.iPkgCnt =  
MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+                    '     'Message.Info("Total packages = " & iPkgCnt)
+                    '   'RETURN
+                    '   ' make sure the progress is revealed at the main  
window
+                    '     WITH FMain
+                    '     .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+                    '     .tvPlan["Inst2"].Selected = TRUE
+                    '     .tvPlan["Inst2"].Picture = MdlCore.sNowPic
+                    '     END WITH
+                    '
+                    '   MdlSetup.SHOW_PROGRESS_CONTROLS()
+                    '   FrmInstallSys.tlBanner.Text = ("Vectorlinux is now  
being installed. Please wait...")
+                    '   ClsGlobal.sTargetMnt = "/mnt/target"
+                    '     sFile =  
Split(File.Load(Temp$("SETUP.CONF")), "\n")
+                    '       FOR i = 0 TO sFile.count - 1
+                    '         sLine = Trim(sFile[i])
+                    '           IF Left(sLine, Len("BULK") + 1)  
LIKE "BULK" & "*[0-9]*" THEN
+                    '             sLine = Right(sLine, Len(sLine) -  
InStr(sLine, "\'"))
+                    '             sLine = Left(sLine, Len(sLine) - 1)
+                    '               sPak = Right(sLine, Len(sLine) -  
InStr(sLine, "\'"))
+                    '               sPak = Left(sPak, Len(sPak) - 1)
+                    '               sEntry = Split(sPak, ":")
+                    '                 sPakPath = sEntry[0]
+                    '                 sPakSize = sEntry[1]
+                    '                 sPakDesc = sEntry[2]
+                    '                   'PRINT sBasePath &/ sPakPath & "  
= " & sPakDesc & " size= " & CStr(sPakSize)
+                    '                       ' figure out the sizing and  
the progrss meter
+                    '                         SHELL "export gsize=$(df|  
grep " & ClsPartSel.sRoot & " ) && echo $gsize | cut -f3 -d \' \'" TO  
sTargetSize
+                    '                           'Message(CStr(sTargetSize))
+                    '                           sTargetSize =  
Trim(CStr(sTargetSize))
+                    '                           sPakSize =  
Trim(CStr(sPakSize)) '
+                    '
+                    '                         'RETURN
+                    '                 FrmInstallSys.tlCurrPkg.Text  
= "Installing " & sPakDesc & " ..."
+                    '                 FrmInstallSys.pbInstallProg.Value =  
0.0
+                    '
+                    '                 PRINT "Installing " & sPakDesc & "  
Total size (KB) = " & CStr(sPakSize)
+                    '                 sDump = ""
+                    '                 sErr = ""
+                    '                   MdlCore.LOCK_GUI()
+                    '                   'inc iPkgNum
+                    '               hproc = SHELL "lzmadec <" & sBasePath  
&/ sPakPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " || echo  
\'FAILED\' 2> /tmp/installdump" 'FOR READ
+                    '
+                    '                 WAIT 2
+                    '                   IF hproc.State = Process.Running  
THEN
+                    '                     REPEAT
+                    '                       WAIT 2
+                    '                             
UPDATE_STEP_PROGRESS(sTargetSize, sPakSize, ClsGlobal.iPkgNum)
+                    '                     UNTIL
+                    '                       hproc.State = Process.Stopped
+                    '                           ' error check
+                    '                             sDump =  
File.Load("/tmp/installdump")
+                    '                             IF  
InStr(sDump, "FAILED") > 0 THEN
+                    '                               Message.Error(("There  
has been an error extracting") & Space(1) & sPakDesc & gb.NewLine &
+                    '                               "<b>ERROR</b>" &  
gb.NewLine &
+                    '                               sErr)
+                    '                               RETURN 1
+                    '                             ELSE
+                    '                                
FrmInstallSys.pbInstallProg.Value = 1
+                    '                   END IF
+                    '                 PRINT sPak & " is installed... "
+                    '                 INC ClsGlobal.iPkgNum
+                    '                                
FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+                    '                             END IF
+                    '            'PRINT "Needs to install " & sPak
+                    '           END IF
+                    '     NEXT
+                    '   FrmInstallSys.tlBanner.Text = ("Finished intalling  
Bulks")
+                    '
+                    '         ' now to the packages individually
+                    '         ' FrmInstallSys.tlBanner.Text = "Installing  
additional software."
+                    '   ' ME.INSTALL_PACKAGES
+                    ' END


  PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float,  
iCurrPkg AS Integer)

Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module	(original)
+++ branches/iVL/MdlLilo.module	Thu Dec 18 11:08:02 2008
@@ -38,7 +38,7 @@
              IF Exist("/usr/bin/ms-sys") THEN
              'dd if=/dev/hda of=/boot/MBR.$( date '+%m%d%y') bs=512 count=1

-            SHELL "dd if=/dev/" & Trim(sTarget) & "  
of=/mnt/target/boot/MBR.$( date +\'%m%d%y\') bs=512 count=1" WAIT
+            SHELL "dd if=/" & Trim(sTarget) & " of=/mnt/target/boot/MBR.$(  
date +\'%m%d%y\') bs=512 count=1" WAIT

              SHELL "/usr/bin/ms-sys -z " & Trim(sTarget) WAIT
            ELSE

Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module	(original)
+++ branches/iVL/MdlPartFrmt.module	Thu Dec 18 11:08:02 2008
@@ -38,7 +38,7 @@
      PRINT "Partition formatting complete"

          MdlCore.LOCK_GUI()
-      MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
+      'MdlInstallSys.MOUNT_DEFINED_PARTITIONS() ' let the game begin
        ' begin running the credits

  ' ' '   END IF
@@ -83,7 +83,7 @@



-    PRINT "Formatting " & sAddr & " to " & sFS
+    'PRINT "Formatting " & sAddr & " to " & sFS
    hproc = SHELL sCommand & " || echo \'FAILED\'" WAIT 'for read
      WAIT 2
        IF hproc.State = Process.Running THEN

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Dec 18 11:08:02 2008
@@ -89,68 +89,6 @@

  END

-PUBLIC FUNCTION FORMAT_SELECTED_PARTITIONS() AS Integer
-
-  'DIM hproc AS Process
-  DIM sDump AS String
-
-
-
-
-    SHELL "mkfs." & LCase(ClsPartSel.fRoot) & " || echo \'ERROR\'" TO sDump
-
-            GOTO CHECK_OUTPUT
-
-
- IF ClsPartSel.sHome AND ClsPartSel.fhome <> "Do not format" THEN
-  sDump = ""
-  SHELL "mkfs." & LCase(ClsPartSel.fhome) & " || echo \'ERROR\'" TO sDump
-
-    GOTO CHECK_OUTPUT
-  END IF
-
-
-
- IF ClsPartSel.sOpt AND ClsPartSel.fOpt <> "Do not format" THEN
- sDump = ""
-  SHELL "mkfs." & LCase(ClsPartSel.fOpt) & " || echo \'ERROR\'" TO sDump
-
-        GOTO CHECK_OUTPUT
- END IF
-
- IF ClsPartSel.sUsr AND ClsPartSel.fUsr <> "Do not format" THEN
-  sDump = ""
-  SHELL "mkfs." & LCase(ClsPartSel.fUsr) & " || echo \'ERROR\'" TO sDump
-
-      GOTO CHECK_OUTPUT
- END IF
-
- IF ClsPartSel.sVar AND ClsPartSel.fVar <> "Do not format" THEN
-  sDump = ""
-  SHELL "mkfs." & LCase(ClsPartSel.fVar) & " || echo \'ERROR\'" TO sDump
-
-    GOTO CHECK_OUTPUT
-  END IF
-
-  IF ClsPartSel.sTmp AND ClsPartSel.fTmp <> "Do not format" THEN
-    sDump = ""
-       SHELL "mkfs." & LCase(ClsPartSel.fTmp) & " || echo \'FAILED\'" TO  
sDump
-
-          GOTO CHECK_OUTPUT
-  END IF
-
-
-
-CHECK_OUTPUT:
- IF InStr(sDump, "ERROR") = TRUE THEN
-                RETURN 1 ' not good... stop right there
-              ELSE
-                RETURN 0
-              END IF
-
-END
-
-

  PUBLIC SUB SHOW_PROGRESS_CONTROLS()

@@ -334,7 +272,9 @@
      FrmInstallSys.tlCurrPkg.text = ("Activating swap space")
    MdlInstallSys.ACTIVATE_SWAP_SPACE()
      FrmInstallSys.tlCurrPkg.text = ("Preparing filesystems")
+
    MdlPartFrmt.PREPARE_ALL_PARTITIONS() ' This will start the install  
process
+  MdlInstallSys.MOUNT_DEFINED_PARTITIONS()


  END

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r426 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec 18 07:00:39 2008
New Revision: 426

Modified:
    branches/iVL/.project
    branches/iVL/FrmNetConf.class
    branches/iVL/MdlNetConf.module
    branches/iVL/installer.gambas

Log:
Completed rewrite of network configuration step


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec 18 07:00:39 2008
@@ -1,8 +1,8 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
-Startup=FrmNetConf
-Version=0.1.17
+Startup=MdlCore
+Version=0.1.14
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Thu Dec 18 07:00:39 2008
@@ -47,12 +47,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

      ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()

@@ -151,12 +151,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	Thu Dec 18 07:00:39 2008
@@ -34,6 +34,7 @@

  PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"]
  PRIVATE pWirelessPic AS picture = picture["images/wireless.png"]
+PRIVATE iFrameTop AS Integer

  PUBLIC SUB LIST_NETWORK_INTERFACES()

@@ -128,18 +129,62 @@
              .Width = MdlObjSizer.get_object_width(.Text) + 16
              .Move(tl.Left + tl.Width + 4, tl.Top)
              END WITH
-        tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' INTERFACE TYPE LABEL
-            WITH tl
-                .Text = ("Interface Type")
-                .Width = MdlObjSizer.get_object_width(.Text)
-                .Height = 21
-                .Alignment = Align.Normal
-                .Move(tb.Left + tb.Width + 4, tb.Top)
+        ' ' ' ' ' tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' INTERFACE  
TYPE LABEL
+        ' ' ' ' '     WITH tl
+        ' ' ' ' '         .Text = ("Interface Type")
+        ' ' ' ' '         .Width = MdlObjSizer.get_object_width(.Text)
+        ' ' ' ' '         .Height = 21
+        ' ' ' ' '         .Alignment = Align.Normal
+        ' ' ' ' '         .Move(tb.Left + tb.Width + 4, tb.Top)
+        ' ' ' ' '     END WITH
+        ' ' ' ' '
+            y = y + tb.Top + tb.Height + 4
+        bcb = NEW CheckBox(FrmNetConf.TSNetDevices)  
AS "bEnableInterface"  '************ enabled / disabled checkbox  
**************************
+          WITH bcb
+            .Value = TRUE
+              .Text = ("Automatically activate this interface at start-up")
+              .Height = 21
+              .Width = MdlObjSizer.get_object_width(.Text) + 36
+              .Move(4, y)
+          END WITH
+          ME.objCheckboxes.Add(bcb)
+            y = bcb.top + bcb.Height + 8
+
+        tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+          WITH tl
+            .Text = ("Setup Mode")
+            .Alignment = Align.Normal
+            .Height = 21
+            .Width = MdlObjSizer.get_object_width(.Text)
+            .Move(24, y) ' indent this a little
+          END WITH
+
+        cb = NEW ComboBox(FrmNetConf.TSNetDevices) AS "MethodSel" '  
*******************************
+            WITH cb
+              .ReadOnly = TRUE
+              .list = ["DHCP", "STATIC"]
+              .Height = 21
+              .Width = MdlObjSizer.get_object_width("STATIC") * 2
+              .move(tl.Left + tl.Width + 4, y)
              END WITH
+            ME.objCombos.Add(cb)

+        tl = NEW  
TextLabel(FrmNetConf.TSNetDevices) '***********************************************************
+            WITH tl
+              .Text = ("Current Status:") & Space(1) & "<b>" & sStatus  
& "</b>"
+              .Alignment = Align.Normal
+              .Height = 21
+              .Width = MdlObjSizer.get_object_width(.Text)
+              .Move(cb.Left + cb.Width + 4, y)
+            END WITH
+            iFrameTop = tl.top + tl.Height + 8


-            y = y + tb.Top + tb.Height + 4
+
+
+
+
+



@@ -933,136 +978,118 @@
    DIM tl AS TextLabel
    DIM itxtleft, itxtwidth, imandnsleft, imandnstxtleft, itlwidth AS Integer

+  IF NOT LAST.text THEN RETURN
+    iFrameTop = LAST.top + LAST.Height + 4
    IF LAST.text = "STATIC" THEN
-  frmDetails = NEW Frame(FrmNetConf.TSNetDevices) AS "STaticDetails"
-    WITH frmDetails
-      .Move(ileft, itop + 8)
-      .text = Space(1) & ("Static IP Address Settings") & Space(1)
-          FOR EACH txtbox IN objIntTypes
-            IF txtbox.tag = LAST.tag THEN
-              IF txtbox.text = ("Wired") THEN
-                .Width = FrmNetConf.TSNetDevices.Width - (ileft * 3)
-              ELSE
-                .Width = 300
-              END IF
-            END IF
-          NEXT
-
-
-      '.Width = 300 '.Parent.Width - (.left * 2.5)
-      .Height = 130
-      .tag = LAST.tag
-
-    END WITH
-    objFrames.Add(frmDetails)
-        'populate the frame for this
-              tl = NEW TextLabel(frmDetails) AS "tlStaticLabels"
-                WITH tl
-                  .Move(8, 24)
-                  .text = ("IP Address")
-                  .Height = 21
-                  .Width = MdlObjSizer.get_object_width(.text)
-                  .Alignment = Align.Normal
-                END WITH
-              txtbox = NEW TextBox(frmDetails) AS "txtStatisIpBoxes" '  
static IP Address Box
-                WITH txtbox
-                  .tag = LAST.tag
-                  .Move((tl.left + tl.Width) * 2, tl.Top)
-                  .text = "192.168.1.100"
-                  .Height = 21
-                  .Width = MdlObjSizer.get_object_width(.text) * 2
-                  .MaxLength = 16
-                    IF objtxtIps.Find(txtbox) = -1 THEN  
objtxtIps.Add(txtbox) ' add to the array
-                END WITH
-                itxtleft = (tl.Left + tl.Width) * 2 'txtbox.Left
-                itxtwidth = txtbox.Width
-                imandnsleft = itxtleft + itxtwidth + 8
-
-
-
-              tl = NEW TextLabel(frmDetails) AS "tlStaticLabels"
-                WITH tl
-                  .text = ("Subnet Mask")
-                  .width = MdlObjSizer.get_object_width(.text)
-                  .Height = 21
-                  .Alignment = Align.Normal
-                  .Move(8, txtbox.top + txtbox.Height + 4)
-                END WITH
-              txtbox = NEW TextBox(frmDetails) AS "txtDnsMaskBoxes" ' DNS  
Mask Box
-                WITH txtbox
-                  .Move(itxtleft, tl.top)
-                  .text = "255.255.255.0"
-                  .tag = LAST.tag
-                  .Height = 21
-                  .Width = itxtwidth
-                  .MaxLength = 16
-                    IF objtxtNetMasks.Find(txtbox) = -1 THEN  
objtxtNetMasks.Add(txtbox) ' add to the array
-                END WITH
-
-
-              tl = NEW TextLabel(frmDetails) AS "tlStaticLabels"
-                WITH tl
-                  .Move(8, txtbox.top + txtbox.Height + 4)
-                  .Height = 21
-                  .text = ("Gateway Address")
-                  .Width = MdlObjSizer.get_object_width(.text)
-                  .Alignment = Align.Normal
-                END WITH
-              txtbox = NEW TextBox(frmDetails) AS "txtGatewayAddrBoxes" '  
Gateway address box
-                WITH txtbox
-                  .tag = LAST.tag
-                  .Move(itxtleft, tl.top)
-                  .Height = 21
-                  .Width = itxtwidth
-                  .MaxLength = 16
-                  .text = "192.168.1.254"
-                    IF objtxtDNS.Find(txtbox) = -1 THEN  
objtxtDNS.Add(txtbox) ' add to the array
-                END WITH
-
-
-      FOR EACH tl IN objtlDetails
-        IF tl.tag = LAST.tag THEN
-          objtlDetails.Delete(objtlDetails.Find(tl))
-        END IF
-      NEXT
-
+                frmDetails = NEW Frame(FrmNetConf.TSNetDevices)  
AS "STaticDetails"
+                  WITH frmDetails
+                    '.Move(ileft, itop + 8)
+                    .Move(24, iFrameTop)
+                    .text = Space(1) & ("Static IP Address Settings") &  
Space(1)
+                    .Width = (.Parent.Width - (.left) * 1.5)
+                    .Height = 130
+                    .tag = LAST.tag
+                    .Raise()
+                    .Visible = TRUE
+                  END WITH
+                  objFrames.Add(frmDetails)
+                      'populate the frame for this
+                            tl = NEW TextLabel(frmDetails)  
AS "tlStaticLabels"
+                              WITH tl
+                                .Move(8, 24)
+                                .text = ("IP Address")
+                                .Height = 21
+                                .Width =  
MdlObjSizer.get_object_width(.text)
+                                .Alignment = Align.Normal
+                              END WITH
+                            txtbox = NEW TextBox(frmDetails)  
AS "txtStatisIpBoxes" ' static IP Address Box
+                              WITH txtbox
+                                .tag = LAST.tag
+                                .Move((tl.left + tl.Width) * 2, tl.Top)
+                                .text = "192.168.1.100"
+                                .Height = 21
+                                .Width =  
MdlObjSizer.get_object_width(.text) * 2
+                                .MaxLength = 16
+                                  IF objtxtIps.Find(txtbox) = -1 THEN  
objtxtIps.Add(txtbox) ' add to the array
+                              END WITH
+                              itxtleft = (tl.Left + tl.Width) *  
2 'txtbox.Left
+                              itxtwidth = txtbox.Width
+                              imandnsleft = itxtleft + itxtwidth + 8
+
+
+
+                            tl = NEW TextLabel(frmDetails)  
AS "tlStaticLabels"
+                              WITH tl
+                                .text = ("Subnet Mask")
+                                .width =  
MdlObjSizer.get_object_width(.text)
+                                .Height = 21
+                                .Alignment = Align.Normal
+                                .Move(8, txtbox.top + txtbox.Height + 4)
+                              END WITH
+                            txtbox = NEW TextBox(frmDetails)  
AS "txtDnsMaskBoxes" ' DNS Mask Box
+                              WITH txtbox
+                                .Move(itxtleft, tl.top)
+                                .text = "255.255.255.0"
+                                .tag = LAST.tag
+                                .Height = 21
+                                .Width = itxtwidth
+                                .MaxLength = 16
+                                  IF objtxtNetMasks.Find(txtbox) = -1 THEN  
objtxtNetMasks.Add(txtbox) ' add to the array
+                              END WITH
+
+
+                            tl = NEW TextLabel(frmDetails)  
AS "tlStaticLabels"
+                              WITH tl
+                                .Move(8, txtbox.top + txtbox.Height + 4)
+                                .Height = 21
+                                .text = ("Gateway Address")
+                                .Width =  
MdlObjSizer.get_object_width(.text)
+                                .Alignment = Align.Normal
+                              END WITH
+                            txtbox = NEW TextBox(frmDetails)  
AS "txtGatewayAddrBoxes" ' Gateway address box
+                              WITH txtbox
+                                .tag = LAST.tag
+                                .Move(itxtleft, tl.top)
+                                .Height = 21
+                                .Width = itxtwidth
+                                .MaxLength = 16
+                                .text = "192.168.1.254"
+                                  IF objtxtDNS.Find(txtbox) = -1 THEN  
objtxtDNS.Add(txtbox) ' add to the array
+                              END WITH
+
+
+                    FOR EACH tl IN objtlDetails
+                      IF tl.tag = LAST.tag THEN
+                        objtlDetails.Delete(objtlDetails.Find(tl))
+                      END IF
+                    NEXT
+
    ELSE
-
+    'Message(LAST.text)
      FOR EACH frmDetails IN objFrames
        IF frmDetails.tag = LAST.tag THEN
        frmDetails.Delete
        objFrames.Delete(objFrames.Find(frmDetails))
      END IF
-        'objFrames.Delete(objFrames.Find(frmDetails))
-        'IF ERROR THEN Message(Error.Text & "\n" & Error.Where)
      NEXT
          ' create a text label that says the thing will get automatically  
configured

+        IF iFrameTop < 101 THEN iFrameTop = 101

          tl = NEW TextLabel(FrmNetConf.TSNetDevices) AS "DetailLbl"
            WITH tl
-            '.Move(LAST.left - (LAST.width / 2), LAST.top + LAST.height +  
12)
-            .Move(8, LAST.top + LAST.height + 12)
-              FOR EACH txtbox IN objIntTypes
-                  IF txtbox.tag = LAST.tag THEN
-                    IF txtbox.text = ("Wired") THEN
-                      itlwidth = FrmNetConf.TSNetDevices.Width - (tl.left  
* 2)
-                    ELSE
-                      itlwidth = 250
-                    END IF
-                  END IF
-        NEXT
-            .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")
+             .Move(24, iFrameTop)
+             .Width = (.Parent.Width - (.left) * 1.5)
+            .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
-            .Width = itlwidth
+            '.Width = itlwidth
              '.Width = 230 'MdlObjSizer.get_object_width(.text)
-            .Height = 21 * 6
+            .Height = 130
              .Tag = LAST.tag
              .Visible = TRUE
              .Raise
-
-
+
            END WITH
              objtlDetails.Add(tl)


Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r425 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Wed Dec 17 14:32:02 2008
New Revision: 425

Modified:
    branches/iVL/.project
    branches/iVL/FrmNetConf.class
    branches/iVL/MdlNetConf.module

Log:
Begin rewrite of netconf module

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Dec 17 14:32:02 2008
@@ -1,7 +1,7 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmNetConf
  Version=0.1.17
  Library=gb.gtk
  Library=gb.form

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Wed Dec 17 14:32:02 2008
@@ -47,12 +47,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

      ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()

@@ -151,12 +151,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	Wed Dec 17 14:32:02 2008
@@ -35,54 +35,35 @@
  PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"]
  PRIVATE pWirelessPic AS picture = picture["images/wireless.png"]

-
-
  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")))
+  DIM sDevAddr, sEths, sDump, sDev, sType, sStatus, sApDump AS String
+  DIM sDevList, sLine AS String[]
+  DIM i, ii, y, x AS Integer
+  DIM tl AS TextLabel
+  DIM tb AS TextBox
+  DIM cb AS ComboBox
+  DIM bcb AS CheckBox
+  DIM ptabpic AS Picture
+
+  ' INITIATE THE ARRAYS

-      seths = Trim(seths)
-
-      IF seths = "" THEN
+     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 "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'\"\" " TO seths
+    seths = Trim(seths)
+
+           IF seths = "" THEN  ' WARN IF NO NETWORK HARDWARE CAN BE  
DETECTED AND EXIT WITHOUT ERROR
            WITH FrmNetConf
              .cbUseManDNS.Enabled = FALSE
              .tlPrimaryDNS.Enabled = FALSE
@@ -100,10 +81,8 @@
                  ME.ifaceCnt = 0
              RETURN
        END IF
-
-
-
-      sDevList = Split(seths, gb.NewLine)
+'
+          sDevList = Split(seths, gb.NewLine)
        'Message(seths)
        ME.ifaceCnt = sDevList.Count
               FOR i = 0 TO sDevList.count - 1
@@ -112,21 +91,9 @@
            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
-
+            'Message(sDevAddr)
+          sType = ("Wired") ' Not detecting wireless, so lets just leave  
it at this
+
                      ' detect status
                        SHELL "ifplugstatus | grep ^" & sDev & " | cut -f 2  
-d \':\'" TO sStatus
                        'Message(sStatus)
@@ -136,675 +103,825 @@
                            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
+                          'Message(sDev & gb.NewLine & sDevAddr &  
gb.NewLine & sStatus)
+' BEGIN POPULATING TABSTRIP.  
=========================================================================
+
+WITH FrmNetConf.TSNetDevices
+  .Index = i
+  .Text = sDev
+
+        ' **************** tabs strip objects
+          tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' MACK ADDRESS LABEL
+            WITH tl
+              .Text = ("Hardware Address")
+              .Width = MdlObjSizer.get_object_width(.Text)
+              .Height = 21
+              .Alignment = Align.Normal
+              .Move(4, 16)
+            END WITH
+              'y = y + tl.Top + tl.Height + 4
+        tb = NEW TextBox(FrmNetConf.TSNetDevices) AS "txtDevAddresses" '  
MAC ADDRESS BOX
+            WITH tb
+            .Text = sDevAddr
+            .ReadOnly = TRUE
+            .Height = 21
+            .Width = MdlObjSizer.get_object_width(.Text) + 16
+            .Move(tl.Left + tl.Width + 4, tl.Top)
+            END WITH
+        tl = NEW TextLabel(FrmNetConf.TSNetDevices) ' INTERFACE TYPE LABEL
+            WITH tl
+                .Text = ("Interface Type")
+                .Width = MdlObjSizer.get_object_width(.Text)
+                .Height = 21
+                .Alignment = Align.Normal
+                .Move(tb.Left + tb.Width + 4, tb.Top)
+            END WITH
+

-                    .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
+            y = y + tb.Top + tb.Height + 4

-          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 WITH  ' END JACKING WITH TABSTRIP  
========================================================================

+
+
+
+          NEXT
  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
+...
 
[truncated message content]

[Vectorlinux-devel] [vinstall-ng commit] r424 - branches/iVL

[<cod...@go...>]

Author: M0...@gm...
Date: Wed Dec 17 13:18:05 2008
New Revision: 424

Modified:
    branches/iVL/.project
    branches/iVL/MdlNetConf.module
    branches/iVL/installer.gambas

Log:
bugfix netconf module

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Dec 17 13:18:05 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.15
+Version=0.1.17
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Wed Dec 17 13:18:05 2008
@@ -82,7 +82,7 @@

        seths = Trim(seths)

-      'IF seths = "" THEN
+      IF seths = "" THEN
            WITH FrmNetConf
              .cbUseManDNS.Enabled = FALSE
              .tlPrimaryDNS.Enabled = FALSE
@@ -99,7 +99,7 @@
              FrmNetConf.TSNetDevices.Text = "Ethernet"
                  ME.ifaceCnt = 0
              RETURN
-'      END IF
+      END IF




Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r423 - in branches/iVL: . .lang

[<cod...@go...>]

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