[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.