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

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

Author: M0E.lnx
Date: Wed Aug 20 13:17:48 2008
New Revision: 132

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/FMain.class
    branches/iVL/FrmLilo.class
    branches/iVL/FrmLilo.form
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlDiskPart.module
    branches/iVL/MdlPartSel.module

Log:
- Modified line that detects the swap partition to try to ensure detection
- Added more code to look for "GParted" twice before trying the entire  
title string on the embedder



Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Wed Aug 20 13:17:48 2008
@@ -14,19 +14,19 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:281
+#: FMain.class:284
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:300
+#: FMain.class:303
  msgid "Next"
  msgstr ""

-#: FMain.class:306
+#: FMain.class:309
  msgid "Back"
  msgstr ""

-#: FMain.class:312
+#: FMain.class:315
  msgid "Exit"
  msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Aug 20 13:17:48 2008
@@ -33,10 +33,13 @@
  MdlCore.LOCK_GUI
  'MdlCore.LOCK_GUI()
  ClsGlobal.sBackNav = NEW Object[]
-ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
-FrmSelISO.Reparent(ME.pnlWinHost)
-FrmSelISO.Width = pnlWinHost.Width
-FrmSelISO.Height = pnlWinHost.Height
+ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom" 'FOR TESTING ONLY
+'/ THE FOLLOWING LINES HAVE BEEN COMMENTED FOR TESTING ONLY
+
+' ' ' FrmSelISO.Reparent(ME.pnlWinHost)
+' ' ' FrmSelISO.Width = pnlWinHost.Width
+' ' ' FrmSelISO.Height = pnlWinHost.Height
+
  iImg = Image.Load("images/installer.png").Stretch(400, 50)
  'iImg.Resize(600, 80)
  PictureBox1.Resize(iImg.Width, iImg.Height)
@@ -44,7 +47,7 @@
  PictureBox1.Background = Color.SelectedBackground
  PictureBox1.Stretch = TRUE
  MdlCore.PREPARE_INSTALL_LAYOUT
-FrmSelISO.Reparent(ME.pnlwinhost)
+
  'FrmSelISO.Show
  'FrmSelISO.Hide

@@ -68,13 +71,13 @@
  END WITH
  'ME.TreeView1.BackColor = Color.Transparent
  ME.AUTOSIZE_LEFT_PANE
-' ' '
-' ' ' WITH FrmLilo
-' ' ' .Reparent(Fmain.pnlWinHost)
-' ' ' .Width = Fmain.pnlWinHost.Width
-' ' ' .Height = Fmain.pnlWinHost.Height
-' ' ' .Show
-' ' ' END WITH
+' ' ' / THE FOLLOWING LINES HAVE BEEN IMPLEMENTED FOR TESTING PURPOSES
+WITH FrmLilo
+.Reparent(Fmain.pnlWinHost)
+.Width = Fmain.pnlWinHost.Width
+.Height = Fmain.pnlWinHost.Height
+.Show
+END WITH

  END


Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Wed Aug 20 13:17:48 2008
@@ -21,7 +21,7 @@
  PUBLIC SUB Form_Open()


-'ClsPartSel.sRoot = "/dev/sdb1" '
+ClsPartSel.sRoot = "/dev/sdb1" '
   FMain.FrmCurr = ME
     FMain.tvPlan["Conf0"].Selected = TRUE
     FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic

Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form	(original)
+++ branches/iVL/FrmLilo.form	Wed Aug 20 13:17:48 2008
@@ -1,7 +1,7 @@
  # Gambas Form File 2.0

  { Form Form
-  MoveScaled(0,0,70,69)
+  MoveScaled(0,0,74,69)
    Text = ("")
    { tlBanner TextLabel
      MoveScaled(1,1,58,4.4286)
@@ -12,7 +12,7 @@
      Text = ("Don't Install Lilo")
    }
    { TabStrip1 TabStrip
-    MoveScaled(2,27,61,28)
+    MoveScaled(1,27,71,40)
      Index = 0
      Text = ("Tab 0")
      Index = 0

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Wed Aug 20 13:17:48 2008
@@ -72,6 +72,9 @@
          TRY MOVE ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf" TO  
ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.dist"
        END IF

+      ' THE FOLLOWING LINE IS FOR TESTING ONLY
+      ClsGlobal.sTargetMnt = "/tmp"
+
      File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", sOut)
        IF ERROR THEN Message.Error(Error.Text & gb.NewLine & Error.Where)
        ' to make sure the new changes are written to the MBR, we need a  
copy in the local running install

Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Wed Aug 20 13:17:48 2008
@@ -40,8 +40,7 @@
      stype = Trim(sType)
        'Message(sType)

-
-
+
      IF Exist("/usr/sbin/gparted") = FALSE THEN
        Message.Error("Gparted was not found on this system. Please install  
gparted and try again")
        RETURN
@@ -49,7 +48,17 @@

    FrmDiskPart.tlBanner.Text = "<h3>Loading gparted ... Please wait</h3>"
    SHELL "/usr/sbin/gparted"
-  WAIT 1.5
+  WAIT 1
+    aHandle = Desktop.Find("GParted")
+      IF aHandle.count = 0 THEN
+        WAIT 1
+          aHandle = Desktop.Find("GParted")
+            IF aHandle.Count = 0 THEN
+             ' this is too much... let's try to find it using the drive  
name
+             aHandle = Desktop.Find(sType & " - GParted")
+            END IF
+      END IF
+

        'aHandle = Desktop.Find("*" & " - GParted", "gpartedbin")
     aHandle = Desktop.Find(sType & " - GParted")

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Wed Aug 20 13:17:48 2008
@@ -191,7 +191,8 @@

        END IF

-      SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \' | grep  
-e /dev" TO sSwapList
+      'SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \' | grep  
-e /dev" TO sSwapList
+       SHELL "probepart | grep -i \"swap\" | cut -f 1 -d \' \' | grep -e  
\"/dev\"" TO sSwapList

          sSwapList = Trim(sSwapList)
            IF sSwapList <> "" THEN