vectorlinux-devel — Vector Linux developer's list

[Vectorlinux-devel] [vinstall-ng commit] r57 - branches/iVL

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

Author: M0...@gm...
Date: Sat Jul 19 20:55:48 2008
New Revision: 57

Added:
   branches/iVL/ClsPkgSel.class
   branches/iVL/FrmPkgsel2.form

Log:
Added additional forms and modules to fill in the package selection process

Added: branches/iVL/ClsPkgSel.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsPkgSel.class	Sat Jul 19 20:55:48 2008
@@ -0,0 +1,20 @@
+' 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/>.
+
+STATIC PUBLIC arrBulks AS String[]
+STATIC PUBLIC arrPkgs AS String[]
+STATIC PUBLIC bCustom AS Boolean
\ No newline at end of file

Added: branches/iVL/FrmPkgsel2.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPkgsel2.form	Sat Jul 19 20:55:48 2008
@@ -0,0 +1,14 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,64,64)
+  Text = ("")
+  { tlbanner TextLabel
+    MoveScaled(1,1,23,6)
+    Text = ("TextLabel1")
+  }
+  { scrPkgs ScrollView
+    MoveScaled(0,8,50,22)
+    Expand = True
+  }
+}

[Vectorlinux-devel] [vinstall-ng commit] r56 - in branches/iVL: . images

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

Author: M0...@gm...
Date: Sat Jul 19 20:54:23 2008
New Revision: 56

Added:
   branches/iVL/images/installer.png   (contents, props changed)
Modified:
   branches/iVL/.project
   branches/iVL/FMain.class
   branches/iVL/FMain.form
   branches/iVL/FrmPkgSel.class
   branches/iVL/FrmPkgSel.form
   branches/iVL/MdlPkgSel.module
   branches/iVL/installer.gambas

Log:
Finished the package selection interface. Ready to begin installing 
packages to the system.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Sat Jul 19 20:54:23 2008
@@ -1,9 +1,10 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
 Startup=MdlCore
-Version=0.0.10
+Version=0.0.17
 Library=gb.gtk
 Library=gb.form
+Library=gb.debug
 Library=gb.desktop
 Library=gb.form.dialog
 Library=gb.form.mdi

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Sat Jul 19 20:54:23 2008
@@ -32,10 +32,13 @@
 FrmSelISO.Width = pnlWinHost.Width
 FrmSelISO.Height = pnlWinHost.Height
 FrmSelISO.Show
+
 MdlCore.PREPARE_INSTALL_LAYOUT
 WITH ME
   .btback.Enabled = FALSE
   .btback.ForeColor = Color.Gray
+  .Frame1.BackColor = Color.Transparent
+  .tvPlan.BackColor = Color.transparent
   .btQuit.Text = "Exit Installation"
 END WITH
 'ME.TreeView1.BackColor = Color.Transparent
@@ -81,12 +84,12 @@
     .tlBanner.width = ME.width
      '.Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height 
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height - 
(.tlbanner.height + (.tlbanner.height / 2)))
      .Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight - 
tlBanner.Height - (.btback.Height * 1.5))
-    .tvPlan.Move(4, 30, .Frame1.Width - 8, Frame1.Height - 
(.Frame1.Height / 20))
+    .tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height - 
(.Frame1.Height / 20))
      '.tvPlan.Resize(.Frame1.Width - (.Frame1.Width / 20), 
Frame1.Height - (.Frame1.Height / 20))
     '.tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
     '.tvPlan.Width = MdlCore.iLeftWidth + (MdlCore.iLeftWidth / 20)
     '.Frame1.Width = .tvPlan.Width + (.tvPlan.Width / 20)
-    .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .Frame1.Height)
+    .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight - 
(.tlbanner.height + (.btback.height * 2)))
      .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top 
+ .pnlWinHost.Height - (.btback.Height), 
MdlObjSizer.get_object_width(.btback.text) + 36)
      .btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width 
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
     ' for the quit button, it'll get a little tricky
@@ -137,7 +140,23 @@
             ' move to package selection
             frmNext = FrmPkgSel
           END IF
+
         END IF
+    CASE "FrmPkgSel"
+        'here we check what kind of install it is, simple  or custom
+            'IF FrmPkgSel.rbCustom.Value = TRUE THEN
+
+          IF ClsPkgSel.bCustom = TRUE THEN
+              'get the list of selected bulks only
+              'MdlPkgSel.GET_USER_BULK_SELECTION()
+              'Message("Going for a custom install")
+              MdlPkgSel.GET_USER_BULK_SELECTION()
+              frmNext = FrmPkgsel2
+            ELSE
+              ' now we are ready to summarize
+              Message("Going for a simple install")
+              frmNext = FrmSummary
+            END IF
   END SELECT



Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form	(original)
+++ branches/iVL/FMain.form	Sat Jul 19 20:54:23 2008
@@ -23,17 +23,17 @@
     MoveScaled(28,9,66,56)
   }
   { btnext Button
-    MoveScaled(89,69,8,3.375)
+    MoveScaled(89,69,8,3.3333)
     Text = ("Next")
     Picture = Picture["icon:/16/right"]
   }
   { btback Button
-    MoveScaled(28,67,8,3.375)
+    MoveScaled(28,67,8,3.3333)
     Text = ("Back")
     Picture = Picture["icon:/16/left"]
   }
   { btQuit Button
-    MoveScaled(54,67,11,3.375)
+    MoveScaled(54,67,11,3.3333)
     Text = ("Exit")
     Picture = Picture["icon:/16/cancel"]
   }

Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class	(original)
+++ branches/iVL/FrmPkgSel.class	Sat Jul 19 20:54:23 2008
@@ -22,8 +22,7 @@
     .tlBanner.Text = "Choose your installation mode"
       .rbFull_Click()
   END WITH
-  MdlPkgSel.LIST_PACKAGE_SELECTION
-
+  FMain.FrmCurr = ME
 END

 PUBLIC SUB Form_Resize()
@@ -44,7 +43,7 @@
    tlActionDesc.Text = "Installs everything in your VectorLinux media 
to your system"
   tlActionDesc.Adjust
   scrlInstallOpts.Visible = FALSE
-
+  ClsPkgSel.bCustom = FALSE

 END

@@ -53,5 +52,13 @@
   tlActionDesc.Text = "Choose your optional components to install."
   tlActionDesc.Adjust
   scrlInstallOpts.Visible = TRUE
+  MdlPkgSel.LIST_BULK_SELECTION
+  ClsPkgSel.bCustom = TRUE
+
+END
+
+PUBLIC SUB Form_Hide()
+
+

 END

Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form	(original)
+++ branches/iVL/FrmPkgSel.form	Sat Jul 19 20:54:23 2008
@@ -9,11 +9,11 @@
     Alignment = Align.Normal
   }
   { rbFull RadioButton
-    MoveScaled(1,8,40,4.5)
+    MoveScaled(1,8,40,4.4444)
     Text = ("Full Install")
   }
   { rbCustom RadioButton
-    MoveScaled(1,14,55,4.5)
+    MoveScaled(1,14,55,4.4444)
     Text = ("Custom Install")
   }
   { tlActionDesc TextLabel
@@ -21,6 +21,6 @@
     Text = ("")
   }
   { scrlInstallOpts ScrollView
-    MoveScaled(1,30,52,28)
+    MoveScaled(1,30,57,28)
   }
 }

Modified: branches/iVL/MdlPkgSel.module
==============================================================================
--- branches/iVL/MdlPkgSel.module	(original)
+++ branches/iVL/MdlPkgSel.module	Sat Jul 19 20:54:23 2008
@@ -16,8 +16,9 @@
 '    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 options AS Object[]
-PUBLIC SUB LIST_PACKAGE_SELECTION()
+PUBLIC Bulks AS Object[]
+PUBLIC Pkgs AS Object[]
+PUBLIC SUB LIST_BULK_SELECTION()

   DIM cb AS CheckBox
   DIM i, ii, cby AS Integer
@@ -30,10 +31,11 @@
   cby = 4
    'File.Save(Temp("SETUP.CONF"), DConv(File.Load(ClsGlobal.sSourceMnt 
&/ "veclinux" &/ "SETUP.CONF")))
   'Message(File.Load(Temp("SETUP.CONF")))
+  Bulks = NEW Object[]

     sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine)
       FOR i = 0 TO sFIle.count - 1
-        sLine = Trim(sFIle[i])
+        sLine = Trim(sFIle[i])
           IF Left(sLine, Len("BULK")) = "BULK" THEN
             sCurrLine = Split(sLine, ":")
               'line format is File_name.tlz:Size_kb:Description
@@ -52,16 +54,110 @@
                     .x = 4
                     .y = cby
                     .Height = 27
-                    .Tag = sPkg
+                    .Tag = Right(sPkg, Len(sPkg) - InStr(sPkg, "=") - 1)
                     .Value = TRUE
                   END WITH
+                    ME.Bulks.Add(cb)
                   cby = cby + cb.Height + 4
                 END IF
             END IF
         NEXT

+END
+
+
+PUBLIC SUB LIST_PACKAGE_SELECTION()
+
+    DIM cb AS CheckBox
+    DIM sName, sDesc, sLoc, sSize AS String
+    DIM i, y AS Integer
+    DIM sRawFile AS String[]
+    DIM sLine AS String

+    ' THis one is kind of tricky.. it will read the whole PACKAGES.TXT
+     y = 4
+    File.Save(Temp("PACKAGES.TXT"), 
DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages" &/ "PACKAGES.TXT")))
+    'Message(File.Load(Temp("PACKAGES.TXT")))
+      sRawFile = Split(File.Load(Temp("PACKAGES.TXT")), "\n")
+        ME.Pkgs = NEW Object[]
+        FOR i = 0 TO sRawFile.Count - 1
+          sLine = Trim(sRawFile[i])
+            IF InStr(sLine, "PACKAGE NAME:") THEN
+                sName = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
+                sLoc = Trim(Right(sRawFile[i + 1], Len(sRawFile[i + 
1]) - InStr(sRawFile[i + 1], ":")))
+                    IF Left(sLoc, 2) = "./" THEN
+                      sLoc = Right(sLoc, Len(sLoc) - 2)
+                    END IF
+                sSize = Trim(Right(sRawFile[i + 2], Len(sRawFile[i + 
2]) - InStr(sRawFile[i + 2], ":")))
+                'Message(sName & " in " & sLoc)
+              cb = NEW CheckBox(FrmPkgsel2.scrPkgs) AS "Packages"
+                WITH cb
+                  .Text = sName & " [ " & sSize & " 
]" 'Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
+                  .Tag = sLoc &/ sName
+                  .x = 4
+                  .y = y
+                  .Height = 27
+                  .Width = MdlObjSizer.get_object_width(.Text) * 2
+                  .Value = TRUE
+                END WITH
+                ME.Pkgs.Add(cb)
+                y = y + cb.Height + 4
+
+            END IF
+
+        NEXT
+
+END
+
+
+PUBLIC SUB Packages_click()

+    'Message(LAST.tag)
+

+END
+
+
+
+
+PUBLIC SUB OptBulks_click()
+
+  IF ClsPkgSel.arrBulks THEN
+    ClsPkgSel.arrBulks.Clear
+  END IF
+  ME.GET_USER_BULK_SELECTION
+
+END
+
+
+PUBLIC SUB GET_USER_BULK_SELECTION()
+
+  DIM cb AS CheckBox
+  DIM sList AS String
+  DIM sItem AS String
+  DIM i AS Integer
+    ' start the list
+    ClsPkgSel.arrBulks = NEW String[]
+    FOR EACH cb IN ME.Bulks
+      IF cb.Value = TRUE THEN
+        ClsPkgSel.arrBulks.Add(cb.tag)
+    END IF
+    NEXT
+
+    FOR i = 0 TO ClsPkgSel.arrBulks.count - 1
+      sItem = ClsPkgSel.arrBulks[i]
+        IF sItem LIKE " " THEN
+          ClsPkgSel.arrBulks.Delete(ClsPkgSel.arrBulks.Find(sItem))
+        ELSE
+        sList = sList & ", " & sItem
+        ENDIF
+    NEXT
+      IF Left(sList) = "," THEN
+        sList = Right(sList, Len(sList) - 1)
+      ELSE IF Right(sList) = "," THEN
+        sList = Left(sList, Len(sList) - 1)
+      END IF
+    sList = Trim(sList)
+

 END

Added: branches/iVL/images/installer.png
==============================================================================
Binary file. No diff available.

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r55 - branches/iVL

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

Author: M0...@gm...
Date: Fri Jul 18 21:45:30 2008
New Revision: 55

Modified:
   branches/iVL/MdlCore.module
   branches/iVL/installer.gambas

Log:
Test commit from initrd environment

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Fri Jul 18 21:45:30 2008
@@ -58,9 +58,12 @@


             ELSE ' only one iso found
+                IF IsDir("/mnt/loop") = FALSE THEN
+                  TRY MKDIR "/mnt/loop"
+                END IF
               SHELL "umount /mnt/loop" WAIT 'clear the mount point
                SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ 
sResults & Space(1) & " /mnt/loop" WAIT
-                File.Save(Temp(sResults), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
+                  File.Save(Temp(sResults), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
                 'Message(File.Load(Temp(sResults)))
                SHELL "umount /mnt/loop && umount " & 
ClsGlobal.sSourceMnt WAIT
                    IF FrmSelISO.lstInstallableImg.Find(sResults & " 
on " & sDrive) = -1 THEN

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

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

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

Author: M0...@gm...
Date: Fri Jul 18 15:55:02 2008
New Revision: 54

Added:
   branches/iVL/.lang/FrmPkgSel.pot
   branches/iVL/.lang/FrmSummary.pot
   branches/iVL/.lang/MdlPkgSel.pot
   branches/iVL/.lang/MdlSummarize.pot
   branches/iVL/FrmPkgSel.class
   branches/iVL/FrmPkgSel.form
   branches/iVL/FrmSummary.class
   branches/iVL/FrmSummary.form
   branches/iVL/MdlPkgSel.module
   branches/iVL/MdlSummarize.module

Log:
Added more objects and controls. On this release, progress was made to 
head into package selection.getting ready for package installation.

Added: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmPkgSel.pot	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,28 @@
+# /home/vluser/area-51/projects/installer/FrmPkgSel.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmPkgSel.class:77
+msgid "TextLabel1"
+msgstr ""
+
+#: FrmPkgSel.class:83
+msgid "Full Install"
+msgstr ""
+
+#: FrmPkgSel.class:88
+msgid "Custom Install"
+msgstr ""
+

Added: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmSummary.pot	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,20 @@
+# /home/vluser/area-51/projects/installer/FrmSummary.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmSummary.class:55
+msgid "TextLabel1"
+msgstr ""
+

Added: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlPkgSel.pot	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,16 @@
+# /home/vluser/area-51/projects/installer/MdlPkgSel.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlSummarize.pot	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,16 @@
+# /home/vluser/area-51/projects/installer/MdlSummarize.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/FrmPkgSel.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPkgSel.class	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,57 @@
+' 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()
+
+  WITH ME
+    .tlBanner.Text = "Choose your installation mode"
+      .rbFull_Click()
+  END WITH
+  MdlPkgSel.LIST_PACKAGE_SELECTION
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .tlBanner.Width = .ClientWidth - 8
+    .rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 8, 
MdlObjSizer.get_object_width(.rbfull.text) + 36)
+    .rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4, 
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
+    .tlActionDesc.Width = .tlBanner.Width - 4
+    .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top 
+ .tlActionDesc.Height + 8, .tlActionDesc.Width, .ClientHeight - 
(.tlActionDesc.top + (.tlActionDesc.height * 1.5)))
+
+  END WITH
+
+END
+
+PUBLIC SUB rbFull_Click()
+
+  tlActionDesc.Text = "Installs everything in your VectorLinux media 
to your system"
+  tlActionDesc.Adjust
+  scrlInstallOpts.Visible = FALSE
+
+
+END
+
+PUBLIC SUB rbCustom_Click()
+
+  tlActionDesc.Text = "Choose your optional components to install."
+  tlActionDesc.Adjust
+  scrlInstallOpts.Visible = TRUE
+
+END

Added: branches/iVL/FrmPkgSel.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPkgSel.form	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,26 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,64,64)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,2,55,5)
+    Text = ("TextLabel1")
+    Alignment = Align.Normal
+  }
+  { rbFull RadioButton
+    MoveScaled(1,8,40,4.5)
+    Text = ("Full Install")
+  }
+  { rbCustom RadioButton
+    MoveScaled(1,14,55,4.5)
+    Text = ("Custom Install")
+  }
+  { tlActionDesc TextLabel
+    MoveScaled(1,21,63,7)
+    Text = ("")
+  }
+  { scrlInstallOpts ScrollView
+    MoveScaled(1,30,52,28)
+  }
+}

Added: branches/iVL/FrmSummary.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSummary.class	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,38 @@
+' 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()
+
+  WITH ME
+    .tlBanner.Text = "Setup is about to begin installing " & 
ClsGlobal.DISTRO & Space(1)&
+    ClsGlobal.VERSION & " to your system. Please verify that the 
information below is " &
+    "correct and click \"" & FMain.btnext.Text & "\" to continue. If 
you need to make" &
+    " changes to your settings, click the \"" & FMain.btback.Text 
& "\" button."
+    .tlBanner.Adjust
+    .tlSummary.Adjust
+  END WITH
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .tlBanner.Width = .ClientWidth - 4
+    .tlSummary.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 
4, .tlBanner.Width, .ClientH - 16)
+  END WITH
+
+END

Added: branches/iVL/FrmSummary.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSummary.form	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,15 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,64,64)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,1,27,10)
+    Text = ("TextLabel1")
+    Alignment = Align.Left
+  }
+  { tlSummary TextLabel
+    MoveScaled(1,13,61,49)
+    Text = ("TextLabel1")
+  }
+}

Added: branches/iVL/MdlPkgSel.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlPkgSel.module	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,67 @@
+' Gambas module 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 options AS Object[]
+PUBLIC SUB LIST_PACKAGE_SELECTION()
+
+  DIM cb AS CheckBox
+  DIM i, ii, cby AS Integer
+  DIM sFIle AS String[]
+  DIM sCurrLine AS String[]
+  DIM sLine, sPkg, sDesc AS String
+  DIM vsize AS Variant
+  DIM isize AS Integer
+
+  cby = 4
+  'File.Save(Temp("SETUP.CONF"), DConv(File.Load(ClsGlobal.sSourceMnt 
&/ "veclinux" &/ "SETUP.CONF")))
+  'Message(File.Load(Temp("SETUP.CONF")))
+
+    sFIle = Split(File.Load(Temp("SETUP.CONF")), gb.NewLine)
+      FOR i = 0 TO sFIle.count - 1
+        sLine = Trim(sFIle[i])
+          IF Left(sLine, Len("BULK")) = "BULK" THEN
+            sCurrLine = Split(sLine, ":")
+              'line format is File_name.tlz:Size_kb:Description
+              sPkg = sCurrLine[0]
+              sDesc = sCurrLine[2]
+              vsize = sCurrLine[1]
+                IF InStr(sDesc, "\'") THEN
+                  sDesc = Left(sDesc, Len(sDesc) - 1)
+                END IF
+                IF InStr(sPkg, "optional/") THEN
+
+              cb = NEW CheckBox(FrmPkgSel.scrlInstallOpts) AS "OptBulks"
+                  WITH cb
+                    .Text = sDesc & Space(1) & "[ " & CStr(vsize) & " 
KB ]"
+                    .Width = MdlObjSizer.get_object_width(.Text) + 24
+                    .x = 4
+                    .y = cby
+                    .Height = 27
+                    .Tag = sPkg
+                    .Value = TRUE
+                  END WITH
+                  cby = cby + cb.Height + 4
+                END IF
+            END IF
+        NEXT
+
+
+
+
+
+END

Added: branches/iVL/MdlSummarize.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlSummarize.module	Fri Jul 18 15:55:02 2008
@@ -0,0 +1,22 @@
+' Gambas module 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 SUMMARIZE_INSTALL()
+
+
+
+END

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

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

Author: M0...@gm...
Date: Fri Jul 18 15:53:00 2008
New Revision: 53

Modified:
   branches/iVL/.lang/#project.pot
   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/FrmSelISO.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/MdlSetup.pot
   branches/iVL/.lang/MdlWinDrives.pot
   branches/iVL/.project
   branches/iVL/FMain.class
   branches/iVL/FrmPartSel.class
   branches/iVL/MdlCore.module
   branches/iVL/MdlSetup.module
   branches/iVL/installer.gambas

Log:
Update binary after a few changes

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsPartSel.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/installer/FMain.class
 # Generated by Gambas compiler

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

-#: FMain.class:172
+#: FMain.class:173
 msgid "Process Overview"
 msgstr ""

-#: FMain.class:185
+#: FMain.class:186
 msgid "Vector Linux Install"
 msgstr ""

-#: FMain.class:195
+#: FMain.class:196
 msgid "Next"
 msgstr ""

-#: FMain.class:201
+#: FMain.class:202
 msgid "Back"
 msgstr ""

-#: FMain.class:207
+#: FMain.class:208
 msgid "Exit"
 msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/installer/FrmPartSel.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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/installer/FrmSelISO.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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/vluser/area-51/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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/installer/MdlPartSel.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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/installer/MdlSetup.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	Fri Jul 18 15:53:00 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# /home/vluser/area-51/projects/installer/MdlWinDrives.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Jul 18 15:53:00 2008
@@ -1,11 +1,12 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
 Startup=MdlCore
-Version=0.0.8
+Version=0.0.10
 Library=gb.gtk
 Library=gb.form
 Library=gb.desktop
 Library=gb.form.dialog
+Library=gb.form.mdi
 Library=gb.gtk.ext
 Description=GUI installer for Vector linux
 Authors=M0E-lnx

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Jul 18 15:53:00 2008
@@ -134,7 +134,8 @@
           IF ClsPartSel.bDoWin = TRUE THEN
             frmNext = FrmWinDrives
           ELSE
-            ' move from here to the file copying step
+            ' move to package selection
+            frmNext = FrmPkgSel
           END IF
         END IF
   END SELECT

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Fri Jul 18 15:53:00 2008
@@ -41,7 +41,7 @@
     .cbDoWin.Move(.scrollPartitions.Left, .ClientHeight 
- .cbDoWin.Height - 8)
    .tlPartRow.Move(4, 4)
    .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width * 1.5), .tlPartRow.top)
-   .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width * 1.5), .tlPartRow.top)
+   .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width * 1.9), .tlPartRow.top)
    ' .tlPartRow.Move(4, 4)
     ' .tlPartRow3.Move(ME.scrollPartitions.Left + 
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
    ' .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Fri Jul 18 15:53:00 2008
@@ -382,6 +382,7 @@
   'drive should already be mounted
   'SHELL "sudo mount /dev/" & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
     IF Exist(sFilePath) THEN
+        File.Save(Temp("SETUP.CONF"), File.Load(sFilePath))
       sFile = Split(DConv(File.Load(sFilePath)), gb.NewLine)
         FOR i = 0 TO sFile.Count - 1
           sLine = Trim(sFile[i])

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Fri Jul 18 15:53:00 2008
@@ -38,6 +38,7 @@

    ' This will also set the default variables for distro name and 
version to clsglobal
     MdlCore.SET_DECISSION(ClsGlobal.sSourceMnt)
+


 END

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r52 - branches/iVL/.lang

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

Author: M0E.lnx
Date: Fri Jul 18 09:51:18 2008
New Revision: 52

Added:
   branches/iVL/.lang/ClsPartSel.pot
   branches/iVL/.lang/ClsWinDrives.pot
   branches/iVL/.lang/FrmWinDrives.pot
   branches/iVL/.lang/MdlWinDrives.pot

Log:
Added some more parts to the .lang dir

Added: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/ClsPartSel.pot	Fri Jul 18 09:51:18 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/ClsPartSel.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/ClsWinDrives.pot	Fri Jul 18 09:51:18 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/ClsWinDrives.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmWinDrives.pot	Fri Jul 18 09:51:18 2008
@@ -0,0 +1,20 @@
+# /home/moises/area-51/projects/installer/FrmWinDrives.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmWinDrives.class:65
+msgid "Select the windows partitions you would like to mount during boot"
+msgstr ""
+

Added: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlWinDrives.pot	Fri Jul 18 09:51:18 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/MdlWinDrives.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

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

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

Author: M0E.lnx
Date: Fri Jul 18 09:49:47 2008
New Revision: 51

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/.project
   branches/iVL/FMain.class
   branches/iVL/FMain.form
   branches/iVL/FrmPartSel.class
   branches/iVL/MdlCore.module
   branches/iVL/MdlSetup.module
   branches/iVL/installer.gambas

Log:
Modified Fmain resize event to make the left panel look just the right 
size (determined by the largest child text). Updated binary.

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /home/moises/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsGlobal.class
+# /home/moises/area-51/projects/installer/ClsGlobal.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	Fri Jul 18 09:49:47 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.
@@ -14,23 +14,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:151
+#: FMain.class:172
 msgid "Process Overview"
 msgstr ""

-#: FMain.class:164
+#: FMain.class:185
 msgid "Vector Linux Install"
 msgstr ""

-#: FMain.class:174
+#: FMain.class:195
 msgid "Next"
 msgstr ""

-#: FMain.class:180
+#: FMain.class:201
 msgid "Back"
 msgstr ""

-#: FMain.class:186
+#: FMain.class:207
 msgid "Exit"
 msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /home/moises/area-51/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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmLicense.class
+# /home/moises/area-51/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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /home/moises/area-51/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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.class
 # Generated by Gambas compiler

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

-#: FrmPartSel.class:143
+#: FrmPartSel.class:146
  msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
 msgstr ""

-#: FrmPartSel.class:151
+#: FrmPartSel.class:154
 msgid "<b>Partition</b>"
 msgstr ""

-#: FrmPartSel.class:157
+#: FrmPartSel.class:160
 msgid "<b>Mount Point</b>"
 msgstr ""

-#: FrmPartSel.class:163
+#: FrmPartSel.class:166
 msgid "<b>File System</b>"
 msgstr ""

-#: FrmPartSel.class:170
+#: FrmPartSel.class:173
  msgid "Check this box if you have a Windows installation on your 
system or any other windows partition (FAT, FAT32, NTFS) that you want 
auto-mounted as soon as your computer starts"
 msgstr ""

-#: FrmPartSel.class:171
+#: FrmPartSel.class:174
 msgid "Detect and Setup Windows partitions for auto-mounting at boot"
 msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /home/moises/area-51/projects/installer/FrmSelISO.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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlCore.module
+# /home/moises/area-51/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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/moises/area-51/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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlObjSizer.module
+# /home/moises/area-51/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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.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	Fri Jul 18 09:49:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Jul 18 09:49:47 2008
@@ -1,7 +1,7 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
 Startup=MdlCore
-Version=0.0.2
+Version=0.0.8
 Library=gb.gtk
 Library=gb.form
 Library=gb.desktop

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Jul 18 09:49:47 2008
@@ -39,10 +39,26 @@
   .btQuit.Text = "Exit Installation"
 END WITH
 'ME.TreeView1.BackColor = Color.Transparent
+ME.AUTOSIZE_LEFT_PANE

+END

+PUBLIC SUB AUTOSIZE_LEFT_PANE()
+
+  DIM iWidth AS Integer
+  ' this will find widest child in treeview
+    ME.tvPlan.MoveFirst()
+      REPEAT
+        IF MdlObjSizer.get_object_width(tvPlan.Item.Text) > iWidth THEN
+          iWidth = MdlObjSizer.get_object_width(tvPlan.item.Text)
+        END IF
+      UNTIL ME.tvPlan.MoveBelow()
+
+    ME.tvPlan.Width = iWidth + (iWidth / 20)
+    ME.Frame1.Width = iWidth + (iWidth / 10)
 END

+
 PUBLIC SUB ComboBox1_Click()


@@ -59,15 +75,20 @@
   WITH ME
     .btQuit.Width = MdlObjSizer.get_object_width(.btQuit.Text) + 36
   END WITH
-
+  'ME.AUTOSIZE_LEFT_PANE

   WITH ME
     .tlBanner.width = ME.width
-    .Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height 
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height - 
(.tlbanner.height + (.tlbanner.height / 2)))
-    .tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
+    '.Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height 
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height - 
(.tlbanner.height + (.tlbanner.height / 2)))
+    .Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight - 
tlBanner.Height - (.btback.Height * 1.5))
+    .tvPlan.Move(4, 30, .Frame1.Width - 8, Frame1.Height - 
(.Frame1.Height / 20))
+    '.tvPlan.Resize(.Frame1.Width - (.Frame1.Width / 20), 
Frame1.Height - (.Frame1.Height / 20))
+    '.tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
+    '.tvPlan.Width = MdlCore.iLeftWidth + (MdlCore.iLeftWidth / 20)
+    '.Frame1.Width = .tvPlan.Width + (.tvPlan.Width / 20)
      .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .Frame1.Height)
      .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top 
+ .pnlWinHost.Height - (.btback.Height), 
MdlObjSizer.get_object_width(.btback.text) + 36)
-    .btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width 
+ 4), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
+    .btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width 
+ 8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
     ' for the quit button, it'll get a little tricky
       ' we want that one right in the middle
      .btQuit.Move(.pnlWinHost.Left + (.pnlWinHost.Width / 2) - 
(.btQuit.Width / 2), .btback.top)

Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form	(original)
+++ branches/iVL/FMain.form	Fri Jul 18 09:49:47 2008
@@ -7,7 +7,7 @@
     MoveScaled(1,8,25,62)
     Text = ("Process Overview")
     { tvPlan TreeView
-      MoveScaled(1,3,22,56)
+      MoveScaled(1,2,22,56)
       Border = False
     }
   }

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Fri Jul 18 09:49:47 2008
@@ -40,8 +40,11 @@
     .scrollPartitions.Resize(.ClientWidth - 12, .ClientHeight 
- .tlBanner.Height - (cbDoWin.Height * 2))
     .cbDoWin.Move(.scrollPartitions.Left, .ClientHeight 
- .cbDoWin.Height - 8)
    .tlPartRow.Move(4, 4)
-   .tlPartRow3.Move(ME.scrollPartitions.Left + 
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
-   .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)
+   .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.Width * 1.5), .tlPartRow.top)
+   .tlPartRow3.Move(.tlPartRow2.left + (.tlPartRow3.Width * 1.5), .tlPartRow.top)
+   ' .tlPartRow.Move(4, 4)
+   ' .tlPartRow3.Move(ME.scrollPartitions.Left + 
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
+   ' .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)


   END WITH

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Fri Jul 18 09:49:47 2008
@@ -23,6 +23,7 @@
 PUBLIC sToDopic AS Picture = Picture["images/circle.png"]
 PUBLIC sNowPic AS picture = Picture["images/arrow.png"]
 PUBLIC sDonePic AS Picture = Picture["images/check.png"]
+PUBLIC iLeftWidth AS Integer



@@ -375,7 +376,7 @@
   DIM iRoot AS Variant
   DIM iswap AS Variant
   DIM ihome AS Variant
