vectorlinux-devel

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

Author: M0...@gm...
Date: Fri Aug  1 08:15:42 2008
New Revision: 98

Added:
   branches/iVL/ClsLilo.class
Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/FrmLilo.class
   branches/iVL/FrmLilo.form
   branches/iVL/MdlConfLilo.module
   branches/iVL/MdlInstallCustom.module

Log:
- Added option listing to lilo setup window
- Added resizing and object positioning on lilo setup window
- Changed the text displayed during a custom install to show a
  package description rather than a package name


Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Aug  1 08:15:42 2008
@@ -1,4 +1,4 @@
-# /root/svn-installer2/.project
+# /home/moises/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Added: branches/iVL/ClsLilo.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsLilo.class	Fri Aug  1 08:15:42 2008
@@ -0,0 +1,17 @@
+' 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/>.
+

Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Fri Aug  1 08:15:42 2008
@@ -1,3 +1,60 @@
 ' 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 SUB Form_Open()
+
+MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
+
+END
+
+PUBLIC SUB YNLiloBox_Click()
+
+  IF ME.YNLiloBox.value = TRUE THEN
+    WITH ME
+      .LiloAppendBox.Enabled = FALSE
+      .LiloTarget.Enabled = FALSE
+      .FBResolution.Enabled = FALSE
+    END WITH
+    ELSE
+    WITH ME
+
+      .LiloAppendBox.Enabled = TRUE
+      .LiloTarget.Enabled = TRUE
+      .FBResolution.Enabled = TRUE
+    END WITH
+  END IF
+
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .tlTarGet.Alignment = Align.Normal
+    .tlFbMode.Alignment = Align.Normal
+    .tlBanner.Move(4, 4)
+    .tlBanner.Width = .ClientWidth - (.tlBanner.x * 2)
+    .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) 
+ 8)
+    .LiloTarget.Move(.tlTarGet.Left + .tlTarGet.Width + 
2, .tlTarGet.top, .tlBanner.Width - (.tlTarGet.Width + .tlTarGet.left))
+    .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 - (.tlFbMode.Width + .tlFbMode.Left))
+  END WITH
+
+END

Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form	(original)
+++ branches/iVL/FrmLilo.form	Fri Aug  1 08:15:42 2008
@@ -3,23 +3,22 @@
 { Form Form
   MoveScaled(0,0,63,41)
   Text = ("")
-  FullScreen = True
   { tlBanner TextLabel
-    MoveScaled(0,0,58,4.5455)
+    MoveScaled(0,0,58,4.5)
     Text = ("Configure and install lilo (Linux Boot Loader)")
   }
   { LiloTarget ComboBox
-    MoveScaled(1,11,45,3.2727)
+    MoveScaled(13,10,39,3.3333)
     Text = ("")
     ReadOnly = True
-    List = [("MBR"), ("Sector"), ("Floppy")]
+    List = []
   }
   { YNLiloBox CheckBox
     MoveScaled(1,5,18,3)
     Text = ("Don't Install Lilo")
   }
   { FBResolution ComboBox
-    MoveScaled(1,18,45,3.2727)
+    MoveScaled(20,15,32,3.3333)
     Text = ("No installable images found.")
     ReadOnly = True
      List = [("Standard"), ("Bootsplash High"), ("Bootsplash Med"), 
("Bootsplash Extra high")]
@@ -29,7 +28,15 @@
     Text = ("")
   }
   { tlBanner2 TextLabel
-    MoveScaled(1,23,58,3)
+    MoveScaled(1,21,58,3)
      Text = ("Lilo optional parameters: You may add any lilo boot 
options here. ")
+  }
+  { tlTarGet TextLabel
+    MoveScaled(1,10,10,3.3333)
+    Text = ("Target")
+  }
+  { tlFbMode TextLabel
+    MoveScaled(1,15,18,3.3333)
+    Text = ("Video Resolution")
   }
 }

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Fri Aug  1 08:15:42 2008
@@ -18,7 +18,38 @@


 ' PUBLIC Vmlinuz AS Object[]
-'
+
+PUBLIC SUB DISPLAY_LILO_TARGET_OPTIONS()
+
+  DIM sList AS String
+  DIM sListarr AS String[]
+  DIM i AS Integer
+  DIM sTarget AS String
+
+    SHELL "probedisk | grep disk |cut -f 1 -d \\|" TO sList
+      sList = Trim(sList)
+      sListarr = Split(sList, "\n")
+        FOR i = 0 TO sListarr.count - 1
+          sTarget = "MBR of " & Trim(sListarr[i])
+          FrmLilo.LiloTarget.Add(sTarget)
+        NEXT
+
+      WITH FrmLilo.LiloTarget
+          IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
+          .Add("Sector")
+          END IF
+
+      .Add("Floppy")
+      END WITH
+
+
+END
+
+
+
+
+
+
 ' PUBLIC SUB LIST_BULK_SELECTION()
 '
 '   DIM cb AS CheckBox

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Fri Aug  1 08:15:42 2008
@@ -344,8 +344,13 @@

   DIM vSize AS Variant
   DIM vTargetSize AS Variant
+  DIM sDesc AS String

    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep " & File.Name(sBulkPath) & " | cut -f 2 -d :" TO vSize
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | 
grep " & File.Name(sBulkPath) & " | cut -f 3 -d :" TO sDesc
+    IF Right(sDesc) = "\'" THEN
+        sDesc = Left(sDesc, RInStr(sDesc, "\'") - 1)
+    END IF
   vSize = Trim(CStr(vSize))
   sDump = ""
   sErr = ""
@@ -364,6 +369,7 @@
     REPEAT
       WAIT 1
       ' do the progress updating here
+        FrmInstallSys.tlCurrPkg.Text = Trim(sDesc)
       IF vSize <> "" THEN
         MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize), CFloat(vSize))
       END IF