[Vectorlinux-devel] [vinstall-ng commit] r21 - in trunk: . .lang

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: M0E.lnx
Date: Mon Aug 13 13:17:02 2007
New Revision: 21

Added:
   trunk/frmChooseFB.class
   trunk/frmChooseFB.form
Modified:
   trunk/.lang/.pot
   trunk/.project
   trunk/Functions.module
   trunk/Global.class
   trunk/frmChooseMBR.class

Log:
The boot manager installer can now detect the MBR's on several devices (if available) it can find the root partition on the Linux Install, it can also find the kernel And offers to choose a boot mode (bootsplash and fb modes) and Stores the information to the Global class. This information will be used to write lilo.conf

Modified: trunk/.lang/.pot
==============================================================================

--- trunk/.lang/.pot	(original)
+++ trunk/.lang/.pot	Mon Aug 13 13:17:02 2007
@@ -22,7 +22,8 @@
 msgid "OK"
 msgstr ""
 
-#: InputBox.class:212 frmDriveSelect.class:133 frmPartSelect.class:379
+#: InputBox.class:212 frmChooseFB.class:91 frmDriveSelect.class:133
+#: frmPartSelect.class:379
 msgid "Cancel"
 msgstr ""
 
@@ -67,15 +68,71 @@
 msgid "Advanced"
 msgstr ""
 
-#: frmChooseMBR.class:46
+#: frmChooseFB.class:76
+msgid "Please Select Boot Mode:"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "Standard  [ The standard Linux Console ]"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "Bootsplash - high  [ 1024x768 image ]"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "Bootsplash - med  [ 800x600 image ]"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "Bootsplash - low    [ 640x480 image ]"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "640 x 480 @ 256"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "800 x 600 @ 256"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "1024 x 768 @ 256"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "640 x 480 @ 32k"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "800 x 600 @ 32k"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "1024 x 768 @ 32k"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "640 x 480 @ 64k"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "800 x 600 @ 64k"
+msgstr ""
+
+#: frmChooseFB.class:81
+msgid "1024 x 768 @ 64k"
+msgstr ""
+
+#: frmChooseFB.class:86 frmChooseMBR.class:47
 msgid "Next >"
 msgstr ""
 
-#: frmChooseMBR.class:51
+#: frmChooseMBR.class:52
 msgid "< Back"
 msgstr ""
 
-#: frmChooseMBR.class:56
+#: frmChooseMBR.class:57
 msgid "Please select the drive you want your boot manager installed to:"
 msgstr ""
 

Modified: trunk/.project
==============================================================================
--- trunk/.project	(original)
+++ trunk/.project	Mon Aug 13 13:17:02 2007
@@ -2,7 +2,7 @@
 Title=VL-gui-installer
 Startup=Main
 Icon=vl_logo_icon2.png
-Version=0.0.193
+Version=0.0.197
 Library=gb.qt
 Library=gb.qt.ext
 TabSize=3

Modified: trunk/Functions.module
==============================================================================
--- trunk/Functions.module	(original)
+++ trunk/Functions.module	Mon Aug 13 13:17:02 2007
@@ -343,7 +343,8 @@
    IF NOT sRoot_Part OR sRoot_Part <> "" THEN 
    SHELL "mount | awk '{if ($3 == \"/\") {print $1}}'" TO sRoot_Part
    END IF
-      message.Info("I've identified your root partition as " & gb.newline & sRoot_Part)
+      'message.Info("I've identified your root partition as " & gb.newline & sRoot_Part)
+      Global.RootPart = sRoot_Part ' Store the location of the root partition to the global module
      END IF
 ' Figure out where the kernel is
   IF Exist(Boot_DIR & "/vmlinuz") THEN 
@@ -354,7 +355,8 @@
    Message.Info("I can't find a kernel !!! ")
    END IF
    IF sKernel_Loc OR sKernel_Loc <> "" THEN 
-    message.Info("I've located the kernel in " & gb.NewLine & sKernel_Loc)
+   'message.Info("I've located the kernel in " & gb.NewLine & sKernel_Loc)
+   Global.KernelLoc = sKernel_Loc ' Store the location of the kernel to the global module
     END IF
     
 END

Modified: trunk/Global.class
==============================================================================
--- trunk/Global.class	(original)
+++ trunk/Global.class	Mon Aug 13 13:17:02 2007
@@ -65,8 +65,11 @@
 'temp stuff 2 check out:
 STATIC PUBLIC installDrive AS String
 
-' MBR Selection (When more than one is available)
-STATIC PUBLIC MBRSel AS String
+' Boot Manager variables
+STATIC PUBLIC MBRSel AS String ' MBR to use in case there is more than 1
+STATIC PUBLIC RootPart AS String ' Root Partition
+STATIC PUBLIC KernelLoc AS String ' Kernel location in root partition
+STATIC PUBLIC CONSOLENUM AS String ' The boot fb console #
 
 
 