-
+  DIM iWidth AS Integer
   ClsGlobal.sBulkList = ""
   ClsGlobal.sConfPkg = ""
   'drive should already be mounted
@@ -432,6 +433,7 @@


 PUBLIC SUB PREPARE_INSTALL_LAYOUT()
+DIM iWidth AS Integer
 WITH FMain.tvPlan
   .Add("Prep", "Preparation", sCatPic)
   .Add("Prep0", "Find installation media", sNowPic, "Prep")
@@ -453,44 +455,17 @@
  FMain.tvPlan.MoveFirst()
  REPEAT
  FMain.tvPlan.Item.Expanded = TRUE
+  IF MdlObjSizer.get_object_width(FMain.tvPlan.Item.Text) > iWidth THEN
+    iWidth = MdlObjSizer.get_object_width(FMain.tvPlan.Item.Text)
+  END IF
  UNTIL FMain.tvPlan.MoveBelow()

-
-
-
-' '
-' ' DIM sLabel AS TextLabel
-' ' DIM X AS Integer
-' ' DIM y AS Integer
-' ' DIM pPic AS PictureBox
-' ' DIM sPrepList AS String = "Find Install Media, License Agreement, Install"
-' ' DIM sPrepArr AS String[] = Split(sPrepList, ",")
-' ' DIM sCurrStep AS String
-' ' DIM i AS Integer
-' '
-' '   'first category
-' '   X = FMain.ScrollView1.X
-' '   Y = FMain.ScrollView1.y + 4
-' '     FOR i = 0 TO sPrepArr.Count - 1
-' '       sCurrStep = Trim(sPrepArr[i])
-' '         sLabel = NEW TextLabel(FMain.ScrollView1) AS "Preps"
-' '           WITH sLabel
-' '             '.Width = .Parent.Width
-' '             .x = x + 4
-' '             .y = Y + 4
-' '             .Text = sCurrStep
-' '             .Width = MdlObjSizer.get_object_width(.Text)
-' '             .Height = 27
-' '
-' '           END WITH
-' '           y = y + sLabel.Height
-' '         NEXT
-' '
-' '
-' '
-' '
+ iLeftWidth = iWidth
+ fmain.tvPlan.Width = iWidth + (iWidth / 20)
+ fmain.Frame1.Width = iWidth + (iWidth / 10)
+
+

-
 END



Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Fri Jul 18 09:49:47 2008
@@ -133,6 +133,8 @@


 PUBLIC SUB MOUNT_DEFINED_PARTITIONS()
+
+

   ' this is where we need to set the mount target
   ClsGlobal.sTargetMnt = "/mnt/target"
@@ -186,7 +188,9 @@
   DIM sPartition AS String
   DIM sMountPoint AS String
   DIM sMntOpts AS String
-
+  DIM i AS Integer
+  DIM sWinPart AS String
+  DIM sWinMntPnt AS String
   DIM sFstab AS String

   sFstab = "# /etc/fstab: static file system information.\n" &
@@ -226,7 +230,17 @@
 "# Shared Windows/Linux partition" &
 "#/dev/hda1   /mnt/dos  msdos  umask=0   0  0 \n" &
  "#/dev/hda1   /mnt/win  vfat   
fmask=111,dmask=0,quiet,shortname=mixed,user  0  0 \n" &
-"#/dev/hda1   /mnt/win  ntfs   umask=0   0  0\n" &
+"#/dev/hda1   /mnt/win  ntfs   umask=0   0  0\n"
+    IF ClsWinDrives.sWinDrives THEN
+      FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
+        sWinPart = Trim(Left(ClsWinDrives.sWinDrives[i], 
InStr(ClsWinDrives.sWinDrives[i], "|") - 1))
+        sWinMntPnt = Trim(Right(ClsWinDrives.sWinDrives[i], 
Len(ClsWinDrives.sWinDrives[i]) - InStr(ClsWinDrives.sWinDrives[i], "|")))
+        Message("Mount " & sWinPart & " to " & sWinMntPnt)
+        ' if this is right... then add it to the file
+      NEXT
+    END IF
+
+sFstab = sFstab & "\n\n" &
 "# Floppy disks \n" &
  "# The 'noauto' option indicates that the file system should not be 
mounted \n" &
  "# with 'mount -a' 'user' indicates that normal users are allowed to 
mount \n" &

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

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

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

Author: M0...@gm...
Date: Thu Jul 17 23:34:49 2008
New Revision: 50

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/.project
   branches/iVL/FrmPartScheme.class
   branches/iVL/FrmPartSel.class
   branches/iVL/FrmSelISO.class
   branches/iVL/FrmWinDrives.class
   branches/iVL/FrmWinDrives.form
   branches/iVL/MdlCore.module
   branches/iVL/MdlDiskPart.module
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlSetup.module
   branches/iVL/MdlWinDrives.module
   branches/iVL/installer.gambas

Log:
Re-arranged position and sizing of virtual objects Made some 
adjustments to make sure the objects look ok on the real installer

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/.project
+# /home/vluser/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Thu Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/installer/ClsGlobal.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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/FMain.class
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/FrmDiskPart.class
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/FrmLicense.class
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/FrmPartScheme.class
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/installer/FrmPartSel.class
 # Generated by Gambas compiler

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

-#: FrmPartSel.class:140
+#: FrmPartSel.class:143
  msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
 msgstr ""

-#: FrmPartSel.class:148
+#: FrmPartSel.class:151
 msgid "<b>Partition</b>"
 msgstr ""

-#: FrmPartSel.class:154
+#: FrmPartSel.class:157
 msgid "<b>Mount Point</b>"
 msgstr ""

-#: FrmPartSel.class:160
+#: FrmPartSel.class:163
 msgid "<b>File System</b>"
 msgstr ""

-#: FrmPartSel.class:167
+#: FrmPartSel.class:170
  msgid "Check this box if you have a Windows installation on your 
system or any other windows partition (FAT, FAT32, NTFS) that you want 
auto-mounted as soon as your computer starts"
 msgstr ""

-#: FrmPartSel.class:168
+#: FrmPartSel.class:171
 msgid "Detect and Setup Windows partitions for auto-mounting at boot"
 msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Thu Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/FrmSelISO.class
+# /home/vluser/area-51/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:215
 msgid "No installable images found."
 msgstr ""

-#: FrmSelISO.class:217
+#: FrmSelISO.class:221
 msgid "Select which distribution to install from the list below"
 msgstr ""

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

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


Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Thu Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/MdlCore.module
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/MdlDiskPart.module
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/MdlObjSizer.module
+# /home/vluser/area-51/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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/installer/MdlPartSel.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 Jul 17 23:34:49 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/installer/MdlSetup.module
+# /home/vluser/area-51/projects/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Jul 17 23:34:49 2008
@@ -1,7 +1,7 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
 Startup=MdlCore
-Version=0.0.7
+Version=0.0.2
 Library=gb.gtk
 Library=gb.form
 Library=gb.desktop

Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class	(original)
+++ branches/iVL/FrmPartScheme.class	Thu Jul 17 23:34:49 2008
@@ -41,7 +41,7 @@
      .rbEditPartitions.Width = 
MdlObjSizer.get_object_width(.rbEditPartitions.Text) + 24
      .rbUseExisting.Width = 
MdlObjSizer.get_object_width(.rbUseExisting.Text) + 24
   END WITH
-  ME.rbEditPartitions.Value = TRUE
+ME.rbUseExisting_Click()

 END


Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Thu Jul 17 23:34:49 2008
@@ -33,12 +33,15 @@


 PUBLIC SUB Form_Resize()
-
+  DIM cb AS ComboBox
+  DIM iWidth AS Integer = 0
   WITH ME
     .tlBanner.Width = .ClientWidth - 16
-    .scrollPartitions.Width = .tlBanner.Width
-    .scrollPartitions.Height = .ClientHeight - (.tlBanner.Height 
+ .cbDoWin.Height + 32)
-    .cbDoWin.Move(.scrollPartitions.Left, .ClientHeight 
- .cbDoWin.Height - 8)
+   .scrollPartitions.Resize(.ClientWidth - 12, .ClientHeight 
- .tlBanner.Height - (cbDoWin.Height * 2))
+   .cbDoWin.Move(.scrollPartitions.Left, .ClientHeight 
- .cbDoWin.Height - 8)
+   .tlPartRow.Move(4, 4)
+   .tlPartRow3.Move(ME.scrollPartitions.Left + 
ME.scrollPartitions.Width - (.tlPartRow3.Width * 2), .tlpartrow.top)
+   .tlPartRow2.Move((.tlPartRow.Width + .tlPartRow3.Left) / 3, tlpartrow.top)


   END WITH
@@ -49,7 +52,7 @@


   FMain.FrmCurr = ME
-
+  ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
   ME.tlBanner.Adjust
   ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
   MdlPartSel.DISPLAY_PARTITION_OPTIONS

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Thu Jul 17 23:34:49 2008
@@ -47,6 +47,10 @@

   ME.Width = ME.Parent.Width
   ME.Height = ME.Parent.Height
+  ME.btResCan.Height = ME.lstInstallableImg.Height
+  FMain.btback.Height = ME.btResCan.Height
+  FMain.btQuit.Height = FMain.btback.Height
+  FMain.btnext.Height = FMain.btback.Height
   FMain.sNextKey = "Prep0"
   FMain.FrmCurr = ME
   FMain.frmNext = FrmPartScheme

Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class	(original)
+++ branches/iVL/FrmWinDrives.class	Thu Jul 17 23:34:49 2008
@@ -18,6 +18,26 @@

 PUBLIC SUB Form_Open()

+ME.Resize(ME.ClientWidth - 12, ME.ClientH - 12)
   MdlWinDrives.LIST_WIN_PARTITIONS
+  'ME.Resize(ME.Parent.Width - 12, ME.Parent.Height - 12)
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .tlBanner.Width = .ClientW - 4
+    '.svWinDrives.Resize(.ClientWidth - 4, .ClientHeight - 
(.tlBanner.Width * 1.5))
+    .svWinDrives.Move(.tlBanner.Left, .tlBanner.top + 
(.tlBanner.Height + 4), .tlBanner.Width - 8, .ClientH - 
(.tlbanner.height * 2))
+
+  END WITH
+
+END
+
+PUBLIC SUB VPanel1_MouseDown()
+
+

 END

Modified: branches/iVL/FrmWinDrives.form
==============================================================================
--- branches/iVL/FrmWinDrives.form	(original)
+++ branches/iVL/FrmWinDrives.form	Thu Jul 17 23:34:49 2008
@@ -3,11 +3,12 @@
 { Form Form
   MoveScaled(0,0,67,56)
   Text = ("")
+  { svWinDrives ScrollView
+    MoveScaled(1,8,64,43)
+    Expand = True
+  }
   { tlBanner TextLabel
     MoveScaled(1,2,65,5)
      Text = ("Select the windows partitions you would like to mount 
during boot")
-  }
-  { svWinDrives ScrollView
-    MoveScaled(1,8,64,39)
   }
 }

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Jul 17 23:34:49 2008
@@ -61,7 +61,7 @@
                SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ 
sResults & Space(1) & " /mnt/loop" WAIT
                 File.Save(Temp(sResults), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
                 'Message(File.Load(Temp(sResults)))
-              SHELL "umount /mnt/loop &&  umount " & 
ClsGlobal.sSourceMnt WAIT
+              SHELL "umount /mnt/loop && umount " & 
ClsGlobal.sSourceMnt WAIT
                    IF FrmSelISO.lstInstallableImg.Find(sResults & " 
on " & sDrive) = -1 THEN
                      FrmSelISO.lstInstallableImg.Add(sResults & " on " 
& sDrive)
                   END IF
@@ -86,7 +86,7 @@
 DIM sPartition AS String

  'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \' 
\'" TO sResults
-  SHELL "export PATH=$PATH:/sbin &&  /sbin/probepart | grep -e \" 
*Linux$\" | cut -f 1 -d \' \'" TO sResults
+  SHELL " /sbin/probepart | grep -e \" *Linux$\" | cut -f 1 -d \' \'" 
TO sResults
   sResults = Trim(sResults)
     'Message.Info(sResults)
   IF InStr(sResults, gb.NewLine) THEN
@@ -118,23 +118,22 @@



-  ClsGlobal.sSourceMnt = "/mnt/cdrom"
+  ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
   sMountPoint = ClsGlobal.sSourceMnt

-  sCmd = " cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f 
2 -d\':\'|xargs -n 2 | sed -r \'s/ /\\n/g\'"
+  sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f 2  
-d\':\'|xargs -n 2"
   SHELL sCmd TO sList
   sList = Trim(sList)
   'PRINT sList
-    'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
-    IF InStr(sList, gb.newline) THEN ' More than one cd drive found
-    sDrives = Split(sList, gb.NewLine)
+    IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
+    sDrives = Split(sList, Space(1))

       FOR i = 0 TO sDrives.count - 1
         ' this is where we loop to find SETUP.CONF in the cd
           'first, clear the mount point (using $HOME/mnt/cdrom for now)
           sDrive = Trim(sDrives[i])

-          SHELL " mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
+          SHELL "mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
             IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
                sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux" &/ "SETUP.CONF")
                 'save a copy of SETUP.CONF in a temp disposable file
@@ -150,12 +149,12 @@


             END IF
-          SHELL " umount /dev/" & sDrive WAIT
+          SHELL "umount /dev/" & sDrive WAIT
         NEXT

     ELSE ' only one drive found
     sDrive = Trim(sList)
-        SHELL " mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
+        SHELL "mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
             IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
                sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux" &/ "SETUP.CONF")
                 'save a copy of SETUP.CONF in a temp disposable file
@@ -171,10 +170,7 @@


             END IF
-          'sHELL "sudo umount /dev/" & sDrive WAIT
-          SHELL " umount " & ClsGlobal.sSourceMnt WAIT
-            CATCH
-              Message( ERROR )
+          SHELL "umount /dev/" & clsglobal.sSourceMnt WAIT



@@ -430,7 +426,7 @@
       ClsGlobal.iSwapMin = CInt(iswap)

     ELSE 'i can't see the file
-      Message.Error("Cannot find SETUP.CONF in" & sFilePath)
+      Message.Error("Cannot find SETUP.CONF")
   END IF
 END


Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Thu Jul 17 23:34:49 2008
@@ -33,7 +33,7 @@
     END IF

   FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
-  SHELL " /usr/sbin/gparted"
+  SHELL "/usr/bin/gparted"
   WAIT 3

   sTitle = "GParted"
@@ -51,10 +51,9 @@
         aHandle = Desktop.Find(sTitle)
         INC i
       UNTIL
-      aHandle.Count > 0 OR i = 10
-      'i = 10 OR aHandle.Count > 0
+      i = 10 OR aHandle.Count > 0
         IF aHandle.Count = 0 THEN
-          Message("Setup is unable to successfully run gparted on this 
system. This may be a sign of \n" &
+          Message("Setup is unable to successfully run gslapt on this 
system. This may be a sign of \n" &
           "a bad install media. Setup cannot continue.")
         RETURN
         END IF
@@ -68,9 +67,8 @@

   'TRY embEmbedder.Embed(iHandle)
   TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
-    CATCH
-      Message.Error(Error.text)
-  'IF ERROR THEN Message.Warning(Error.Text)
+
+  IF ERROR THEN Message.Warning(Error.Text)

 END


Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Thu Jul 17 23:34:49 2008
@@ -35,14 +35,14 @@
   DIM iswapsize AS Float
   DIM i3drdrowX AS Integer
   DIM iX AS Integer
-
+  DIM iWidth AS Integer
   ' fire up the arrays
   oFsTypes = NEW Object[]
   oMountPoints = NEW Object[]


   ' We will mount the partitions first, and then figure out their size
-  SHELL "export PATH=$PATH:/sbin &&  probepart | grep -e \" Linux$\" | 
cut -f 1 -d \' \'" TO sDump1
+  SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \'" TO sDump1
   sDump1 = Trim(sDump1)


@@ -56,10 +56,10 @@

               'make sure the mount point exists
                 IF IsDir("/mnt" &/ sPart) = FALSE THEN
-                  SHELL " mkdir /mnt" &/ sPart WAIT
+                  SHELL "mkdir /mnt" &/ sPart WAIT
                 END IF
                 ' Now mount the partition
-                SHELL " mount " & Trim(sPartList[i]) & Space(1) 
& "/mnt" &/ sPart WAIT
+                SHELL "mount " & Trim(sPartList[i]) & Space(1) 
& "/mnt" &/ sPart WAIT
                     ' get the size using df -h | grep sPart and some sed
                     ' will embed some bash, but should probabbly be fixed
                  SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
@@ -125,7 +125,7 @@


                 ' now umount the partition and delete the mount point
-                  SHELL " umount /mnt" &/ sPart & " &&  rm -r /mnt" &/ 
sPart WAIT
+                  SHELL "umount /mnt" &/ sPart & " && rm -r /mnt" &/ 
sPart WAIT
                 ' increase the value of y for the next label
                 y = y + tl.Height + 4

@@ -139,7 +139,7 @@

       END IF

-      SHELL "export PATH=$PATH:/sbin &&  probepart | grep -i \" 
*swap$\" | cut -f 1 -d \' \'" TO sSwapList
+      SHELL " probepart | grep -i \" *swap$\" | cut -f 1 -d \' \'" TO sSwapList
         sSwapList = Trim(sSwapList)
         'Message.Info(sSwapList)
         IF InStr(sSwapList, gb.NewLine) THEN
@@ -148,8 +148,7 @@
         ELSE
           spart = Trim(sSwapList)
            'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) | 
cut -f 2 -d \' \'" TO vSwapSize
-          'SHELL "export PATH=$PATH:/sbin && export sw=$(sudo 
probepart | grep -i \" *swap$\") && echo $sw | cut -f 4 -d \' \'" TO vSwapSize
-          SHELL "export PATH=$PATH:/sbin && export sw=$( probepart | 
grep -i \" *swap$\") && echo $sw | cut -f 4 -d \' \'| sed -e 
\'s/\\([[:digit:]]\\)+/\\1/\'" TO vSwapSize
+          SHELL " export sw=$(probepart | grep -i \" *swap$\") && echo 
$sw | cut -f 4 -d \' \'" TO vSwapSize

             iswapsize = CInt(vSwapSize)
             iswapsize = Round(iswapsize / 1024 / 1024, -2)
@@ -185,6 +184,21 @@

           'Message.Info("Swap total = " & iswapsize)
         END IF
+
+  FOR EACH cb IN MdlPartSel.oMountPoints
+    IF cb.width > iWidth THEN
+      iWidth = cb.Width
+    END IF
+  NEXT
+    FOR EACH cb IN MdlPartSel.oMountPoints
+      cb.Width = iWidth
+    NEXT
+    FOR EACH cb IN MdlPartSel.oFsTypes
+      cb.Width = iWidth
+    NEXT
+
+
+


 END

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Jul 17 23:34:49 2008
@@ -22,16 +22,15 @@
   DIM sAddy AS String = Right(sDev, Len(sDev) - RInStr(sDev, "/"))


-  'message.info(sDev)
   IF sISONAME OR sISONAME <> "" THEN
      'SHELL "sudo mount " & sDev & " /mnt/loop" WAIT ' will switch 
places here .. the device will mount to loop and the iso will mount to 
the mount point
-    SHELL " mkdir -p /mnt" &/ sAddy & " &&  mount " & sDev & Space(1) 
& "/mnt" &/ sAddy WAIT
-    SHELL " mount -o loop /mnt" &/ sAddy &/ sISONAME & Space(1) & 
ClsGlobal.sSourceMnt WAIT
+    SHELL "mkdir -p /mnt" &/ sAddy & " && mount " & sDev & Space(1) 
& "/mnt" &/ sAddy WAIT
+    SHELL "mount -o loop /mnt" &/ sAddy &/ sISONAME & Space(1) & 
ClsGlobal.sSourceMnt WAIT

     'SHELL "sudo umount /mnt/loop" WAIT
   ELSE
-
-    SHELL " mount -t iso9660 " & sDev & Space(1) & 
ClsGlobal.sSourceMnt WAIT
+
+    SHELL "mount " & sDev & Space(1) & ClsGlobal.sSourceMnt & " 
2>/root/err" & " >/root/log" WAIT
   END IF

   ' display the license agreement text
@@ -54,8 +53,8 @@
  DIM sFATList AS String
  DIM sFAT32List AS String

- SHELL " probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" TO sFAT32List
- SHELL " probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" TO sFATList
+ SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" TO sFAT32List
+ SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" TO sFATList

  sFAT32List = Trim(sFAT32List)
  sFATList = Trim(sFATList)

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Thu Jul 17 23:34:49 2008
@@ -18,6 +18,7 @@


 PUBLIC vObj AS Object[]
+PUBLIC oWMntPoints AS Object[]
 PUBLIC SUB LIST_WIN_PARTITIONS()
 DIM tl AS TextLabel
 DIM cb AS ComboBox
@@ -29,6 +30,7 @@
 DIM sPart AS String
 DIM sSize AS String
 DIM lbwidth AS Integer
+DIM cbx AS Integer = FrmPartSel.scrollPartitions.Width / 2

 x = 4
 y = 8
@@ -38,7 +40,7 @@
   ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
   ' THESE ARE ONLY NEEDED FOR FSTAB
   sDump1 = ""
-      SHELL "PATH=$PATH:/sbin &&  probepart | grep -e \'/dev\' | grep 
-v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | cut -f 
1 -d \' \' | sed -r \'s/Disk//g\'" TO sdump1
+      SHELL "PATH=$PATH:/sbin && probepart | grep -e \'/dev\' | grep 
-v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | cut -f 
1 -d \' \' | sed -r \'s/Disk//g\'" TO sdump1
        File.Save(Temp("all"), Trim(sDump1))

     vObj = NEW Object[]
@@ -55,9 +57,12 @@
             .Height = 27
             .Width = MdlObjSizer.get_object_width(.Text)
             .x = FrmWinDrives.svWinDrives.Width / 2 - (.Width / 2)
+
             .y = y
+            cbx = .x + .Width - (.Width / 2)
           END WITH
     y = y + tl.Height * 2
+
     'END IF
       IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
         sPartList = Split(sDump1, gb.NewLine) ' multiple partitions found
@@ -66,56 +71,65 @@
           FOR i = 0 TO sPartList.Count - 1
             sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))

-                SHELL " mkdir /mnt" &/ spart & " &&  mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
+                SHELL "mkdir /mnt" &/ spart & " && mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
                     ' get the size using df -h | grep sPart and some sed
                     ' will embed some bash, but should probabbly be fixed
                  SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
-                SHELL " umount /mnt" &/ spart
-                SHELL " rm -rf /mnt" &/ spart
+                SHELL "umount /mnt" &/ spart WAIT
+                'SHELL "rm -rf /mnt" &/ spart WAIT
+                TRY RMDIR "/mnt" &/ sPart
+

               tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
                 WITH tl

                   .Text = sPartList[i] & " ( " & sSize & " )"
-                  .Width = MdlObjSizer.get_object_width(.Text) * 1.5
+                  .Width = MdlObjSizer.get_object_width(.Text) ' * 1.5
                   .Tag = sPartList[i]
                   .Height = 27
                   .x = FrmPartSel.tlPartRow.Left
                   .y = y
-                    IF .Width > lbwidth THEN
+                  cbx = .x + tl.Width * 1.5
+                  IF .Width > lbwidth THEN
                     lbwidth = .Width
-                    END IF
-                  .Width = lbwidth
+                  ELSE
+                    .Width = lbwidth
+                  END IF
+                                    ME.vObj.Add(tl)
                 END WITH
-                ME.vObj.Add(tl)
+
+
                 ClsWinDrives.sWinDrives.Add(tl.Tag & "|" & "/mnt/" & sPart)
                 ' now create the combobox to select the mount point
                   cb = NEW ComboBox(FrmWinDrives.svWinDrives) AS "WinMntPoints"
+                  oWMntPoints = NEW Object[]
                     WITH cb
-                      .Width = tl.Width
                       .Tag = sPartList[i]
                       .Height = 27
-                      .x = tl.Left + tl.Width + 8
+                      '.x = FrmPartSel.scrollPartitions.Width / 
2 'lbwidth + 12
+                      .x = FrmPartSel.tlPartRow2.Left
                       .y = tl.Top
-                      .Width = lbwidth
                       .Add("/mnt" &/ sPart)
+                      .Width = MdlObjSizer.get_object_width("/mnt" &/ 
sPart) * 2
                       .ReadOnly = FALSE
+'                      .border = border.Plain
+                      ME.oWMntPoints.Add(cb)
                     END WITH
-
+
                 y = y + tl.Height + 4
-
+


           NEXT
-



       ELSE ' only one win partition found

+
         sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
         'Message(sPart)
-        SHELL " mkdir -p /mnt" &/ spart & " &&  mount " & Trim(sDump1) 
& Space(1) & "/mnt" &/ sPart WAIT
+        SHELL "mkdir -p /mnt" &/ spart & " && mount " & Trim(sDump1) & 
Space(1) & "/mnt" &/ sPart WAIT
          SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") && 
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
         sSize = Trim(sSize)
         'Message(sSize)
@@ -131,10 +145,10 @@
             .Width = MdlObjSizer.get_object_width(.Text) * 1.5
             .x = FrmPartSel.tlPartRow.Left
             .y = y
-
+
           END WITH
-          SHELL " umount /mnt" &/ spart WAIT
-        SHELL " rm -rf /mnt" &/ spart WAIT
+          SHELL "umount /mnt" &/ spart WAIT
+        SHELL "rm -rf /mnt" &/ spart WAIT
   END IF
  ELSE
   ' no widnows partitions found
@@ -145,8 +159,17 @@
         .Height = 27
         .x = y
         .y = y
+
       END WITH
+
+
  END IF
+
+
+
+
+
+
 END

 PUBLIC SUB WinMntPoints_keyrelease()

Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.

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

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

Author: M0...@gm...
Date: Thu Jul 17 18:28:53 2008
New Revision: 49

Added:
   branches/iVL/installer.gambas   (contents, props changed)
Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/.project
   branches/iVL/FMain.class
   branches/iVL/MdlCore.module
   branches/iVL/MdlDiskPart.module
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlSetup.module
   branches/iVL/MdlWinDrives.module

Log:
Added binary and cleaned out the sudo stuff to get ready to test in a 
real environment. The partition detection is still having problems... 
need to fix now

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/moises/area-51/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Thu Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/moises/area-51/installer/ClsGlobal.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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/moises/area-51/installer/FrmPartSel.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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/moises/area-51/installer/FrmSelISO.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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/moises/area-51/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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/moises/area-51/installer/MdlPartSel.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 Jul 17 18:28:53 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/moises/area-51/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Jul 17 18:28:53 2008
@@ -1,7 +1,7 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
 Startup=MdlCore
-Version=0.0.1
+Version=0.0.7
 Library=gb.gtk
 Library=gb.form
 Library=gb.desktop

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Jul 17 18:28:53 2008
@@ -27,7 +27,7 @@
 END

 PUBLIC SUB Form_Open()
-ClsGlobal.sSourceMnt = User.Home &/ "mnt" &/ "cdrom"
+ClsGlobal.sSourceMnt = "/mnt" &/ "cdrom"
 FrmSelISO.Reparent(ME.pnlWinHost)
 FrmSelISO.Width = pnlWinHost.Width
 FrmSelISO.Height = pnlWinHost.Height

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Jul 17 18:28:53 2008
@@ -32,8 +32,8 @@
   DIM sResults, sISO AS String
   DIM i AS Integer

-  SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
-  SHELL "sudo mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
+  SHELL "umount " & ClsGlobal.sSourceMnt WAIT
+  SHELL "mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
      SHELL "ls " & ClsGlobal.sSourceMnt & " | grep -i vl* | grep -i 
iso" TO sResults
       sResults = Trim(sResults)
       'Message(sResults)
@@ -43,32 +43,32 @@
                 sISOList = Split(sResults, gb.NewLine)
                   FOR i = 0 TO sISOList.count - 1
                     sIso = Trim(sISOList[i])
-                    SHELL "sudo umount /mnt/loop" WAIT
-                    SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt 
&/ sISO & Space(1) & "/mnt/loop" WAIT
+                    SHELL "umount /mnt/loop" WAIT
+                    SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ 
sISO & Space(1) & "/mnt/loop" WAIT
                       File.Save(Temp(siso), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
-                    SHELL "sudo umount /mnt/loop" WAIT
+                    SHELL "umount /mnt/loop" WAIT
                        IF FrmSelISO.lstInstallableImg.Find(sISO & " 
on " & sDrive) = -1 THEN
                          FrmSelISO.lstInstallableImg.Add(sISO & " on " 
& sDrive)
                       END IF

                   NEXT
-                SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
+                SHELL "umount " & ClsGlobal.sSourceMnt WAIT



             ELSE ' only one iso found
-              SHELL "sudo umount /mnt/loop" WAIT 'clear the mount point
-              SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt &/ 
sResults & Space(1) & " /mnt/loop" WAIT
+              SHELL "umount /mnt/loop" WAIT 'clear the mount point
+              SHELL "mount -o loop " & ClsGlobal.sSourceMnt &/ 
sResults & Space(1) & " /mnt/loop" WAIT
                 File.Save(Temp(sResults), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
                 'Message(File.Load(Temp(sResults)))
-              SHELL "sudo umount /mnt/loop && sudo umount " & 
ClsGlobal.sSourceMnt WAIT
+              SHELL "umount /mnt/loop &&  umount " & 
ClsGlobal.sSourceMnt WAIT
                    IF FrmSelISO.lstInstallableImg.Find(sResults & " 
on " & sDrive) = -1 THEN
                      FrmSelISO.lstInstallableImg.Add(sResults & " on " 
& sDrive)
                   END IF
             END IF

           ELSE 'no ISO's found
-            SHELL "sudo umount " & ClsGlobal.sSourceMnt
+            SHELL "umount " & ClsGlobal.sSourceMnt

           END IF

@@ -86,7 +86,7 @@
 DIM sPartition AS String

  'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \' 
\'" TO sResults
-  SHELL "export PATH=$PATH:/sbin && sudo /sbin/probepart | grep -e \" 
*Linux$\" | cut -f 1 -d \' \'" TO sResults
+  SHELL "export PATH=$PATH:/sbin &&  /sbin/probepart | grep -e \" 
*Linux$\" | cut -f 1 -d \' \'" TO sResults
   sResults = Trim(sResults)
     'Message.Info(sResults)
   IF InStr(sResults, gb.NewLine) THEN
@@ -118,10 +118,10 @@



-  ClsGlobal.sSourceMnt = User.home &/ "mnt" &/ "cdrom"
+  ClsGlobal.sSourceMnt = "/mnt/cdrom"
   sMountPoint = ClsGlobal.sSourceMnt

-  sCmd = "sudo cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut 
-f 2 -d\':\'|xargs -n 2 | sed -r \'s/ /\\n/g\'"
+  sCmd = " cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f 
2 -d\':\'|xargs -n 2 | sed -r \'s/ /\\n/g\'"
   SHELL sCmd TO sList
   sList = Trim(sList)
   'PRINT sList
@@ -134,7 +134,7 @@
           'first, clear the mount point (using $HOME/mnt/cdrom for now)
           sDrive = Trim(sDrives[i])

-          SHELL "sudo mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
+          SHELL " mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
             IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
                sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux" &/ "SETUP.CONF")
                 'save a copy of SETUP.CONF in a temp disposable file
@@ -150,12 +150,12 @@


             END IF
-          SHELL "sudo umount /dev/" & sDrive WAIT
+          SHELL " umount /dev/" & sDrive WAIT
         NEXT

     ELSE ' only one drive found
     sDrive = Trim(sList)
-        SHELL "sudo mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
+        SHELL " mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
             IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
                sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux" &/ "SETUP.CONF")
                 'save a copy of SETUP.CONF in a temp disposable file
@@ -172,7 +172,7 @@

             END IF
           'sHELL "sudo umount /dev/" & sDrive WAIT
-          SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
+          SHELL " umount " & ClsGlobal.sSourceMnt WAIT
             CATCH
               Message( ERROR )

@@ -430,7 +430,7 @@
       ClsGlobal.iSwapMin = CInt(iswap)

     ELSE 'i can't see the file
-      Message.Error("Cannot find SETUP.CONF")
+      Message.Error("Cannot find SETUP.CONF in" & sFilePath)
   END IF
 END


Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Thu Jul 17 18:28:53 2008
@@ -33,7 +33,7 @@
     END IF

   FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
-  SHELL "sudo /usr/sbin/gparted"
+  SHELL " /usr/sbin/gparted"
   WAIT 3

   sTitle = "GParted"

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Thu Jul 17 18:28:53 2008
@@ -42,7 +42,7 @@


   ' We will mount the partitions first, and then figure out their size
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
Linux$\" | cut -f 1 -d \' \'" TO sDump1
+  SHELL "export PATH=$PATH:/sbin &&  probepart | grep -e \" Linux$\" | 
cut -f 1 -d \' \'" TO sDump1
   sDump1 = Trim(sDump1)


@@ -56,10 +56,10 @@

               'make sure the mount point exists
                 IF IsDir("/mnt" &/ sPart) = FALSE THEN
-                  SHELL "sudo mkdir /mnt" &/ sPart WAIT
+                  SHELL " mkdir /mnt" &/ sPart WAIT
                 END IF
                 ' Now mount the partition
-                SHELL "sudo mount " & Trim(sPartList[i]) & Space(1) 
& "/mnt" &/ sPart WAIT
+                SHELL " mount " & Trim(sPartList[i]) & Space(1) 
& "/mnt" &/ sPart WAIT
                     ' get the size using df -h | grep sPart and some sed
                     ' will embed some bash, but should probabbly be fixed
                  SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
@@ -125,7 +125,7 @@


                 ' now umount the partition and delete the mount point
-                  SHELL "sudo umount /mnt" &/ sPart & " && sudo rm -r 
/mnt" &/ sPart WAIT
+                  SHELL " umount /mnt" &/ sPart & " &&  rm -r /mnt" &/ 
sPart WAIT
                 ' increase the value of y for the next label
                 y = y + tl.Height + 4

@@ -139,7 +139,7 @@

       END IF

-      SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -i \" 
*swap$\" | cut -f 1 -d \' \'" TO sSwapList
+      SHELL "export PATH=$PATH:/sbin &&  probepart | grep -i \" 
*swap$\" | cut -f 1 -d \' \'" TO sSwapList
         sSwapList = Trim(sSwapList)
         'Message.Info(sSwapList)
         IF InStr(sSwapList, gb.NewLine) THEN
@@ -148,7 +148,8 @@
         ELSE
           spart = Trim(sSwapList)
            'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) | 
cut -f 2 -d \' \'" TO vSwapSize
-          SHELL "export PATH=$PATH:/sbin && export sw=$(sudo probepart  
| grep -i \" *swap$\") && echo $sw | cut -f 4 -d \' \'" TO vSwapSize
+          'SHELL "export PATH=$PATH:/sbin && export sw=$(sudo 
probepart | grep -i \" *swap$\") && echo $sw | cut -f 4 -d \' \'" TO vSwapSize
+          SHELL "export PATH=$PATH:/sbin && export sw=$( probepart | 
grep -i \" *swap$\") && echo $sw | cut -f 4 -d \' \'| sed -e 
\'s/\\([[:digit:]]\\)+/\\1/\'" TO vSwapSize

             iswapsize = CInt(vSwapSize)
             iswapsize = Round(iswapsize / 1024 / 1024, -2)

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Jul 17 18:28:53 2008
@@ -25,13 +25,13 @@
   'message.info(sDev)
   IF sISONAME OR sISONAME <> "" THEN
      'SHELL "sudo mount " & sDev & " /mnt/loop" WAIT ' will switch 
places here .. the device will mount to loop and the iso will mount to 
the mount point
-    SHELL "sudo mkdir -p /mnt" &/ sAddy & " && sudo mount " & sDev & 
Space(1) & "/mnt" &/ sAddy WAIT
-    SHELL "sudo mount -o loop /mnt" &/ sAddy &/ sISONAME & Space(1) & 
ClsGlobal.sSourceMnt WAIT
+    SHELL " mkdir -p /mnt" &/ sAddy & " &&  mount " & sDev & Space(1) 
& "/mnt" &/ sAddy WAIT
+    SHELL " mount -o loop /mnt" &/ sAddy &/ sISONAME & Space(1) & 
ClsGlobal.sSourceMnt WAIT

     'SHELL "sudo umount /mnt/loop" WAIT
   ELSE

-    SHELL "sudo mount -t iso9660 " & sDev & Space(1) & 
ClsGlobal.sSourceMnt WAIT
+    SHELL " mount -t iso9660 " & sDev & Space(1) & 
ClsGlobal.sSourceMnt WAIT
   END IF

   ' display the license agreement text
@@ -54,8 +54,8 @@
  DIM sFATList AS String
  DIM sFAT32List AS String

- SHELL "sudo probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" 
TO sFAT32List
- SHELL "sudo probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" 
TO sFATList
+ SHELL " probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" TO sFAT32List
+ SHELL " probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" TO sFATList

  sFAT32List = Trim(sFAT32List)
  sFATList = Trim(sFATList)

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Thu Jul 17 18:28:53 2008
@@ -38,7 +38,7 @@
   ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
   ' THESE ARE ONLY NEEDED FOR FSTAB
   sDump1 = ""
-      SHELL "PATH=$PATH:/sbin && sudo probepart | grep -e \'/dev\' | 
grep -v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | 
cut -f 1 -d \' \' | sed -r \'s/Disk//g\'" TO sdump1
+      SHELL "PATH=$PATH:/sbin &&  probepart | grep -e \'/dev\' | grep 
-v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | cut -f 
1 -d \' \' | sed -r \'s/Disk//g\'" TO sdump1
        File.Save(Temp("all"), Trim(sDump1))

     vObj = NEW Object[]
@@ -66,12 +66,12 @@
           FOR i = 0 TO sPartList.Count - 1
             sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))

-                SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
+                SHELL " mkdir /mnt" &/ spart & " &&  mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
                     ' get the size using df -h | grep sPart and some sed
                     ' will embed some bash, but should probabbly be fixed
                  SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
-                SHELL "sudo umount /mnt" &/ spart
-                SHELL "sudo rm -rf /mnt" &/ spart
+                SHELL " umount /mnt" &/ spart
+                SHELL " rm -rf /mnt" &/ spart

               tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
                 WITH tl
@@ -115,7 +115,7 @@

         sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
         'Message(sPart)
-        SHELL "sudo mkdir -p /mnt" &/ spart & " && sudo mount " & 
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
+        SHELL " mkdir -p /mnt" &/ spart & " &&  mount " & Trim(sDump1) 
& Space(1) & "/mnt" &/ sPart WAIT
          SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") && 
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
         sSize = Trim(sSize)
         'Message(sSize)
@@ -133,8 +133,8 @@
             .y = y

           END WITH
-          SHELL "sudo umount /mnt" &/ spart WAIT
-        SHELL "sudo rm -rf /mnt" &/ spart WAIT
+          SHELL " umount /mnt" &/ spart WAIT
+        SHELL " rm -rf /mnt" &/ spart WAIT
   END IF
  ELSE
   ' no widnows partitions found

Added: branches/iVL/installer.gambas
==============================================================================
Binary file. No diff available.

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

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

Author: M0E.lnx
Date: Thu Jul 17 15:01:23 2008
New Revision: 48

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/FrmDiskPart.pot
   branches/iVL/MdlCore.module
   branches/iVL/MdlDiskPart.module
   branches/iVL/MdlSetup.module

Log:
Modified win partition detection and cdrom drive detection.

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Jul 17 15:01:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/.project
+# /home/moises/area-51/projects/installer/.project
 # 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 Jul 17 15:01:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmDiskPart.class
+# /home/moises/area-51/projects/installer/FrmDiskPart.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Jul 17 15:01:23 2008
@@ -121,12 +121,13 @@
   ClsGlobal.sSourceMnt = User.home &/ "mnt" &/ "cdrom"
   sMountPoint = ClsGlobal.sSourceMnt

-  sCmd = "sudo cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut 
-f 2 -d\':\'|xargs -n 2"
+  sCmd = "sudo cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut 
-f 2 -d\':\'|xargs -n 2 | sed -r \'s/ /\\n/g\'"
   SHELL sCmd TO sList
   sList = Trim(sList)
   'PRINT sList
-    IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
-    sDrives = Split(sList, Space(1))
+    'IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
+    IF InStr(sList, gb.newline) THEN ' More than one cd drive found
+    sDrives = Split(sList, gb.NewLine)

       FOR i = 0 TO sDrives.count - 1
         ' this is where we loop to find SETUP.CONF in the cd
@@ -170,7 +171,10 @@


             END IF
-          SHELL "sudo umount /dev/" & sDrive WAIT
+          'sHELL "sudo umount /dev/" & sDrive WAIT
+          SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
+            CATCH
+              Message( ERROR )




Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Thu Jul 17 15:01:23 2008
@@ -51,9 +51,10 @@
         aHandle = Desktop.Find(sTitle)
         INC i
       UNTIL
-      i = 10 OR aHandle.Count > 0
+      aHandle.Count > 0 OR i = 10
+      'i = 10 OR aHandle.Count > 0
         IF aHandle.Count = 0 THEN
-          Message("Setup is unable to successfully run gslapt on this 
system. This may be a sign of \n" &
+          Message("Setup is unable to successfully run gparted on this 
system. This may be a sign of \n" &
           "a bad install media. Setup cannot continue.")
         RETURN
         END IF
@@ -67,8 +68,9 @@

   'TRY embEmbedder.Embed(iHandle)
   TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
-
-  IF ERROR THEN Message.Warning(Error.Text)
+    CATCH
+      Message.Error(Error.text)
+  'IF ERROR THEN Message.Warning(Error.Text)

 END


Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Jul 17 15:01:23 2008
@@ -22,6 +22,7 @@
   DIM sAddy AS String = Right(sDev, Len(sDev) - RInStr(sDev, "/"))


+  'message.info(sDev)
   IF sISONAME OR sISONAME <> "" THEN
      'SHELL "sudo mount " & sDev & " /mnt/loop" WAIT ' will switch 
places here .. the device will mount to loop and the iso will mount to 
the mount point
      SHELL "sudo mkdir -p /mnt" &/ sAddy & " && sudo mount " & sDev & 
Space(1) & "/mnt" &/ sAddy WAIT

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

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

Author: M0E.lnx
Date: Thu Jul 17 08:11:43 2008
New Revision: 47

Modified:
   branches/iVL/.lang/FMain.pot
   branches/iVL/.lang/FrmLicense.pot
   branches/iVL/.lang/FrmPartScheme.pot
   branches/iVL/.lang/FrmPartSel.pot
   branches/iVL/.lang/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/FMain.class
   branches/iVL/FMain.form
   branches/iVL/FrmLicense.form
   branches/iVL/FrmPartScheme.form
   branches/iVL/FrmPartSel.form
   branches/iVL/FrmSelISO.form
   branches/iVL/MdlCore.module

Log:
fixed bug in the quit button position while resizing FMain

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
 # Generated by Gambas compiler

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

-#: FMain.class:160
+#: FMain.class:151
 msgid "Process Overview"
 msgstr ""

-#: FMain.class:173
+#: FMain.class:164
 msgid "Vector Linux Install"
 msgstr ""

-#: FMain.class:183
+#: FMain.class:174
 msgid "Next"
 msgstr ""

-#: FMain.class:189
+#: FMain.class:180
 msgid "Back"
 msgstr ""

-#: FMain.class:195
+#: FMain.class:186
 msgid "Exit"
 msgstr ""


Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot	(original)
+++ branches/iVL/.lang/FrmLicense.pot	Thu Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmLicense.class
+# /home/moises/area-51/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 Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmPartScheme.class
+# /home/moises/area-51/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 Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.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 Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmSelISO.class
+# /home/moises/area-51/projects/installer/FrmSelISO.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 Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlCore.module
+# /home/moises/area-51/projects/installer/MdlCore.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 Jul 17 08:11:43 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Jul 17 08:11:43 2008
@@ -52,10 +52,12 @@

 PUBLIC SUB Form_Resize()

+
+
 DIM iMid AS Integer

   WITH ME
-    iMid = (.btback.Left + .btnext.left + .btnext.Width) / 2
+    .btQuit.Width = MdlObjSizer.get_object_width(.btQuit.Text) + 36
   END WITH


@@ -66,24 +68,13 @@
      .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .Frame1.Height)
      .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top 
+ .pnlWinHost.Height - (.btback.Height), 
MdlObjSizer.get_object_width(.btback.text) + 36)
      .btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width 
+ 4), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
-      ' for the quit button, it'll get a little tricky
+    ' for the quit button, it'll get a little tricky
       ' we want that one right in the middle
-    .btQuit.Move(iMid - (.btQuit.Width / 2), .btback.Top, 
MdlObjSizer.get_object_width(.btQuit.Text) + 36)
-    '.pnlWinHost.Move(ME.left + ME.Frame1.Width + 4,  Frame1.Top, 
ME.Width - (Frame1.Width + 4))
+    .btQuit.Move(.pnlWinHost.Left + (.pnlWinHost.Width / 2) - 
(.btQuit.Width / 2), .btback.top)
   END WITH
 END

-PUBLIC SUB Frame1_MouseDown()
-
-
-
-END
-
-

-PUBLIC SUB tvPlan_Select()
-
-END

 PUBLIC SUB tvPlan_MouseUp()


Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form	(original)
+++ branches/iVL/FMain.form	Thu Jul 17 08:11:43 2008
@@ -23,17 +23,17 @@
     MoveScaled(28,9,66,56)
   }
   { btnext Button
-    MoveScaled(89,69,8,3)
+    MoveScaled(89,69,8,3.375)
     Text = ("Next")
     Picture = Picture["icon:/16/right"]
   }
   { btback Button
-    MoveScaled(28,67,8,3)
+    MoveScaled(28,67,8,3.375)
     Text = ("Back")
     Picture = Picture["icon:/16/left"]
   }
   { btQuit Button
-    MoveScaled(54,67,11,2)
+    MoveScaled(54,67,11,3.375)
     Text = ("Exit")
     Picture = Picture["icon:/16/cancel"]
   }

