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

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

Author: M0E.lnx
Date: Thu Aug 28 15:00:53 2008
New Revision: 152

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/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/FrmSelISO.class
    branches/iVL/FrmSelISO.form
    branches/iVL/MdlCore.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlLiloOsList.module
    branches/iVL/MdlPartSel.module

Log:
- Modified ISO selection label
- Fixed problem in fstab writer (missing mount point for /)
- Added default fs type for / partition
   This will keep new users from choosing a / and not formatting.
   installing to an unformatted partition would lead to a bad install
- Adjusted lilo screen to set focus on the newly installed VL



Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/ClsGlobal.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/ClsPartSel.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/ClsWinDrives.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/FMain.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/FrmDiskPart.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/FrmLicense.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/FrmPartScheme.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/FrmPartSel.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/FrmPkgSel.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/FrmSelISO.class
+# /home/moe/projects/installer/FrmSelISO.class
  # Generated by Gambas compiler

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

-#: FrmSelISO.class:211
+#: FrmSelISO.class:219
  msgid "No installable images found."
  msgstr ""

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

-#: FrmSelISO.class:222
+#: FrmSelISO.class:230
  msgid "TextLabel1"
  msgstr ""

-#: FrmSelISO.class:227
+#: FrmSelISO.class:235
  msgid "Search Again"
  msgstr ""


Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/FrmSummary.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/FrmWinDrives.class
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlCore.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/MdlDiskPart.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/MdlObjSizer.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlPartSel.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlPkgSel.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlSetup.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/Area-51/projects/installer/MdlSummarize.module
+# /home/moe/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	Thu Aug 28 15:00:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/area-51/projects/installer/MdlWinDrives.module
+# /home/moe/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Thu Aug 28 15:00:53 2008
@@ -39,6 +39,8 @@
      RETURN ' quiet return... we already know there are no images found
    END IF

+'Message(Left(FrmSelISO.lstInstallableImg.text,  
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4))
+

  END

@@ -59,6 +61,12 @@
    IF ClsGlobal.sBackNav.Find(ME) = -1 THEN
    ClsGlobal.sBackNav.Add(ME)
    END IF
