[Vectorlinux-devel] [vinstall-ng commit] r500 - in branches/speedy: . .lang

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

Author: M0...@gm...
Date: Mon Feb 23 12:03:40 2009
New Revision: 500

Modified:
    branches/speedy/.lang/.pot
    branches/speedy/.lang/Step7b.pot
    branches/speedy/Step7b.class
    branches/speedy/Step7b.form

Log:
software selection complete

Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot	(original)
+++ branches/speedy/.lang/.pot	Mon Feb 23 12:03:40 2009
@@ -707,7 +707,7 @@
  msgid "Install the most minimal working confuguration (For older hardware)"
  msgstr ""

-#: Step7a.class:27 Step7b.class:21
+#: Step7a.class:27 Step7b.class:23
  msgid "Customize Your VectorLinux Installation"
  msgstr ""

@@ -715,7 +715,7 @@
  msgid "Component"
  msgstr ""

-#: Step7a.class:49
+#: Step7a.class:49 Step7b.class:27
  msgid "Description"
  msgstr ""

@@ -735,11 +735,11 @@
  msgid "Are you sure you want to disable this conponent anyway?"
  msgstr ""

-#: Step7a.class:151
+#: Step7a.class:151 Step7b.class:153
  msgid "Select All"
  msgstr ""

-#: Step7a.class:157
+#: Step7a.class:157 Step7b.class:151
  msgid "Un-Select All"
  msgstr ""

@@ -749,7 +749,11 @@
  "a component, click it's name or the box to the left of it's name."
  msgstr ""

-#: Step7b.class:83
+#: Step7b.class:26
+msgid "Package Name"
+msgstr ""
+
+#: Step7b.class:210
  msgid ""
  "Additional optional software available. Select which software packages  
to "
  "include in your installation."

Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot	(original)
+++ branches/speedy/.lang/Step7b.pot	Mon Feb 23 12:03:40 2009
@@ -14,11 +14,27 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: Step7b.class:21
+#: Step7b.class:23
  msgid "Customize Your VectorLinux Installation"
  msgstr ""

-#: Step7b.class:83
+#: Step7b.class:26
+msgid "Package Name"
+msgstr ""
+
+#: Step7b.class:27
+msgid "Description"
+msgstr ""
+
+#: Step7b.class:151
+msgid "Un-Select All"
+msgstr ""
+
+#: Step7b.class:153
+msgid "Select All"
+msgstr ""
+
+#: Step7b.class:210
  msgid "Additional optional software available. Select which software  
packages to include in your installation."
  msgstr ""


Modified: branches/speedy/Step7b.class
==============================================================================
--- branches/speedy/Step7b.class	(original)
+++ branches/speedy/Step7b.class	Mon Feb 23 12:03:40 2009
@@ -15,12 +15,75 @@
  '    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 PicYes AS Picture
+PRIVATE PicNo AS Picture

  PUBLIC SUB Form_Open()

    ME.tlbanner.Text = "<h2>" & ("Customize Your VectorLinux Installation")  
& "</h2>"
+    ME.gvOptions.Rows.count = 3
+    ME.gvOptions.Columns.count = 4
+    ME.gvOptions[0, 1].Text = ("Package Name")
+    ME.gvOptions[0, 2].Text = ("Description")
+    ME.gvOptions[0, 1].Font.Bold = TRUE
+    ME.gvOptions[0, 2].Font.Bold = TRUE
+    ME.gvOptions[0, 0].BackColor = Color.LightBackground
+    ME.gvOptions[0, 1].BackColor = Color.LightBackground
+    ME.gvOptions[0, 2].BackColor = Color.LightBackground
+    ME.gvOptions.Rows[1].Height = 5
+    ME.gvOptions.Columns[0].Width = 24
+    ME.gvOptions.Columns[1].Width = 150
+    ME.gvOptions.Columns[2].Width = 300
+
+    picYes = Picture.Load("images/16px-check.png")
+    picNo = Picture.Load("images/16px-Nocheck.png")
+
+    ME.LIST_OPTIONAL_PACKAGES()

  END
