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

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

Author: M0...@gm...
Date: Tue Aug 12 14:57:08 2008
New Revision: 117

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/FrmLicense.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/FrmLilo.class
    branches/iVL/MdlLiloOsList.module
    branches/iVL/ToDo

Log:
- Fixed backcolor property on the virtual objects created in the LILO screen
- Corrected code to detect FAT32|NTFS partitions. Not yet listed in the tabs



Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/projects/installer/FrmDiskPart.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot	(original)
+++ branches/iVL/.lang/FrmLicense.pot	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/projects/installer/FrmLicense.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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPkgSel.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSummary.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPkgSel.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSummarize.module
+# /home/vluser/area-51/projects/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	Tue Aug 12 14:57:08 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Tue Aug 12 14:57:08 2008
@@ -29,6 +29,7 @@
    ME.sVidMode = "Standard"
  MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
  MdlLiloOsList.LIST_LILO_OS_CHOICES()
+MdlLiloOsList.LIST_WIN_INSTALL_CHOICES(ME.TabStrip1.Count)
  ME.tlList.text = "The following Operating Systems have been detected on  
this computer. Choose your desired option " &
  "for each one of them by clicking on each tab. To proceed with the default  
pre-set values, simply click \'" & FMain.btnext.text & "\'"
  ME.tlList.Adjust
@@ -96,7 +97,7 @@
      '.tlTimoutSec.Move(.sbTimer.left + .sbTimer.Width + 4, .sbTimer.top,  
MdlObjSizer.get_object_width(.tlTimoutSec.text) + 8)
      .tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height +  
8, .tlBanner.Width)
      '.tlList.Move(.tlFbMode.Left, .tlFbMode.top + .tlFbMode.Height +  
12, .tlBanner.Width)
-    .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +  
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - .tlBanner.Height *  
5.5)
+    .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +  
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height  
* 6))

    END WITH


Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Tue Aug 12 14:57:08 2008
@@ -89,17 +89,23 @@
                   END WITH ' end jacking with the tabstrip
              NEXT
        END IF
-  SHELL "fdisk -l| grep -E \'^/dev/.* \\* .*(FAT32|HPFS|NTFS|Win)\' | cut  
-f 1 -d \' \'" TO sNTFSLst
+  SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT32|HPFS|NTFS|Win)\' | cut -f  
1 -d \' \'" TO sNTFSLst
      sNTFSLst = Trim(sNTFSLst)
+      'Message(sNTFSLst)
        IF sNTFSLst <> "" THEN
          arrNTFS = Split(sNTFSLst, "\n")
          iTotalEntries = iTotalEntries + (arrNTFS.Count - 1)
        END IF

-  IF iTotalEntries = 0 THEN
-    RETURN ' no need to proceed if no windows installs were found
-  END IF
-
+
+    FOR i = 0 TO arrNTFS.count - 1
+
+      WITH FrmLilo.TabStrip1
+        .count = .count + 1
+        .index = .count
+        .text = "Windows"
+      END WITH
+    NEXT


  END
@@ -162,6 +168,7 @@
                .Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
                '.BackColor = Color.SelectedBackground
                .Alignment = Align.Normal
+              .Background = Color.Background
                '.ForeColor = Color.SelectedForeground
              END WITH

@@ -174,6 +181,7 @@
                  .Value = TRUE
                  .Move(4, tl.top + tl.Height + 4,  
MdlObjSizer.get_object_width(.text) + 24)
                  .tag = arrLinux[i]
+                .Background = Color.Background
                END WITH
                ME.bIncluded.Add(cbInclude)

@@ -183,7 +191,7 @@
                  .Move(cbInclude.left, cbInclude.top + cbInclude.Height +  
4, MdlObjSizer.get_object_width(.text))
                  .Height = 27
                  .Alignment = Align.Normal
-                .BackColor = Color.Default
+                .Background = Color.Background
                END WITH
              txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "NameBox"
                WITH txtAppnd
@@ -204,6 +212,7 @@
                  .Move(txtAppnd.Left + txtAppnd.Width + 8, txtAppnd.top,  
MdlObjSizer.get_object_width(.text))
                  .Height = 27
                  .Alignment = Align.Normal
+                .Background = Color.Background
                END WITH

              txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "initrdBox"
@@ -220,6 +229,7 @@
                  .Move(4, txtAppnd.top + txtAppnd.Height + 4,  
MdlObjSizer.get_object_width(.text))
                  .Height = 27
                  .Alignment = Align.Normal
+                .Background = Color.Background

                  ME.iAppendLeft = .x + .Width + 4

@@ -234,12 +244,10 @@
                  .tag = arrLinux[i]
                  txtAppends.Add(txtAppnd)
                END WITH
-
-
-
+

            ' Add an option to boot the recently installed OS to CLI mode
-          ClsPartSel.sRoot = "/dev/hda1" ' for testing only
+          ClsPartSel.sRoot = "/dev/hda6" ' for testing only
              IF sLiloDesc LIKE "Vector" THEN
                IF arrLinux[i] = ClsPartSel.sRoot THEN
                  cbInclude = NEW CheckBox(FrmLilo.TabStrip1)  
AS "VlCliOption"
@@ -250,6 +258,7 @@
                      .Height = 27
                      .Move(4, tl.top + tl.Height + 12)
                      .tag = arrLinux[i]
+                    .Background = Color.Background
                    END WITH

                END IF

Modified: branches/iVL/ToDo
==============================================================================
--- branches/iVL/ToDo	(original)
+++ branches/iVL/ToDo	Tue Aug 12 14:57:08 2008
@@ -7,5 +7,5 @@
      * Read the tabstrip to create the lilo.conf
      * Store lilo.conf to /etc
      * Run lilo.
+**** DO WE STILL NEED TO DETECT FAT16 PARTITIONS? WHO IS STILL RUNNING  
DOS/WIN95/98?

-
\ No newline at end of file