Modified: branches/iVL/FrmLicense.form
==============================================================================
--- branches/iVL/FrmLicense.form	(original)
+++ branches/iVL/FrmLicense.form	Thu Jul 17 08:11:43 2008
@@ -13,11 +13,11 @@
     ReadOnly = True
   }
   { rbYes RadioButton
-    MoveScaled(2,50,20,3)
+    MoveScaled(2,51,20,3.375)
     Text = ("Yes, I Agree to the License Agreement")
   }
   { rbNo RadioButton
-    MoveScaled(2,46,20,3)
+    MoveScaled(2,46,20,3.375)
     Text = ("No, I Do Not Agree")
   }
 }

Modified: branches/iVL/FrmPartScheme.form
==============================================================================
--- branches/iVL/FrmPartScheme.form	(original)
+++ branches/iVL/FrmPartScheme.form	Thu Jul 17 08:11:43 2008
@@ -8,11 +8,11 @@
     Text = ("Select your disk partition option")
   }
   { rbUseExisting RadioButton
-    MoveScaled(2,8,32,3)
+    MoveScaled(2,7,32,3.375)
     Text = ("Use existing disk partitions")
   }
   { rbEditPartitions RadioButton
-    MoveScaled(2,12,62,3)
+    MoveScaled(2,12,62,3.375)
     Text = ("Modify my disk partitions to make room for new installation")
   }
   { tlChoiceExp TextLabel

Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form	(original)
+++ branches/iVL/FrmPartSel.form	Thu Jul 17 08:11:43 2008
@@ -26,7 +26,7 @@
     }
   }
   { cbDoWin CheckBox
-    MoveScaled(1,50,57,3)
+    MoveScaled(1,50,57,3.375)
      ToolTip = ("Check this box if you have a Windows installation on 
your system or any other windows partition (FAT, FAT32, NTFS) that you 
want auto-mounted as soon as your computer starts")
     Text = ("Detect and Setup Windows partitions for auto-mounting at boot")
   }

Modified: branches/iVL/FrmSelISO.form
==============================================================================
--- branches/iVL/FrmSelISO.form	(original)
+++ branches/iVL/FrmSelISO.form	Thu Jul 17 08:11:43 2008
@@ -5,7 +5,7 @@
   Text = ("")
   FullScreen = True
   { lstInstallableImg ComboBox
-    MoveScaled(1,7,45,3)
+    MoveScaled(1,7,45,3.375)
     Text = ("No installable images found.")
     ReadOnly = True
   }
@@ -18,7 +18,7 @@
     Text = ("TextLabel1")
   }
   { btResCan Button
-    MoveScaled(49,7,13,3)
+    MoveScaled(49,7,13,3.375)
     Text = ("Search Again")
     Picture = Picture["icon:/16/refresh"]
   }

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Jul 17 08:11:43 2008
@@ -191,6 +191,9 @@

  ME.MEDIA_SCAN
   FMain.Show
+  FMain.SkipTaskbar = TRUE
+  FMain.Maximized = TRUE
+  FMain.Resize(Desktop.Width, Desktop.Height)
   'FMain.tvPlan.MoveTo("Prep0")
 FMain.tvPlan["Prep0"].Selected = TRUE

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

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

Author: M0E.lnx
Date: Wed Jul 16 21:17:36 2008
New Revision: 46

Added:
   branches/iVL/ClsWinDrives.class
Modified:
   branches/iVL/.lang/FMain.pot
   branches/iVL/.lang/FrmPartSel.pot
   branches/iVL/.lang/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/MdlSetup.module
   branches/iVL/MdlWinDrives.module

Log:
Fixed bug in win partition listing. Also, began working on the windows 
partition mount point definition for fstab.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Wed Jul 16 21:17:36 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/new-inst/FMain.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	Wed Jul 16 21:17:36 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/new-inst/FrmPartSel.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	Wed Jul 16 21:17:36 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/new-inst/FrmSelISO.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	Wed Jul 16 21:17:36 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/new-inst/MdlCore.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	Wed Jul 16 21:17:36 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/new-inst/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Added: branches/iVL/ClsWinDrives.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsWinDrives.class	Wed Jul 16 21:17:36 2008
@@ -0,0 +1,19 @@
+' 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/>.
+
+STATIC PUBLIC sWinDrives AS String[]
\ No newline at end of file

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Wed Jul 16 21:17:36 2008
@@ -34,7 +34,7 @@
   END IF

   ' display the license agreement text
-  FrmLicense.taLicense.Text = SConv(File.Load(sPathToLic))
+'  FrmLicense.taLicense.Text = SConv(File.Load(sPathToLic))

    ' This will also set the default variables for distro name and 
version to clsglobal
     MdlCore.SET_DECISSION(ClsGlobal.sSourceMnt)

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Wed Jul 16 21:17:36 2008
@@ -38,27 +38,9 @@
   ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
   ' THESE ARE ONLY NEEDED FOR FSTAB
   sDump1 = ""
-    'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
-  'SHELL "export PATH=$PATH:/sbin && sudo probepart 2>/dev/null | grep 
-e \"^/dev\" | grep -v \" Ext\" |grep -v \"raid autodetect\"|grep -v 
Linux \"" TO sDump1
-  'SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e 
\"^/dev\" | grep -v \" Ext\" | grep -v \"raid autodetect\" | trep -v 
Linux | cut -f 1 -d \' \'" TO sDump1
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \'/dev\' |
  grep -v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | 
cut -f 1 -d \' \' | sed -s'/Disk//'" TO sDump1
-     File.Save(Temp("all"), Trim(sDump1))
-  ' ' ' SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT32\" | cut -f 1 -d \' \'" TO sDump1
-  ' ' '   File.Save(Temp("fat32"), Trim(sDump1))
-  ' ' '    sDump1 = ""
-  ' ' ' SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT$\" | cut -f 1 -d \' \'" TO sDump1
-  ' ' '   File.Save(Temp("fat"), Trim(sDump1))
-  ' ' '   sDump1 = ""
-  ' ' ' SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*NTFS$\" | cut -f 1 -d \' \'" TO sDump1
-  ' ' '   File.Save(Temp("ntfs"), Trim(sDump1))
-  ' ' '   sDump1 = ""
-
-    ' ' ' sDump1 = File.Load(Temp("fat32")) & gb.NewLine &
-    ' ' ' File.Load(Temp("fat")) & gb.NewLine &
-    ' ' ' File.Load(Temp("ntfs")) & gb.NewLine
-    ' ' ' sDump1 = Trim(sDump1)
-
-    'Message.Info(sDump1)
+      SHELL "PATH=$PATH:/sbin && sudo probepart | grep -e \'/dev\' | 
grep -v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | 
cut -f 1 -d \' \' | sed -r \'s/Disk//g\'" TO sdump1
+       File.Save(Temp("all"), Trim(sDump1))
+
     vObj = NEW Object[]
 sDump1 = File.Load(Temp("all"))
 sDump1 = Trim(sDump1)
@@ -78,7 +60,9 @@
     y = y + tl.Height * 2
     'END IF
       IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
-        sPartList = Split(sDump1, gb.NewLine)
+        sPartList = Split(sDump1, gb.NewLine) ' multiple partitions found
+          'initiate the array
+            ClsWinDrives.sWinDrives = NEW String[]
           FOR i = 0 TO sPartList.Count - 1
             sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))

@@ -92,7 +76,7 @@
               tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
                 WITH tl

-                  .Text = sPart & " ( " & sSize & " )"
+                  .Text = sPartList[i] & " ( " & sSize & " )"
                   .Width = MdlObjSizer.get_object_width(.Text) * 1.5
                   .Tag = sPartList[i]
                   .Height = 27
@@ -104,9 +88,9 @@
                   .Width = lbwidth
                 END WITH
                 ME.vObj.Add(tl)
-
+                ClsWinDrives.sWinDrives.Add(tl.Tag & "|" & "/mnt/" & sPart)
                 ' now create the combobox to select the mount point
-                  cb = NEW ComboBox(FrmWinDrives.svWinDrives)
+                  cb = NEW ComboBox(FrmWinDrives.svWinDrives) AS "WinMntPoints"
                     WITH cb
                       .Width = tl.Width
                       .Tag = sPartList[i]
@@ -164,6 +148,38 @@
       END WITH
  END IF
 END
-
+
+PUBLIC SUB WinMntPoints_keyrelease()
+
+  ME.UPDATE_WIN_ARRAY(LAST.tag, Trim(LAST.text))
+
+END
+PUBLIC SUB WinMntPoints_Select()
+
+  ME.UPDATE_WIN_ARRAY(LAST.tag, Trim(LAST.text))
+
+END
+
+


+
+PUBLIC SUB UPDATE_WIN_ARRAY(sTag AS String, sMntPoint AS String)
+
+DIM i AS Integer
+DIM sLine AS String
+  FOR i = 0 TO ClsWinDrives.sWinDrives.Count - 1
+    sLine = ClsWinDrives.sWinDrives[i]
+      IF Left(sLine, InStr(sLine, "|") - 1) = sTag THEN
+        sLine = sTag & "|" & sMntPoint
+      PRINT sLine
+      ELSE
+        sLine = sLine
+      END IF
+  NEXT
+
+  ' WARNING: ALTHOUGH THIS WORKS, IT MAY STILL NOT BE SAVING THE DATA 
TO THE ARRAY.... MAKE SURE THE NEW VALUES ARE
+  ' SAVED. ALSO, MAKE IT WORK WITH A SINGLE PARTITION AS WELL.
+
+END
+

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

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

Author: M0E.lnx
Date: Wed Jul 16 14:55:37 2008
New Revision: 45

Removed:
   branches/iVL/Notes
Modified:
   branches/iVL/.lang/FMain.pot
   branches/iVL/.lang/FrmPartSel.pot
   branches/iVL/.lang/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/FMain.class
   branches/iVL/FrmPartSel.class
   branches/iVL/FrmSelISO.class
   branches/iVL/MdlCore.module

Log:
Fixed problem resulting when only one(1) ISO was found in a linux 
partition. Re-wrote the function that detects ISOs on eachpartition.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Wed Jul 16 14:55:37 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FMain.class
+# /home/moises/area-51/projects/installer/FMain.class
 # Generated by Gambas compiler

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

-#: FMain.class:154
+#: FMain.class:160
 msgid "Process Overview"
 msgstr ""

-#: FMain.class:167
+#: FMain.class:173
 msgid "Vector Linux Install"
 msgstr ""

-#: FMain.class:177
+#: FMain.class:183
 msgid "Next"
 msgstr ""

-#: FMain.class:183
+#: FMain.class:189
 msgid "Back"
 msgstr ""

-#: FMain.class:189
+#: FMain.class:195
 msgid "Exit"
 msgstr ""


Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Wed Jul 16 14:55:37 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.class
 # Generated by Gambas compiler

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

-#: FrmPartSel.class:139
+#: FrmPartSel.class:140
  msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
 msgstr ""

-#: FrmPartSel.class:147
+#: FrmPartSel.class:148
 msgid "<b>Partition</b>"
 msgstr ""

-#: FrmPartSel.class:153
+#: FrmPartSel.class:154
 msgid "<b>Mount Point</b>"
 msgstr ""

-#: FrmPartSel.class:159
+#: FrmPartSel.class:160
 msgid "<b>File System</b>"
 msgstr ""

-#: FrmPartSel.class:166
+#: FrmPartSel.class:167
  msgid "Check this box if you have a Windows installation on your 
system or any other windows partition (FAT, FAT32, NTFS) that you want 
auto-mounted as soon as your computer starts"
 msgstr ""

-#: FrmPartSel.class:167
+#: FrmPartSel.class:168
 msgid "Detect and Setup Windows partitions for auto-mounting at boot"
 msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Wed Jul 16 14:55:37 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmSelISO.class
+# /home/moises/area-51/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:189
+#: FrmSelISO.class:211
 msgid "No installable images found."
 msgstr ""

