Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r231 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-15 17:49:04
|
Author: M0...@gm...
Date: Wed Oct 15 10:45:40 2008
New Revision: 231
Modified:
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/DevLog
branches/iVL/FrmSummary.class
branches/iVL/FrmSummary.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlPartSel.module
branches/iVL/MdlWinDrives.module
Log:
- New Process Sumary window is complete.
- Fixed problem with user account/shell not being specified (BUG)
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Oct 15 10:45:40 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/installer/FrmSummary.class
+# /home/moe/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,55 +14,67 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmSummary.class:8
+#: FrmSummary.class:14
+msgid "Installation Summary"
+msgstr ""
+
+#: FrmSummary.class:16
msgid "Custom"
msgstr ""
-#: FrmSummary.class:12
+#: FrmSummary.class:20
msgid "Full"
msgstr ""
-#: FrmSummary.class:28
+#: FrmSummary.class:37
msgid "Partition"
msgstr ""
-#: FrmSummary.class:30
+#: FrmSummary.class:39
msgid "Size / GiB"
msgstr ""
-#: FrmSummary.class:32
+#: FrmSummary.class:41
msgid "Filesystem"
msgstr ""
-#: FrmSummary.class:33
-msgid "Do Not Format"
-msgstr ""
-
-#: FrmSummary.class:34
+#: FrmSummary.class:43
msgid "Mount Point"
msgstr ""
-#: FrmSummary.class:40
+#: FrmSummary.class:49
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:77
+#: FrmSummary.class:87
+msgid "None"
+msgstr ""
+
+#: FrmSummary.class:108
+msgid "Do not mount"
+msgstr ""
+
+#: FrmSummary.class:160
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:79
-msgid "Size / KiB"
+#: FrmSummary.class:169
+msgid "BULK PACKAGES"
+msgstr ""
+
+#: FrmSummary.class:186
+msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:116
+#: FrmSummary.class:239
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:126
+#: FrmSummary.class:249
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:136
+#: FrmSummary.class:259
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Oct 15 10:45:40 2008
@@ -14,31 +14,31 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlPartSel.module:67
+#: MdlPartSel.module:71
msgid "PARTITION"
msgstr ""
-#: MdlPartSel.module:78
+#: MdlPartSel.module:82
msgid "MOUNT POINT"
msgstr ""
-#: MdlPartSel.module:88
+#: MdlPartSel.module:92
msgid "FILESYSTEM"
msgstr ""
-#: MdlPartSel.module:137
+#: MdlPartSel.module:141
msgid "Do not format"
msgstr ""
-#: MdlPartSel.module:139
+#: MdlPartSel.module:143
msgid "Not Used"
msgstr ""
-#: MdlPartSel.module:284
+#: MdlPartSel.module:289
msgid "Please select only one "
msgstr ""
-#: MdlPartSel.module:284
+#: MdlPartSel.module:289
msgid "partition"
msgstr ""
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Oct 15 10:45:40 2008
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlWinDrives.module:55
+#: MdlWinDrives.module:58
msgid "Windows Partitions Detected"
msgstr ""
-#: MdlWinDrives.module:71
+#: MdlWinDrives.module:74
msgid "PARTITION"
msgstr ""
-#: MdlWinDrives.module:81
+#: MdlWinDrives.module:84
msgid "MOUNT TO"
msgstr ""
-#: MdlWinDrives.module:119
+#: MdlWinDrives.module:123
msgid "Do not mount"
msgstr ""
-#: MdlWinDrives.module:181
+#: MdlWinDrives.module:186
msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Oct 15 10:45:40 2008
@@ -1,4 +1,5 @@
-- Began working on new re-designed installation summary window
- (Not yet complete... but will be better)
+- New Process Sumary window is complete.
+- Fixed problem with user account/shell not being specified (BUG)
+
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Wed Oct 15 10:45:40 2008
@@ -4,6 +4,14 @@
PUBLIC SUB Form_Open()
+FMain.FrmCurr = ME
+ FMain.tvPlan["Inst0"].Selected = TRUE
+ FMain.tvPlan["Prep3"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Inst0"].Picture = MdlCore.sNowPic
+ FMain.btback.Enabled = TRUE
+
+
+ ME.tlBanner.text = "<h3>" & ("Installation Summary") & "</h3>"
IF ClsPkgSel.bCustom = TRUE THEN
ME.TextBox1.text = ("Custom")
ME.Frame2.Visible = TRUE
@@ -22,6 +30,7 @@
DIM iRow AS Integer = 0
DIM cb AS ComboBox
DIM cb1 AS ComboBox
+ DIM tl AS TextLabel
DIM sPart, sMountPnt, sFsType, sSize AS String
ME.GridView1.Columns.count = 4
@@ -30,7 +39,7 @@
ME.GridView1.Columns[1].text = ("Size / GiB")
ME.GridView1.Columns[1].Width =
MdlObjSizer.get_object_width(ME.GridView1.Columns[1].text) * 1.5
ME.GridView1.Columns[2].text = ("Filesystem")
- ME.GridView1.Columns[2].Width = MdlObjSizer.get_object_width(("Do
Not Format")) * 1.5
+ ME.GridView1.Columns[2].Width =
MdlObjSizer.get_object_width(("Filesystem")) * 1.25
ME.GridView1.Columns[3].text = ("Mount Point")
'ME.GridView1.Columns[3].Width =
MdlObjSizer.get_object_width(ME.GridView1.Columns[3].text)
@@ -44,6 +53,13 @@
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
NEXT
+ FOR EACH tl IN MdlPartSel.oPartLbls
+ IF tl.tag = cb.tag THEN
+ sSize = Mid(tl.text, InStr(tl.text, "("),
Len(tl.text) - RInStr(tl.text, "("))
+ sSize = Trim(Replace(sSize, "(", ""))
+ sSize = Replace(sSize, "GB", "")
+ END IF
+ NEXT
WITH ME
.GridView1[irow, 0].text = sPart
.GridView1[irow, 1].text = sSize
@@ -54,7 +70,73 @@
END IF
NEXT
-
+ INC GridView1.Rows.Count
+ 'INC irow
+ FOR EACH cb IN MdlPartSel.oSwaps
+ IF cb.text <> ("Not Used") THEN
+ FOR EACH tl IN MdlPartSel.oTlSwapLbls
+ IF tl.tag = cb.tag THEN
+ sSize = Mid(tl.text, InStr(tl.text, "("), Len(tl.text) -
RInStr(tl.text, "("))
+ sSize = Trim(Replace(sSize, "(", ""))
+ sSize = Replace(sSize, "GB", "")
+ sSize = Replace(sSize, "MB", "")
+ END IF
+ NEXT
+ spart = cb.Tag
+ sFsType = "swap"
+ sMountPnt = ("None")
+ WITH ME
+ .GridView1[irow, 0].text = sPart
+ .GridView1[irow, 0].BackColor = Color.LightBackground
+ .GridView1[irow, 1].text = sSize
+ .GridView1[irow, 1].BackColor = Color.LightBackground
+ .GridView1[irow, 2].text = sFsType
+ .GridView1[irow, 2].BackColor = Color.LightBackground
+ .GridView1[irow, 3].Text = sMountPnt
+ .GridView1[irow, 3].BackColor = Color.LightBackground
+ END WITH
+ INC irow
+ END IF
+ NEXT
+
+ IF MdlWinDrives.oWMntPoints THEN
+
+ INC GridView1.Rows.Count
+ INC GridView1.Rows.Count
+
+ FOR EACH cb IN MdlWinDrives.oWMntPoints
+ IF cb.text <> ("Do not mount") THEN
+ sPart = cb.Tag
+ sMountPnt = cb.Text
+ FOR EACH tl IN MdlWinDrives.tlWnParts
+ IF tl.tag = cb.tag THEN
+ sSize = Mid(tl.text, InStr(tl.text, "["), Len(tl.text) -
RInStr(tl.text, "["))
+ sSize = Trim(Replace(sSize, "[", ""))
+ sSize = Replace(sSize, "GB", "")
+ sSize = Replace(sSize, "MB", "")
+ END IF
+
+ NEXT
+
+ 'sFsType = "Windows"
+ SHELL "l=$(probepart | grep " & cb.tag & "); echo $l | cut
-f 6,7 -d \' \'" TO sFsType
+
+ WITH ME
+ .GridView1[irow, 0].text = sPart
+ .GridView1[irow, 0].BackColor = Color.LightGray
+ .GridView1[irow, 1].BackColor = Color.LightGray
+ .GridView1[irow, 1].Text = sSize
+ .GridView1[irow, 2].BackColor = Color.LightGray
+ .GridView1[irow, 2].text = sFsType
+ .GridView1[irow, 3].text = sMountPnt
+ .GridView1[irow, 3].BackColor = Color.LightGray
+ END WITH
+ INC irow
+ END IF
+ NEXT
+
+ END IF
+
' ADD SWAP PARTITIONS HERE.
' NEED TO ADD WINDOWS PARTITIONS HERE
@@ -71,25 +153,64 @@
DIM irow AS Integer = 0
DIM sPkg, sSize AS String
DIM cb AS CheckBox
+ DIM sDesc AS String
WITH ME.GridView2
- .Columns.count = 2
+ .Columns.count = 1
.Columns[0].Title = ("Package Name")
.Columns[0].Width = MdlObjSizer.get_object_width(.Columns[0].text) *
2.5
- .Columns[1].Title = ("Size / KiB")
- .Columns[1].Width = MdlObjSizer.get_object_width(.Columns[1].Text) *
1.5
+ '.Columns[1].Title = ("Size / KiB")
+ '.Columns[1].Width = MdlObjSizer.get_object_width(.Columns[1].Text)
* 1.5
END WITH
-
+ GridView2.Rows.count = 2
+ GridView2[0, 0].BackColor = Color.SelectedBackground
+ ' GridView2[0, 1].BackColor = Color.SelectedBackground
+ GridView2[0, 0].Alignment = Align.Center
+ GridView2[0, 0].text = ("BULK PACKAGES")
+ GridView2.MoveTo(1, 0)
+ irow = 1
' add bulk packages
FOR EACH cb IN MdlPkgSel.Bulks
IF cb.Value = TRUE THEN
INC ME.GridView2.Rows.Count
- GridView2[irow, 0].text = cb.Tag
-
+ GridView2[irow, 0].text = File.BaseName(cb.Tag)
+
+ INC irow
+ END IF
+
+ NEXT
+ INC GridView2.Rows.Count
+ 'irow = irow + 1 ' move the selection to the next line
+ GridView2[irow, 0].BackColor = Color.SelectedBackground
+ GridView2[irow, 0].Alignment = Align.Center
+ GridView2[irow, 0].text = ("USER-SELECTED PACKAGES")
+ INC irow
+
+ FOR EACH cb IN MdlPkgSel.Pkgs
+ IF cb.Value = TRUE THEN
+ INC GridView2.Rows.Count
+ GridView2[irow, 0].text = File.BaseName(cb.tag)
+ 'shell "
INC irow
END IF
NEXT
-
END
+
+PUBLIC SUB Form_Resize()
+ME.lbInstallType.Alignment = Align.Normal
+ WITH ME
+ .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.left * 2))
+ .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+ .lbInstallType.Move(4, .hrsep.top + .hrsep.Height + 8,
MdlObjSizer.get_object_width(.lbInstallType.text))
+ .TextBox1.Move(.lbInstallType.Left + .lbInstallType.Width +
8, .lbInstallType.top, .lbInstallType.Width)
+ .Frame1.Move(4, .TextBox1.top + .TextBox1.Height + 12, .ClientWidth
- (.Frame1.Left * 2), (.ClientHeight - .Frame1.top) / 2.5)
+ .GridView1.Move(4, 16, .Frame1.Width - (.GridView1.Left *
2), .Frame1.Height - (.GridView1.top * 2))
+ .Frame2.Move(4, .Frame1.top + .Frame1.Height + 8, .ClientWidth -
(.Frame2.Left * 2), (.ClientHeight - .Frame2.Top) - .TextBox1.Height)
+ .GridView2.Move(4, 16, .Frame2.Width - (.GridView2.Left *
2), .Frame2.Height - (.GridView2.top * 2))
+
+
+ END WITH
+
+END
Modified: branches/iVL/FrmSummary.form
==============================================================================
--- branches/iVL/FrmSummary.form (original)
+++ branches/iVL/FrmSummary.form Wed Oct 15 10:45:40 2008
@@ -4,15 +4,15 @@
MoveScaled(0,0,73,61)
Text = ("")
{ lbInstallType TextLabel
- MoveScaled(8,4,13,3)
+ MoveScaled(8,6,13,3)
Text = ("Installation Type")
}
{ TextBox1 TextBox
- MoveScaled(22,4,14,3)
+ MoveScaled(22,6,14,3)
Text = ("")
}
{ Frame1 Frame
- MoveScaled(2,8,67,19)
+ MoveScaled(2,10,67,19)
Text = ("Partition Selection Scheme")
{ GridView1 GridView
MoveScaled(1,2,65,16)
@@ -20,10 +20,17 @@
}
}
{ Frame2 Frame
- MoveScaled(2,29,67,29)
+ MoveScaled(2,31,67,29)
Text = ("Software Selection")
{ GridView2 GridView
MoveScaled(1,4,65,25)
}
+ }
+ { tlBanner TextLabel
+ MoveScaled(1,1,21,4)
+ Text = ("")
+ }
+ { hrsep Separator
+ MoveScaled(27,4,8,1)
}
}
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Oct 15 10:45:40 2008
@@ -138,7 +138,7 @@
'SHELL "chroot /mnt/target /usr/sbin/useradd -m -s /bin/bash
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups & Space(1) &
ME.tbUsername.Text WAIT
PRINT "Creating new user account"
SHELL "chroot /mnt/target /usr/sbin/useradd -m -c " & "\'" &
ME.tbRealname.text & "\'" & " -g " & ME.tbUsername.text &
- " -p " & ME.tbPasswd1.text & " -u " & iUID & " -G " & "\'" &
sGroups & "\' " & ME.tbUsername.Text WAIT
+ " -p " & ME.tbPasswd1.text & " -u " & iUID & " -G " & "\'" &
sGroups & "\' -s /bin/bash " & ME.tbUsername.Text WAIT
' sDocmd = "useradd -m -c " & "\'" & sname & "\'" & " -g " &
slogin & " -p " & ME.txtpass1.Text &
'" -G " & "\'" & sgrparse & "\' " & slogin
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Oct 15 10:45:40 2008
@@ -19,6 +19,8 @@
PUBLIC oMountPoints AS Object[]
PUBLIC oFsTypes AS Object[]
PUBLIC oSwaps AS Object[]
+PUBLIC oPartLbls AS Object[]
+PUBLIC oTlSwapLbls AS Object[]
PUBLIC SUB DISPLAY_PARTITION_OPTIONS()
@@ -48,6 +50,8 @@
oFsTypes = NEW Object[]
oMountPoints = NEW Object[]
oSwaps = NEW Object[]
+ oPartLbls = NEW Object[]
+ oTlSwapLbls = NEW Object[]
' We will mount the partitions first, and then figure out their size
SHELL " probepart | grep -e \" Linux$\" | cut -f 1 -d \' \' | grep /dev"
TO sDump1
@@ -125,7 +129,7 @@
.Alignment = Align.Normal
.y = y
END WITH
-
+ ME.oPartLbls.Add(tl)
'create the combobox
cb = NEW ComboBox(FrmPartSel.scrollPartitions)
AS "MountPoints"
WITH cb
@@ -225,6 +229,7 @@
.Alignment = Align.Normal
.tag = sSwaps[ii]
END WITH
+ oTlSwapLbls.Add(tl)
cb = NEW ComboBox(FrmPartSel.scrollPartitions)
AS "swapsel"
WITH cb
.y = y
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Wed Oct 15 10:45:40 2008
@@ -19,6 +19,8 @@
PUBLIC vObj AS Object[]
PUBLIC oWMntPoints AS Object[]
+PUBLIC tlWnParts AS Object[]
+
PUBLIC SUB LIST_WIN_PARTITIONS()
DIM tl AS TextLabel
DIM cb AS ComboBox
@@ -39,6 +41,7 @@
y = 8
ME.oWMntPoints = NEW Object[]
+ME.tlWnParts = NEW Object[]
' now, do the WIN partitions
' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
@@ -108,6 +111,7 @@
.tag = sDisks[i]
.Alignment = Align.Normal
END WITH
+ ME.tlWnParts.Add(tl)
cb = NEW ComboBox(FrmWinDrives.svWinDrives)
WITH cb
.x = cbx
@@ -150,6 +154,7 @@
.tag = wintfs[i]
.Alignment = Align.Normal
END WITH
+ ME.tlWnParts.Add(tl)
cb = NEW ComboBox(FrmWinDrives.svWinDrives)
WITH cb
.x = cbx
|
