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

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

Author: M0E.lnx
Date: Wed Nov 26 11:49:26 2008
New Revision: 329

Modified:
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/.project
    branches/iVL/FrmSummary.class
    branches/iVL/installer.gambas

Log:
- Fixed problem with filesystem being reported wrong for ntfs partitions
- Added column to partition selection summary to include "Format Yes/No"  
value


Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Wed Nov 26 11:49:26 2008
@@ -26,55 +26,71 @@
  msgid "Full"
  msgstr ""

-#: FrmSummary.class:38
+#: FrmSummary.class:39
  msgid "Partition"
  msgstr ""

-#: FrmSummary.class:40
+#: FrmSummary.class:41
  msgid "Size"
  msgstr ""

-#: FrmSummary.class:42
+#: FrmSummary.class:43
  msgid "Filesystem"
  msgstr ""

-#: FrmSummary.class:44
+#: FrmSummary.class:45
  msgid "Mount Point"
  msgstr ""

-#: FrmSummary.class:50
+#: FrmSummary.class:46
+msgid "Format ?"
+msgstr ""
+
+#: FrmSummary.class:52
  msgid "Not Used"
  msgstr ""

-#: FrmSummary.class:91
+#: FrmSummary.class:58
+msgid "Do Not Format"
+msgstr ""
+
+#: FrmSummary.class:59
+msgid "Yes"
+msgstr ""
+
+#: FrmSummary.class:61
+msgid "No"
+msgstr ""
+
+#: FrmSummary.class:99
  msgid "None"
  msgstr ""

-#: FrmSummary.class:113
+#: FrmSummary.class:121
  msgid "Do not mount"
  msgstr ""

-#: FrmSummary.class:165
+#: FrmSummary.class:175
  msgid "Package Name"
  msgstr ""

-#: FrmSummary.class:174
+#: FrmSummary.class:184
  msgid "BULK PACKAGES"
  msgstr ""

-#: FrmSummary.class:201
+#: FrmSummary.class:211
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:277
+#: FrmSummary.class:287
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:287
+#: FrmSummary.class:297
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:297
+#: FrmSummary.class:307
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Nov 26 11:49:26 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.10
+Version=0.1.11
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Wed Nov 26 11:49:26 2008
@@ -32,9 +32,10 @@
      DIM cb AS ComboBox
      DIM cb1 AS ComboBox
      DIM tl AS TextLabel
+    DIM bForm AS String
      DIM sPart, sMountPnt, sFsType, sSize AS String

-    ME.GridView1.Columns.count = 4
+    ME.GridView1.Columns.count = 5
          ME.GridView1.Columns[0].text = ("Partition")
          ME.GridView1.Columns[0].Width =  
MdlObjSizer.get_object_width("/dev/hda1***")
          ME.GridView1.Columns[1].text = ("Size")
@@ -42,6 +43,7 @@
          ME.GridView1.Columns[2].text = ("Filesystem")
          ME.GridView1.Columns[2].Width =  
MdlObjSizer.get_object_width(("Filesystem")) * 1.25
          ME.GridView1.Columns[3].text = ("Mount Point")
+        ME.GridView1.Columns[4].Text = ("Format ?")
          'ME.GridView1.Columns[3].Width =  
MdlObjSizer.get_object_width(ME.GridView1.Columns[3].text)

          ' tricky part to list the partitions on the summary
@@ -53,6 +55,11 @@
                    sMountPnt = cb.Text
                      FOR EACH cb1 IN MdlPartSel.oFsTypes
                        IF cb1.tag = cb.tag THEN sFsType = cb1.Text
+                      IF cb1.Text <> ("Do Not Format") THEN
+                        bForm = ("Yes")
+                      ELSE
+                        bForm = ("No")
+                      END IF
                      NEXT
                        FOR EACH tl IN MdlPartSel.oPartLbls
                          IF tl.tag = cb.tag THEN
@@ -66,6 +73,7 @@
                      .GridView1[irow, 1].text = sSize
                      .GridView1[irow, 2].text = sFsType
                      .GridView1[irow, 3].Text = sMountPnt
+                    .GridView1[irow, 4].Text = bForm
                    END WITH
                  INC irow ' increase this value... this determines the row  
to use.
                  END IF
@@ -124,7 +132,9 @@
                NEXT

              'sFsType = "Windows"
-              SHELL "l=$(probepart | grep " & cb.tag & "); echo $l | cut  
-f 6,7 -d \' \'" TO sFsType
+              'SHELL "l=$(probepart | grep " & cb.tag & "); echo $l | cut  
-f 6,7 -d \' \'" TO sFsType
+              SHELL "probepart | grep ^" & cb.Tag & " | tr -s \' \'\"\" |  
cut -f 6 -d \' \'" TO sFsType
+              sFsType = Trim(sFsType)

              WITH ME
              .GridView1[irow, 0].text = sPart

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