-#: FrmSelISO.class:195
+#: FrmSelISO.class:217
 msgid "Select which distribution to install from the list below"
 msgstr ""

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

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


Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Wed Jul 16 14:55:37 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlCore.module
+# /home/moises/area-51/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	Wed Jul 16 14:55:37 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlDiskPart.module
+# /home/moises/area-51/projects/installer/MdlDiskPart.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	Wed Jul 16 14:55:37 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Jul 16 14:55:37 2008
@@ -118,6 +118,12 @@
         IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
          Message.Error("You must select a \"/\" partition. This is the 
target where the system will install to")
           STOP EVENT
+        ELSE
+          IF ClsPartSel.bDoWin = TRUE THEN
+            frmNext = FrmWinDrives
+          ELSE
+            ' move from here to the file copying step
+          END IF
         END IF
   END SELECT


Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Wed Jul 16 14:55:37 2008
@@ -54,6 +54,7 @@
   ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
   MdlPartSel.DISPLAY_PARTITION_OPTIONS
   ME.cbDoWin.Value = FALSE
+  ClsPartSel.bDoWin = FALSE


 END
@@ -107,11 +108,11 @@
 PUBLIC SUB cbDoWin_Click()

   ClsPartSel.bDoWin = cbDoWin.Value
-    IF ClsPartSel.bDoWin = TRUE THEN
-      FMain.frmNext = FrmWinDrives
-    ELSE
-      ' Move towards installing packages
-    END IF
+    ' ' IF ClsPartSel.bDoWin = TRUE THEN
+    ' '   FMain.frmNext = FrmWinDrives
+    ' ' ELSE
+    ' '   ' Move towards installing packages
+    ' ' END IF


 END

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Wed Jul 16 14:55:37 2008
@@ -23,12 +23,11 @@
   DIM sLocation AS String
   DIM ipos1 AS Integer

-
   IF lstInstallableImg.Count > 0 THEN
   IF lstInstallableImg.Text <> "No Installable Media Found" THEN
-
-  IF InStr(lstInstallableImg.Text, ".iso") OR 
InStr(lstInstallableImg.Text, ".ISO") = TRUE THEN
+    IF InStr(Trim(lstInstallableImg.Text), ".iso") OR 
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
      sLocation = Left(lstInstallableImg.Text, 
InStr(lstInstallableImg.Text, " ") - 1)
+
   ELSE
     ipos1 = RInStr(ME.lstInstallableImg.Text, "/")
      sLocation = Right(ME.lstInstallableImg.Text, 
Len(ME.lstInstallableImg.Text) - ipos1)
@@ -36,11 +35,9 @@
   'function to read the file
   ME.DESCRIBE_DISTRO(sLocation)
   END IF
+  ELSE
+    RETURN ' quiet return... we already know there are no images found
   END IF
-  'Message.Info(File.Load(Temp$(sLocation)))
-
-
-


 END
@@ -54,6 +51,21 @@
   FMain.FrmCurr = ME
   FMain.frmNext = FrmPartScheme

+  ' shape the main form according to the findings
+ 'warn the user if no installable media was found
+
+ IF FrmSelISO.lstInstallableImg.Count = 0 THEN
+  FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
+  FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any 
installable media on your system. Please insert your VectorLinux " &
+    "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to 
try again"
+  FMain.btnext.Enabled = FALSE
+  FMain.btnext.ForeColor = Color.Gray
+ ELSE
+  FMain.btnext.Enabled = TRUE
+  FMain.btnext.ForeColor = Color.Black
+ END IF
+
+



@@ -61,7 +73,7 @@

 PUBLIC SUB DESCRIBE_DISTRO(sLoc AS String)

-  DIM sFile AS String[] = Split(File.Load(Temp$(sLoc)), gb.NewLine)
+  DIM sFile AS String[]
   DIM sLine AS String
   DIM i AS Integer
   DIM iSep AS String
@@ -69,6 +81,16 @@

   DIM sDist, sVer, iMinRoot, iMinHome, iMinSwap AS String

+'    Message.Info(File.Load(Temp(sLoc)))
+'Message.Info(sLoc)
+  IF sLoc <> "" THEN
+    sFile = Split(File.Load(Temp$(sLoc)), gb.NewLine)
+  ELSE
+    'can't find Distro ID
+    Message.Error("Unable to identify distro.")
+    RETURN
+  END IF
+
   IF sFile THEN
     FOR i = 0 TO sFile.count - 1
       sLine = Trim(sFile[i])

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Wed Jul 16 14:55:37 2008
@@ -25,47 +25,59 @@
 PUBLIC sDonePic AS Picture = Picture["images/check.png"]


-PUBLIC SUB SEARCH_LINUX_DRIVES_FOR_MEDIA(sDev AS String)
-  DIM sIsoList AS String[]
-  DIM sResults AS String
-  DIM sISO AS String
+
+PUBLIC SUB FIND_ISO_ON_DRIVE(sDrive AS String)
+
+  DIM sISOList AS String[]
+  DIM sResults, sISO AS String
   DIM i AS Integer

-  SHELL "sudo mount " & sDev & Space(1) & ClsGlobal.sSourceMnt WAIT
-   SHELL "ls " & ClsGlobal.sSourceMnt & "| grep -i vl* | grep -i iso" 
TO sResults
-  'SHELL "ls / | grep -i VL* | grep -i iso" TO sResults
-    sResults = Trim(sResults)
-      IF InStr(sResults, gb.NewLine) THEN
-        sIsoList = Split(sResults, gb.NewLine)
-          FOR i = 0 TO sIsoList.Count - 1
-            sISO = Trim(sIsoList[i])
-              IF FrmSelISO.lstInstallableImg.Find(sISO & " on " & 
sDev) = -1 THEN
-                FrmSelISO.lstInstallableImg.Add(sISO & " on " & sDev)
-                  ' save the temp file for distro description
-                    SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt 
&/ sISO & " /mnt/loop" WAIT
-                      File.Save(Temp(sISO), SConv(File.Load("/mnt/loop/veclinux/SETUP.CONF")))
-                    SHELL "sudo umount /mnt/loop" WAIT
-
-              END IF
-          NEXT
-      ELSE ' only one ISO on this drive
-        IF sResults THEN
-        sISO = Trim(sResults)
-          IF FrmSelISO.lstInstallableImg.Find(sISO & " on " & sDev) = 
-1 THEN
-            FrmSelISO.lstInstallableImg.Add(sISO & " on " & sDev)
-             SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt &/ 
sISO & " /mnt/loop" WAIT
-                      File.Save(Temp(sISO), SConv(File.Load("/mnt/loop/veclinux/SETUP.CONF")))
-             SHELL "sudo umount /mnt/loop" WAIT
-
-              END IF
-        END IF
-      END IF
-
   SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
-
+  SHELL "sudo mount " & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
+    SHELL "ls " & ClsGlobal.sSourceMnt & " | grep -i vl* | grep -i 
iso" TO sResults
+      sResults = Trim(sResults)
+      'Message(sResults)
+          IF sResults <> "" THEN
+            IF InStr(sResults, gb.NewLine) THEN 'more than one iso was 
found... do a loop for each one
+              ' this loop will mount each iso and store it's 
SETUP.CONF to a temp file
+                sISOList = Split(sResults, gb.NewLine)
+                  FOR i = 0 TO sISOList.count - 1
+                    sIso = Trim(sISOList[i])
+                    SHELL "sudo umount /mnt/loop" WAIT
+                    SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt 
&/ sISO & Space(1) & "/mnt/loop" WAIT
+                      File.Save(Temp(siso), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
+                    SHELL "sudo umount /mnt/loop" WAIT
+                      IF FrmSelISO.lstInstallableImg.Find(sISO & " 
on " & sDrive) = -1 THEN
+                        FrmSelISO.lstInstallableImg.Add(sISO & " on " 
& sDrive)
+                      END IF
+
+                  NEXT
+                SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
+
+
+
+            ELSE ' only one iso found
+              SHELL "sudo umount /mnt/loop" WAIT 'clear the mount point
+              SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt &/ 
sResults & Space(1) & " /mnt/loop" WAIT
+                File.Save(Temp(sResults), File.Load("/mnt/loop/veclinux/SETUP.CONF"))
+                'Message(File.Load(Temp(sResults)))
+              SHELL "sudo umount /mnt/loop && sudo umount " & 
ClsGlobal.sSourceMnt WAIT
+                  IF FrmSelISO.lstInstallableImg.Find(sResults & " 
on " & sDrive) = -1 THEN
+                    FrmSelISO.lstInstallableImg.Add(sResults & " on " 
& sDrive)
+                  END IF
+            END IF
+
+          ELSE 'no ISO's found
+            SHELL "sudo umount " & ClsGlobal.sSourceMnt
+
+          END IF
+
+
 END


+
+
 PUBLIC SUB SCAN_LINUX_PARTITIONS()

 DIM sResults AS String
@@ -76,22 +88,20 @@
  'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \' 
\'" TO sResults
    SHELL "export PATH=$PATH:/sbin && sudo /sbin/probepart | grep -e \" 
*Linux$\" | cut -f 1 -d \' \'" TO sResults
   sResults = Trim(sResults)
-
+    'Message.Info(sResults)
   IF InStr(sResults, gb.NewLine) THEN
     sPartList = Split(sResults, gb.NewLine)
       FOR i = 0 TO sPartList.count - 1
         sPartition = Trim(sPartList[i])
-          'now scan this partition
-            ME.SEARCH_LINUX_DRIVES_FOR_MEDIA(sPartition)
+           'now scan this partition
+           ME.FIND_ISO_ON_DRIVE(sPartition)
+
       NEXT
   ELSE ' only one linux partition found
     sPartition = Trim(sResults)
-      ME.SEARCH_LINUX_DRIVES_FOR_MEDIA(sPartition)
+      ME.FIND_ISO_ON_DRIVE(sPartition)
   END IF
-
-
-
-
+
 END


@@ -170,20 +180,7 @@

           'NOW SEARCH FOR ISOS ON THE DRIVES
     ME.SCAN_LINUX_PARTITIONS()
- ' shape the main form according to the findings
- 'warn the user if no installable media was found

- IF FrmSelISO.lstInstallableImg.Count = 0 THEN
-  FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
-  FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any 
installable media on your system. Please insert your VectorLinux " &
-    "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to 
try again"
-  FMain.btnext.Enabled = FALSE
-  FMain.btnext.ForeColor = Color.Gray
- ELSE
-  FMain.btnext.Enabled = TRUE
-  FMain.btnext.ForeColor = Color.Black
- END IF
-


 END

[Vectorlinux-devel] [vinstall-ng commit] r44 - branches/iVL

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

Author: M0E.lnx
Date: Tue Jul 15 21:37:49 2008
New Revision: 44

Modified:
   branches/iVL/MdlWinDrives.module

Log:
Another attempt to fix the win partition listing

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Tue Jul 15 21:37:49 2008
@@ -39,22 +39,30 @@
   ' THESE ARE ONLY NEEDED FOR FSTAB
   sDump1 = ""
     'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT32\" | cut -f 1 -d \' \'" TO sDump1
-    File.Save(Temp("fat32"), Trim(sDump1))
-     sDump1 = ""
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT$\" | cut -f 1 -d \' \'" TO sDump1
-    File.Save(Temp("fat"), Trim(sDump1))
-    sDump1 = ""
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*NTFS$\" | cut -f 1 -d \' \'" TO sDump1
-    File.Save(Temp("ntfs"), Trim(sDump1))
-    sDump1 = ""
-    sDump1 = File.Load(Temp("fat32")) & gb.NewLine &
-    File.Load(Temp("fat")) & gb.NewLine &
-    File.Load(Temp("ntfs")) & gb.NewLine
-    sDump1 = Trim(sDump1)
+  'SHELL "export PATH=$PATH:/sbin && sudo probepart 2>/dev/null | grep 
-e \"^/dev\" | grep -v \" Ext\" |grep -v \"raid autodetect\"|grep -v 
Linux \"" TO sDump1
+  'SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e 
\"^/dev\" | grep -v \" Ext\" | grep -v \"raid autodetect\" | trep -v 
Linux | cut -f 1 -d \' \'" TO sDump1
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \'/dev\' |
  grep -v \' Ext\' | grep -v \'raid autodetect\' | grep -v \' Linux\' | 
cut -f 1 -d \' \' | sed -s'/Disk//'" TO sDump1
+     File.Save(Temp("all"), Trim(sDump1))
+  ' ' ' SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT32\" | cut -f 1 -d \' \'" TO sDump1
+  ' ' '   File.Save(Temp("fat32"), Trim(sDump1))
+  ' ' '    sDump1 = ""
+  ' ' ' SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT$\" | cut -f 1 -d \' \'" TO sDump1
+  ' ' '   File.Save(Temp("fat"), Trim(sDump1))
+  ' ' '   sDump1 = ""
+  ' ' ' SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*NTFS$\" | cut -f 1 -d \' \'" TO sDump1
+  ' ' '   File.Save(Temp("ntfs"), Trim(sDump1))
+  ' ' '   sDump1 = ""
+
+    ' ' ' sDump1 = File.Load(Temp("fat32")) & gb.NewLine &
+    ' ' ' File.Load(Temp("fat")) & gb.NewLine &
+    ' ' ' File.Load(Temp("ntfs")) & gb.NewLine
+    ' ' ' sDump1 = Trim(sDump1)

     'Message.Info(sDump1)
-
+    vObj = NEW Object[]
+sDump1 = File.Load(Temp("all"))
+sDump1 = Trim(sDump1)
+'Message(sDump1)
     IF sDump1 <> "" THEN
     sDump1 = Trim(sDump1)
     'y = y + tl.Height * 2 + 4
@@ -67,7 +75,7 @@
             .x = FrmWinDrives.svWinDrives.Width / 2 - (.Width / 2)
             .y = y
           END WITH
-
+    y = y + tl.Height * 2
     'END IF
       IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
         sPartList = Split(sDump1, gb.NewLine)
@@ -83,8 +91,9 @@

               tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
                 WITH tl
-                  .Width = tl.Width
+
                   .Text = sPart & " ( " & sSize & " )"
+                  .Width = MdlObjSizer.get_object_width(.Text) * 1.5
                   .Tag = sPartList[i]
                   .Height = 27
                   .x = FrmPartSel.tlPartRow.Left
@@ -97,7 +106,7 @@
                 ME.vObj.Add(tl)

                 ' now create the combobox to select the mount point
-                  cb = NEW ComboBox
+                  cb = NEW ComboBox(FrmWinDrives.svWinDrives)
                     WITH cb
                       .Width = tl.Width
                       .Tag = sPartList[i]
@@ -106,6 +115,7 @@
                       .y = tl.Top
                       .Width = lbwidth
                       .Add("/mnt" &/ sPart)
+                      .ReadOnly = FALSE
                     END WITH

                 y = y + tl.Height + 4

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

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

Author: M0E.lnx
Date: Tue Jul 15 20:05:37 2008
New Revision: 43

Modified:
   branches/iVL/.lang/#project.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/FMain.class
   branches/iVL/MdlCore.module
   branches/iVL/MdlDiskPart.module
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlWinDrives.module

Log:
Corrected problem for systems with only one cdrom device. This was a 
left-over from a previous revision. improved partition selection 
algorithm, and modified win partition detection (this still needs work)

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/new-inst/.project
 # 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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/new-inst/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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/projects/new-inst/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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/projects/new-inst/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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/new-inst/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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/new-inst/FrmPartSel.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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/new-inst/FrmSelISO.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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/new-inst/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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/new-inst/MdlDiskPart.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	Tue Jul 15 20:05:37 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/new-inst/MdlPartSel.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Jul 15 20:05:37 2008
@@ -62,7 +62,7 @@
   WITH ME
     .tlBanner.width = ME.width
      .Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height 
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height - 
(.tlbanner.height + (.tlbanner.height / 2)))
-    .tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 30)
+    .tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 36)
      .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .Frame1.Height)
      .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top 
+ .pnlWinHost.Height - (.btback.Height), 
MdlObjSizer.get_object_width(.btback.text) + 36)
      .btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width 
+ 4), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Tue Jul 15 20:05:37 2008
@@ -111,7 +111,7 @@
   ClsGlobal.sSourceMnt = User.home &/ "mnt" &/ "cdrom"
   sMountPoint = ClsGlobal.sSourceMnt

-  sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f2  
-d\':\'|xargs -n 2"
+  sCmd = "sudo cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut 
-f 2 -d\':\'|xargs -n 2"
   SHELL sCmd TO sList
   sList = Trim(sList)
   'PRINT sList
@@ -143,6 +143,28 @@
         NEXT

     ELSE ' only one drive found
+    sDrive = Trim(sList)
+        SHELL "sudo mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
+            IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
+               sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux" &/ "SETUP.CONF")
+                'save a copy of SETUP.CONF in a temp disposable file
+                  ' this temp file will be named as the last 
characters of the drive that contains the distro (ie, hda, sg0, sda)
+                   ' this information will be used FOR reading the 
file later
+
+               File.Save(Temp$(sDrive), DConv(File.Load(sMountPoint 
&/ "veclinux" &/ "SETUP.CONF")))
+               'Message.Info(File.Load(Temp$(sDrive)))
+
+               IF FrmSelISO.lstInstallableImg.Find(sDump & " on " 
& "/dev/" & sDrive) = -1 THEN  'only add the entry if not found
+                FrmSelISO.lstInstallableImg.Add(sDump & " on " 
& "/dev/" & sDrive)
+              END IF
+
+
+            END IF
+          SHELL "sudo umount /dev/" & sDrive WAIT
+
+
+
+
     END IF



Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module	(original)
+++ branches/iVL/MdlDiskPart.module	Tue Jul 15 20:05:37 2008
@@ -23,8 +23,15 @@
   DIM aHandle AS NEW Pointer[]
   DIM iHandle AS Integer
   DIM i AS Integer = 0
-
+  DIM sDump AS String
   'Desktop.Find("", "GParted")
+
+
+    IF Exist("/usr/sbin/gparted") = FALSE THEN
+      Message.Error("Gparted was not found on this system. Please 
install gparted and try again")
+      RETURN
+    END IF
+
   FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
   SHELL "sudo /usr/sbin/gparted"
   WAIT 3

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Tue Jul 15 20:05:37 2008
@@ -202,7 +202,23 @@
       END IF
       STOP EVENT
     NEXT
-
+
+    ' set the variable to the global class
+      SELECT CASE LCase(LAST.text)
+        CASE "/"
+          ClsPartSel.sRoot = LCase(LAST.tag)
+        CASE "/home"
+          ClsPartSel.sHome = LCase(LAST.tag)
+        CASE "/usr"
+          ClsPartSel.sUsr = LCase(LAST.tag)
+        CASE "/opt"
+          ClsPartSel.sOpt = LCase(LAST.tag)
+        CASE "/tmp"
+          ClsPartSel.sTmp = LCase(LAST.tag)
+        CASE "/var"
+          ClsPartSel.sVar = LCase(LAST.tag)
+      END SELECT
+


   IF sText = "Not Used" THEN

Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module	(original)
+++ branches/iVL/MdlWinDrives.module	Tue Jul 15 20:05:37 2008
@@ -30,8 +30,8 @@
 DIM sSize AS String
 DIM lbwidth AS Integer

-x = FrmWinDrives.svWinDrives.Left + 4
-y = FrmWinDrives.svWinDrives.Top + 8
+x = 4
+y = 8


   ' now, do the WIN partitions
@@ -39,9 +39,9 @@
   ' THESE ARE ONLY NEEDED FOR FSTAB
   sDump1 = ""
     'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT32$\" | cut -f 1 -d \' \'" TO sDump1
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT32\" | cut -f 1 -d \' \'" TO sDump1
     File.Save(Temp("fat32"), Trim(sDump1))
-    sDump1 = ""
+     sDump1 = ""
    SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT$\" | cut -f 1 -d \' \'" TO sDump1
     File.Save(Temp("fat"), Trim(sDump1))
     sDump1 = ""
@@ -53,6 +53,7 @@
     File.Load(Temp("ntfs")) & gb.NewLine
     sDump1 = Trim(sDump1)

+    'Message.Info(sDump1)

     IF sDump1 <> "" THEN
     sDump1 = Trim(sDump1)
@@ -60,10 +61,10 @@
          ' create a new text label just to label the separation between 
windows and linux partitions
         tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "Separator"
           WITH tl
-            .Text = "<b>Windows Partitions</b>"
+            .Text = "<b>Windows Partitions Detected</b>"
             .Height = 27
             .Width = MdlObjSizer.get_object_width(.Text)
-            .x = x
+            .x = FrmWinDrives.svWinDrives.Width / 2 - (.Width / 2)
             .y = y
           END WITH

@@ -119,18 +120,21 @@
       ELSE ' only one win partition found

         sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
-        SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
+        'Message(sPart)
+        SHELL "sudo mkdir -p /mnt" &/ spart & " && sudo mount " & 
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
          SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") && 
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+        sSize = Trim(sSize)
+        'Message(sSize)



-        'y = y + tl.Height + 4
+        y = y + tl.Height + 4
         tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
           WITH tl
-            .Width = lbwidth
             .Text = sDump1 & " ( " & sSize & " )"
             .tag = sDump1
             .Height = 27
+            .Width = MdlObjSizer.get_object_width(.Text) * 1.5
             .x = FrmPartSel.tlPartRow.Left
             .y = y

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

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

Author: M0E.lnx
Date: Tue Jul 15 14:26:59 2008
New Revision: 42

Added:
   branches/iVL/FrmWinDrives.class
   branches/iVL/FrmWinDrives.form
   branches/iVL/MdlWinDrives.module
Modified:
   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/FrmSelISO.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/.project
   branches/iVL/ClsPartSel.class
   branches/iVL/FMain.class
   branches/iVL/FrmDiskPart.class
   branches/iVL/FrmLicense.class
   branches/iVL/FrmPartScheme.class
   branches/iVL/FrmPartScheme.form
   branches/iVL/FrmPartSel.class
   branches/iVL/FrmPartSel.form
   branches/iVL/FrmSelISO.class
   branches/iVL/MdlCore.module
   branches/iVL/MdlPartSel.module

Log:
Reworked navigation algorithm. This eliminates the need for 
separate "Next" buttons on child forms during the install.

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Tue Jul 15 14:26:59 2008
@@ -14,23 +14,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:176
+#: FMain.class:154
 msgid "Process Overview"
 msgstr ""

-#: FMain.class:189
+#: FMain.class:167
 msgid "Vector Linux Install"
 msgstr ""

-#: FMain.class:199
+#: FMain.class:177
 msgid "Next"
 msgstr ""

-#: FMain.class:205
+#: FMain.class:183
 msgid "Back"
 msgstr ""

-#: FMain.class:211
+#: FMain.class:189
 msgid "Exit"
 msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Tue Jul 15 14:26:59 2008
@@ -14,7 +14,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FrmDiskPart.class:96
+#: FrmDiskPart.class:100
 msgid "Disk Partitioning:"
 msgstr ""


Modified: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- branches/iVL/.lang/FrmLicense.pot	(original)
+++ branches/iVL/.lang/FrmLicense.pot	Tue Jul 15 14:26:59 2008
@@ -14,19 +14,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FrmLicense.class:100
+#: FrmLicense.class:99
 msgid "LICENSE AGREEMENT"
 msgstr ""

-#: FrmLicense.class:105
+#: FrmLicense.class:104
 msgid "TextArea1"
 msgstr ""

-#: FrmLicense.class:111
+#: FrmLicense.class:110
 msgid "Yes, I Agree to the License Agreement"
 msgstr ""

-#: FrmLicense.class:116
+#: FrmLicense.class:115
 msgid "No, I Do Not Agree"
 msgstr ""


Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Tue Jul 15 14:26:59 2008
@@ -14,23 +14,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FrmPartScheme.class:103
+#: FrmPartScheme.class:97
 msgid "Select your disk partition option"
 msgstr ""

-#: FrmPartScheme.class:108
+#: FrmPartScheme.class:102
 msgid "Use existing disk partitions"
 msgstr ""

-#: FrmPartScheme.class:113
+#: FrmPartScheme.class:107
 msgid "Modify my disk partitions to make room for new installation"
 msgstr ""

-#: FrmPartScheme.class:118
+#: FrmPartScheme.class:112
 msgid "TextLabel1"
-msgstr ""
-
-#: FrmPartScheme.class:123
-msgid "Next"
 msgstr ""


Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Tue Jul 15 14:26:59 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.class
 # Generated by Gambas compiler

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

-#: FrmPartSel.class:120
+#: FrmPartSel.class:139
  msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
 msgstr ""

-#: FrmPartSel.class:128
+#: FrmPartSel.class:147
 msgid "<b>Partition</b>"
 msgstr ""

-#: FrmPartSel.class:134
+#: FrmPartSel.class:153
 msgid "<b>Mount Point</b>"
 msgstr ""

-#: FrmPartSel.class:140
+#: FrmPartSel.class:159
 msgid "<b>File System</b>"
+msgstr ""
+
+#: FrmPartSel.class:166
+msgid "Check this box if you have a Windows installation on your 
system or any other windows partition (FAT, FAT32, NTFS) that you want 
auto-mounted as soon as your computer starts"
+msgstr ""
+
+#: FrmPartSel.class:167
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
 msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Tue Jul 15 14:26:59 2008
@@ -14,19 +14,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: FrmSelISO.class:188
+#: FrmSelISO.class:189
 msgid "No installable images found."
 msgstr ""

-#: FrmSelISO.class:194
+#: FrmSelISO.class:195
 msgid "Select which distribution to install from the list below"
 msgstr ""

-#: FrmSelISO.class:199
+#: FrmSelISO.class:200
 msgid "TextLabel1"
 msgstr ""

-#: FrmSelISO.class:204
+#: FrmSelISO.class:205
 msgid "Search Again"
 msgstr ""


Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot	(original)
+++ branches/iVL/.lang/MdlPartSel.pot	Tue Jul 15 14:26:59 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.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	Tue Jul 15 14:26:59 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Tue Jul 15 14:26:59 2008
@@ -1,6 +1,6 @@
 # Gambas Project File 2.0
 Title=VectorLinux Installer
-Startup=FrmPartSel
+Startup=MdlCore
 Version=0.0.1
 Library=gb.gtk
 Library=gb.form

Modified: branches/iVL/ClsPartSel.class
==============================================================================
--- branches/iVL/ClsPartSel.class	(original)
+++ branches/iVL/ClsPartSel.class	Tue Jul 15 14:26:59 2008
@@ -31,3 +31,5 @@
 STATIC PUBLIC fTmp AS String

 STATIC PUBLIC sSwap AS String
+
+STATIC PUBLIC bDoWin AS Boolean

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Jul 15 14:26:59 2008
@@ -20,6 +20,7 @@
 PUBLIC sNextKey AS String
 PUBLIC FrmCurr AS Form ' assigned when a form is opened
 PUBLIC frmLast AS Form ' assigned when a form is hidden
+PUBLIC frmNext AS Form ' assined next form for the "next" button in fmain"

 PUBLIC SUB _new()

@@ -82,23 +83,6 @@

 PUBLIC SUB tvPlan_Select()

-
-'tvPlan[sLast].Picture = MdlCore.sDonePic
-'
-'
-'
-' IF tvPlan.Current.Picture <> MdlCore.sCatPic THEN
-'
-'   IF sLast THEN
-'     tvPlan[sLast].Picture = MdlCore.sDonePic
-'   END IF
-'
-'   tvPlan.Current.Picture = MdlCore.sNowPic
-
-
-
-'END IF
-
 END

 PUBLIC SUB tvPlan_MouseUp()
@@ -118,37 +102,31 @@


 PUBLIC SUB btnext_Click()
-  DIM FrmNext AS Form
-  DIM sDev AS String
   DIM sISONAME AS String
+  DIM sDev AS String

-  'DIM FrmCurr AS Form
-
-  SELECT CASE ME.sNextKey
-    CASE "Prep0"
-        ' We'll need to mount the ISO or image and then display the form
+  SELECT CASE FrmCurr.Name ' very nice navigation algoritm
+    CASE "FrmSelISO"
          sDev = Right(FrmSelISO.lstInstallableImg.Text, 
Len(FrmSelISO.lstInstallableImg.Text) - 
InStr(FrmSelISO.lstInstallableImg.text, "/") + 1)
          IF InStr(FrmSelISO.lstInstallableImg.text, ".iso") OR 
InStr(FrmSelISO.lstInstallableImg.text, ".ISO") THEN
-          sISONAME = Left(FrmSelISO.lstInstallableImg.text, 
InStr(FrmSelISO.lstInstallableImg.text, " ") - 1)
-          MdlSetup.GO_WITH_SELECTED(sDev, sISONAME)
+           sISONAME = Left(FrmSelISO.lstInstallableImg.text, 
InStr(FrmSelISO.lstInstallableImg.text, " ") - 1)
+           MdlSetup.GO_WITH_SELECTED(sDev, sISONAME)
         ELSE
-
-        MdlSetup.GO_WITH_SELECTED(sDev, "")
+          MdlSetup.GO_WITH_SELECTED(sDev, "")
+        END IF
+    CASE "FrmPartSel"
+        IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
+        Message.Error("You must select a \"/\" partition. This is the 
target where the system will install to")
+          STOP EVENT
         END IF
-      FrmNext = FrmPartScheme
-      ME.tvPlan.Current.Picture = MdlCore.sDonePic
-      ME.tvPlan["Prep1"].Selected = TRUE
-      ME.tvPlan["Prep1"].Picture = MdlCore.sNowPic
-
-    CASE "Prep1"
-      FrmNext = FrmDiskPart
-      ME.tvPlan.Current.Picture = MdlCore.sDonePic
-      ME.tvPlan["Prep2"].Picture = MdlCore.sNowPic
-      ME.tvPlan["Prep2"].Selected = TRUE
   END SELECT
+
+

-  FrmNext.Reparent(FrmCurr.Parent)
+  frmNext.Reparent(ME.pnlWinHost)
   FrmCurr.Hide
-  FrmNext.Show
+  frmLast = FrmCurr
+  frmNext.Show
+

 END

Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class	(original)
+++ branches/iVL/FrmDiskPart.class	Tue Jul 15 14:26:59 2008
@@ -20,6 +20,10 @@


 PUBLIC SUB Form_Open()
+
+  FMain.FrmCurr = ME
+
+
   MdlDiskPart.EMBED_GPARTED()

   WITH ME

Modified: branches/iVL/FrmLicense.class
==============================================================================
--- branches/iVL/FrmLicense.class	(original)
+++ branches/iVL/FrmLicense.class	Tue Jul 15 14:26:59 2008
@@ -53,7 +53,6 @@
     .Reparent(.parent)
     .Resize(.Parent.Width, .Parent.Height)
      .taLicense.Move(.tlbanner.Left, .tlbanner.top + .tlbanner.Height + 
4, .ClientWidth - 20, .ClientHeight - .tlbanner.Height - (.rbNo.Height 
* 4))
-    '.taLicense.Resize(.ClientWidth - (.ClientWidth / 
20), .ClientHeight - .tlbanner.Height - (.rbNo.Height * 4))
      .rbNo.Move(.taLicense.Left, .taLicense.Top + (.taLicense.Height + 
4), MdlObjSizer.get_object_width(.rbNo.Text) + 24)
      .rbYes.Move(.rbNo.Left, .rbNo.Top + (.rbNo.Height + 4), 
MdlObjSizer.get_object_width(.rbYes.Text) + 24)
   END WITH

Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class	(original)
+++ branches/iVL/FrmPartScheme.class	Tue Jul 15 14:26:59 2008
@@ -24,22 +24,25 @@
      .rbUseExisting.Move(.tlBanner.Left, .tlBanner.Top 
+ .tlBanner.Height + 8)
      .rbEditPartitions.Move(.rbUseExisting.Left, .rbUseExisting.Top 
+ .rbUseExisting.Height + 4)
      .tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top 
+ .rbEditPartitions.Height + 16, .tlBanner.Width - 10)
-    .btNext.Move(.tlBanner.Left + .tlBanner.Width - .btNext.Width - 
8, .ClientHeight - (.btNext.Height * 2))
+

   END WITH

 END

 PUBLIC SUB Form_Open()
-
+
+FMain.FrmCurr = ME
+FMain.tvPlan["Prep1"].Selected = TRUE
+FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+'FMain.frmNext = FrmPartSel
   WITH ME
      .rbEditPartitions.Width = 
MdlObjSizer.get_object_width(.rbEditPartitions.Text) + 24
      .rbUseExisting.Width = 
MdlObjSizer.get_object_width(.rbUseExisting.Text) + 24
-    .btNext.Width = MdlObjSizer.get_object_width(.btNext.Text) + 36
   END WITH
   ME.rbEditPartitions.Value = TRUE
-FMain.btnext.Enabled = FALSE
-FMain.btnext.ForeColor = Color.Gray
+
 END

 PUBLIC SUB rbUseExisting_Click()
@@ -48,6 +51,7 @@
    "Select this option if you already have a linux installation that 
you wish to overwrite or if a linux partition scheme exists in your " &
    "Hard disk. <b>This option will overwrite whatever is in those 
partitions</b><br><br>" &
    "<i>Use this option if you already prepared your partitions using 
the VectorLinux installer</i>"
+  FMain.frmNext = FrmPartSel

 END

@@ -56,6 +60,7 @@
   ME.tlChoiceExp.Text = "<b>" & rbEditPartitions.Text & "</b><br><br>" &
    "Select this option is you wish to create, more or resize partitions 
in order to make room for your new VectorLinux " &
    "installation. This option is the safest choice if you have other 
existing installations that you wish to keep."
+  FMain.frmNext = FrmDiskPart

 END

@@ -65,19 +70,9 @@

 END

-PUBLIC SUB btNext_Click()

-  IF ME.rbEditPartitions.Value = TRUE THEN
-    ' fire up the gparted window
-  FrmDiskPart.Reparent(ME.Parent)
-  ME.Hide
-  FrmDiskPart.Show
-  ELSE IF ME.rbUseExisting.Value THEN
-    ' Fire wizard to set partitions
-    ' This will also be used after the user has already partitioned 
the disk
-    FrmPartSel.Reparent(ME.Parent)
-    ME.Hide
-    FrmPartSel.Show
-  END IF
+PUBLIC SUB Form_Hide()
+
+

 END

Modified: branches/iVL/FrmPartScheme.form
==============================================================================
--- branches/iVL/FrmPartScheme.form	(original)
+++ branches/iVL/FrmPartScheme.form	Tue Jul 15 14:26:59 2008
@@ -19,9 +19,4 @@
     MoveScaled(1,17,76,23)
     Text = ("TextLabel1")
   }
-  { btNext Button
-    MoveScaled(70,44,9,3)
-    Text = ("Next")
-    Picture = Picture["icon:/16/right"]
-  }
 }

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Tue Jul 15 14:26:59 2008
@@ -36,8 +36,10 @@

   WITH ME
     .tlBanner.Width = .ClientWidth - 16
-
-
+    .scrollPartitions.Width = .tlBanner.Width
+    .scrollPartitions.Height = .ClientHeight - (.tlBanner.Height 
+ .cbDoWin.Height + 32)
+    .cbDoWin.Move(.scrollPartitions.Left, .ClientHeight 
- .cbDoWin.Height - 8)
+

   END WITH

@@ -45,31 +47,34 @@

 PUBLIC SUB Form_Open()

+
+  FMain.FrmCurr = ME
+
   ME.tlBanner.Adjust
