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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: M0...@gm...
Date: Mon Feb 23 07:40:01 2009
New Revision: 499

Removed:
    branches/speedy/images/arrow.png
    branches/speedy/images/arrow_old.png
    branches/speedy/images/check.png
    branches/speedy/images/check_old.png
    branches/speedy/images/circle.png
    branches/speedy/images/circle_old.png
    branches/speedy/images/throbber.gif_old
    branches/speedy/images/throbber.gif_simple
Modified:
    branches/speedy/.lang/.pot
    branches/speedy/.lang/Step7a.pot
    branches/speedy/Step1.class
    branches/speedy/Step7a.class

Log:
Implemented change in Config file name/contents. Removed un-used icons

Modified: branches/speedy/.lang/.pot
==============================================================================

--- branches/speedy/.lang/.pot	(original)
+++ branches/speedy/.lang/.pot	Mon Feb 23 07:40:01 2009
@@ -170,7 +170,7 @@
  msgid "This feature can help you avoid an unsuccesful installation."
  msgstr ""

-#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:139
+#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:125
  msgid "WARNING:"
  msgstr ""

@@ -451,11 +451,11 @@
  msgid "This step cannot be undone. Are you sure you want to continue?"
  msgstr ""

-#: Step3a1a.class:169 Step6.class:386 Step7a.class:139
+#: Step3a1a.class:169 Step6.class:386 Step7a.class:125
  msgid "Yes"
  msgstr ""

-#: Step3a1a.class:169 Step6.class:386 Step7a.class:139
+#: Step3a1a.class:169 Step6.class:386 Step7a.class:125
  msgid "No"
  msgstr ""

@@ -719,31 +719,31 @@
  msgid "Description"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid ""
  "This component is a dependancy to any graphical user interface progam on  
the "
  "system"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid ""
  "Choosing not to install this may result in a command-line (text mode) "
  "installation only"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "Are you sure you want to disable this conponent anyway?"
  msgstr ""

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

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

-#: Step7a.class:231
+#: Step7a.class:217
  msgid ""
  "Major optional components available for installation. To select /  
un-select "
  "a component, click it's name or the box to the left of it's name."

Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot	(original)
+++ branches/speedy/.lang/Step7a.pot	Mon Feb 23 07:40:01 2009
@@ -26,39 +26,39 @@
  msgid "Description"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "WARNING:"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "This component is a dependancy to any graphical user interface  
progam on the system"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "Choosing not to install this may result in a command-line (text  
mode) installation only"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "Are you sure you want to disable this conponent anyway?"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "Yes"
  msgstr ""

-#: Step7a.class:139
+#: Step7a.class:125
  msgid "No"
  msgstr ""

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

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

-#: Step7a.class:231
+#: Step7a.class:217
  msgid "Major optional components available for installation. To select /  
un-select a component, click it's name or the box to the left of it's name."
  msgstr ""


Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class	(original)
+++ branches/speedy/Step1.class	Mon Feb 23 07:40:01 2009
@@ -139,13 +139,13 @@
        sKeyPath = "/mnt" &/ Trim(sPart)
            TRY MKDIR sKeyPath
            SHELL "mount /dev" &/ Trim(sPart) & " /mnt" &/ Trim(sPart) & "  
2>/dev/null" WAIT
-            IF Exist(sKeyPath &/ "veclinux" &/ "SETUP.CONF") THEN
+            IF Exist(sKeyPath &/ "veclinux" &/ "VINSTALL.CONF") THEN
                ' Must read file first before we have anything to list
-                SHELL "grep \"^DISTRO=\" " & sKeyPath &/ "veclinux"  
&/ "SETUP.CONF | cut -f 2 -d \"\'\"" TO sName
-                SHELL "grep \"^VERSION=\" " & sKeyPath &/ "veclinux"  
&/ "SETUP.CONF | cut -f 2 -d \"\'\"" TO sVersion
+                SHELL "grep \"^DISTRO=\" " & sKeyPath &/ "veclinux"  
&/ "VINSTALL.CONF | cut -f 2 -d \"\'\"" TO sName
+                SHELL "grep \"^VERSION=\" " & sKeyPath &/ "veclinux"  
&/ "VINSTALL.CONF | cut -f 2 -d \"\'\"" TO sVersion
                  sName = Trim(sName)
                  sVersion = Trim(sVersion)
-                  File.Save(Temp(Trim(sName) & "-" & Trim(sVersion) & "-"  
& Trim(sPart)), File.Load(sKeyPath &/ "veclinux" &/ "SETUP.CONF"))
+                  File.Save(Temp(Trim(sName) & "-" & Trim(sVersion) & "-"  
& Trim(sPart)), File.Load(sKeyPath &/ "veclinux" &/ "VINSTALL.CONF"))
                    ComboBox1.Add(Trim(sname) & "-" & Trim(sVersion) &  
Space(1) & ("on") & Space(1) & Trim(sPart))
                      PRINT " \\__" & Space(1) & ("Found") & Space(1) &  
Trim(sname) & Space(1) & Trim(sVersion) & Space(1) & ("in partition") &  
Space(1) & Trim(sPart)

@@ -202,12 +202,12 @@
          'EXEC ["mount", "-o", "ro", Trim(sDriveList[i]), "/mnt" &/  
sShortDrive] WAIT
          SHELL "mount " & Trim(sDriveList[i]) & Space(1) & "/mnt" &/  
sShortDrive & " 2>/dev/null" WAIT
          PRINT ("Scanning") & Space(1) & sDriveList[i]