+
+  IF lstInstallableImg.count = 1 THEN
+    tlBanner.Text = "Click \'" & FMain.btnext.text & "\' to begin  
installating " &
+    Left(FrmSelISO.lstInstallableImg.text,  
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
+  END IF
+


  END

Modified: branches/iVL/FrmSelISO.form
==============================================================================
--- branches/iVL/FrmSelISO.form	(original)
+++ branches/iVL/FrmSelISO.form	Thu Aug 28 15:00:53 2008
@@ -5,20 +5,20 @@
    Text = ("")
    FullScreen = True
    { lstInstallableImg ComboBox
-    MoveScaled(1,7,45,3.375)
+    MoveScaled(1,7,45,3.2857)
      Text = ("No installable images found.")
      ReadOnly = True
    }
    { tlBanner TextLabel
      MoveScaled(1,1,58,5)
-    Text = ("Select which distribution to install from the list below")
+    Text = ("Select which VectorLinux version you wish to install from the  
list below")
    }
    { tlDistroDesc TextLabel
      MoveScaled(1,13,60,22)
      Text = ("TextLabel1")
    }
    { btResCan Button
-    MoveScaled(49,7,13,3.375)
+    MoveScaled(49,7,13,3.2857)
      Text = ("Search Again")
      Picture = Picture["icon:/16/refresh"]
    }

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Aug 28 15:00:53 2008
@@ -112,10 +112,7 @@
             ME.FIND_ISO_ON_DRIVE(sPartition)

        NEXT
-  'ELSE ' only one linux partition found
-  '  sPartition = Trim(sResults)
-  '    ME.FIND_ISO_ON_DRIVE(sPartition)
-  'END IF
+

  END


Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Aug 28 15:00:53 2008
@@ -92,51 +92,7 @@
    DIM cb, mt AS ComboBox
    DIM sRes, sDrive, sBlank, sPartNo AS String

-
-            'FOR testing purposes
-            'ClsPartSel.sRoot = "/mnt/target"
-
-
-
-
-
-  ' MAKE SURE THE PARTITIONS TYPES ARE DETECTED CORRECTLY
-
-    IF ClsPartSel.fRoot LIKE "do not format" THEN
-    SHELL "mount | grep -m 1 \'" & ClsPartSel.sRoot & "\' | cut -f 5 -d \'  
\'" TO sPartFmt
-      sPartFmt = Trim(sPartFmt)
-      ClsPartSel.fRoot = sPartFmt
-
-    END IF
-        IF ClsPartSel.sHome AND ClsPartSel.fhome LIKE "do not format" THEN
-    SHELL "mount | grep -m 1 \'" & ClsPartSel.sHome & "\' | cut -f 5 -d \'  
\'" TO sPartFmt
-      sPartFmt = Trim(sPartFmt)
-      ClsPartSel.fhome = sPartFmt
-    END IF
-        IF ClsPartSel.fUsr AND ClsPartSel.fUsr LIKE "do not format" THEN
-    SHELL "mount | grep -m 1 \'" & ClsPartSel.sUsr & "\' | cut -f 5 -d \'  
\'" TO sPartFmt
-      sPartFmt = Trim(sPartFmt)
-      ClsPartSel.fUsr = sPartFmt
-    END IF
-    IF ClsPartSel.fVar AND ClsPartSel.fVar LIKE "do not format" THEN
-    SHELL "mount | grep -m 1 \'" & ClsPartSel.sVar & "\' | cut -f 5 -d \'  
\'" TO sPartFmt
-      sPartFmt = Trim(sPartFmt)
-      ClsPartSel.fVar = sPartFmt
-    END IF
-    IF ClsPartSel.fOpt AND ClsPartSel.fOpt LIKE "do not format" THEN
-    SHELL "mount | grep -m 1 \'" & ClsPartSel.sOpt & "\' | cut -f 5 -d \'  
\'" TO sPartFmt
-      sPartFmt = Trim(sPartFmt)
-      ClsPartSel.fOpt = sPartFmt
-    END IF
-    IF ClsPartSel.fTmp AND ClsPartSel.fTmp LIKE "do not format" THEN
-    SHELL "mount | grep -m 1 \'" & ClsPartSel.sTmp & "\' | cut -f 5 -d \'  
\'" TO sPartFmt
-      sPartFmt = Trim(sPartFmt)
-      ClsPartSel.fTmp = sPartFmt
-
-    END IF
-
-
-
+
    ' make the changes show up on the steps now
    FrmInstallSys.tlCurrPkg.Text = "Writing new /etc/fstab to system"

@@ -158,29 +114,7 @@


  sFstab = sFstab & gb.NewLine
-' ' ' ClsPartSel.sRoot & Space(5) & "/" & Space(5) &  
LCase(ClsPartSel.fRoot) & Space(5) & ME.fS_oPTIONS(LCase(ClsPartSel.fRoot))  
& Space(5) & "0 1" & gb.NewLine
-' ' '
-' ' ' IF ClsPartSel.sHome THEN
-' ' '   sFstab = sFstab & gb.NewLine & ClsPartSel.sHome & " /home " &  
LCase(ClsPartSel.fhome) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fhome)) & "  
0 2"
-' ' ' END IF
-' ' ' IF ClsPartSel.sUsr THEN
-' ' '   sFstab = sFstab & gb.NewLine & ClsPartSel.sUsr & " /usr " &  
LCase(ClsPartSel.fUsr) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fUsr)) & " 0  
2 "
-' ' ' END IF
-' ' ' IF ClsPartSel.sOpt THEN
-' ' '   sFstab = sFstab & gb.NewLine & ClsPartSel.sopt & " /opt " &  
LCase(ClsPartSel.fOpt) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fOpt)) & " 0  
2 "
-' ' ' END IF
-' ' ' IF ClsPartSel.sVar THEN
-' ' '   sFstab = sFstab & gb.NewLine & ClsPartSel.sVar & " /var " &  
LCase(ClsPartSel.fVar) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fVar)) & " 0  
2 "
-' ' ' END IF
-' ' ' IF ClsPartSel.sTmp THEN
-' ' '   sFstab = sFstab & gb.NewLine & ClsPartSel.sTmp & " /tmp " &  
LCase(ClsPartSel.fTmp) & " " & ME.fS_oPTIONS(LCase(ClsPartSel.fTmp)) & " 0  
2 "
-' ' ' END IF
-' ' ' IF ClsPartSel.sLinuxPart THEN
-' ' '   FOR i = 0 TO ClsPartSel.sLinuxPart.Count - 1
-' ' '     sLinPart = ClsPartSel.sLinuxPart[i]
-' ' '     sLinMntPnt = ClsPartSel.sLinuxPart[i]
-' ' '   NEXT
-' ' ' ENDIF
+

  ' nOW LETS' GET THE REST OF THE PARTITIONS IN THERE
  FOR EACH CB IN MdlPartSel.oMountPoints
@@ -200,7 +134,7 @@
                  FOR EACH mt IN MdlPartFrmt.oFsTypes
                    IF mt.tag = cb.tag THEN
                      sFstab = sFstab & "\n" &
-                    mt.tag & Space(5) & Trim(mt.text) & Space(5)  
& "defaults 0 1" & "\n"
+                    mt.tag & Space(5) & Space(5) & "/" & Space(5) &  
Trim(mt.text) & Space(5) & "defaults 0 1" & "\n"
                    END IF
                  NEXT
               ELSE

Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Thu Aug 28 15:00:53 2008
@@ -370,7 +370,7 @@
                      .tag = arrLinux[i]
                      .Background = Color.Background
                    END WITH
-                  ME.iVlTag = FrmLilo.TabStrip1.Index
+                  ME.iVlTag = FrmLilo.TabStrip1.Index - 1
                END IF

              END IF

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Thu Aug 28 15:00:53 2008
@@ -312,7 +312,11 @@
      SELECT CASE LAST.text
          CASE "/"
            ClsPartSel.sRoot = LCase(LAST.tag)
-
+              FOR EACH sdropdwn IN ME.oFsTypes
+                IF sdropdwn.tag = LAST.tag THEN
+                  sdropdwn.Text = "reiserfs"
+                END IF
+              NEXT
          CASE "/home"
            ClsPartSel.sHome = LCase(LAST.tag)