-
+  ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
   MdlPartSel.DISPLAY_PARTITION_OPTIONS
-
+  ME.cbDoWin.Value = FALSE


 END

 PUBLIC SUB Form_Hide()
-
-  ME.ANALYZE_PARTITION_SETUP()
+

 END

-PUBLIC SUB ANALYZE_PARTITION_SETUP()
+PUBLIC FUNCTION ANALYZE_PARTITION_SETUP() AS Integer

   IF NOT sRootAddr THEN
      Message.Error("You must select at least one partition for \"/\" 
This is there the system will be installed to")
-    STOP EVENT
+    RETURN 1
   ELSE IF NOT sRootFrmt THEN
      Message.Error("You must select which file system type to use with 
your \"/\" partition.")
-    STOP EVENT
+    RETURN 1
   ELSE
     ClsPartSel.sRoot = sRootAddr
     ClsPartSel.fRoot = sRootFrmt
+    RETURN 0
   END IF

   IF sHomeAddr THEN
@@ -97,4 +102,17 @@

 END

+
+
+PUBLIC SUB cbDoWin_Click()
+
+  ClsPartSel.bDoWin = cbDoWin.Value
+    IF ClsPartSel.bDoWin = TRUE THEN
+      FMain.frmNext = FrmWinDrives
+    ELSE
+      ' Move towards installing packages
+    END IF
+
+
+END


Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form	(original)
+++ branches/iVL/FrmPartSel.form	Tue Jul 15 14:26:59 2008
@@ -8,7 +8,7 @@
      Text = ("Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install")
   }
   { scrollPartitions ScrollView
-    MoveScaled(1,16,69,36)
+    MoveScaled(1,16,69,33)
     { tlPartRow TextLabel
       MoveScaled(1,1,14,3)
       Text = ("<b>Partition</b>")
@@ -24,5 +24,10 @@
       Text = ("<b>File System</b>")
       Alignment = Align.Left
     }
+  }
+  { cbDoWin CheckBox
+    MoveScaled(1,50,57,3)
+    ToolTip = ("Check this box if you have a Windows installation on 
your system or any other windows partition (FAT, FAT32, NTFS) that you 
want auto-mounted as soon as your computer starts")
+    Text = ("Detect and Setup Windows partitions for auto-mounting at boot")
   }
 }

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Tue Jul 15 14:26:59 2008
@@ -52,6 +52,7 @@
   ME.Height = ME.Parent.Height
   FMain.sNextKey = "Prep0"
   FMain.FrmCurr = ME
+  FMain.frmNext = FrmPartScheme




Added: branches/iVL/FrmWinDrives.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmWinDrives.class	Tue Jul 15 14:26:59 2008
@@ -0,0 +1,23 @@
+' 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()
+
+  MdlWinDrives.LIST_WIN_PARTITIONS
+
+END

Added: branches/iVL/FrmWinDrives.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmWinDrives.form	Tue Jul 15 14:26:59 2008
@@ -0,0 +1,13 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,67,56)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,2,65,5)
+    Text = ("Select the windows partitions you would like to mount 
during boot")
+  }
+  { svWinDrives ScrollView
+    MoveScaled(1,8,64,39)
+  }
+}

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Tue Jul 15 14:26:59 2008
@@ -329,14 +329,7 @@
       "/home " & iMinHome & "<br>" &
       "swap " & iMinSwap
     END WITH
-      ' PRINT sDistro
-      ' PRINT sVer
-      ' PRINT sBuildDate
-      ' PRINT iMinHome
-      ' PRINT iMinRoot
-      ' PRINT iMinSwap
-      ' PRINT ClsGlobal.sBulkList
-      ' PRINT ClsGlobal.sConfPkg
+
   ELSE
     'File not found
      Message.Error("Setup is unable to find SETUP.CONF in your install 
media. This could be symptoms of a bad burn or a bad ISO")

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Tue Jul 15 14:26:59 2008
@@ -184,76 +184,7 @@

           'Message.Info("Swap total = " & iswapsize)
         END IF
-
-  ' now, do the WIN partitions
-  ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
-  ' THESE ARE ONLY NEEDED FOR FSTAB
-  sDump1 = ""
-    'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
-  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -i \" FAT\" |
 cut -f 1 -d \' \'" TO sDump1
-    IF sDump1 THEN
-    sDump1 = Trim(sDump1)
-    y = y + tl.Height * 2 + 4
-        ' create a new text label just to label the separation between 
windows and linux partitions
-        tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "Separator"
-          WITH tl
-            .Text = "<b>Windows Partitions</b>"
-            .Height = 27
-            .Width = MdlObjSizer.get_object_width(.Text)
-            .x = FrmPartSel.tlPartRow2.Left
-            .y = y
-          END WITH
-    END IF
-      IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
-        sPartList = Split(sDump1, gb.NewLine)
-          FOR i = 0 TO sPartList.Count - 1
-            sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
-
-                SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
-                    ' get the size using df -h | grep sPart and some sed
-                    ' will embed some bash, but should probabbly be fixed
-                SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
-                SHELL "sudo umount /mnt" &/ spart
-                SHELL "sudo rm -rf /mnt" &/ spart
-
-              tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "WinPartitions"
-                WITH tl
-                  .Width = tl.Width
-                  .Text = sPart & " ( " & sSize & " )"
-                  .Tag = sPartList[i]
-                  .Height = 27
-                  .x = FrmPartSel.tlPartRow.Left
-                  .y = y
-                END WITH
-                y = y + tl.Height + 4
-
-          NEXT
-      ELSE ' only one win partition found
-
-        sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
-        SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
-        SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") && 
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
-
-
-
-        y = y + tl.Height + 4
-        tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "WinPartitions"
-          WITH tl
-            .Width = lbwidth
-            .Text = sDump1 & " ( " & sSize & " )"
-            .tag = sDump1
-            .Height = 27
-            .x = FrmPartSel.tlPartRow.Left
-            .y = y
-
-          END WITH
-          SHELL "sudo umount /mnt" &/ spart WAIT
-        SHELL "sudo rm -rf /mnt" &/ spart WAIT
-  END IF
-
-
-
-
+

 END

@@ -323,7 +254,7 @@
       NEXT
     END IF

-  PRINT "format " & LAST.tag & " as " & LAST.text
+  'PRINT "format " & LAST.tag & " as " & LAST.text

   ME.SET_PARTITION_FORMAT(LAST.tag, LAST.text)


Added: branches/iVL/MdlWinDrives.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlWinDrives.module	Tue Jul 15 14:26:59 2008
@@ -0,0 +1,155 @@
+' Gambas module 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 vObj AS Object[]
+PUBLIC SUB LIST_WIN_PARTITIONS()
+DIM tl AS TextLabel
+DIM cb AS ComboBox
+DIM y AS Integer
+DIM x AS Integer
+DIM i AS Integer
+DIM sDump1 AS String
+DIM sPartList AS String[]
+DIM sPart AS String
+DIM sSize AS String
+DIM lbwidth AS Integer
+
+x = FrmWinDrives.svWinDrives.Left + 4
+y = FrmWinDrives.svWinDrives.Top + 8
+
+
+  ' now, do the WIN partitions
+  ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
+  ' THESE ARE ONLY NEEDED FOR FSTAB
+  sDump1 = ""
+    'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT32$\" | cut -f 1 -d \' \'" TO sDump1
+    File.Save(Temp("fat32"), Trim(sDump1))
+    sDump1 = ""
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*FAT$\" | cut -f 1 -d \' \'" TO sDump1
+    File.Save(Temp("fat"), Trim(sDump1))
+    sDump1 = ""
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
*NTFS$\" | cut -f 1 -d \' \'" TO sDump1
+    File.Save(Temp("ntfs"), Trim(sDump1))
+    sDump1 = ""
+    sDump1 = File.Load(Temp("fat32")) & gb.NewLine &
+    File.Load(Temp("fat")) & gb.NewLine &
+    File.Load(Temp("ntfs")) & gb.NewLine
+    sDump1 = Trim(sDump1)
+
+
+    IF sDump1 <> "" THEN
+    sDump1 = Trim(sDump1)
+    'y = y + tl.Height * 2 + 4
+        ' create a new text label just to label the separation between 
windows and linux partitions
+        tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "Separator"
+          WITH tl
+            .Text = "<b>Windows Partitions</b>"
+            .Height = 27
+            .Width = MdlObjSizer.get_object_width(.Text)
+            .x = x
+            .y = y
+          END WITH
+
+    'END IF
+      IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
+        sPartList = Split(sDump1, gb.NewLine)
+          FOR i = 0 TO sPartList.Count - 1
+            sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
+
+                SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
+                    ' get the size using df -h | grep sPart and some sed
+                    ' will embed some bash, but should probabbly be fixed
+                SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+                SHELL "sudo umount /mnt" &/ spart
+                SHELL "sudo rm -rf /mnt" &/ spart
+
+              tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
+                WITH tl
+                  .Width = tl.Width
+                  .Text = sPart & " ( " & sSize & " )"
+                  .Tag = sPartList[i]
+                  .Height = 27
+                  .x = FrmPartSel.tlPartRow.Left
+                  .y = y
+                    IF .Width > lbwidth THEN
+                    lbwidth = .Width
+                    END IF
+                  .Width = lbwidth
+                END WITH
+                ME.vObj.Add(tl)
+
+                ' now create the combobox to select the mount point
+                  cb = NEW ComboBox
+                    WITH cb
+                      .Width = tl.Width
+                      .Tag = sPartList[i]
+                      .Height = 27
+                      .x = tl.Left + tl.Width + 8
+                      .y = tl.Top
+                      .Width = lbwidth
+                      .Add("/mnt" &/ sPart)
+                    END WITH
+
+                y = y + tl.Height + 4
+
+
+
+          NEXT
+
+
+
+
+      ELSE ' only one win partition found
+
+        sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
+        SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
+        SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") && 
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+
+
+
+        'y = y + tl.Height + 4
+        tl = NEW TextLabel(FrmWinDrives.svWinDrives) AS "WinPartitions"
+          WITH tl
+            .Width = lbwidth
+            .Text = sDump1 & " ( " & sSize & " )"
+            .tag = sDump1
+            .Height = 27
+            .x = FrmPartSel.tlPartRow.Left
+            .y = y
+
+          END WITH
+          SHELL "sudo umount /mnt" &/ spart WAIT
+        SHELL "sudo rm -rf /mnt" &/ spart WAIT
+  END IF
+ ELSE
+  ' no widnows partitions found
+    tl = NEW TextLabel(FrmWinDrives.svWinDrives)
+      WITH tl
+        .Text = "<b>No Windows partitions detected</b>"
+        .Width = MdlObjSizer.get_object_width(.Text)
+        .Height = 27
+        .x = y
+        .y = y
+      END WITH
+ END IF
+END
+
+
+

[Vectorlinux-devel] [vinstall-ng commit] r41 - branches/iVL

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

Author: M0E.lnx
Date: Mon Jul 14 22:41:58 2008
New Revision: 41

Modified:
   branches/iVL/ClsPartSel.class
   branches/iVL/MdlPartSel.module

Log:
Added Lisence to ClsPartSel.class

Modified: branches/iVL/ClsPartSel.class
==============================================================================
--- branches/iVL/ClsPartSel.class	(original)
+++ branches/iVL/ClsPartSel.class	Mon Jul 14 22:41:58 2008
@@ -1,5 +1,22 @@
 ' 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/>.
+
+
 STATIC PUBLIC sRoot AS String
 STATIC PUBLIC fRoot AS String
 STATIC PUBLIC sHome AS String

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Mon Jul 14 22:41:58 2008
@@ -1,6 +1,5 @@
 ' Gambas module file

-' Gambas module file

 '    This file is part of vinstall-ng

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

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

Author: M0E.lnx
Date: Mon Jul 14 22:39:55 2008
New Revision: 40

Modified:
   branches/iVL/.lang/FrmPartSel.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/FrmPartSel.class
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlSetup.module

Log:
Added Win partition detection. TODO: Move win partition listing to 
another screen, away from the *needed* partition listing

Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot	(original)
+++ branches/iVL/.lang/FrmPartSel.pot	Mon Jul 14 22:39:55 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/new-inst/FrmPartSel.class
 # 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	Mon Jul 14 22:39:55 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/new-inst/MdlPartSel.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	Mon Jul 14 22:39:55 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/new-inst/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Mon Jul 14 22:39:55 2008
@@ -55,7 +55,7 @@

 PUBLIC SUB Form_Hide()

-
+  ME.ANALYZE_PARTITION_SETUP()

 END


Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Mon Jul 14 22:39:55 2008
@@ -167,6 +167,7 @@
                   ClsPartSel.sSwap = sPart

                 END WITH
+
               ' now create a combobox with the swap-only option
                 cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "swapsel"
                   WITH cb
@@ -185,6 +186,72 @@
           'Message.Info("Swap total = " & iswapsize)
         END IF

+  ' now, do the WIN partitions
+  ' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
+  ' THESE ARE ONLY NEEDED FOR FSTAB
+  sDump1 = ""
+    'FIX THIS COMMAND.... MAY NOT WORK OR NEED MORE ACCURATE DETECTION
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -i \" FAT\" |
 cut -f 1 -d \' \'" TO sDump1
+    IF sDump1 THEN
+    sDump1 = Trim(sDump1)
+    y = y + tl.Height * 2 + 4
+        ' create a new text label just to label the separation between 
windows and linux partitions
+        tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "Separator"
+          WITH tl
+            .Text = "<b>Windows Partitions</b>"
+            .Height = 27
+            .Width = MdlObjSizer.get_object_width(.Text)
+            .x = FrmPartSel.tlPartRow2.Left
+            .y = y
+          END WITH
+    END IF
+      IF InStr(sDump1, gb.NewLine) THEN ' more than one partition found
+        sPartList = Split(sDump1, gb.NewLine)
+          FOR i = 0 TO sPartList.Count - 1
+            sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
+
+                SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sPartList[i]) & Space(1) & "/mnt" &/ sPart WAIT
+                    ' get the size using df -h | grep sPart and some sed
+                    ' will embed some bash, but should probabbly be fixed
+                SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+                SHELL "sudo umount /mnt" &/ spart
+                SHELL "sudo rm -rf /mnt" &/ spart
+
+              tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "WinPartitions"
+                WITH tl
+                  .Width = tl.Width
+                  .Text = sPart & " ( " & sSize & " )"
+                  .Tag = sPartList[i]
+                  .Height = 27
+                  .x = FrmPartSel.tlPartRow.Left
+                  .y = y
+                END WITH
+                y = y + tl.Height + 4
+
+          NEXT
+      ELSE ' only one win partition found
+
+        sPart = Right(sDump1, Len(sDump1) - RInStr(sDump1, "/"))
+        SHELL "sudo mkdir /mnt" &/ spart & " && sudo mount " & 
Trim(sDump1) & Space(1) & "/mnt" &/ sPart WAIT
+        SHELL "export " & sPart & "=$(df -h | grep " & sPart & ") && 
echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+
+
+
+        y = y + tl.Height + 4
+        tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "WinPartitions"
+          WITH tl
+            .Width = lbwidth
+            .Text = sDump1 & " ( " & sSize & " )"
+            .tag = sDump1
+            .Height = 27
+            .x = FrmPartSel.tlPartRow.Left
+            .y = y
+
+          END WITH
+          SHELL "sudo umount /mnt" &/ spart WAIT
+        SHELL "sudo rm -rf /mnt" &/ spart WAIT
+  END IF
+




Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Mon Jul 14 22:39:55 2008
@@ -79,25 +79,14 @@


     SHELL "mkfs." & LCase(ClsPartSel.fRoot) & " || echo \'ERROR\'" TO sDump
-      ' IF hproc.State = Process.Running THEN
-      '   REPEAT
-      '     WAIT
-      '   UNTIL
-      '     hproc.state = Process.Stopped
-      '       ' do the error checking
-      ' END IF
+
             GOTO CHECK_OUTPUT


  IF ClsPartSel.sHome AND ClsPartSel.fhome <> "Do not format" THEN
   sDump = ""
   SHELL "mkfs." & LCase(ClsPartSel.fhome) & " || echo \'ERROR\'" TO sDump
-    ' IF hproc.State = Process.Running THEN
-    '   REPEAT
-    '     WAIT
-    '   UNTIL
-    '     hproc.state = Process.Stopped
-    ' END IF
+
     GOTO CHECK_OUTPUT
   END IF

@@ -106,49 +95,28 @@
  IF ClsPartSel.sOpt AND ClsPartSel.fOpt <> "Do not format" THEN
  sDump = ""
   SHELL "mkfs." & LCase(ClsPartSel.fOpt) & " || echo \'ERROR\'" TO sDump
-    ' IF hproc.State = Process.Running THEN
-    '   REPEAT
-    '     WAIT
-    '   UNTIL
-    '     hproc.state = Process.Stopped
-    ' END IF
-
+
         GOTO CHECK_OUTPUT
  END IF

  IF ClsPartSel.sUsr AND ClsPartSel.fUsr <> "Do not format" THEN
   sDump = ""
   SHELL "mkfs." & LCase(ClsPartSel.fUsr) & " || echo \'ERROR\'" TO sDump
-    ' IF hproc.State = Process.Running THEN
-    '   REPEAT
-    '     WAIT
-    '   UNTIL
-    '   hproc.State = Process.Stopped
-    ' END IF
+
       GOTO CHECK_OUTPUT
  END IF

  IF ClsPartSel.sVar AND ClsPartSel.fVar <> "Do not format" THEN
   sDump = ""
   SHELL "mkfs." & LCase(ClsPartSel.fVar) & " || echo \'ERROR\'" TO sDump
-    ' IF hproc.State = Process.Running THEN
-    '   REPEAT
-    '     WAIT
-    '   UNTIL
-    '     hproc.State = Process.Stopped
-    ' END IF
+
     GOTO CHECK_OUTPUT
   END IF

   IF ClsPartSel.sTmp AND ClsPartSel.fTmp <> "Do not format" THEN
     sDump = ""
         SHELL "mkfs." & LCase(ClsPartSel.fTmp) & " || echo \'FAILED\'" 
TO sDump
-        ' IF hproc.state = Process.Running THEN
-        '   REPEAT
-        '     WAIT
-        '   UNTIL
-        '     hproc.state = Process.Stopped
-        ' END IF
+
           GOTO CHECK_OUTPUT
   END IF

@@ -168,7 +136,7 @@

   ' this is where we need to set the mount target
   ClsGlobal.sTargetMnt = "/mnt/target"
-    IF Exist(ClsGlobal.sTargetMnt)FALSE THEN
+    IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
       TRY MKDIR ClsGlobal.sTargetMnt
     END IF

@@ -210,9 +178,6 @@

 END

-
-
-


 PUBLIC FUNCTION WRITE_NEW_FSTAB()
@@ -258,13 +223,10 @@
 END IF

 sFstab = sFstab & "\n\n" &
-"# Shared Windows/Linux partition"
+"# Shared Windows/Linux partition" &
 "#/dev/hda1   /mnt/dos  msdos  umask=0   0  0 \n" &
  "#/dev/hda1   /mnt/win  vfat   
fmask=111,dmask=0,quiet,shortname=mixed,user  0  0 \n" &
 "#/dev/hda1   /mnt/win  ntfs   umask=0   0  0\n" &
-' Add any windows partitions to the fstab file
-' fix me here please
-
 "# Floppy disks \n" &
  "# The 'noauto' option indicates that the file system should not be 
mounted \n" &
  "# with 'mount -a' 'user' indicates that normal users are allowed to 
mount \n" &
@@ -274,9 +236,9 @@
  "# If you have a ls-120 floppy drive, it could be on /dev/hda b c d 
etc.\n" &
 "#/dev/hdd  /mnt/ls120  auto  defaults,noauto,user  0 0 \n\n" &
 "# CDROM, CDWRITER, DVD \n" &
-"/dev/cdrom    /mnt/cdrom  iso9660  defaults,noauto,ro,user  0 0 \n" &
-"#/dev/cdwriter /mnt/cdwriter  iso9660  defaults,noauto,rw,user  0 0 
\n" &
-"#/dev/dvd      /mnt/dvd   auto  defaults,noauto,ro,user  0 0\n\n" &
+"/dev/cdrom    /media/cdrom  iso9660  defaults,noauto,ro,user  0 0 \n" &
+"#/dev/cdwriter /media/cdwriter  iso9660  defaults,noauto,rw,user  0 0 
\n" &
+"#/dev/dvd      /media/dvd   auto  defaults,noauto,ro,user  0 0\n\n" &
 "# NFS file systems:\n" &
 "#linux01.gwdg.de:/suse/6.3/i386.de  /mnt/nfs  nfs  defaults  0 0\n\n" &
 "# proc file system:\n" &
@@ -290,7 +252,6 @@
 "usbfs /proc/bus/usb usbfs rw,devmode=0666 0 0\n\n" &
 "# example of a VFAT USB pendrive\n" &
  "#/dev/sda1  /mnt/pendrive vfat   
fmask=111,dmask=0,noauto,user,quiet,shortname=mixed 0 0\n\n" &
-
 "# Swap partitions\n" &
 "# The 'sw' option means auto activating with 'swapon -a'.\n"
 IF ClsPartSel.sSwap THEN
@@ -311,14 +272,18 @@
 END
 PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String

-    SELECT CASE LCase(sFrmt)
+    DIM sMntOpts AS String
+
+    SELECT CASE LCase(sType)
       CASE "reiserfs"
         sMntOpts = "noatime"
       CASE "vfat"
         sMntOpts = "fmask=111,dmask=0,gid=users,shortname=mixed,quiet,user"
       CASE "ntfs"
         sMntOpts = "umask=0,gid=users,user"
-      CASE "ext2", "ext3", ELSE
+      CASE "ext2", "ext3"
+        sMntOpts = "defaults"
+      CASE ELSE
         sMntOpts = "defaults"
     END SELECT

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

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

Author: M0E.lnx
Date: Mon Jul 14 13:32:23 2008
New Revision: 39

Added:
   branches/iVL/ClsPartSel.class
Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/FrmPartSel.class
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlSetup.module

Log:
Moving towards partition selection module

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/.project
+# /home/moises/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/ClsGlobal.class
+# /home/moises/area-51/projects/installer/ClsGlobal.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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FMain.class
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmDiskPart.class
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmLicense.class
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmPartScheme.class
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmPartSel.class
+# /home/moises/area-51/projects/installer/FrmPartSel.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"

-#: FrmPartSel.class:61
+#: FrmPartSel.class:120
  msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
 msgstr ""

-#: FrmPartSel.class:69
+#: FrmPartSel.class:128
 msgid "<b>Partition</b>"
 msgstr ""

-#: FrmPartSel.class:75
+#: FrmPartSel.class:134
 msgid "<b>Mount Point</b>"
 msgstr ""

-#: FrmPartSel.class:81
+#: FrmPartSel.class:140
 msgid "<b>File System</b>"
 msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/FrmSelISO.class
+# /home/moises/area-51/projects/installer/FrmSelISO.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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlCore.module
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlDiskPart.module
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlObjSizer.module
+# /home/moises/area-51/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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlPartSel.module
+# /home/moises/area-51/projects/installer/MdlPartSel.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	Mon Jul 14 13:32:23 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/new-inst/MdlSetup.module
+# /home/moises/area-51/projects/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Added: branches/iVL/ClsPartSel.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsPartSel.class	Mon Jul 14 13:32:23 2008
@@ -0,0 +1,16 @@
+' Gambas class file
+
+STATIC PUBLIC sRoot AS String
+STATIC PUBLIC fRoot AS String
+STATIC PUBLIC sHome AS String
+STATIC PUBLIC fhome AS String
+STATIC PUBLIC sUsr AS String
+STATIC PUBLIC fUsr AS String
+STATIC PUBLIC sOpt AS String
+STATIC PUBLIC fOpt AS String
+STATIC PUBLIC sVar AS String
+STATIC PUBLIC fVar AS String
+STATIC PUBLIC sTmp AS String
+STATIC PUBLIC fTmp AS String
+
+STATIC PUBLIC sSwap AS String

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Mon Jul 14 13:32:23 2008
@@ -52,3 +52,49 @@


 END
