Menu
▾
▴
vectorlinux-devel — Vector Linux developer's list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(40) |
Apr
(76) |
May
(31) |
Jun
(39) |
Jul
(44) |
Aug
(87) |
Sep
(32) |
Oct
(23) |
Nov
(36) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(49) |
Sep
(14) |
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(63) |
Aug
(95) |
Sep
(39) |
Oct
(61) |
Nov
(75) |
Dec
(118) |
| 2009 |
Jan
(25) |
Feb
(37) |
Mar
(20) |
Apr
(15) |
May
(14) |
Jun
(48) |
Jul
(82) |
Aug
(160) |
Sep
(94) |
Oct
(55) |
Nov
(59) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(17) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <cod...@go...> - 2008-11-17 15:05:42
|
Author: M0...@gm...
Date: Mon Nov 17 07:03:50 2008
New Revision: 297
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmNetConf.class
branches/iVL/FrmNetConf.form
branches/iVL/MdlNetConf.module
branches/iVL/installer.gambas
Log:
Added code to handle machines without a network device
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -82,27 +82,27 @@
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:406
+#: FMain.class:408
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:406
+#: FMain.class:408
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:658
+#: FMain.class:660
msgid "Back"
msgstr ""
-#: FMain.class:670
+#: FMain.class:672
msgid "Exit Installation"
msgstr ""
-#: FMain.class:682
+#: FMain.class:684
msgid "Next"
msgstr ""
-#: FMain.class:696
+#: FMain.class:698
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Mon Nov 17 07:03:50 2008
@@ -1,4 +1,4 @@
-# /home/moises/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 17 07:03:50 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.165
+Version=0.0.167
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 17 07:03:50 2008
@@ -394,11 +394,13 @@
RETURN
END IF
-
-
- MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text,
FrmNetConf.tbDomain.Text)
- MdlNetConf.SET_DNS_ADDRESSES()
- MdlNetConf.WRITE_INET()
+ IF MdlNetConf.ifaceCnt = 0 THEN
+ MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.Text,
FrmNetConf.tbDomain.Text)
+ ELSE ' IF MdlNetConf > 0 THEN
+ MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text,
FrmNetConf.tbDomain.Text)
+ MdlNetConf.SET_DNS_ADDRESSES()
+ MdlNetConf.WRITE_INET()
+ END IF
' CONFIGURE X QUIETLY HERE
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Mon Nov 17 07:03:50 2008
@@ -80,31 +80,31 @@
END
-PUBLIC SUB Form_Resize()
-DIM itxtboxleft AS Integer
-
- WITH ME
- .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.left * 2))
- .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - 4, .tlBanner.Width)
- .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height
+ 8, MdlObjSizer.get_object_width(.tlHostNameLbl.text), 21)
- .txtHostName.Move(.tlHostNameLbl.left + .tlHostNameLbl.Width +
4, .tlHostNameLbl.top)
- .tlDomainName.Move(.txtHostName.Left + .txtHostName.Width +
24, .txtHostName.top, MdlObjSizer.get_object_width(.tlDomainName.Text))
- .tbDomain.Move(.tlDomainName.left + .tlDomainName.Width +
4, .tlDomainName.top, .txtHostName.Width)
- .cbUseManDNS.Move(.tlHostNameLbl.Left, .tlHostNameLbl.top
+ .tlHostNameLbl.Height + 10,
MdlObjSizer.get_object_width(.cbUseManDNS.text) + 24)
- .tlPrimaryDNS.Move(.cbUseManDNS.left, .cbUseManDNS.top
+ .cbUseManDNS.Height + 4, MdlObjSizer.get_object_width(.tlPrimaryDNS.text))
- itxtboxleft = .tlPrimaryDNS.Left + .tlPrimaryDNS.Width + 24
- .txtPrimaryDNS.Move(itxtboxleft, .tlPrimaryDNS.Top)
- .tlSecDNS.Move(.tlPrimaryDNS.Left, .tlPrimaryDNS.top
+ .tlPrimaryDNS.Height + 4, MdlObjSizer.get_object_width(.tlSecDNS.text))
- .txtSecDNS.Move(itxtboxleft, .tlSecDNS.top)
- ' now move the frame
- .frmNetDevices.Move(.tlSecDNS.Left, .tlSecDNS.top + .tlSecDNS.Height
+ 8, .ClientWidth - (.frmNetDevices.Left * 2), .ClientH
- .frmNetDevices.top - 32)
-
- .TSNetDevices.Move(8, 20, .frmNetDevices.Width - (.TSNetDevices.Left
* 2))
- .TSNetDevices.Height = .frmNetDevices.Height - (.TSNetDevices.y * 2)
-
-
- END WITH
-END
+' PUBLIC SUB Form_Resize()
+' DIM itxtboxleft AS Integer
+'
+' WITH ME
+' .tlBanner.Move(4, 8, .ClientWidth - (.tlBanner.left * 2))
+' .hrSep.Move(4, .tlBanner.top + .tlBanner.Height -
4, .tlBanner.Width)
+' .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top
+ .tlBanner.Height + 8, MdlObjSizer.get_object_width(.tlHostNameLbl.text),
21)
+' .txtHostName.Move(.tlHostNameLbl.left + .tlHostNameLbl.Width +
4, .tlHostNameLbl.top)
+' .tlDomainName.Move(.txtHostName.Left + .txtHostName.Width +
24, .txtHostName.top, MdlObjSizer.get_object_width(.tlDomainName.Text))
+' .tbDomain.Move(.tlDomainName.left + .tlDomainName.Width +
4, .tlDomainName.top, .txtHostName.Width)
+' .cbUseManDNS.Move(.tlHostNameLbl.Left, .tlHostNameLbl.top
+ .tlHostNameLbl.Height + 10,
MdlObjSizer.get_object_width(.cbUseManDNS.text) + 24)
+' .tlPrimaryDNS.Move(.cbUseManDNS.left, .cbUseManDNS.top
+ .cbUseManDNS.Height + 4, MdlObjSizer.get_object_width(.tlPrimaryDNS.text))
+' itxtboxleft = .tlPrimaryDNS.Left + .tlPrimaryDNS.Width + 24
+' .txtPrimaryDNS.Move(itxtboxleft, .tlPrimaryDNS.Top)
+' .tlSecDNS.Move(.tlPrimaryDNS.Left, .tlPrimaryDNS.top
+ .tlPrimaryDNS.Height + 4, MdlObjSizer.get_object_width(.tlSecDNS.text))
+' .txtSecDNS.Move(itxtboxleft, .tlSecDNS.top)
+' ' now move the frame
+' .frmNetDevices.Move(.tlSecDNS.Left, .tlSecDNS.top
+ .tlSecDNS.Height + 8, .ClientWidth - (.frmNetDevices.Left * 2), .ClientH
- .frmNetDevices.top - 32)
+'
+' .TSNetDevices.Move(8, 20, .frmNetDevices.Width -
(.TSNetDevices.Left * 2))
+' .TSNetDevices.Height = .frmNetDevices.Height - (.TSNetDevices.y *
2)
+'
+'
+' END WITH
+' END
PUBLIC SUB cbUseManDNS_Click()
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Mon Nov 17 07:03:50 2008
@@ -3,68 +3,105 @@
{ Form Form
MoveScaled(0,0,114,74)
Text = ("")
- { tlDomainName TextLabel
- MoveScaled(47,8,9,3)
- Text = ("Domain")
- Alignment = Align.Normal
- }
- { txtHostName TextBox
- MoveScaled(18,8,28,3)
- Text = ("")
- MaxLength = 24
- }
- { tbDomain TextBox
- MoveScaled(58,8,29,3)
- Text = ("")
- MaxLength = 24
- }
- { frmNetDevices Frame
- MoveScaled(1,20,85,49)
- Text = ("")
+ Arrangement = Arrange.Vertical
+ { HPanel1 HPanel
+ MoveScaled(1,1,94,7)
+ { tlBanner TextLabel
+ MoveScaled(1,0,45,4)
+ Expand = True
+ Text = ("Network Configuration")
+ Alignment = Align.Normal
+ }
+ { hrSep Separator
+ MoveScaled(1,5,33,1)
+ Expand = True
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,8,92,4)
+ { tlHostNameLbl TextLabel
+ MoveScaled(0,0,15,3)
+ Text = ("Computer Name")
+ Alignment = Align.Normal
+ }
+ { txtHostName TextBox
+ MoveScaled(16,0,28,3)
+ Text = ("")
+ MaxLength = 24
+ }
+ { Panel3 Panel
+ MoveScaled(45,0,4,3)
+ Arrangement = Arrange.Horizontal
+ }
+ { tlDomainName TextLabel
+ MoveScaled(49,0,9,3)
+ Text = ("Domain")
+ Alignment = Align.Normal
+ }
+ { tbDomain TextBox
+ MoveScaled(59,0,29,3)
+ Text = ("")
+ MaxLength = 24
+ }
+ }
+ { HPanel3 HPanel
+ MoveScaled(1,12,80,3)
+ { cbUseManDNS CheckBox
+ MoveScaled(0,0,39,3)
+ Text = ("Manual DNS Server Specification")
+ }
+ }
+ { Panel2 Panel
+ MoveScaled(1,16,93,6)
+ { txtPrimaryDNS TextBox txtManDNSBoxes
+ Name = "txtPrimaryDNS"
+ MoveScaled(26,0,18.1429,3)
+ Enabled = False
+ Text = ("192.168.1.254")
+ }
+ { tlPrimaryDNS TextLabel
+ MoveScaled(0,0,17,3)
+ Text = ("Primary DNS Server")
+ Alignment = Align.Normal
+ }
+ { txtSecDNS TextBox txtManDNSBoxes
+ Name = "txtSecDNS"
+ MoveScaled(26,3,18.1429,3)
+ Enabled = False
+ Text = ("")
+ }
+ { tlSecDNS TextLabel
+ MoveScaled(0,3,19,3)
+ Text = ("Secondary DNS Server")
+ Alignment = Align.Normal
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(1,24,94,1)
+ { Separator1 Separator
+ MoveScaled(3,0,35,1)
+ Expand = True
+ }
+ }
+ { HPanel5 HPanel
+ MoveScaled(1,26,95,1)
+ }
+ { Panel1 Panel
+ MoveScaled(1,29,105,42)
+ Expand = True
+ Arrangement = Arrange.Horizontal
{ TSNetDevices TabStrip
- MoveScaled(2,4,81,43)
+ MoveScaled(2,1,70,35)
+ Expand = True
Index = 0
Text = ("Tab 0")
Index = 0
}
- }
- { cbUseManDNS CheckBox
- MoveScaled(1,12,39,3)
- Text = ("Manual DNS Server Specification")
- }
- { tlPrimaryDNS TextLabel
- MoveScaled(2,16,20,3)
- Text = ("Primary DNS Server")
- Alignment = Align.Normal
- }
- { txtPrimaryDNS TextBox txtManDNSBoxes
- Name = "txtPrimaryDNS"
- MoveScaled(24,16,18.2857,3)
- Enabled = False
- Text = ("192.168.1.254")
- }
- { tlSecDNS TextLabel
- MoveScaled(44,15,21,3)
- Text = ("Secondary DNS Server")
- Alignment = Align.Normal
- }
- { txtSecDNS TextBox txtManDNSBoxes
- Name = "txtSecDNS"
- MoveScaled(68,15,18.2857,3)
- Enabled = False
- Text = ("")
- }
- { tlBanner TextLabel
- MoveScaled(1,1,45,4)
- Text = ("Network Configuration")
- Alignment = Align.Normal
- }
- { hrSep Separator
- MoveScaled(13,6,33,1)
- }
- { tlHostNameLbl TextLabel
- MoveScaled(2,8,15,3)
- Text = ("Computer Name")
- Alignment = Align.Normal
+ { frmNetDevices Frame
+ MoveScaled(4,1,85,40)
+ Visible = False
+ Expand = True
+ Text = ("")
+ }
}
}
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Mon Nov 17 07:03:50 2008
@@ -30,7 +30,7 @@
PUBLIC objcbWifiessid AS Object[]
PUBLIC objIntTypes AS Object[]
-
+PUBLIC ifaceCnt AS Integer
PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"]
PRIVATE pWirelessPic AS picture = picture["images/wireless.png"]
@@ -75,10 +75,34 @@
SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo
\"$res\" | tr -s \' \'" TO seths
'File.Save(Temp("eths"), Trim(seths))
'Message(File.Load(Temp("eths")))
+
seths = Trim(seths)
+ IF seths = "" THEN
+ WITH FrmNetConf
+ .cbUseManDNS.Enabled = FALSE
+ .tlPrimaryDNS.Enabled = FALSE
+ .tlSecDNS.Enabled = FALSE
+ END WITH
+ tl = NEW TextLabel(FrmNetConf.TSNetDevices)
+ WITH tl
+ .Width = 400
+ .Height = 200
+ .Alignment = Align.Normal
+ .Text = "<b>" & ("No ethernet neworking devices found")
& "</b>"
+ .Move(30, 24)
+ END WITH
+ FrmNetConf.TSNetDevices.Text = "Ethernet"
+ ME.ifaceCnt = 0
+ RETURN
+ END IF
+
+
+
sDevList = Split(seths, gb.NewLine)
'Message(seths)
+ ME.ifaceCnt = sDevList.Count
+
FOR i = 0 TO sDevList.count - 1
'Message(sDevList[i])
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-15 03:11:12
|
Author: M0...@gm...
Date: Fri Nov 14 19:10:15 2008
New Revision: 296
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlConfLilo.module
Log:
Added code to mount /home partition selection. This fixes the bug with the
dissapearing user /home directory
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsGlobal.class
+# /home/moises/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsPartSel.class
+# /home/moises/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsWinDrives.class
+# /home/moises/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FMain.class
+# /home/moises/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmDiskPart.class
+# /home/moises/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartScheme.class
+# /home/moises/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartSel.class
+# /home/moises/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPkgSel.class
+# /home/moises/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSelISO.class
+# /home/moises/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSummary.class
+# /home/moises/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmWinDrives.class
+# /home/moises/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlCore.module
+# /home/moises/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlDiskPart.module
+# /home/moises/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlObjSizer.module
+# /home/moises/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPartSel.module
+# /home/moises/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPkgSel.module
+# /home/moises/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSetup.module
+# /home/moises/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSummarize.module
+# /home/moises/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Fri Nov 14 19:10:15 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlWinDrives.module
+# /home/moises/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Nov 14 19:10:15 2008
@@ -300,7 +300,7 @@
PUBLIC SUB PERFORM_BINDING()
DIM sOut AS String
-
+ DIM cb AS CheckBox
' SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetMnt &/ "sys"] WAIT
' SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
@@ -309,6 +309,16 @@
EXEC ["mount", "-o", "bind", "/tmp", ClsGlobal.sTargetMnt &/ "tmp"] WAIT
' SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetMnt &/ "dev"] WAIT
+
+
+' Mount home directory for user accounts
+ FOR EACH cb IN MdlPartSel.oMountPoints
+ IF cb.Text = "/home" THEN
+ EXEC ["mount", cb.Tag, ClsGlobal.sTargetMnt &/ "home"] WAIT
+ END IF
+ NEXT
+
+
'We will run the commands neccisary to setup the newly installed system
here
EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"]
WAIT
|
|
From: <cod...@go...> - 2008-11-14 21:41:40
|
Author: M0...@gm...
Date: Fri Nov 14 13:31:48 2008
New Revision: 295
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
Completed coding section for LiloSetup stup. Ready for testing
Updated Binary
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/moe/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/moe/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsPartSel.class
+# /home/moe/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsWinDrives.class
+# /home/moe/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FMain.class
+# /home/moe/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -34,71 +34,75 @@
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:313
+#: FMain.class:311
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:314
+#: FMain.class:312
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:325
+#: FMain.class:319
+msgid "Skipping boot loaded setup"
+msgstr ""
+
+#: FMain.class:342
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:339
+#: FMain.class:356
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:354
+#: FMain.class:371
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:354
+#: FMain.class:371
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:354
+#: FMain.class:371
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:354
+#: FMain.class:371
msgid "Yes"
msgstr ""
-#: FMain.class:354
+#: FMain.class:371
msgid "No"
msgstr ""
-#: FMain.class:372
+#: FMain.class:389
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:376
+#: FMain.class:393
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:389
+#: FMain.class:406
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:389
+#: FMain.class:406
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:641
+#: FMain.class:658
msgid "Back"
msgstr ""
-#: FMain.class:653
+#: FMain.class:670
msgid "Exit Installation"
msgstr ""
-#: FMain.class:665
+#: FMain.class:682
msgid "Next"
msgstr ""
-#: FMain.class:679
+#: FMain.class:696
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmDiskPart.class
+# /home/moe/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartScheme.class
+# /home/moe/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartSel.class
+# /home/moe/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPkgSel.class
+# /home/moe/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSelISO.class
+# /home/moe/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSummary.class
+# /home/moe/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmWinDrives.class
+# /home/moe/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlCore.module
+# /home/moe/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlDiskPart.module
+# /home/moe/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlObjSizer.module
+# /home/moe/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPartSel.module
+# /home/moe/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPkgSel.module
+# /home/moe/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/moe/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSummarize.module
+# /home/moe/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Fri Nov 14 13:31:48 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlWinDrives.module
+# /home/moe/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Nov 14 13:31:48 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmLiloSetup
-Version=0.0.162
+Startup=MdlCore
+Version=0.0.165
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer2/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Fri Nov 14 13:31:48 2008
@@ -302,7 +302,24 @@
CASE "FrmInstallSys"
MdlInstallSys.WRITE_NEW_DISTRO_ID()
MdlConfLilo.PERFORM_BINDING()
- frmNext = FrmLilo
+ 'frmNext = FrmLilo
+ frmNext = FrmLiloSetup
+
+ CASE "FrmLiloSetup"
+ IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
+ IF FrmLiloSetup.cbBootDefault.Text = "" THEN
+ Message.Warning(("Please select a default operating system
to boot before proceeding"))
+ Balloon.Info(("Select an entry from this list"),
FrmLiloSetup.cbBootDefault)
+ STOP EVENT
+ RETURN
+ END IF
+ 'Run the setup
+ MdlLilo.TRIGGER_LILO_SETUP()
+ ELSE
+ FrmLiloSetup.tlBanner.Text = "<b>" & ("Skipping boot loaded setup")
& "</b>"
+ END IF
+ SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
+ frmNext = FrmZoneSet
CASE "FrmLilo"
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Fri Nov 14 13:31:48 2008
@@ -19,9 +19,14 @@
PUBLIC SUB Form_Open()
- ' hack just for testing here
- ClsPartSel.sRoot = "/dev/hdb1"
- ClsPartSel.fRoot = "reiserfs"
+
+ '
+ ' ME.tlBanner.Text = "<h3>" & tlBanner.text & "</h3>"
+ ' 'ClsPartSel.sRoot = "/dev/sdb1" '
+ ' FMain.FrmCurr = ME
+ ' FMain.tvPlan["Conf0"].Selected = TRUE
+ ' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
+ ' FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
ME.list_video_modes()
@@ -91,3 +96,30 @@
END WITH
END
+
+PUBLIC SUB cbVideoRes_Click()
+
+ DIM tb AS TextBox
+ DIM sText AS String
+
+ IF NOT MdlLilo.arrLinuxAppendtxtBoxes THEN RETURN
+ SELECT CASE Trim(cbVideoRes.text)
+ CASE (("Standard"))
+ FOR EACH tb IN MdlLilo.arrLinuxAppendtxtBoxes
+ tb.Text = Replace(tb.Text, "splash=silent", "") ' Not
available on this mode
+ NEXT
+ CASE ELSE
+ FOR EACH tb IN MdlLilo.arrLinuxAppendtxtBoxes
+ IF InStr(tb.Text, "splash=") = FALSE THEN
+ IF tb.Tag <> "" THEN
+ tb.Text = tb.Text & " splash=silent"
+ ELSE
+ tb.Text = "splash=silent"
+ END IF
+ END IF
+ NEXT
+ END SELECT
+
+
+
+END
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Fri Nov 14 13:31:48 2008
@@ -40,8 +40,11 @@
ReadOnly = True
}
}
+ { HBox2 HBox
+ MoveScaled(2,12,82,1)
+ }
{ Panel3 Panel
- MoveScaled(1,12,88,4)
+ MoveScaled(1,13,88,4)
Arrangement = Arrange.Horizontal
{ tlLiloTarget TextLabel
MoveScaled(0,0,7,3)
@@ -69,8 +72,11 @@
ReadOnly = True
}
}
+ { HBox3 HBox
+ MoveScaled(1,17,85,1)
+ }
{ PnlTop Panel
- MoveScaled(1,16,88,3)
+ MoveScaled(1,18,88,3)
Arrangement = Arrange.Horizontal
{ tlTimeOut TextLabel
MoveScaled(0,0,14,3)
@@ -88,14 +94,14 @@
}
}
{ HBox1 HBox
- MoveScaled(1,19,88,2)
+ MoveScaled(1,21,88,2)
{ Separator2 Separator
MoveScaled(0,1,83,1)
Expand = True
}
}
{ tsLIloTabs TabStrip
- MoveScaled(2,23,84,30)
+ MoveScaled(1,26,84,30)
Expand = True
Index = 0
Text = ("Tab 0")
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Nov 14 13:31:48 2008
@@ -301,14 +301,20 @@
DIM sOut AS String
-SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
-SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
-SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
-SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+' SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT
+EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetMnt &/ "sys"] WAIT
+' SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
+EXEC ["mount", "-o", "bind", "/proc", ClsGlobal.sTargetMnt &/ "proc"] WAIT
+' SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
+EXEC ["mount", "-o", "bind", "/tmp", ClsGlobal.sTargetMnt &/ "tmp"] WAIT
+' SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
+EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetMnt &/ "dev"] WAIT
'We will run the commands neccisary to setup the newly installed system
here
-SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
-SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
+EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"]
WAIT
+'SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
+'SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
+EXEC ["chmod", "700", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"]
WAIT
sOut = "#!/bin/bash \n" &
"DISPLAY=" & gb.NewLine &
"chmod +x /etc/rc.d/rc.udev" & gb.NewLine &
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Fri Nov 14 13:31:48 2008
@@ -27,6 +27,60 @@
PRIVATE i AS Integer ' used for object key
+PUBLIC SUB TRIGGER_LILO_SETUP()
+
+ ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
+ MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
+ MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
+
+
+
+END
+
+PUBLIC FUNCTION GENERATE_LILO_DOT_CONF_VIDEOMODES_SECTION() AS String
+
+ DIM sInput AS String = Trim(FrmLiloSetup.cbVideoRes.Text)
+ DIM sVGA AS String
+ DIM sOutput AS String
+ SELECT CASE sInput
+ CASE (("Standard"))
+ svga = "normal"
+ CASE (("Bootsplash Med"))
+ sVga = "788"
+ CASE (("Bootsplash High"))
+ sVga = "791"
+ CASE (("Bootsplash Extra High"))
+ sVga = "794"
+ END SELECT
+
+sOutput = "# VESA framebuffer console @ 1024x768x64k \n" &
+"vga = " & sVga & "<br>" &
+"# Normal VGA console n" &
+"#vga = normal \n" &
+"#VESA framebuffer console @ 1024 x768x64k \n" &
+"#vga = 791 \n" &
+"#VESA framebuffer console @ 1024 x768x32k \n" &
+"#vga = 790 \n" &
+"#VESA framebuffer console @ 1024 x768x256 \n" &
+"#vga = 773 \n" &
+"#VESA framebuffer console @ 800 x600x64k \n" &
+"#vga = 788 \n" &
+"#VESA framebuffer console @ 800 x600x32k \n" &
+"#vga = 787 \n" &
+"#VESA framebuffer console @ 800 x600x256 \n" &
+"#vga = 771 \n" &
+"#VESA framebuffer console @ 640 x480x64k \n" &
+"#vga = 785 \n" &
+"#VESA framebuffer console @ 640 x480x32k \n" &
+"#vga = 784 \n" &
+"#VESA framebuffer console @ 640 x480x256 \n" &
+"#vga = 769"
+
+RETURN sOutput
+
+END
+
+
PUBLIC FUNCTION generate_lilo_dot_conf_header() AS String
DIM sHeader AS String
@@ -66,7 +120,6 @@
"bitmap = /boot/bitmap/boot.bmp \n"
END IF
sHeader = sHeader & "\n" &
- "vga = 791 \n" &
"# Begin listing OS Choices \n"
@@ -81,11 +134,11 @@
DIM tb AS TextBox
DIM cb, chbox AS CheckBox
-DIM sOsEntries AS String
+ DIM sOsEntries AS String
DIM sSection, sClisection, sWinSection AS String
DIM cbox AS ComboBox
DIM sLabel, sKernel, sInitrd, sAppend, sTag AS String
- DIM sBootPath, sHeader, sFile AS String
+ DIM sBootPath, sHeader, sFile, sVidModeSection AS String
@@ -104,7 +157,7 @@
END IF
NEXT
FOR EACH cbox IN arrCbInitrds
- IF cb.Tag = cbox.Tag THEN sInitrd = Trim(cbox.Text) & "-" &
sLabel
+ IF cb.Tag = cbox.Tag THEN sInitrd = Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
NEXT
FOR EACH tb IN arrLinuxAppendtxtBoxes
IF cb.Tag = tb.Tag THEN sAppend = Trim(tb.Text)
@@ -160,8 +213,19 @@
'END IF
'NEXT
sHeader = ME.generate_lilo_dot_conf_header()
- sFile = sHeader & "<br>" & sOsEntries
+ sVidModeSection = ME.GENERATE_LILO_DOT_CONF_VIDEOMODES_SECTION()
+ sFile = sHeader & "<br>" & sVidModeSection & "<br><br>" & sOsEntries
+ 'Message(sFile)
+
+ ' move files to the right place
+ ME.COPY_KERNELS_AND_INITRDS()
+ IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf") THEN
+ TRY MOVE ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf" TO
ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist"
+ END IF
+
+ File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", sFile)
+
' write the file to the target
@@ -169,6 +233,72 @@
+PUBLIC SUB COPY_KERNELS_AND_INITRDS()
+
+ DIM tb AS TextBox
+ DIM cbox AS ComboBox
+ DIM cb AS CheckBox
+ DIM sKernelPath, sPart, sShortpart AS String
+ DIM sKernel, sInitrd, sKernelLoc AS String
+
+
+ ' PREPARE HOST PARTITION
+ 'EXEC ["mount", "/dev/sdb8", "/mnt/target"] WAIT
+ EXEC ["mount", ClsPartSel.sRoot, "/mnt/target"] WAIT
+ 'ClsGlobal.sTargetMnt = "/mnt/target"
+
+ 'ClsPartSel.sRoot = "/dev/sdb8"
+ 'ClsPartSel.fRoot = "reiserfs"
+ ' TRY MKDIR ClsGlobal.sTargetMnt &/ "boot"
+ ' TRY MKDIR ClsGlobal.sTargetMnt &/ "boot" &/ "tamu"
+ ' TRY MKDIR ClsGlobal.sTargetMnt &/ "etc"
+
+
+ FOR EACH cb IN MdlLilo.arrLinuxIncCheckboxes
+ IF cb.Value = TRUE THEN
+ sPart = Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
+ sShortpart = Right(sPart, Len(sPart) - RInStr(sPart, "/"))
+
+ IF sPart = ClsPartSel.sRoot THEN
+ sKernelPath = "boot"
+ ELSE
+ sKernelPath = "boot/tamu"
+ END IF
+
+ ' get the initrd name
+ FOR EACH cbox IN MdlLilo.arrCbInitrds
+ 'Message(cbox.tag)
+ IF cbox.tag = cb.tag THEN
+ 'Message("Found initrd")
+ sInitrd = Trim(cbox.text)
+ 'IF sInitrd = "" THEN sInitrd = "initrd"
+ END IF
+ NEXT
+ 'for each tb in MdlLilo.arr
+
+ EXEC ["sync"] WAIT
+ EXEC ["mount", sPart, "/tmp/lilo_tmp"] WAIT
+ IF MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
LIKE "vector" THEN
+ sKernelLoc = "/tmp/lilo_tmp/boot"
+ ELSE
+ sKernelLoc = "/tmp/lilo_tmp"
+ END IF
+
+ ' EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt
&/ "boot/tamu"] WAIT
+ EXEC ["cp", sKernelLoc &/ sInitrd,
ClsGlobal.sTargetMnt &/ sKernelPath &/ sInitrd & "-" & sShortpart] WAIT
+ EXEC ["cp", sKernelLoc &/ "vmlinuz",
ClsGlobal.sTargetMnt &/ sKernelPath &/ "vmlinuz-" & sShortpart] WAIT
+
+
+ EXEC ["sync"] WAIT
+ EXEC ["umount", "/tmp/lilo_tmp"] WAIT
+ ' END IF
+ 'NEXT
+ 'END IF
+
+END IF
+NEXT
+EXEC ["umount", "/mnt/target"] WAIT
+END
@@ -199,9 +329,13 @@
sPart = Right(sLinuxpart, Len(sLinuxPart) -
RInStr(sLinuxPart, "/"))
EXEC ["mount", "/dev/" & sPart, "/tmp/lilo_tmp"] WAIT
- IF IsDir("/tmp/lilo_tmp/boot") THEN
+ IF IsDir("/tmp/lilo_tmp/boot") THEN
+ IF sPart = ClsPartSel.sRoot THEN
+ sOsDesc = "VectorLinux"
+ ELSE
'FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ END IF
'Message(sOsDesc)
IF sOsDesc LIKE "vector" THEN
sKernelLoc = "/tmp/lilo_tmp/boot"
@@ -416,7 +550,11 @@
.Width = 200
.MaxLength = 15
.Move(x + tl.Width + 8, y)
- .Text = sDesc & "-" &
Right(sHostPart, Len(sHostPart) - RInStr(sHostPart, "/"))
+ IF sHostPart =
ClsPartSel.sRoot THEN
+ .text = "VectorLinux"
+ ELSE
+ .Text = sDesc & "-" &
Right(sHostPart, Len(sHostPart) - RInStr(sHostPart, "/"))
+ END IF
.Tag = i & sHostPart
END WITH
ME.arrLinuxNametxtboxes.Add(tb)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-14 16:56:38
|
Author: M0...@gm...
Date: Fri Nov 14 08:56:14 2008
New Revision: 294
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/MdlLilo.module
Log:
Successfully generates lilo.conf
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Nov 14 08:56:14 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Nov 14 08:56:14 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Nov 14 08:56:14 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Nov 14 08:56:14 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmLiloSetup
Version=0.0.162
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Fri Nov 14 08:56:14 2008
@@ -76,3 +76,18 @@
END
+
+
+PUBLIC SUB cbYNLilo_Click()
+ DIM bVal AS Boolean
+ IF LAST.value = TRUE THEN bval = FALSE
+ IF LAST.value = FALSE THEN bval = TRUE
+ WITH ME
+ .tsLIloTabs.Enabled = bval
+ .cbBootDefault.Enabled = bval
+ .cbLIloTarget.Enabled = bval
+ .cbVideoRes.Enabled = bval
+ .SpinBox1.Enabled = bval
+END WITH
+END
+
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Fri Nov 14 08:56:14 2008
@@ -19,7 +19,7 @@
{ Panel1 Panel
MoveScaled(2,8,84,4)
Arrangement = Arrange.Horizontal
- { CheckBox1 CheckBox
+ { cbYNLilo CheckBox
MoveScaled(0,0,20,3)
Expand = True
Text = ("Do not install LILO")
@@ -79,6 +79,7 @@
}
{ SpinBox1 SpinBox
MoveScaled(15,0,7,3)
+ Value = 10
}
{ cbTimeOutSec TextLabel
MoveScaled(24,0,8,3)
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Fri Nov 14 08:56:14 2008
@@ -28,15 +28,66 @@
+PUBLIC FUNCTION generate_lilo_dot_conf_header() AS String
+ DIM sHeader AS String
+ DIM sTarget, sVidMode, sDefOS AS String
+ DIM iTimeOut AS Integer
+
+ sTarget = Trim(FrmLiloSetup.cbLIloTarget.Text)
+ IF InStr(sTarget, "MBR of") THEN
+ sTarget = Right(sTarget, Len(sTarget) - InStr(sTarget, "/") + 1)
+ ELSE IF sTarget = "Sector" THEN
+ sTarget = ClsPartSel.sRoot
+ ELSE IF sTarget = "Floppy" THEN
+ sTarget = "/dev/df0"
+ END IF
+
+ 'iTimeOut = FrmLiloSetup.cbTimeOutSec.value * 10
+ iTimeOut = FrmLiloSetup.SpinBox1.Value * 10
+
+
+ sHeader = "# LILO Configuration file \n" &
+ "# Generated by the VectorLinux installer \n" &
+ "# \n" &
+ "# Begin lilo global configuration \n" &
+ "# \n" &
+ "boot = " & sTarget & "\n" &
+ "default = " & Trim(FrmLiloSetup.cbBootDefault.Text) & "\n" &
+ "prompt \n" &
+ "compact \n" &
+ "timeout = " & iTimeOut & "\n" &
+ "# \n" &
+ "# \n" &
+ "# Override dangerous defaults that require the partition table: \n" &
+ "change-rules \n" &
+ "reset \n"
+ IF Exist(ClsGlobal.sTargetMnt &/ "boot" &/ "bitmap" &/ "boot.bmp") THEN
+ sHeader = sHeader & "\n" &
+ "bitmap = /boot/bitmap/boot.bmp \n"
+ END IF
+ sHeader = sHeader & "\n" &
+ "vga = 791 \n" &
+ "# Begin listing OS Choices \n"
+
+
+ RETURN sHeader
+
+END
+
+
+
+
PUBLIC SUB GENERATE_LILO_DOT_CONF()
DIM tb AS TextBox
DIM cb, chbox AS CheckBox
-
- DIM sSection, sClisection AS String
+DIM sOsEntries AS String
+ DIM sSection, sClisection, sWinSection AS String
DIM cbox AS ComboBox
- DIM sLabel, sKernel, sInitrd, sAppend AS String
- DIM sBootPath AS String
+ DIM sLabel, sKernel, sInitrd, sAppend, sTag AS String
+ DIM sBootPath, sHeader, sFile AS String
+
+
FOR EACH cb IN arrLinuxIncCheckboxes
@@ -65,13 +116,13 @@
"label = " & sLabel & "<br>" &
"append = " & sAppend & "<br>" &
"initrd = " & sBootPath &/ sInitrd & "<br>" &
- "read only"
+ "read only" & "<br>"
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
sClisection = sSection
sClisection = Replace(sClisection, "append = " &
sAppend, "append = 2 splash=verbose vga=791")
- sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli")
+ sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "<br>"
ELSE
sClisection = ""
END IF
@@ -79,16 +130,39 @@
END IF
NEXT
+ FOR EACH chbox IN ME.arrWinBootChecks
+ IF chbox.Value = TRUE THEN
+ FOR EACH tb IN ME.arrWinNameTxtBoxes
+ IF tb.Tag = chbox.tag THEN
+ sTag = Right(tb.Tag, Len(tb.Tag) -
InStr(tb.Tag, "/") + 1)
+
+ sWinSection = "other = " & sTag & "<br>"
& 'Right(tb.tag, Len(tb.Tag) - InStr(tb.Tag, "/")) & "<br>" &
+ "label = " & tb.Text & "<br>" &
+ "table = " & Left(sTag, 8) & "<br>"
+ ELSE
+ sWinSection = ""
+ END IF
+ NEXT
+ END IF
+ NEXT
+
+
- Message(sSection)
- IF sClisection THEN Message(sClisection)
+ 'Message(sSection)
+ sOsEntries = sOsEntries & "<br>" & sSection & "<br>" &
sClisection & "<br>" & sWinSection
+
+ ' IF sClisection THEN Message(sClisection)
'sSection = "image=" & "boot" &/ tb.Text
'Message(sSection)
END IF
NEXT
'END IF
'NEXT
+ sHeader = ME.generate_lilo_dot_conf_header()
+ sFile = sHeader & "<br>" & sOsEntries
+
+ ' write the file to the target
END
@@ -455,6 +529,9 @@
END
+
+
+
PUBLIC SUB OsNameTxtBox_KeyPress()
DIM sOld AS String
@@ -464,6 +541,8 @@
IF iKey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
+ 'FrmLiloSetup.tsLIloTabs.Text = LAST.text
+
'FrmLiloSetup.cbBootDefault.Add(LAST.text)
'IF FrmLiloSetup.cbBootDefault.Find(sOld) <> -1 THEN
FrmLiloSetup.cbBootDefault.Remove
@@ -479,7 +558,7 @@
IF ikey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
FrmLiloSetup.cbBootDefault.Add(LAST.text)
-
+ FrmLiloSetup.tsLIloTabs.Text = LAST.text
'FrmLiloSetup.cbBootDefault.Add(LAST.text)
|
|
From: <cod...@go...> - 2008-11-14 00:31:35
|
Author: uelsk8s
Date: Thu Nov 13 16:30:06 2008
New Revision: 293
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/ClsGlobal.class
branches/iVL/FrmLilo.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
fixed full install pkg count resolves div by 0 bug
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /root/gui-installer2/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /root/gui-installer2/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /root/gui-installer2/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /root/gui-installer2/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /root/gui-installer2/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /root/gui-installer2/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /root/gui-installer2/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /root/gui-installer2/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /root/gui-installer2/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /root/gui-installer2/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /root/gui-installer2/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /root/gui-installer2/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /root/gui-installer2/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /root/gui-installer2/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /root/gui-installer2/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /root/gui-installer2/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /root/gui-installer2/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /root/gui-installer2/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:242
+#: MdlSetup.module:198
+msgid "Calculating package count ... Please wait"
+msgstr ""
+
+#: MdlSetup.module:254
+msgid "Total bulks to be installed = "
+msgstr ""
+
+#: MdlSetup.module:257
+msgid "Total pkgs to be installed = "
+msgstr ""
+
+#: MdlSetup.module:304
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:258
+#: MdlSetup.module:320
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:260
+#: MdlSetup.module:322
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /root/gui-installer2/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Nov 13 16:30:06 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /root/gui-installer2/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 13 16:30:06 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmLiloSetup
-Version=0.0.159
+Startup=MdlCore
+Version=0.0.162
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -12,12 +12,12 @@
Library=gb.gtk.ext
Description=GUI installer for Vector linux
Authors=M0E-lnx
-Arguments="-C"
TabSize=2
Translate=1
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/root/gui-installer2/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/ClsGlobal.class
==============================================================================
--- branches/iVL/ClsGlobal.class (original)
+++ branches/iVL/ClsGlobal.class Thu Nov 13 16:30:06 2008
@@ -26,6 +26,10 @@
STATIC PUBLIC iSwapMin AS Integer = 64
STATIC PUBLIC iPkgCnt AS Integer = 0
STATIC PUBLIC iBulkCnt AS Integer = 0
+STATIC PUBLIC iPkgTot AS Integer = 0
+STATIC PUBLIC iPkgNum AS Integer = 0
+
+STATIC PUBLIC fPbInc AS Float
STATIC PUBLIC sRootMnt AS String
STATIC PUBLIC sHomeMnt AS String
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Nov 13 16:30:06 2008
@@ -32,11 +32,11 @@
ME.sVidMode = "Standard"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
MdlLiloOsList.LIST_LILO_OS_CHOICES()
-MdlLiloOsList.LIST_WIN_INSTALL_CHOICES(ME.TabStrip1.Count)
+MdlLiloOsList.LIST_WIN_INSTALL_CHOICES(ME.tsOsSetup.Count)
ME.tlList.text = ("The following Operating Systems have been detected on
this computer. Choose your desired option") & Space(1)&
("for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click") & Space(1) & "\'" &
FMain.btnext.text & "\'"
ME.tlList.Adjust
-ME.TabStrip1.Index = MdlLiloOsList.iVltag
+ME.tsOsSetup.Index = MdlLiloOsList.iVltag
MdlLiloOsList.bVlCliOption = TRUE
' ' '
@@ -48,7 +48,7 @@
FBResolution.text = "Bootsplash High"
FBResolution_Click()
MdlLiloOsList.list_boot_options()
-ME.TabStrip1.Index = 0
+ME.tsOsSetup.Index = 0
ME.cbDefBoot.Text = "Linux"
END
@@ -64,13 +64,13 @@
' .LiloAppendBox.Enabled = FALSE
.LiloTarget.Enabled = FALSE
.FBResolution.Enabled = FALSE
- .TabStrip1.Enabled = FALSE
+ .tsOsSetup.Enabled = FALSE
.sbTimer.Enabled = FALSE
.cbDefBoot.Enabled = FALSE
END WITH
ELSE
WITH ME
- .TabStrip1.Enabled = TRUE
+ .tsOsSetup.Enabled = TRUE
'.LiloAppendBox.Enabled = TRUE
.LiloTarget.Enabled = TRUE
.FBResolution.Enabled = TRUE
@@ -113,14 +113,14 @@
.tlList.Move(.tlTimeOUt.left, .tlTimeOUt.top + .tlTimeOUt.Height +
12, .tlBanner.Width)
'.TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.tlBanner.Height
* 8))
- .TabStrip1.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.TabStrip1.left * 2), .ClientHeight - (.TabStrip1.top) -
(.YNLiloBox.Height * 10))
+ .tsOsSetup.Move(.tlList.Left, .tlList.top + .tlList.Height +
8, .ClientWidth - (.tsOsSetup.left * 2), .ClientHeight - (.tsOsSetup.top) -
(.YNLiloBox.Height * 10))
'.TabStrip1.Move(4, .tlList.top + .tlList.Height + 8, .ClientWidth -
(.TabStrip1.Left * 2), .ClientHeight - (.TabStrip1.top + (.YNLiloBox.height
* 3)))
END WITH
FOR EACH tb IN MdlLiloOsList.txtAppends
FOR EACH tl IN MdlLiloOsList.tlappends
IF tb.tag = tl.tag THEN
- tb.Move(tl.left + tl.Width + 4, tl.top, ME.TabStrip1.Width -
tb.left - 8)
+ tb.Move(tl.left + tl.Width + 4, tl.top, ME.tsOsSetup.Width -
tb.left - 8)
END IF
NEXT
NEXT
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Nov 13 16:30:06 2008
@@ -18,12 +18,12 @@
' needs to read arrays from clsPkgsel and install all required packages
-PUBLIC fPbInc AS Float
+'PUBLIC fPbInc AS Float
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
-PRIVATE iPkgCnt AS Integer
+'PRIVATE iPkgCnt AS Integer
PRIVATE iPkgNum AS Integer
@@ -36,7 +36,9 @@
.tvPlan["Inst1"].Picture = MdlCore.sNowPic
.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END WITH
- ME.CALCULATE_TOTAL_PACKAGES()
+ 'pass the pkg count to the function in mdlsetup
+ MdlSetup.CALCULATE_PACKAGE_COUNT(TRUE)
+ 'ME.CALCULATE_TOTAL_PACKAGES()
'RETURN
WAIT 2
iRet = ME.INSTALL_REQUIRED_BULKS()
@@ -66,8 +68,8 @@
'iret = ME.INSTALL_PACKAGES_REQUIRED()
' Make sure we set the right value for the progress bar here
- MdlInstallSys.iPkgCnt = iPkgCnt
- MdlInstallSys.iPkgNum = iPkgNum
+ 'MdlInstallSys.iPkgCnt = iPkgCnt
+ 'MdlInstallSys.iPkgNum = iPkgNum
iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
@@ -275,7 +277,7 @@
FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &
FrmUsrPkgSel.GridView1[ii, 1].Text
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
'hproc = EXEC ["installpkg -R " & ClsGlobal.sTargetMnt &
Space(1) & sBasePath &/ sLoc &/ sPkg & " || echo \'FAILED\' 2>
/tmp/installdump"]
@@ -353,7 +355,7 @@
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
IF InStr(sDump, "FAILED") > 0 THEN
Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
RETURN 1
@@ -535,103 +537,103 @@
END
-PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
-
- DIM i, ii AS Integer
- DIM irs AS Integer
- DIM sOutput AS String
- DIM sOutArr AS String[]
- DIM cb AS CheckBox
-
-
- PRINT ("Calculating package count ... Please wait")
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^BULK | grep required" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- ELSE
- i = i + 1
- END IF
- 'add bulks to ClsGlobal.iBulkCnt
- ClsGlobal.iBulkCnt = i
- 'Message.Info(i & " from required bulks")
- 'RETURN
- 'count required packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
- sOutput = Trim(sOutput)
- sOutArr = Split(sOutput, ",")
- i = i + sOutArr.Count
- 'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = sOutArr.Count
- 'Message(i & " from packages/required")
- 'Count CONF packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^CONF" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
- ELSE
- i = i + 1
- 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at the
end
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
- END IF
- 'Count user-selected stuff in
-
- REPEAT
- IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
- INC ii
- UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
- i = i + irs
- 'add bulks to ClsGlobal.iBulkCnt
- ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
-
-
- ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
- ' ' ' ' irs = 0
- ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
- ' ' ' ' IF cb.value = TRUE THEN INC irs
- ' ' ' '
- ' ' ' '
- ' ' ' ' NEXT
- ' ' ' ' i = i + irs
- ' now do the optional packages
- irs = 0 ' reset the count
-
- REPEAT
- IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
- INC irs
- END IF
- INC ii
- UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
-
-
- ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
- ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
- ' ' ' ' ' ' '
-' NEXT
- i = i + irs ' the count to the total
- 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
- 'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
- iPkgCnt = i
- PRINT ("Total packages to be installed = ") & i
- fPbInc = 1 / iPkgCnt
- PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every package installed"
- PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
- fPbInc = 0.6 / ClsGlobal.iBulkCnt
- PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every bulk installed"
- PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
- fPbInc = 0.4 / ClsGlobal.iPkgCnt
- PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every pkg installed"
-
-END
+' PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
+'
+' DIM i, ii AS Integer
+' DIM irs AS Integer
+' DIM sOutput AS String
+' DIM sOutArr AS String[]
+' DIM cb AS CheckBox
+'
+'
+' PRINT ("Calculating package count ... Please wait")
+' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^BULK | grep required" TO sOutput
+' sOutput = Trim(sOutput)
+' IF InStr(sOutput, "\n") > 0 THEN
+' sOutArr = Split(sOutput, "\n")
+' i = i + sOutArr.Count
+' ELSE
+' i = i + 1
+' END IF
+' 'add bulks to ClsGlobal.iBulkCnt
+' ClsGlobal.iBulkCnt = i
+' 'Message.Info(i & " from required bulks")
+' 'RETURN
+' 'count required packages in
+' sOutArr.Clear
+' sOutput = ""
+' SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
+' sOutput = Trim(sOutput)
+' sOutArr = Split(sOutput, ",")
+' i = i + sOutArr.Count
+' 'add pkgs TO ClsGlobal.iPkgCnt
+' ClsGlobal.iPkgCnt = sOutArr.Count
+' 'Message(i & " from packages/required")
+' 'Count CONF packages in
+' sOutArr.Clear
+' sOutput = ""
+' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sOutput
+' sOutput = Trim(sOutput)
+' IF InStr(sOutput, "\n") > 0 THEN
+' sOutArr = Split(sOutput, "\n")
+' i = i + sOutArr.Count
+' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
+' ELSE
+' i = i + 1
+' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
+' END IF
+' 'Count user-selected stuff in
+'
+' REPEAT
+' IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
+' INC ii
+' UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+' i = i + irs
+' 'add bulks to ClsGlobal.iBulkCnt
+' ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
+'
+'
+' ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
+' ' ' ' ' irs = 0
+' ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
+' ' ' ' ' IF cb.value = TRUE THEN INC irs
+' ' ' ' '
+' ' ' ' '
+' ' ' ' ' NEXT
+' ' ' ' ' i = i + irs
+' ' now do the optional packages
+' irs = 0 ' reset the count
+'
+' REPEAT
+' IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes
THEN
+' INC irs
+' END IF
+' INC ii
+' UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
+'
+'
+' ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
+' ' ' ' ' ' ' '
+' ' NEXT
+' i = i + irs ' the count to the total
+' 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
+' 'add pkgs TO ClsGlobal.iPkgCnt
+' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
+' iPkgCnt = i
+' PRINT ("Total packages to be installed = ") & i
+' fPbInc = 1 / iPkgCnt
+' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every package installed"
+' PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
+' fPbInc = 0.6 / ClsGlobal.iBulkCnt
+' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every bulk installed"
+' PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
+' fPbInc = 0.4 / ClsGlobal.iPkgCnt
+' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every pkg installed"
+'
+' END
PUBLIC FUNCTION INSTALL_REQUIRED_BULKS() AS Integer
@@ -668,7 +670,7 @@
PRINT " ! " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk & " is
installed"
NEXT
ELSE ' found only one line
- iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
+ 'iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
sLine = Split(sTrimmed, ":")
@@ -726,7 +728,7 @@
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (fPbInc - (fPbInc *
FrmInstallSys.pbInstallProg.Value)) / 100)
+ FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
END IF
UNTIL
hproc.State = Process.Stopped
@@ -738,7 +740,7 @@
' ' ' IF InStr(sDump, "FAILED") > 0 THEN
' ' ' RETURN 1
' ' ' ELSE
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
RETURN 0
END IF
' END IF
@@ -760,7 +762,7 @@
END IF
FrmInstallSys.pbInstallProg.Value = 0
INC iPkgNum
- PRINT "Package " & iPkgNum & " of " & iPkgCnt
+ PRINT "Package " & iPkgNum & " of " & ClsGlobal.iPkgTot
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
@@ -788,7 +790,7 @@
ELSE
FrmInstallSys.pbInstallProg.Value = 1
WAIT
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
RETURN 0
END IF
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Nov 13 16:30:06 2008
@@ -18,8 +18,8 @@
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
- PUBLIC iPkgCnt AS Integer
- PUBLIC iPkgNum AS Integer = 0
+ 'PUBLIC iPkgCnt AS Integer
+ 'PUBLIC iPkgNum AS Integer = 0
@@ -312,9 +312,9 @@
.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END WITH
- iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ ClsGlobal.iPkgTot = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
'Message.Info("Total packages = " & iPkgCnt)
- PRINT "Total packages to be installed " & iPkgCnt
+ PRINT "Total packages to be installed " & ClsGlobal.iPkgTot
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
@@ -395,7 +395,7 @@
' now install the package
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " )
&& echo $gsize | cut -f3 -d \' \'" TO vTargetSize
PRINT "installing " & ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName
- INC iPkgNum
+ INC ClsGlobal.iPkgNum
'ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt &/ "packages"
&/ sPkgPath &/ sPkgName)
' move the process here locally
SHELL "echo \"\" /tmp/installdump" WAIT
@@ -405,7 +405,7 @@
REPEAT
WAIT 1
' update progress here
- ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vPgsSize), iPkgNum)
+ ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vPgsSize), ClsGlobal.iPkgNum)
UNTIL
hproc.State = Process.Stopped
END IF
@@ -418,9 +418,9 @@
END IF
FrmInstallSys.pbInstallProg.Value = 1
WAIT
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
NEXT
- INC iPkgNum
+ INC ClsGlobal.iPkgNum
'error check
IF InStr(sDump, "FAILED") > 0 THEN
PRINT sPkgName & " failed to install "
@@ -446,8 +446,6 @@
'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF")
DIM sLine AS String
-
-
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
sList = Split(sRawList, "\n")
@@ -465,7 +463,7 @@
sBulkDesc = sLineArr[2]
'PRINT sBulkPath & vBulkSize & sBulkDesc
FrmInstallSys.pbInstallProg.Value = 0
- INC iPkgNum
+ INC ClsGlobal.iPkgNum
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) &&
echo $gsize | cut -f3 -d \' \'" TO vTargetSize
PRINT "installing " & sBulkPath
FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &
sBulkDesc & " ..."
@@ -476,8 +474,8 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vBulkSize), iPkgNum)
-
+ ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vBulkSize), ClsGlobal.iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
UNTIL
hproc.State = Process.Stopped
'error check
@@ -485,7 +483,7 @@
END IF
FrmInstallSys.pbInstallProg.Value = 1
WAIT
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
NEXT
'RETURN
@@ -518,7 +516,7 @@
sDump = ""
SHELL "echo \"\" > /tmp/installdump" WAIT
sErr = ""
- INC iPkgNum
+ INC ClsGlobal.iPkgNum
'hproc = SHELL "install-pkg " & sPath_To_Package & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
'IF Right(sPath_To_Package, 3) LIKE "t?z" THEN
IF File.Ext(sPath_To_Package) LIKE "t?z" THEN
@@ -560,7 +558,7 @@
WITH FrmInstallSys
.Resize(FMain.pnlWinHost.Width, FMain.pnlWinHost.Height)
END WITH
- iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ ClsGlobal.iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
'Message.Info("Total packages = " & iPkgCnt)
'RETURN
' make sure the progress is revealed at the main window
@@ -607,7 +605,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- UPDATE_STEP_PROGRESS(sTargetSize, sPakSize,
iPkgNum)
+ UPDATE_STEP_PROGRESS(sTargetSize, sPakSize,
ClsGlobal.iPkgNum)
UNTIL
hproc.State = Process.Stopped
' error check
@@ -621,8 +619,8 @@
FrmInstallSys.pbInstallProg.Value = 1
END IF
PRINT sPak & " is installed... "
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ INC ClsGlobal.iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
END IF
'PRINT "Needs to install " & sPak
END IF
@@ -718,7 +716,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 1
- UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize, iPkgNum)
+ UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize,
ClsGlobal.iPkgNum)
' figure out the progress again
@@ -735,8 +733,8 @@
END IF
END IF
END IF
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ INC ClsGlobal.iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
END IF
NEXT
@@ -799,8 +797,8 @@
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ INC ClsGlobal.iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
'Message(sTlzPath & "<br>" & sTlzName)
@@ -810,56 +808,52 @@
PUBLIC FUNCTION INSTALL_CONFIG_PACKAGES() AS Integer
- DIM sList AS String[]
- DIM sLinarr AS String[]
- DIM sRawList AS String
- DIM sPkg AS String
- DIM sCOnfLine AS String
- DIM sPkgPath AS String
- DIM i, ipkgsize AS Integer
- DIM itgtsize AS Integer
- SHELL "echo \"\" > /tmp/installdump" WAIT
- 'PRINT "Installing final system configuration"
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sRawList
- 'Message.Info(sRawList)
- 'PRINT sRawList & " config"
-
- 'PRINT "Found a single CONF package... Installing it now"
- sRawList = Trim(sRawList)
- sList = Split(sRawList, "\n")
- FOR i = 0 TO sList.count - 1
-
- sLinarr = Split(Trim(sList[i]), ":")
- sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) -
InStr(sLinarr[0], "\'"))
- ' now install the package
- FrmInstallSys.tlCurrPkg.Text = ("Installing Final
configuration files...") & File.Name(sPkgPath)
-
- 'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
- SHELL "i=$(df | grep " & ClsGlobal.sSourceMnt & ") ;
echo $i | cut -f 3 -d \' \'" TO itgtsize
-
-
- FrmInstallSys.pbInstallProg.Value = i / sList.Count - 1
- hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sPkgPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
- 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/
sPkgPath)
-
- WAIT 1
- IF hproc.State = Process.Running THEN
- REPEAT
- WAIT 2
- ME.UPDATE_STEP_PROGRESS(itgtsize, sLinArr[1],
iPkgNum)
- UNTIL
- hproc.State = Process.Stopped
- END IF
- INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- ' END IF
+
+ DIM sList AS String[]
+ DIM sLinarr AS String[]
+ DIM sRawList AS String
+ DIM sPkg AS String
+ DIM sCOnfLine AS String
+ DIM sPkgPath AS String
+ DIM i, ipkgsize AS Integer
+ DIM itgtsize AS Integer
+
+ SHELL "echo \"\" > /tmp/installdump" WAIT
+ 'PRINT "Installing final system configuration"
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^CONF" TO sRawList
+ 'Message.Info(sRawList)
+ 'PRINT sRawList & " config"
+ 'PRINT "Found a single CONF package... Installing it now"
+ sRawList = Trim(sRawList)
+ sList = Split(sRawList, "\n")
+ FOR i = 0 TO sList.count - 1
+ sLinarr = Split(Trim(sList[i]), ":")
+ sPkgPath = Right(sLinarr[0], Len(sLinarr[0]) - InStr(sLinarr[0], "\'"))
+ ' now install the package
+ FrmInstallSys.tlCurrPkg.Text = ("Installing Final configuration
files...") & File.Name(sPkgPath)
+ 'hproc = SHELL "install-pkg " & sPkgPath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
+ SHELL "i=$(df | grep " & ClsGlobal.sSourceMnt & ") ; echo $i | cut -f
3 -d \' \'" TO itgtsize
+ FrmInstallSys.pbInstallProg.Value = i / sList.Count - 1
+ hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt &/ "veclinux" &/
sPkgPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " || echo \'FAILED\'
2> /tmp/installdump" 'FOR READ
+ 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/ sPkgPath)
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 2
+ 'ME.UPDATE_STEP_PROGRESS(itgtsize, sLinArr[1], ClsGlobal.iPkgNum)
+ UNTIL
+ hproc.State = Process.Stopped
+ END IF
+ INC ClsGlobal.iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+ 'END IF
sDump = File.Load("/tmp/installdump")
IF InStr(sDump, "FAILED") > 0 THEN
RETURN 1
ELSE
RETURN 0
- END IF
- NEXT
+ END IF
+ NEXT
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Nov 13 16:30:06 2008
@@ -115,7 +115,7 @@
FOR i = 0 TO arrNTFS.count - 1
- idx = FrmLilo.TabStrip1.count - 1
+ idx = FrmLilo.tsOsSetup.count - 1
sWinPart = arrNTFS[i]
sWinAddr = Right(arrNTFS[i], Len(arrNTFS[i]) -
RInStr(arrNTFS[i], "/"))
'sHELL "mkdir /mnt" &/ sWinAddr WAIT
@@ -127,12 +127,12 @@
'IF IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
' this is indeed a windows installation
- WITH FrmLilo.TabStrip1
+ WITH FrmLilo.tsOsSetup
.count = .count + 1
.index = idx
.text = "Windows-" & sWinAddr
' Populate the new windows tab with just one
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinPartLbl"
+ tl = NEW TextLabel(FrmLilo.tsOsSetup) AS "WinPartLbl"
WITH tl
.Move(4, 24)
.text = "<b>" & ("Windows installation found
in") & Space(1) & sWinPart & "</b>"
@@ -141,7 +141,7 @@
.BackColor = Color.Background
END WITH
- cb = NEW CheckBox(FrmLilo.TabStrip1)
AS "bIncludeThisWin"
+ cb = NEW CheckBox(FrmLilo.tsOsSetup)
AS "bIncludeThisWin"
WITH cb
.Move(4, tl.top + tl.Height + 12)
.tag = sWinPart
@@ -152,14 +152,14 @@
.Value = TRUE
END WITH
arrWinInstalls.Add(cb) ' add to the array
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinLblLbl"
+ tl = NEW TextLabel(FrmLilo.tsOsSetup) AS "WinLblLbl"
WITH tl
.text = ("Label")
.MOVE(4, cb.top + cb.Height + 4,
MdlObjSizer.get_object_width(.text), 27)
.BackColor = Color.Background
.Alignment = Align.Normal
END WITH
- tb = NEW TextBox(FrmLilo.TabStrip1) AS "WinLbl"
+ tb = NEW TextBox(FrmLilo.tsOsSetup) AS "WinLbl"
WITH tb
.text = "Windows-" & sWinAddr
.Move(tl.left + tl.Width + 4, tl.top, 200, 27)
@@ -228,7 +228,7 @@
DIM cbInclude AS CheckBox
DIM tl AS TextLabel
DIM sShortAddr AS String
- DIM iwidth AS Integer = FrmLilo.TabStrip1.Width
+ DIM iwidth AS Integer = FrmLilo.tsOsSetup.Width
DIM cb AS ComboBox
DIM tb AS TextBox
@@ -273,18 +273,18 @@
arrDump = Split(sDump, "\n")
FOR ii = 0 TO arrDump.Count - 1
- FrmLilo.TabStrip1.Count = FrmLilo.TabStrip1.count +
1 'arrLinux.Count - 1
+ FrmLilo.tsOsSetup.Count = FrmLilo.tsOsSetup.count +
1 'arrLinux.Count - 1
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
- WITH FrmLilo.TabStrip1
- .Index = FrmLilo.TabStrip1.count - 1
+ WITH FrmLilo.tsOsSetup
+ .Index = FrmLilo.tsOsSetup.count - 1
IF arrLinux[i] = ClsPartSel.sRoot THEN
.text = "Linux"
ELSE
.text = sLiloDesc & "-" & sShortAddr
ENDIF
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
+ tl = NEW TextLabel(FrmLilo.tsOsSetup) AS "OSIntro"
WITH tl
.text = "<b>" & ("Operating system installed in") & Space(1)
& arrLinux[i] & "</b> "
.Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
@@ -296,7 +296,7 @@
- cbInclude = NEW CheckBox(FrmLilo.TabStrip1) AS "IncludeOS"
+ cbInclude = NEW CheckBox(FrmLilo.tsOsSetup) AS "IncludeOS"
WITH cbInclude
.text = ("Include this operating system in the boot menu")
.Height = 27
@@ -307,7 +307,7 @@
END WITH
ME.bIncluded.Add(cbInclude)
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "Label"
+ tl = NEW TextLabel(FrmLilo.tsOsSetup) AS "Label"
WITH tl
.text = ("Name")
.Move(cbInclude.left, cbInclude.top + cbInclude.Height +
4, MdlObjSizer.get_object_width(.text))
@@ -315,11 +315,11 @@
.Alignment = Align.Normal
.Background = Color.Background
END WITH
- txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "NameBox"
+ txtAppnd = NEW TextBox(FrmLilo.tsOsSetup) AS "NameBox"
WITH txtAppnd
.Width = tl.Width * 4
.Height = tl.Height
- .text = FrmLilo.TabStrip1.Current.text 'sLiloDesc
+ .text = FrmLilo.tsOsSetup.Current.text 'sLiloDesc
.x = tl.left + tl.Width + 8
.y = tl.Top
.MaxLength = 15
@@ -328,7 +328,7 @@
END WITH
txtNames.Add(txtAppnd)
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "InitdLbl"
+ tl = NEW TextLabel(FrmLilo.tsOsSetup) AS "InitdLbl"
WITH tl
.text = ("Initial Ram Disk")
.Move(txtAppnd.Left + txtAppnd.Width + 8, txtAppnd.top,
MdlObjSizer.get_object_width(.text))
@@ -338,7 +338,7 @@
.Visible = FALSE
END WITH
- txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "initrdBox"
+ txtAppnd = NEW TextBox(FrmLilo.tsOsSetup) AS "initrdBox"
WITH txtAppnd
.Move(tl.Left + tl.Width + 4, tl.top, 250, 27)
@@ -353,7 +353,7 @@
END WITH
ME.txtInitrds.Add(txtAppnd)
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "AppndLbl"
+ tl = NEW TextLabel(FrmLilo.tsOsSetup) AS "AppndLbl"
WITH tl
.text = ("Kernel boot options")
.Move(4, txtAppnd.top + txtAppnd.Height + 4,
MdlObjSizer.get_object_width(.text))
@@ -365,7 +365,7 @@
END WITH
tlappends.Add(tl)
- txtAppnd = NEW TextBox(FrmLilo.TabStrip1) AS "AppendBox"
+ txtAppnd = NEW TextBox(FrmLilo.tsOsSetup) AS "AppendBox"
WITH txtAppnd
'.Move(tl.Left + tl.Width + 8, tl.top, tl.Width * 1.25)
@@ -389,7 +389,7 @@
ClsLilo.sRootInstall = cb.Tag
'FrmLilo.cbDefBoot.Add("Linux-tui")
'IF arrLinux[i] = ClsPartSel.sRoot THEN
- cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
+ cbInclude = NEW CheckBox(FrmLilo.tsOsSetup)
AS "VlCliOption"
WITH cbInclude
.Value = TRUE
.text = ("Add option to boot this Operating system
into Text mode.")
@@ -413,7 +413,7 @@
' NEXT
END WITH
'FrmLilo.cbDefBoot.Add("Linux-tui")
- ME.iVlTag = FrmLilo.TabStrip1.Index - 1
+ ME.iVlTag = FrmLilo.tsOsSetup.Index - 1
END IF
NEXT
@@ -439,11 +439,11 @@
'NEXT ' next in dump
- FOR i = 0 TO FrmLilo.TabStrip1.Count - 1
- WITH FrmLilo.TabStrip1
+ FOR i = 0 TO FrmLilo.tsOsSetup.Count - 1
+ WITH FrmLilo.tsOsSetup
.Index = i
IF .Children.Count < 1 THEN
- FrmLilo.TabStrip1[i].Visible = FALSE
+ FrmLilo.tsOsSetup[i].Visible = FALSE
END IF
END WITH
NEXT
@@ -517,9 +517,9 @@
'ME.list_boot_options()
IF LAST.value = TRUE THEN
- IF FrmLilo.cbDefBoot.Find(FrmLilo.TabStrip1.text) = -1 THEN
FrmLilo.cbDefBoot.Add(FrmLilo.TabStrip1.text)
+ IF FrmLilo.cbDefBoot.Find(FrmLilo.tsOsSetup.text) = -1 THEN
FrmLilo.cbDefBoot.Add(FrmLilo.tsOsSetup.text)
ELSE
- IF FrmLilo.cbDefBoot.Find(FrmLilo.TabStrip1.text) <> -1 THEN
FrmLilo.cbDefBoot.Remove(FrmLilo.cbDefBoot.Find(FrmLilo.TabStrip1.text))
+ IF FrmLilo.cbDefBoot.Find(FrmLilo.tsOsSetup.text) <> -1 THEN
FrmLilo.cbDefBoot.Remove(FrmLilo.cbDefBoot.Find(FrmLilo.tsOsSetup.text))
END IF
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Nov 13 16:30:06 2008
@@ -167,7 +167,7 @@
iCPkg = iCurrPkg - ClsGlobal.iBulkCnt
fRet = iCPkg * fcur
fRet = Round(fRet, -2)
- fRet = fRet + 0.6
+ fRet = fRet + fbulk
ENDIF
RETURN fRet
@@ -176,26 +176,88 @@
PUBLIC FUNCTION CALCULATE_PACKAGE_COUNT(bCustom AS Boolean) AS Integer
-
+
+ DIM sOutput AS String
+ DIM sOutArr AS String[]
+ DIM cb AS CheckBox
DIM sDump AS String
DIM sTotalList AS String
- DIM i AS Integer
+ DIM i, ii AS Integer
+ DIM irs AS Integer
DIM sList AS String[]
- DIM iQTY AS Integer
' let's get a package count
- IF bCustom = FALSE THEN ' DOING A FULL INSTALL
-
- SHELL "find " & ClsGlobal.sSourceMnt & " -name \"*.tlz\"|wc -l" TO
iQTY
+ IF bCustom = FALSE THEN 'DOING A FULL INSTALL
+ 'find bulks
+ SHELL "find " & ClsGlobal.sSourceMnt & "/veclinux -name \"*.tlz\"|wc
-l" TO ClsGlobal.iBulkCnt
+ 'find packages
+ SHELL "find " & ClsGlobal.sSourceMnt & "/packages -name \"*.tlz\"|wc
-l" TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgTot = ClsGlobal.iBulkCnt + ClsGlobal.iPkgCnt
+ PRINT ClsGlobal.iPkgTot
ELSE ' GOING FOR CUSTOM INSTALL
-
+ PRINT ("Calculating package count ... Please wait")
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^BULK | grep required" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ ELSE
+ i = i + 1
+ END IF
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = i
+ 'count required packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
+ sOutput = Trim(sOutput)
+ sOutArr = Split(sOutput, ",")
+ i = i + sOutArr.Count
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = sOutArr.Count
+ 'Count CONF packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
+ ELSE
+ i = i + 1
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
+ END IF
+ 'Count user-selected bulks
+ REPEAT
+ IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes THEN
INC irs
+ INC ii
+ UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+ i = i + irs
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
+ ' now do the optional packages
+ irs = 0 ' reset the count
+ REPEAT
+ IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+ INC irs
+ END IF
+ INC ii
+ UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
+ i = i + irs ' the count to the total
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
+ ClsGlobal.iPkgTot = i
END IF
-
-
- RETURN iQTY
-
-
-
+ PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
+ ClsGlobal.fPbInc = 0.6 / ClsGlobal.iBulkCnt
+ PRINT "The total progrssbar will work in increments of " &
ClsGlobal.fPbInc & " on every bulk installed"
+ PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
+ ClsGlobal.fPbInc = 0.4 / ClsGlobal.iPkgCnt
+ PRINT "The total progrssbar will work in increments of " &
ClsGlobal.fPbInc & " on every pkg installed"
+ RETURN ClsGlobal.iPkgTot
END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-13 22:26:57
|
Author: M0E.lnx
Date: Thu Nov 13 14:26:10 2008
New Revision: 292
Modified:
branches/iVL/MdlLilo.module
Log:
Lilo Setup - Implemented OS Name changes to default boot options
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 13 14:26:10 2008
@@ -247,7 +247,7 @@
END WITH
'y = y + tl.Height + 4
- tb = NEW TextBox(FrmLiloSetup.tsLIloTabs) AS "txtWinNameBox"
+ tb = NEW TextBox(FrmLiloSetup.tsLIloTabs)
AS "OsNameTxtBox" ' " txtWinNameBox ""
WITH tb
.Height = 21
.Width = 200
@@ -455,4 +455,33 @@
END
+PUBLIC SUB OsNameTxtBox_KeyPress()
+
+ DIM sOld AS String
+ DIM iKey AS Integer
+ sOld = LAST.Text
+ iKey = FrmLiloSetup.cbBootDefault.Find(sOld)
+
+ IF iKey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
+
+ 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
+ 'IF FrmLiloSetup.cbBootDefault.Find(sOld) <> -1 THEN
FrmLiloSetup.cbBootDefault.Remove
+
+ 'Message(sOld)
+
+
+END
+PUBLIC SUB OsNameTxtBox_KeyRelease()
+ DIM iKey AS Integer
+
+ iKey = FrmLiloSetup.cbBootDefault.Find(Left(LAST.Text, Len(LAST.text) -
1))
+ IF ikey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
+ FrmLiloSetup.cbBootDefault.Add(LAST.text)
+
+
+ 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
+
+
+
+END
|
|
From: <cod...@go...> - 2008-11-13 21:53:53
|
Author: M0E.lnx
Date: Thu Nov 13 13:53:08 2008
New Revision: 291
Modified:
branches/iVL/MdlLilo.module
Log:
MdlLilo.module - Added initial OS list to default boot options
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 13 13:53:08 2008
@@ -192,7 +192,7 @@
-
+ EXEC ["sync"] WAIT
EXEC ["umount", sTmpMountPoint] WAIT
NEXT
@@ -440,6 +440,17 @@
END IF
NEXT
END IF
+ NEXT
+
+ ' List windows installs now
+ FOR EACH cb IN ME.arrWinBootChecks
+ IF cb.Value = TRUE THEN
+ FOR EACH tb IN ME.arrWinNameTxtBoxes
+ IF cb.Tag = tb.Tag THEN
+ IF FrmLiloSetup.cbBootDefault.Find(tb.Text) = -1 THEN
FrmLiloSetup.cbBootDefault.Add(tb.Text)
+ END IF
+ NEXT
+ END IF
NEXT
END
|
|
From: <cod...@go...> - 2008-11-13 21:24:45
|
Author: M0E.lnx
Date: Thu Nov 13 13:23:40 2008
New Revision: 290
Modified:
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLilo.module
Log:
Added top-form details to new LILO setup window
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Thu Nov 13 13:23:40 2008
@@ -18,9 +18,19 @@
PUBLIC SUB Form_Open()
+
+ ' hack just for testing here
+ ClsPartSel.sRoot = "/dev/hdb1"
+ ClsPartSel.fRoot = "reiserfs"
+
+MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
+ME.list_video_modes()
+
+
MdlLilo.LIST_LINUX_OS()
MdlLilo.LIST_WIN_INSTALLS()
ME.CLEANUP_TABSTRIP()
+ MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
END
PUBLIC SUB CLEANUP_TABSTRIP()
@@ -38,6 +48,22 @@
END
+
+PUBLIC SUB list_video_modes()
+
+ WITH ME.cbVideoRes
+ .Add(("Standard"))
+ .Add(("Bootsplash Med"))
+ .Add(("Bootsplash High"))
+ .Add(("Bootsplash Extra High"))
+ END WITH
+
+
+END
+
+
+
+
PUBLIC SUB Form_Menu()
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Thu Nov 13 13:23:40 2008
@@ -17,7 +17,7 @@
}
}
{ Panel1 Panel
- MoveScaled(2,8,84,3)
+ MoveScaled(2,8,84,4)
Arrangement = Arrange.Horizontal
{ CheckBox1 CheckBox
MoveScaled(0,0,20,3)
@@ -37,10 +37,11 @@
{ cbVideoRes ComboBox
MoveScaled(61,0,22,3)
Text = ("")
+ ReadOnly = True
}
}
{ Panel3 Panel
- MoveScaled(1,11,88,3)
+ MoveScaled(1,12,88,4)
Arrangement = Arrange.Horizontal
{ tlLiloTarget TextLabel
MoveScaled(0,0,7,3)
@@ -48,8 +49,9 @@
Alignment = Align.Normal
}
{ cbLIloTarget ComboBox
- MoveScaled(8,0,26,2)
+ MoveScaled(8,0,26,3)
Text = ("")
+ ReadOnly = True
}
{ Panel4 Panel
MoveScaled(35,1,5,2)
@@ -59,10 +61,12 @@
{ cbDefBoot TextLabel
MoveScaled(45,0,11,3)
Text = ("Boot Default")
+ Alignment = Align.Normal
}
- { ComboBox1 ComboBox
+ { cbBootDefault ComboBox
MoveScaled(62,0,22,3)
Text = ("")
+ ReadOnly = True
}
}
{ PnlTop Panel
@@ -90,7 +94,7 @@
}
}
{ tsLIloTabs TabStrip
- MoveScaled(2,25,84,30)
+ MoveScaled(2,23,84,30)
Expand = True
Index = 0
Text = ("Tab 0")
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Nov 13 13:23:40 2008
@@ -119,39 +119,20 @@
SHELL "probedisk | grep -v cdrom |cut -f 1 -d \'|\'" TO sList
sList = Trim(sList)
- sListarr = Split(sList, "\n")
+ sListarr = Split(sList, "\n").Sort(gb.Ascent)
FOR i = 0 TO sListarr.count - 1
sTarget = "MBR of " & Trim(sListarr[i])
- FrmLilo.LiloTarget.Add(sTarget)
+ 'FrmLilo.LiloTarget.Add(sTarget)
+ FrmLiloSetup.cbLIloTarget.Add(sTarget)
NEXT
- WITH FrmLilo.LiloTarget
- 'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
- 'IF Application.Args[1] <> "" THEN
+ 'WITH FrmLilo.LiloTarget
+ WITH FrmLiloSetup.cbLIloTarget
+ IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
+
+ .Add("Sector")
+ END IF
- ' DETECT THE FILESYSTEM OF THE PARTITION BEING MOUNTED AS
ROOT HERE
-
-
-
- ' ELSE
-
- FOR EACH cb IN MdlPartSel.oMountPoints
- IF cb.text = "/" THEN
- ClsPartSel.sRoot = cb.Tag ' make sure this is set... we
will need it later
- FOR EACH cb1 IN MdlPartSel.oFsTypes
- IF cb1.tag = cb.tag THEN
- IF cb1.text <> "xfs" THEN .Add("Sector")
- END IF
- NEXT
- END IF
- NEXT
-
-
- 'END IF
-
- '.Add("Sector")
-' END IF
-
SHELL "lsdev | grep floppy" TO sDump
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 13 13:23:40 2008
@@ -163,7 +163,7 @@
DIM sWinDrives AS String[]
DIM i, ii AS Integer
DIM sTmpMountPoint AS String = "/tmp/lilo_tmp"
-
+ DIM hproc AS Process
ME.arrWinBootChecks = NEW Object[]
ME.arrWinNameTxtBoxes = NEW Object[]
@@ -172,7 +172,12 @@
sWinDrives = Split(sWinPartlist, gb.NewLine)
FOR i = 0 TO sWinDrives.Count - 1
sPartition = sWinDrives[i]
- EXEC ["mount", sPartition, sTmpMountPoint] WAIT
+ hproc = EXEC ["mount", sPartition, sTmpMountPoint] WAIT
+ IF hproc.Value > 0 THEN
+ EXEC ["sync"] WAIT
+ EXEC ["umount", sPartition] WAIT
+ EXEC ["mount", sPartition, sTmpMountPoint] WAIT
+ END IF
IF Exist(sTmpMountPoint &/ "winnt" &/ "system32"
&/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32"
&/ "winver.exe") THEN
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
@@ -283,9 +288,7 @@
END IF
'Message(sInitrdLoc)
-
- ' hack just for testing here
- ClsPartSel.sRoot = "/dev/hdb1"
+
INC i
x = 4
y = 12
@@ -361,11 +364,11 @@
.Height = 21
.Tag = i & sHostPart
' BROWSE FOR INITRD IMAGES
- FOR EACH sDump IN
Dir(sInitrdLoc, "initrd*")
+ FOR EACH sDump IN
Dir(sInitrdLoc, "initrd*").Sort(gb.Ascent)
IF
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
NEXT
-
- .Sorted = TRUE
+ .Sorted = gb.Ascent
+ '.Sorted = TRUE
END WITH
ME.arrCbInitrds.Add(cbox)
@@ -409,4 +412,36 @@
END
+
+
+PUBLIC SUB LIST_DEFAULT_BOOT_OPTIONS()
+
+ DIM cb, cbox AS CheckBox
+ DIM tb AS TextBox
+
+ FOR EACH cb IN ME.arrLinuxIncCheckboxes
+ IF cb.Value = TRUE THEN
+ FOR EACH tb IN ME.arrLinuxNametxtboxes
+ IF tb.Tag = cb.Tag THEN
+ WITH FrmLiloSetup.cbBootDefault
+ IF .Find(tb.Text) = -1 THEN .Add(tb.Text)
+ END WITH
+ END IF
+ NEXT
+ FOR EACH cbox IN ME.arrLinuxTextBoots
+ IF cb.Tag = cbox.Tag THEN
+ IF cbox.Value = TRUE THEN
+ FOR EACH tb IN ME.arrLinuxNametxtboxes
+ IF cbox.Tag = tb.Tag THEN
+ IF FrmLiloSetup.cbBootDefault.Find(tb.Text
& "-tui") = -1 THEN FrmLiloSetup.cbBootDefault.Add(tb.Text & "-tui")
+ END IF
+ NEXT
+ END IF
+ END IF
+ NEXT
+ END IF
+ NEXT
+
+END
+
|
|
From: <cod...@go...> - 2008-11-13 20:04:22
|
Author: M0E.lnx
Date: Thu Nov 13 12:02:35 2008
New Revision: 289
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
Modified OS Detection @ LILO setup step
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,27 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:197
-msgid "Calculating package count ... Please wait"
-msgstr ""
-
-#: MdlSetup.module:253
-msgid "Total bulks to be installed = "
-msgstr ""
-
-#: MdlSetup.module:256
-msgid "Total pkgs to be installed = "
-msgstr ""
-
-#: MdlSetup.module:303
+#: MdlSetup.module:242
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:319
+#: MdlSetup.module:258
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:321
+#: MdlSetup.module:260
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Thu Nov 13 12:02:35 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 13 12:02:35 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
-Version=0.0.158
+Startup=FrmLiloSetup
+Version=0.0.159
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -18,7 +18,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer2/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Thu Nov 13 12:02:35 2008
@@ -44,3 +44,9 @@
MdlLilo.GENERATE_LILO_DOT_CONF
END
+
+PUBLIC SUB cbTimeOutSec_MouseDown()
+
+
+
+END
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Thu Nov 13 12:02:35 2008
@@ -5,7 +5,7 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
- MoveScaled(1,1,71,7)
+ MoveScaled(1,1,71,6)
{ tlBanner TextLabel
MoveScaled(1,1,21,3)
Expand = True
@@ -16,64 +16,81 @@
Expand = True
}
}
- { HPanel2 HPanel
- MoveScaled(1,8,88,18)
+ { Panel1 Panel
+ MoveScaled(2,8,84,3)
+ Arrangement = Arrange.Horizontal
{ CheckBox1 CheckBox
- MoveScaled(1,2,20,3)
+ MoveScaled(0,0,20,3)
Expand = True
Text = ("Do not install LILO")
}
- { tlVidRes TextLabel
- MoveScaled(40,4,16,3)
+ { Panel2 Panel
+ MoveScaled(22,0,15,1)
Expand = True
+ Arrangement = Arrange.Horizontal
+ }
+ { tlVidRes TextLabel
+ MoveScaled(44,0,15,3)
Text = ("Video Resolution")
Alignment = Align.Normal
}
{ cbVideoRes ComboBox
- MoveScaled(57,4,22,3)
- Expand = True
- Text = ("ComboBox1")
+ MoveScaled(61,0,22,3)
+ Text = ("")
}
+ }
+ { Panel3 Panel
+ MoveScaled(1,11,88,3)
+ Arrangement = Arrange.Horizontal
{ tlLiloTarget TextLabel
- MoveScaled(1,5,7,3)
- Expand = True
+ MoveScaled(0,0,7,3)
Text = ("Target")
Alignment = Align.Normal
}
{ cbLIloTarget ComboBox
- MoveScaled(10,5,26,2)
+ MoveScaled(8,0,26,2)
+ Text = ("")
+ }
+ { Panel4 Panel
+ MoveScaled(35,1,5,2)
Expand = True
- Text = ("ComboBox1")
+ Arrangement = Arrange.Horizontal
}
{ cbDefBoot TextLabel
- MoveScaled(40,8,17,3)
- Expand = True
+ MoveScaled(45,0,11,3)
Text = ("Boot Default")
}
{ ComboBox1 ComboBox
- MoveScaled(58,8,21,3)
- Expand = True
- Text = ("ComboBox1")
+ MoveScaled(62,0,22,3)
+ Text = ("")
}
+ }
+ { PnlTop Panel
+ MoveScaled(1,16,88,3)
+ Arrangement = Arrange.Horizontal
{ tlTimeOut TextLabel
- MoveScaled(1,10,14,3)
- Expand = True
+ MoveScaled(0,0,14,3)
Text = ("Prompt Timeout")
Alignment = Align.Normal
}
{ SpinBox1 SpinBox
- MoveScaled(16,10,7,3)
- Expand = True
+ MoveScaled(15,0,7,3)
}
{ cbTimeOutSec TextLabel
- MoveScaled(24,10,8,3)
- Expand = True
+ MoveScaled(24,0,8,3)
Text = ("Seconds")
Alignment = Align.Normal
}
}
+ { HBox1 HBox
+ MoveScaled(1,19,88,2)
+ { Separator2 Separator
+ MoveScaled(0,1,83,1)
+ Expand = True
+ }
+ }
{ tsLIloTabs TabStrip
- MoveScaled(1,28,84,30)
+ MoveScaled(2,25,84,30)
Expand = True
Index = 0
Text = ("Tab 0")
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 13 12:02:35 2008
@@ -23,6 +23,7 @@
PUBLIC arrWinBootChecks AS Object[]
PUBLIC arrWinNameTxtBoxes AS Object[]
PUBLIC arrCbInitrds AS Object[]
+PUBLIC arriDLabels AS Object[]
PRIVATE i AS Integer ' used for object key
@@ -30,8 +31,9 @@
PUBLIC SUB GENERATE_LILO_DOT_CONF()
DIM tb AS TextBox
- DIM cb AS CheckBox
- DIM sSection AS String
+ DIM cb, chbox AS CheckBox
+
+ DIM sSection, sClisection AS String
DIM cbox AS ComboBox
DIM sLabel, sKernel, sInitrd, sAppend AS String
DIM sBootPath AS String
@@ -47,7 +49,7 @@
FOR EACH tb IN arrLinuxNametxtboxes
IF tb.Tag = cb.Tag THEN
sLabel = tb.Text
- sKernel = "vmlinuz-" & sLabel
+ sKernel = "vmlinuz-" & Right(tb.Tag, Len(tb.Tag) -
RInStr(tb.Tag, "/"))
END IF
NEXT
FOR EACH cbox IN arrCbInitrds
@@ -64,9 +66,23 @@
"append = " & sAppend & "<br>" &
"initrd = " & sBootPath &/ sInitrd & "<br>" &
"read only"
+ FOR EACH chbox IN ME.arrLinuxTextBoots
+ IF chbox.Value = TRUE THEN
+ IF chbox.tag = cb.Tag THEN
+ sClisection = sSection
+ sClisection = Replace(sClisection, "append = " &
sAppend, "append = 2 splash=verbose vga=791")
+ sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli")
+ ELSE
+ sClisection = ""
+ END IF
+
+ END IF
+ NEXT
+
+
Message(sSection)
-
+ IF sClisection THEN Message(sClisection)
'sSection = "image=" & "boot" &/ tb.Text
'Message(sSection)
END IF
@@ -86,7 +102,7 @@
PUBLIC SUB LIST_LINUX_OS()
DIM sDump, sLinuxPart, sPart, vmlinuz, kernel AS String
- DIM sOsDesc AS String
+ DIM sOsDesc, sInitrd, sKernelLoc AS String
DIM x, y, i, ii AS Integer
DIM sPartitions, sOs AS String[]
@@ -96,6 +112,7 @@
arrLinuxAppendtxtBoxes = NEW Object[]
arrLinuxTextBoots = NEW Object[]
arrCbInitrds = NEW Object[]
+ arriDLabels = NEW Object[]
@@ -107,23 +124,31 @@
sLinuxPart = Trim(sPartitions[i])
sPart = Right(sLinuxpart, Len(sLinuxPart) -
RInStr(sLinuxPart, "/"))
EXEC ["mount", "/dev/" & sPart, "/tmp/lilo_tmp"] WAIT
-
- IF IsDir("/tmp/lilo_tmp/boot") THEN
- FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
- IF Stat("/tmp/lilo_tmp/boot" &/
vmlinuz).Type <> 6
- sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
- sOsDesc =
Replace(vmlinuz, "vmlinuz", sOsDesc)
+
+ IF IsDir("/tmp/lilo_tmp/boot") THEN
+ 'FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
+ sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ 'Message(sOsDesc)
+ IF sOsDesc LIKE "vector" THEN
+ sKernelLoc = "/tmp/lilo_tmp/boot"
+ ELSE
+ sKernelLoc = "/tmp/lilo_tmp"
+ END IF
+ FOR EACH vmlinuz IN
Dir(sKernelLoc, "vmlinuz")
+ 'IF Stat("/tmp/lilo_tmp/boot" &/
vmlinuz).Type <> 6
+ 'sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ 'sOsDesc =
Replace(vmlinuz, "vmlinuz", sOsDesc)
'Message(Stat("/tmp/lilo_tmp" &/
vmlinuz).Type)
WITH FrmLiloSetup
.tsLIloTabs.Index
= .tsLIloTabs.Count - 1
- .tsLIloTabs.Text = sOsDesc &
Space(1) & "(" & sPart & ")"
+ .tsLIloTabs.Text = sOsDesc & "-" &
sPart
.tsLIloTabs.Count
= .tsLIloTabs.Count + 1
' populate the tabstrip here
ME.FILL_IN_LINUX_TAB(sOsDesc, "/dev" &/ sPart)
END WITH
- END IF
+ 'END IF
NEXT
END IF
@@ -152,7 +177,7 @@
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
.Index = .Count - 1
- .Text = "Windows" & Space(1) & "(" &
Right(sPartition, Len(sPartition) - RInStr(sPartition, "/")) & ")"
+ .Text = "Windows" & Space(1) & "-" &
Right(sPartition, Len(sPartition) - RInStr(sPartition, "/"))
.Count = .Count + 1
END WITH
' populate the tab
@@ -248,8 +273,15 @@
DIM hrsep AS Separator
DIM cbox AS ComboBox
DIM sDump AS String
+ DIM sInitrdLoc AS String
'DIM i AS Integer
'DIM sKernelStr AS String
+ IF sDesc LIKE "vector" THEN
+ sInitrdLoc = "/tmp/lilo_tmp/boot"
+ ELSE
+ sInitrdLoc = "/tmp/lilo_tmp"
+ END IF
+ 'Message(sInitrdLoc)
' hack just for testing here
@@ -261,11 +293,13 @@
tl = NEW TextLabel(FrmLiloSetup.tsLIloTabs) AS "osItroLabels"
WITH tl
.Move(x, y)
- .Text = "<h3>" & sDesc & Space(1) & ("installed in") & Space(1)
& sHostPart & "</h3>"
+ .Text = "<h3>" & sDesc & Space(1) & "Linux" & Space(1) &
("installed in") & Space(1) & sHostPart & "</h3>"
.Height = 21
.Width = MdlObjSizer.get_object_width(.Text) + 36
.Alignment = Align.Normal
+ .tag = i & sHostPart
END WITH
+ arriDLabels.Add(tl)
y = y + tl.Height + 4
hrsep = NEW Separator(FrmLiloSetup.tsLIloTabs) AS "Separators"
@@ -327,7 +361,7 @@
.Height = 21
.Tag = i & sHostPart
' BROWSE FOR INITRD IMAGES
- FOR EACH sDump IN
Dir("/tmp/lilo_tmp/boot/", "initrd*")
+ FOR EACH sDump IN
Dir(sInitrdLoc, "initrd*")
IF
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
NEXT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-13 13:33:07
|
Author: M0E.lnx
Date: Thu Nov 13 05:32:30 2008
New Revision: 288
Added:
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/MdlLilo.module
Modified:
branches/iVL/ClsGlobal.class
branches/iVL/FrmLilo.form
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlSetup.module
Log:
Begin new LILO setup
Modified: branches/iVL/ClsGlobal.class
==============================================================================
--- branches/iVL/ClsGlobal.class (original)
+++ branches/iVL/ClsGlobal.class Thu Nov 13 05:32:30 2008
@@ -26,10 +26,6 @@
STATIC PUBLIC iSwapMin AS Integer = 64
STATIC PUBLIC iPkgCnt AS Integer = 0
STATIC PUBLIC iBulkCnt AS Integer = 0
-STATIC PUBLIC iPkgTot AS Integer
-STATIC PUBLIC iPkgNum AS Integer
-
-STATIC PUBLIC fPbInc AS Float
STATIC PUBLIC sRootMnt AS String
STATIC PUBLIC sHomeMnt AS String
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Thu Nov 13 05:32:30 2008
@@ -11,7 +11,7 @@
MoveScaled(1,7,18,3)
Text = ("Don't Install Lilo")
}
- { TabStrip1 TabStrip
+ { tsOsSetup TabStrip
MoveScaled(1,27,71,40)
Index = 0
Text = ("Tab 0")
Added: branches/iVL/FrmLiloSetup.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLiloSetup.class Thu Nov 13 05:32:30 2008
@@ -0,0 +1,46 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+
+PUBLIC SUB Form_Open()
+
+ MdlLilo.LIST_LINUX_OS()
+ MdlLilo.LIST_WIN_INSTALLS()
+ ME.CLEANUP_TABSTRIP()
+END
+
+PUBLIC SUB CLEANUP_TABSTRIP()
+DIM i AS Integer
+
+ ' will remove blank tabstrip
+ FOR i = 0 TO ME.tsLIloTabs.Count
+ tsLIloTabs.Index = i
+ IF tsLIloTabs.Text = "" THEN
+ tsLIloTabs[i].Delete
+ RETURN
+ END IF
+
+ NEXT
+
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ MdlLilo.GENERATE_LILO_DOT_CONF
+
+END
Added: branches/iVL/FrmLiloSetup.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmLiloSetup.form Thu Nov 13 05:32:30 2008
@@ -0,0 +1,82 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,92,60)
+ Text = ("")
+ Arrangement = Arrange.Vertical
+ { HPanel1 HPanel
+ MoveScaled(1,1,71,7)
+ { tlBanner TextLabel
+ MoveScaled(1,1,21,3)
+ Expand = True
+ Text = ("Bootloaded Setup")
+ }
+ { Separator1 Separator
+ MoveScaled(2,4,22,1)
+ Expand = True
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,8,88,18)
+ { CheckBox1 CheckBox
+ MoveScaled(1,2,20,3)
+ Expand = True
+ Text = ("Do not install LILO")
+ }
+ { tlVidRes TextLabel
+ MoveScaled(40,4,16,3)
+ Expand = True
+ Text = ("Video Resolution")
+ Alignment = Align.Normal
+ }
+ { cbVideoRes ComboBox
+ MoveScaled(57,4,22,3)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ { tlLiloTarget TextLabel
+ MoveScaled(1,5,7,3)
+ Expand = True
+ Text = ("Target")
+ Alignment = Align.Normal
+ }
+ { cbLIloTarget ComboBox
+ MoveScaled(10,5,26,2)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ { cbDefBoot TextLabel
+ MoveScaled(40,8,17,3)
+ Expand = True
+ Text = ("Boot Default")
+ }
+ { ComboBox1 ComboBox
+ MoveScaled(58,8,21,3)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ { tlTimeOut TextLabel
+ MoveScaled(1,10,14,3)
+ Expand = True
+ Text = ("Prompt Timeout")
+ Alignment = Align.Normal
+ }
+ { SpinBox1 SpinBox
+ MoveScaled(16,10,7,3)
+ Expand = True
+ }
+ { cbTimeOutSec TextLabel
+ MoveScaled(24,10,8,3)
+ Expand = True
+ Text = ("Seconds")
+ Alignment = Align.Normal
+ }
+ }
+ { tsLIloTabs TabStrip
+ MoveScaled(1,28,84,30)
+ Expand = True
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
+ }
+}
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Nov 13 05:32:30 2008
@@ -18,12 +18,12 @@
' needs to read arrays from clsPkgsel and install all required packages
-'PUBLIC fPbInc AS Float
+PUBLIC fPbInc AS Float
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
-'PRIVATE iPkgCnt AS Integer
+PRIVATE iPkgCnt AS Integer
PRIVATE iPkgNum AS Integer
@@ -36,9 +36,7 @@
.tvPlan["Inst1"].Picture = MdlCore.sNowPic
.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END WITH
- 'pass the pkg count to the function in mdlsetup
- MdlSetup.CALCULATE_PACKAGE_COUNT(TRUE)
- 'ME.CALCULATE_TOTAL_PACKAGES()
+ ME.CALCULATE_TOTAL_PACKAGES()
'RETURN
WAIT 2
iRet = ME.INSTALL_REQUIRED_BULKS()
@@ -68,8 +66,8 @@
'iret = ME.INSTALL_PACKAGES_REQUIRED()
' Make sure we set the right value for the progress bar here
- 'MdlInstallSys.iPkgCnt = iPkgCnt
- 'MdlInstallSys.iPkgNum = iPkgNum
+ MdlInstallSys.iPkgCnt = iPkgCnt
+ MdlInstallSys.iPkgNum = iPkgNum
iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
@@ -277,7 +275,7 @@
FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &
FrmUsrPkgSel.GridView1[ii, 1].Text
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
'hproc = EXEC ["installpkg -R " & ClsGlobal.sTargetMnt &
Space(1) & sBasePath &/ sLoc &/ sPkg & " || echo \'FAILED\' 2>
/tmp/installdump"]
@@ -355,7 +353,7 @@
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
IF InStr(sDump, "FAILED") > 0 THEN
Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
RETURN 1
@@ -537,103 +535,103 @@
END
-' PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
-'
-' DIM i, ii AS Integer
-' DIM irs AS Integer
-' DIM sOutput AS String
-' DIM sOutArr AS String[]
-' DIM cb AS CheckBox
-'
-'
-' PRINT ("Calculating package count ... Please wait")
-' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^BULK | grep required" TO sOutput
-' sOutput = Trim(sOutput)
-' IF InStr(sOutput, "\n") > 0 THEN
-' sOutArr = Split(sOutput, "\n")
-' i = i + sOutArr.Count
-' ELSE
-' i = i + 1
-' END IF
-' 'add bulks to ClsGlobal.iBulkCnt
-' ClsGlobal.iBulkCnt = i
-' 'Message.Info(i & " from required bulks")
-' 'RETURN
-' 'count required packages in
-' sOutArr.Clear
-' sOutput = ""
-' SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
-' sOutput = Trim(sOutput)
-' sOutArr = Split(sOutput, ",")
-' i = i + sOutArr.Count
-' 'add pkgs TO ClsGlobal.iPkgCnt
-' ClsGlobal.iPkgCnt = sOutArr.Count
-' 'Message(i & " from packages/required")
-' 'Count CONF packages in
-' sOutArr.Clear
-' sOutput = ""
-' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sOutput
-' sOutput = Trim(sOutput)
-' IF InStr(sOutput, "\n") > 0 THEN
-' sOutArr = Split(sOutput, "\n")
-' i = i + sOutArr.Count
-' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
-' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
-' ELSE
-' i = i + 1
-' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
-' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
-' END IF
-' 'Count user-selected stuff in
-'
-' REPEAT
-' IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
-' INC ii
-' UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
-' i = i + irs
-' 'add bulks to ClsGlobal.iBulkCnt
-' ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
-'
-'
-' ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
-' ' ' ' ' irs = 0
-' ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
-' ' ' ' ' IF cb.value = TRUE THEN INC irs
-' ' ' ' '
-' ' ' ' '
-' ' ' ' ' NEXT
-' ' ' ' ' i = i + irs
-' ' now do the optional packages
-' irs = 0 ' reset the count
-'
-' REPEAT
-' IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes
THEN
-' INC irs
-' END IF
-' INC ii
-' UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
-'
-'
-' ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
-' ' ' ' ' ' ' '
-' ' NEXT
-' i = i + irs ' the count to the total
-' 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
-' 'add pkgs TO ClsGlobal.iPkgCnt
-' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
-' iPkgCnt = i
-' PRINT ("Total packages to be installed = ") & i
-' fPbInc = 1 / iPkgCnt
-' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every package installed"
-' PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
-' fPbInc = 0.6 / ClsGlobal.iBulkCnt
-' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every bulk installed"
-' PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
-' fPbInc = 0.4 / ClsGlobal.iPkgCnt
-' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every pkg installed"
-'
-' END
+PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
+
+ DIM i, ii AS Integer
+ DIM irs AS Integer
+ DIM sOutput AS String
+ DIM sOutArr AS String[]
+ DIM cb AS CheckBox
+
+
+ PRINT ("Calculating package count ... Please wait")
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^BULK | grep required" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ ELSE
+ i = i + 1
+ END IF
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = i
+ 'Message.Info(i & " from required bulks")
+ 'RETURN
+ 'count required packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
+ sOutput = Trim(sOutput)
+ sOutArr = Split(sOutput, ",")
+ i = i + sOutArr.Count
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = sOutArr.Count
+ 'Message(i & " from packages/required")
+ 'Count CONF packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^CONF" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
+ ELSE
+ i = i + 1
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at the
end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
+ END IF
+ 'Count user-selected stuff in
+
+ REPEAT
+ IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
+ INC ii
+ UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+ i = i + irs
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
+
+
+ ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
+ ' ' ' ' irs = 0
+ ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
+ ' ' ' ' IF cb.value = TRUE THEN INC irs
+ ' ' ' '
+ ' ' ' '
+ ' ' ' ' NEXT
+ ' ' ' ' i = i + irs
+ ' now do the optional packages
+ irs = 0 ' reset the count
+
+ REPEAT
+ IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+ INC irs
+ END IF
+ INC ii
+ UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
+
+
+ ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+ ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
+ ' ' ' ' ' ' '
+' NEXT
+ i = i + irs ' the count to the total
+ 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
+ iPkgCnt = i
+ PRINT ("Total packages to be installed = ") & i
+ fPbInc = 1 / iPkgCnt
+ PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every package installed"
+ PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
+ fPbInc = 0.6 / ClsGlobal.iBulkCnt
+ PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every bulk installed"
+ PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
+ fPbInc = 0.4 / ClsGlobal.iPkgCnt
+ PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every pkg installed"
+
+END
PUBLIC FUNCTION INSTALL_REQUIRED_BULKS() AS Integer
@@ -670,7 +668,7 @@
PRINT " ! " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk & " is
installed"
NEXT
ELSE ' found only one line
- 'iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
+ iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
sLine = Split(sTrimmed, ":")
@@ -728,7 +726,7 @@
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
+ FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (fPbInc - (fPbInc *
FrmInstallSys.pbInstallProg.Value)) / 100)
END IF
UNTIL
hproc.State = Process.Stopped
@@ -740,7 +738,7 @@
' ' ' IF InStr(sDump, "FAILED") > 0 THEN
' ' ' RETURN 1
' ' ' ELSE
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
RETURN 0
END IF
' END IF
@@ -762,7 +760,7 @@
END IF
FrmInstallSys.pbInstallProg.Value = 0
INC iPkgNum
- PRINT "Package " & iPkgNum & " of " & ClsGlobal.iPkgTot
+ PRINT "Package " & iPkgNum & " of " & iPkgCnt
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
@@ -790,7 +788,7 @@
ELSE
FrmInstallSys.pbInstallProg.Value = 1
WAIT
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
RETURN 0
END IF
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Nov 13 05:32:30 2008
@@ -312,9 +312,9 @@
.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END WITH
- 'iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
'Message.Info("Total packages = " & iPkgCnt)
- PRINT "Total packages to be installed " & ClsGlobal.iPkgTot
+ PRINT "Total packages to be installed " & iPkgCnt
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
@@ -446,6 +446,8 @@
'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF")
DIM sLine AS String
+
+
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
sList = Split(sRawList, "\n")
@@ -475,7 +477,7 @@
REPEAT
WAIT 2
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vBulkSize), iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
+
UNTIL
hproc.State = Process.Stopped
'error check
Added: branches/iVL/MdlLilo.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlLilo.module Thu Nov 13 05:32:30 2008
@@ -0,0 +1,378 @@
+' Gambas module file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC arrLinuxIncCheckboxes AS Object[]
+PUBLIC arrLinuxInitrdBoxes AS Object[]
+PUBLIC arrLinuxNametxtboxes AS Object[]
+PUBLIC arrLinuxAppendtxtBoxes AS Object[]
+PUBLIC arrLinuxTextBoots AS Object[]
+PUBLIC arrWinBootChecks AS Object[]
+PUBLIC arrWinNameTxtBoxes AS Object[]
+PUBLIC arrCbInitrds AS Object[]
+PRIVATE i AS Integer ' used for object key
+
+
+
+PUBLIC SUB GENERATE_LILO_DOT_CONF()
+
+ DIM tb AS TextBox
+ DIM cb AS CheckBox
+ DIM sSection AS String
+ DIM cbox AS ComboBox
+ DIM sLabel, sKernel, sInitrd, sAppend AS String
+ DIM sBootPath AS String
+
+
+ FOR EACH cb IN arrLinuxIncCheckboxes
+ IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
+ sBootPath = "/boot"
+ ELSE
+ sBootPath = "/boot/tamu"
+ END IF
+ IF cb.Value = TRUE THEN
+ FOR EACH tb IN arrLinuxNametxtboxes
+ IF tb.Tag = cb.Tag THEN
+ sLabel = tb.Text
+ sKernel = "vmlinuz-" & sLabel
+ END IF
+ NEXT
+ FOR EACH cbox IN arrCbInitrds
+ IF cb.Tag = cbox.Tag THEN sInitrd = Trim(cbox.Text) & "-" &
sLabel
+ NEXT
+ FOR EACH tb IN arrLinuxAppendtxtBoxes
+ IF cb.Tag = tb.Tag THEN sAppend = Trim(tb.Text)
+
+ NEXT
+
+ sSection = "image = " & sBootPath &/ sKernel & "<br>" &
+ "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "<br>" &
+ "label = " & sLabel & "<br>" &
+ "append = " & sAppend & "<br>" &
+ "initrd = " & sBootPath &/ sInitrd & "<br>" &
+ "read only"
+
+ Message(sSection)
+
+ 'sSection = "image=" & "boot" &/ tb.Text
+ 'Message(sSection)
+ END IF
+ NEXT
+ 'END IF
+ 'NEXT
+
+
+END
+
+
+
+
+
+
+
+PUBLIC SUB LIST_LINUX_OS()
+
+ DIM sDump, sLinuxPart, sPart, vmlinuz, kernel AS String
+ DIM sOsDesc AS String
+ DIM x, y, i, ii AS Integer
+ DIM sPartitions, sOs AS String[]
+
+ arrLinuxIncCheckboxes = NEW Object[]
+ arrLinuxInitrdBoxes = NEW Object[]
+ arrLinuxNametxtboxes = NEW Object[]
+ arrLinuxAppendtxtBoxes = NEW Object[]
+ arrLinuxTextBoots = NEW Object[]
+ arrCbInitrds = NEW Object[]
+
+
+
+ SHELL "fdisk -l |grep -E \'83 *Linux\' | cut -f 1 -d \' \'" TO sDump
+ sDump = Trim(sDump)
+ sPartitions = Split(sDump, gb.NewLine)
+ TRY MKDIR "/tmp/lilo_tmp"
+ FOR i = 0 TO sPartitions.Count - 1
+ sLinuxPart = Trim(sPartitions[i])
+ sPart = Right(sLinuxpart, Len(sLinuxPart) -
RInStr(sLinuxPart, "/"))
+ EXEC ["mount", "/dev/" & sPart, "/tmp/lilo_tmp"] WAIT
+
+ IF IsDir("/tmp/lilo_tmp/boot") THEN
+ FOR EACH vmlinuz IN
Dir("/tmp/lilo_tmp/boot", "vmlinuz*", gb.File)
+ IF Stat("/tmp/lilo_tmp/boot" &/
vmlinuz).Type <> 6
+ sOsDesc =
MdlLiloOsList.ID_DISTRO("/tmp/lilo_tmp")
+ sOsDesc =
Replace(vmlinuz, "vmlinuz", sOsDesc)
+
+ 'Message(Stat("/tmp/lilo_tmp" &/
vmlinuz).Type)
+ WITH FrmLiloSetup
+ .tsLIloTabs.Index
= .tsLIloTabs.Count - 1
+ .tsLIloTabs.Text = sOsDesc &
Space(1) & "(" & sPart & ")"
+ .tsLIloTabs.Count
= .tsLIloTabs.Count + 1
+ ' populate the tabstrip here
+
ME.FILL_IN_LINUX_TAB(sOsDesc, "/dev" &/ sPart)
+
+ END WITH
+ END IF
+ NEXT
+ END IF
+
+ EXEC ["umount", "/tmp/lilo_tmp"] WAIT
+ NEXT
+
+END
+
+PUBLIC SUB LIST_WIN_INSTALLS()
+
+ DIM sWinPartlist, sPartition AS String
+ DIM sWinDrives AS String[]
+ DIM i, ii AS Integer
+ DIM sTmpMountPoint AS String = "/tmp/lilo_tmp"
+
+ ME.arrWinBootChecks = NEW Object[]
+ ME.arrWinNameTxtBoxes = NEW Object[]
+
+ SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT16|FAT32|HPFS|NTFS|Win)\' |
cut -f 1 -d \' \'" TO sWinPartlist
+ sWinPartlist = Trim(sWinPartlist)
+ sWinDrives = Split(sWinPartlist, gb.NewLine)
+ FOR i = 0 TO sWinDrives.Count - 1
+ sPartition = sWinDrives[i]
+ EXEC ["mount", sPartition, sTmpMountPoint] WAIT
+ IF Exist(sTmpMountPoint &/ "winnt" &/ "system32"
&/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32"
&/ "winver.exe") THEN
+ 'Message(sPartition & " has a windows install")
+ WITH FrmLiloSetup.tsLIloTabs
+ .Index = .Count - 1
+ .Text = "Windows" & Space(1) & "(" &
Right(sPartition, Len(sPartition) - RInStr(sPartition, "/")) & ")"
+ .Count = .Count + 1
+ END WITH
+ ' populate the tab
+ ME.FILL_IN_WINDOWS_TAB("Windows",
sPartition)
+
+ END IF
+
+
+
+
+ EXEC ["umount", sTmpMountPoint] WAIT
+ NEXT
+
+END
+
+PUBLIC SUB FILL_IN_WINDOWS_TAB(sDesc AS String, sHostPart AS String)
+
+ DIM tb AS TextBox
+ DIM tl AS TextLabel
+ DIM cb AS CheckBox
+ DIM hr AS Separator
+ DIM x, y AS Integer
+
+ x = 4
+ y = 12
+
+ tl = NEW TextLabel(FrmLiloSetup.tsLIloTabs)
+ WITH tl
+ .Text = "<h3>" & sDesc & Space(1) & ("installed on") &
Space(1) & sHostPart & "</h3>"
+ .Height = 21
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .Move(x, y)
+ END WITH
+ y = y + tl.Height + 4
+ hr = NEW Separator(FrmLiloSetup.tsLIloTabs)
+ WITH hr
+ .Height = 2
+ .Move(x - 2, y)
+ .Width = FrmLiloSetup.tsLIloTabs.Width - x
+ END WITH
+ y = y + 16
+
+ cb = NEW CheckBox(FrmLiloSetup.tsLIloTabs) AS "bBootWinInstall"
+ WITH cb
+ .Move(x, y)
+ .Value = TRUE
+ .Text = ("Include this installation in the boot menu")
+ .Width = MdlObjSizer.get_object_width(.Text) + 36
+ .Height = 21
+ .Tag = sHostPart
+ END WITH
+ ME.arrWinBootChecks.Add(cb)
+ y = y + cb.Height + 4
+
+ tl = NEW TextLabel(FrmLiloSetup.tsLIloTabs)
+ WITH tl
+ .Text = ("Name")
+ .Height = 21
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .Move(x, y)
+ .Alignment = Align.Normal
+ END WITH
+ 'y = y + tl.Height + 4
+
+ tb = NEW TextBox(FrmLiloSetup.tsLIloTabs) AS "txtWinNameBox"
+ WITH tb
+ .Height = 21
+ .Width = 200
+ .Text = sDesc & "-" & Right(sHostPart, Len(sHostPart)
- RInStr(sHostPart, "/"))
+ .MaxLength = 15
+ .Move(x + tl.Width + 8, y)
+ .Tag = sHostPart
+ END WITH
+ ME.arrWinNameTxtBoxes.Add(tb)
+
+
+END
+
+
+
+
+
+
+
+
+
+ PUBLIC SUB FILL_IN_LINUX_TAB(sDesc AS String, sHostPart AS String)
+
+ DIM tb AS TextBox
+ DIM cb AS CheckBox
+ DIM tl AS TextLabel
+ DIM x, y AS Integer
+ DIM hrsep AS Separator
+ DIM cbox AS ComboBox
+ DIM sDump AS String
+ 'DIM i AS Integer
+ 'DIM sKernelStr AS String
+
+
+ ' hack just for testing here
+ ClsPartSel.sRoot = "/dev/hdb1"
+ INC i
+ x = 4
+ y = 12
+ 'WITH FrmLiloSetup.tsLIloTabs
+ tl = NEW TextLabel(FrmLiloSetup.tsLIloTabs) AS "osItroLabels"
+ WITH tl
+ .Move(x, y)
+ .Text = "<h3>" & sDesc & Space(1) & ("installed in") & Space(1)
& sHostPart & "</h3>"
+ .Height = 21
+ .Width = MdlObjSizer.get_object_width(.Text) + 36
+ .Alignment = Align.Normal
+ END WITH
+ y = y + tl.Height + 4
+
+ hrsep = NEW Separator(FrmLiloSetup.tsLIloTabs) AS "Separators"
+ WITH hrsep
+ .Height = 2
+ .Move(x - 2, y, FrmLiloSetup.tsLIloTabs.Width - 4)
+ END WITH
+ y = y + 16
+
+
+
+ cb = NEW CheckBox(FrmLiloSetup.tsLIloTabs) AS "cbIncCheckboxes"
+ WITH cb
+ .Tag = i & sHostPart
+ .Text = ("Include in boot menu")
+ .Value = TRUE
+ .Width = MdlObjSizer.get_object_width(.Text) + 36
+ .Height = 21
+ .Move(x, y)
+ END WITH
+ ME.arrLinuxIncCheckboxes.Add(cb)
+ y = y + cb.Height + 4
+
+ tl = NEW
TextLabel(FrmLiloSetup.tsLIloTabs) AS "NameLabels"
+ WITH tl
+ .Move(x, y)
+ .Text = ("Name")
+ .Width =
MdlObjSizer.get_object_width(.Text)
+ .Height = 21
+ .Alignment = Align.Normal
+ END WITH
+ 'y = y + tl.Height + 4
+
+ tb = NEW TextBox(FrmLiloSetup.tsLIloTabs)
AS "OsNameTxtBox"
+ WITH tb
+ .Height = 21
+ .Width = 200
+ .MaxLength = 15
+ .Move(x + tl.Width + 8, y)
+ .Text = sDesc & "-" &
Right(sHostPart, Len(sHostPart) - RInStr(sHostPart, "/"))
+ .Tag = i & sHostPart
+ END WITH
+ ME.arrLinuxNametxtboxes.Add(tb)
+ x = x + tl.Width + 8 + tb.Width
+ tl = NEW TextLabel(FrmLiloSetup.tsLIloTabs)
+ WITH tl
+ .Text = ("Initrd")
+ .Height = 21
+ .Width =
MdlObjSizer.get_object_width(.Text)
+ .Move(x + 8, y)
+ .Alignment = Align.Bottom
+ END WITH
+
+ cbox = NEW
ComboBox(FrmLiloSetup.tsLIloTabs)
+ WITH cbox
+ .Move(x + tl.Width + 16, y)
+ .ReadOnly = TRUE
+ .Width = 200
+ .Height = 21
+ .Tag = i & sHostPart
+ ' BROWSE FOR INITRD IMAGES
+ FOR EACH sDump IN
Dir("/tmp/lilo_tmp/boot/", "initrd*")
+ IF
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
+ NEXT
+
+ .Sorted = TRUE
+ END WITH
+ ME.arrCbInitrds.Add(cbox)
+
+
+ x = 4
+ y = y + tb.Height + 4
+
+
+ tl = NEW
TextLabel(FrmLiloSetup.tsLIloTabs) AS "AppendLabel"
+ WITH tl
+ .Text = ("Kernel boot options")
+ .Width =
MdlObjSizer.get_object_width(.Text)
+ .Height = 21
+ .Alignment = Align.Normal
+ .Move(x, y)
+ END WITH
+
+ tb = NEW TextBox(FrmLiloSetup.tsLIloTabs)
AS "txtAppendBox"
+ WITH tb
+ .Move(x + tl.Width + 8, y,
FrmLiloSetup.tsLIloTabs.Width - (x + tl.Width + 8 + 4), 21)
+ .Text = ""
+ .Tag = i & sHostPart
+ .ReadOnly = FALSE
+ END WITH
+ ME.arrLinuxAppendtxtBoxes.Add(tb)
+ y = y + tb.Height + 4
+
+ IF sHostPart = ClsPartSel.sRoot THEN
+ ' ADD A NEW CHECK BOX TO BOOT INTO TEXT MODE
+ cb = NEW CheckBox(FrmLiloSetup.tsLIloTabs) AS "bDoTextMode"
+ WITH cb
+ .Move(x, y)
+ .Value = FALSE
+ .Text = ("Add option to boot this operating system into
text mode")
+ .Height = 21
+ .Width = MdlObjSizer.get_object_width(.Text) + 36
+ .Tag = i & sHostPart
+ END WITH
+ ME.arrLinuxTextBoots.Add(cb)
+ END IF
+
+
+END
+
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Thu Nov 13 05:32:30 2008
@@ -123,7 +123,7 @@
PRINT "mounting " & sWinAddr
'SHELL "mount " & "/dev" &/ sWinAddr & Space(1) & "/mnt" &/
sWinAddr WAIT
EXEC ["mount", "/dev" &/ sWinAddr, "/mnt" &/ sWinAddr] WAIT
- IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") OR Exist("/mnt" &/ sWinAddr &/ "winnt" &/ "system32"
&/ "winver.exe") THEN
+ IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") OR IF IsDir("/mnt" &/ sWinAddr &/ "winnt") = TRUE
THEN 'Exist("/mnt" &/ sWinAddr &/ "winnt" &/ "system32" &/ "winver.exe")
THEN
'IF IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
' this is indeed a windows installation
@@ -215,9 +215,9 @@
PUBLIC SUB LIST_LILO_OS_CHOICES()
- DIM sLinuxList AS String
- DIM arrLinux AS String[]
- DIM i AS Integer
+ DIM sLinuxList, sDump AS String
+ DIM arrLinux, arrDump AS String[]
+ DIM i, ii AS Integer
DIM sLiloLabel AS String
DIM sLiloDesc AS String
DIM svmLinuz AS String
@@ -261,11 +261,19 @@
sShortAddr = Right(arrLinux[i], Len(arrLinux[i]) -
RInStr(arrLinux[i], "/"))
PRINT "scanning " & arrLinux[i]
PRINT "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp"
- SHELL "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp" WAIT
+ 'SHELL "mount " & arrLinux[i] & Space(1) & "/tmp/lilo_tmp" WAIT
+ EXEC ["mount", arrLinux[i], "/tmp/lilo_tmp"] WAIT
' now check for a vmlinuz
- IF Exist("/tmp/lilo_tmp/boot/vmlinuz") = TRUE THEN
- FrmLilo.TabStrip1.Count = FrmLilo.TabStrip1.count +
1 'arrLinux.Count - 1
+ 'IF Exist("/tmp/lilo_tmp/boot/vmlinuz*") = TRUE THEN
+ 'EXEC ["ls", "-l", "/tmp/lilo_tmp/boot/vmlinuz*"] TO sDump
+ SHELL "ls -1 /tmp/lilo_tmp/boot/vmlinuz* | grep -v \'@\'" TO sDump
+ Message(sDump)
+ sDump = Trim(sDump)
+ arrDump = Split(sDump, "\n")
+
+ FOR ii = 0 TO arrDump.Count - 1
+ FrmLilo.TabStrip1.Count = FrmLilo.TabStrip1.count +
1 'arrLinux.Count - 1
sLiloDesc = ME.ID_DISTRO("/tmp/lilo_tmp")
@@ -419,11 +427,18 @@
'END IF
END WITH ' end jacking with the tabstrip itself
- END IF
- SHELL "umount /tmp/lilo_tmp" WAIT
+ 'END IF
+ ' SHELL "umount /tmp/lilo_tmp" WAIT
+ NEXT
+ EXEC ["umount", "/tmp/lilo_tmp"] WAIT
+ 'NEXT
END IF
+
NEXT
-
+
+'NEXT ' next in dump
+
+
FOR i = 0 TO FrmLilo.TabStrip1.Count - 1
WITH FrmLilo.TabStrip1
.Index = i
@@ -431,8 +446,8 @@
FrmLilo.TabStrip1[i].Visible = FALSE
END IF
END WITH
-
- NEXT
+ NEXT
+
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Nov 13 05:32:30 2008
@@ -167,7 +167,7 @@
iCPkg = iCurrPkg - ClsGlobal.iBulkCnt
fRet = iCPkg * fcur
fRet = Round(fRet, -2)
- fRet = fRet + fbulk
+ fRet = fRet + 0.6
ENDIF
RETURN fRet
@@ -176,87 +176,26 @@
PUBLIC FUNCTION CALCULATE_PACKAGE_COUNT(bCustom AS Boolean) AS Integer
-
- DIM sOutput AS String
- DIM sOutArr AS String[]
- DIM cb AS CheckBox
+
DIM sDump AS String
DIM sTotalList AS String
- DIM i, ii AS Integer
- DIM irs AS Integer
+ DIM i AS Integer
DIM sList AS String[]
+ DIM iQTY AS Integer
' let's get a package count
- IF bCustom = FALSE THEN 'DOING A FULL INSTALL
- 'find bulks
- SHELL "find " & ClsGlobal.sSourceMnt & "/veclinux - name \"*.tlz\"|wc
-l" TO ClsGlobal.iBulkCnt
- 'find packages
- SHELL "find " & ClsGlobal.sSourceMnt & "/packages - name \"*.tlz\"|wc
-l" TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgTot = ClsGlobal.iBulkCnt + ClsGlobal.iPkgCnt
+ IF bCustom = FALSE THEN ' DOING A FULL INSTALL
+
+ SHELL "find " & ClsGlobal.sSourceMnt & " -name \"*.tlz\"|wc -l" TO
iQTY
ELSE ' GOING FOR CUSTOM INSTALL
- PRINT ("Calculating package count ... Please wait")
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^BULK | grep required" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- ELSE
- i = i + 1
- END IF
- 'add bulks to ClsGlobal.iBulkCnt
- ClsGlobal.iBulkCnt = i
- 'count required packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
- sOutput = Trim(sOutput)
- sOutArr = Split(sOutput, ",")
- i = i + sOutArr.Count
- 'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = sOutArr.Count
- 'Count CONF packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
- ELSE
- i = i + 1
- 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
- END IF
- 'Count user-selected bulks
- REPEAT
- IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes THEN
INC irs
- INC ii
- UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
- i = i + irs
- 'add bulks to ClsGlobal.iBulkCnt
- ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
- ' now do the optional packages
- irs = 0 ' reset the count
- REPEAT
- IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
- INC irs
- END IF
- INC ii
- UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
- i = i + irs ' the count to the total
- 'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
- ClsGlobal.iPkgTot = i
+
END IF
- PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
- ClsGlobal.fPbInc = 0.6 / ClsGlobal.iBulkCnt
- PRINT "The total progrssbar will work in increments of " &
ClsGlobal.fPbInc & " on every bulk installed"
- PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
- ClsGlobal.fPbInc = 0.4 / ClsGlobal.iPkgCnt
- PRINT "The total progrssbar will work in increments of " &
ClsGlobal.fPbInc & " on every pkg installed"
- RETURN ClsGlobal.iPkgTot
+
+
+ RETURN iQTY
+
+
+
END
|
|
From: <cod...@go...> - 2008-11-13 06:10:56
|
Author: uelsk8s
Date: Wed Nov 12 22:10:10 2008
New Revision: 287
Modified:
branches/iVL/.project
branches/iVL/installer.gambas
Log:
updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 12 22:10:10 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.157
+Version=0.0.158
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -18,6 +18,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/root/gui-installer2/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-12 21:21:38
|
Author: uelsk8s
Date: Wed Nov 12 13:19:53 2008
New Revision: 286
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/ClsGlobal.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
combined pkg count code for custom and full install fixed division by zero
bug
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /root/gui-installer2/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /root/gui-installer2/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /root/gui-installer2/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /root/gui-installer2/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /root/gui-installer2/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /root/gui-installer2/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /root/gui-installer2/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /root/gui-installer2/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /root/gui-installer2/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /root/gui-installer2/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /root/gui-installer2/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /root/gui-installer2/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /root/gui-installer2/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /root/gui-installer2/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /root/gui-installer2/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /root/gui-installer2/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /root/gui-installer2/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /root/gui-installer2/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:242
+#: MdlSetup.module:197
+msgid "Calculating package count ... Please wait"
+msgstr ""
+
+#: MdlSetup.module:253
+msgid "Total bulks to be installed = "
+msgstr ""
+
+#: MdlSetup.module:256
+msgid "Total pkgs to be installed = "
+msgstr ""
+
+#: MdlSetup.module:303
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:258
+#: MdlSetup.module:319
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:260
+#: MdlSetup.module:321
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /root/gui-installer2/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Nov 12 13:19:53 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /root/gui-installer2/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 12 13:19:53 2008
@@ -12,6 +12,7 @@
Library=gb.gtk.ext
Description=GUI installer for Vector linux
Authors=M0E-lnx
+Arguments="-C"
TabSize=2
Translate=1
Language=en_US
Modified: branches/iVL/ClsGlobal.class
==============================================================================
--- branches/iVL/ClsGlobal.class (original)
+++ branches/iVL/ClsGlobal.class Wed Nov 12 13:19:53 2008
@@ -26,6 +26,10 @@
STATIC PUBLIC iSwapMin AS Integer = 64
STATIC PUBLIC iPkgCnt AS Integer = 0
STATIC PUBLIC iBulkCnt AS Integer = 0
+STATIC PUBLIC iPkgTot AS Integer
+STATIC PUBLIC iPkgNum AS Integer
+
+STATIC PUBLIC fPbInc AS Float
STATIC PUBLIC sRootMnt AS String
STATIC PUBLIC sHomeMnt AS String
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Wed Nov 12 13:19:53 2008
@@ -18,12 +18,12 @@
' needs to read arrays from clsPkgsel and install all required packages
-PUBLIC fPbInc AS Float
+'PUBLIC fPbInc AS Float
PRIVATE hproc AS Process
PRIVATE sDump AS String
PRIVATE sErr AS String
-PRIVATE iPkgCnt AS Integer
+'PRIVATE iPkgCnt AS Integer
PRIVATE iPkgNum AS Integer
@@ -36,7 +36,9 @@
.tvPlan["Inst1"].Picture = MdlCore.sNowPic
.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END WITH
- ME.CALCULATE_TOTAL_PACKAGES()
+ 'pass the pkg count to the function in mdlsetup
+ MdlSetup.CALCULATE_PACKAGE_COUNT(TRUE)
+ 'ME.CALCULATE_TOTAL_PACKAGES()
'RETURN
WAIT 2
iRet = ME.INSTALL_REQUIRED_BULKS()
@@ -66,8 +68,8 @@
'iret = ME.INSTALL_PACKAGES_REQUIRED()
' Make sure we set the right value for the progress bar here
- MdlInstallSys.iPkgCnt = iPkgCnt
- MdlInstallSys.iPkgNum = iPkgNum
+ 'MdlInstallSys.iPkgCnt = iPkgCnt
+ 'MdlInstallSys.iPkgNum = iPkgNum
iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
@@ -275,7 +277,7 @@
FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &
FrmUsrPkgSel.GridView1[ii, 1].Text
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
'hproc = EXEC ["installpkg -R " & ClsGlobal.sTargetMnt &
Space(1) & sBasePath &/ sLoc &/ sPkg & " || echo \'FAILED\' 2>
/tmp/installdump"]
@@ -353,7 +355,7 @@
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
IF InStr(sDump, "FAILED") > 0 THEN
Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
RETURN 1
@@ -535,103 +537,103 @@
END
-PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
-
- DIM i, ii AS Integer
- DIM irs AS Integer
- DIM sOutput AS String
- DIM sOutArr AS String[]
- DIM cb AS CheckBox
-
-
- PRINT ("Calculating package count ... Please wait")
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^BULK | grep required" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- ELSE
- i = i + 1
- END IF
- 'add bulks to ClsGlobal.iBulkCnt
- ClsGlobal.iBulkCnt = i
- 'Message.Info(i & " from required bulks")
- 'RETURN
- 'count required packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
- sOutput = Trim(sOutput)
- sOutArr = Split(sOutput, ",")
- i = i + sOutArr.Count
- 'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = sOutArr.Count
- 'Message(i & " from packages/required")
- 'Count CONF packages in
- sOutArr.Clear
- sOutput = ""
- SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & " |
grep ^CONF" TO sOutput
- sOutput = Trim(sOutput)
- IF InStr(sOutput, "\n") > 0 THEN
- sOutArr = Split(sOutput, "\n")
- i = i + sOutArr.Count
- 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
- ELSE
- i = i + 1
- 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at the
end
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
- END IF
- 'Count user-selected stuff in
-
- REPEAT
- IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
- INC ii
- UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
- i = i + irs
- 'add bulks to ClsGlobal.iBulkCnt
- ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
-
-
- ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
- ' ' ' ' irs = 0
- ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
- ' ' ' ' IF cb.value = TRUE THEN INC irs
- ' ' ' '
- ' ' ' '
- ' ' ' ' NEXT
- ' ' ' ' i = i + irs
- ' now do the optional packages
- irs = 0 ' reset the count
-
- REPEAT
- IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
- INC irs
- END IF
- INC ii
- UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
-
-
- ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
- ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
- ' ' ' ' ' ' '
-' NEXT
- i = i + irs ' the count to the total
- 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
- 'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
- iPkgCnt = i
- PRINT ("Total packages to be installed = ") & i
- fPbInc = 1 / iPkgCnt
- PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every package installed"
- PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
- fPbInc = 0.6 / ClsGlobal.iBulkCnt
- PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every bulk installed"
- PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
- fPbInc = 0.4 / ClsGlobal.iPkgCnt
- PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every pkg installed"
-
-END
+' PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
+'
+' DIM i, ii AS Integer
+' DIM irs AS Integer
+' DIM sOutput AS String
+' DIM sOutArr AS String[]
+' DIM cb AS CheckBox
+'
+'
+' PRINT ("Calculating package count ... Please wait")
+' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^BULK | grep required" TO sOutput
+' sOutput = Trim(sOutput)
+' IF InStr(sOutput, "\n") > 0 THEN
+' sOutArr = Split(sOutput, "\n")
+' i = i + sOutArr.Count
+' ELSE
+' i = i + 1
+' END IF
+' 'add bulks to ClsGlobal.iBulkCnt
+' ClsGlobal.iBulkCnt = i
+' 'Message.Info(i & " from required bulks")
+' 'RETURN
+' 'count required packages in
+' sOutArr.Clear
+' sOutput = ""
+' SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
+' sOutput = Trim(sOutput)
+' sOutArr = Split(sOutput, ",")
+' i = i + sOutArr.Count
+' 'add pkgs TO ClsGlobal.iPkgCnt
+' ClsGlobal.iPkgCnt = sOutArr.Count
+' 'Message(i & " from packages/required")
+' 'Count CONF packages in
+' sOutArr.Clear
+' sOutput = ""
+' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sOutput
+' sOutput = Trim(sOutput)
+' IF InStr(sOutput, "\n") > 0 THEN
+' sOutArr = Split(sOutput, "\n")
+' i = i + sOutArr.Count
+' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
+' ELSE
+' i = i + 1
+' 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
+' END IF
+' 'Count user-selected stuff in
+'
+' REPEAT
+' IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes
THEN INC irs
+' INC ii
+' UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+' i = i + irs
+' 'add bulks to ClsGlobal.iBulkCnt
+' ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
+'
+'
+' ' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
+' ' ' ' ' irs = 0
+' ' ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
+' ' ' ' ' IF cb.value = TRUE THEN INC irs
+' ' ' ' '
+' ' ' ' '
+' ' ' ' ' NEXT
+' ' ' ' ' i = i + irs
+' ' now do the optional packages
+' irs = 0 ' reset the count
+'
+' REPEAT
+' IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes
THEN
+' INC irs
+' END IF
+' INC ii
+' UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
+'
+'
+' ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+' ' ' ' ' ' ' ' IF cb.Value = TRUE THEN INC irs
+' ' ' ' ' ' ' '
+' ' NEXT
+' i = i + irs ' the count to the total
+' 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
+' 'add pkgs TO ClsGlobal.iPkgCnt
+' ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
+' iPkgCnt = i
+' PRINT ("Total packages to be installed = ") & i
+' fPbInc = 1 / iPkgCnt
+' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every package installed"
+' PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
+' fPbInc = 0.6 / ClsGlobal.iBulkCnt
+' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every bulk installed"
+' PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
+' fPbInc = 0.4 / ClsGlobal.iPkgCnt
+' PRINT "The total progrssbar will work in increments of " & fPbInc & "
on every pkg installed"
+'
+' END
PUBLIC FUNCTION INSTALL_REQUIRED_BULKS() AS Integer
@@ -668,7 +670,7 @@
PRINT " ! " & ClsGlobal.sSourceMnt &/ "veclinux" &/ sBulk & " is
installed"
NEXT
ELSE ' found only one line
- iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
+ 'iPkgCnt = iPkgCnt + 1 ' add only one to the overall package count
sTrimmed = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
sTrimmed = Left(sTrimmed, Len(sTrimmed) - RInStr(sTrimmed, "\'"))
sLine = Split(sTrimmed, ":")
@@ -726,7 +728,7 @@
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (fPbInc - (fPbInc *
FrmInstallSys.pbInstallProg.Value)) / 100)
+ FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
END IF
UNTIL
hproc.State = Process.Stopped
@@ -738,7 +740,7 @@
' ' ' IF InStr(sDump, "FAILED") > 0 THEN
' ' ' RETURN 1
' ' ' ELSE
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
RETURN 0
END IF
' END IF
@@ -760,7 +762,7 @@
END IF
FrmInstallSys.pbInstallProg.Value = 0
INC iPkgNum
- PRINT "Package " & iPkgNum & " of " & iPkgCnt
+ PRINT "Package " & iPkgNum & " of " & ClsGlobal.iPkgTot
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
@@ -788,7 +790,7 @@
ELSE
FrmInstallSys.pbInstallProg.Value = 1
WAIT
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
RETURN 0
END IF
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Nov 12 13:19:53 2008
@@ -312,9 +312,9 @@
.tvPlan["Inst0"].Picture = MdlCore.sDonePic
END WITH
- iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
+ 'iPkgCnt = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
'Message.Info("Total packages = " & iPkgCnt)
- PRINT "Total packages to be installed " & iPkgCnt
+ PRINT "Total packages to be installed " & ClsGlobal.iPkgTot
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
@@ -446,8 +446,6 @@
'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF")
DIM sLine AS String
-
-
SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^BULK" TO sRawList
' sList = Split(File.Load(Temp$("SETUP.CONF")), "\n")
sList = Split(sRawList, "\n")
@@ -477,7 +475,7 @@
REPEAT
WAIT 2
ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vBulkSize), iPkgNum)
-
+ FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
UNTIL
hproc.State = Process.Stopped
'error check
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Nov 12 13:19:53 2008
@@ -167,7 +167,7 @@
iCPkg = iCurrPkg - ClsGlobal.iBulkCnt
fRet = iCPkg * fcur
fRet = Round(fRet, -2)
- fRet = fRet + 0.6
+ fRet = fRet + fbulk
ENDIF
RETURN fRet
@@ -176,26 +176,87 @@
PUBLIC FUNCTION CALCULATE_PACKAGE_COUNT(bCustom AS Boolean) AS Integer
-
+
+ DIM sOutput AS String
+ DIM sOutArr AS String[]
+ DIM cb AS CheckBox
DIM sDump AS String
DIM sTotalList AS String
- DIM i AS Integer
+ DIM i, ii AS Integer
+ DIM irs AS Integer
DIM sList AS String[]
- DIM iQTY AS Integer
' let's get a package count
- IF bCustom = FALSE THEN ' DOING A FULL INSTALL
-
- SHELL "find " & ClsGlobal.sSourceMnt & " -name \"*.tlz\"|wc -l" TO
iQTY
+ IF bCustom = FALSE THEN 'DOING A FULL INSTALL
+ 'find bulks
+ SHELL "find " & ClsGlobal.sSourceMnt & "/veclinux - name \"*.tlz\"|wc
-l" TO ClsGlobal.iBulkCnt
+ 'find packages
+ SHELL "find " & ClsGlobal.sSourceMnt & "/packages - name \"*.tlz\"|wc
-l" TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgTot = ClsGlobal.iBulkCnt + ClsGlobal.iPkgCnt
ELSE ' GOING FOR CUSTOM INSTALL
-
+ PRINT ("Calculating package count ... Please wait")
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^BULK | grep required" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ ELSE
+ i = i + 1
+ END IF
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = i
+ 'count required packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "ls -m " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ "*.t?z" TO sOutput
+ sOutput = Trim(sOutput)
+ sOutArr = Split(sOutput, ",")
+ i = i + sOutArr.Count
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = sOutArr.Count
+ 'Count CONF packages in
+ sOutArr.Clear
+ sOutput = ""
+ SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF" & "
| grep ^CONF" TO sOutput
+ sOutput = Trim(sOutput)
+ IF InStr(sOutput, "\n") > 0 THEN
+ sOutArr = Split(sOutput, "\n")
+ i = i + sOutArr.Count
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
+ ELSE
+ i = i + 1
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
+ END IF
+ 'Count user-selected bulks
+ REPEAT
+ IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes THEN
INC irs
+ INC ii
+ UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+ i = i + irs
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
+ ' now do the optional packages
+ irs = 0 ' reset the count
+ REPEAT
+ IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+ INC irs
+ END IF
+ INC ii
+ UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
+ i = i + irs ' the count to the total
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
+ ClsGlobal.iPkgTot = i
END IF
-
-
- RETURN iQTY
-
-
-
+ PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
+ ClsGlobal.fPbInc = 0.6 / ClsGlobal.iBulkCnt
+ PRINT "The total progrssbar will work in increments of " &
ClsGlobal.fPbInc & " on every bulk installed"
+ PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
+ ClsGlobal.fPbInc = 0.4 / ClsGlobal.iPkgCnt
+ PRINT "The total progrssbar will work in increments of " &
ClsGlobal.fPbInc & " on every pkg installed"
+ RETURN ClsGlobal.iPkgTot
END
|
|
From: <cod...@go...> - 2008-11-11 21:49:02
|
Author: M0E.lnx
Date: Tue Nov 11 13:47:30 2008
New Revision: 285
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmUsrPkgSel.class
branches/iVL/FrmUsrPkgSel.form
branches/iVL/MdlLiloOsList.module
branches/iVL/installer.gambas
Log:
Updated binary
Fixed reverse navigation woes using the old navigation scheme
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,91 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:219
+#: FMain.class:191
msgid "Restart"
msgstr ""
-#: FMain.class:267
+#: FMain.class:240
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:269
+#: FMain.class:242
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:269
+#: FMain.class:242
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:283
+#: FMain.class:256
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:340
+#: FMain.class:313
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:341
+#: FMain.class:314
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:352
+#: FMain.class:325
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:366
+#: FMain.class:339
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:381
+#: FMain.class:354
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:381
+#: FMain.class:354
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:381
+#: FMain.class:354
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:381
+#: FMain.class:354
msgid "Yes"
msgstr ""
-#: FMain.class:381
+#: FMain.class:354
msgid "No"
msgstr ""
-#: FMain.class:399
+#: FMain.class:372
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:403
+#: FMain.class:376
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:416
+#: FMain.class:389
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:416
+#: FMain.class:389
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:667
+#: FMain.class:641
msgid "Back"
msgstr ""
-#: FMain.class:679
+#: FMain.class:653
msgid "Exit Installation"
msgstr ""
-#: FMain.class:691
+#: FMain.class:665
msgid "Next"
msgstr ""
-#: FMain.class:705
+#: FMain.class:679
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,39 +14,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartScheme.class:64
+#: FrmPartScheme.class:61
msgid "Select this option if you already have a linux installation that
you wish to overwrite or if a linux partition scheme exists in your hard
disk."
msgstr ""
-#: FrmPartScheme.class:64
+#: FrmPartScheme.class:61
msgid "This option will overwrite any existing data in the selected
partitions"
msgstr ""
-#: FrmPartScheme.class:64
+#: FrmPartScheme.class:61
msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
msgstr ""
-#: FrmPartScheme.class:74
+#: FrmPartScheme.class:70
msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
msgstr ""
-#: FrmPartScheme.class:74
+#: FrmPartScheme.class:70
msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
msgstr ""
-#: FrmPartScheme.class:117
+#: FrmPartScheme.class:112
msgid "Disk Partitioning Options"
msgstr ""
-#: FrmPartScheme.class:122
+#: FrmPartScheme.class:117
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:127
+#: FrmPartScheme.class:122
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:132
+#: FrmPartScheme.class:127
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,75 +14,75 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "user data separately for added data security. You may install the
system to a single partition"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "suggested setup for a typical Linux installation"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "Used to store system data. This particular install requires a
minimum of"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "for this"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "but you should considear a higher value to make sure you have room
to install additional software"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "in case you wish to."
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "Typically, you want to use the largest partition for this."
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "for this is"
msgstr ""
-#: FrmPartSel.class:151
+#: FrmPartSel.class:149
msgid "but can also be calculated as 2 times your ammount of RAM"
msgstr ""
-#: FrmPartSel.class:182
+#: FrmPartSel.class:180
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:187
+#: FrmPartSel.class:185
msgid "Help"
msgstr ""
-#: FrmPartSel.class:207
+#: FrmPartSel.class:205
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:208
+#: FrmPartSel.class:206
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,43 +18,43 @@
msgid "No Installable Media Found"
msgstr ""
-#: FrmSelISO.class:79
+#: FrmSelISO.class:74
msgid "Click"
msgstr ""
-#: FrmSelISO.class:79
+#: FrmSelISO.class:74
msgid "to begin installating"
msgstr ""
-#: FrmSelISO.class:81
+#: FrmSelISO.class:76
msgid "Unable to locate any installable media."
msgstr ""
-#: FrmSelISO.class:87
+#: FrmSelISO.class:82
msgid "Select installation media from the list below"
msgstr ""
-#: FrmSelISO.class:118
+#: FrmSelISO.class:113
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:153
+#: FrmSelISO.class:148
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:256
+#: FrmSelISO.class:251
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:262
+#: FrmSelISO.class:257
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:267
+#: FrmSelISO.class:262
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:272
+#: FrmSelISO.class:267
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Tue Nov 11 13:47:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Nov 11 13:47:30 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.156
+Version=0.0.157
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 13:47:30 2008
@@ -512,6 +512,7 @@
END WITH
FrmCurr.Hide
frm.Show
+ ClsGlobal.sBackNav.Add(frm)
END IF
END
Modified: branches/iVL/FrmUsrPkgSel.class
==============================================================================
--- branches/iVL/FrmUsrPkgSel.class (original)
+++ branches/iVL/FrmUsrPkgSel.class Tue Nov 11 13:47:30 2008
@@ -8,7 +8,7 @@
PUBLIC SUB Form_Open()
FMain.FrmCurr = ME
-
+ME.tlbanner.Text = "<h3>" & ("Select your indivirual packages to
install.") & "</h3>" & " <br>" & ("To install them all, just click") &
Space(1) & FMain.btnext.text ' next")
WITH ME.GridView1
.Columns.count = 6
'.Rows.count = 2
@@ -20,6 +20,7 @@
.Columns[3].Width = 120
.Columns[4].Width = 0
.Columns[5].Width = 0
+ .Columns[5].Resizable = FALSE
END WITH
ME.LIST_PACKAGES
@@ -54,6 +55,7 @@
ME.GridView1[ii, 3].Text = sSize
ME.GridView1[ii, 4].Text = sLoc
ME.GridView1[ii, 5].Text = sPkg
+ 'ME.GridView1[ii, 5].ForeColor = Color.SelectedBackground
ELSE IF Left(sLine, Len("PACKAGE DESCRIPTION:")) = "PACKAGE
DESCRIPTION:" THEN
sDesc = sPACKAGES[i + 1]
sDesc = Right(sDesc, Len(sDesc) - InStr(sDesc, ":"))
@@ -104,5 +106,11 @@
PUBLIC SUB Form_Menu()
MdlPkgSelNew.GET_LIST_OF_SELECTED_PACKAGES()
+
+END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
END
Modified: branches/iVL/FrmUsrPkgSel.form
==============================================================================
--- branches/iVL/FrmUsrPkgSel.form (original)
+++ branches/iVL/FrmUsrPkgSel.form Tue Nov 11 13:47:30 2008
@@ -4,21 +4,22 @@
MoveScaled(0,0,72,47)
Text = ("")
Arrangement = Arrange.Vertical
- { Panel1 Panel
- MoveScaled(1,1,68,4)
- Arrangement = Arrange.Horizontal
- AutoResize = True
+ { HPanel1 HPanel
+ MoveScaled(1,1,68,10)
{ tlBanner TextLabel
- MoveScaled(1,0,20,3)
+ MoveScaled(1,0,20,7)
Expand = True
AutoResize = True
Text = ("Software Selection")
Alignment = Align.Normal
- Border = Border.Plain
+ }
+ { Separator1 Separator
+ MoveScaled(2,8,10,1)
+ Expand = True
}
}
{ Panel2 Panel
- MoveScaled(1,6,70,28)
+ MoveScaled(1,12,70,28)
Expand = True
Arrangement = Arrange.Vertical
{ GridView1 GridView
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Tue Nov 11 13:47:30 2008
@@ -118,9 +118,11 @@
idx = FrmLilo.TabStrip1.count - 1
sWinPart = arrNTFS[i]
sWinAddr = Right(arrNTFS[i], Len(arrNTFS[i]) -
RInStr(arrNTFS[i], "/"))
- SHELL "mkdir /mnt" &/ sWinAddr WAIT
+ 'sHELL "mkdir /mnt" &/ sWinAddr WAIT
+ TRY MKDIR "/mnt" &/ sWinAddr
PRINT "mounting " & sWinAddr
- SHELL "mount " & "/dev" &/ sWinAddr & Space(1) & "/mnt" &/
sWinAddr WAIT
+ 'SHELL "mount " & "/dev" &/ sWinAddr & Space(1) & "/mnt" &/
sWinAddr WAIT
+ EXEC ["mount", "/dev" &/ sWinAddr, "/mnt" &/ sWinAddr] WAIT
IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") OR Exist("/mnt" &/ sWinAddr &/ "winnt" &/ "system32"
&/ "winver.exe") THEN
'IF IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
' this is indeed a windows installation
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-11 20:31:04
|
Author: M0E.lnx
Date: Tue Nov 11 12:30:11 2008
New Revision: 284
Modified:
branches/iVL/FMain.class
branches/iVL/FrmLangSel.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmSelISO.class
branches/iVL/MdlNav.module
Log:
reverted old navigation scheme
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 12:30:11 2008
@@ -179,37 +179,9 @@
END
-PUBLIC SUB btnext_Click()
- DIM frmLast AS Form
-
- 'Message(pnlwinhost.Children.Type)
- 'frmTemp = FrmCurr
-' FrmCurr.Close
-'frmlast = FrmCurr
- IF FrmCurr.name = "FrmLangSel" THEN
- ME.Button1_Click()
- RETURN
- ELSE
- 'END IF
- 'FrmCurr = pnlwinhost.
-'ME.pnlwinhost.Children.Clear
-frmNext = MdlNav.Forward(FrmCurr.Name) '.Reparent(ME.pnlwinhost)
-FrmCurr.Close
-frmNext.Reparent(ME.pnlwinhost)
- 'frmlast.Hide
- 'MdlNav.Forward(FrmCurr.Name).Show()
- 'frmlast.Close
- 'frmlast.Close
-END IF
- 'MdlNav.Forward(FrmCurr.Text).Reparent(ME.pnlwinhost)
- 'MdlNav.Forward(FrmCurr.Text).Show
-
-
-END
-
-PUBLIC SUB btnext_Click_old()
+PUBLIC SUB btnext_Click()
DIM sISONAME AS String
DIM sDev AS String
DIM sLang AS String
@@ -256,7 +228,8 @@
MdlSetup.GO_WITH_SELECTED(sDev, "")
END IF
frmNext = FrmPartScheme
-
+
+
CASE "FrmPartScheme"
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Tue Nov 11 12:30:11 2008
@@ -80,8 +80,6 @@
PUBLIC SUB lbLangSel_Select()
FMain.btnext.Enabled = TRUE
- ClsInstall.sLANG = LAST.current.Key
- System.Language = ClsInstall.sLANG
'Message(LAST.current.key)
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Nov 11 12:30:11 2008
@@ -36,9 +36,6 @@
PUBLIC SUB Form_Open()
-
- MdlSetup.GO_WITH_SELECTED(ClsInstall.sDev, ClsInstall.sISOname)
-
ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>"
FMain.FrmCurr = ME
FMain.tvPlan["Prep2"].Selected = TRUE
@@ -62,8 +59,7 @@
("Select this option if you already have a linux installation that you
wish to overwrite or if a linux partition scheme exists in your hard
disk.") & Space(1)&
"<b>" & ("This option will overwrite any existing data in the selected
partitions") & "</b><br><br>" &
"<i>" & ("Use this option if you already prepared your partitions using
the VectorLinux installer") & "</i> "
- ClsInstall.bUseGparted = FALSE
- 'FMain.frmNext = FrmPartSel
+ FMain.frmNext = FrmPartSel
END
@@ -72,8 +68,7 @@
ME.tlChoiceExp.Text = "<h3>" & rbEditPartitions.Text & "</h3><br>" &
("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux installation.") & Space(1)&
("This option is the safest choice if you have other existing
installations that you wish to keep.")
- ClsInstall.bUseGparted = TRUE
- 'FMain.frmNext = FrmDiskPart
+ FMain.frmNext = FrmDiskPart
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Nov 11 12:30:11 2008
@@ -59,14 +59,14 @@
ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
ME.tlBanner.Adjust
ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
-
+ MdlPartSel.DISPLAY_PARTITION_OPTIONS
ME.cbDoWin.Value = FALSE
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
-MdlPartSel.DISPLAY_PARTITION_OPTIONS
+
END
PUBLIC SUB Form_Hide()
@@ -116,9 +116,7 @@
PUBLIC SUB cbDoWin_Click()
- 'ClsPartSel.bDoWin = cbDoWin.Value
- IF LAST.value = TRUE THEN ClsPartSel.bDoWin = TRUE
- IF LAST.value = FALSE OR IF LAST.value = NULL THEN ClsPartSel.bDoWin =
FALSE
+ ClsPartSel.bDoWin = cbDoWin.Value
' ' IF ClsPartSel.bDoWin = TRUE THEN
' ' FMain.frmNext = FrmWinDrives
' ' ELSE
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Nov 11 12:30:11 2008
@@ -30,14 +30,10 @@
IF lstInstallableImg.Find(("No Installable Media Found")) = -1
IF InStr(Trim(lstInstallableImg.Text), ".iso") OR
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
sLocation = Left(lstInstallableImg.Text,
InStr(lstInstallableImg.Text, " ") - 1)
- ClsInstall.sISOname = sLocation
- ClsInstall.sDev = Trim(Right(lstInstallableImg.Text,
Len(lstInstallableImg.Text) - InStr(lstInstallableImg.Text, "/")))
-
+
ELSE
ipos1 = RInStr(ME.lstInstallableImg.Text, "/")
sLocation = Right(ME.lstInstallableImg.Text,
Len(ME.lstInstallableImg.Text) - ipos1)
- ClsInstall.sDev = sLocation
- ClsInstall.sISOname = ""
END IF
'function to read the file
ME.DESCRIBE_DISTRO(sLocation)
@@ -48,7 +44,6 @@
'Message(Left(FrmSelISO.lstInstallableImg.text,
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4))
-'ClsInstall.sDev = sLocation
END
Modified: branches/iVL/MdlNav.module
==============================================================================
--- branches/iVL/MdlNav.module (original)
+++ branches/iVL/MdlNav.module Tue Nov 11 12:30:11 2008
@@ -17,38 +17,9 @@
PUBLIC FUNCTION Forward(sTrFCurrent AS String) AS Form
DIM fRet AS Form
- DIM sISONAME, sDev, sLang AS String
-
SELECT CASE sTrFCurrent
-
CASE "FrmSelISO"
fRet = FrmPartScheme
- CASE "FrmPartScheme"
- IF ClsInstall.bUseGparted = TRUE THEN
- Fret = FrmDiskPart
- ELSE
- fRet = FrmPartSel
- END IF
- CASE "FrmPartsel"
- IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
- Message.Error(("You must select a \"/\" partition. This is the
target where the system will install to"))
- RETURN
- END IF
- MdlPartSel.SET_LINUX_PARTITION_TYPES()
- IF ClsPartSel.bDoWin = TRUE THEN
- fRet = FrmWinDrives
- ELSE
- fRet = FrmPkgSel
- END IF
- CASE "FrmDiskPart"
- 'IF MdlSetup.CHECK_IF_REBOOT_NEEDED() = TRUE THEN
- ' now need to reboot
- fRet = FrmPartSel
- 'case
-
-' END IF
-
-
END SELECT
RETURN fRet
|
|
From: <cod...@go...> - 2008-11-11 19:57:45
|
Author: M0E.lnx
Date: Tue Nov 11 11:57:03 2008
New Revision: 283
Added:
branches/iVL/ClsInstall.class
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/FMain.class
branches/iVL/FrmDiskPart.form
branches/iVL/FrmLangSel.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPartSel.form
branches/iVL/FrmSelISO.class
branches/iVL/MdlNav.module
Log:
Incomplete navigation
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Nov 11 11:57:03 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/remote/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 11 11:57:03 2008
@@ -14,91 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:191
+#: FMain.class:219
msgid "Restart"
msgstr ""
-#: FMain.class:240
+#: FMain.class:267
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:242
+#: FMain.class:269
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:242
+#: FMain.class:269
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:256
+#: FMain.class:283
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:313
+#: FMain.class:340
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:314
+#: FMain.class:341
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:325
+#: FMain.class:352
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:339
+#: FMain.class:366
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "Yes"
msgstr ""
-#: FMain.class:354
+#: FMain.class:381
msgid "No"
msgstr ""
-#: FMain.class:372
+#: FMain.class:399
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:376
+#: FMain.class:403
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:389
+#: FMain.class:416
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:389
+#: FMain.class:416
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:640
+#: FMain.class:667
msgid "Back"
msgstr ""
-#: FMain.class:652
+#: FMain.class:679
msgid "Exit Installation"
msgstr ""
-#: FMain.class:664
+#: FMain.class:691
msgid "Next"
msgstr ""
-#: FMain.class:678
+#: FMain.class:705
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Nov 11 11:57:03 2008
@@ -14,39 +14,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartScheme.class:61
+#: FrmPartScheme.class:64
msgid "Select this option if you already have a linux installation that
you wish to overwrite or if a linux partition scheme exists in your hard
disk."
msgstr ""
-#: FrmPartScheme.class:61
+#: FrmPartScheme.class:64
msgid "This option will overwrite any existing data in the selected
partitions"
msgstr ""
-#: FrmPartScheme.class:61
+#: FrmPartScheme.class:64
msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:74
msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:74
msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
msgstr ""
-#: FrmPartScheme.class:112
+#: FrmPartScheme.class:117
msgid "Disk Partitioning Options"
msgstr ""
-#: FrmPartScheme.class:117
+#: FrmPartScheme.class:122
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:122
+#: FrmPartScheme.class:127
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:127
+#: FrmPartScheme.class:132
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Nov 11 11:57:03 2008
@@ -14,75 +14,75 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "user data separately for added data security. You may install the
system to a single partition"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "suggested setup for a typical Linux installation"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Used to store system data. This particular install requires a
minimum of"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "for this"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "but you should considear a higher value to make sure you have room
to install additional software"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "in case you wish to."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Typically, you want to use the largest partition for this."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "for this is"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:151
msgid "but can also be calculated as 2 times your ammount of RAM"
msgstr ""
-#: FrmPartSel.class:180
+#: FrmPartSel.class:182
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:185
+#: FrmPartSel.class:187
msgid "Help"
msgstr ""
-#: FrmPartSel.class:205
+#: FrmPartSel.class:207
msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:206
+#: FrmPartSel.class:208
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Nov 11 11:57:03 2008
@@ -18,43 +18,43 @@
msgid "No Installable Media Found"
msgstr ""
-#: FrmSelISO.class:74
+#: FrmSelISO.class:79
msgid "Click"
msgstr ""
-#: FrmSelISO.class:74
+#: FrmSelISO.class:79
msgid "to begin installating"
msgstr ""
-#: FrmSelISO.class:76
+#: FrmSelISO.class:81
msgid "Unable to locate any installable media."
msgstr ""
-#: FrmSelISO.class:82
+#: FrmSelISO.class:87
msgid "Select installation media from the list below"
msgstr ""
-#: FrmSelISO.class:113
+#: FrmSelISO.class:118
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:148
+#: FrmSelISO.class:153
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:251
+#: FrmSelISO.class:256
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:257
+#: FrmSelISO.class:262
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:262
+#: FrmSelISO.class:267
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:267
+#: FrmSelISO.class:272
msgid "Search Again"
msgstr ""
Added: branches/iVL/ClsInstall.class
==============================================================================
--- (empty file)
+++ branches/iVL/ClsInstall.class Tue Nov 11 11:57:03 2008
@@ -0,0 +1,23 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+STATIC PUBLIC sDev AS String
+STATIC PUBLIC sISOname AS String
+STATIC PUBLIC sLANG AS String
+
+' Partition method
+STATIC PUBLIC bUseGparted AS Boolean
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 11:57:03 2008
@@ -179,9 +179,37 @@
END
+PUBLIC SUB btnext_Click()
+ DIM frmLast AS Form
+
+ 'Message(pnlwinhost.Children.Type)
+ 'frmTemp = FrmCurr
+' FrmCurr.Close
+'frmlast = FrmCurr
+ IF FrmCurr.name = "FrmLangSel" THEN
+ ME.Button1_Click()
+ RETURN
+ ELSE
+ 'END IF
+ 'FrmCurr = pnlwinhost.
+'ME.pnlwinhost.Children.Clear
+frmNext = MdlNav.Forward(FrmCurr.Name) '.Reparent(ME.pnlwinhost)
+FrmCurr.Close
+frmNext.Reparent(ME.pnlwinhost)
+ 'frmlast.Hide
+ 'MdlNav.Forward(FrmCurr.Name).Show()
+ 'frmlast.Close
+ 'frmlast.Close
+END IF
+ 'MdlNav.Forward(FrmCurr.Text).Reparent(ME.pnlwinhost)
+ 'MdlNav.Forward(FrmCurr.Text).Show
+
+
+END
-PUBLIC SUB btnext_Click()
+
+PUBLIC SUB btnext_Click_old()
DIM sISONAME AS String
DIM sDev AS String
DIM sLang AS String
@@ -228,8 +256,7 @@
MdlSetup.GO_WITH_SELECTED(sDev, "")
END IF
frmNext = FrmPartScheme
-
-
+
CASE "FrmPartScheme"
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
Modified: branches/iVL/FrmDiskPart.form
==============================================================================
--- branches/iVL/FrmDiskPart.form (original)
+++ branches/iVL/FrmDiskPart.form Tue Nov 11 11:57:03 2008
@@ -12,7 +12,7 @@
MoveScaled(1,12,74,48)
Expand = True
{ EmbGPARTED Embedder
- MoveScaled(6,7,76,32)
+ MoveScaled(1,4,76,32)
Expand = True
}
}
Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class (original)
+++ branches/iVL/FrmLangSel.class Tue Nov 11 11:57:03 2008
@@ -80,6 +80,8 @@
PUBLIC SUB lbLangSel_Select()
FMain.btnext.Enabled = TRUE
+ ClsInstall.sLANG = LAST.current.Key
+ System.Language = ClsInstall.sLANG
'Message(LAST.current.key)
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Tue Nov 11 11:57:03 2008
@@ -36,6 +36,9 @@
PUBLIC SUB Form_Open()
+
+ MdlSetup.GO_WITH_SELECTED(ClsInstall.sDev, ClsInstall.sISOname)
+
ME.tlBanner.text = "<h3>" & ME.tlBanner.text & "</h3>"
FMain.FrmCurr = ME
FMain.tvPlan["Prep2"].Selected = TRUE
@@ -59,7 +62,8 @@
("Select this option if you already have a linux installation that you
wish to overwrite or if a linux partition scheme exists in your hard
disk.") & Space(1)&
"<b>" & ("This option will overwrite any existing data in the selected
partitions") & "</b><br><br>" &
"<i>" & ("Use this option if you already prepared your partitions using
the VectorLinux installer") & "</i> "
- FMain.frmNext = FrmPartSel
+ ClsInstall.bUseGparted = FALSE
+ 'FMain.frmNext = FrmPartSel
END
@@ -68,7 +72,8 @@
ME.tlChoiceExp.Text = "<h3>" & rbEditPartitions.Text & "</h3><br>" &
("Select this option is you wish to create, more or resize partitions in
order to make room for your new VectorLinux installation.") & Space(1)&
("This option is the safest choice if you have other existing
installations that you wish to keep.")
- FMain.frmNext = FrmDiskPart
+ ClsInstall.bUseGparted = TRUE
+ 'FMain.frmNext = FrmDiskPart
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Tue Nov 11 11:57:03 2008
@@ -59,14 +59,14 @@
ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
ME.tlBanner.Adjust
ME.cbDoWin.Width = MdlObjSizer.get_object_width(cbDoWin.text) + 24
- MdlPartSel.DISPLAY_PARTITION_OPTIONS
+
ME.cbDoWin.Value = FALSE
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
FMain.tvPlan["Prep2"].Selected = TRUE
FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
-
+MdlPartSel.DISPLAY_PARTITION_OPTIONS
END
PUBLIC SUB Form_Hide()
@@ -116,7 +116,9 @@
PUBLIC SUB cbDoWin_Click()
- ClsPartSel.bDoWin = cbDoWin.Value
+ 'ClsPartSel.bDoWin = cbDoWin.Value
+ IF LAST.value = TRUE THEN ClsPartSel.bDoWin = TRUE
+ IF LAST.value = FALSE OR IF LAST.value = NULL THEN ClsPartSel.bDoWin =
FALSE
' ' IF ClsPartSel.bDoWin = TRUE THEN
' ' FMain.frmNext = FrmWinDrives
' ' ELSE
Modified: branches/iVL/FrmPartSel.form
==============================================================================
--- branches/iVL/FrmPartSel.form (original)
+++ branches/iVL/FrmPartSel.form Tue Nov 11 11:57:03 2008
@@ -16,7 +16,7 @@
Picture = Picture["icon:/small/help"]
}
{ hrSep Separator
- MoveScaled(2,6,19,1)
+ MoveScaled(5,4,19,1)
}
}
{ scrollPartitions ScrollView
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Nov 11 11:57:03 2008
@@ -30,10 +30,14 @@
IF lstInstallableImg.Find(("No Installable Media Found")) = -1
IF InStr(Trim(lstInstallableImg.Text), ".iso") OR
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
sLocation = Left(lstInstallableImg.Text,
InStr(lstInstallableImg.Text, " ") - 1)
-
+ ClsInstall.sISOname = sLocation
+ ClsInstall.sDev = Trim(Right(lstInstallableImg.Text,
Len(lstInstallableImg.Text) - InStr(lstInstallableImg.Text, "/")))
+
ELSE
ipos1 = RInStr(ME.lstInstallableImg.Text, "/")
sLocation = Right(ME.lstInstallableImg.Text,
Len(ME.lstInstallableImg.Text) - ipos1)
+ ClsInstall.sDev = sLocation
+ ClsInstall.sISOname = ""
END IF
'function to read the file
ME.DESCRIBE_DISTRO(sLocation)
@@ -44,6 +48,7 @@
'Message(Left(FrmSelISO.lstInstallableImg.text,
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4))
+'ClsInstall.sDev = sLocation
END
Modified: branches/iVL/MdlNav.module
==============================================================================
--- branches/iVL/MdlNav.module (original)
+++ branches/iVL/MdlNav.module Tue Nov 11 11:57:03 2008
@@ -17,9 +17,38 @@
PUBLIC FUNCTION Forward(sTrFCurrent AS String) AS Form
DIM fRet AS Form
+ DIM sISONAME, sDev, sLang AS String
+
SELECT CASE sTrFCurrent
+
CASE "FrmSelISO"
fRet = FrmPartScheme
+ CASE "FrmPartScheme"
+ IF ClsInstall.bUseGparted = TRUE THEN
+ Fret = FrmDiskPart
+ ELSE
+ fRet = FrmPartSel
+ END IF
+ CASE "FrmPartsel"
+ IF NOT ClsPartSel.sRoot OR ClsPartSel.sRoot = "" THEN
+ Message.Error(("You must select a \"/\" partition. This is the
target where the system will install to"))
+ RETURN
+ END IF
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
+ IF ClsPartSel.bDoWin = TRUE THEN
+ fRet = FrmWinDrives
+ ELSE
+ fRet = FrmPkgSel
+ END IF
+ CASE "FrmDiskPart"
+ 'IF MdlSetup.CHECK_IF_REBOOT_NEEDED() = TRUE THEN
+ ' now need to reboot
+ fRet = FrmPartSel
+ 'case
+
+' END IF
+
+
END SELECT
RETURN fRet
|
|
From: <cod...@go...> - 2008-11-11 18:20:21
|
Author: M0E.lnx
Date: Tue Nov 11 10:19:27 2008
New Revision: 282
Added:
branches/iVL/MdlNav.module
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
Log:
Began splitting the navigation algorithm
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 11 10:19:27 2008
@@ -86,19 +86,19 @@
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:639
+#: FMain.class:640
msgid "Back"
msgstr ""
-#: FMain.class:651
+#: FMain.class:652
msgid "Exit Installation"
msgstr ""
-#: FMain.class:663
+#: FMain.class:664
msgid "Next"
msgstr ""
-#: FMain.class:677
+#: FMain.class:678
msgid "Button1"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 10:19:27 2008
@@ -186,7 +186,7 @@
DIM sDev AS String
DIM sLang AS String
- tvPlan.Refresh()
+ 'tvPlan.Refresh()
IF LAST.TEXT = ("Restart") THEN
'EXEC "shutdown", "-r", " now"
@@ -239,7 +239,7 @@
IF .rbEditPartitions.Value = TRUE THEN
.tlChoiceExp.text = .tlChoiceExp.text & gb.NewLine &
gb.NewLine & "<b><br><br>" & ("Please wait while setup attampts to run the
partitioning utility") & "</b>"
ELSE IF .rbUseExisting.Value = TRUE THEN
- .tlChoiceExp.Text = .tlChoiceExp.Text & gb.NewLine &
gb.NewLine & "<b><br><br><hr>" & ("Please wait while setup analyses your
current partition setup.") & " <br>" & ("This may take a while ...")
& "</b>"
+ .tlChoiceExp.Text = .tlChoiceExp.Text & gb.NewLine &
gb.NewLine & "<b><br><br>" & ("Please wait while setup analyses your
current partition setup.") & " <br>" & ("This may take a while ...")
& "</b>"
END IF
@@ -439,7 +439,7 @@
END IF
END IF
tvPlan.Refresh()
-
+ClsGlobal.sBackNav.Add(FrmCurr)
END
@@ -473,45 +473,46 @@
PUBLIC SUB btback_Click()
- DIM iKey AS Integer
- DIM frm AS Form
-
- SELECT CASE FrmCurr.Name
- CASE "FrmSummary"
- 'IF FrmPkgSel.rbCustom.Value = TRUE THEN
- IF ClsPkgSel.bCustom = TRUE THEN
- frm = FrmUsrPkgSel
- 'ELSE IF FrmPkgSel.rbFull.Value = TRUE THEN
- ELSE
- frm = FrmPkgSel
- END IF
- 'FrmCurr.Close
- CASE "FrmUsrPkgSel"
- 'FrmCurr.Hide
- frm = FrmPkgSel
-
-
-
- ' ' ' CASE ELSE
- ' ' '
- ' ' '
- ' ' ' iKey = ClsGlobal.sBackNav.Find(FrmCurr)
- ' ' ' IF iKey <> -1 THEN
- ' ' ' frm = ClsGlobal.sBackNav[iKey - 1]
- ' ' ' WITH FMain
- ' ' ' .tvPlan.MoveBack
- ' ' ' END WITH
- ' ' ' FrmCurr.Hide
- ' ' ' frm.Show
- ' ' ' END IF
-
-END SELECT
- frm.Reparent(ME.pnlwinhost)
- FrmCurr.Close
- frm.Show
+ DIM iKey AS Integer
+ DIM frm AS Form
+'
+' SELECT CASE FrmCurr.Name
+' CASE "FrmSummary"
+' 'IF FrmPkgSel.rbCustom.Value = TRUE THEN
+' IF ClsPkgSel.bCustom = TRUE THEN
+' frm = FrmUsrPkgSel
+' 'ELSE IF FrmPkgSel.rbFull.Value = TRUE THEN
+' ELSE
+' frm = FrmPkgSel
+' END IF
+' 'FrmCurr.Close
+' CASE "FrmUsrPkgSel"
+' 'FrmCurr.Hide
+' frm = FrmPkgSel
+'
+'
+'
+' ' ' ' CASE ELSE
+' ' ' '
+' ' ' '
+'
+'
+' END SELECT
+' frm.Reparent(ME.pnlwinhost)
+' FrmCurr.Close
+' frm.Show
-
+ iKey = ClsGlobal.sBackNav.Find(FrmCurr)
+ IF iKey <> -1 THEN
+ frm = ClsGlobal.sBackNav[iKey - 1]
+ ClsGlobal.sBackNav.Delete(iKey)
+ WITH FMain
+ .tvPlan.MoveBack
+ END WITH
+ FrmCurr.Hide
+ frm.Show
+ END IF
END
Added: branches/iVL/MdlNav.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlNav.module Tue Nov 11 10:19:27 2008
@@ -0,0 +1,29 @@
+' Gambas module file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC FUNCTION Forward(sTrFCurrent AS String) AS Form
+
+ DIM fRet AS Form
+ SELECT CASE sTrFCurrent
+ CASE "FrmSelISO"
+ fRet = FrmPartScheme
+ END SELECT
+
+ RETURN fRet
+
+
+
+END
|
|
From: <cod...@go...> - 2008-11-11 16:57:00
|
Author: M0E.lnx
Date: Tue Nov 11 08:55:35 2008
New Revision: 281
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FMain.class
Log:
Attempt to fix the reverse navigation woes
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/remote/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/remote/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/remote/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/remote/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,87 +18,87 @@
msgid "Restart"
msgstr ""
-#: FMain.class:239
+#: FMain.class:240
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:241
+#: FMain.class:242
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:241
+#: FMain.class:242
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:255
+#: FMain.class:256
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:310
+#: FMain.class:313
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:311
+#: FMain.class:314
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:322
+#: FMain.class:325
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:336
+#: FMain.class:339
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:351
+#: FMain.class:354
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:351
+#: FMain.class:354
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:351
+#: FMain.class:354
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:351
+#: FMain.class:354
msgid "Yes"
msgstr ""
-#: FMain.class:351
+#: FMain.class:354
msgid "No"
msgstr ""
-#: FMain.class:369
+#: FMain.class:372
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:373
+#: FMain.class:376
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:386
+#: FMain.class:389
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:386
+#: FMain.class:389
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:609
+#: FMain.class:639
msgid "Back"
msgstr ""
-#: FMain.class:621
+#: FMain.class:651
msgid "Exit Installation"
msgstr ""
-#: FMain.class:633
+#: FMain.class:663
msgid "Next"
msgstr ""
-#: FMain.class:647
+#: FMain.class:677
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/remote/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/remote/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/remote/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/remote/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/remote/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/remote/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/remote/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/remote/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/remote/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/remote/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/remote/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/remote/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/remote/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/remote/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Tue Nov 11 08:55:35 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/remote/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 08:55:35 2008
@@ -214,6 +214,7 @@
ELSE
+ IF ERROR THEN Message(Error.Where & "<br>" & Error.Text)
SELECT CASE FrmCurr.Name ' very nice navigation algoritm
@@ -283,11 +284,13 @@
END IF
- CASE "FrmPkgsel2", "FrmUsrPkgSel"
+ CASE "FrmPkgsel2" ', "FrmUsrPkgSel"
' summarize the build
' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '
MdlSummarize.SUMMARIZE_INSTALL
frmNext = FrmSummary
'frmNext = install
+ CASE "FrmUsrPkgSel"
+ frmNext = FrmSummary
CASE "FrmWinDrives"
'Move on to selecting packages
frmNext = FrmPkgSel
@@ -472,16 +475,43 @@
DIM iKey AS Integer
DIM frm AS Form
- iKey = ClsGlobal.sBackNav.Find(FrmCurr)
- IF iKey <> -1 THEN
- frm = ClsGlobal.sBackNav[iKey - 1]
- WITH FMain
- .tvPlan.MoveBack
- END WITH
- FrmCurr.Hide
- frm.Show
+
+ SELECT CASE FrmCurr.Name
+ CASE "FrmSummary"
+ 'IF FrmPkgSel.rbCustom.Value = TRUE THEN
+ IF ClsPkgSel.bCustom = TRUE THEN
+ frm = FrmUsrPkgSel
+ 'ELSE IF FrmPkgSel.rbFull.Value = TRUE THEN
+ ELSE
+ frm = FrmPkgSel
END IF
-
+ 'FrmCurr.Close
+ CASE "FrmUsrPkgSel"
+ 'FrmCurr.Hide
+ frm = FrmPkgSel
+
+
+
+ ' ' ' CASE ELSE
+ ' ' '
+ ' ' '
+ ' ' ' iKey = ClsGlobal.sBackNav.Find(FrmCurr)
+ ' ' ' IF iKey <> -1 THEN
+ ' ' ' frm = ClsGlobal.sBackNav[iKey - 1]
+ ' ' ' WITH FMain
+ ' ' ' .tvPlan.MoveBack
+ ' ' ' END WITH
+ ' ' ' FrmCurr.Hide
+ ' ' ' frm.Show
+ ' ' ' END IF
+
+END SELECT
+ frm.Reparent(ME.pnlwinhost)
+ FrmCurr.Close
+ frm.Show
+
+
+
END
|
|
From: <cod...@go...> - 2008-11-11 16:07:38
|
Author: M0E.lnx
Date: Tue Nov 11 08:06:50 2008
New Revision: 280
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/ClsLilo.class
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmLilo.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLiloOsList.module
Log:
- Fixed bug where the LILO os list was adding a TUI option even when the
option was set to false
- Added auto-width to the left panel.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Nov 11 08:06:50 2008
@@ -14,91 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:188
+#: FMain.class:191
msgid "Restart"
msgstr ""
-#: FMain.class:236
+#: FMain.class:239
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:238
+#: FMain.class:241
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:238
+#: FMain.class:241
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:252
+#: FMain.class:255
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:307
+#: FMain.class:310
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:308
+#: FMain.class:311
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:319
+#: FMain.class:322
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:333
+#: FMain.class:336
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "Yes"
msgstr ""
-#: FMain.class:348
+#: FMain.class:351
msgid "No"
msgstr ""
-#: FMain.class:366
+#: FMain.class:369
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:370
+#: FMain.class:373
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:383
+#: FMain.class:386
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:383
+#: FMain.class:386
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:606
+#: FMain.class:609
msgid "Back"
msgstr ""
-#: FMain.class:618
+#: FMain.class:621
msgid "Exit Installation"
msgstr ""
-#: FMain.class:630
+#: FMain.class:633
msgid "Next"
msgstr ""
-#: FMain.class:644
+#: FMain.class:647
msgid "Button1"
msgstr ""
Modified: branches/iVL/ClsLilo.class
==============================================================================
--- branches/iVL/ClsLilo.class (original)
+++ branches/iVL/ClsLilo.class Tue Nov 11 08:06:50 2008
@@ -15,3 +15,5 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+STATIC PUBLIC sRootInstall AS String
+STATIC PUBLIC bCliOpt AS Boolean
\ No newline at end of file
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Nov 11 08:06:50 2008
@@ -1 +1,2 @@
-
+- Fixed bug where the LILO os list was adding a TUI option even when the
option was set to false
+- Added auto-width to the left panel.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Tue Nov 11 08:06:50 2008
@@ -94,6 +94,7 @@
'Message(iWidth)
FMain.btnext.Enabled = FALSE ' disable the button until a language is
selected
IF ERROR THEN Message(Error.Text & "<br>" & Error.Where)
+ME.AUTOSIZE_LEFT_PANE()
END
PUBLIC SUB AUTOSIZE_LEFT_PANE()
@@ -111,7 +112,9 @@
'Message(iWidth)
'ME.tvPlan.Width = iWidth + (iWidth / 5)
ME.tvPlan.Width = iWidth + 6
- ME.Frame1.Width = iWidth + 12
+ 'ME.Frame1.Width = iWidth + 12
+ ME.SidePanel1.Width = iWidth + 64
+ 'me.SidePane
END
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Tue Nov 11 08:06:50 2008
@@ -20,7 +20,9 @@
PUBLIC SUB Form_Open()
-
+ IF Application.Args[1] = "-C" THEN
+ FMain.btnext.Enabled = TRUE
+ END IF
ME.tlBanner.Text = "<h3>" & tlBanner.text & "</h3>"
'ClsPartSel.sRoot = "/dev/sdb1" '
FMain.FrmCurr = ME
@@ -161,9 +163,9 @@
PUBLIC SUB Form_Menu()
- 'MdlConfLilo.GENERATE_LILO_DOT_CONF()
+MdlConfLilo.GENERATE_LILO_DOT_CONF()
' MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
- 'MdlConfLilo.WRITE_LILO_DOT_CONF()
+MdlConfLilo.WRITE_LILO_DOT_CONF()
END
@@ -174,5 +176,11 @@
FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
ME.sVidMode = "Standard"
+
+END
+
+PUBLIC SUB Form_MouseWheel()
+
+
END
Modified: branches/iVL/FrmLilo.form
==============================================================================
--- branches/iVL/FrmLilo.form (original)
+++ branches/iVL/FrmLilo.form Tue Nov 11 08:06:50 2008
@@ -50,7 +50,7 @@
}
{ sbTimer SpinBox
MoveScaled(20,16,9,3)
- Value = 3
+ Value = 10
}
{ tlTimoutSec TextLabel
MoveScaled(30,16,7,3)
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Tue Nov 11 08:06:50 2008
@@ -66,7 +66,8 @@
- 'message(sOut)
+ message(sOut)
+ RETURN
' Now we want to write the actual file to the root partition
IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf") THEN
IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist") THEN
KILL ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist"
@@ -277,7 +278,7 @@
'FOR EACH cbox IN MdlPartSel.oMountPoints
' IF cbox.text = "/" AND cbox.tag = ClsPartSel.sRoot THEN
' IF MdlLiloOsList.bVlCliOption = TRUE THEN
- IF bInc.tag = ClsPartSel.sRoot AND MdlLiloOsList.bVlCliOption =
TRUE THEN
+ IF bInc.tag = ClsLilo.sRootInstall AND MdlLiloOsList.bVlCliOption
= TRUE THEN
sCliSection = Replace(sSection, "append = \"" &
sEntryApnd & "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
sCliSection = Replace(sCliSection, "label = " &
sEntryLbl, "label = " & sEntryLbl & "-tui")
sCliSection = sCliSection & gb.NewLine
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Tue Nov 11 08:06:50 2008
@@ -228,6 +228,7 @@
DIM sShortAddr AS String
DIM iwidth AS Integer = FrmLilo.TabStrip1.Width
DIM cb AS ComboBox
+ DIM tb AS TextBox
x = 4
y = 4
@@ -241,6 +242,7 @@
cbarr = NEW Object[]
+ 'ME.bVlCliOption = FALSE
SHELL "fdisk -l |grep -E \'83 *Linux\' | cut -f 1 -d \' \'" TO sLinuxList
'sLinuxList = Trim(sLinuxList)
@@ -274,7 +276,7 @@
ENDIF
tl = NEW TextLabel(FrmLilo.TabStrip1) AS "OSIntro"
WITH tl
- .text = "<b>" & ("Operating system installed in ") &
arrLinux[i] & "</b> "
+ .text = "<b>" & ("Operating system installed in") & Space(1)
& arrLinux[i] & "</b> "
.Move(4, 16, MdlObjSizer.get_object_width(.text) + 4, 27)
'.BackColor = Color.SelectedBackground
.Alignment = Align.Normal
@@ -374,18 +376,33 @@
FOR EACH cb IN MdlPartSel.oMountPoints
IF cb.text = "/" AND cb.tag = arrLinux[i] THEN
+ ClsLilo.sRootInstall = cb.Tag
+ 'FrmLilo.cbDefBoot.Add("Linux-tui")
'IF arrLinux[i] = ClsPartSel.sRoot THEN
cbInclude = NEW CheckBox(FrmLilo.TabStrip1)
AS "VlCliOption"
WITH cbInclude
- .Value = FALSE
- .text = ("Add option to boot this Operating system
into Text mode")
+ .Value = TRUE
+ .text = ("Add option to boot this Operating system
into Text mode.")
.Width = MdlObjSizer.get_object_width(.text) + 36
.Height = 27
.Move(4, tl.top + tl.Height + 4)
-
.tag = arrLinux[i]
.Background = Color.Background
+ 'Message(.tag)
+ 'FOR EACH tb IN txtNames
+ 'Message(tb.tag & "<br>" & tb.Text)
+ 'message
+ 'IF Trim(tb.tag) = Trim(.tag) THEN
+ 'Message(tb.tag)
+ ' IF FrmLilo.cbDefBoot.Find(Trim(tb.Text
& "-tui")) = -1 THEN
+ 'FrmLilo.cbDefBoot.Add(tb.text & "-tui")
+ ' FrmLilo.cbDefBoot.Add(Trim(tb.text)
& "-tui")
+ ' END IF
+ 'FrmLilo.cbDefBoot.Add("Linux-tui")
+' END IF
+' NEXT
END WITH
+ 'FrmLilo.cbDefBoot.Add("Linux-tui")
ME.iVlTag = FrmLilo.TabStrip1.Index - 1
END IF
NEXT
@@ -452,7 +469,12 @@
PUBLIC SUB VlCliOption_click()
DIM tb AS TextBox
- bVlCliOption = LAST.value
+ 'bVlCliOption = LAST
+ IF LAST.value = TRUE THEN
+ bVlCliOption = TRUE
+ ELSE
+ bVlCliOption = FALSE
+ END IF
FOR EACH tb IN ME.txtNames
IF tb.tag = LAST.tag THEN
@@ -489,6 +511,7 @@
PUBLIC SUB NameBox_keyrelease()
LAST.text = Replace(LAST.text, " ", "")
+ 'FrmLilo.TabStrip1.text = LAST.text
ME.list_boot_options
|
|
From: <cod...@go...> - 2008-11-11 14:27:00
|
Author: M0E.lnx
Date: Tue Nov 11 06:26:33 2008
New Revision: 279
Modified:
branches/iVL/.lang/MdlCore.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/MdlCore.module
branches/iVL/installer.gambas
Log:
Updated Binary
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Nov 11 06:26:33 2008
@@ -27,7 +27,7 @@
msgstr ""
#: MdlCore.module:222
-msgid "installation CD and click "
+msgid "installation CD and click"
msgstr ""
#: MdlCore.module:222
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Nov 11 06:26:33 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.155
+Version=0.0.156
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -12,13 +12,11 @@
Library=gb.gtk.ext
Description=GUI installer for Vector linux
Authors=M0E-lnx
-Arguments="-C"
TabSize=2
Translate=1
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Tue Nov 11 06:26:33 2008
@@ -1,3 +1 @@
-- Fixed object positioning woes in install window.
-- Added a little space between embedded forms and the navigation buttons
-- Fixed object positioning woes in Partition selection window
+
Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module (original)
+++ branches/iVL/MdlCore.module Tue Nov 11 06:26:33 2008
@@ -219,7 +219,7 @@
IF FrmSelISO.lstInstallableImg.Count = 0 THEN
FrmSelISO.lstInstallableImg.Add(("No Installable Media Found"))
FrmSelISO.tlDistroDesc.Text = ("Setup was unable to find any installable
media on your system. Please insert your VectorLinux ")&
- ("installation CD and click ") & "\'" & FrmSelISO.btResCan.Text
& "\' " & ("to try again")
+ ("installation CD and click") & Space(1) & "\'" &
FrmSelISO.btResCan.Text & "\' " & ("to try again")
FMain.btnext.Enabled = FALSE
FMain.btnext.ForeColor = Color.Gray
ELSE
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-10 22:33:34
|
Author: M0E.lnx
Date: Mon Nov 10 14:31:10 2008
New Revision: 278
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.lang/en_US.po
branches/iVL/.lang/es.mo
branches/iVL/.lang/es.po
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.form
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmPartSel.class
branches/iVL/FrmPartSel.form
Log:
- Fixed object positioning woes in install window.
- Added a little space between embedded forms and the navigation buttons
- Fixed object positioning woes in Partition selection window
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -86,19 +86,19 @@
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:601
+#: FMain.class:606
msgid "Back"
msgstr ""
-#: FMain.class:613
+#: FMain.class:618
msgid "Exit Installation"
msgstr ""
-#: FMain.class:625
+#: FMain.class:630
msgid "Next"
msgstr ""
-#: FMain.class:639
+#: FMain.class:644
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -70,19 +70,19 @@
msgid "but can also be calculated as 2 times your ammount of RAM"
msgstr ""
-#: FrmPartSel.class:174
+#: FrmPartSel.class:180
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:183
-msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
+#: FrmPartSel.class:185
+msgid "Help"
msgstr ""
-#: FrmPartSel.class:184
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+#: FrmPartSel.class:205
+msgid "Check this box if you have a Windows installation on your system or
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted
as soon as your computer starts"
msgstr ""
-#: FrmPartSel.class:189
-msgid "Help"
+#: FrmPartSel.class:206
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr ""
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,15 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:227
+#: MdlSetup.module:242
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:243
+#: MdlSetup.module:258
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:245
+#: MdlSetup.module:260
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Mon Nov 10 14:31:10 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Mon Nov 10 14:31:10 2008
@@ -18,23 +18,23 @@
msgid "GUI installer for Vector linux"
msgstr "GUI installer for Vector linux"
-#: FMain.class:177 FrmDone.class:28
+#: FMain.class:188 FrmDone.class:28
msgid "Restart"
msgstr ""
-#: FMain.class:211
+#: FMain.class:236
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr "Please wait while setup attempts to run the partitioning utility"
-#: FMain.class:213
+#: FMain.class:238
msgid "Please wait while setup analyses your current partition setup."
msgstr "Please wait while setup analyses your current partition setup."
-#: FMain.class:213
+#: FMain.class:238
msgid "This may take a while ..."
msgstr "This may take a while ..."
-#: FMain.class:227
+#: FMain.class:252
msgid ""
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
@@ -42,74 +42,77 @@
"You must select a \"/\" partition. This is the target where the system
will "
"install to"
-#: FMain.class:279
+#: FMain.class:307
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:280
+#: FMain.class:308
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:291
+#: FMain.class:319
msgid "Skipping lilo setup"
msgstr "Skipping lilo setup per user request"
-#: FMain.class:305
+#: FMain.class:333
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:320
+#: FMain.class:348
msgid ""
"You have not created any user accounts for this system yet. There is not "
"enough information"
msgstr ""
-#: FMain.class:320
+#: FMain.class:348
msgid ""
"to create an account here. It is recommended that you create at least
one."
msgstr ""
-#: FMain.class:320
+#: FMain.class:348
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:320
+#: FMain.class:348
msgid "Yes"
msgstr ""
-#: FMain.class:320
+#: FMain.class:348
#, fuzzy
msgid "No"
msgstr "None"
-#: FMain.class:343
+#: FMain.class:366
+msgid "Please specify a hostname for this computer"
+msgstr ""
+
+#: FMain.class:370
+msgid "Please specify the domain this computer belongs to"
+msgstr ""
+
+#: FMain.class:383
msgid ""
"VectorLinux will now try to detect and configure your graphics hardware."
msgstr ""
-#: FMain.class:343
+#: FMain.class:383
msgid ""
-"Your screen may flicker or go blank during this process for a few
seconds "
-"during this process."
+"Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:494
-msgid "Process Overview"
-msgstr "Process Overview"
-
-#: FMain.class:514
-msgid "Next"
-msgstr "Next"
-
-#: FMain.class:520
+#: FMain.class:606
msgid "Back"
msgstr "Back"
-#: FMain.class:526
+#: FMain.class:618
msgid "Exit Installation"
msgstr "Exit Installation"
-#: FMain.class:542
+#: FMain.class:630
+msgid "Next"
+msgstr "Next"
+
+#: FMain.class:644
msgid "Button1"
msgstr "-"
@@ -131,32 +134,38 @@
msgid "Exit"
msgstr ""
-#: FrmDone.class:38
+#: FrmDone.class:39
#, fuzzy
msgid ""
"has been installed to your system. Your new system has been configured
with "
"the default factory settings."
msgstr "Packages have been installed to your system. Please click"
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
msgstr ""
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid ""
"Your computer needs to be restarted so that you can use your new
operating "
"system. Click"
msgstr ""
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "to restart your computer now or click"
msgstr ""
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "to restart your computer at a later time"
msgstr ""
-#: FrmDone.class:73
+#: FrmDone.class:39
+msgid ""
+"If you installed from CD-ROM/R/RW media, please remove de disk before "
+"restarting."
+msgstr ""
+
+#: FrmDone.class:74
#, fuzzy
msgid "Installation is finished"
msgstr "Installation"
@@ -181,32 +190,32 @@
msgid "Current Status"
msgstr "Current Status"
-#: FrmHostPrep.class:139 FrmLilo.class:223 FrmPartScheme.class:127
-#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:262
+#: FrmHostPrep.class:139 FrmLilo.class:224 FrmPartScheme.class:127
+#: FrmPkgSel.class:195 FrmPkgsel2.class:86 FrmSelISO.class:262
#: FrmSummaryOld.class:87
msgid "TextLabel1"
msgstr "-"
-#: FrmInstallSys.class:57 FrmInstallSysN.class:72
+#: FrmInstallSys.class:59 FrmInstallSysN.class:72
msgid "Current Step"
msgstr "Current Step"
-#: FrmInstallSys.class:181
+#: FrmInstallSys.class:192
msgid "Vectorlinux is currently being installed to your system... Please
wait"
msgstr "Vectorlinux is currently being installed to your system... Please
wait"
-#: FrmInstallSys.class:194
-msgid "Total progress"
-msgstr "Total progress"
-
-#: FrmInstallSys.class:204
+#: FrmInstallSys.class:206
msgid "Installing ..."
msgstr "Installing ..."
-#: FrmInstallSys.class:209
+#: FrmInstallSys.class:217
msgid "Current Step "
msgstr "Current Step "
+#: FrmInstallSys.class:239
+msgid "Total progress"
+msgstr "Total progress"
+
#: FrmInstallSysN.class:82
#, fuzzy
msgid "Total Progress"
@@ -216,22 +225,6 @@
msgid "Select your language"
msgstr "Select your language"
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "LICENSE AGREEMENT"
-
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
-
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "Yes, I Agree to the License Agreement"
-
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No, I Do Not Agree"
-
#: FrmLilo.class:35
msgid ""
"The following Operating Systems have been detected on this computer.
Choose "
@@ -248,82 +241,86 @@
"for each one of them by clicking on each tab. To proceed with the
default "
"pre-set values, simply click"
-#: FrmLilo.class:132
+#: FrmLilo.class:133
msgid "Standard"
msgstr "Standard"
-#: FrmLilo.class:206
+#: FrmLilo.class:207
msgid "Configure and install lilo (Linux Boot Loader)"
msgstr "Configure and install lilo (Linux Boot Loader)"
-#: FrmLilo.class:211
+#: FrmLilo.class:212
msgid "Don't Install Lilo"
msgstr "Don't Install Lilo"
-#: FrmLilo.class:217 FrmNetConf.class:141
+#: FrmLilo.class:218 FrmNetConf.class:195
msgid "Tab 0"
msgstr "-"
-#: FrmLilo.class:235
+#: FrmLilo.class:236
msgid "Target"
msgstr "Target"
-#: FrmLilo.class:241
+#: FrmLilo.class:242
msgid "Video Resolution"
msgstr "Video Resolution"
-#: FrmLilo.class:249
+#: FrmLilo.class:250
msgid "Bootsplash Med"
msgstr "Bootsplash Med"
-#: FrmLilo.class:249
+#: FrmLilo.class:250
msgid "Bootsplash High"
msgstr "Bootsplash High"
-#: FrmLilo.class:249
+#: FrmLilo.class:250
msgid "Bootsplash Extra high"
msgstr "Bootsplash Extra High"
-#: FrmLilo.class:254
+#: FrmLilo.class:255
msgid "Prompt Timeout"
msgstr "Prompt Timeout"
-#: FrmLilo.class:265
+#: FrmLilo.class:266
msgid "Seconds"
msgstr "Seconds"
-#: FrmLilo.class:271
+#: FrmLilo.class:272
msgid "Boot Default"
msgstr "Boot Default"
-#: FrmNetConf.class:58
+#: FrmNetConf.class:70
msgid "Network Interfaces"
msgstr ""
-#: FrmNetConf.class:125
-msgid "Computer Name"
-msgstr "Computer Name"
+#: FrmNetConf.class:172
+msgid "Domain"
+msgstr ""
-#: FrmNetConf.class:148
+#: FrmNetConf.class:202
msgid "Manual DNS Server Specification"
msgstr "Manual DNS Server Specification"
-#: FrmNetConf.class:153
+#: FrmNetConf.class:207
msgid "Primary DNS Server"
msgstr "Primary DNS Server"
-#: FrmNetConf.class:161
+#: FrmNetConf.class:215
msgid "192.168.1.254"
msgstr "-"
-#: FrmNetConf.class:166
+#: FrmNetConf.class:220
msgid "Secondary DNS Server"
msgstr "Secondary DNS Server"
-#: FrmNetConf.class:179 MdlCore.module:462
+#: FrmNetConf.class:233 MdlCore.module:484
msgid "Network Configuration"
msgstr "Network Configuration"
+#: FrmNetConf.class:243
+msgid "Computer Name"
+msgstr "Computer Name"
+
#: FrmPartScheme.class:61
msgid ""
"Select this option if you already have a linux installation that you wish
to "
@@ -477,23 +474,37 @@
msgid "Help"
msgstr "Help"
-#: FrmPkgSel.class:22
+#: FrmPkgSel.class:25
msgid "Choose your installation mode"
msgstr "Choose your installation mode"
-#: FrmPkgSel.class:51
-msgid "Installs everything in your VectorLinux media to your system"
+#: FrmPkgSel.class:40
+msgid "Package"
+msgstr ""
+
+#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
+#, fuzzy
+msgid "Description"
+msgstr "Preparation"
+
+#: FrmPkgSel.class:42 FrmSummary.class:40 FrmUsrPkgSel.class:19
+msgid "Size"
msgstr ""
-#: FrmPkgSel.class:60
+#: FrmPkgSel.class:70
+msgid ""
+"Installs all optional components in your VectorLinux media to your system"
+msgstr ""
+
+#: FrmPkgSel.class:80
msgid "Choose your optional components to install."
msgstr ""
-#: FrmPkgSel.class:107
+#: FrmPkgSel.class:205
msgid "Full Install"
msgstr "Full Install"
-#: FrmPkgSel.class:112
+#: FrmPkgSel.class:210
msgid "Custom Install"
msgstr "Custom Install"
@@ -535,7 +546,7 @@
"Passwords do not match. Please enter the same password twice for
accuracy."
msgstr ""
-#: FrmRootPass.class:118 MdlCore.module:460
+#: FrmRootPass.class:118 MdlCore.module:482
msgid "System Administrator"
msgstr "System Administrator"
@@ -571,7 +582,7 @@
msgid "Set Password"
msgstr "Set Password"
-#: FrmSelISO.class:30 MdlCore.module:198
+#: FrmSelISO.class:30 MdlCore.module:220
msgid "No Installable Media Found"
msgstr "No Installable Media Found"
@@ -590,8 +601,9 @@
#: FrmSelISO.class:82
#, fuzzy
-msgid "Installable media found."
-msgstr "No Installable Media Found"
+msgid "Select installation media from the list below"
+msgstr ""
+"Select which VectorLinux version you wish to install from the list below"
#: FrmSelISO.class:113
msgid "Unable to identify distro."
@@ -615,72 +627,68 @@
msgid "Search Again"
msgstr "Search Again"
-#: FrmSummary.class:14 MdlCore.module:454
+#: FrmSummary.class:14 MdlCore.module:476
msgid "Installation Summary"
msgstr "Installation Summary"
-#: FrmSummary.class:16 MdlSummarize.module:56
+#: FrmSummary.class:17 MdlSummarize.module:56
msgid "Custom"
msgstr "Custom"
-#: FrmSummary.class:20 MdlSummarize.module:69
+#: FrmSummary.class:21 MdlSummarize.module:69
msgid "Full"
msgstr "Full"
-#: FrmSummary.class:37
+#: FrmSummary.class:38
#, fuzzy
msgid "Partition"
msgstr "Preparation"
-#: FrmSummary.class:39
-msgid "Size"
-msgstr ""
-
-#: FrmSummary.class:41
+#: FrmSummary.class:42
msgid "Filesystem"
msgstr ""
-#: FrmSummary.class:43
+#: FrmSummary.class:44
#, fuzzy
msgid "Mount Point"
msgstr "Do not mount"
-#: FrmSummary.class:49 MdlInstallSys.module:142 MdlPartSel.module:143
+#: FrmSummary.class:50 MdlInstallSys.module:142 MdlPartSel.module:143
msgid "Not Used"
msgstr "Not Used"
-#: FrmSummary.class:90 MdlNetConf.module:220
+#: FrmSummary.class:91 MdlNetConf.module:220
msgid "None"
msgstr "None"
-#: FrmSummary.class:112 MdlInstallSys.module:190 MdlWinDrives.module:123
+#: FrmSummary.class:113 MdlInstallSys.module:190 MdlWinDrives.module:123
msgid "Do not mount"
msgstr "Do not mount"
-#: FrmSummary.class:164
+#: FrmSummary.class:165 FrmUsrPkgSel.class:16
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:173
+#: FrmSummary.class:174
#, fuzzy
msgid "BULK PACKAGES"
msgstr "BULK PACKAGES:"
-#: FrmSummary.class:190
+#: FrmSummary.class:201
#, fuzzy
msgid "USER-SELECTED PACKAGES"
msgstr "BULK PACKAGES:"
-#: FrmSummary.class:243
+#: FrmSummary.class:277
#, fuzzy
msgid "Installation Type"
msgstr "Installation"
-#: FrmSummary.class:253
+#: FrmSummary.class:287
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:263 MdlCore.module:451
+#: FrmSummary.class:297 FrmUsrPkgSel.class:135 MdlCore.module:473
msgid "Software Selection"
msgstr "Software Selection"
@@ -937,11 +945,11 @@
msgid "Boot loader has been setup successfully"
msgstr "Boot loader has been setup successfully"
-#: MdlCore.module:182
+#: MdlCore.module:204
msgid "Scanning system for installable media. Please wait ..."
msgstr "Scanning system for installable media. Please wait ..."
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid ""
"Setup was unable to find any installable media on your system. Please
insert "
"your VectorLinux "
@@ -949,23 +957,23 @@
"Setup was unable to find any installable media on your system. Please
insert "
"your VectorLinux "
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "installation CD and click "
msgstr "installation CD and click "
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "to try again"
msgstr "to try again"
-#: MdlCore.module:361
+#: MdlCore.module:383
msgid "Build Date: "
msgstr "Build Date: "
-#: MdlCore.module:361
+#: MdlCore.module:383
msgid "MINIMUM REQUIREMENTS"
msgstr "MINIMUM REQUIREMENTS"
-#: MdlCore.module:366
+#: MdlCore.module:388
msgid ""
"Setup is unable to find SETUP.CONF in your install media. This could be "
"symptoms of a bad burn or a bad ISO"
@@ -973,51 +981,51 @@
"Setup is unable to find SETUP.CONF in your install media. This could be "
"symptoms of a bad burn or a bad ISO"
-#: MdlCore.module:439
+#: MdlCore.module:461
msgid "Cannot find SETUP.CONF"
msgstr "Cannot find SETUP.CONF"
-#: MdlCore.module:447
+#: MdlCore.module:469
msgid "Preparation"
msgstr "Preparation"
-#: MdlCore.module:448
+#: MdlCore.module:470
msgid "Language Selection"
msgstr "Language Selection"
-#: MdlCore.module:449
+#: MdlCore.module:471
msgid "Find installation media"
msgstr "Find installation media"
-#: MdlCore.module:450
+#: MdlCore.module:472
msgid "Disk Partitioning"
msgstr "Disk Partitioning"
-#: MdlCore.module:453
+#: MdlCore.module:475
msgid "Installation"
msgstr "Installation"
-#: MdlCore.module:456
+#: MdlCore.module:478
msgid "Install Operating System"
msgstr "Install Operating System"
-#: MdlCore.module:457
+#: MdlCore.module:479
msgid "System Configuration"
msgstr "System Configuration"
-#: MdlCore.module:458
+#: MdlCore.module:480
msgid "Boot Menu Options"
msgstr "Boot Menu Options"
-#: MdlCore.module:459
+#: MdlCore.module:481
msgid "Regional Settings"
msgstr "Regional Settings"
-#: MdlCore.module:461
+#: MdlCore.module:483
msgid "User Accounts"
msgstr "User Accounts"
-#: MdlCore.module:463
+#: MdlCore.module:485
#, fuzzy
msgid "Final Hardware Configuration"
msgstr "Hardware Configuration"
@@ -1062,34 +1070,34 @@
msgid "Several windows found. I will take the first one!"
msgstr "Several windows found. I will take the first one!"
-#: MdlInstallCustom.module:44
+#: MdlInstallCustom.module:46
msgid "There as been an error while installing required system software. "
msgstr "There as been an error while installing required system software. "
-#: MdlInstallCustom.module:52
+#: MdlInstallCustom.module:54
msgid ""
"There has been an error while installing optional software to your
system. "
msgstr ""
"There has been an error while installing optional software to your
system. "
-#: MdlInstallCustom.module:60
+#: MdlInstallCustom.module:63
msgid ""
"There has been an error while installing optional software to your
system."
msgstr ""
-#: MdlInstallCustom.module:72
+#: MdlInstallCustom.module:75
msgid "Error while installing required system software. "
msgstr "Error while installing required system software. "
-#: MdlInstallCustom.module:81
+#: MdlInstallCustom.module:84
msgid "Error while installing system configuration. "
msgstr "Error while installing system configuration. "
-#: MdlInstallCustom.module:88
+#: MdlInstallCustom.module:91
msgid "Unable to install kernels. "
msgstr "Unable to install kernels. "
-#: MdlInstallCustom.module:99
+#: MdlInstallCustom.module:102
msgid ""
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
@@ -1097,7 +1105,7 @@
"Vectorlinux is now installed in your system. Please click next to
configure "
"it."
-#: MdlInstallCustom.module:100
+#: MdlInstallCustom.module:103
msgid ""
"packages have been Installed. Please click next to move on to System "
"Configuration."
@@ -1105,23 +1113,45 @@
"packages have been Installed. Please click next to move on to System "
"Configuration."
-#: MdlInstallCustom.module:269
+#: MdlInstallCustom.module:275 MdlInstallSys.module:471
+msgid "Installing"
+msgstr "Installing"
+
+#: MdlInstallCustom.module:295
+msgid "Failed to install. Installation will stop"
+msgstr ""
+
+#: MdlInstallCustom.module:341
#, fuzzy
msgid "Installing user-selected package"
msgstr "Installing Required Packages ..."
-#: MdlInstallCustom.module:459
+#: MdlInstallCustom.module:547
msgid "Calculating package count ... Please wait"
msgstr "Calculating package count ... Please wait"
-#: MdlInstallCustom.module:507
+#: MdlInstallCustom.module:624
msgid "Total packages to be installed = "
msgstr "Total packages to be installed = "
-#: MdlInstallCustom.module:539
+#: MdlInstallCustom.module:627
+#, fuzzy
+msgid "Total bulks to be installed = "
+msgstr "Total packages to be installed = "
+
+#: MdlInstallCustom.module:630
+#, fuzzy
+msgid "Total pkgs to be installed = "
+msgstr "Total packages to be installed = "
+
+#: MdlInstallCustom.module:665
msgid "Error while installing "
msgstr "Error while installing "
+#: MdlInstallCustom.module:734
+msgid "failed to install. Installation will stop now"
+msgstr ""
+
#: MdlInstallSys.module:118
msgid "Writing new /etc/fstab to system"
msgstr "Writing new /etc/fstab to system"
@@ -1142,10 +1172,6 @@
msgid "Packages have been installed in your system. Please click"
msgstr "Packages have been installed to your system. Please click"
-#: MdlInstallSys.module:471
-msgid "Installing"
-msgstr "Installing"
-
#: MdlInstallSys.module:509
#, fuzzy
msgid "Error occurred while installing"
@@ -1163,25 +1189,25 @@
msgid "Finished intalling Bulks"
msgstr "Finished intalling Bulks"
-#: MdlInstallSys.module:736
+#: MdlInstallSys.module:745
msgid "Installation phase complete. Ready for configuration"
msgstr "Installation phase complete. Ready for configuration"
-#: MdlInstallSys.module:739
+#: MdlInstallSys.module:748
msgid "Installing default system configuration and required software."
msgstr "Installing default system configuration and required software."
-#: MdlInstallSys.module:775
+#: MdlInstallSys.module:784
#, fuzzy
msgid "Installing Required Package ..."
msgstr "Installing Required Packages ..."
-#: MdlInstallSys.module:786
+#: MdlInstallSys.module:795
#, fuzzy
msgid "Failed to install"
msgstr "Unable to install kernels. "
-#: MdlInstallSys.module:826
+#: MdlInstallSys.module:835
msgid "Installing Final configuration files..."
msgstr "Installing final configuration files ..."
@@ -1218,7 +1244,7 @@
msgid "Kernel boot options"
msgstr "Kernel boot options"
-#: MdlLiloOsList.module:379
+#: MdlLiloOsList.module:381
msgid "Add option to boot this Operating system into Text mode"
msgstr "Add option to boot this Operating system into Text mode"
@@ -1326,15 +1352,15 @@
msgid "partition"
msgstr ""
-#: MdlSetup.module:227
+#: MdlSetup.module:242
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:243
+#: MdlSetup.module:258
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:245
+#: MdlSetup.module:260
msgid "Preparing filesystems"
msgstr ""
@@ -1427,6 +1453,25 @@
#: MdlZoneSet.module:28
msgid "localtime"
msgstr "localtime"
+
+#~ msgid "Process Overview"
+#~ msgstr "Process Overview"
+
+#~ msgid "LICENSE AGREEMENT"
+#~ msgstr "LICENSE AGREEMENT"
+
+#~ msgid "TextArea1"
+#~ msgstr "-"
+
+#~ msgid "Yes, I Agree to the License Agreement"
+#~ msgstr "Yes, I Agree to the License Agreement"
+
+#~ msgid "No, I Do Not Agree"
+#~ msgstr "No, I Do Not Agree"
+
+#, fuzzy
+#~ msgid "Installable media found."
+#~ msgstr "No Installable Media Found"
#~ msgid "Name "
#~ msgstr "Name "
Modified: branches/iVL/.lang/es.mo
==============================================================================
Binary files. No diff available.
Modified: branches/iVL/.lang/es.po
==============================================================================
--- branches/iVL/.lang/es.po (original)
+++ branches/iVL/.lang/es.po Mon Nov 10 14:31:10 2008
@@ -38,7 +38,7 @@
msgid "1600x1200"
msgstr ""
-#: FrmNetConf.class:161
+#: FrmNetConf.class:215
msgid "192.168.1.254"
msgstr "-"
@@ -78,15 +78,15 @@
msgid "Access Point"
msgstr "Punto de Accesso (Access Point)"
-#: MdlSetup.module:243
+#: MdlSetup.module:258
msgid "Activating swap space"
msgstr "Activando la partición Swap"
-#: MdlLiloOsList.module:379
+#: MdlLiloOsList.module:381
msgid "Add option to boot this Operating system into Text mode"
msgstr "Añadir una opción para arrancar este sistema operativo en modo
texto"
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
msgstr "Luego de reiniciar, puedes utilizar Vasm o VasmCC para ultimar los
detalles de la instalación "
@@ -106,11 +106,11 @@
msgid "Automatically activate this interface at start-up"
msgstr "Activar esta interfaz automáticamente al arrancar"
-#: MdlSetup.module:227
+#: MdlSetup.module:242
msgid "BROUGHT TO YOU BY"
msgstr "Créditos "
-#: FrmSummary.class:173
+#: FrmSummary.class:174
msgid "BULK PACKAGES"
msgstr "PAQUETES POR CATEGORIA"
@@ -118,15 +118,15 @@
msgid "BULK PACKAGES:"
msgstr "Paquetes por categoría"
-#: FMain.class:520
+#: FMain.class:606
msgid "Back"
msgstr "Regresar"
-#: FrmLilo.class:271
+#: FrmLilo.class:272
msgid "Boot Default"
msgstr "Arranque por defecto"
-#: MdlCore.module:458
+#: MdlCore.module:480
msgid "Boot Menu Options"
msgstr "Opciones de arranque"
@@ -134,31 +134,31 @@
msgid "Boot loader has been setup successfully"
msgstr "El cargador de arranque ha sido configurado con éxito"
-#: FrmLilo.class:249
+#: FrmLilo.class:250
msgid "Bootsplash Extra high"
msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
-#: FrmLilo.class:249
+#: FrmLilo.class:250
msgid "Bootsplash High"
msgstr "Resolución del arranque gráfico (bootsplash) alta"
-#: FrmLilo.class:249
+#: FrmLilo.class:250
msgid "Bootsplash Med"
msgstr "Resolución del arranque gráfico (bootsplash) media"
-#: MdlCore.module:361
+#: MdlCore.module:383
msgid "Build Date: "
msgstr "Compilado el: "
-#: FMain.class:542
+#: FMain.class:644
msgid "Button1"
msgstr "-"
-#: MdlInstallCustom.module:459
+#: MdlInstallCustom.module:547
msgid "Calculating package count ... Please wait"
msgstr "Calculando el número de paquetes ... Por favor espere"
-#: MdlCore.module:439
+#: MdlCore.module:461
msgid "Cannot find SETUP.CONF"
msgstr "No se pudo encontrar SETUP.CONF"
@@ -178,11 +178,11 @@
msgid "Choose the correct timezone for the area in which you live."
msgstr "Selecciona la zona horaria del área donde vives"
-#: FrmPkgSel.class:22
+#: FrmPkgSel.class:25
msgid "Choose your installation mode"
msgstr "Selecciona el modo de instalación"
-#: FrmPkgSel.class:60
+#: FrmPkgSel.class:80
msgid "Choose your optional components to install."
msgstr "Selecciona los componentes opcionales a instalar."
@@ -202,11 +202,11 @@
msgid "ComboBox1"
msgstr "-"
-#: FrmNetConf.class:125
+#: FrmNetConf.class:243
msgid "Computer Name"
msgstr "Nombre Local"
-#: FrmLilo.class:206
+#: FrmLilo.class:207
msgid "Configure and install lilo (Linux Boot Loader)"
msgstr "Confuguración de LILO"
@@ -222,27 +222,31 @@
msgid "Current Status"
msgstr "Estado Actual"
-#: FrmInstallSys.class:57 FrmInstallSysN.class:72
+#: FrmInstallSys.class:59 FrmInstallSysN.class:72
msgid "Current Step"
msgstr "Este paso"
-#: FrmInstallSys.class:209
+#: FrmInstallSys.class:217
msgid "Current Step "
msgstr "Este paso"
-#: FrmSummary.class:16 MdlSummarize.module:56
+#: FrmSummary.class:17 MdlSummarize.module:56
msgid "Custom"
msgstr "Personalisado"
-#: FrmPkgSel.class:112
+#: FrmPkgSel.class:210
msgid "Custom Install"
msgstr "Instalación Personalizada"
+#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
+msgid "Description"
+msgstr ""
+
#: FrmPartSel.class:184
msgid "Detect and Setup Windows partitions for auto-mounting at boot"
msgstr "Detectar volúmenes con sistemas Windows"
-#: MdlCore.module:450
+#: MdlCore.module:472
msgid "Disk Partitioning"
msgstr "Particionado de disco"
@@ -258,11 +262,15 @@
msgid "Do not format"
msgstr "No Formatear"
-#: FrmSummary.class:112 MdlInstallSys.module:190 MdlWinDrives.module:123
+#: FrmSummary.class:113 MdlInstallSys.module:190 MdlWinDrives.module:123
msgid "Do not mount"
msgstr "No montar"
-#: FrmLilo.class:211
+#: FrmNetConf.class:172
+msgid "Domain"
+msgstr ""
+
+#: FrmLilo.class:212
msgid "Don't Install Lilo"
msgstr "No quiero instalar LILO"
@@ -306,15 +314,15 @@
msgid "Error occurred while installing"
msgstr "Ha ocurrido un error durante la instalación"
-#: MdlInstallCustom.module:539
+#: MdlInstallCustom.module:665
msgid "Error while installing "
msgstr "Error al instalar "
-#: MdlInstallCustom.module:72
+#: MdlInstallCustom.module:75
msgid "Error while installing required system software. "
msgstr "Error al instalar el software base. "
-#: MdlInstallCustom.module:81
+#: MdlInstallCustom.module:84
msgid "Error while installing system configuration. "
msgstr "Error al instalar la configuración del sistema. "
@@ -322,7 +330,7 @@
msgid "Exit"
msgstr "Salir"
-#: FMain.class:526
+#: FMain.class:618
msgid "Exit Installation"
msgstr "Cancelar Instalación"
@@ -330,23 +338,27 @@
msgid "FILESYSTEM"
msgstr "Sistema de archivos"
-#: MdlInstallSys.module:786
+#: MdlInstallSys.module:795
msgid "Failed to install"
msgstr "La instalación ha fallado"
+#: MdlInstallCustom.module:295
+msgid "Failed to install. Installation will stop"
+msgstr ""
+
#: FrmXconf.class:342
msgid "Fbdev"
msgstr ""
-#: FrmSummary.class:41
+#: FrmSummary.class:42
msgid "Filesystem"
msgstr "Sistema de Archivos"
-#: MdlCore.module:463
+#: MdlCore.module:485
msgid "Final Hardware Configuration"
-msgstr "Configuración final del hardware "
+msgstr "Configuración final"
-#: MdlCore.module:449
+#: MdlCore.module:471
msgid "Find installation media"
msgstr "Buscar medio de instalación"
@@ -358,11 +370,11 @@
msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess"
msgstr "Por motivos de seguridad, deberías utilizar una clave fácil de
recordar, pero difícil de adivinar"
-#: FrmSummary.class:20 MdlSummarize.module:69
+#: FrmSummary.class:21 MdlSummarize.module:69
msgid "Full"
msgstr "Completa"
-#: FrmPkgSel.class:107
+#: FrmPkgSel.class:205
msgid "Full Install"
msgstr "Instalacion Completa"
@@ -410,6 +422,10 @@
msgid "If in doubt, choose this option"
msgstr "Si dudas, elige esta opción"
+#: FrmDone.class:39
+msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
+msgstr ""
+
#: MdlLiloOsList.module:146
msgid "Include this installation in the boot menu"
msgstr "Incluir esta instalación en el menú de arranque"
@@ -422,61 +438,57 @@
msgid "Initial Ram Disk"
msgstr "Disco Ram inicial"
-#: MdlCore.module:456
+#: MdlCore.module:478
msgid "Install Operating System"
-msgstr "Instalación del sistema operativo"
+msgstr "Copiar Archivos"
-#: FrmSelISO.class:82
-msgid "Installable media found."
-msgstr "Medio de instalación encontrado."
-
-#: MdlCore.module:453
+#: MdlCore.module:475
msgid "Installation"
msgstr "Instalación "
-#: FrmSummary.class:14 MdlCore.module:454
+#: FrmSummary.class:14 MdlCore.module:476
msgid "Installation Summary"
msgstr "Resumen del proceso"
-#: FrmSummary.class:243
+#: FrmSummary.class:277
msgid "Installation Type"
msgstr "Tipo de instalación"
-#: FrmDone.class:73
+#: FrmDone.class:74
msgid "Installation is finished"
msgstr "La instalación ha finalizado "
-#: MdlInstallSys.module:736
+#: MdlInstallSys.module:745
msgid "Installation phase complete. Ready for configuration"
msgstr "Fase de instalación completada. Vamos a por la configuración"
-#: MdlInstallSys.module:471
+#: MdlInstallCustom.module:275 MdlInstallSys.module:471
msgid "Installing"
msgstr "Instalando"
-#: FrmInstallSys.class:204
+#: FrmInstallSys.class:206
msgid "Installing ..."
msgstr "Instalando..."
-#: MdlInstallSys.module:826
+#: MdlInstallSys.module:835
msgid "Installing Final configuration files..."
msgstr "Instalando los últimos ficheros de configuración ..."
-#: MdlInstallSys.module:775
+#: MdlInstallSys.module:784
msgid "Installing Required Package ..."
msgstr "Instalando paquetes requeridos ..."
-#: MdlInstallSys.module:739
+#: MdlInstallSys.module:748
msgid "Installing default system configuration and required software."
msgstr "Instalando el software necesario y las configuraciones por
defecto."
-#: MdlInstallCustom.module:269
+#: MdlInstallCustom.module:341
msgid "Installing user-selected package"
msgstr "Instalando paquetes selecionados por el usuario"
-#: FrmPkgSel.class:51
-msgid "Installs everything in your VectorLinux media to your system"
-msgstr "Instalar todo lo que incluye el medio de instalación en tu disco
duro"
+#: FrmPkgSel.class:70
+msgid "Installs all optional components in your VectorLinux media to your
system"
+msgstr ""
#: MdlNetConf.module:149
msgid "Interface Type"
@@ -490,15 +502,11 @@
msgid "Kernel boot options"
msgstr "Opciones de arranque de kernel"
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "Aceptación de licencia"
-
#: MdlLiloOsList.module:155
msgid "Label"
msgstr "Etiqueta"
-#: MdlCore.module:448
+#: MdlCore.module:470
msgid "Language Selection"
msgstr "Seleccion de idioma"
@@ -526,7 +534,7 @@
msgid "Login name field contains illegal characters. Please use only
lowercase letters and numbers"
msgstr "Tu nombre de usuario contiene caracteres ilegales. Por favor
utiliza solo letras minúsculas y números"
-#: MdlCore.module:361
+#: MdlCore.module:383
msgid "MINIMUM REQUIREMENTS"
msgstr "Requerimientos mínimos del sistema"
@@ -538,7 +546,7 @@
msgid "MOUNT TO"
msgstr "Montar en"
-#: FrmNetConf.class:148
+#: FrmNetConf.class:202
msgid "Manual DNS Server Specification"
msgstr "Configuración Manual de servidores de nombres (DNS)"
@@ -554,7 +562,7 @@
msgid "Most other every-day taks do not require administrative
priviledges."
msgstr "Las tareas diarias no requieren privilegios de administrador"
-#: FrmSummary.class:43
+#: FrmSummary.class:44
msgid "Mount Point"
msgstr "Punto de montaje"
@@ -562,23 +570,23 @@
msgid "Name"
msgstr "Nombre"
-#: FrmNetConf.class:179 MdlCore.module:462
+#: FrmNetConf.class:233 MdlCore.module:484
msgid "Network Configuration"
msgstr "Configuración de red"
-#: FrmNetConf.class:58
+#: FrmNetConf.class:70
msgid "Network Interfaces"
msgstr "Dispositivos de red"
-#: FMain.class:514
+#: FMain.class:630
msgid "Next"
msgstr "Siguiente"
-#: FMain.class:320
+#: FMain.class:348
msgid "No"
msgstr "No"
-#: FrmSelISO.class:30 MdlCore.module:198
+#: FrmSelISO.class:30 MdlCore.module:220
msgid "No Installable Media Found"
msgstr "No se encontró ningún medio instalable"
@@ -590,15 +598,11 @@
msgid "No installable images found."
msgstr "No se encontró ninguna imagen que se pueda instalar"
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No estoy de acuerdo"
-
-#: FrmSummary.class:90 MdlNetConf.module:220
+#: FrmSummary.class:91 MdlNetConf.module:220
msgid "None"
msgstr "Ninguno"
-#: FrmSummary.class:49 MdlInstallSys.module:142 MdlPartSel.module:143
+#: FrmSummary.class:50 MdlInstallSys.module:142 MdlPartSel.module:143
msgid "Not Used"
msgstr "Sin usar"
@@ -626,7 +630,11 @@
msgid "PARTITIONING LAYOUT"
msgstr "Diseño del particionado"
-#: FrmSummary.class:164
+#: FrmPkgSel.class:40
+msgid "Package"
+msgstr ""
+
+#: FrmSummary.class:165 FrmUsrPkgSel.class:16
msgid "Package Name"
msgstr "Nombre del paquete"
@@ -634,11 +642,11 @@
msgid "Packages have been installed in your system. Please click"
msgstr "Los paquetes han sido instalados en tu sistema. Por favor haga
click"
-#: FrmSummary.class:37
+#: FrmSummary.class:38
msgid "Partition"
msgstr "Partición"
-#: FrmSummary.class:253
+#: FrmSummary.class:287
msgid "Partition Selection Scheme"
msgstr "Selección del esquema de particionado"
@@ -646,7 +654,7 @@
msgid "Passwords do not match"
msgstr "Las contraseñas no coinciden "
-#: FMain.class:305
+#: FMain.class:333
msgid "Passwords do not match. Please enter the same password twice"
msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña "
@@ -654,7 +662,7 @@
msgid "Passwords do not match. Please enter the same password twice for
accuracy."
msgstr "Las contraseñas no coinciden. Por favor ingrese la misma
contraseña dos veces para estar seguros de que es la que Usted
verdaderamente desea."
-#: FMain.class:279
+#: FMain.class:307
msgid "Please select a default operating system to boot before proceeding"
msgstr "Por favor selectione el sistema operativo que se iniciara por
defecto"
@@ -666,15 +674,23 @@
msgid "Please select the partitions you wish to use and how to use them"
msgstr "For favor, seleccione las secciones del disco que desea usar, y
también como usarlas"
+#: FMain.class:366
+msgid "Please specify a hostname for this computer"
+msgstr ""
+
+#: FMain.class:370
+msgid "Please specify the domain this computer belongs to"
+msgstr ""
+
#: FrmAlsaConf.class:36
msgid "Please use the setup program below to setup the sound system."
msgstr "Pro favo utiliza el siguiente software para configurar el sistema
de sonido. "
-#: FMain.class:213
+#: FMain.class:238
msgid "Please wait while setup analyses your current partition setup."
msgstr "Por favor espere mientras el instalador analiza su particonado
actual."
-#: FMain.class:211
+#: FMain.class:236
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr "Por favor espere, el instalador intentará ejecutar la herramienta
de particionado"
@@ -682,15 +698,15 @@
msgid "Plugged-in"
msgstr "Conectado"
-#: MdlCore.module:447
+#: MdlCore.module:469
msgid "Preparation"
msgstr "Preparación"
-#: MdlSetup.module:245
+#: MdlSetup.module:260
msgid "Preparing filesystems"
msgstr "Preparando sistemas de archivos"
-#: FrmNetConf.class:153
+#: FrmNetConf.class:207
msgid "Primary DNS Server"
msgstr "Servidor de nombres primario (DNS)"
@@ -698,11 +714,7 @@
msgid "Probe hardware to setup your Graphical Environment using your
preffered settings"
msgstr "Testear tu hardware para configurar tu Entorno Gráfico con tus
configuraciones predefinidas "
-#: FMain.class:494
-msgid "Process Overview"
-msgstr "Resumen del proceso"
-
-#: FrmLilo.class:254
+#: FrmLilo.class:255
msgid "Prompt Timeout"
msgstr "Esperar"
@@ -718,11 +730,11 @@
msgid "Real Name"
msgstr "Nombre Real"
-#: MdlCore.module:459
+#: MdlCore.module:481
msgid "Regional Settings"
msgstr "Opciones de regionalización"
-#: FMain.class:177 FrmDone.class:28
+#: FMain.class:188 FrmDone.class:28
msgid "Restart"
msgstr "Reiniciar"
@@ -734,7 +746,7 @@
msgid "STATUS:"
msgstr "Estado Actual:"
-#: MdlCore.module:182
+#: MdlCore.module:204
msgid "Scanning system for installable media. Please wait ..."
msgstr "Buscando medios de instalación en el sistema. Por favor espere ..."
@@ -746,11 +758,11 @@
msgid "Search Again"
msgstr "Buscar nuevamente"
-#: FrmNetConf.class:166
+#: FrmNetConf.class:220
msgid "Secondary DNS Server"
msgstr "Servidor de nombres (DNS) secundario"
-#: FrmLilo.class:265
+#: FrmLilo.class:266
msgid "Seconds"
msgstr "Segundos"
@@ -758,10 +770,14 @@
msgid "Select"
msgstr "Seleciona"
-#: FMain.class:280
+#: FMain.class:308
msgid "Select an entry from this list"
msgstr "Seleccione una de esta opciones"
+#: FrmSelISO.class:82
+msgid "Select installation media from the list below"
+msgstr ""
+
#: FrmUserAdd.class:311
msgid "Select picture for user Login"
msgstr "Selecciona una imagen para el usuario"
@@ -802,7 +818,7 @@
msgid "Setup Mode"
msgstr "Modo de configuración"
-#: MdlCore.module:366
+#: MdlCore.module:388
msgid "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
msgstr "El instalador no puede encontrar SETUP.CONF en el medio de
instalación. Eso puede ser síntoma de una mala grabación de la ISO"
@@ -810,7 +826,7 @@
msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
msgstr "El programa de instalación no pudo ejecutar Gparted en tu sistema.
Esto puede ser señal de"
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
msgstr "El instalador no ha podido encontrar ningún medio instalable en tu
sistema. Por favor inserta Vectorlinux"
@@ -818,19 +834,19 @@
msgid "Several windows found. I will take the first one!"
msgstr "Se han encontrado varios windows. Cogeré el primero!"
-#: FrmSummary.class:39
+#: FrmPkgSel.class:42 FrmSummary.class:40 FrmUsrPkgSel.class:19
msgid "Size"
msgstr "Tamano"
-#: FMain.class:291
+#: FMain.class:319
msgid "Skipping lilo setup"
msgstr "Salteando configuración de LILO"
-#: FrmSummary.class:263 MdlCore.module:451
+#: FrmSummary.class:297 FrmUsrPkgSel.class:135 MdlCore.module:473
msgid "Software Selection"
msgstr "Selección de software"
-#: FrmLilo.class:132
+#: FrmLilo.class:133
msgid "Standard"
msgstr "Estandar"
@@ -842,7 +858,7 @@
msgid "Subnet Mask"
msgstr "Máscara de subred"
-#: FrmRootPass.class:118 MdlCore.module:460
+#: FrmRootPass.class:118 MdlCore.module:482
msgid "System Administrator"
msgstr "Administrador del sistema"
@@ -850,22 +866,18 @@
msgid "System Administrator Password"
msgstr "Contraseña del administrador del sistema"
-#: MdlCore.module:457
+#: MdlCore.module:479
msgid "System Configuration"
msgstr "Configurar el sistema"
-#: FrmLilo.class:217 FrmNetConf.class:141
+#: FrmLilo.class:218 FrmNetConf.class:195
msgid "Tab 0"
msgstr "-"
-#: FrmLilo.class:235
+#: FrmLilo.class:236
msgid "Target"
msgstr "-"
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
-
#: FrmSummaryOld.class:87
msgid "TextLabel1"
msgstr "-"
@@ -878,7 +890,7 @@
msgid "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
msgstr "La cuenta root en los sistemas Linux está diseñada como la cuenta
del administrador del sistema. Es utilizada para realizar tareas de
mantenimiento del sistema globales, tales como actualizaciones de software,
gestionar los permisos o crear nuevos usuarios, etc. \n\nLa mayoría de las
otras operaciones no requieren privilegios de administrador.\nLa contraseña
para el usuario root deberá ser ingresada dos veces para asegurar que es la
contraseña deseada. Al elegir la contraseña de administrador, piensa en
algo fácil de recordar, pero al mismo tiempo difícil de adivinar para los
otros. "
-#: MdlInstallCustom.module:44
+#: MdlInstallCustom.module:46
msgid "There as been an error while installing required system software. "
msgstr "Ha ocurrido un error durante la instalación del software base. "
@@ -886,11 +898,11 @@
msgid "There has been an error extracting"
msgstr "Ha ourrido un error en la extracción"
-#: MdlInstallCustom.module:60
+#: MdlInstallCustom.module:63
msgid "There has been an error while installing optional software to your
system."
msgstr "Ha ocurrido un error mientras se instalaba el software opcional."
-#: MdlInstallCustom.module:52
+#: MdlInstallCustom.module:54
msgid "There has been an error while installing optional software to your
system. "
msgstr "Ha ocurrido un error durante la instalación del software
opcional. "
@@ -898,7 +910,7 @@
msgid "There has been an error while trying to format "
msgstr "Ha ocurrido un error mientras se intentaba formatear la partición."
-#: FMain.class:213
+#: FMain.class:238
msgid "This may take a while ..."
msgstr "Esto puede tardar unos minutos ..."
@@ -962,11 +974,19 @@
msgid "Total Progress"
msgstr "Progreso Total"
-#: MdlInstallCustom.module:507
+#: MdlInstallCustom.module:627
+msgid "Total bulks to be installed = "
+msgstr ""
+
+#: MdlInstallCustom.module:624
msgid "Total packages to be installed = "
msgstr "Paquetes a instalar = "
-#: FrmInstallSys.class:194
+#: MdlInstallCustom.module:630
+msgid "Total pkgs to be installed = "
+msgstr ""
+
+#: FrmInstallSys.class:239
msgid "Total progress"
msgstr "Progreso Total"
@@ -974,7 +994,7 @@
msgid "Typically, you want to use the largest partition for this."
msgstr "Normalmente querrías utilizar tu partición más grande para esto."
-#: FrmSummary.class:190
+#: FrmSummary.class:201
msgid "USER-SELECTED PACKAGES"
msgstr "PAQUETES INDIVIDUALES"
@@ -986,7 +1006,7 @@
msgid "Unable to identify distro."
msgstr "No se pudo detectar la distribución."
-#: MdlInstallCustom.module:88
+#: MdlInstallCustom.module:91
msgid "Unable to install kernels. "
msgstr "No se pudieron instalar los kernels. "
@@ -1022,7 +1042,7 @@
msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
msgstr "Utilizada para almacenar los ficheros del usuario, documentos,
imágenes, videos, etc. Puedes asignar tanto espacio como desees"
-#: MdlCore.module:461
+#: MdlCore.module:483
msgid "User Accounts"
msgstr "Usuarios"
@@ -1058,11 +1078,11 @@
msgid "VectorLinux is unable to determine the type of hard disks on your
system."
msgstr "El instalador no ha podido determinar el tipo de disco duro en tu
sistema."
-#: FMain.class:343
+#: FMain.class:383
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FrmInstallSys.class:181
+#: FrmInstallSys.class:192
msgid "Vectorlinux is currently being installed to your system... Please
wait"
msgstr "Por favor espere mientras VectorLinux se instala en su sistema"
@@ -1074,7 +1094,7 @@
msgid "Vectorlinux is now installed in your system. Please click"
msgstr "VectorLinux ha sido instalado e tu sistema. Por favor presiona"
-#: MdlInstallCustom.module:99
+#: MdlInstallCustom.module:102
msgid "Vectorlinux is now installed in your system. Please click next to
configure it."
msgstr "Vectorlinux se ha instalado en tu ordenador. Por favor, clica
next para configurarlo."
@@ -1090,7 +1110,7 @@
msgid "Video Driver"
msgstr ""
-#: FrmLilo.class:241
+#: FrmLilo.class:242
msgid "Video Resolution"
msgstr "Resolucion de pantalla"
@@ -1110,7 +1130,7 @@
msgid "Wireless"
msgstr "Inalámbrico"
-#: FMain.class:320
+#: FMain.class:348
msgid "Would you like to continue anyway?"
msgstr ""
@@ -1122,23 +1142,19 @@
msgid "Writing new /etc/fstab to system"
msgstr "Escribiendo el nuevo /etc/fstab en el sistema"
-#: FMain.class:320
+#: FMain.class:348
msgid "Yes"
msgstr "Sí"
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "De acuerdo"
-
-#: FMain.class:320
+#: FMain.class:348
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:227
+#: FMain.class:252
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr "Debes seleccionar una partición para \"/\" (raíz). Allí sera
instalado el sistema operativo"
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "Your computer needs to be restarted so that you can use your new
operating system. Click"
msgstr ""
@@ -1146,8 +1162,8 @@
msgid "Your password selections do not match. Please enter the same
password twice"
msgstr "Sus contraseñas no coinciden. Por favor ingrese la misma
contraseña dos veces."
-#: FMain.class:343
-msgid "Your screen may flicker or go blank during this process for a few
seconds during this process."
+#: FMain.class:383
+msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
#: MdlDiskPart.module:90
@@ -1170,6 +1186,10 @@
msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
msgstr "simplemente seleccionando un valor para \"/\" en esta pantalla. El
resto es opcional. Lo siguiente es un"
+#: MdlInstallCustom.module:734
+msgid "failed to install. Installation will stop now"
+msgstr ""
+
#: FrmLilo.class:35
msgid "for each one of them by clicking on each tab. To proceed with the
default pre-set values, simply click"
msgstr "para cada uno de ellos seleccionando cada pestaña. Para continuar
con los valores seleccionados por defecto simplemente haz click en "
@@ -1182,7 +1202,7 @@
msgid "for this is"
msgstr "para esto es"
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "has been installed to your system. Your new system has been
configured with the default factory settings."
msgstr ""
@@ -1190,7 +1210,7 @@
msgid "in case you wish to."
msgstr "en caso que lo desees."
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "installation CD and click "
msgstr "CD de instalación y haz click en"
@@ -1202,7 +1222,7 @@
msgid "localtime-copied-from"
msgstr "Hora-local-copiada-de"
-#: MdlInstallCustom.module:100
+#: MdlInstallCustom.module:103
msgid "packages have been Installed. Please click next to move on to
System Configuration."
msgstr "paquetes han sido instalados. Por favor presiona Siguiente para
configurar el sistema."
@@ -1226,19 +1246,19 @@
msgid "to configure it."
msgstr "para configurarla."
-#: FMain.class:320
+#: FMain.class:348
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "to restart your computer at a later time"
msgstr ""
-#: FrmDone.class:38
+#: FrmDone.class:39
msgid "to restart your computer now or click"
msgstr ""
-#: MdlCore.module:200
+#: MdlCore.module:222
msgid "to try again"
msgstr "para intentarlo nuevamente...
[truncated message content] |
|
From: <cod...@go...> - 2008-11-10 21:21:35
|
Author: uelsk8s
Date: Mon Nov 10 13:19:57 2008
New Revision: 277
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/ClsGlobal.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
reworked progress bars
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /root/gui-installer2/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /root/gui-installer2/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /root/gui-installer2/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /root/gui-installer2/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /root/gui-installer2/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /root/gui-installer2/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /root/gui-installer2/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /root/gui-installer2/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /root/gui-installer2/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /root/gui-installer2/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /root/gui-installer2/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /root/gui-installer2/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /root/gui-installer2/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /root/gui-installer2/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /root/gui-installer2/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /root/gui-installer2/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /root/gui-installer2/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /root/gui-installer2/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /root/gui-installer2/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Mon Nov 10 13:19:57 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /root/gui-installer2/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 10 13:19:57 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.154
+Version=0.0.155
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/ClsGlobal.class
==============================================================================
--- branches/iVL/ClsGlobal.class (original)
+++ branches/iVL/ClsGlobal.class Mon Nov 10 13:19:57 2008
@@ -24,6 +24,8 @@
STATIC PUBLIC iRootMax AS Integer = 40000
STATIC PUBLIC iHomeMin AS Integer = 500
STATIC PUBLIC iSwapMin AS Integer = 64
+STATIC PUBLIC iPkgCnt AS Integer = 0
+STATIC PUBLIC iBulkCnt AS Integer = 0
STATIC PUBLIC sRootMnt AS String
STATIC PUBLIC sHomeMnt AS String
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Mon Nov 10 13:19:57 2008
@@ -553,6 +553,8 @@
ELSE
i = i + 1
END IF
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = i
'Message.Info(i & " from required bulks")
'RETURN
'count required packages in
@@ -562,6 +564,8 @@
sOutput = Trim(sOutput)
sOutArr = Split(sOutput, ",")
i = i + sOutArr.Count
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = sOutArr.Count
'Message(i & " from packages/required")
'Count CONF packages in
sOutArr.Clear
@@ -571,8 +575,12 @@
IF InStr(sOutput, "\n") > 0 THEN
sOutArr = Split(sOutput, "\n")
i = i + sOutArr.Count
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + sOutArr.Count
ELSE
- i = i + 1
+ i = i + 1
+ 'add config bulks to ClsGlobal.iPkgCnt cause they are small and at the
end
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 1
END IF
'Count user-selected stuff in
@@ -581,6 +589,8 @@
INC ii
UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
i = i + irs
+ 'add bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + irs
' ' ' ' 'we will need to cycle through the arrays for th is for
accuracy...
@@ -607,11 +617,19 @@
' ' ' ' ' ' '
' NEXT
i = i + irs ' the count to the total
- 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
+ 'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
+ 'add pkgs TO ClsGlobal.iPkgCnt
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs
iPkgCnt = i
PRINT ("Total packages to be installed = ") & i
fPbInc = 1 / iPkgCnt
+ PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every package installed"
+ PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
+ fPbInc = 0.6 / ClsGlobal.iBulkCnt
PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every bulk installed"
+ PRINT ("Total pkgs to be installed = ") & ClsGlobal.iPkgCnt
+ fPbInc = 0.4 / ClsGlobal.iPkgCnt
+ PRINT "The total progrssbar will work in increments of " & fPbInc & " on
every pkg installed"
END
@@ -706,7 +724,7 @@
FrmInstallSys.tlCurrPkg.Text = Trim(sDesc)
IF vSize <> "" THEN
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
- MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize)
+ MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize, iPkgNum)
FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (fPbInc - (fPbInc *
FrmInstallSys.pbInstallProg.Value)) / 100)
END IF
@@ -756,7 +774,7 @@
' do the progress bar updating here
IF vSize <> "" THEN
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
- MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, CInt(vSize))
+ MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, CInt(vSize), iPkgNum)
END IF
UNTIL
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Mon Nov 10 13:19:57 2008
@@ -405,7 +405,7 @@
REPEAT
WAIT 1
' update progress here
- ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vPgsSize))
+ ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vPgsSize), iPkgNum)
UNTIL
hproc.State = Process.Stopped
END IF
@@ -476,7 +476,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vBulkSize))
+ ME.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vBulkSize), iPkgNum)
UNTIL
hproc.State = Process.Stopped
@@ -607,7 +607,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- UPDATE_STEP_PROGRESS(sTargetSize, sPakSize)
+ UPDATE_STEP_PROGRESS(sTargetSize, sPakSize,
iPkgNum)
UNTIL
hproc.State = Process.Stopped
' error check
@@ -635,7 +635,7 @@
END
-PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float)
+PUBLIC SUB UPDATE_STEP_PROGRESS(sTargetSize AS Float, sPakSize AS Float,
iCurrPkg AS Integer)
DIM iMBProgress AS Float
DIM ipct AS Float
@@ -644,7 +644,9 @@
DIM iVal AS Float
DIM iProgress AS Float
DIM iCurrSize AS Variant
-
+ DIM fcur, fRet AS Float
+ DIM fbulk AS Float = 0.6
+
SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & " ) && echo $gsize
| cut -f3 -d \' \'" TO iCurrSize
iCurrSize = Trim(CStr(iCurrSize))
iProgress = CInt(iCurrSize - sTargetSize)
@@ -663,6 +665,12 @@
ENDIF
IF iVal > FrmInstallSys.pbInstallProg.Value THEN
FrmInstallSys.pbInstallProg.Value = iVal
+ IF iCurrPkg <= ClsGlobal.iBulkCnt THEN
+ fcur = fbulk / ClsGlobal.iBulkCnt
+ fRet = (iCurrPkg - 1) * fcur
+ fRet = Round(fRet, -2)
+ FrmInstallSys.pbInstallProg2.Value = ((iVal * fcur) + fRet)
+ ENDIF
END IF
'PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &
iVal & "%"
@@ -710,7 +718,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 1
- UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize)
+ UPDATE_STEP_PROGRESS(sTargetSize, iTlzSize, iPkgNum)
' figure out the progress again
@@ -838,7 +846,7 @@
IF hproc.State = Process.Running THEN
REPEAT
WAIT 2
- ME.UPDATE_STEP_PROGRESS(itgtsize, sLinArr[1])
+ ME.UPDATE_STEP_PROGRESS(itgtsize, sLinArr[1],
iPkgNum)
UNTIL
hproc.State = Process.Stopped
END IF
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Nov 10 13:19:57 2008
@@ -148,12 +148,27 @@
PUBLIC FUNCTION UPDATE_OVERALL_PROGRESS(iTotalPkgs AS Integer, iCurrPkg AS
Integer) AS Float
DIM fRet AS Float
+ DIM fcur AS Float
+ DIM fpkg AS Float = 0.4
+ DIM fbulk AS Float = 0.6
+ DIM iCPkg AS Integer
IF iTotalPkgs = 0 THEN
iTotalPkgs = 30
ENDIF
- fRet = iCurrPkg / iTotalPkgs
- fRet = Round(fRet, -2)
+ 'fRet = iCurrPkg / iTotalPkgs
+ 'fRet = Round(fRet, -2)
+ IF iCurrPkg <= ClsGlobal.iBulkCnt THEN
+ fcur = fbulk / ClsGlobal.iBulkCnt
+ fRet = iCurrPkg * fcur
+ fRet = Round(fRet, -2)
+ ELSE
+ fcur = fpkg / ClsGlobal.iPkgCnt
+ iCPkg = iCurrPkg - ClsGlobal.iBulkCnt
+ fRet = iCPkg * fcur
+ fRet = Round(fRet, -2)
+ fRet = fRet + 0.6
+ ENDIF
RETURN fRet
END
|
|
From: <cod...@go...> - 2008-11-10 21:05:33
|
Author: M0E.lnx
Date: Mon Nov 10 13:04:53 2008
New Revision: 276
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
branches/iVL/FMain.form
Log:
Fixed bug in rearranging objects all over FMain. Navigation buttons are now
spread out across the right panel
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 10 13:04:53 2008
@@ -14,91 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:185
+#: FMain.class:188
msgid "Restart"
msgstr ""
-#: FMain.class:233
+#: FMain.class:236
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:235
+#: FMain.class:238
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:235
+#: FMain.class:238
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:249
+#: FMain.class:252
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:304
+#: FMain.class:307
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:305
+#: FMain.class:308
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:316
+#: FMain.class:319
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:330
+#: FMain.class:333
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:345
+#: FMain.class:348
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:345
+#: FMain.class:348
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:345
+#: FMain.class:348
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:345
+#: FMain.class:348
msgid "Yes"
msgstr ""
-#: FMain.class:345
+#: FMain.class:348
msgid "No"
msgstr ""
-#: FMain.class:363
+#: FMain.class:366
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:367
+#: FMain.class:370
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:380
+#: FMain.class:383
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:380
+#: FMain.class:383
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:588
+#: FMain.class:601
msgid "Back"
msgstr ""
-#: FMain.class:594
+#: FMain.class:613
msgid "Exit Installation"
msgstr ""
-#: FMain.class:600
+#: FMain.class:625
msgid "Next"
msgstr ""
-#: FMain.class:610
+#: FMain.class:639
msgid "Button1"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 10 13:04:53 2008
@@ -135,6 +135,9 @@
'ME.pnlWinHost.Resize(ME.ClientWidth - ME.Frame1.Width - (ME.Frame1.left *
8), ME.ClientH - ME.tlBanner.Height - (ME.btback.Height * 8))
WITH ME
.tlBanner.width = ME.width
+ '.btback.Move(.HBox1.Left, .HBox1.top,
MdlObjSizer.get_object_width(.btback.Text) + 36)
+ '.btnext.Move(.HBox1.Width - .btback.Width - 24, .btback.top,
MdlObjSizer.get_object_width(.btnext.Text) + 36)
+
'.Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth *1.7, .ClientHeight - .PictureBox1.Height * 1.5)
''''.Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth + 90, .ClientHeight - .PictureBox1.Height * 1.5)
'.Frame1.Move(4, .PictureBox1.top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.60, .ClientHeight - tlBanner.Height -
(.btback.Height * 2))
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Mon Nov 10 13:04:53 2008
@@ -25,6 +25,7 @@
Arrangement = Arrange.Horizontal
{ SidePanel1 SidePanel
MoveScaled(1,1,26,63)
+ Background = Color.Background
Arrangement = Arrange.Vertical
Orientation = Align.Left
{ tvPlan TreeView
@@ -32,6 +33,9 @@
Expand = True
Mode = Select.None
}
+ { HBox2 HBox
+ MoveScaled(1,56,72,6.8571)
+ }
}
{ PnlRight Panel
MoveScaled(31,4,57,48)
@@ -42,23 +46,37 @@
MoveScaled(5,2,30,26)
Expand = True
}
- { ToolBar1 ToolBar
- MoveScaled(1,44,56,3)
+ { HBox1 HBox
+ MoveScaled(2,43,53,3)
{ btback Button
MoveScaled(0,0,8,3)
+ Expand = True
Text = ("Back")
Picture = Picture["icon:/16/left"]
}
+ { Panel3 Panel
+ MoveScaled(10,1,4,2)
+ Expand = True
+ }
{ btQuit Button
MoveScaled(16,0,15,3)
+ Expand = True
Text = ("Exit Installation")
Picture = Picture["icon:/16/cancel"]
}
+ { Panel4 Panel
+ MoveScaled(33,0,6,2)
+ Expand = True
+ }
{ btnext Button
- MoveScaled(37,0,8,3)
+ MoveScaled(44,0,8,3)
+ Expand = True
Text = ("Next")
Picture = Picture["icon:/16/right"]
}
+ }
+ { HBox3 HBox
+ MoveScaled(7,46,12,2)
}
}
}
|
|
From: <cod...@go...> - 2008-11-10 19:50:54
|
Author: M0E.lnx
Date: Mon Nov 10 11:49:39 2008
New Revision: 275
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FMain.form
Log:
- Changed method of displaying the left panel.
It is now resizable and can be completely hidden.
This allows more room on the right panel for smaller
screen resolutions.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 10 11:49:39 2008
@@ -86,23 +86,19 @@
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:541
-msgid "Next"
-msgstr ""
-
-#: FMain.class:547
+#: FMain.class:588
msgid "Back"
msgstr ""
-#: FMain.class:553
+#: FMain.class:594
msgid "Exit Installation"
msgstr ""
-#: FMain.class:569
-msgid "Button1"
+#: FMain.class:600
+msgid "Next"
msgstr ""
-#: FMain.class:575
-msgid "Process Overview"
+#: FMain.class:610
+msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 10 11:49:39 2008
@@ -66,15 +66,15 @@
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:270
+#: FrmSummary.class:277
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:280
+#: FrmSummary.class:287
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:290
+#: FrmSummary.class:297
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Mon Nov 10 11:49:39 2008
@@ -1,3 +1,4 @@
-- Fixed bug in netconf
- Was not setting /etc/HOSTNAME
-- Fixed reverse navigation on package selection window.
+- Changed method of displaying the left panel.
+ It is now resizable and can be completely hidden.
+ This allows more room on the right panel for smaller
+ screen resolutions.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 10 11:49:39 2008
@@ -74,7 +74,7 @@
WITH ME
.btback.Enabled = FALSE
.btback.ForeColor = Color.Gray
- .Frame1.BackColor = Color.Transparent
+' .Frame1.BackColor = Color.Transparent
.tvPlan.BackColor = Color.transparent
.tlBanner.Height = .PictureBox1.Height
'.tvPlan.Width = MdlCore.iLeftWidth
@@ -136,15 +136,15 @@
WITH ME
.tlBanner.width = ME.width
'.Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth *1.7, .ClientHeight - .PictureBox1.Height * 1.5)
- .Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth + 90, .ClientHeight - .PictureBox1.Height * 1.5)
+ ''''.Frame1.Move(4, .PictureBox1.Top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth + 90, .ClientHeight - .PictureBox1.Height * 1.5)
'.Frame1.Move(4, .PictureBox1.top + .PictureBox1.Height + 4,
MdlCore.iLeftWidth * 1.60, .ClientHeight - tlBanner.Height -
(.btback.Height * 2))
'.Frame1.Resize(MdlCore.iLeftWidth * 1.60, .ClientHeight -
tlBanner.Height - (.btback.Height * 1.5))
- .tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS WILL
LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
+ ''''.tvPlan.Move(4, 24, .Frame1.Width - 8, .Frame1.Height - 28) ' THIS
WILL LEAVE 16PIX ON TOP AND BOTTOM AND 2 ON LEFT AND RIGHT
'.tvPlan.Move(4, 24, .Frame1.Width - 8, Frame1.Height -
(.Frame1.Height / 20))
'.pnlWinHost.Move(.Frame1.left + .Frame1.Width + 4, .Frame1.top +
(.tlBanner.Height / 2), .tlBanner.Width - (.Frame1.Width +
8), .ClientHeight - (.tlbanner.height + (.btback.height * 3.5)))
- .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3)))
- .btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
+''' .pnlWinHost.Move(.Frame1.left + .Frame1.Width +
4, .Frame1.Top, .tlBanner.Width - (.Frame1.Width + 8), .ClientHeight -
(.tlBanner.Height + (.btback.Height * 3)))
+''' .btback.Move(.pnlWinHost.Left, .Frame1.top + .Frame1.Height
- .btback.Height, MdlObjSizer.get_object_width(.btback.text) + 36)
.btnext.Move(.pnlWinHost.Left + .pnlWinHost.Width - (.btnext.Width +
8), .btback.Top, MdlObjSizer.get_object_width(.btnext.text) + 36)
' for the quit button, it'll get a little tricky
' we want that one right in the middle
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Mon Nov 10 11:49:39 2008
@@ -3,48 +3,68 @@
{ Form Form
MoveScaled(0,0,100,75)
Text = ("")
- { tlBanner TextLabel
- MoveScaled(0,0,26,7)
- Font = Font["+6"]
- Background = Color.SelectedBackground
- Foreground = Color.SelectedForeground
- Text = ("")
- Alignment = Align.Center
- }
- { btnext Button
- MoveScaled(56,67,8,3)
- Text = ("Next")
- Picture = Picture["icon:/16/right"]
- }
- { btback Button
- MoveScaled(28,67,8,3)
- Text = ("Back")
- Picture = Picture["icon:/16/left"]
- }
- { btQuit Button
- MoveScaled(38,67,15,3)
- Text = ("Exit Installation")
- Picture = Picture["icon:/16/cancel"]
- }
- { PictureBox1 PictureBox
- MoveScaled(36,1,54,8)
- Stretch = True
+ Arrangement = Arrange.Vertical
+ { Panel1 Panel
+ MoveScaled(6,1,88,8)
+ { tlBanner TextLabel
+ MoveScaled(0,0,26,7)
+ Font = Font["+6"]
+ Background = Color.SelectedBackground
+ Foreground = Color.SelectedForeground
+ Text = ("")
+ Alignment = Align.Center
+ }
+ { PictureBox1 PictureBox
+ MoveScaled(24,0,54,8)
+ Stretch = True
+ }
}
- { pnlwinhost Workspace
- MoveScaled(27,10,70,55)
+ { Panel2 Panel
+ MoveScaled(3,9,94,60)
+ Expand = True
+ Arrangement = Arrange.Horizontal
+ { SidePanel1 SidePanel
+ MoveScaled(1,1,26,63)
+ Arrangement = Arrange.Vertical
+ Orientation = Align.Left
+ { tvPlan TreeView
+ MoveScaled(1,0,23,56)
+ Expand = True
+ Mode = Select.None
+ }
+ }
+ { PnlRight Panel
+ MoveScaled(31,4,57,48)
+ Expand = True
+ Arrangement = Arrange.Vertical
+ Border = Border.Etched
+ { pnlwinhost Workspace
+ MoveScaled(5,2,30,26)
+ Expand = True
+ }
+ { ToolBar1 ToolBar
+ MoveScaled(1,44,56,3)
+ { btback Button
+ MoveScaled(0,0,8,3)
+ Text = ("Back")
+ Picture = Picture["icon:/16/left"]
+ }
+ { btQuit Button
+ MoveScaled(16,0,15,3)
+ Text = ("Exit Installation")
+ Picture = Picture["icon:/16/cancel"]
+ }
+ { btnext Button
+ MoveScaled(37,0,8,3)
+ Text = ("Next")
+ Picture = Picture["icon:/16/right"]
+ }
+ }
+ }
}
{ Button1 Button
- MoveScaled(16,71,10,2)
+ MoveScaled(4,71,10,2)
Visible = False
Text = ("Button1")
- }
- { Frame1 Frame
- MoveScaled(0,7,25,62)
- Text = ("Process Overview")
- { tvPlan TreeView
- MoveScaled(2,3,22,56)
- Expand = True
- Border = False
- }
}
}
|
|
From: <cod...@go...> - 2008-11-10 18:43:23
|
Author: uelsk8s
Date: Mon Nov 10 10:42:20 2008
New Revision: 274
Modified:
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmUserAdd.class
branches/iVL/installer.gambas
Log:
fixed permissions on gdm user pic
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Mon Nov 10 10:42:20 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.142
+Version=0.0.154
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Mon Nov 10 10:42:20 2008
@@ -184,7 +184,7 @@
IF LAST.TEXT = ("Restart") THEN
'EXEC "shutdown", "-r", " now"
- EXEC ["shutdown", "-r", "now"]
+ EXEC ["init", "6"]
ELSE
IF FrmLangSel.Visible = TRUE THEN
@@ -386,7 +386,9 @@
CASE "FrmDone"
'offer to reboot here
-
+ SHELL ["sed", "-i", "'/^$/d'", "/root/gui.log"] WAIT
+ SHELL ["sed", "-i", "'/^(installer/d'", "/root/gui.log"] WAIT
+ COPY "/root/gui.log" TO "/mnt/target/var/log/setup/gui.log"
ME.END_INSTALLER()
'frmNext = FrmAlsaConf
' frmNext = FrmLilo ' this is already done
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Mon Nov 10 10:42:20 2008
@@ -107,19 +107,7 @@
RETURN
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
-
- 'IF IsDir(sPicdir) THEN
- IF bUsePic.Value = TRUE THEN
- 'SHELL "cd " & sPicdir & " && ln -s root1.png
root.face.icon" ' This needs to go somewhere else
-
- 'SHELL "cd " & sPicdir & " ; ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
- 'this next line is for kdm
- SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
- 'this next line is for gdm
- SHELL "cd /mnt/target/home/" & tbUsername.Text & "; cp " &
Replace(tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & ".face" WAIT
-
- ENDIF
-
+
'COMPILE LIST OF GROUPS THIS USER WILL BELONG TO
FOR EACH cb IN MdlUsrAdd.objGrps
IF cb.Value = TRUE THEN
@@ -128,11 +116,7 @@
NEXT
sGroups = Right(sGroups, Len(sGroups) - 1)
'Message(sGroups)
-
-
-
-
- ' need to do some binding for this to work
+ 'need to do some binding for this to work
'PRINT "Mounting system locations with bind options"
'SHELL "mount -o bind /sys /mnt/target/sys" WAIT
'SHELL "mount -o bind /tmp /mnt/target/tmp" WAIT
@@ -156,6 +140,20 @@
'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
+ 'IF IsDir(sPicdir) THEN
+ IF bUsePic.Value = TRUE THEN
+ 'SHELL "cd " & sPicdir & " && ln -s root1.png
root.face.icon" ' This needs to go somewhere else
+ 'SHELL "cd " & sPicdir & " ; ln -s default3.png " &
ME.tbUsername.Text & ".face.icon"
+ 'this next line is for kdm
+ SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
+ 'the next lines are for gdm
+ PRINT tbPicPath.Text
+ 'SHELL "cp " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
+ COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home" &/
tbUsername.text &/ ".face"
+ SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
+ ENDIF
Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("was created."))
btClrFrm_Click() ' clear the form
INC iUID
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-10 16:37:24
|
Author: M0E.lnx
Date: Mon Nov 10 08:36:30 2008
New Revision: 273
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/DevLog
branches/iVL/FMain.form
branches/iVL/FrmDone.class
branches/iVL/FrmSummary.class
branches/iVL/MdlNetConf.module
Log:
- Fixed bug in netconf
Was not setting /etc/HOSTNAME
- Fixed reverse navigation on package selection window.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Mon Nov 10 08:36:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -70,39 +70,39 @@
msgid "No"
msgstr ""
-#: FMain.class:362
+#: FMain.class:363
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:366
+#: FMain.class:367
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:379
+#: FMain.class:380
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:379
+#: FMain.class:380
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:531
-msgid "Process Overview"
-msgstr ""
-
-#: FMain.class:551
+#: FMain.class:541
msgid "Next"
msgstr ""
-#: FMain.class:557
+#: FMain.class:547
msgid "Back"
msgstr ""
-#: FMain.class:563
+#: FMain.class:553
msgid "Exit Installation"
msgstr ""
-#: FMain.class:579
+#: FMain.class:569
msgid "Button1"
+msgstr ""
+
+#: FMain.class:575
+msgid "Process Overview"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 10 08:36:30 2008
@@ -18,63 +18,63 @@
msgid "Installation Summary"
msgstr ""
-#: FrmSummary.class:16
+#: FrmSummary.class:17
msgid "Custom"
msgstr ""
-#: FrmSummary.class:20
+#: FrmSummary.class:21
msgid "Full"
msgstr ""
-#: FrmSummary.class:37
+#: FrmSummary.class:38
msgid "Partition"
msgstr ""
-#: FrmSummary.class:39
+#: FrmSummary.class:40
msgid "Size"
msgstr ""
-#: FrmSummary.class:41
+#: FrmSummary.class:42
msgid "Filesystem"
msgstr ""
-#: FrmSummary.class:43
+#: FrmSummary.class:44
msgid "Mount Point"
msgstr ""
-#: FrmSummary.class:49
+#: FrmSummary.class:50
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:90
+#: FrmSummary.class:91
msgid "None"
msgstr ""
-#: FrmSummary.class:112
+#: FrmSummary.class:113
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:164
+#: FrmSummary.class:165
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:173
+#: FrmSummary.class:174
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:200
+#: FrmSummary.class:201
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:269
+#: FrmSummary.class:270
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:279
+#: FrmSummary.class:280
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:289
+#: FrmSummary.class:290
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Mon Nov 10 08:36:30 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Mon Nov 10 08:36:30 2008
@@ -1,2 +1,3 @@
-- Updated binary
- Ready for testing
\ No newline at end of file
+- Fixed bug in netconf
+ Was not setting /etc/HOSTNAME
+- Fixed reverse navigation on package selection window.
Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form (original)
+++ branches/iVL/FMain.form Mon Nov 10 08:36:30 2008
@@ -3,15 +3,6 @@
{ Form Form
MoveScaled(0,0,100,75)
Text = ("")
- { Frame1 Frame
- MoveScaled(1,8,25,62)
- Text = ("Process Overview")
- { tvPlan TreeView
- MoveScaled(1,2,22,56)
- Expand = True
- Border = False
- }
- }
{ tlBanner TextLabel
MoveScaled(0,0,26,7)
Font = Font["+6"]
@@ -46,5 +37,14 @@
MoveScaled(16,71,10,2)
Visible = False
Text = ("Button1")
+ }
+ { Frame1 Frame
+ MoveScaled(0,7,25,62)
+ Text = ("Process Overview")
+ { tvPlan TreeView
+ MoveScaled(2,3,22,56)
+ Expand = True
+ Border = False
+ }
}
}
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Mon Nov 10 08:36:30 2008
@@ -35,7 +35,8 @@
.Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
- ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
+ ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
END WITH
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Mon Nov 10 08:36:30 2008
@@ -12,7 +12,8 @@
ME.tlBanner.text = "<h3>" & ("Installation Summary") & "</h3>"
- IF ClsPkgSel.bCustom = TRUE THEN
+ 'IF ClsPkgSel.bCustom = TRUE THEN
+ IF FrmPkgSel.rbCustom.Value = TRUE THEN
ME.TextBox1.text = ("Custom")
ME.Frame2.Visible = TRUE
ME.prepare_packages_summary()
@@ -242,5 +243,12 @@
END WITH
+
+END
+
+PUBLIC SUB Form_Show()
+
+ ME.Form_Open()
+
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Mon Nov 10 08:36:30 2008
@@ -539,19 +539,11 @@
END
PUBLIC SUB SET_HOSTNAME(sHostName AS String, sDomain AS String)
-
- DIM sRes AS String
- SHELL "skill -n X" TO sRes
- sRes = Trim(sRes)
+
+
+ SHELL "echo " & sHostName & "." & sDomain & " >" &
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT
- EXEC ["echo ", sHostName & "." & sDomain, " >", ClsGlobal.sTargetMnt
&/ "etc" &/ "HOSTNAME"] WAIT
-
- ' ' '
- ' ' ' IF Len(sRes) > 0 THEN
- ' ' ' SHELL "echo " & sHostName & " > " & ClsGlobal.sTargetMnt
&/ "etc" &/ "HOSTNAME" WAIT
- ' ' ' ELSE ' X is not running
- ' ' ' SHELL "hostname $HOSTNAME; echo " & sHostName & " > " &
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT ' This sets the hostname
to the current CLI session and saves it for future boots
- ' ' ' END IF
+
ME.UPDATE_HOSTS_FILE(sHostName, sDomain)
|
14 messages has been excluded from this view by a project administrator.