Added: trunk/frmChooseFB.class
==============================================================================
--- (empty file)
+++ trunk/frmChooseFB.class	Mon Aug 13 13:17:02 2007
@@ -0,0 +1,59 @@
+' Gambas class file
+
+
+PUBLIC SUB btNext_Click()
+DIM sel AS String
+sel = Trim(fblist.text)
+
+IF InStr(sel, "Standard") THEN 
+global.CONSOLENUM = "normal"
+ELSE IF InStr(sel, "Bootsplash - high") THEN 
+global.CONSOLENUM = "791"
+' Need to add more code to take care of the splash
+'SPLASH = "plash=silent"
+'RAMDISK="/boot/initrd"
+ELSE IF InStr(sel, "Bootsplash - med") THEN 
+Global.CONSOLENUM = "788"
+'SPLASH = "splash=silent"
+'RAMDISK = "/boot/initrd"
+ELSE IF InStr(sel, "Bootsplash - low") THEN 
+Global.CONSOLENUM = "785"
+'SPLASH="splash=silent"
+'RAMDISK="/boot/initrd"
+ELSE IF InStr(sel, "640 x 480 @ 256") THEN 
+Global.CONSOLENUM = "769"
+ELSE IF InStr(sel, "800 x 600 @ 256") THEN 
+Global.CONSOLENUM = "771"
+ELSE IF InStr(sel, "1024 x 768 @ 256") THEN 
+Global.CONSOLENUM = "773"
+ELSE IF InStr(sel, "640 x 480 @ 32k") THEN 
+Global.CONSOLENUM = "784"
+ELSE IF InStr(sel, "800 x 600 @ 32k") THEN 
+Global.CONSOLENUM = "787"
+ELSE IF InStr(sel, "1024 x 768 @ 32k") THEN 
+Global.CONSOLENUM = "790"
+ELSE IF InStr(sel, "640 x 480 @ 64k") THEN 
+Global.CONSOLENUM = "785"
+ELSE IF InStr(sel, "800 x 600 @ 64k") THEN 
+Global.CONSOLENUM = "788"
+ELSE IF InStr(sel, "1024 x 768 @ 64k") THEN 
+Global.CONSOLENUM = "791"
+ELSE 
+message.Error("Please select from the list!")
+END IF
+'message.Info(Trim(fblist.text))  
+'message.Info(Global.CONSOLENUM)
+Message.Info("Found your root partition : " & global.RootPart & gb.newline &
+"Found your kernel in : " & global.KernelLoc & gb.newline &
+"Video mode to use for boot: " & global.CONSOLENUM & gb.NewLine &
+"Installing Boot manager to : " & global.MBRSel)
+ME.Close
+
+
+END
+
+PUBLIC SUB btCancel_Click()
+
+ME.close  
+
+END

Added: trunk/frmChooseFB.form
==============================================================================
--- (empty file)
+++ trunk/frmChooseFB.form	Mon Aug 13 13:17:02 2007
@@ -0,0 +1,22 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,64,50)
+  Text = ("")
+  { lbSelfbinfo TextLabel
+    MoveScaled(1,1,62,6)
+    Text = ("Please Select Boot Mode:")
+  }
+  { FBList ListBox
+    MoveScaled(2,10,62,34)
+    List = [("Standard  [ The standard Linux Console ]"), ("Bootsplash - high  [ 1024x768 image ]"), ("Bootsplash - med  [ 800x600 image ]"), ("Bootsplash - low    [ 640x480 image ]"), ("640 x 480 @ 256"), ("800 x 600 @ 256"), ("1024 x 768 @ 256"), ("640 x 480 @ 32k"), ("800 x 600 @ 32k"), ("1024 x 768 @ 32k"), ("640 x 480 @ 64k"), ("800 x 600 @ 64k"), ("1024 x 768 @ 64k")]
+  }
+  { btNext Button
+    MoveScaled(54,46,8,3)
+    Text = ("Next >")
+  }
+  { btCancel Button
+    MoveScaled(45,46,8,3)
+    Text = ("Cancel")
+  }
+}

Modified: trunk/frmChooseMBR.class
==============================================================================
--- trunk/frmChooseMBR.class	(original)
+++ trunk/frmChooseMBR.class	Mon Aug 13 13:17:02 2007
@@ -4,7 +4,8 @@
 PUBLIC SUB btNext_Click()
 
 global.MBRSel = Trim(MBRList.text)
-Message.Info(global.MBRSel) ' Just a sanity check to make sure the right value is parsed
+'Message.Info(global.MBRSel) ' Just a sanity check to make sure the right value is parsed
+frmChooseFB.show
 ME.Close
 ' May need to add more code here... to tell it where to go next  
 