+
+PUBLIC SUB Form_Hide()
+
+
+
+END
+
+PUBLIC SUB ANALYZE_PARTITION_SETUP()
+
+  IF NOT sRootAddr THEN
+    Message.Error("You must select at least one partition for \"/\" 
This is there the system will be installed to")
+    STOP EVENT
+  ELSE IF NOT sRootFrmt THEN
+    Message.Error("You must select which file system type to use with 
your \"/\" partition.")
+    STOP EVENT
+  ELSE
+    ClsPartSel.sRoot = sRootAddr
+    ClsPartSel.fRoot = sRootFrmt
+  END IF
+
+  IF sHomeAddr THEN
+    ClsPartSel.sHome = sHomeAddr
+    ClsPartSel.fhome = sHomeFrmt
+  END IF
+  IF sUsrAddr THEN
+    ClsPartSel.sUsr = sUsrAddr
+    ClsPartSel.fUsr = sUsrFrmt
+  END IF
+  IF sOptAddr THEN
+    ClsPartSel.sOpt = sOptAddr
+    ClsPartSel.fOpt = sOptFrmt
+  END IF
+  IF sVarAddr THEN
+    ClsPartSel.sVar = sVarAddr
+    ClsPartSel.fVar = sVarFrmt
+  END IF
+  IF sTmpAddr THEN
+    ClsPartSel.sVar = sTmpAddr
+    ClsPartSel.fTmp = sTrmFrmt
+  END IF
+
+
+
+END
+
+

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Mon Jul 14 13:32:23 2008
@@ -164,6 +164,7 @@
                   .Height = 27
                   .tag = "SwapLbl"
                   .Alignment = Align.Normal
+                  ClsPartSel.sSwap = sPart

                 END WITH
               ' now create a combobox with the swap-only option
@@ -176,6 +177,7 @@
                     .tag = "swapSelection"
                     .ReadOnly = TRUE
                     .Add("Swap")
+
                   END WITH


@@ -226,10 +228,18 @@
     FOR EACH sdropdwn IN oFsTypes
       IF sdropdwn.tag = LAST.tag THEN
         sdropdwn.Text = "XFS"
+      'Balloon.Info("Select which filesystem to use with this 
partition", sdropdwn)
+      Balloon("Select which filesystem to use with this partition", sdropdwn)
+
       END IF
     NEXT
   END IF

+  'send the value to the form public value
+  ME.SET_SELECTED_PARTITION(LAST.tag, LAST.text)
+
+
+
 END

 PUBLIC SUB fsTypes_click()
@@ -246,6 +256,50 @@
         END IF
       NEXT
     END IF
+
+  PRINT "format " & LAST.tag & " as " & LAST.text
+
+  ME.SET_PARTITION_FORMAT(LAST.tag, LAST.text)
+
+
+END
+
+PUBLIC SUB SET_SELECTED_PARTITION(SPartition AS String, sMountPoint AS String)
+
+  SELECT CASE sMountPoint
+    CASE "/"
+      FrmPartSel.sRootAddr = SPartition
+    CASE "/home"
+      FrmPartSel.sHomeAddr = SPartition
+    CASE "/opt"
+      FrmPartSel.sOptAddr = SPartition
+    CASE "/usr"
+      FrmPartSel.sUsrAddr = SPartition
+    CASE "/var"
+      FrmPartSel.sVarAddr = SPartition
+    CASE "/tmp"
+      FrmPartSel.sTmpAddr = SPartition
+  END SELECT
+
+END
+
+PUBLIC SUB SET_PARTITION_FORMAT(sMountPoint AS String, sFormat AS String)
+
+    SELECT CASE sMountPoint
+      CASE "/"
+        FrmPartSel.sRootFrmt = sFormat
+      CASE "/home"
+        FrmPartSel.sHomeFrmt = sFormat
+      CASE "/opt"
+        FrmPartSel.sOptFrmt = sFormat
+      CASE "/usr"
+        FrmPartSel.sUsrFrmt = sFormat
+      CASE "/var"
+        FrmPartSel.sVarFrmt = sFormat
+      CASE "/tmp"
+        FrmPartSel.sTrmFrmt = sFormat
+    END SELECT
+

 END


Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Mon Jul 14 13:32:23 2008
@@ -67,9 +67,265 @@
   RETURN FALSE ' no reboot needed
  END IF

+
+END
+
+PUBLIC FUNCTION FORMAT_SELECTED_PARTITIONS() AS Integer
+
+  'DIM hproc AS Process
+  DIM sDump AS String
+
+
+
+
+    SHELL "mkfs." & LCase(ClsPartSel.fRoot) & " || echo \'ERROR\'" TO sDump
+      ' IF hproc.State = Process.Running THEN
+      '   REPEAT
+      '     WAIT
+      '   UNTIL
+      '     hproc.state = Process.Stopped
+      '       ' do the error checking
+      ' END IF
+            GOTO CHECK_OUTPUT
+
+
+ IF ClsPartSel.sHome AND ClsPartSel.fhome <> "Do not format" THEN
+  sDump = ""
+  SHELL "mkfs." & LCase(ClsPartSel.fhome) & " || echo \'ERROR\'" TO sDump
+    ' IF hproc.State = Process.Running THEN
+    '   REPEAT
+    '     WAIT
+    '   UNTIL
+    '     hproc.state = Process.Stopped
+    ' END IF
+    GOTO CHECK_OUTPUT
+  END IF
+
+
+
+ IF ClsPartSel.sOpt AND ClsPartSel.fOpt <> "Do not format" THEN
+ sDump = ""
+  SHELL "mkfs." & LCase(ClsPartSel.fOpt) & " || echo \'ERROR\'" TO sDump
+    ' IF hproc.State = Process.Running THEN
+    '   REPEAT
+    '     WAIT
+    '   UNTIL
+    '     hproc.state = Process.Stopped
+    ' END IF
+
+        GOTO CHECK_OUTPUT
+ END IF
+
+ IF ClsPartSel.sUsr AND ClsPartSel.fUsr <> "Do not format" THEN
+  sDump = ""
+  SHELL "mkfs." & LCase(ClsPartSel.fUsr) & " || echo \'ERROR\'" TO sDump
+    ' IF hproc.State = Process.Running THEN
+    '   REPEAT
+    '     WAIT
+    '   UNTIL
+    '   hproc.State = Process.Stopped
+    ' END IF
+      GOTO CHECK_OUTPUT
+ END IF
+
+ IF ClsPartSel.sVar AND ClsPartSel.fVar <> "Do not format" THEN
+  sDump = ""
+  SHELL "mkfs." & LCase(ClsPartSel.fVar) & " || echo \'ERROR\'" TO sDump
+    ' IF hproc.State = Process.Running THEN
+    '   REPEAT
+    '     WAIT
+    '   UNTIL
+    '     hproc.State = Process.Stopped
+    ' END IF
+    GOTO CHECK_OUTPUT
+  END IF
+
+  IF ClsPartSel.sTmp AND ClsPartSel.fTmp <> "Do not format" THEN
+    sDump = ""
+       SHELL "mkfs." & LCase(ClsPartSel.fTmp) & " || echo \'FAILED\'" 
TO sDump
+        ' IF hproc.state = Process.Running THEN
+        '   REPEAT
+        '     WAIT
+        '   UNTIL
+        '     hproc.state = Process.Stopped
+        ' END IF
+          GOTO CHECK_OUTPUT
+  END IF
+
+
+
+CHECK_OUTPUT:
+ IF InStr(sDump, "ERROR") = TRUE THEN
+                RETURN 1 ' not good... stop right there
+              ELSE
+                RETURN 0
+              END IF
+
+END
+
+
+PUBLIC SUB MOUNT_DEFINED_PARTITIONS()
+
+  ' this is where we need to set the mount target
+  ClsGlobal.sTargetMnt = "/mnt/target"
+    IF Exist(ClsGlobal.sTargetMnt)FALSE THEN
+      TRY MKDIR ClsGlobal.sTargetMnt
+    END IF
+
+    SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
+
+    SHELL "mount " & ClsPartSel.sRoot & Space(1) & 
ClsGlobal.sTargetMnt & Space(1) & " -t " & ClsPartSel.fRoot WAIT  'moun 
the root partition first
+    IF ClsPartSel.sHome THEN
+        SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "home" WAIT
+      SHELL "mount " & ClsPartSel.sHome & Space(1) & 
ClsGlobal.sTargetMnt &/ "home -t " & ClsPartSel.fhome WAIT 'mount the 
home partition if defined
+
+    END IF
+    IF ClsPartSel.sUsr THEN
+      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "usr" WAIT
+      SHELL "mount " & ClsPartSel.sUsr & Space(1) & 
ClsGlobal.sTargetMnt &/ "usr -t" & ClsPartSel.fUsr WAIT ' mount the 
user partition
+    END IF
+    IF ClsPartSel.sOpt THEN
+      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "opt" WAIT
+      SHELL "mount " & ClsPartSel.sOpt & Space(1) & 
ClsGlobal.sTargetMnt &/ "opt -t " & ClsPartSel.fOpt WAIT 'mount the opt partitiong
+    END IF
+    IF ClsPartSel.sVar THEN
+      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var" WAIT
+      SHELL "mount " & ClsPartSel.sVar & Space(1) & 
ClsGlobal.sTargetMnt &/ "var -t " & ClsPartSel.fVar WAIT
+    END IF
+    IF ClsPartSel.sTmp THEN
+      SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+      SHELL "mount " & ClsPartSel.sTmp & Space(1) & 
ClsGlobal.sTargetMnt &/ "tmp -t " & ClsPartSel.fTmp WAIT
+    END IF
+
+    ' see if there is a swap partition and use it
+      IF ClsPartSel.sSwap THEN
+        SHELL "swapon -a " WAIT
+      END IF
+
+    'WRITE THE NEW FSTAB NOW, RIGHT BEFORE INSTALLING PACKAGES.
+
+    ME.WRITE_NEW_FSTAB()
+
+
+
+END
+
+
+
+
+
+
+PUBLIC FUNCTION WRITE_NEW_FSTAB()
+
+  DIM sEntry AS String
+  DIM sPartition AS String
+  DIM sMountPoint AS String
+  DIM sMntOpts AS String
+
+  DIM sFstab AS String
+
+  sFstab = "# /etc/fstab: static file system information.\n" &
+  "#\n" &
+"#The following is an example.Please see fstab(5) for further 
details.\n" &
+"#Please refer to mount(1) for a complete description OF mount 
options.\n" &
+"#\n" &
+"#Format:\n" &
+"# < file system > < mount point > < type > < options > < dump > < 
pass >\n" &
+"#\n" &
+"#dump(8)uses the < dump > field to determine which file systems need 
\n" &
+"# to be dumped.fsck(8)uses the < pass > column TO determine which 
file \n" &
+"#systems need TO be checked - - the root file system should have a 1 
in \n" &
+"#this field, other file systems a 2, AND any file systems that should 
\n" &
+"#not be checked(such AS MS - initrd / mnt OR NFS file systems)a 
0.\n\n\n" &
+"#The Linux partitions\n"
+
+sFstab = sFstab & gb.NewLine &
+ClsPartSel.sRoot & " / " & LCase(ClsPartSel.fRoot) & " " & 
ME.fS_oPTIONS(LCase(ClsPartSel.fRoot)) & " 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
+
+sFstab = sFstab & "\n\n" &
+"# Shared Windows/Linux partition"
+"#/dev/hda1   /mnt/dos  msdos  umask=0   0  0 \n" &
+"#/dev/hda1   /mnt/win  vfat   
fmask=111,dmask=0,quiet,shortname=mixed,user  0  0 \n" &
+"#/dev/hda1   /mnt/win  ntfs   umask=0   0  0\n" &
+' Add any windows partitions to the fstab file
+' fix me here please
+
+"# Floppy disks \n" &
+"# The 'noauto' option indicates that the file system should not be 
mounted \n" &
+"# with 'mount -a' 'user' indicates that normal users are allowed to 
mount \n" &
+"# the file system. \n" &
+"/dev/fd0   /mnt/floppy  auto  defaults,noauto,user  0 0 \n" &
+"#/dev/fd1  /mnt/floppy  auto  defaults,noauto,user  0 0 \n\n" &
+"# If you have a ls-120 floppy drive, it could be on /dev/hda b c d 
etc.\n" &
+"#/dev/hdd  /mnt/ls120  auto  defaults,noauto,user  0 0 \n\n" &
+"# CDROM, CDWRITER, DVD \n" &
+"/dev/cdrom    /mnt/cdrom  iso9660  defaults,noauto,ro,user  0 0 \n" &
+"#/dev/cdwriter /mnt/cdwriter  iso9660  defaults,noauto,rw,user  0 0 
\n" &
+"#/dev/dvd      /mnt/dvd   auto  defaults,noauto,ro,user  0 0\n\n" &
+"# NFS file systems:\n" &
+"#linux01.gwdg.de:/suse/6.3/i386.de  /mnt/nfs  nfs  defaults  0 0\n\n" &
+"# proc file system:\n" &
+"proc  /proc  proc  defaults  0 0\n\n" &
+"# Unix98 devpts filesystem: \n" &
+"none  /dev/pts  devpts  gid=5,mode=666  0 0\n\n" &
+"# Shared memory filesystem: \n" &
+"tmpfs   /dev/shm    tmpfs defaults 0  0 \n\n" &
+"# Basic USB filesystem\n" &
+"sysfs  /sys  sysfs  defaults  0 0\n" &
+"usbfs /proc/bus/usb usbfs rw,devmode=0666 0 0\n\n" &
+"# example of a VFAT USB pendrive\n" &
+"#/dev/sda1  /mnt/pendrive vfat   
fmask=111,dmask=0,noauto,user,quiet,shortname=mixed 0 0\n\n" &
+
+"# Swap partitions\n" &
+"# The 'sw' option means auto activating with 'swapon -a'.\n"
+IF ClsPartSel.sSwap THEN
+  sFstab = sFstab & gb.NewLine &
+   ClsPartSel.sSwap & Space(5) & "none" & Space(5) & "swap" & Space(5) 
& "sw" & Space(5) & "0" & Space(5) & "0"
+END IF
+' Wheewww!... that's the whole fstab there... Please fix the win partitions
+
+
+
+
+
+
+
+
+
+
+END
+PUBLIC FUNCTION fS_oPTIONS(sType AS String) AS String

+    SELECT CASE LCase(sFrmt)
+      CASE "reiserfs"
+        sMntOpts = "noatime"
+      CASE "vfat"
+        sMntOpts = "fmask=111,dmask=0,gid=users,shortname=mixed,quiet,user"
+      CASE "ntfs"
+        sMntOpts = "umask=0,gid=users,user"
+      CASE "ext2", "ext3", ELSE
+        sMntOpts = "defaults"
+    END SELECT
+
+    RETURN sMntOpts


 END
+

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

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

Author: M0E.lnx
Date: Sun Jul 13 18:41:16 2008
New Revision: 38

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/FrmPartSel.class
   branches/iVL/MdlPartSel.module

Log:
More work in the partition selection virtual objects.

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Sun Jul 13 18:41:16 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/new-inst/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Sun Jul 13 18:41:16 2008
@@ -16,6 +16,19 @@
 '    along with vinstall-ng.  If not, see <http://www.gnu.org/licenses/>.


+PUBLIC sRootAddr AS String
+PUBLIC sRootFrmt AS String
+PUBLIC sHomeAddr AS String
+PUBLIC sHomeFrmt AS String
+PUBLIC sUsrAddr AS String
+PUBLIC sUsrFrmt AS String
+PUBLIC sVarAddr AS String
+PUBLIC sVarFrmt AS String
+PUBLIC sTmpAddr AS String
+PUBLIC sTrmFrmt AS String
+PUBLIC sOptAddr AS String
+PUBLIC sOptFrmt AS String
+




Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Sun Jul 13 18:41:16 2008
@@ -113,12 +113,14 @@
                   .y = y
                   .ReadOnly = TRUE
                   .Width = tl.Width
+                  .Add("Do not format")
                   .Add("XFS")
                   .Add("ReiserFS")
                   .Add("Ext2")
                   .Add("Ext3")
                   .Add("JFS")
-                  .Add("Do not format")
+
+
                   END WITH
                   oFsTypes.Add(cb)

@@ -192,10 +194,22 @@
   DIM sdropdwn AS ComboBox
   DIM sTag AS String = LAST.tag
   DIM sText AS String = Trim(LAST.text)
-
+
+    FOR EACH sdropdwn IN oMountPoints
+      IF LAST.text <> "Not Used" AND LAST.text = sdropdwn.Text AND 
LAST.tag <> sdropdwn.tag THEN
+        Message.Error("You have already select a " & LAST.text & " 
partition. Please " &
+        "select only one")
+        LAST.text = "Not Used"
+      END IF
+      STOP EVENT
+    NEXT
+
+
+
   IF sText = "Not Used" THEN
     FOR EACH sdropdwn IN oFsTypes
       IF sdropdwn.Tag = sTag THEN
+        sdropdwn.Text = "Do not format"
         sdropdwn.Enabled = FALSE
       ELSE
         sdropdwn.Enabled = TRUE
@@ -208,6 +222,13 @@
       END IF
     NEXT
   END IF
+  IF LAST.text <> "Not Used" THEN
+    FOR EACH sdropdwn IN oFsTypes
+      IF sdropdwn.tag = LAST.tag THEN
+        sdropdwn.Text = "XFS"
+      END IF
+    NEXT
+  END IF

 END

@@ -219,7 +240,9 @@
       FOR EACH cb IN oMountPoints
         IF cb.tag = LAST.tag AND cb.text = "/" THEN
            Message.Error("The / partition MUST be formatted no matter 
what. Please select a filesystem for this partition")
-          RETURN
+            'default it to xfs
+            LAST.text = "XFS"
+          STOP EVENT
         END IF
       NEXT
     END IF

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

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

Author: M0E.lnx
Date: Sat Jul 12 09:09:11 2008
New Revision: 37

Modified:
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/MdlPartSel.module

Log:
Updated tree

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/new-inst/ClsGlobal.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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/new-inst/FrmPartSel.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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/new-inst/FrmSelISO.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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlObjSizer.module
+# /home/vluser/area-51/projects/new-inst/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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/new-inst/MdlPartSel.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	Sat Jul 12 09:09:11 2008
@@ -1,4 +1,4 @@
-# /home/vluser/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/new-inst/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Sat Jul 12 09:09:11 2008
@@ -218,7 +218,7 @@
 IF LAST.text = "Do not format"
       FOR EACH cb IN oMountPoints
         IF cb.tag = LAST.tag AND cb.text = "/" THEN
-          Message.Error("The / partition MUST BE FORMATTED. No way 
around that")
+          Message.Error("The / partition MUST be formatted no matter 
what. Please select a filesystem for this partition")
           RETURN
         END IF
       NEXT

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

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

Author: M0E.lnx
Date: Fri Jul 11 19:26:01 2008
New Revision: 36

Modified:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/FrmPartSel.form
   branches/iVL/MdlPartSel.module

Log:
Progress on the partition selection algorithm.


Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/.project
+# /home/vluser/area-51/projects/installer/.project
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/ClsGlobal.class
+# /home/vluser/area-51/projects/installer/ClsGlobal.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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FMain.class
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmLicense.class
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/area-51/projects/installer/FrmPartSel.class
 # Generated by Gambas compiler

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

-#: FrmPartSel.class:58
+#: FrmPartSel.class:61
  msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
+msgstr ""
+
+#: FrmPartSel.class:69
+msgid "<b>Partition</b>"
+msgstr ""
+
+#: FrmPartSel.class:75
+msgid "<b>Mount Point</b>"
+msgstr ""
+
+#: FrmPartSel.class:81
+msgid "<b>File System</b>"
 msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/area-51/projects/installer/FrmSelISO.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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlCore.module
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# /home/vluser/area-51/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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/area-51/projects/installer/MdlPartSel.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	Fri Jul 11 19:26:01 2008
@@ -1,4 +1,4 @@
-# /home/moises/area-51/projects/installer/MdlSetup.module
+# /home/vluser/area-51/projects/installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form	(original)
+++ branches/iVL/FrmPartSel.form	Fri Jul 11 19:26:01 2008
@@ -9,5 +9,20 @@
   }
   { scrollPartitions ScrollView
     MoveScaled(1,16,69,36)
+    { tlPartRow TextLabel
+      MoveScaled(1,1,14,3)
+      Text = ("<b>Partition</b>")
+      Alignment = Align.Left
+    }
+    { tlPartRow2 TextLabel
+      MoveScaled(19,1,14,3)
+      Text = ("<b>Mount Point</b>")
+      Alignment = Align.Left
+    }
+    { tlPartRow3 TextLabel
+      MoveScaled(39,1,14,3)
+      Text = ("<b>File System</b>")
+      Alignment = Align.Left
+    }
   }
 }

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Fri Jul 11 19:26:01 2008
@@ -17,6 +17,9 @@
 '    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 oMountPoints AS Object[]
+PUBLIC oFsTypes AS Object[]
+
 PUBLIC SUB DISPLAY_PARTITION_OPTIONS()

   DIM tl AS TextLabel
@@ -32,14 +35,20 @@
   DIM vSwapSize AS Variant
   DIM iswapsize AS Float
   DIM i3drdrowX AS Integer
+  DIM iX AS Integer

-
+  ' fire up the arrays
+  oFsTypes = NEW Object[]
+  oMountPoints = NEW Object[]


   ' We will mount the partitions first, and then figure out their size
    SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
Linux$\" | cut -f 1 -d \' \'" TO sDump1
   sDump1 = Trim(sDump1)
-  y = FrmPartSel.y + 24
+
+
+    y = FrmPartSel.tlPartRow.top + FrmPartSel.tlPartRow.Height + 8
+
     IF InStr(sDump1, gb.NewLine) > 0 THEN
       sPartList = Split(sDump1, gb.NewLine)
         FOR i = 0 TO sPartList.Count - 1
@@ -69,7 +78,7 @@
                     .Width = lbwidth
                     END IF
                   .Height = 27
-                  .x = .Parent.X
+                  .x = FrmPartSel.tlPartRow.Left
                   .Alignment = Align.Normal
                   .y = y
                 END WITH
@@ -78,11 +87,14 @@
               cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "MountPoints"
                 WITH cb
                 .tag = Trim(sPartList[i])
-                .x = lbwidth + 24
+                '.x = lbwidth + 24
+                .X = FrmPartSel.tlPartRow2.Left
                 .y = y
                 .Height = tl.Height
                 .Width = tl.Width
                 .ReadOnly = TRUE
+                .tag = Trim(sPartList[i])
+                .Add("Not Used")
                 .Add("/")
                 .Add("/home")
                 .Add("/opt")
@@ -90,12 +102,14 @@
                 .Add("/var")
                 .Add("/tmp")
                 END WITH
+                oMountPoints.Add(cb)
                 i3drdrowX = cb.x + cb.Width + 8
               'create the file system options
                 cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "fsTypes"
                   WITH cb
                   .Tag = Trim(sPartList[i])
-                  .x = i3drdrowX
+                  '.x = i3drdrowX
+                  .x = FrmPartSel.tlPartRow3.Left
                   .y = y
                   .ReadOnly = TRUE
                   .Width = tl.Width
@@ -104,7 +118,9 @@
                   .Add("Ext2")
                   .Add("Ext3")
                   .Add("JFS")
+                  .Add("Do not format")
                   END WITH
+                  oFsTypes.Add(cb)


                 ' now umount the partition and delete the mount point
@@ -138,7 +154,8 @@
             'now create the swap label and combo box
               tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "swlabel"
                 WITH tl
-                  .x = .Parent.x
+                  '.x = .Parent.x
+                  .x = FrmPartSel.tlPartRow.Left
                   .y = y
                   .Text = sPart & " ( " & CStr(iswapsize) & "G )"
                   .Width = lbwidth
@@ -151,7 +168,8 @@
                 cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "swapsel"
                   WITH cb
                     .y = y
-                    .x = lbwidth + 24
+                    '.x = lbwidth + 24
+                    .x = FrmPartSel.tlPartRow2.Left
                     .Width = tl.Width
                     .tag = "swapSelection"
                     .ReadOnly = TRUE
@@ -163,12 +181,50 @@
           'Message.Info("Swap total = " & iswapsize)
         END IF

-
-
-
+



 END
+
+PUBLIC SUB MountPoints_CLick()
+
+  DIM sdropdwn AS ComboBox
+  DIM sTag AS String = LAST.tag
+  DIM sText AS String = Trim(LAST.text)
+
+  IF sText = "Not Used" THEN
+    FOR EACH sdropdwn IN oFsTypes
+      IF sdropdwn.Tag = sTag THEN
+        sdropdwn.Enabled = FALSE
+      ELSE
+        sdropdwn.Enabled = TRUE
+      END IF
+    NEXT
+  ELSE
+    FOR EACH sdropdwn IN oFsTypes
+      IF sdropdwn.Tag = sTag THEN
+        sdropdwn.Enabled = TRUE
+      END IF
+    NEXT
+  END IF
+
+END
+
+PUBLIC SUB fsTypes_click()
+
+  DIM cb AS ComboBox
+
+IF LAST.text = "Do not format"
+      FOR EACH cb IN oMountPoints
+        IF cb.tag = LAST.tag AND cb.text = "/" THEN
+          Message.Error("The / partition MUST BE FORMATTED. No way 
around that")
+          RETURN
+        END IF
+      NEXT
+    END IF
+
+END
+

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

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

Author: M0E.lnx
Date: Fri Jul 11 09:34:02 2008
New Revision: 35

Added:
   branches/iVL/.lang/#project.pot
   branches/iVL/.lang/ClsGlobal.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/FrmSelISO.pot
   branches/iVL/.lang/MdlCore.pot
   branches/iVL/.lang/MdlDiskPart.pot
   branches/iVL/.lang/MdlObjSizer.pot
   branches/iVL/.lang/MdlPartSel.pot
   branches/iVL/.lang/MdlSetup.pot
Modified:
   branches/iVL/FrmPartSel.class
   branches/iVL/FrmPartSel.form
   branches/iVL/MdlPartSel.module

Log:
Added partition selection window. This will be used after the drive has 
been partitioned

Added: branches/iVL/.lang/#project.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/#project.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,24 @@
+# /home/moises/area-51/projects/installer/.project
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr ""
+
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr ""
+

Added: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/ClsGlobal.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/FMain.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FMain.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,36 @@
+# /home/moises/area-51/projects/installer/FMain.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FMain.class:176
+msgid "Process Overview"
+msgstr ""
+
+#: FMain.class:189
+msgid "Vector Linux Install"
+msgstr ""
+
+#: FMain.class:199
+msgid "Next"
+msgstr ""
+
+#: FMain.class:205
+msgid "Back"
+msgstr ""
+
+#: FMain.class:211
+msgid "Exit"
+msgstr ""
+

Added: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,20 @@
+# /home/moises/area-51/projects/installer/FrmDiskPart.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmDiskPart.class:96
+msgid "Disk Partitioning:"
+msgstr ""
+

Added: branches/iVL/.lang/FrmLicense.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmLicense.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,32 @@
+# /home/moises/area-51/projects/installer/FrmLicense.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmLicense.class:100
+msgid "LICENSE AGREEMENT"
+msgstr ""
+
+#: FrmLicense.class:105
+msgid "TextArea1"
+msgstr ""
+
+#: FrmLicense.class:111
+msgid "Yes, I Agree to the License Agreement"
+msgstr ""
+
+#: FrmLicense.class:116
+msgid "No, I Do Not Agree"
+msgstr ""
+

Added: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmPartScheme.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,36 @@
+# /home/moises/area-51/projects/installer/FrmPartScheme.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmPartScheme.class:103
+msgid "Select your disk partition option"
+msgstr ""
+
+#: FrmPartScheme.class:108
+msgid "Use existing disk partitions"
+msgstr ""
+
+#: FrmPartScheme.class:113
+msgid "Modify my disk partitions to make room for new installation"
+msgstr ""
+
+#: FrmPartScheme.class:118
+msgid "TextLabel1"
+msgstr ""
+
+#: FrmPartScheme.class:123
+msgid "Next"
+msgstr ""
+

Added: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmPartSel.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,20 @@
+# /home/moises/area-51/projects/installer/FrmPartSel.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmPartSel.class:58
+msgid "Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install"
+msgstr ""
+

Added: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/FrmSelISO.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,32 @@
+# /home/moises/area-51/projects/installer/FrmSelISO.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FrmSelISO.class:188
+msgid "No installable images found."
+msgstr ""
+
+#: FrmSelISO.class:194
+msgid "Select which distribution to install from the list below"
+msgstr ""
+
+#: FrmSelISO.class:199
+msgid "TextLabel1"
+msgstr ""
+
+#: FrmSelISO.class:204
+msgid "Search Again"
+msgstr ""
+

Added: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlCore.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/MdlCore.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlDiskPart.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/MdlDiskPart.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlObjSizer.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/MdlObjSizer.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlPartSel.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/MdlPartSel.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Added: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- (empty file)
+++ branches/iVL/.lang/MdlSetup.pot	Fri Jul 11 09:34:02 2008
@@ -0,0 +1,16 @@
+# /home/moises/area-51/projects/installer/MdlSetup.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01 04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+

Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class	(original)
+++ branches/iVL/FrmPartSel.class	Fri Jul 11 09:34:02 2008
@@ -23,25 +23,7 @@

   WITH ME
     .tlBanner.Width = .ClientWidth - 16
-    '.frmpartitions.Move(.tlBanner.Left, .tlBanner.Top 
+ .tlBanner.Height + 4, .tlBanner.Width, .ClientHeight 
- .frmpartitions.top - 4)
-    '.tlRootPart.Move(.frmpartitions.Left + 8, .frmpartitions.top + 8, MdlObjSizer.get_object_width(.tlRootPart.Text))
-    .tlRootPart.Move(.tlBanner.Left, .tlBanner.Top + .tlBanner.Height 
+ 8, MdlObjSizer.get_object_width(.tlRootPart.Text))
-    .cbSelRoot.Move(.tlRootPart.Left + .tlRootPart.Width + 8, .tlRootPart.Top)
-    .btWhatRoot.Move(.cbSelRoot.Left + .cbSelRoot.Width + 
8, .cbSelRoot.top, MdlObjSizer.get_object_width(.btWhatRoot.text) + 32)
-    .bUseCustompart.Move(.tlRootPart.Left, .tlRootPart.top 
+ .tlRootPart.Height + 4)
-    .tlHomePart.Move(.tlRootPart.Left, .bUseCustompart.Top 
+ .bUseCustompart.Height + 4, .tlRootPart.Width)
-    .cbSelHome.Move(.cbSelRoot.Left, .tlHomePart.top, .cbSelRoot.Width)
-    .btWhathome.Move(.btWhatRoot.Left, .cbSelHome.top, 
MdlObjSizer.get_object_width(.btWhathome.Text) + 32)
-    .bAllCustom.Move(.bUseCustompart.Left, .tlHomePart.Top 
+ .tlHomePart.Height + 4)
-    .tlOptPart.Move(.bAllCustom.Left, .bAllCustom.top 
+ .bAllCustom.Height + 4, .tlHomePart.Width)
-    .cbselopt.Move(.tlOptPart.Left + .tlOptPart.Width + 
4, .tlOptPart.top, cbSelRoot.Width)
-    .tlusr.Move(.tlOptPart.Left, .tlOptPart.top + .tlOptPart.Height + 2, .tlOptPart.Width)
-    .cbselusr.Move(.tlusr.Left + .tlusr.Width + 4, .tlusr.top, .cbselopt.Width)
-    .tlvar.Move(.tlusr.Left, .tlusr.top + .tlusr.Height + 4, .tlusr.Width)
-    .cbselvar.Move(.tlvar.Left + .tlvar.Width + 4, .tlvar.top, .cbselopt.Width)
-
-
-
+


   END WITH
@@ -51,49 +33,9 @@
 PUBLIC SUB Form_Open()

   ME.tlBanner.Adjust
-  ME.bUseCustompart.Text = "Use separate partition for user data. (/home)"
-  ME.bUseCustompart.Width = 
MdlObjSizer.get_object_width(ME.bUseCustompart.text) + 36
-  ME.bAllCustom.Width = 
MdlObjSizer.get_object_width(ME.bAllCustom.Text) + 36

+  MdlPartSel.DISPLAY_PARTITION_OPTIONS

-
-END
-
-PUBLIC SUB btWhatRoot_Click()
-
-  Message("<b>About the root partition</b><br><br>" &
-  "The root partition is the very top directory on the drive where the 
operating system is \ninstalled. " &
-  "This partition contains all the system and application information 
as well as binaries. \n" &
-  "<i>This is required for ALL installations</i>")

-
-END
-
-PUBLIC SUB btWhathome_Click()
-
-  Message("<b>About the /home partition</b><br><br>" &
-  "The /home partition is where the user data is kept. User settings 
and personal documents \n" &
-  "are kept here. \n" &
-  "<i>This is optional, but recommended</i>")
-
-END
-
-PUBLIC SUB bUseCustompart_Click()
-
-  IF ME.bUseCustompart.Value = TRUE THEN
-    WITH ME
-      .tlHomePart.Visible = TRUE
-      .cbSelHome.Visible = TRUE
-      .btWhathome.Visible = TRUE
-      .bAllCustom.Visible = TRUE
-    END WITH
-  ELSE
-    WITH ME
-      .tlHomePart.Visible = FALSE
-      .cbSelHome.Visible = FALSE
-      .btWhathome.Visible = FALSE
-      .bAllCustom.Visible = FALSE
-    END WITH
-  END IF

 END

Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form	(original)
+++ branches/iVL/FrmPartSel.form	Fri Jul 11 09:34:02 2008
@@ -7,85 +7,7 @@
     MoveScaled(1,1,70,14)
      Text = ("Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install")
   }
-  { tlRootPart TextLabel
-    MoveScaled(1,17,13,3)
-    Text = ("Root partition")
-    Alignment = Align.Normal
-  }
-  { bUseCustompart CheckBox
-    MoveScaled(1,21,37,3)
-    Text = ("Use separate /home partition")
-  }
-  { cbSelRoot ComboBox
-    MoveScaled(15,17,14,3)
-    Text = ("")
-  }
-  { btWhatRoot Button
-    MoveScaled(30,17,10,3)
-    ToolTip = ("What is the root partition?\nClick here to find out")
-    Text = ("What is this?")
-    Picture = Picture["icon:/16/question"]
-  }
-  { tlHomePart TextLabel
-    MoveScaled(1,25,12,3)
-    Visible = False
-    Text = ("/home")
-    Alignment = Align.Normal
-  }
-  { cbSelHome ComboBox
-    MoveScaled(14,24,15,1)
-    Visible = False
-    Text = ("")
-  }
-  { btWhathome Button
-    MoveScaled(30,24,10,1)
-    Visible = False
-    Text = ("What is this?")
-    Picture = Picture["icon:/16/question"]
-  }
-  { bAllCustom CheckBox
-    MoveScaled(1,29,25,3)
-    Visible = False
-    Text = ("Specify additional custom partitions (expoert install)")
-  }
-  { tlOptPart TextLabel
-    MoveScaled(1,33,10,3)
-    Text = ("/opt")
-  }
-  { cbselopt ComboBox
-    MoveScaled(12,33,12,2)
-    Text = ("ComboBox1")
-  }
-  { tlvar TextLabel
-    MoveScaled(1,41,10,3)
-    Text = ("/var")
-  }
-  { cbselvar ComboBox
-    MoveScaled(12,41,11,2)
-    Text = ("ComboBox1")
-  }
-  { tlusr TextLabel
-    MoveScaled(1,37,9,3)
-    Text = ("/usr")
-  }
-  { cbselusr ComboBox
-    MoveScaled(12,37,12,2)
-    Text = ("ComboBox1")
-  }
-  { tltmp TextLabel
-    MoveScaled(26,34,10,3)
-    Text = ("/tmp")
-  }
-  { cbseltmp ComboBox
-    MoveScaled(37,34,12,1)
-    Text = ("ComboBox1")
-  }
-  { tlWin TextLabel
-    MoveScaled(26,38,10,3)
-    Text = ("Win")
-  }
-  { cbselwin ComboBox
-    MoveScaled(37,39,11,1)
-    Text = ("ComboBox1")
+  { scrollPartitions ScrollView
+    MoveScaled(1,16,69,36)
   }
 }

Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Fri Jul 11 09:34:02 2008
@@ -17,3 +17,158 @@
 '    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 DISPLAY_PARTITION_OPTIONS()
+
+  DIM tl AS TextLabel
+  DIM cb AS ComboBox
+  DIM sPartList AS String[]
+  DIM sPart AS String
+  DIM sSize AS String
+  DIM i AS Integer
+  DIM y AS Integer
+  DIM sDump1 AS String ' partition list dump
+  DIM lbwidth AS Integer = 0
+  DIM sSwapList AS String
+  DIM vSwapSize AS Variant
+  DIM iswapsize AS Float
+  DIM i3drdrowX AS Integer
+
+
+
+
+  ' We will mount the partitions first, and then figure out their size
+  SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -e \" 
Linux$\" | cut -f 1 -d \' \'" TO sDump1
+  sDump1 = Trim(sDump1)
+  y = FrmPartSel.y + 24
+    IF InStr(sDump1, gb.NewLine) > 0 THEN
+      sPartList = Split(sDump1, gb.NewLine)
+        FOR i = 0 TO sPartList.Count - 1
+          sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
+            'Message.Info(sPart)
+
+              'make sure the mount point exists
+                IF IsDir("/mnt" &/ sPart) = FALSE THEN
+                  SHELL "sudo mkdir /mnt" &/ sPart WAIT
+                END IF
+                ' Now mount the partition
+                SHELL "sudo mount " & Trim(sPartList[i]) & Space(1) 
& "/mnt" &/ sPart WAIT
+                    ' get the size using df -h | grep sPart and some sed
+                    ' will embed some bash, but should probabbly be fixed
+                SHELL "export " & sPart & "=$(df -h | grep " & sPart 
& ") && echo $" & sPart & " | cut -f 2 -d \' \'" TO sSize
+                  'Message(sPart & Space(1) & "[ " & Trim(sSize) & " ]")
+            'create the label and the drop down box here
+              tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "Labels"
+                WITH tl
+                  .Tag = Trim(sPartList[i])
+                  .Text = Trim(sPartList[i]) & Space(1) & "( " & sSize 
& " )"
+                  .Width = MdlObjSizer.get_object_width(.Text) * 1.25
+                    IF .Width > lbwidth THEN
+                      lbwidth = .Width
+                    END IF
+                    IF .Width < lbwidth THEN
+                    .Width = lbwidth
+                    END IF
+                  .Height = 27
+                  .x = .Parent.X
+                  .Alignment = Align.Normal
+                  .y = y
+                END WITH
+
+              'create the combobox
+              cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "MountPoints"
+                WITH cb
+                .tag = Trim(sPartList[i])
+                .x = lbwidth + 24
+                .y = y
+                .Height = tl.Height
+                .Width = tl.Width
+                .ReadOnly = TRUE
+                .Add("/")
+                .Add("/home")
+                .Add("/opt")
+                .Add("/usr")
+                .Add("/var")
+                .Add("/tmp")
+                END WITH
+                i3drdrowX = cb.x + cb.Width + 8
+              'create the file system options
+                cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "fsTypes"
+                  WITH cb
+                  .Tag = Trim(sPartList[i])
+                  .x = i3drdrowX
+                  .y = y
+                  .ReadOnly = TRUE
+                  .Width = tl.Width
+                  .Add("XFS")
+                  .Add("ReiserFS")
+                  .Add("Ext2")
+                  .Add("Ext3")
+                  .Add("JFS")
+                  END WITH
+
+
+                ' now umount the partition and delete the mount point
+                  SHELL "sudo umount /mnt" &/ sPart & " && sudo rm -r 
/mnt" &/ sPart WAIT
+                ' increase the value of y for the next label
+                y = y + tl.Height + 4
+
+
+        NEXT
+
+      ELSE
+        'only one partition found. This could be trouble
+
+
+
+      END IF
+
+      SHELL "export PATH=$PATH:/sbin && sudo probepart | grep -i \" 
*swap$\" | cut -f 1 -d \' \'" TO sSwapList
+        sSwapList = Trim(sSwapList)
+        'Message.Info(sSwapList)
+        IF InStr(sSwapList, gb.NewLine) THEN
+          'several swap partitions found
+          'how do we deal w/ this?
+        ELSE
+          spart = Trim(sSwapList)
+          'SHELL "export " & sSwapList & "=$(df -h | grep -i swap) | 
cut -f 2 -d \' \'" TO vSwapSize
+          SHELL "export PATH=$PATH:/sbin && export sw=$(sudo probepart  
| grep -i \" *swap$\") && echo $sw | cut -f 4 -d \' \'" TO vSwapSize
+
+            iswapsize = CInt(vSwapSize)
+            iswapsize = Round(iswapsize / 1024 / 1024, -2)
+            'now create the swap label and combo box
+              tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "swlabel"
+                WITH tl
+                  .x = .Parent.x
+                  .y = y
+                  .Text = sPart & " ( " & CStr(iswapsize) & "G )"
+                  .Width = lbwidth
+                  .Height = 27
+                  .tag = "SwapLbl"
+                  .Alignment = Align.Normal
+
+                END WITH
+              ' now create a combobox with the swap-only option
+                cb = NEW ComboBox(FrmPartSel.scrollPartitions) AS "swapsel"
+                  WITH cb
+                    .y = y
+                    .x = lbwidth + 24
+                    .Width = tl.Width
+                    .tag = "swapSelection"
+                    .ReadOnly = TRUE
+                    .Add("Swap")
+                  END WITH
+
+
+
+          'Message.Info("Swap total = " & iswapsize)
+        END IF
+
+
+
+
+
+
+
+END
+
+

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

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

Author: M0E.lnx
Date: Fri Jul 11 05:03:45 2008
New Revision: 34

Added:
   branches/iVL/.lang/
   branches/iVL/.project
   branches/iVL/ClsGlobal.class
   branches/iVL/FMain.class
   branches/iVL/FMain.form
   branches/iVL/FrmDiskPart.class
   branches/iVL/FrmDiskPart.form
   branches/iVL/FrmLicense.class
   branches/iVL/FrmLicense.form
   branches/iVL/FrmPartScheme.class
   branches/iVL/FrmPartScheme.form
   branches/iVL/FrmPartSel.class
   branches/iVL/FrmPartSel.form
   branches/iVL/FrmSelISO.class
   branches/iVL/FrmSelISO.form
   branches/iVL/MdlCore.module
   branches/iVL/MdlDiskPart.module
   branches/iVL/MdlObjSizer.module
   branches/iVL/MdlPartSel.module
   branches/iVL/MdlSetup.module
   branches/iVL/Notes
   branches/iVL/images/
   branches/iVL/images/arrow.png   (contents, props changed)
   branches/iVL/images/check.png   (contents, props changed)
   branches/iVL/images/circle.png   (contents, props changed)

Log:
Load new attempt project. This one was started from scratch, and is 
much simpler.

Added: branches/iVL/.project
==============================================================================
--- (empty file)
+++ branches/iVL/.project	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,20 @@
+# Gambas Project File 2.0
+Title=VectorLinux Installer
+Startup=FrmPartSel
+Version=0.0.1
+Library=gb.gtk
+Library=gb.form
+Library=gb.desktop
+Library=gb.form.dialog
+Library=gb.gtk.ext
+Description=GUI installer for Vector linux
+Authors=M0E-lnx
+TabSize=2
+Translate=1
+Language=en_US
+ControlPublic=1
+ModulePublic=1
+Maintainer=benoit
+Vendor=Princeton
+Address=benoit@localhost
+License=General Public Licence

Added: branches/iVL/ClsGlobal.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsGlobal.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,42 @@
+' 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/>.
+
+
+
+STATIC PUBLIC DISTRO AS String = "Vector Linux" ' will be overridden 
by SETUP.CONF
+STATIC PUBLIC VERSION AS String = "6.0" ' will be overridden by SETUP.CONF
+
+STATIC PUBLIC iRootMin AS Integer = 20000
+STATIC PUBLIC iRootMax AS Integer = 40000
+STATIC PUBLIC iHomeMin AS Integer = 500
+STATIC PUBLIC iSwapMin AS Integer = 64
+
+STATIC PUBLIC sRootMnt AS String
+STATIC PUBLIC sHomeMnt AS String
+STATIC PUBLIC sTargetMnt AS String
+STATIC PUBLIC sSourceMnt AS String
+STATIC PUBLIC sMediaMnt AS String
+
+STATIC PUBLIC sBulkList AS String
+STATIC PUBLIC sConfPkg AS String
+
+'Values to these variables is set from mdlcore.main
+STATIC PUBLIC sBulkDir AS String
+STATIC PUBLIC sPackDir AS String
+STATIC PUBLIC sDocDir AS String
+STATIC PUBLIC sSetupConfPath AS String
+STATIC PUBLIC sReadMePath AS String

Added: branches/iVL/FMain.class
==============================================================================
--- (empty file)
+++ branches/iVL/FMain.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,154 @@
+' 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/>.
+
+
+
+PRIVATE sLast AS String
+PUBLIC sNextKey AS String
+PUBLIC FrmCurr AS Form ' assigned when a form is opened
+PUBLIC frmLast AS Form ' assigned when a form is hidden
+
+PUBLIC SUB _new()
+
+END
+
+PUBLIC SUB Form_Open()
+ClsGlobal.sSourceMnt = User.Home &/ "mnt" &/ "cdrom"
+FrmSelISO.Reparent(ME.pnlWinHost)
+FrmSelISO.Width = pnlWinHost.Width
+FrmSelISO.Height = pnlWinHost.Height
+FrmSelISO.Show
+MdlCore.PREPARE_INSTALL_LAYOUT
+WITH ME
+  .btback.Enabled = FALSE
+  .btback.ForeColor = Color.Gray
+  .btQuit.Text = "Exit Installation"
+END WITH
+'ME.TreeView1.BackColor = Color.Transparent
+
+
+END
+
+PUBLIC SUB ComboBox1_Click()
+
+
+
+END
+
+
+PUBLIC SUB Form_Resize()
+
+DIM iMid AS Integer
+
+  WITH ME
+    iMid = (.btback.Left + .btnext.left + .btnext.Width) / 2
+  END WITH
+
+
+  WITH ME
+    .tlBanner.width = ME.width
+    .Frame1.Move(.tlBanner.left + 4, .tlBanner.Top + .tlBanner.Height 
+ 4, .tlBanner.Width - ((.tlBanner.Width / 10) * 7), .Height - 
(.tlbanner.height + (.tlbanner.height / 2)))
+    .tvPlan.Resize(.Frame1.Width - 20, .Frame1.Height - 30)
+    .pnlWinHost.Move(.Frame1.left + .Frame1.Width + 
4, .Frame1.top, .tlBanner.Width - (.Frame1.Width + 8), .Frame1.Height)
+    .btback.Move(.pnlWinHost.Left, .pnlWinHost.Top 
+ .pnlWinHost.Height - (.btback.Height), 
MdlObjSizer.get_object_width(.btback.text) + 36)
+    .btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width 
+ 4), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
+      ' for the quit button, it'll get a little tricky
+      ' we want that one right in the middle
+    .btQuit.Move(iMid - (.btQuit.Width / 2), .btback.Top, 
MdlObjSizer.get_object_width(.btQuit.Text) + 36)
+    '.pnlWinHost.Move(ME.left + ME.Frame1.Width + 4,  Frame1.Top, 
ME.Width - (Frame1.Width + 4))
+  END WITH
+END
+
+PUBLIC SUB Frame1_MouseDown()
+
+
+
+END
+
+
+
+PUBLIC SUB tvPlan_Select()
+
+
+'tvPlan[sLast].Picture = MdlCore.sDonePic
+'
+'
+'
+' IF tvPlan.Current.Picture <> MdlCore.sCatPic THEN
+'
+'   IF sLast THEN
+'     tvPlan[sLast].Picture = MdlCore.sDonePic
+'   END IF
+'
+'   tvPlan.Current.Picture = MdlCore.sNowPic
+
+
+
+'END IF
+
+END
+
+PUBLIC SUB tvPlan_MouseUp()
+
+  IF tvPlan.Current.Picture <> MdlCore.sCatPic THEN
+  sLast = tvPlan.Current.Key
+  END IF
+
+END
+
+PUBLIC SUB btQuit_Click()
+
+  FMain.Close
+
+END
+
+
+
+PUBLIC SUB btnext_Click()
+  DIM FrmNext AS Form
+  DIM sDev AS String
+  DIM sISONAME AS String
+
+  'DIM FrmCurr AS Form
+
+  SELECT CASE ME.sNextKey
+    CASE "Prep0"
+        ' We'll need to mount the ISO or image and then display the form
+        sDev = Right(FrmSelISO.lstInstallableImg.Text, 
Len(FrmSelISO.lstInstallableImg.Text) - 
InStr(FrmSelISO.lstInstallableImg.text, "/") + 1)
+        IF InStr(FrmSelISO.lstInstallableImg.text, ".iso") OR 
InStr(FrmSelISO.lstInstallableImg.text, ".ISO") THEN
+          sISONAME = Left(FrmSelISO.lstInstallableImg.text, 
InStr(FrmSelISO.lstInstallableImg.text, " ") - 1)
+          MdlSetup.GO_WITH_SELECTED(sDev, sISONAME)
+        ELSE
+
+        MdlSetup.GO_WITH_SELECTED(sDev, "")
+        END IF
+      FrmNext = FrmPartScheme
+      ME.tvPlan.Current.Picture = MdlCore.sDonePic
+      ME.tvPlan["Prep1"].Selected = TRUE
+      ME.tvPlan["Prep1"].Picture = MdlCore.sNowPic
+
+    CASE "Prep1"
+      FrmNext = FrmDiskPart
+      ME.tvPlan.Current.Picture = MdlCore.sDonePic
+      ME.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+      ME.tvPlan["Prep2"].Selected = TRUE
+  END SELECT
+
+  FrmNext.Reparent(FrmCurr.Parent)
+  FrmCurr.Hide
+  FrmNext.Show
+
+END

