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

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

Author: M0...@gm...
Date: Thu Aug 14 14:53:43 2008
New Revision: 126

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.project
    branches/iVL/FrmLilo.class
    branches/iVL/FrmLilo.form
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlLiloOsList.module

Log:
- Attempt to provide selection for default OS to boot

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Aug 14 14:53:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Aug 14 14:53:43 2008
@@ -1,6 +1,6 @@
  # Gambas Project File 2.0
  Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmLilo
  Version=0.0.33
  Library=gb.gtk
  Library=gb.form

Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Thu Aug 14 14:53:43 2008
@@ -41,11 +41,14 @@
  'ME.Maximized = TRUE
  FBResolution_Click()
  FBResolution.text = "Standard"
-
+MdlLiloOsList.list_boot_options()
  END



+
+
+
  PUBLIC SUB YNLiloBox_Click()

    IF ME.YNLiloBox.value = TRUE THEN
@@ -80,12 +83,13 @@
      .YNLiloBox.Move(.tlBanner.left, .tlBanner.Top + (.tlBanner.Height +  
1.5), MdlObjSizer.get_object_width(.YNLiloBox.text) + 36, 28)
      .tlTarGet.Move(.YNLiloBox.left, .YNLiloBox.top + (.YNLiloBox.Height *  
1.5), MdlObjSizer.get_object_width(.tlTarGet.Text))
      .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 4, .tlTarGet.top,  
(.tlBanner.Width / 2.75) - (.tlTarGet.Width + .tlTarGet.left))
-    .tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width +  
12, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text))
+    .tlFbMode.Move(.LiloTarget.Left + LiloTarget.Width +  
32, .LiloTarget.top, MdlObjSizer.get_object_width(.tlFbMode.text))
      .FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +  
4, .tlFbMode.top, .tlBanner.Width - .FBResolution.Left * 1.30)
      .tlTimeOUt.Move(.tlTarGet.left, .tlTarGet.top + .tlTarGet.Height + 4,  
MdlObjSizer.get_object_width(.tlTimeOUt.Text))
      .sbTimer.Move(.tlTimeOUt.Left + .tlTimeOUt.Width + 4, .tlTimeOUt.top,  
60)
      .tlTimoutSec.Move(.sbTimer.Left + .sbTimer.Width + 4, .sbTimer.top,  
MdlObjSizer.get_object_width(.tlTimoutSec.text))
-
+    .tlDefBoot.Move(.tlFbMode.Left, .sbTimer.top,  
MdlObjSizer.get_object_width(.tlDefBoot.text), 27)
+    .cbDefBoot.Move(.tlDefBoot.Left + .tlDefBoot.Width +  
4, .tlDefBoot.top, .tlBanner.Width - .cbDefBoot.Left * 1.3)
      '.tlFbMode.Move(.tlBanner.Left, .tlTarGet.top + .tlTarGet.Height + 8,  
MdlObjSizer.get_object_width(.tlFbMode.Text) + 8)
      '.FBResolution.Move(.tlFbMode.Left + .tlFbMode.Width +  
2, .tlFbMode.top, (.tlBanner.Width / 2) - (.tlFbMode.Width  
+ .tlFbMode.Left))


Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form	(original)
+++ branches/iVL/FrmLilo.form	Thu Aug 14 14:53:43 2008
@@ -55,4 +55,15 @@
      Text = ("Seconds")
      Alignment = Align.Normal
    }
+  { tlDefBoot TextLabel
+    MoveScaled(33,14,18,3.125)
+    Text = ("Boot Default")
+    Alignment = Align.Normal
+  }
+  { cbDefBoot ComboBox
+    MoveScaled(52,13,21,3.125)
+    Text = ("")
+    ReadOnly = True
+    List = []
+  }
  }

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Aug 14 14:53:43 2008
@@ -27,7 +27,9 @@


    ' this is where we need to set the mount target
-  ClsGlobal.sTargetMnt = "/mnt/target"
+  'ClsGlobal.sTargetMnt = "/mnt/target"
+
+
      IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
        TRY MKDIR ClsGlobal.sTargetMnt
      END IF
@@ -68,6 +70,12 @@
        'redirect to packages install
        'ME.INSTALL_PACKAGES()
      ' FROM HERE, DECIDE WHICH WAY TO GO
+
+    ClsGlobal.sTargetMnt = "/home/moises/mnt/target" ' for testing only
+
+
+
+
        IF ClsPkgSel.bCustom = TRUE THEN
          MdlInstallCustom.PERFORM_CUSTOM_INSTALL
        ELSE

Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Thu Aug 14 14:53:43 2008
@@ -26,6 +26,7 @@
  PUBLIC bIncluded AS Object[]
  PUBLIC arrWinInstalls AS Object[]
  PUBLIC arrWinLabels AS Object[]
+PRIVATE sTmpTxt AS String

  PUBLIC SUB LIST_WIN_INSTALL_CHOICES(iCurrentTabCnt AS Integer)
    DIM sFatList AS String
@@ -177,7 +178,7 @@
  PUBLIC SUB WinLbl_keyrelease()

    LAST.text = Replace(LAST.text, " ", "")
-
+  ME.list_boot_options
  END


@@ -194,7 +195,7 @@
      NEXT
    END IF
    'PRINT LAST.tag
-
+  ME.list_boot_options
  END


@@ -376,6 +377,37 @@

  END

+
+PUBLIC SUB list_boot_options()
+  DIM tb AS TextBox
+  DIM cb AS CheckBox
+
+  FrmLilo.cbDefBoot.Clear()
+
+  FOR EACH cb IN ME.bIncluded
+    IF cb.Value = TRUE THEN
+      FOR EACH tb IN ME.txtNames
+        IF tb.tag = cb.tag THEN
+          IF FrmLilo.cbDefBoot.Find(tb.text) = -1 THEN
+          FrmLilo.cbDefBoot.Add(tb.text)
+          END IF
+        END IF
+      NEXT
+    ELSE IF cb.Value = FALSE THEN
+        FOR EACH tb IN ME.txtNames
+          IF FrmLilo.cbDefBoot.Find(tb.text) <> -1 THEN
+            FrmLilo.cbDefBoot.Remove(FrmLilo.cbDefBoot.Find(tb.text))
+          END IF
+        NEXT
+    END IF
+  NEXT
+
+
+END
+
+
+
+
  PUBLIC SUB VlCliOption_click()

    bVlCliOption = LAST.value
@@ -385,18 +417,21 @@


  PUBLIC SUB IncludeOs_click()
-  IF LAST.value = FALSE THEN
-Message("Excluding " & FrmLilo.TabStrip1.Current.text & " from the boot  
menu")
-END IF
-
+
+  ME.list_boot_options

  END

  PUBLIC SUB NameBox_keyrelease()

      LAST.text = Replace(LAST.text, " ", "")
+    ME.list_boot_options
+

  END
+
+
+