+
+PUBLIC SUB LIST_OPTIONAL_PACKAGES()
+
+  DIM irow, i AS Integer
+  DIM sDescDump, sFile, sLine, sPkg, sDesc, sShortDesc AS String
+  DIM sArr, sDescArr AS String[]
+
+  irow = 2
+
+    IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN
+    sArr = Split(File.Load("/mnt/source/veclinux/OPTIONAL"), "\n")
+      FOR i = 0 TO sArr.Max
+        sLine = Trim(sArr[i])
+        sPkg = sLine
+        SHELL "cat /mnt/source/PACKAGES.TXT | grep \"^" & sPkg & "\" | cut  
-f 2 -d \':\' " TO sDescDump
+          sDescDump = Trim(sDescDump)
+          IF sDescDump THEN
+            sDescArr = Split(sDescDump, "\n")
+            sShortDesc = Trim(sDescArr[0])
+            sShortDesc = Replace(sShortDesc, sPkg, "")
+            sShortDesc = Replace(sShortDesc, "(", "")
+            sShortDesc = Replace(sShortDesc, ")", "")
+            sShortDesc = Trim(sShortDesc)
+            sShortDesc = UCase(Left(sShortDesc, 1)) & Right(sShortDesc,  
Len(sShortDesc) - 1)
+            sDesc = Trim(sDescDump)
+          ELSE
+            sShortDesc = ""
+            sDesc = ""
+          END IF
+
+        gvOptions[irow, 0].Picture = PicYes
+        gvOptions[irow, 1].Text = sPkg
+        gvOptions[irow, 2].Text = Trim(sShortDesc)
+        gvOptions[irow, 3].Text = Trim(sDesc)
+        INC gvOptions.Rows.Count
+      INC irow
+      NEXT
+
+
+
+END
+
+
  PUBLIC SUB OnExit()


@@ -35,4 +98,63 @@

    RETURN "Step8"

+END
+
+PUBLIC SUB Form_Resize()
+
+  'gvBulkSel.Columns[2].Width = gvBulkSel.Width -  
(gvBulkSel.ColumnAt(gvBulkSel[0, 2].Left) + gvBulkSel.Columns[1].Width +  
gvBulkSel.Columns[0].width + 4)
+  gvOptions.Columns[2].Width = gvOptions.Width -  
(gvOptions.ColumnAt(gvOptions[0, 3].Left) + (gvOptions.Columns[0].Width +  
gvOptions.Columns[1].Width)) - gvOptions.Columns[0].Width + 4 ' +  
gvOptions.Columns[1].Width + gvOptions.Columns[0].width)
+  gvOptions.Columns[3].Width = 0
+
+END
+
+PUBLIC SUB TOGGLE_SELECTION(BsELECTaLL AS Boolean)
+
+  DIM irow AS Integer
+  IF BsELECTaLL = TRUE THEN
+    FOR irow = 2 TO gvOptions.Rows.Count - 1
+      gvOptions[irow, 0].Picture = PicYes
+    NEXT
+  ELSE
+    FOR irow = 2 TO gvOptions.Rows.Count - 1
+      gvOptions[irow, 0].Picture = PicNo
+    NEXT
+  END IF
+
+END
+
+
+PUBLIC SUB gvOptions_Click()
+
+IF LAST.row = 0 OR LAST.row = 1 THEN RETURN
+
+IF LAST.column = 0 OR LAST.column = 1 THEN
+  IF gvOptions[LAST.row, 0].Picture = PicYes THEN
+    gvOptions[LAST.row, 0].Picture = PicNo
+  ELSE
+    gvOptions[LAST.row, 0].Picture = PicYes
+  END IF
+ELSE IF LAST.column = 2 THEN
+  IF gvOptions[LAST.row, 3].Text THEN
+    Balloon(gvOptions[LAST.row, 3].Text, gvOptions, gvOptions[LAST.row,  
0].picture, gvOptions[LAST.row, LAST.column].left + 4, gvOptions[LAST.row,  
LAST.column].y + 12)
+  END IF
+ELSE
+  RETURN
+  STOP EVENT
+END IF
+
+gvOptions.Refresh
+END
+
+PUBLIC SUB btTglSel_Click()
+
+  IF LAST.text = ("Un-Select All") THEN
+    ME.TOGGLE_SELECTION(FALSE)
+    ME.btTglSel.Text = ("Select All")
+  ELSE
+    ME.TOGGLE_SELECTION(TRUE)
+    ME.btTglSel.Text = ("Un-Select All")
+  END IF
+  gvOptions.Refresh
+
  END

Modified: branches/speedy/Step7b.form
==============================================================================
--- branches/speedy/Step7b.form	(original)
+++ branches/speedy/Step7b.form	Mon Feb 23 12:03:40 2009
@@ -27,4 +27,25 @@
        Text = ("Additional optional software available. Select which  
software packages to include in your installation.")
      }
    }
+  { Panel1 Panel
+    MoveScaled(1,16,59,28)
+    Expand = True
+    Arrangement = Arrange.Fill
+    { gvOptions GridView
+      MoveScaled(3,3,51,16)
+      Expand = True
+      Border = False
+    }
+  }
+  { HBox4 HBox
+    MoveScaled(1,44,7,1)
+  }
+  { HBox3 HBox
+    MoveScaled(1,46,37,3)
+    { btTglSel ToggleButton
+      MoveScaled(0,0,24,3)
+      Text = ("Un-Select All")
+      Picture = Picture["icon:/16/refresh"]
+    }
+  }
  }