Added: branches/iVL/FMain.form
==============================================================================
--- (empty file)
+++ branches/iVL/FMain.form	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,40 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,100,75)
+  Text = ("")
+  { Frame1 Frame
+    MoveScaled(1,8,25,62)
+    Text = ("Process Overview")
+    { tvPlan TreeView
+      MoveScaled(1,3,22,56)
+      Border = False
+    }
+  }
+  { tlBanner TextLabel
+    MoveScaled(0,0,26,7)
+    Font = Font["+6"]
+    Background = Color.SelectedBackground
+    Foreground = Color.SelectedForeground
+    Text = ("Vector Linux Install")
+    Alignment = Align.Center
+  }
+  { pnlWinHost VBox
+    MoveScaled(28,9,66,56)
+  }
+  { btnext Button
+    MoveScaled(89,69,8,3)
+    Text = ("Next")
+    Picture = Picture["icon:/16/right"]
+  }
+  { btback Button
+    MoveScaled(28,67,8,3)
+    Text = ("Back")
+    Picture = Picture["icon:/16/left"]
+  }
+  { btQuit Button
+    MoveScaled(54,67,11,2)
+    Text = ("Exit")
+    Picture = Picture["icon:/16/cancel"]
+  }
+}

Added: branches/iVL/FrmDiskPart.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmDiskPart.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,79 @@
+' 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()
+  MdlDiskPart.EMBED_GPARTED()
+
+  WITH ME
+    .tlBanner.Text = "<b>Disk Partitioning:</b><br>" &
+    "This portion of the setup process allows you to define an 
installation target for your new operating system." &
+    "Please use the partition program below to create, resize, or 
delete partitions, and make room for Vectorlinux."
+    .tlBanner.Adjust
+  END WITH
+
+
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .tlBanner.Width = .Width
+    .EmbGPARTED.Move(.tlBanner.Left, .tlBanner.Top + .tlBanner.Height 
+ 4, .ClientWidth - 16, .ClientHeight)
+  END WITH
+END
+
+PUBLIC SUB EmbGPARTED_Embed()
+
+  FMain.btnext.Enabled = FALSE
+  FMain.btnext.ForeColor = Color.Gray
+  FMain.btback.Enabled = FALSE
+  FMain.btback.ForeColor = Color.Gray
+  FMain.btQuit.Enabled = FALSE
+  FMain.btQuit.ForeColor = Color.Gray
+
+
+END
+
+PUBLIC SUB EmbGPARTED_Close()
+
+  DIM bReboot AS Boolean
+  bReboot = MdlSetup.CHECK_IF_REBOOT_NEEDED()
+
+    IF bReboot = TRUE THEN ' need to reboot
+      Message.Info("Your partition setup requires a system reboot. 
Your computer will now reboot")
+        'SHELL "sudo shutdown -r now"
+    ELSE ' move to the next stage (select which partitions to use as what
+       FrmPartSel.Reparent(ME.Parent)
+       ME.Hide
+        FrmPartSel.Show
+
+
+
+  FMain.btnext.Enabled = TRUE
+  FMain.btnext.ForeColor = Color.Black
+  FMain.btback.Enabled = TRUE
+  FMain.btback.ForeColor = Color.Black
+  FMain.btQuit.Enabled = TRUE
+  FMain.btQuit.ForeColor = Color.Black
+  END IF
+END

Added: branches/iVL/FrmDiskPart.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmDiskPart.form	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,13 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,84,55)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,2,81,9)
+    Text = ("Disk Partitioning:")
+  }
+  { EmbGPARTED Embedder
+    MoveScaled(1,13,82,39)
+  }
+}

Added: branches/iVL/FrmLicense.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLicense.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,81 @@
+' 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()
+
+  ME.tlbanner.Text = "Ready to install " & ClsGlobal.DISTRO & Space(1) 
& ClsGlobal.VERSION & " to your system. " &
+   "<br><br>Please read the License agreement and click \'" & 
FMain.btnext.Text & "\' to continue"
+
+  ME.tlbanner.Adjust
+  ME.rbNo.Width = MdlObjSizer.get_object_width(ME.rbNo.Text) + 24
+  ME.rbYes.Width = MdlObjSizer.get_object_width(ME.rbYes.Text) + 24
+  ME.rbNo.Value = TRUE
+  FMain.btnext.Enabled = FALSE
+  FMain.btnext.ForeColor = Color.Gray
+
+
+
+  FMain.sNextKey = "Prep1"
+  FMain.FrmCurr = ME
+
+
+
+
+END
+
+PUBLIC SUB Form_Hide()
+
+  FMain.frmLast = ME
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+
+  WITH ME
+    .Reparent(.parent)
+    .Resize(.Parent.Width, .Parent.Height)
+    .taLicense.Move(.tlbanner.Left, .tlbanner.top + .tlbanner.Height + 
4, .ClientWidth - 20, .ClientHeight - .tlbanner.Height - (.rbNo.Height 
* 4))
+    '.taLicense.Resize(.ClientWidth - (.ClientWidth / 
20), .ClientHeight - .tlbanner.Height - (.rbNo.Height * 4))
+    .rbNo.Move(.taLicense.Left, .taLicense.Top + (.taLicense.Height + 
4), MdlObjSizer.get_object_width(.rbNo.Text) + 24)
+    .rbYes.Move(.rbNo.Left, .rbNo.Top + (.rbNo.Height + 4), 
MdlObjSizer.get_object_width(.rbYes.Text) + 24)
+  END WITH
+
+END
+
+PUBLIC SUB rbNo_Click()
+
+  FMain.btnext.Enabled = FALSE
+  FMain.btnext.ForeColor = Color.Gray
+
+END
+
+PUBLIC SUB rbYes_Click()
+
+  FMain.btnext.Enabled = TRUE
+  FMain.btnext.ForeColor = Color.Black
+
+END
+
+PUBLIC SUB tlbanner_MouseDown()
+
+
+
+END

Added: branches/iVL/FrmLicense.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLicense.form	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,23 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,73,60)
+  Text = ("")
+  { tlbanner TextLabel
+    MoveScaled(1,1,71,9)
+    Text = ("LICENSE AGREEMENT")
+  }
+  { taLicense TextArea
+    MoveScaled(2,19,65,26)
+    Text = ("TextArea1")
+    ReadOnly = True
+  }
+  { rbYes RadioButton
+    MoveScaled(2,50,20,3)
+    Text = ("Yes, I Agree to the License Agreement")
+  }
+  { rbNo RadioButton
+    MoveScaled(2,46,20,3)
+    Text = ("No, I Do Not Agree")
+  }
+}

Added: branches/iVL/FrmPartScheme.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPartScheme.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,83 @@
+' 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_Resize()
+
+  WITH ME
+    .tlBanner.Width = .ClientWidth - 10
+    .rbUseExisting.Move(.tlBanner.Left, .tlBanner.Top 
+ .tlBanner.Height + 8)
+    .rbEditPartitions.Move(.rbUseExisting.Left, .rbUseExisting.Top 
+ .rbUseExisting.Height + 4)
+    .tlChoiceExp.Move(.rbEditPartitions.Left, .rbEditPartitions.top 
+ .rbEditPartitions.Height + 16, .tlBanner.Width - 10)
+    .btNext.Move(.tlBanner.Left + .tlBanner.Width - .btNext.Width - 
8, .ClientHeight - (.btNext.Height * 2))
+
+  END WITH
+
+END
+
+PUBLIC SUB Form_Open()
+
+  WITH ME
+    .rbEditPartitions.Width = 
MdlObjSizer.get_object_width(.rbEditPartitions.Text) + 24
+    .rbUseExisting.Width = 
MdlObjSizer.get_object_width(.rbUseExisting.Text) + 24
+    .btNext.Width = MdlObjSizer.get_object_width(.btNext.Text) + 36
+  END WITH
+  ME.rbEditPartitions.Value = TRUE
+FMain.btnext.Enabled = FALSE
+FMain.btnext.ForeColor = Color.Gray
+END
+
+PUBLIC SUB rbUseExisting_Click()
+
+  ME.tlChoiceExp.Text = "<b>" & rbUseExisting.Text & "</b><br><br>" &
+  "Select this option if you already have a linux installation that 
you wish to overwrite or if a linux partition scheme exists in your " &
+  "Hard disk. <b>This option will overwrite whatever is in those 
partitions</b><br><br>" &
+  "<i>Use this option if you already prepared your partitions using 
the VectorLinux installer</i>"
+
+END
+
+PUBLIC SUB rbEditPartitions_Click()
+
+  ME.tlChoiceExp.Text = "<b>" & rbEditPartitions.Text & "</b><br><br>" &
+  "Select this option is you wish to create, more or resize partitions 
in order to make room for your new VectorLinux " &
+  "installation. This option is the safest choice if you have other 
existing installations that you wish to keep."
+
+END
+
+PUBLIC SUB tlChoiceExp_MouseDown()
+
+
+
+END
+
+PUBLIC SUB btNext_Click()
+
+  IF ME.rbEditPartitions.Value = TRUE THEN
+    ' fire up the gparted window
+  FrmDiskPart.Reparent(ME.Parent)
+  ME.Hide
+  FrmDiskPart.Show
+  ELSE IF ME.rbUseExisting.Value THEN
+    ' Fire wizard to set partitions
+    ' This will also be used after the user has already partitioned 
the disk
+    FrmPartSel.Reparent(ME.Parent)
+    ME.Hide
+    FrmPartSel.Show
+  END IF
+
+END

Added: branches/iVL/FrmPartScheme.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPartScheme.form	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,27 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,81,50)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,2,51,4)
+    Text = ("Select your disk partition option")
+  }
+  { rbUseExisting RadioButton
+    MoveScaled(2,8,32,3)
+    Text = ("Use existing disk partitions")
+  }
+  { rbEditPartitions RadioButton
+    MoveScaled(2,12,62,3)
+    Text = ("Modify my disk partitions to make room for new installation")
+  }
+  { tlChoiceExp TextLabel
+    MoveScaled(1,17,76,23)
+    Text = ("TextLabel1")
+  }
+  { btNext Button
+    MoveScaled(70,44,9,3)
+    Text = ("Next")
+    Picture = Picture["icon:/16/right"]
+  }
+}

Added: branches/iVL/FrmPartSel.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPartSel.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,99 @@
+' 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_Resize()
+
+  WITH ME
+    .tlBanner.Width = .ClientWidth - 16
+    '.frmpartitions.Move(.tlBanner.Left, .tlBanner.Top 
+ .tlBanner.Height + 4, .tlBanner.Width, .ClientHeight 
- .frmpartitions.top - 4)
+    '.tlRootPart.Move(.frmpartitions.Left + 8, .frmpartitions.top + 8, MdlObjSizer.get_object_width(.tlRootPart.Text))
+    .tlRootPart.Move(.tlBanner.Left, .tlBanner.Top + .tlBanner.Height 
+ 8, MdlObjSizer.get_object_width(.tlRootPart.Text))
+    .cbSelRoot.Move(.tlRootPart.Left + .tlRootPart.Width + 8, .tlRootPart.Top)
+    .btWhatRoot.Move(.cbSelRoot.Left + .cbSelRoot.Width + 
8, .cbSelRoot.top, MdlObjSizer.get_object_width(.btWhatRoot.text) + 32)
+    .bUseCustompart.Move(.tlRootPart.Left, .tlRootPart.top 
+ .tlRootPart.Height + 4)
+    .tlHomePart.Move(.tlRootPart.Left, .bUseCustompart.Top 
+ .bUseCustompart.Height + 4, .tlRootPart.Width)
+    .cbSelHome.Move(.cbSelRoot.Left, .tlHomePart.top, .cbSelRoot.Width)
+    .btWhathome.Move(.btWhatRoot.Left, .cbSelHome.top, 
MdlObjSizer.get_object_width(.btWhathome.Text) + 32)
+    .bAllCustom.Move(.bUseCustompart.Left, .tlHomePart.Top 
+ .tlHomePart.Height + 4)
+    .tlOptPart.Move(.bAllCustom.Left, .bAllCustom.top 
+ .bAllCustom.Height + 4, .tlHomePart.Width)
+    .cbselopt.Move(.tlOptPart.Left + .tlOptPart.Width + 
4, .tlOptPart.top, cbSelRoot.Width)
+    .tlusr.Move(.tlOptPart.Left, .tlOptPart.top + .tlOptPart.Height + 2, .tlOptPart.Width)
+    .cbselusr.Move(.tlusr.Left + .tlusr.Width + 4, .tlusr.top, .cbselopt.Width)
+    .tlvar.Move(.tlusr.Left, .tlusr.top + .tlusr.Height + 4, .tlusr.Width)
+    .cbselvar.Move(.tlvar.Left + .tlvar.Width + 4, .tlvar.top, .cbselopt.Width)
+
+
+
+
+
+  END WITH
+
+END
+
+PUBLIC SUB Form_Open()
+
+  ME.tlBanner.Adjust
+  ME.bUseCustompart.Text = "Use separate partition for user data. (/home)"
+  ME.bUseCustompart.Width = 
MdlObjSizer.get_object_width(ME.bUseCustompart.text) + 36
+  ME.bAllCustom.Width = 
MdlObjSizer.get_object_width(ME.bAllCustom.Text) + 36
+
+
+
+END
+
+PUBLIC SUB btWhatRoot_Click()
+
+  Message("<b>About the root partition</b><br><br>" &
+  "The root partition is the very top directory on the drive where the 
operating system is \ninstalled. " &
+  "This partition contains all the system and application information 
as well as binaries. \n" &
+  "<i>This is required for ALL installations</i>")
+
+
+END
+
+PUBLIC SUB btWhathome_Click()
+
+  Message("<b>About the /home partition</b><br><br>" &
+  "The /home partition is where the user data is kept. User settings 
and personal documents \n" &
+  "are kept here. \n" &
+  "<i>This is optional, but recommended</i>")
+
+END
+
+PUBLIC SUB bUseCustompart_Click()
+
+  IF ME.bUseCustompart.Value = TRUE THEN
+    WITH ME
+      .tlHomePart.Visible = TRUE
+      .cbSelHome.Visible = TRUE
+      .btWhathome.Visible = TRUE
+      .bAllCustom.Visible = TRUE
+    END WITH
+  ELSE
+    WITH ME
+      .tlHomePart.Visible = FALSE
+      .cbSelHome.Visible = FALSE
+      .btWhathome.Visible = FALSE
+      .bAllCustom.Visible = FALSE
+    END WITH
+  END IF
+
+END

Added: branches/iVL/FrmPartSel.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmPartSel.form	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,91 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,72,55)
+  Text = ("")
+  { tlBanner TextLabel
+    MoveScaled(1,1,70,14)
+    Text = ("Define where the operating system will be 
installed\n<br>\nLinux is a modular operating system. This means that 
it has the ability to keep system and user data separately.<br> A 
recommended setup would included a / (root), a /home, and a swap 
partitions.\n<br>\nPlease select which partitions you would like to use 
for your install")
+  }
+  { tlRootPart TextLabel
+    MoveScaled(1,17,13,3)
+    Text = ("Root partition")
+    Alignment = Align.Normal
+  }
+  { bUseCustompart CheckBox
+    MoveScaled(1,21,37,3)
+    Text = ("Use separate /home partition")
+  }
+  { cbSelRoot ComboBox
+    MoveScaled(15,17,14,3)
+    Text = ("")
+  }
+  { btWhatRoot Button
+    MoveScaled(30,17,10,3)
+    ToolTip = ("What is the root partition?\nClick here to find out")
+    Text = ("What is this?")
+    Picture = Picture["icon:/16/question"]
+  }
+  { tlHomePart TextLabel
+    MoveScaled(1,25,12,3)
+    Visible = False
+    Text = ("/home")
+    Alignment = Align.Normal
+  }
+  { cbSelHome ComboBox
+    MoveScaled(14,24,15,1)
+    Visible = False
+    Text = ("")
+  }
+  { btWhathome Button
+    MoveScaled(30,24,10,1)
+    Visible = False
+    Text = ("What is this?")
+    Picture = Picture["icon:/16/question"]
+  }
+  { bAllCustom CheckBox
+    MoveScaled(1,29,25,3)
+    Visible = False
+    Text = ("Specify additional custom partitions (expoert install)")
+  }
+  { tlOptPart TextLabel
+    MoveScaled(1,33,10,3)
+    Text = ("/opt")
+  }
+  { cbselopt ComboBox
+    MoveScaled(12,33,12,2)
+    Text = ("ComboBox1")
+  }
+  { tlvar TextLabel
+    MoveScaled(1,41,10,3)
+    Text = ("/var")
+  }
+  { cbselvar ComboBox
+    MoveScaled(12,41,11,2)
+    Text = ("ComboBox1")
+  }
+  { tlusr TextLabel
+    MoveScaled(1,37,9,3)
+    Text = ("/usr")
+  }
+  { cbselusr ComboBox
+    MoveScaled(12,37,12,2)
+    Text = ("ComboBox1")
+  }
+  { tltmp TextLabel
+    MoveScaled(26,34,10,3)
+    Text = ("/tmp")
+  }
+  { cbseltmp ComboBox
+    MoveScaled(37,34,12,1)
+    Text = ("ComboBox1")
+  }
+  { tlWin TextLabel
+    MoveScaled(26,38,10,3)
+    Text = ("Win")
+  }
+  { cbselwin ComboBox
+    MoveScaled(37,39,11,1)
+    Text = ("ComboBox1")
+  }
+}