-          IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "SETUP.CONF")  
THEN
-              SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux"  
&/ "SETUP.CONF | cut -f 2 -d \'=\'" TO sName
-              SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux"  
&/ "SETUP.CONF | cut -f 2 -d \'=\'" TO sVersion
+          IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF")  
THEN
+              SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux"  
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
+              SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux"  
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
                  sName = Trim(Replace(sName, "\'", ""))
                  sVersion = Trim(Replace(sVersion, "\'", ""))
-                File.Save(Temp(sShortDrive), File.Load("/mnt" &/  
sShortDrive &/ "veclinux" &/ "SETUP.CONF"))
+                File.Save(Temp(sShortDrive), File.Load("/mnt" &/  
sShortDrive &/ "veclinux" &/ "VINSTALL.CONF"))
                    IF ME.ComboBox1.Find(sName & Space(1) & sVersion &  
Space(1) & ("on") & Space(1) & Trim(sShortDrive)) = -1  
THEN 'Trim(sDriveList[i])) = -1 THEN
                      ME.ComboBox1.Add(sName & Space(1) & sVersion &  
Space(1) & ("on") & Space(1) & Trim(sShortDrive)) 'Trim(sDriveList[i]))
                    END IF
@@ -252,9 +252,9 @@
              FOR EACH sFile IN Dir("/mnt" &/ Trim(sPart), "*.iso")
                  TRY MKDIR "/mnt/loop"
                    EXEC ["mount", "-o", "loop", "/mnt" &/ Trim(sPart) &/  
Trim(sFile), "/mnt/loop"] WAIT
-                    IF Exist("/mnt/loop/veclinux/SETUP.CONF") THEN
+                    IF Exist("/mnt/loop/veclinux/VINSTALL.CONF") THEN
                      'PRINT "Adding temp file" & Space(1) &  
Temp(Trim(sFile) & "-" & Trim(sPart))
-                      File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)),  
File.Load("/mnt/loop/veclinux/SETUP.CONF"))
+                      File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)),  
File.Load("/mnt/loop/veclinux/VINSTALL.CONF"))
                        ComboBox1.Add(sFile & Space(1) & ("on") & Space(1)  
& "/dev" &/ Trim(sPart))
                        'Message(sFile & "-" & Trim(sPart))
                        PRINT " \\__" & Space(1) & ("Found") & Space(1) &  
Trim(sFile) & Space(1) & ("on") & Space(1) & Trim(sPart)

Modified: branches/speedy/Step7a.class
==============================================================================
--- branches/speedy/Step7a.class	(original)
+++ branches/speedy/Step7a.class	Mon Feb 23 07:40:01 2009
@@ -61,48 +61,34 @@
  PUBLIC SUB LIST_OPTIONAL_BULKS()

    DIM sLine, sFile AS String '=  
File.Load("/mnt/source/veclinux/SETUP.CONF")
-  DIM sArr AS String[]
+  DIM sArr, sLineArr AS String[]
    DIM i, irow AS Integer
-  DIM sDesc AS String
+  DIM sName, sDesc AS String

-  IF Exist("/mnt/source/veclinux/SETUP.CONF") THEN
-    sFile = File.Load("/mnt/source/veclinux/SETUP.CONF")
+  irow = 2
+  IF Exist("/mnt/source/veclinux/VINSTALL.CONF") THEN
+    sFile = File.Load("/mnt/source/veclinux/VINSTALL.CONF")
      sArr = Split(sFile, "\n")
+      FOR i = 0 TO sArr.Max
+        sLine = Trim(sArr[i])
+        sLine = Trim(Right(sLine, Len(sLine) - InStr(sLine, "=")))
+        sLine = Replace(sLine, "\'", "")
+          IF InStr(sLine, "OPT") THEN
+          INC gvBulkSel.Rows.Count
+            sLineArr = Split(sLine, ":")
+            sName = Trim(sLineArr[1])
+            sDesc = Trim(sLineArr[3])
+            gvBulkSel[irow, 1].Text = Trim(sname)
+            gvBulkSel[irow, 0].Picture = picYes
+            gvBulkSel[irow, 2].Text = Trim(sDesc)
+          INC irow
+          END IF
+      NEXT
+
+
    ELSE
    END IF
-  irow = 2
-  FOR EACH sLine IN Dir("/mnt/source/veclinux/")
-    IF sLine LIKE "SETUP.CONF" THEN
-    ELSE
-      INC gvBulkSel.Rows.Count
-      gvBulkSel[irow, 1].Text = Trim(sLine)
-
-      gvBulkSel[irow, 0].Picture = picYes ' enabled by default
-      SHELL "grep \"" & sLine & "\" /mnt/source/veclinux/SETUP.CONF | cut  
-f 3 -d \':\'" TO sDesc
-      'Message(sDesc)
-      sDesc = Replace(sDesc, "\'", "")
-      sDesc = Replace(sDesc, "\"", "")
-      gvBulkSel[irow, 2].Text = Trim(sDesc)
-      ' cbBulk = NEW CheckBox(ME.Panel1) AS "cbBulkSel"
-      '   WITH cbBulk
-      '     .Move(gvBulkSel.RowAt(gvBulkSel[irow, 0].top),  
gvBulkSel.ColumnAt(gvBulkSel[irow, 0].Left))
-      '     '.Move(gvBulkSel.ColumnAt(gvBulkSel[irow, 0].Left),  
gvBulkSel.RowAt(gvBulkSel[irow, 0].top))
-      '     .Height = 21
-      '     .tag = Trim(sLine)
-      '     .Visible = TRUE
-      '     .Value = TRUE
-      '   END WITH
-      INC irow
-
-    END IF

-  NEXT
-
-
-
-  'FOR i = 0 TO sArr.Max
-   ' sLine = Trim(sArr[i])
-

  END



