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

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

Author: M0...@gm...
Date: Sun Jul 20 16:10:16 2008
New Revision: 61

Modified:
   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/FrmPkgSel.pot
   branches/iVL/.lang/FrmSelISO.pot
   branches/iVL/.lang/FrmSummary.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/MdlPkgSel.pot
   branches/iVL/.lang/MdlSetup.pot
   branches/iVL/.lang/MdlSummarize.pot
   branches/iVL/.lang/MdlWinDrives.pot
   branches/iVL/FrmPartSel.class
   branches/iVL/FrmPartSel.form
   branches/iVL/MdlPartSel.module

Log:
Fixed problem in FrmPartSel and MdlPartSel to make sure virtual objects 
are perfectly aligned. Just a cosmetic fix

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/ClsGlobal.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/ClsPartSel.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/ClsWinDrives.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FMain.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmDiskPart.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmLicense.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmPartScheme.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmPartSel.class
+# /root/gui-installer/FrmPartSel.class
 # Generated by Gambas compiler

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

-#: FrmPartSel.class:146
+#: 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:154
-msgid "<b>Partition</b>"
-msgstr ""
-
-#: FrmPartSel.class:160
-msgid "<b>Mount Point</b>"
-msgstr ""
-
-#: FrmPartSel.class:166
-msgid "<b>File System</b>"
-msgstr ""
-
-#: FrmPartSel.class:173
+#: FrmPartSel.class:152
  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:174
+#: FrmPartSel.class:153
 msgid "Detect and Setup Windows partitions for auto-mounting at boot"
 msgstr ""


Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot	(original)
+++ branches/iVL/.lang/FrmPkgSel.pot	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmPkgSel.class
+# /root/gui-installer/FrmPkgSel.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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmSelISO.class
+# /root/gui-installer/FrmSelISO.class
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmSummary.class
+# /root/gui-installer/FrmSummary.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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/FrmWinDrives.class
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlCore.module
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlDiskPart.module
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlObjSizer.module
+# /root/gui-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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlPartSel.module
+# /root/gui-installer/MdlPartSel.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot	(original)
+++ branches/iVL/.lang/MdlPkgSel.pot	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlPkgSel.module
+# /root/gui-installer/MdlPkgSel.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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlSetup.module
+# /root/gui-installer/MdlSetup.module
 # Generated by Gambas compiler

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot	(original)
+++ branches/iVL/.lang/MdlSummarize.pot	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlSummarize.module
+# /root/gui-installer/MdlSummarize.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	Sun Jul 20 16:10:16 2008
@@ -1,4 +1,4 @@
-# /root/new-inst/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
 # 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 20 16:10:16 2008
@@ -39,9 +39,9 @@
     .tlBanner.Width = .ClientWidth - 16
     .scrollPartitions.Resize(.ClientWidth - 12, .ClientHeight 
- .tlBanner.Height - (cbDoWin.Height * 2))
     .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.9), .tlPartRow.top)
+'   .tlPartRow.Move(4, 4)
+'   .tlPartRow2.Move(.tlPartRow.Left + (.tlPartRow.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/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form	(original)
+++ branches/iVL/FrmPartSel.form	Sun Jul 20 16:10:16 2008
@@ -9,24 +9,9 @@
   }
   { scrollPartitions ScrollView
     MoveScaled(1,16,69,33)
-    { 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
-    }
   }
   { cbDoWin CheckBox
-    MoveScaled(1,50,57,3.375)
+    MoveScaled(1,50,57,3.3333)
      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/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module	(original)
+++ branches/iVL/MdlPartSel.module	Sun Jul 20 16:10:16 2008
@@ -27,7 +27,7 @@
   DIM sPart AS String
   DIM sSize AS String
   DIM i AS Integer
-  DIM y AS Integer
+  DIM x, y AS Integer
   DIM sDump1 AS String ' partition list dump
   DIM lbwidth AS Integer = 0
   DIM sSwapList AS String
@@ -36,6 +36,7 @@
   DIM i3drdrowX AS Integer
   DIM iX AS Integer
   DIM iWidth AS Integer
+  DIM iCol1, icol2, iCol3 AS Integer
   ' fire up the arrays
   oFsTypes = NEW Object[]
   oMountPoints = NEW Object[]
@@ -46,10 +47,44 @@
   sDump1 = Trim(sDump1)


-    y = FrmPartSel.tlPartRow.top + FrmPartSel.tlPartRow.Height + 8
+    y = 4
+    x = 8

     IF InStr(sDump1, gb.NewLine) > 0 THEN
       sPartList = Split(sDump1, gb.NewLine)
+
+          ' create header labels
+          tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
+            WITH tl
+              .Text = "PARTITION"
+              .Height = 27
+              .x = x
+              .y = y
+              .Width = MdlObjSizer.get_object_width(.text) * 2.5
+            END WITH
+            icol1 = x
+            icol2 = x + tl.Width + 4
+          tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
+            WITH tl
+              .text = "MOUNT POINT"
+              .Height = 27
+              .x = icol2
+              .y = y
+              .Width = MdlObjSizer.get_object_width(.text) * 2.5
+            END WITH
+              icol3 = tl.x + tl.Width + 4
+          tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "HEADERS"
+            WITH tl
+              .text = "FILESYSTEM"
+              .Height = 27
+              .x = icol3
+              .y = y
+              .Width = MdlObjSizer.get_object_width(.text) * 2.5
+            END WITH
+            y = y + 20
+
+
+
         FOR i = 0 TO sPartList.Count - 1
           sPart = Right(sPartList[i], Len(sPartList[i]) - RInStr(sPartList[i], "/"))
             'Message.Info(sPart)
@@ -77,7 +112,7 @@
                     .Width = lbwidth
                     END IF
                   .Height = 27
-                  .x = FrmPartSel.tlPartRow.Left
+                  .x = icol1 'FrmPartSel.tlPartRow.Left
                   .Alignment = Align.Normal
                   .y = y
                 END WITH
@@ -87,7 +122,7 @@
                 WITH cb
                 .tag = Trim(sPartList[i])
                 '.x = lbwidth + 24
-                .X = FrmPartSel.tlPartRow2.Left
+                .X = icol2 'FrmPartSel.tlPartRow2.Left
                 .y = y
                 .Height = tl.Height
                 .Width = tl.Width
@@ -108,7 +143,7 @@
                   WITH cb
                   .Tag = Trim(sPartList[i])
                   '.x = i3drdrowX
-                  .x = FrmPartSel.tlPartRow3.Left
+                  .x = iCol3 'FrmPartSel.tlPartRow3.Left
                   .y = y
                   .ReadOnly = TRUE
                   .Width = tl.Width
@@ -156,7 +191,7 @@
               tl = NEW TextLabel(FrmPartSel.scrollPartitions) AS "swlabel"
                 WITH tl
                   '.x = .Parent.x
-                  .x = FrmPartSel.tlPartRow.Left
+                  .x = icol1 'FrmPartSel.tlPartRow.Left
                   .y = y
                   .Text = sPart & " ( " & CStr(iswapsize) & "G )"
                   .Width = lbwidth
@@ -172,7 +207,7 @@
                   WITH cb
                     .y = y
                     '.x = lbwidth + 24
-                    .x = FrmPartSel.tlPartRow2.Left
+                    .x = icol2 'FrmPartSel.tlPartRow2.Left
                     .Width = tl.Width
                     .tag = "swapSelection"
                     .ReadOnly = TRUE