Added: branches/iVL/FrmSelISO.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSelISO.class	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,168 @@
+' 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 lstInstallableImg_Click()
+
+  DIM sLocation AS String
+  DIM ipos1 AS Integer
+
+
+  IF lstInstallableImg.Count > 0 THEN
+  IF lstInstallableImg.Text <> "No Installable Media Found" THEN
+
+  IF InStr(lstInstallableImg.Text, ".iso") OR 
InStr(lstInstallableImg.Text, ".ISO") = TRUE THEN
+    sLocation = Left(lstInstallableImg.Text, 
InStr(lstInstallableImg.Text, " ") - 1)
+  ELSE
+    ipos1 = RInStr(ME.lstInstallableImg.Text, "/")
+    sLocation = Right(ME.lstInstallableImg.Text, 
Len(ME.lstInstallableImg.Text) - ipos1)
+  END IF
+  'function to read the file
+  ME.DESCRIBE_DISTRO(sLocation)
+  END IF
+  END IF
+  'Message.Info(File.Load(Temp$(sLocation)))
+
+
+
+
+
+END
+
+PUBLIC SUB Form_Open()
+
+
+  ME.Width = ME.Parent.Width
+  ME.Height = ME.Parent.Height
+  FMain.sNextKey = "Prep0"
+  FMain.FrmCurr = ME
+
+
+
+
+END
+
+PUBLIC SUB DESCRIBE_DISTRO(sLoc AS String)
+
+  DIM sFile AS String[] = Split(File.Load(Temp$(sLoc)), gb.NewLine)
+  DIM sLine AS String
+  DIM i AS Integer
+  DIM iSep AS String
+  DIM ipos1 AS Integer
+
+  DIM sDist, sVer, iMinRoot, iMinHome, iMinSwap AS String
+
+  IF sFile THEN
+    FOR i = 0 TO sFile.count - 1
+      sLine = Trim(sFile[i])
+
+          IF InStr(sLine, "\'") = TRUE THEN
+            iSep = "\'"
+          ELSE IF InStr(sline, "\"") = TRUE THEN
+            iSep = "\""
+          END IF
+      ipos1 = InStr(sLine, iSep)
+        IF Left(sLine, Len("DISTRO=")) = "DISTRO=" THEN
+          sDist = Right(sLine, Len(sLine) - InStr(sLine, "=") - 1)
+        ELSE IF Left(sLine, Len("VERSION=")) = "VERSION=" THEN
+          sVer = Right(sLine, Len(sLine) - InStr(sLine, "=") - 1)
+        ELSE IF Left(sLine, Len("HD_ROOT_MIN=")) = "HD_ROOT_MIN=" THEN
+          iMinRoot = Right(sLine, Len(sLine) - InStr(sLine, "=") - 1)
+        ELSE IF Left(sLine, Len("HD_SWAP=")) = "HD_SWAP=" THEN
+          iMinSwap = Right(sLine, Len(sLine) - InStr(sLine, "=") - 1)
+        ELSE IF Left(sLine, Len("HD_HOME")) = "HD_HOME" THEN
+          iMinHome = Right(sLine, Len(sLine) - InStr(sLine, "=") - 1)
+
+        END IF
+    NEXT
+     IF Right(sDist) LIKE "\'" OR "\"" THEN
+        sDist = Left(sDist, Len(sDist) - 1)
+      END IF
+      IF Right(sVer) LIKE "\'" OR "\"" THEN
+        sVer = Left(sVer, Len(sver) - 1)
+      END IF
+
+    FrmSelISO.tlDistroDesc.Text = "<h3>" & sDist & Space(1) & sVer 
& "</h3><br>" &
+    "<b>Minimum Disk Space Requirements</b><br>"
+
+
+      IF Right(iMinRoot) LIKE "\'" OR "\"" THEN
+        iMinRoot = Left(iMinRoot, Len(iMinRoot) - 1)
+        FrmSelISO.tlDistroDesc.Text = FrmSelISO.tlDistroDesc.Text 
& "<br>" & "<b>ROOT: </b>" & iMinRoot & " MB"
+      END IF
+      IF Right(iMinHome) LIKE "\'" OR "\"" THEN
+        iMinHome = Left(iMinHome, Len(iMinHome) - 1)
+        FrmSelISO.tlDistroDesc.Text = FrmSelISO.tlDistroDesc.Text 
& "<br><b>HOME: </b>" & iMinHome & " MB"
+      END IF
+      IF Right(iMinSwap) LIKE "\'" OR "\"" THEN
+        iMinSwap = Left(iMinSwap, Len(iMinSwap) - 1)
+        FrmSelISO.tlDistroDesc.Text = FrmSelISO.tlDistroDesc.Text 
& "<br><b>SWAP: </b>" & iMinSwap & " MB"
+
+      END IF
+
+
+
+  ELSE
+    ' can't read file
+    'Message.Error("Setup is unable to locate the ")
+  END IF
+
+
+END
+
+
+PUBLIC SUB btNext_Click()
+  DIM sSel AS String
+  sSel = Right(lstInstallableImg.Text, Len(lstInstallableImg.Text) - RInStr(lstInstallableImg.Text, "/"))
+  PRINT "User selected to install from /dev/" & sSel
+  'RETURN
+  MdlCore.SET_DECISSION(sSel)
+  WAIT
+  'read the SETUP.CONF now to set the variables for the real install 
process to begin
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+  WITH ME
+    .Reparent(.Parent)
+    .Resize(.Parent.Width, .Parent.Height)
+'    .btNext.Move(.Left + .Width - .btNext.Width - 8, .top + ME.Height 
- .btNext.Height - 8)
+    .btResCan.Move(.Left + .Width - .btResCan.Width - 8, .top 
+ .tlBanner.Height + 12, MdlObjSizer.get_object_width(.btResCan.text) + 36)
+    .lstInstallableImg.Move(.left + 4, .btResCan.Top, .Width - 
(.btResCan.Width + 24))
+    .FullScreen = TRUE
+  END WITH
+
+END
+
+PUBLIC SUB btResCan_Click()
+
+lstInstallableImg.Clear()
+MdlCore.MEDIA_SCAN
+
+
+END
+
+PUBLIC SUB Form_Hide()
+
+  FMain.frmLast = ME
+
+
+END

Added: branches/iVL/FrmSelISO.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmSelISO.form	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,25 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,63,41)
+  Text = ("")
+  FullScreen = True
+  { lstInstallableImg ComboBox
+    MoveScaled(1,7,45,3)
+    Text = ("No installable images found.")
+    ReadOnly = True
+  }
+  { tlBanner TextLabel
+    MoveScaled(1,1,58,5)
+    Text = ("Select which distribution to install from the list below")
+  }
+  { tlDistroDesc TextLabel
+    MoveScaled(1,13,60,22)
+    Text = ("TextLabel1")
+  }
+  { btResCan Button
+    MoveScaled(49,7,13,3)
+    Text = ("Search Again")
+    Picture = Picture["icon:/16/refresh"]
+  }
+}

Added: branches/iVL/MdlCore.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlCore.module	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,503 @@
+' Gambas module 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 sCatPic AS picture = Picture["icon:/16/linux"]
+PUBLIC sToDopic AS Picture = Picture["images/circle.png"]
+PUBLIC sNowPic AS picture = Picture["images/arrow.png"]
+PUBLIC sDonePic AS Picture = Picture["images/check.png"]
+
+
+PUBLIC SUB SEARCH_LINUX_DRIVES_FOR_MEDIA(sDev AS String)
+  DIM sIsoList AS String[]
+  DIM sResults AS String
+  DIM sISO AS String
+  DIM i AS Integer
+
+  SHELL "sudo mount " & sDev & Space(1) & ClsGlobal.sSourceMnt WAIT
+   SHELL "ls " & ClsGlobal.sSourceMnt & "| grep -i vl* | grep -i iso" 
TO sResults
+  'SHELL "ls / | grep -i VL* | grep -i iso" TO sResults
+    sResults = Trim(sResults)
+      IF InStr(sResults, gb.NewLine) THEN
+        sIsoList = Split(sResults, gb.NewLine)
+          FOR i = 0 TO sIsoList.Count - 1
+            sISO = Trim(sIsoList[i])
+              IF FrmSelISO.lstInstallableImg.Find(sISO & " on " & 
sDev) = -1 THEN
+                FrmSelISO.lstInstallableImg.Add(sISO & " on " & sDev)
+                  ' save the temp file for distro description
+                    SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt 
&/ sISO & " /mnt/loop" WAIT
+                      File.Save(Temp(sISO), SConv(File.Load("/mnt/loop/veclinux/SETUP.CONF")))
+                    SHELL "sudo umount /mnt/loop" WAIT
+
+              END IF
+          NEXT
+      ELSE ' only one ISO on this drive
+        IF sResults THEN
+        sISO = Trim(sResults)
+          IF FrmSelISO.lstInstallableImg.Find(sISO & " on " & sDev) = 
-1 THEN
+            FrmSelISO.lstInstallableImg.Add(sISO & " on " & sDev)
+             SHELL "sudo mount -o loop " & ClsGlobal.sSourceMnt &/ 
sISO & " /mnt/loop" WAIT
+                      File.Save(Temp(sISO), SConv(File.Load("/mnt/loop/veclinux/SETUP.CONF")))
+             SHELL "sudo umount /mnt/loop" WAIT
+
+              END IF
+        END IF
+      END IF
+
+  SHELL "sudo umount " & ClsGlobal.sSourceMnt WAIT
+
+END
+
+
+PUBLIC SUB SCAN_LINUX_PARTITIONS()
+
+DIM sResults AS String
+DIM sPartList AS String[]
+DIM i AS Integer
+DIM sPartition AS String
+
+'SHELL "sudo /sbin/probepart | grep -e \"*Linux$\" | cut -f 1 -d \' 
\'" TO sResults
+  SHELL "export PATH=$PATH:/sbin && sudo /sbin/probepart | grep -e \" 
*Linux$\" | cut -f 1 -d \' \'" TO sResults
+  sResults = Trim(sResults)
+
+  IF InStr(sResults, gb.NewLine) THEN
+    sPartList = Split(sResults, gb.NewLine)
+      FOR i = 0 TO sPartList.count - 1
+        sPartition = Trim(sPartList[i])
+          'now scan this partition
+            ME.SEARCH_LINUX_DRIVES_FOR_MEDIA(sPartition)
+      NEXT
+  ELSE ' only one linux partition found
+    sPartition = Trim(sResults)
+      ME.SEARCH_LINUX_DRIVES_FOR_MEDIA(sPartition)
+  END IF
+
+
+
+
+END
+
+
+
+PUBLIC SUB MEDIA_SCAN()
+
+  DIM sCmd AS String
+  DIM sList AS String
+  DIM sDrives AS String[]
+  DIM sDrive AS String
+  DIM sMountPoint AS String
+  DIM sDump AS String
+  DIM i AS Integer
+
+
+
+  ClsGlobal.sSourceMnt = User.home &/ "mnt" &/ "cdrom"
+  sMountPoint = ClsGlobal.sSourceMnt
+
+  sCmd = "cat /proc/sys/dev/cdrom/info | grep \"drive name\" |cut -f2  
-d\':\'|xargs -n 2"
+  SHELL sCmd TO sList
+  sList = Trim(sList)
+  'PRINT sList
+    IF InStr(sList, Space(1)) > 0 THEN 'there is more than one drive
+    sDrives = Split(sList, Space(1))
+
+      FOR i = 0 TO sDrives.count - 1
+        ' this is where we loop to find SETUP.CONF in the cd
+          'first, clear the mount point (using $HOME/mnt/cdrom for now)
+          sDrive = Trim(sDrives[i])
+
+          SHELL "sudo mount /dev/" & sDrive & Space(1) & sMountPoint WAIT
+            IF Exist(sMountPoint &/ "veclinux" &/ "SETUP.CONF") = TRUE THEN
+               sDump = ME.ID_DISTRO(sMountPoint &/ "veclinux" &/ "SETUP.CONF")
+                'save a copy of SETUP.CONF in a temp disposable file
+                  ' this temp file will be named as the last 
characters of the drive that contains the distro (ie, hda, sg0, sda)
+                   ' this information will be used FOR reading the 
file later
+
+               File.Save(Temp$(sDrive), DConv(File.Load(sMountPoint 
&/ "veclinux" &/ "SETUP.CONF")))
+               'Message.Info(File.Load(Temp$(sDrive)))
+
+               IF FrmSelISO.lstInstallableImg.Find(sDump & " on " 
& "/dev/" & sDrive) = -1 THEN  'only add the entry if not found
+                FrmSelISO.lstInstallableImg.Add(sDump & " on " 
& "/dev/" & sDrive)
+              END IF
+
+
+            END IF
+          SHELL "sudo umount /dev/" & sDrive WAIT
+        NEXT
+
+    ELSE ' only one drive found
+    END IF
+
+
+          'NOW SEARCH FOR ISOS ON THE DRIVES
+    ME.SCAN_LINUX_PARTITIONS()
+ ' shape the main form according to the findings
+ 'warn the user if no installable media was found
+
+ IF FrmSelISO.lstInstallableImg.Count = 0 THEN
+  FrmSelISO.lstInstallableImg.Add("No Installable Media Found")
+  FrmSelISO.tlDistroDesc.Text = "Setup was unable to find any 
installable media on your system. Please insert your VectorLinux " &
+    "installation CD and click \'" & FrmSelISO.btResCan.Text & "\' to 
try again"
+  FMain.btnext.Enabled = FALSE
+  FMain.btnext.ForeColor = Color.Gray
+ ELSE
+  FMain.btnext.Enabled = TRUE
+  FMain.btnext.ForeColor = Color.Black
+ END IF
+
+
+
+END
+
+
+
+PUBLIC SUB main()
+
+ ME.MEDIA_SCAN
+  FMain.Show
+  'FMain.tvPlan.MoveTo("Prep0")
+FMain.tvPlan["Prep0"].Selected = TRUE
+
+
+'  FMain.tvPlan["Prep0"].Selected
+END
+
+PUBLIC FUNCTION ID_DISTRO(sPathToSetupConf AS String) AS String
+
+  DIM sRet AS String
+  DIM sFile AS String[]
+  DIM i AS Integer
+  DIM sLine AS String
+  DIM sName AS String
+  DIM sver AS String
+  DIM isep AS String
+
+  sFile = Split(DConv(File.Load(sPathToSetupConf)), gb.NewLine)
+
+  'PRINT "Analyzing contents"
+    FOR i = 0 TO sFile.Count - 1
+      sLine = Trim(sFile[i])
+
+          IF InStr(sLine, "\'") THEN
+            isep = "\'"
+          ELSE IF InStr(sLine, "\"") THEN
+            isep = "\""
+          END IF
+        IF Left(sLine, Len("DISTRO=")) = "DISTRO=" THEN
+           sName = Right(sLine, Len(sLine) - InStr(sLine, isep))
+
+        ELSE IF Left(sLine, Len("VERSION=")) = "VERSION=" THEN
+          sver = Right(sLine, Len(sLine) - InStr(sLine, isep))
+        END IF
+
+    NEXT
+
+          IF Right(sName) = isep THEN
+          sName = Left(sName, Len(sName) - 1)
+         END IF
+         IF Right(sver) = isep THEN
+          sver = Left(sver, Len(sver) - 1)
+         END IF
+
+
+RETURN sName & Space(1) & sver
+
+
+
+
+END
+
+
+PUBLIC SUB READ_SETUP_FILE()
+
+  'This module will read SETUP.CONF and set the necessary variables 
for the installer to work
+  DIM sFile AS String[]
+  DIM sLine AS String
+  DIM i AS Integer
+  DIM sDistro AS String
+  DIM sVer AS String
+  DIM sBuildDate AS String
+  DIM iMinRoot AS Integer 'may need to be variant-to-integer
+  DIM iMaxRoot AS Integer
+  DIM iMinSwap AS Integer
+  DIM iMinHome AS Integer
+  DIM sVal AS String
+  DIM iPost1 AS Integer
+  DIM sDelm AS String
+
+
+  WITH ClsGlobal
+.sBulkDir = .sSourceMnt &/ "veclinux"
+.sDocDir = .sSourceMnt &/ "doc"
+.sPackDir = .sSourceMnt &/ "packages"
+.sReadMePath = .sSourceMnt &/ "README"
+.sSetupConfPath = .sBulkDir &/ "SETUP.CONF"
+END WITH
+
+
+
+
+
+IF Exist(ClsGlobal.sSetupConfPath) THEN
+  sFile = Split(File.Load(DConv(ClsGlobal.sSetupConfPath)), gb.NewLine)
+    FOR i = 0 TO sFile.Count - 1
+      sLine = Trim(sFile[i])
+
+          IF InStr(sLine, "\"") THEN
+            sDelm = "\""
+          ELSE IF InStr(sLine, "\'") THEN
+            sDelm = "\'"
+          END IF
+        IF Left(sLine) <> "#" THEN 'if line is not commented
+          IF InStr(sLine, "=") THEN 'if there is a "=" in the line
+             sVal = Right(sLine, Len(sLine) - InStr(sLine, sDelm))
+             sVal = Left(sVal, Len(sVal) - 1)
+             'PRINT sVal
+
+          END IF
+
+
+        END IF
+
+
+          'PRINT sVal
+
+
+        IF Left(sLine, Len("DISTRO=")) = "DISTRO=" THEN
+          sDistro = sVal
+        ELSE IF Left(sLine, Len("VERSION=")) = "VERSION=" THEN
+          sVer = sVal
+        ELSE IF Left(sLine, Len("builddate")) = "builddate" THEN
+          sBuildDate = sVal
+        ELSE IF Left(sLine, Len("HD_ROOT_MIN=")) = "HD_ROOT_MIN=" THEN
+          iMinRoot = sVal
+        ELSE IF Left(sLine, Len("HD_ROOT_MAX")) = "HD_ROOT_MAX" THEN
+          iMaxRoot = sval
+        ELSE IF Left(sLine, Len("HD_SWAP")) = "HD_SWAP" THEN
+          iMinSwap = sval
+        ELSE IF Left(sLine, Len("HD_HOME")) = "HD_HOME" THEN
+          iMinHome = sval
+          '      BEGIN BULKS HERE ***************
+        ELSE IF Left(sLine, Len("BULK")) = "BULK" THEN
+        'PRINT "bulk"
+          ClsGlobal.sBulkList = ClsGlobal.sBulkList & "," & sval
+        ELSE IF Left(sLine, Len("CONF")) = "CONF" THEN
+          ClsGlobal.sConfPkg = ClsGlobal.sConfPkg & "," & sval
+
+        END IF
+      NEXT
+
+        'trim out the list of bulks
+          IF Left(ClsGlobal.sBulkList) = "," THEN
+            ClsGlobal.sBulkList = Right(ClsGlobal.sBulkList, 
Len(ClsGlobal.sBulkList) - 1)
+          END IF
+          IF Right(ClsGlobal.sBulkList) = "," THEN
+            ClsGlobal.sBulkList = Left(ClsGlobal.sBulkList, 
Len(ClsGlobal.sBulkList) - 1)
+          END IF
+
+          IF Left(ClsGlobal.sConfPkg) = "," THEN
+            ClsGlobal.sConfPkg = Right(ClsGlobal.sConfPkg, 
Len(ClsGlobal.sConfPkg) - 1)
+          END IF
+          IF Right(ClsGlobal.sConfPkg) = "," THEN
+            ClsGlobal.sConfPkg = Left(ClsGlobal.sConfPkg, 
Len(ClsGlobal.sConfPkg) - 1)
+          END IF
+    'Do something with all of these variables
+    ' we will need to assign them to the global class
+'    FMain.lstInstallableImg.Add(sDistro & Space(1) & sVer)
+    WITH FrmSelISO.tlDistroDesc
+      .Text = sDistro & Space(1) & sver & "<br>" &
+      "Build Date: " & sBuildDate & "<br>" &
+      "<b>MINIMUM REQUIREMENTS<br>" &
+      "/ " & iMinRoot & "<br>" &
+      "/home " & iMinHome & "<br>" &
+      "swap " & iMinSwap
+    END WITH
+      ' PRINT sDistro
+      ' PRINT sVer
+      ' PRINT sBuildDate
+      ' PRINT iMinHome
+      ' PRINT iMinRoot
+      ' PRINT iMinSwap
+      ' PRINT ClsGlobal.sBulkList
+      ' PRINT ClsGlobal.sConfPkg
+  ELSE
+    'File not found
+    Message.Error("Setup is unable to find SETUP.CONF in your install 
media. This could be symptoms of a bad burn or a bad ISO")
+    RETURN  ' exit
+
+  END IF
+
+
+END
+
+PUBLIC SUB SET_DECISSION(sSrcLocation AS String)
+
+  ' This sub will receive a string like "hda") and will read the file 
in it to
+  ' set the variables in clsglobal for the one distro that will be installed
+  DIM sFile AS String[]
+  DIM sLine AS String
+  DIM i AS Integer
+  DIM sFilePath AS String = ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF"
+  DIM squotetype AS String
+  DIM sLineVal AS String
+  DIM iRoot AS Variant
+  DIM iswap AS Variant
+  DIM ihome AS Variant
+
+  ClsGlobal.sBulkList = ""
+  ClsGlobal.sConfPkg = ""
+  'drive should already be mounted
+  'SHELL "sudo mount /dev/" & sDrive & Space(1) & ClsGlobal.sSourceMnt WAIT
+    IF Exist(sFilePath) THEN
+      sFile = Split(DConv(File.Load(sFilePath)), gb.NewLine)
+        FOR i = 0 TO sFile.Count - 1
+          sLine = Trim(sFile[i])
+
+             IF InStr(sLine, "\"") THEN
+              squotetype = "\""
+             ELSE IF InStr(sLine, "\'") THEN
+              squotetype = "\'"
+             END IF
+              IF Left(sLine) <> "#" THEN 'if line is not commented
+              IF InStr(sLine, "=") THEN 'if there is a "=" in the line
+                sLineVal = Right(sLine, Len(sLine) - InStr(sLine, squotetype))
+                sLineVal = Left(sLineVal, Len(sLineVal) - 1)
+              END IF
+
+                  IF Left(sLine, Len("HD_ROOT_MIN=")) = "HD_ROOT_MIN=" THEN
+                    iRoot = sLineVal
+                  ELSE IF Left(sLine, Len("HD_SWAP")) = "HD_SWAP" THEN
+                    iSwap = sLineVal
+                  ELSE IF Left(sLine, Len("HD_HOME")) = "HD_HOME" THEN
+                    iHome = sLineVal
+                  ELSE IF Left(sLine, Len("DISTRO=")) = "DISTRO=" THEN
+                    ClsGlobal.DISTRO = sLineVal
+                  ELSE IF Left(sLine, Len("VERSION=")) = "VERSION=" THEN
+                    ClsGlobal.VERSION = sLineVal
+
+                    '      BEGIN BULKS HERE ***************
+                  ELSE IF Left(sLine, Len("BULK")) = "BULK" THEN
+                  'PRINT "bulk"
+                    ClsGlobal.sBulkList = ClsGlobal.sBulkList & "," & sLineVal
+                  ELSE IF Left(sLine, Len("CONF")) = "CONF" THEN
+                    ClsGlobal.sConfPkg = ClsGlobal.sConfPkg & "," & sLineVal
+
+                  END IF
+
+
+              END IF
+
+
+      NEXT
+      ClsGlobal.iRootMin = CInt(iRoot)
+      ClsGlobal.iHomeMin = CInt(ihome)
+      ClsGlobal.iSwapMin = CInt(iswap)
+
+    ELSE 'i can't see the file
+      Message.Error("Cannot find SETUP.CONF")
+  END IF
+END
+
+
+PUBLIC SUB PREPARE_INSTALL_LAYOUT()
+WITH FMain.tvPlan
+  .Add("Prep", "Preparation", sCatPic)
+  .Add("Prep0", "Find installation media", sNowPic, "Prep")
+  .Add("Prep1", "Disk Partitioning", sToDopic, "Prep")
+  .Add("Prep2", "Regional Setup", sToDopic, "Prep")
+  .Add("Prep3", "Desktop Selection", sToDopic, "Prep")
+  .Add("Inst", "Installation", sCatPic)
+  .Add("Inst0", "Installation Summary", sToDopic, "Inst")
+  .Add("Inst1", "Install Operating System", sToDopic, "Inst")
+  .Add("Conf", "System Configuration", sCatPic)
+  .Add("Conf0", "Computer Name", sToDopic, "Conf")
+  .Add("Conf1", "System Administrator", sToDopic, "Conf")
+  .Add("Conf2", "Network Configuration", sToDopic, "Conf")
+  .Add("Conf3", "User Accounts", sToDopic, "Conf")
+  .Add("Conf4", "Hardware Configuration", sToDopic, "Conf")
+END WITH
+
+'expand the treeview
+ FMain.tvPlan.MoveFirst()
+ REPEAT
+ FMain.tvPlan.Item.Expanded = TRUE
+ UNTIL FMain.tvPlan.MoveBelow()
+
+
+
+
+' '
+' ' DIM sLabel AS TextLabel
+' ' DIM X AS Integer
+' ' DIM y AS Integer
+' ' DIM pPic AS PictureBox
+' ' DIM sPrepList AS String = "Find Install Media, License Agreement, Install"
+' ' DIM sPrepArr AS String[] = Split(sPrepList, ",")
+' ' DIM sCurrStep AS String
+' ' DIM i AS Integer
+' '
+' '   'first category
+' '   X = FMain.ScrollView1.X
+' '   Y = FMain.ScrollView1.y + 4
+' '     FOR i = 0 TO sPrepArr.Count - 1
+' '       sCurrStep = Trim(sPrepArr[i])
+' '         sLabel = NEW TextLabel(FMain.ScrollView1) AS "Preps"
+' '           WITH sLabel
+' '             '.Width = .Parent.Width
+' '             .x = x + 4
+' '             .y = Y + 4
+' '             .Text = sCurrStep
+' '             .Width = MdlObjSizer.get_object_width(.Text)
+' '             .Height = 27
+' '
+' '           END WITH
+' '           y = y + sLabel.Height
+' '         NEXT
+' '
+' '
+' '
+' '
+
+
+END
+
+
+
+
+PUBLIC FUNCTION CALCULATE_SWAP(iRam AS Integer) AS Integer
+
+  DIM iRec AS Integer
+    IF iRam > 196 THEN
+      iRec = 512
+    ELSE IF iRam > 127 THEN
+      iRec = 256
+    ELSE IF iRam > 63 THEN
+      iRec = 128
+    ELSE
+      iRec = 96
+    END IF
+
+    RETURN iRec
+
+
+END
+
+
+

Added: branches/iVL/MdlDiskPart.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlDiskPart.module	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,77 @@
+' Gambas module 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 EMBED_GPARTED()
+
+
+  DIM sTitle AS String
+  DIM aHandle AS NEW Pointer[]
+  DIM iHandle AS Integer
+  DIM i AS Integer = 0
+
+  'Desktop.Find("", "GParted")
+  FrmDiskPart.tlBanner.Text = "<h3>Loading gparted .... Please wait</h3>"
+  SHELL "sudo /usr/sbin/gparted"
+  WAIT 3
+
+  sTitle = "GParted"
+  IF Left(sTitle, 2) = "0x" THEN
+    iHandle = Val("&" & Mid$(sTitle, 3))
+  ELSE IF Left(sTitle) = "&" THEN
+    iHandle = Val(sTitle)
+  ELSE
+    'aHandle = Desktop.Find(sTitle)
+    aHandle = Desktop.Find(sTitle)
+    'Message.Info(aHandle[0])
+    IF aHandle.Count = 0 THEN
+      REPEAT
+        WAIT 2
+        aHandle = Desktop.Find(sTitle)
+        INC i
+      UNTIL
+      i = 10 OR aHandle.Count > 0
+        IF aHandle.Count = 0 THEN
+          Message("Setup is unable to successfully run gslapt on this 
system. This may be a sign of \n" &
+          "a bad install media. Setup cannot continue.")
+        RETURN
+        END IF
+
+    ELSE IF aHandle.Count >= 2 THEN
+      Message("Several windows found. I take the first one!")
+    ENDIF
+    iHandle = aHandle[0]
+
+  ENDIF
+
+  'TRY embEmbedder.Embed(iHandle)
+  TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
+
+  IF ERROR THEN Message.Warning(Error.Text)
+
+END
+
+PUBLIC FUNCTION FIND_DOS_PARTITIONS(sDev AS String) AS Boolean
+
+  ' this function will find any DOS partitions on the system
+  ' IF THERE ARE ANY DOS PARTITIONS AFTER THE DISK HAS BEEN MODIFIED, 
WE'LL NEED TO REBOOT
+  ' ELSE, THE INSTALLER CAN SAFELY CONTINUE
+
+
+END
+
+

Added: branches/iVL/MdlObjSizer.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlObjSizer.module	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,41 @@
+' Gambas module 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 fvirtfrm AS Form
+PUBLIC datemp AS DrawingArea
+PUBLIC SUB get_object_width(sText AS String) AS Integer
+
+
+  DIM iRetVal AS Integer
+
+
+  fvirtfrm = NEW Form
+  WITH fvirtfrm
+    .Width = 300
+    .Height = 200
+  END WITH
+  datemp = NEW DrawingArea(fvirtfrm)
+
+  Draw.Begin(datemp)
+  iRetVal = Draw.RichTextWidth(sText)
+  Draw.End
+  RETURN iRetVal
+
+
+END

Added: branches/iVL/MdlPartSel.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlPartSel.module	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,19 @@
+' Gambas module file
+
+' Gambas module 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/>.
+

Added: branches/iVL/MdlSetup.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlSetup.module	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,75 @@
+' Gambas module 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 GO_WITH_SELECTED(sDev AS String, sISONAME AS String) ' this 
will mount the drive and display the license agreement
+
+  DIM sPathToLic AS String = ClsGlobal.sSourceMnt &/ "COPYING"
+  DIM sAddy AS String = Right(sDev, Len(sDev) - RInStr(sDev, "/"))
+
+
+  IF sISONAME OR sISONAME <> "" THEN
+    'SHELL "sudo mount " & sDev & " /mnt/loop" WAIT ' will switch 
places here .. the device will mount to loop and the iso will mount to 
the mount point
+    SHELL "sudo mkdir -p /mnt" &/ sAddy & " && sudo mount " & sDev & 
Space(1) & "/mnt" &/ sAddy WAIT
+    SHELL "sudo mount -o loop /mnt" &/ sAddy &/ sISONAME & Space(1) & 
ClsGlobal.sSourceMnt WAIT
+
+    'SHELL "sudo umount /mnt/loop" WAIT
+  ELSE
+
+    SHELL "sudo mount -t iso9660 " & sDev & Space(1) & 
ClsGlobal.sSourceMnt WAIT
+  END IF
+
+  ' display the license agreement text
+  FrmLicense.taLicense.Text = SConv(File.Load(sPathToLic))
+
+  ' This will also set the default variables for distro name and 
version to clsglobal
+    MdlCore.SET_DECISSION(ClsGlobal.sSourceMnt)
+
+
+END
+
+
+ PUBLIC FUNCTION CHECK_IF_REBOOT_NEEDED() AS Boolean
+
+ ' KNOWN BUG:
+ ' This will make the user restart if there are FAT* partitions 
anywhere on the box
+ ' even if that drive was not modified
+ ' END OF BUG -- FIX SOON
+
+ DIM sFATList AS String
+ DIM sFAT32List AS String
+
+ SHELL "sudo probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\'" 
TO sFAT32List
+ SHELL "sudo probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'" 
TO sFATList
+
+ sFAT32List = Trim(sFAT32List)
+ sFATList = Trim(sFATList)
+
+ IF sFAT32List <> "" THEN
+  RETURN TRUE ' reboot needed
+ ELSE IF sFATList <> "" THEN
+  RETURN TRUE ' reboot needed
+ ELSE
+  RETURN FALSE ' no reboot needed
+ END IF
+
+
+
+
+END
+
+

Added: branches/iVL/Notes
==============================================================================
--- (empty file)
+++ branches/iVL/Notes	Fri Jul 11 05:03:45 2008
@@ -0,0 +1,7 @@
+1. prepare a mount point for cdrom
+2. clear mount point
+3. find cd drives
+4. mount drives one at a time
+loop
+
+TEST

Added: branches/iVL/images/arrow.png
==============================================================================
Binary file. No diff available.

Added: branches/iVL/images/check.png
==============================================================================
Binary file. No diff available.

Added: branches/iVL/images/circle.png
==============================================================================
Binary file. No diff available.

[Vectorlinux-devel] [vinstall-ng commit] r33 - branches/iVL

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

Author: M0E.lnx
Date: Fri Jul 11 04:49:41 2008
New Revision: 33

Added:
   branches/iVL/

Log:
Create branch for a new attempt at the installer