Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r502 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-02-23 23:04:05
|
Author: M0...@gm...
Date: Mon Feb 23 14:30:56 2009
New Revision: 502
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/ClsGlobal.class
branches/speedy/Step6.class
branches/speedy/Step7a.class
branches/speedy/Step7b.class
branches/speedy/Step7b.form
Log:
Finished software selection... started collecting information from user
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Feb 23 14:30:56 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:127
+#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143
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:127
+#: Step3a1a.class:169 Step6.class:441 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:386 Step7a.class:127
+#: Step3a1a.class:169 Step6.class:441 Step7a.class:143
msgid "No"
msgstr ""
@@ -635,47 +635,47 @@
msgid "Restart Now"
msgstr ""
-#: Step6.class:59
+#: Step6.class:66
msgid "Partition"
msgstr ""
-#: Step6.class:60
+#: Step6.class:67
msgid "Size"
msgstr ""
-#: Step6.class:61
+#: Step6.class:68
msgid "Mount Point"
msgstr ""
-#: Step6.class:62
+#: Step6.class:69
msgid "File System"
msgstr ""
-#: Step6.class:134
+#: Step6.class:141
msgid "Not Used"
msgstr ""
-#: Step6.class:155
+#: Step6.class:162
msgid "Do not format"
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "You have already selected"
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "as your"
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "partition."
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:281
+#: Step6.class:336
msgid "Select which partitions to use for installation"
msgstr ""
@@ -715,49 +715,49 @@
msgid "Component"
msgstr ""
-#: Step7a.class:49 Step7b.class:27
+#: Step7a.class:49 Step7b.class:28
msgid "Description"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid ""
"This component is a dependancy to any graphical user interface progam on
the "
"system"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid ""
"Choosing not to install this may result in a command-line (text mode) "
"installation only"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "Are you sure you want to disable this conponent anyway?"
msgstr ""
-#: Step7a.class:153 Step7b.class:164
+#: Step7a.class:169 Step7b.class:180
msgid "Select All"
msgstr ""
-#: Step7a.class:159 Step7b.class:162
+#: Step7a.class:175 Step7b.class:178
msgid "Un-Select All"
msgstr ""
-#: Step7a.class:219
+#: Step7a.class:235
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 ""
-#: Step7b.class:26
+#: Step7b.class:27
msgid "Package Name"
msgstr ""
-#: Step7b.class:54
+#: Step7b.class:58
msgid "Reading software catalog... Please wait a moment"
msgstr ""
-#: Step7b.class:93
+#: Step7b.class:104
msgid ""
"Additional optional software available. Select which software packages
to "
"include in your installation."
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Mon Feb 23 14:30:56 2009
@@ -14,55 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step6.class:59
+#: Step6.class:66
msgid "Partition"
msgstr ""
-#: Step6.class:60
+#: Step6.class:67
msgid "Size"
msgstr ""
-#: Step6.class:61
+#: Step6.class:68
msgid "Mount Point"
msgstr ""
-#: Step6.class:62
+#: Step6.class:69
msgid "File System"
msgstr ""
-#: Step6.class:134
+#: Step6.class:141
msgid "Not Used"
msgstr ""
-#: Step6.class:155
+#: Step6.class:162
msgid "Do not format"
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "You have already selected"
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "as your"
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "partition."
msgstr ""
-#: Step6.class:200
+#: Step6.class:207
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:281
+#: Step6.class:336
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:386
+#: Step6.class:441
msgid "Yes"
msgstr ""
-#: Step6.class:386
+#: Step6.class:441
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Mon Feb 23 14:30:56 2009
@@ -26,39 +26,39 @@
msgid "Description"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "This component is a dependancy to any graphical user interface
progam on the system"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "Choosing not to install this may result in a command-line (text
mode) installation only"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "Are you sure you want to disable this conponent anyway?"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step7a.class:127
+#: Step7a.class:143
msgid "No"
msgstr ""
-#: Step7a.class:153
+#: Step7a.class:169
msgid "Select All"
msgstr ""
-#: Step7a.class:159
+#: Step7a.class:175
msgid "Un-Select All"
msgstr ""
-#: Step7a.class:219
+#: Step7a.class:235
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/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Mon Feb 23 14:30:56 2009
@@ -18,27 +18,27 @@
msgid "Customize Your VectorLinux Installation"
msgstr ""
-#: Step7b.class:26
+#: Step7b.class:27
msgid "Package Name"
msgstr ""
-#: Step7b.class:27
+#: Step7b.class:28
msgid "Description"
msgstr ""
-#: Step7b.class:54
+#: Step7b.class:58
msgid "Reading software catalog... Please wait a moment"
msgstr ""
-#: Step7b.class:93
+#: Step7b.class:104
msgid "Additional optional software available. Select which software
packages to include in your installation."
msgstr ""
-#: Step7b.class:162
+#: Step7b.class:178
msgid "Un-Select All"
msgstr ""
-#: Step7b.class:164
+#: Step7b.class:180
msgid "Select All"
msgstr ""
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Mon Feb 23 14:30:56 2009
@@ -35,6 +35,25 @@
STATIC PUBLIC sTargetRoot AS String ' we know by default this is a
reiserfs partition
STATIC PUBLIC sTargetSwap AS String
+' PARTITIONS SELECTED
+STATIC PUBLIC sRoot AS String
+STATIC PUBLIC froot AS String
+STATIC PUBLIC shome AS String
+STATIC PUBLIC fhome AS String
+STATIC PUBLIC sopt AS String
+STATIC PUBLIC fopt AS String
+STATIC PUBLIC susr AS String
+STATIC PUBLIC fusr AS String
+STATIC PUBLIC stmp AS String
+STATIC PUBLIC ftmp AS String
+STATIC PUBLIC svar AS String
+STATIC PUBLIC fvar AS String
+STATIC PUBLIC sboot AS String
+STATIC PUBLIC fboot AS String
+
+STATIC PUBLIC sVitalPartList AS String
+STATIC PUBLIC sMiscMountList AS String
+
STATIC PUBLIC sFullDiscToWipe AS String
' Installation method variable
@@ -42,4 +61,9 @@
' 1 = CUSTOMIZED INSTALL
' 2 = MINIMAL INSTALL
STATIC PUBLIC iInstallMethod AS Integer
+
+' INSTALLATION DETAILS
+
+STATIC PUBLIC sBulkListToInstall AS String
+STATIC PUBLIC sPkgListToInstall AS String
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Mon Feb 23 14:30:56 2009
@@ -30,19 +30,26 @@
PUBLIC SUB OnExit()
DIM n AS Integer
- DIM sFmtAs AS String
+ DIM sFmtAs, sList, sPartAddr AS String
+ ClsGlobal.sVitalPartList = ""
FOR n = 1 TO gvPartListing.Rows.Count - 1
IF gvPartListing[n, 2].Text THEN
+ sPartAddr = gvPartListing[n, 2].Text
IF gvPartListing[n, 4].Text THEN
sFmtAs = gvPartListing[n, 4].Text
ELSE
sFmtAs = gvPartListing[n, 5].Text
END IF
END IF
+ sList = sList & sPartAddr & "," & sFmtAs & ";"
'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
NEXT
-
+ ME.read_partition_selection
+ Message(ClsGlobal.sVitalPartList)
+ ' sList = Trim(Left(sList, Len(sList) - 1))
+ 'ClsGlobal.sVitalPartList = Trim(sList)
+ 'Message(ClsGlobal.sVitalPartList)
END
PUBLIC SUB StartUp()
@@ -178,7 +185,7 @@
IF LAST.text <> ("Do not format") THEN
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
- ME.OnExit()
+ 'ME.OnExit()
ELSE
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = ""
END IF
@@ -273,6 +280,54 @@
END
+PUBLIC SUB read_partition_selection()
+
+ DIM cbox, cb AS ComboBox
+ DIM sFormat AS String
+ FOR EACH cbox IN objMntPoints
+ IF cbox.Text <> ("Not Used") THEN
+ FOR EACH cb IN objFS
+ IF cbox.tag = cb.Tag THEN
+ sFormat = Trim(cb.Text)
+ BREAK
+ ELSE
+ sFormat = ""
+ END IF
+ NEXT
+ ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & cbox.Text & "-" & sFormat & ","
+
+ ' SELECT CASE cbox.Text
+ ' CASE "/"
+ ' ClsGlobal.sRoot = cbox.Tag
+ ' ClsGlobal.froot = sFormat
+ ' CASE "/home"
+ ' ClsGlobal.shome = cbox.Tag
+ ' ClsGlobal.fhome = sFormat
+ ' CASE "/usr"
+ ' ClsGlobal.susr = cbox.Tag
+ ' ClsGlobal.fusr = sFormat
+ ' CASE "/opt"
+ ' ClsGlobal.sopt = cbox.Tag
+ ' ClsGlobal.fopt = sFormat
+ ' CASE "/var"
+ ' ClsGlobal.svar = cbox.Tag
+ ' ClsGlobal.fvar = sFormat
+ ' CASE "/tmp"
+ ' ClsGlobal.stmp = cbox.Tag
+ ' ClsGlobal.ftmp = sFormat
+ ' CASE "/boot"
+ ' ClsGlobal.sboot = cbox.Tag
+ ' ClsGlobal.fboot = sFormat
+ ' CASE ELSE
+ ' ClsGlobal.sMiscMountList = ClsGlobal.sMiscMountList &
cbox.Tag & "," & Trim(cbox.Text) & ";"
+ ' END SELECT
+ END IF
+ NEXT
+
+
+
+
+END
Modified: branches/speedy/Step7a.class
==============================================================================
--- branches/speedy/Step7a.class (original)
+++ branches/speedy/Step7a.class Mon Feb 23 14:30:56 2009
@@ -83,6 +83,7 @@
gvBulkSel[irow, 1].Text = Trim(sname)
gvBulkSel[irow, 0].Picture = picYes
gvBulkSel[irow, 2].Text = Trim(sDesc)
+ gvBulkSel[irow, 3].Text = "yes"
INC irow
END IF
NEXT
@@ -101,10 +102,25 @@
END
+PUBLIC SUB Get_Bulk_Selection()
+
+ DIM irow AS Integer
+ DIM sList AS String
+ FOR irow = 2 TO gvBulkSel.Rows.count - 1
+ IF gvBulkSel[irow, 3].Text LIKE "yes" THEN
+ sList = sList & Trim(gvBulkSel[irow, 1].Text) & ","
+ END IF
+ NEXT
+ ClsGlobal.sBulkListToInstall = Trim(slist)
+ 'Message(ClsGlobal.sBulkListToInstall)
+
+
+END
+
PUBLIC SUB OnExit()
-
+ ME.Get_Bulk_Selection()
END
Modified: branches/speedy/Step7b.class
==============================================================================
--- branches/speedy/Step7b.class (original)
+++ branches/speedy/Step7b.class Mon Feb 23 14:30:56 2009
@@ -21,8 +21,9 @@
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.Columns.count = 5
ME.gvOptions[0, 1].Text = ("Package Name")
ME.gvOptions[0, 2].Text = ("Description")
ME.gvOptions[0, 1].Font.Bold = TRUE
@@ -34,7 +35,10 @@
ME.gvOptions.Columns[0].Width = 24
ME.gvOptions.Columns[1].Width = 150
ME.gvOptions.Columns[2].Width = 300
+ ME.gvOptions.Columns[3].Width = 0
+ ME.gvOptions.Columns[4].Width = 0
+ ME.Resize(ClsGlobal.fRunningMainForm.pnlstack.Width,
ClsGlobal.fRunningMainForm.pnlstack.height)
picYes = Picture.Load("images/16px-check.png")
picNo = Picture.Load("images/16px-Nocheck.png")
ME.MovieBox1.Path = "images/throbber.gif"
@@ -54,6 +58,8 @@
ME.tlWinExp.Text = ("Reading software catalog... Please wait a moment")
ME.Panel1.Visible = FALSE
ME.HPanel2.Visible = TRUE
+ ME.HBox3.Visible = FALSE
+ ME.HBox5.Visible = TRUE
ME.MovieBox1.Playing = TRUE
WAIT 1
irow = 2
@@ -61,6 +67,8 @@
IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN
sArr = Split(File.Load("/mnt/source/veclinux/OPTIONAL"), "\n")
FOR i = 0 TO sArr.Max
+ ME.MovieBox1.Playing = TRUE
+ ME.MovieBox1.Refresh
sLine = Trim(sArr[i])
sPkg = sLine
SHELL "cat /mnt/source/PACKAGES.TXT | grep \"^" & sPkg & "\" | cut
-f 2 -d \':\' " TO sDescDump
@@ -83,6 +91,7 @@
gvOptions[irow, 1].Text = sPkg
gvOptions[irow, 2].Text = Trim(sShortDesc)
gvOptions[irow, 3].Text = Trim(sDesc)
+ gvOptions[irow, 4].Text = "yes"
INC gvOptions.Rows.Count
INC irow
NEXT
@@ -90,6 +99,8 @@
ME.MovieBox1.Playing = FALSE
ME.HPanel2.Visible = FALSE
ME.Panel1.Visible = TRUE
+ ME.HBox3.Visible = TRUE
+ ME.HBox5.Visible = FALSE
ME.tlWinExp.Text = ("Additional optional software available. Select
which software packages to include in your installation.")
END
@@ -97,12 +108,13 @@
PUBLIC SUB OnExit()
-
+ ME.Read_Optional_Pkg_Selection()
+ 'Message(ClsGlobal.sPkgListToInstall)
END
PUBLIC SUB StartUp()
-
+ ME.Resize(ClsGlobal.fRunningMainForm.pnlstack.Width,
ClsGlobal.fRunningMainForm.pnlstack.height)
END
PUBLIC FUNCTION GetNext() AS String
@@ -125,10 +137,12 @@
IF BsELECTaLL = TRUE THEN
FOR irow = 2 TO gvOptions.Rows.Count - 1
gvOptions[irow, 0].Picture = PicYes
+ gvOptions[irow, 4].Text = "yes"
NEXT
ELSE
FOR irow = 2 TO gvOptions.Rows.Count - 1
gvOptions[irow, 0].Picture = PicNo
+ gvOptions[irow, 4].Text = "no"
NEXT
END IF
@@ -142,8 +156,10 @@
IF LAST.column = 0 OR LAST.column = 1 THEN
IF gvOptions[LAST.row, 0].Picture = PicYes THEN
gvOptions[LAST.row, 0].Picture = PicNo
+ gvOptions[LAST.row, 4].Text = "no"
ELSE
gvOptions[LAST.row, 0].Picture = PicYes
+ gvOptions[LAST.row, 4].Text = "yes"
END IF
ELSE IF LAST.column = 2 THEN
IF gvOptions[LAST.row, 3].Text THEN
@@ -168,6 +184,21 @@
END IF
gvOptions.Refresh
+END
+
+PUBLIC SUB Read_Optional_Pkg_Selection()
+
+ DIM IROW AS Integer
+ DIM sList AS String
+
+ FOR irow = 2 TO gvOptions.Rows.count - 1
+ IF gvOptions[irow, 4].Text LIKE "yes" THEN
+ sList = sList & Trim(gvOptions[irow, 1].Text) & ","
+ END IF
+ NEXT
+ ClsGlobal.sPkgListToInstall = Trim(sList)
+
+
END
Modified: branches/speedy/Step7b.form
==============================================================================
--- branches/speedy/Step7b.form (original)
+++ branches/speedy/Step7b.form Mon Feb 23 14:30:56 2009
@@ -20,11 +20,11 @@
MoveScaled(0,5,10,1)
}
{ HBox2 HBox
- MoveScaled(0,7,70,8)
+ MoveScaled(0,7,70,6)
{ tlWinExp TextLabel
- MoveScaled(1,0,64,7)
+ MoveScaled(1,0,64,5)
Expand = True
- Text = ("Additional optional software available. Select which
software packages to include in your installation.")
+ Text = ("Reading software catalog... Please wait a moment")
}
}
{ Panel1 Panel
@@ -38,8 +38,12 @@
Border = False
}
}
+ { HBox5 HBox
+ MoveScaled(1,24,11,3)
+ Visible = False
+ }
{ HPanel2 HPanel
- MoveScaled(1,24,57,28)
+ MoveScaled(1,27,57,28)
Expand = True
{ MovieBox1 MovieBox
MoveScaled(11,1,37,24)
@@ -50,7 +54,7 @@
MoveScaled(1,52,7,1)
}
{ HBox3 HBox
- MoveScaled(1,54,37,3)
+ MoveScaled(1,57,37,3)
{ btTglSel ToggleButton
MoveScaled(0,0,24,3)
Text = ("Un-Select All")
|
