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-24 14:22:02
|
Author: M0E.lnx
Date: Mon Nov 24 06:20:50 2008
New Revision: 322
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.mo
branches/iVL/.lang/en_US.po
branches/iVL/.lang/es.po
branches/iVL/.project
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
Fixed problem with windows detection
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Mon Nov 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Mon Nov 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/devel/installer/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 Mon Nov 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 24 06:20:50 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/en_US.mo
==============================================================================
Binary files. No diff available.
Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po (original)
+++ branches/iVL/.lang/en_US.po Mon Nov 24 06:20:50 2008
@@ -10,1500 +10,1307 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "VectorLinux Installer"
-
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "GUI installer for Vector linux"
-
-#: FMain.class:188 FrmDone.class:28
-msgid "Restart"
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
msgstr ""
-#: 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:238
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Please wait while setup analyses your current partition setup."
-
-#: FMain.class:238
-msgid "This may take a while ..."
-msgstr "This may take a while ..."
-
-#: FMain.class:252
-msgid ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
+#: FrmXconf.class:348
+msgid "1024x768"
msgstr ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
-#: FMain.class:307
-msgid "Please select a default operating system to boot before proceeding"
+#: FrmXconf.class:348
+msgid "1280x1024"
msgstr ""
-#: FMain.class:308
-msgid "Select an entry from this list"
+#: FrmXconf.class:348
+msgid "1280x800"
msgstr ""
-#: FMain.class:319
-msgid "Skipping lilo setup"
-msgstr "Skipping lilo setup per user request"
-
-#: FMain.class:333
-msgid "Passwords do not match. Please enter the same password twice"
+#: FrmXconf.class:348
+msgid "1440x900"
msgstr ""
-#: FMain.class:348
-msgid ""
-"You have not created any user accounts for this system yet. There is not "
-"enough information"
+#: FrmXconf.class:335
+msgid "16 bit Pseudo Color"
msgstr ""
-#: FMain.class:348
-msgid ""
-"to create an account here. It is recommended that you create at least
one."
+#: FrmXconf.class:348
+msgid "1600x1200"
msgstr ""
-#: FMain.class:348
-msgid "Would you like to continue anyway?"
-msgstr ""
+#: FrmNetConf.class:238
+msgid "192.168.1.254"
+msgstr "-"
-#: FMain.class:348
-msgid "Yes"
+#: FrmXconf.class:348
+msgid "1920x1280"
msgstr ""
-#: FMain.class:348
-#, fuzzy
-msgid "No"
-msgstr "None"
-
-#: FMain.class:366
-msgid "Please specify a hostname for this computer"
+#: FrmXconf.class:335
+msgid "24 bit True Color"
msgstr ""
-#: FMain.class:370
-msgid "Please specify the domain this computer belongs to"
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
msgstr ""
-#: FMain.class:383
-msgid ""
-"VectorLinux will now try to detect and configure your graphics hardware."
+#: FrmXconf.class:348
+msgid "640x480"
msgstr ""
-#: FMain.class:383
-msgid ""
-"Your screen may flicker or go blank for a few seconds during this
process."
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
msgstr ""
-#: FMain.class:606
-msgid "Back"
-msgstr "Back"
-
-#: FMain.class:618
-msgid "Exit Installation"
-msgstr "Exit Installation"
-
-#: FMain.class:630
-msgid "Next"
-msgstr "Next"
-
-#: FMain.class:644
-msgid "Button1"
-msgstr "-"
-
-#: FrmAlsaConf.class:36
-msgid ""
-"This portion of the setup process allows you to sutup your soundcard for "
-"your new operating system."
+#: FrmXconf.class:348
+msgid "800x600"
msgstr ""
-#: FrmAlsaConf.class:36
-msgid "Please use the setup program below to setup the sound system."
+#: FrmPartSel.class:150
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
+
+#: FrmRootPass.class:29
+msgid "About the root account"
msgstr ""
-#: FrmDiskPart.class:115
-msgid "Disk Partitioning:"
-msgstr "Disk Partitioning:"
+#: MdlNetConf.module:276
+msgid "Access Point"
+msgstr "ESSID"
-#: FrmDone.class:32
-msgid "Exit"
+#: MdlSetup.module:317
+msgid "Activating swap space"
msgstr ""
-#: 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:39
-msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
+#: MdlLiloOsList.module:395
+msgid "Add option to boot this Operating system into Text mode."
msgstr ""
-#: FrmDone.class:39
-msgid ""
-"Your computer needs to be restarted so that you can use your new
operating "
-"system. Click"
+#: MdlLilo.module:627
+msgid "Add option to boot this operating system into text mode"
msgstr ""
#: FrmDone.class:39
-msgid "to restart your computer now or click"
+msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
msgstr ""
-#: FrmDone.class:39
-msgid "to restart your computer at a later time"
+#: MdlUsrAdd.module:74
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
msgstr ""
-#: FrmDone.class:39
-msgid ""
-"If you installed from CD-ROM/R/RW media, please remove de disk before "
-"restarting."
+#: MdlUsrAdd.module:77
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
msgstr ""
-#: FrmDone.class:74
-#, fuzzy
-msgid "Installation is finished"
-msgstr "Installation"
+#: MdlNetConf.module:316
+msgid "Automatic settings via DHCP."
+msgstr "Automatic settings via DHCP."
-#: FrmHalSwitch.class:20
-msgid "Would you like to use Vl-Hot or HAL to manage your removable
devices?"
-msgstr ""
+#: MdlNetConf.module:192
+msgid "Automatically activate this interface at start-up"
+msgstr "Automatically activate this interface at start-up"
-#: FrmHalSwitch.class:25
-msgid "HAL"
+#: MdlSetup.module:301
+msgid "BROUGHT TO YOU BY"
msgstr ""
-#: FrmHalSwitch.class:30
-msgid "VL-Hot"
+#: FrmSummary.class:174
+msgid "BULK PACKAGES"
msgstr ""
-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr "Vectorlinux is preparing your system for installation. Please
wait."
-
-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Current Status"
-
-#: 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:59 FrmInstallSysN.class:72
-msgid "Current Step"
-msgstr "Current Step"
-
-#: 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:206
-msgid "Installing ..."
-msgstr "Installing ..."
-
-#: FrmInstallSys.class:217
-msgid "Current Step "
-msgstr "Current Step "
-
-#: FrmInstallSys.class:239
-msgid "Total progress"
-msgstr "Total progress"
+#: MdlSummarize.module:58
+msgid "BULK PACKAGES:"
+msgstr "BULK PACKAGES:"
-#: FrmInstallSysN.class:82
-#, fuzzy
-msgid "Total Progress"
-msgstr "Total progress"
+#: FMain.class:784
+msgid "Back"
+msgstr "Back"
-#: FrmLangSel.class:123
-msgid "Select your language"
-msgstr "Select your language"
+#: FrmLilo.class:284 FrmLiloSetup.class:242
+msgid "Boot Default"
+msgstr "Boot Default"
-#: FrmLilo.class:35
-msgid ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
-msgstr ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
-
-#: FrmLilo.class:35
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
+#: FrmLiloSetup.class:176
+msgid "Boot Manager Configuration"
msgstr ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
-
-#: FrmLilo.class:133
-msgid "Standard"
-msgstr "Standard"
-#: FrmLilo.class:207
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Configure and install lilo (Linux Boot Loader)"
+#: MdlCore.module:480
+msgid "Boot Menu Options"
+msgstr "Boot Menu Options"
-#: FrmLilo.class:212
-msgid "Don't Install Lilo"
-msgstr "Don't Install Lilo"
+#: MdlConfLilo.module:100
+msgid "Boot loader has been setup successfully"
+msgstr "Boot loader has been setup successfully"
-#: FrmLilo.class:218 FrmNetConf.class:195
-msgid "Tab 0"
-msgstr "-"
+#: FrmLiloSetup.class:66 MdlLilo.module:55
+msgid "Bootsplash Extra High"
+msgstr ""
-#: FrmLilo.class:236
-msgid "Target"
-msgstr "Target"
+#: FrmLilo.class:262
+msgid "Bootsplash Extra high"
+msgstr "Bootsplash Extra High"
-#: FrmLilo.class:242
-msgid "Video Resolution"
-msgstr "Video Resolution"
+#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:53
+msgid "Bootsplash High"
+msgstr "Bootsplash High"
-#: FrmLilo.class:250
+#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:51
msgid "Bootsplash Med"
msgstr "Bootsplash Med"
-#: FrmLilo.class:250
-msgid "Bootsplash High"
-msgstr "Bootsplash High"
+#: MdlCore.module:383
+msgid "Build Date: "
+msgstr "Build Date: "
-#: FrmLilo.class:250
-msgid "Bootsplash Extra high"
-msgstr "Bootsplash Extra High"
+#: FMain.class:822
+msgid "Button1"
+msgstr "-"
-#: FrmLilo.class:255
-msgid "Prompt Timeout"
-msgstr "Prompt Timeout"
+#: MdlSetup.module:199
+msgid "Calculating package count ... Please wait"
+msgstr "Calculating package count ... Please wait"
-#: FrmLilo.class:266
-msgid "Seconds"
-msgstr "Seconds"
+#: MdlCore.module:461
+msgid "Cannot find SETUP.CONF"
+msgstr "Cannot find SETUP.CONF"
-#: FrmLilo.class:272
-msgid "Boot Default"
-msgstr "Boot Default"
+#: FrmPartSel.class:206
+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 "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"
+
+#: FrmUserAdd.class:504
+msgid "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
+msgstr "Choose a unique name for each user. Enter the password for twice
for accuracy. You can make as many users as you want, and when you are
finished click next to continue."
+
+#: FrmZoneSet.class:182
+msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
+msgstr "Choose how\nyour hardware clock is set up.\nChoose UTC if you know
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).
Otherwise,\nChoose localtime since most PCs are setup this way."
-#: FrmNetConf.class:70
-msgid "Network Interfaces"
+#: FrmZoneSet.class:170
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Choose the correct timezone for the area in which you live."
+
+#: FrmPkgSel.class:25
+msgid "Choose your installation mode"
+msgstr "Choose your installation mode"
+
+#: FrmPkgSel.class:81
+msgid "Choose your optional components to install."
msgstr ""
-#: FrmNetConf.class:172
-msgid "Domain"
+#: FrmUserAdd.class:576
+msgid "Clear Form"
msgstr ""
-#: FrmNetConf.class:202
-msgid "Manual DNS Server Specification"
-msgstr "Manual DNS Server Specification"
+#: FrmSelISO.class:79
+msgid "Click"
+msgstr "Click"
-#: FrmNetConf.class:207
-msgid "Primary DNS Server"
-msgstr "Primary DNS Server"
+#: FrmXconf.class:322
+msgid "Color Depth"
+msgstr ""
-#: FrmNetConf.class:215
-msgid "192.168.1.254"
+#: FrmZoneSet.class:175
+msgid "ComboBox1"
msgstr "-"
-#: FrmNetConf.class:220
-msgid "Secondary DNS Server"
-msgstr "Secondary DNS Server"
-
-#: FrmNetConf.class:233 MdlCore.module:484
-msgid "Network Configuration"
-msgstr "Network Configuration"
-
-#: FrmNetConf.class:243
+#: FrmNetConf.class:199
msgid "Computer Name"
msgstr "Computer Name"
-#: 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 ""
-"Select this option if you already have a linux installation that you wish
to "
-"overwrite or if a linux parition scheme exists in your hard disk"
+#: FrmLilo.class:219
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Configure and install lilo (Linux Boot Loader)"
-#: FrmPartScheme.class:61
-msgid "This option will overwrite any existing data in the selected
partitions"
-msgstr ""
-"This option will overwrite any existing data in the selected partitions"
+#: FrmUserAdd.class:570
+msgid "Create User"
+msgstr "Create User"
-#: FrmPartScheme.class:61
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-msgstr ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-
-#: 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 ""
-"Select this option if you wish to create, move or resize partitions in
order "
-"to make room for your new VectorLinux installation."
-
-#: FrmPartScheme.class:70
-msgid ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
+#: FrmUserAdd.class:37
+msgid "Create User Accounts"
msgstr ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
-#: FrmPartScheme.class:112
-msgid "Disk Partitioning Options"
-msgstr "Disk Partitioning Options"
-
-#: FrmPartScheme.class:117
-msgid "Use existing disk partitions"
-msgstr "Use existing disk partitions"
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Current Status"
-#: FrmPartScheme.class:122
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modify my disk partitions to make room for new installation"
+#: FrmInstallSys.class:63
+msgid "Current Step"
+msgstr "Current Step"
-#: FrmPartSel.class:149
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
+#: FrmInstallSys.class:230
+msgid "Current Step "
+msgstr "Current Step "
-#: FrmPartSel.class:149
-msgid ""
-"Linux is a modular operating system. This means that is has the ability
to "
-"store system and"
-msgstr ""
-"Linux is a modular operating system. This means that it has the ability
to "
-"store system and"
-
-#: FrmPartSel.class:149
-msgid ""
-"user data separately for added data security. You may install the system
to "
-"a single partition"
-msgstr ""
-"user data separately for added data security. You may install the system
to "
-"a single partition"
-
-#: FrmPartSel.class:149
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
-msgstr ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
+#: FrmSummary.class:17 MdlSummarize.module:56
+msgid "Custom"
+msgstr "Custom"
-#: FrmPartSel.class:149
-msgid "suggested setup for a typical Linux installation"
-msgstr "suggested setup for a typical Linux installation"
+#: FrmPkgSel.class:211
+msgid "Custom Install"
+msgstr "Custom Install"
-#: FrmPartSel.class:149
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
+#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
+msgid "Description"
msgstr ""
-"Used to store system data. This particular install requires a minimum of"
-#: FrmPartSel.class:149
-msgid "for this"
-msgstr "for this"
+#: FrmPartSel.class:207
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
-#: FrmPartSel.class:149
-msgid ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
-msgstr ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
+#: MdlCore.module:472
+msgid "Disk Partitioning"
+msgstr "Disk Partitioning"
-#: FrmPartSel.class:149
-msgid "in case you wish to."
-msgstr "in case you wish to."
+#: FrmPartScheme.class:113
+msgid "Disk Partitioning Options"
+msgstr "Disk Partitioning Options"
-#: FrmPartSel.class:149
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
-msgstr ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
+#: FrmDiskPart.class:115
+msgid "Disk Partitioning:"
+msgstr "Disk Partitioning:"
-#: FrmPartSel.class:149
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Typically, you want to use the largest partition for this."
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:141
+msgid "Do not format"
+msgstr "Do not format"
-#: FrmPartSel.class:149
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
+#: FrmLiloSetup.class:192
+msgid "Do not install LILO"
msgstr ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-#: FrmPartSel.class:149
-msgid "for this is"
-msgstr "for this is"
+#: FrmSummary.class:113 MdlInstallSys.module:190 MdlWinDrives.module:123
+msgid "Do not mount"
+msgstr "Do not mount"
-#: FrmPartSel.class:149
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr "but can also be calculated as 2 times your ammount of RAM"
+#: FrmNetConf.class:211
+msgid "Domain"
+msgstr ""
-#: FrmPartSel.class:174
-msgid "Please select the partitions you wish to use and how to use them"
-msgstr "Please select the partitions you wish to use and how to use them"
+#: FrmLilo.class:224
+msgid "Don't Install Lilo"
+msgstr "Don't Install Lilo"
-#: 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"
-msgstr ""
-"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"
+#: MdlNetConf.module:316
+msgid "Dynamic Host Control Protocol"
+msgstr "Dynamic Host Control Protocol"
-#: FrmPartSel.class:184
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detect and Setup Windows partitions for auto-mounting at boot"
+#: MdlUsrAdd.module:71
+msgid "Elite user"
+msgstr ""
-#: FrmPartSel.class:189 FrmUserAdd.class:486
-msgid "Help"
-msgstr "Help"
+#: MdlNetConf.module:257
+msgid "Encryption key"
+msgstr "Encryption Key"
-#: FrmPkgSel.class:25
-msgid "Choose your installation mode"
-msgstr "Choose your installation mode"
+#: MdlNetConf.module:231
+msgid "Encryption type"
+msgstr "Encryption type"
-#: FrmPkgSel.class:40
-msgid "Package"
+#: FrmRootPass.class:139 FrmUserAdd.class:590
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: FrmRootPass.class:36
+msgid "Enter a Password for root."
msgstr ""
-#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
-#, fuzzy
-msgid "Description"
-msgstr "Preparation"
+#: FrmUserAdd.class:111
+msgid "Enter a password for"
+msgstr ""
-#: FrmPkgSel.class:42 FrmSummary.class:40 FrmUsrPkgSel.class:19
-msgid "Size"
+#: FrmUserAdd.class:82
+msgid "Enter the login name that this user will user to login to this
system."
msgstr ""
-#: FrmPkgSel.class:70
-msgid ""
-"Installs all optional components in your VectorLinux media to your system"
+#: FrmUserAdd.class:177
+msgid "Enter the same password twice"
msgstr ""
-#: FrmPkgSel.class:80
-msgid "Choose your optional components to install."
+#: MdlInstallSys.module:518
+msgid "Error occurred while installing"
msgstr ""
-#: FrmPkgSel.class:205
-msgid "Full Install"
-msgstr "Full Install"
+#: MdlInstallCustom.module:354
+msgid "Error while installing "
+msgstr "Error while installing "
-#: FrmPkgSel.class:210
-msgid "Custom Install"
-msgstr "Custom Install"
+#: MdlInstallCustom.module:76
+msgid "Error while installing required system software. "
+msgstr "Error while installing required system software. "
-#: FrmPkgsel2.class:21
-msgid "Select your indivirual packages to install."
-msgstr "Select your individual packages to install"
+#: MdlInstallCustom.module:85
+msgid "Error while installing system configuration. "
+msgstr "Error while installing system configuration. "
-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "To install them all, just click next"
+#: FrmDone.class:32
+msgid "Exit"
+msgstr ""
-#: FrmRootPass.class:6
-msgid "System Administrator Password"
-msgstr "System Administrator Password"
+#: FMain.class:796
+msgid "Exit Installation"
+msgstr "Exit Installation"
-#: FrmRootPass.class:13
-msgid "Most other every-day taks do not require administrative
priviledges."
-msgstr "Most other every-day tasks do not require administrative
priviledges."
+#: MdlPartSel.module:92
+msgid "FILESYSTEM"
+msgstr "FYLESYSTEM"
-#: FrmRootPass.class:13
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
+#: MdlInstallSys.module:813
+msgid "Failed to install"
msgstr ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
-#: FrmRootPass.class:28
-msgid "About the root account"
+#: MdlInstallCustom.module:225
+msgid "Failed to install. Installation will stop"
msgstr ""
-#: FrmRootPass.class:34
-#, fuzzy
-msgid "Enter a Password for root."
-msgstr "Enter Password"
+#: FrmXconf.class:342
+msgid "Fbdev"
+msgstr ""
-#: FrmRootPass.class:48
-msgid ""
-"Passwords do not match. Please enter the same password twice for
accuracy."
+#: FrmSummary.class:42
+msgid "Filesystem"
msgstr ""
-#: FrmRootPass.class:118 MdlCore.module:482
-msgid "System Administrator"
-msgstr "System Administrator"
+#: MdlCore.module:485
+msgid "Final Hardware Configuration"
+msgstr ""
-#: FrmRootPass.class:131
-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"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The 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 ""
-"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"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The 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."
+#: MdlCore.module:471
+msgid "Find installation media"
+msgstr "Find installation media"
-#: FrmRootPass.class:137 FrmUserAdd.class:514
-msgid "Enter Password"
-msgstr "Enter Password"
+#: MdlInstallSys.module:639
+msgid "Finished intalling Bulks"
+msgstr "Finished intalling Bulks"
-#: FrmRootPass.class:142
-msgid "Re-Enter Password"
-msgstr "Re-Enter Password"
+#: FrmRootPass.class:19
+msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess"
+msgstr "For added security, use a password that is easy for you to
remember, but hard for others to guess"
-#: FrmRootPass.class:159
-msgid "Set Password"
-msgstr "Set Password"
+#: FrmSummary.class:21 MdlSummarize.module:69
+msgid "Full"
+msgstr "Full"
-#: FrmSelISO.class:30 MdlCore.module:220
-msgid "No Installable Media Found"
-msgstr "No Installable Media Found"
+#: FrmPkgSel.class:206
+msgid "Full Install"
+msgstr "Full Install"
-#: FrmSelISO.class:74
-msgid "Click"
-msgstr "Click"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "GUI installer for Vector linux"
-#: FrmSelISO.class:74
-msgid "to begin installating"
-msgstr "to begin installating"
+#: MdlNetConf.module:423
+msgid "Gateway Address"
+msgstr "Gateway Address"
-#: FrmSelISO.class:76
-#, fuzzy
-msgid "Unable to locate any installable media."
-msgstr "Unable to install kernels. "
+#: MdlDiskPart.module:53
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr "Gparted was not found on this system. Please install gparted and
try again"
-#: FrmSelISO.class:82
-#, fuzzy
-msgid "Select installation media from the list below"
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
msgstr ""
-"Select which VectorLinux version you wish to install from the list below"
-
-#: FrmSelISO.class:113
-msgid "Unable to identify distro."
-msgstr "Unable to identify distro."
-
-#: FrmSelISO.class:148
-msgid "Minimum Disk Space Requirements"
-msgstr "Minimum Disk Space Requirements"
-#: FrmSelISO.class:251
-msgid "No installable images found."
-msgstr "No installable images found."
+#: FrmUserAdd.class:442
+msgid "Groups are a way of administering permissions for your users. You
grant the user"
+msgstr ""
-#: FrmSelISO.class:257
-msgid ""
-"Select which VectorLinux version you wish to install from the list below"
+#: FrmHalSwitch.class:25
+msgid "HAL"
msgstr ""
-"Select which VectorLinux version you wish to install from the list below"
-#: FrmSelISO.class:267
-msgid "Search Again"
-msgstr "Search Again"
+#: MdlNetConf.module:152
+msgid "Hardware Address"
+msgstr "Hardware Address"
-#: FrmSummary.class:14 MdlCore.module:476
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#: FrmPartSel.class:186 FrmUserAdd.class:557
+msgid "Help"
+msgstr "Help"
-#: FrmSummary.class:17 MdlSummarize.module:56
-msgid "Custom"
-msgstr "Custom"
+#: MdlSummarize.module:56
+msgid "INSTALL TYPE:"
+msgstr "INSTALL TYPE:"
-#: FrmSummary.class:21 MdlSummarize.module:69
-msgid "Full"
-msgstr "Full"
+#: MdlNetConf.module:378
+msgid "IP Address"
+msgstr "IP Address"
-#: FrmSummary.class:38
-#, fuzzy
-msgid "Partition"
-msgstr "Preparation"
+#: MdlNetConf.module:316
+msgid "If in doubt, choose this option"
+msgstr "If in doubt, choose this option"
-#: FrmSummary.class:42
-msgid "Filesystem"
+#: FrmDone.class:39
+msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
msgstr ""
-#: FrmSummary.class:44
-#, fuzzy
-msgid "Mount Point"
-msgstr "Do not mount"
+#: MdlLilo.module:538
+msgid "Include in boot menu"
+msgstr ""
-#: FrmSummary.class:50 MdlInstallSys.module:142 MdlPartSel.module:143
-msgid "Not Used"
-msgstr "Not Used"
+#: MdlLilo.module:450 MdlLiloOsList.module:148
+msgid "Include this installation in the boot menu"
+msgstr "Include this installation in the boot menu"
-#: FrmSummary.class:91 MdlNetConf.module:220
-msgid "None"
-msgstr "None"
+#: MdlLiloOsList.module:301
+msgid "Include this operating system in the boot menu"
+msgstr "Include this operating system in the boot menu"
-#: FrmSummary.class:113 MdlInstallSys.module:190 MdlWinDrives.module:123
-msgid "Do not mount"
-msgstr "Do not mount"
+#: MdlLiloOsList.module:333
+msgid "Initial Ram Disk"
+msgstr "Initial Ram Disk"
-#: FrmSummary.class:165 FrmUsrPkgSel.class:16
-msgid "Package Name"
+#: MdlLilo.module:574
+msgid "Initrd"
msgstr ""
-#: FrmSummary.class:174
-#, fuzzy
-msgid "BULK PACKAGES"
-msgstr "BULK PACKAGES:"
+#: MdlCore.module:478
+msgid "Install Operating System"
+msgstr "Install Operating System"
-#: FrmSummary.class:201
-#, fuzzy
-msgid "USER-SELECTED PACKAGES"
-msgstr "BULK PACKAGES:"
+#: MdlCore.module:475
+msgid "Installation"
+msgstr "Installation"
+
+#: FrmSummary.class:14 MdlCore.module:476
+msgid "Installation Summary"
+msgstr "Installation Summary"
#: FrmSummary.class:277
-#, fuzzy
msgid "Installation Type"
-msgstr "Installation"
+msgstr ""
-#: FrmSummary.class:287
-msgid "Partition Selection Scheme"
+#: FrmDone.class:75
+msgid "Installation is finished"
msgstr ""
-#: FrmSummary.class:297 FrmUsrPkgSel.class:135 MdlCore.module:473
-msgid "Software Selection"
-msgstr "Software Selection"
+#: MdlInstallSys.module:754
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Installation phase complete. Ready for configuration"
-#: FrmUserAdd.class:37
-#, fuzzy
-msgid "Create User Accounts"
-msgstr "User Accounts"
+#: MdlInstallCustom.module:205 MdlInstallSys.module:480
+msgid "Installing"
+msgstr "Installing"
-#: FrmUserAdd.class:78
-msgid "Enter the login name that this user will user to login to this
system."
+#: FrmInstallSys.class:219
+msgid "Installing ..."
+msgstr "Installing ..."
+
+#: MdlInstallSys.module:853
+msgid "Installing Final configuration files..."
+msgstr "Installing final configuration files ..."
+
+#: MdlInstallSys.module:799
+msgid "Installing Required Package ..."
msgstr ""
-#: FrmUserAdd.class:86
-msgid ""
-"Login name field contains illegal characters. Please use only lowercase "
-"letters and numbers"
+#: MdlInstallSys.module:757
+msgid "Installing default system configuration and required software."
+msgstr "Installing default system configuration and required software."
+
+#: MdlInstallCustom.module:271
+msgid "Installing user-selected package"
msgstr ""
-#: FrmUserAdd.class:99
-msgid "Username contains illegal characters"
+#: FrmPkgSel.class:71
+msgid "Installs all optional components in your VectorLinux media to your
system"
msgstr ""
-#: FrmUserAdd.class:102
-#, fuzzy
-msgid "User account for"
-msgstr "User Accounts"
+#: MdlNetConf.module:173
+msgid "Interface Type"
+msgstr "Interface Type"
-#: FrmUserAdd.class:102
-msgid "already exists"
-msgstr ""
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you
need to pre-partition your disks first"
+msgstr "It is still possible to install VectorLinux on your system, but
you need to pre-partition your disk first"
-#: FrmUserAdd.class:106
-#, fuzzy
-msgid "Enter a password for"
-msgstr "Enter Password"
+#: MdlLilo.module:604 MdlLiloOsList.module:358
+msgid "Kernel boot options"
+msgstr "Kernel boot options"
-#: FrmUserAdd.class:157
-msgid "was created."
-msgstr ""
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "LICENSE AGREEMENT"
-#: FrmUserAdd.class:161
-msgid "Passwords do not match"
-msgstr ""
+#: MdlLiloOsList.module:157
+msgid "Label"
+msgstr "Label"
-#: FrmUserAdd.class:162
-#, fuzzy
-msgid "Enter the same password twice"
-msgstr "Enter Password"
+#: MdlCore.module:470
+msgid "Language Selection"
+msgstr "Language Selection"
-#: FrmUserAdd.class:311
-msgid "Select picture for user Login"
-msgstr ""
+#: MdlConfLilo.module:97
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo returned an error. Please see below"
-#: FrmUserAdd.class:350
-msgid ""
-"Your password selections do not match. Please enter the same password
twice"
-msgstr ""
+#: FrmPartSel.class:150
+msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
+msgstr "Linux is a modular operating system. This means that it has the
ability to store system and"
-#: FrmUserAdd.class:375
-msgid ""
-"Groups are a way of administering permissions for your users. You grant
the "
-"user"
-msgstr ""
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Loagind gparted ... Please wait"
-#: FrmUserAdd.class:375
-msgid "permission to do certain things by adding them to certain groups."
-msgstr ""
+#: FrmZoneSet.class:177
+msgid "LocalTime"
+msgstr "LocalTime"
-#: FrmUserAdd.class:375
-msgid "Select which groups you want this user to be a part of here"
+#: FrmUserAdd.class:583
+msgid "Login Name"
msgstr ""
-#: FrmUserAdd.class:376
-msgid "OK"
+#: FrmUserAdd.class:90
+msgid "Login name field contains illegal characters. Please use only
lowercase letters and numbers"
msgstr ""
-#: FrmUserAdd.class:433
-msgid ""
-"Choose a unique name for each user. Enter the password for twice for "
-"accuracy. You can make as many users as you want, and when you are
finished "
-"click next to continue."
-msgstr ""
-"Choose a unique name for each user. Enter the password for twice for "
-"accuracy. You can make as many users as you want, and when you are
finished "
-"click next to continue."
+#: MdlCore.module:383
+msgid "MINIMUM REQUIREMENTS"
+msgstr "MINIMUM REQUIREMENTS"
-#: FrmUserAdd.class:471
-msgid "Select"
-msgstr ""
+#: MdlPartSel.module:82
+msgid "MOUNT POINT"
+msgstr "MOUNT POINT"
-#: FrmUserAdd.class:477
-msgid "Use Picture ID for Login greeting"
-msgstr ""
+#: MdlWinDrives.module:84
+msgid "MOUNT TO"
+msgstr "MOUNT TO"
-#: FrmUserAdd.class:482
-msgid "User Rights Management"
-msgstr ""
+#: FrmNetConf.class:227
+msgid "Manual DNS Server Specification"
+msgstr "Manual DNS Server Specification"
-#: FrmUserAdd.class:494
-msgid "Create User"
-msgstr "Create User"
+#: FrmSelISO.class:151
+msgid "Minimum Disk Space Requirements"
+msgstr "Minimum Disk Space Requirements"
-#: FrmUserAdd.class:500
-msgid "Clear Form"
-msgstr ""
+#: FrmPartScheme.class:123
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Modify my disk partitions to make room for new installation"
-#: FrmUserAdd.class:507
-msgid "Login Name"
-msgstr ""
+#: FrmRootPass.class:19
+msgid "Most other every-day taks do not require administrative
priviledges."
+msgstr "Most other every-day tasks do not require administrative
priviledges."
-#: FrmUserAdd.class:521
-msgid "ReEnter Password"
-msgstr "ReEnter Password"
+#: FrmSummary.class:44
+msgid "Mount Point"
+msgstr ""
-#: FrmUserAdd.class:542
-#, fuzzy
-msgid "Real Name"
+#: MdlLilo.module:460 MdlLiloOsList.module:312
+msgid "Name"
msgstr "Name"
-#: FrmWinDrives.class:72
-msgid "Select the windows partitions you would like to mount during boot"
-msgstr "Select the windows partitions you would like to mount during boot"
+#: FrmNetConf.class:184 MdlCore.module:484
+msgid "Network Configuration"
+msgstr "Network Configuration"
-#: FrmXconf.class:25
-msgid "Uses the default (failsafe) configuration."
-msgstr ""
+#: FMain.class:808
+msgid "Next"
+msgstr "Next"
-#: FrmXconf.class:27
-msgid ""
-"Probe hardware to setup your Graphical Environment using your preffered "
-"settings"
+#: FMain.class:258
+msgid "No"
msgstr ""
-#: FrmXconf.class:29
-msgid "Use the console framebuffer driver"
-msgstr ""
+#: FrmSelISO.class:30 MdlCore.module:220
+msgid "No Installable Media Found"
+msgstr "No Installable Media Found"
-#: FrmXconf.class:301
-msgid "Graphical Interface Settings"
-msgstr ""
+#: MdlWinDrives.module:186
+msgid "No Windows partitions detected"
+msgstr "No Windows partitions detected"
-#: FrmXconf.class:311
-msgid "Video Driver"
+#: MdlNetConf.module:92
+msgid "No ethernet neworking devices found"
msgstr ""
-#: FrmXconf.class:322
-msgid "Color Depth"
-msgstr ""
+#: FrmSelISO.class:254
+msgid "No installable images found."
+msgstr "No installable images found."
-#: FrmXconf.class:328
-#, fuzzy
-msgid "Screen Resolution"
-msgstr "Video Resolution"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "No, I Do Not Agree"
-#: FrmXconf.class:335
-msgid "24 bit True Color"
-msgstr ""
+#: FrmSummary.class:91 MdlNetConf.module:244
+msgid "None"
+msgstr "None"
-#: FrmXconf.class:335
-msgid "16 bit Pseudo Color"
-msgstr ""
+#: FrmSummary.class:50 MdlInstallSys.module:142 MdlPartSel.module:143
+msgid "Not Used"
+msgstr "Not Used"
-#: FrmXconf.class:335
-msgid "8 bit 256 Color"
+#: FrmUserAdd.class:443
+msgid "OK"
msgstr ""
-#: FrmXconf.class:335
-msgid "4 bit 16 Color"
+#: MdlSummarize.module:62
+msgid "OPTIONAL PACKAGES:"
+msgstr "OPTIONAL PACKAGES:"
+
+#: MdlSummarize.module:49
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+msgstr "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+
+#: MdlLiloOsList.module:289
+msgid "Operating system installed in"
msgstr ""
-#: FrmXconf.class:335
-msgid "1 bit Mono B/W"
+#: MdlPartSel.module:71 MdlWinDrives.module:74
+msgid "PARTITION"
+msgstr "PARTITION"
+
+#: MdlSummarize.module:28
+msgid "PARTITIONING LAYOUT"
+msgstr "PARTITION LAYOUT"
+
+#: FrmPkgSel.class:40
+msgid "Package"
msgstr ""
-#: FrmXconf.class:340
-msgid "Vesa"
+#: FrmSummary.class:165 FrmUsrPkgSel.class:16
+msgid "Package Name"
msgstr ""
-#: FrmXconf.class:342
-msgid "Fbdev"
+#: MdlInstallSys.module:371
+msgid "Packages have been installed in your system. Please click"
+msgstr "Packages have been installed to your system. Please click"
+
+#: FrmSummary.class:38
+msgid "Partition"
msgstr ""
-#: FrmXconf.class:348
-msgid "1920x1280"
+#: FrmSummary.class:287
+msgid "Partition Selection Scheme"
msgstr ""
-#: FrmXconf.class:348
-msgid "1600x1200"
+#: FrmUserAdd.class:176
+msgid "Passwords do not match"
msgstr ""
-#: FrmXconf.class:348
-msgid "1440x900"
+#: FMain.class:243
+msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FrmXconf.class:348
-msgid "1280x1024"
+#: FrmRootPass.class:50
+msgid "Passwords do not match. Please enter the same password twice for
accuracy."
msgstr ""
-#: FrmXconf.class:348
-msgid "1280x800"
+#: FMain.class:222
+msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FrmXconf.class:348
-msgid "1024x768"
+#: MdlPartSel.module:289
+msgid "Please select only one "
+msgstr "Please select only one "
+
+#: FrmPartSel.class:181
+msgid "Please select the partitions you wish to use and how to use them"
+msgstr "Please select the partitions you wish to use and how to use them"
+
+#: FMain.class:276
+msgid "Please specify a hostname for this computer"
msgstr ""
-#: FrmXconf.class:348
-msgid "800x600"
+#: FMain.class:280
+msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FrmXconf.class:348
-msgid "640x480"
+#: FrmAlsaConf.class:36
+msgid "Please use the setup program below to setup the sound system."
msgstr ""
-#: FrmZoneSet.class:21
-msgid "Timezone configuration"
-msgstr "Timezone configuration"
+#: FMain.class:356
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Please wait while setup analyses your current partition setup."
-#: FrmZoneSet.class:169
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Choose the correct timezone for the area in which you live."
+#: FMain.class:354
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "Please wait while setup attempts to run the partitioning utility"
-#: FrmZoneSet.class:174
-msgid "ComboBox1"
-msgstr "-"
+#: MdlNetConf.module:131
+msgid "Plugged-in"
+msgstr "Plugged-in"
-#: FrmZoneSet.class:176
-msgid "LocalTime"
-msgstr "LocalTime"
+#: MdlCore.module:469
+msgid "Preparation"
+msgstr "Preparation"
-#: FrmZoneSet.class:176
-msgid "UTC"
-msgstr "UTC"
+#: MdlSetup.module:319
+msgid "Preparing filesystems"
+msgstr ""
-#: FrmZoneSet.class:181
-msgid ""
-"Choose how\n"
-"your hardware clock is set up.\n"
-"Choose UTC if you know that the clock is set up to\n"
-"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
-"Choose localtime since most PCs are setup this way."
-msgstr ""
-"Choose how\n"
-"your hardware clock is set up.\n"
-"Choose UTC if you know that the clock is set up to\n"
-"the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
-"Choose localtime since most PCs are setup this way."
+#: FrmNetConf.class:243
+msgid "Primary DNS Server"
+msgstr "Primary DNS Server"
-#: MdlConfLilo.module:96
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo returned an error. Please see below"
+#: FrmXconf.class:27
+msgid "Probe hardware to setup your Graphical Environment using your
preffered settings"
+msgstr ""
-#: MdlConfLilo.module:99
-msgid "Boot loader has been setup successfully"
-msgstr "Boot loader has been setup successfully"
+#: FrmLilo.class:267 FrmLiloSetup.class:263
+msgid "Prompt Timeout"
+msgstr "Prompt Timeout"
-#: MdlCore.module:204
-msgid "Scanning system for installable media. Please wait ..."
-msgstr "Scanning system for installable media. Please wait ..."
+#: FrmRootPass.class:144
+msgid "Re-Enter Password"
+msgstr "Re-Enter Password"
-#: MdlCore.module:222
-msgid ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
+#: FrmUserAdd.class:597
+msgid "ReEnter Password"
+msgstr "ReEnter Password"
+
+#: FrmUserAdd.class:613
+msgid "Real Name"
msgstr ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
-#: MdlCore.module:222
-msgid "installation CD and click "
-msgstr "installation CD and click "
+#: MdlCore.module:481
+msgid "Regional Settings"
+msgstr "Regional Settings"
-#: MdlCore.module:222
-msgid "to try again"
-msgstr "to try again"
+#: FMain.class:195 FrmDone.class:28
+msgid "Restart"
+msgstr ""
-#: MdlCore.module:383
-msgid "Build Date: "
-msgstr "Build Date: "
+#: MdlUsrAdd.module:65
+msgid "Restricted administrator (backup)"
+msgstr ""
-#: MdlCore.module:383
-msgid "MINIMUM REQUIREMENTS"
-msgstr "MINIMUM REQUIREMENTS"
+#: MdlNetConf.module:300
+msgid "STATUS:"
+msgstr "STATUS:"
-#: 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"
+#: MdlCore.module:204
+msgid "Scanning system for installable media. Please wait ..."
+msgstr "Scanning system for installable media. Please wait ..."
+
+#: FrmXconf.class:328
+msgid "Screen Resolution"
msgstr ""
-"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:461
-msgid "Cannot find SETUP.CONF"
-msgstr "Cannot find SETUP.CONF"
+#: FrmSelISO.class:270
+msgid "Search Again"
+msgstr "Search Again"
-#: MdlCore.module:469
-msgid "Preparation"
-msgstr "Preparation"
+#: FrmNetConf.class:256
+msgid "Secondary DNS Server"
+msgstr "Secondary DNS Server"
-#: MdlCore.module:470
-msgid "Language Selection"
-msgstr "Language Selection"
+#: FrmLilo.class:278 FrmLiloSetup.class:274
+msgid "Seconds"
+msgstr "Seconds"
-#: MdlCore.module:471
-msgid "Find installation media"
-msgstr "Find installation media"
+#: FrmUserAdd.class:542
+msgid "Select"
+msgstr ""
-#: MdlCore.module:472
-msgid "Disk Partitioning"
-msgstr "Disk Partitioning"
+#: FMain.class:223
+msgid "Select an entry from this list"
+msgstr ""
-#: MdlCore.module:475
-msgid "Installation"
-msgstr "Installation"
+#: FrmSelISO.class:87
+msgid "Select installation media from the list below"
+msgstr ""
-#: MdlCore.module:478
-msgid "Install Operating System"
-msgstr "Install Operating System"
+#: FrmUserAdd.class:378
+msgid "Select picture for user Login"
+msgstr ""
-#: MdlCore.module:479
-msgid "System Configuration"
-msgstr "System Configuration"
+#: FrmWinDrives.class:72
+msgid "Select the windows partitions you would like to mount during boot"
+msgstr "Select the windows partitions you would like to mount during boot"
-#: MdlCore.module:480
-msgid "Boot Menu Options"
-msgstr "Boot Menu Options"
+#: 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 "Select this option if you already have a linux installation that
you wish to overwrite or if a linux parition scheme exists in your hard
disk"
-#: MdlCore.module:481
-msgid "Regional Settings"
-msgstr "Regional Settings"
+#: FrmPartScheme.class:71
+msgid "Select this option is you wish to create, more or resize partitions
in order to make room for your new VectorLinux installation."
+msgstr "Select this option if you wish to create, move or resize
partitions in order to make room for your new VectorLinux installation."
+
+#: FrmSelISO.class:260
+msgid "Select which VectorLinux version you wish to install from the list
below"
+msgstr "Select which VectorLinux version you wish to install from the list
below"
-#: MdlCore.module:483
-msgid "User Accounts"
-msgstr "User Accounts"
+#: FrmUserAdd.class:442
+msgid "Select which groups you want this user to be a part of here"
+msgstr ""
-#: MdlCore.module:485
-#, fuzzy
-msgid "Final Hardware Configuration"
-msgstr "Hardware Configuration"
+#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
+msgid "Select your indivirual packages to install."
+msgstr "Select your individual packages to install"
-#: MdlDiskPart.module:46
-msgid ""
-"VectorLinux is unable to determine the type of hard disks on your system."
-msgstr ""
-"VectorLinux is unable to determine the type of hard disks on your system."
+#: FrmLangSel.class:123
+msgid "Select your language"
+msgstr "Select your language"
-#: MdlDiskPart.module:46
-msgid ""
-"It is still possible to install VectorLinux on your system, but you need
to "
-"pre-partition your disks first"
-msgstr ""
-"It is still possible to install VectorLinux on your system, but you need
to "
-"pre-partition your disk first"
+#: FrmRootPass.class:161
+msgid "Set Password"
+msgstr "Set Password"
-#: MdlDiskPart.module:53
-msgid ""
-"Gparted was not found on this system. Please install gparted and try
again"
-msgstr ""
-"Gparted was not found on this system. Please install gparted and try
again"
+#: MdlNetConf.module:205
+msgid "Setup Mode"
+msgstr "Setup Mode"
-#: MdlDiskPart.module:57
-msgid "Loading gparted ... Please wait"
-msgstr "Loagind gparted ... Please wait"
+#: 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 "Setup is unable to find SETUP.CONF in your install media. This
could be symptoms of a bad burn or a bad ISO"
#: MdlDiskPart.module:90
-msgid ""
-"Setup is unable to successfully run gparted on this system. This may be
a "
-"sign of "
-msgstr ""
-"Setup is unable to successfully run gparted on this system. This may be
a "
-"sign of"
+msgid "Setup is unable to successfully run gparted on this system. This
may be a sign of "
+msgstr "Setup is unable to successfully run gparted on this system. This
may be a sign of"
-#: MdlDiskPart.module:90
-msgid "a bad install media. Setup cannot continue."
-msgstr "a bad install media. Setup cannot continue."
+#: MdlCore.module:222
+msgid "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
+msgstr "Setup was unable to find any installable media on your system.
Please insert your VectorLinux "
#: MdlDiskPart.module:95
msgid "Several windows found. I will take the first one!"
msgstr "Several windows found. I will take the first one!"
-#: 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:54
-msgid ""
-"There has been an error while installing optional software to your
system. "
+#: FrmPkgSel.class:42 FrmSummary.class:40 FrmUsrPkgSel.class:19
+msgid "Size"
msgstr ""
-"There has been an error while installing optional software to your
system. "
-#: MdlInstallCustom.module:63
-msgid ""
-"There has been an error while installing optional software to your
system."
+#: FMain.class:230
+msgid "Skipping boot loaded setup"
msgstr ""
-#: MdlInstallCustom.module:75
-msgid "Error while installing required system software. "
-msgstr "Error while installing required system software. "
+#: FMain.class:459
+msgid "Skipping lilo setup"
+msgstr "Skipping lilo setup per user request"
-#: MdlInstallCustom.module:84
-msgid "Error while installing system configuration. "
-msgstr "Error while installing system configuration. "
+#: FrmSummary.class:297 FrmUsrPkgSel.class:143 MdlCore.module:473
+msgid "Software Selection"
+msgstr "Software Selection"
-#: MdlInstallCustom.module:91
-msgid "Unable to install kernels. "
-msgstr "Unable to install kernels. "
+#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:49
+msgid "Standard"
+msgstr "Standard"
-#: MdlInstallCustom.module:102
-msgid ""
-"Vectorlinux is now installed in your system. Please click next to
configure "
-"it."
-msgstr ""
-"Vectorlinux is now installed in your system. Please click next to
configure "
-"it."
-
-#: MdlInstallCustom.module:103
-msgid ""
-"packages have been Installed. Please click next to move on to System "
-"Configuration."
+#: MdlNetConf.module:356
+msgid "Static IP Add...
[truncated message content] |
|
From: <cod...@go...> - 2008-11-23 05:39:20
|
Author: M0...@gm...
Date: Sat Nov 22 21:38:26 2008
New Revision: 321
Modified:
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/MdlLilo.module
Log:
new windows detection method for LILO step
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Sat Nov 22 21:38:26 2008
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlWinDrives.module:58
+#: MdlWinDrives.module:59
msgid "Windows Partitions Detected"
msgstr ""
-#: MdlWinDrives.module:74
+#: MdlWinDrives.module:75
msgid "PARTITION"
msgstr ""
-#: MdlWinDrives.module:84
+#: MdlWinDrives.module:85
msgid "MOUNT TO"
msgstr ""
-#: MdlWinDrives.module:123
+#: MdlWinDrives.module:124
msgid "Do not mount"
msgstr ""
-#: MdlWinDrives.module:190
+#: MdlWinDrives.module:193
msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Sat Nov 22 21:38:26 2008
@@ -382,6 +382,7 @@
DIM i, ii AS Integer
DIM sTmpMountPoint AS String = "/tmp/lilo_tmp"
DIM hproc AS Process
+ DIM sLook AS String
ME.arrWinBootChecks = NEW Object[]
ME.arrWinNameTxtBoxes = NEW Object[]
@@ -396,7 +397,15 @@
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*") OR IF
IsDir(sTmpMountPoint &/ "*winnt*") THEN
+ 'IF Exist(sTmpMountPoint &/ "*winnt*"
&/ "*system32*" &/ "*winver.exe*") OR IF Exist(sTmpMountPoint
&/ "*WINDOWS*" &/ "*system32*" &/ "*winver.exe*") OR IF
IsDir(sTmpMountPoint &/ "*winnt*") THEN
+ 'IF Exist(sTmpMountPoint &/ "*[winnt]*"
&/ "*[system32]*"
+ FOR EACH sLook IN
Dir(sTmpMountPoint, "*[win]*", gb.Directory)
+ IF Stat(sTmpMountPoint &/ sLook).Type =
gb.Directory THEN
+ IF sLook LIKE "winnt" OR IF sLook
LIKE "windows" THEN
+
+
+' IF Exist(sTmpMountPoint &/ LIKE "winnt" &/
LIKE "system32" &/ LIKE "winver") THEN
+
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
.Index = .Count - 1
@@ -407,7 +416,10 @@
ME.FILL_IN_WINDOWS_TAB("Windows",
sPartition)
END IF
-
+
+ END IF
+' END IF
+ NEXT
EXEC ["sync"] WAIT
|
|
From: <cod...@go...> - 2008-11-23 05:15:21
|
Author: M0...@gm...
Date: Sat Nov 22 21:14:14 2008
New Revision: 320
Modified:
branches/iVL/MdlWinDrives.module
Log:
attempt to fix windows partitions detection
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Sat Nov 22 21:14:14 2008
@@ -47,7 +47,8 @@
' MOVE THESE PARTITIONS TO A DIFFERENT WINDOW.
' THESE ARE ONLY NEEDED FOR FSTAB
- SHELL "probepart | grep -i fat | cut -f 1 -d \' \'" TO sDump1
+ 'SHELL "probepart | grep -i fat | cut -f 1 -d \' \'" TO sDump1
+ SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT16|FAT32|HPFS|NTFS|Win)\' |
cut -f 1 -d \' \'" TO sDump1
'message(sDump1)
IF sDump1 <> "" THEN
sDump1 = Trim(sDump1)
@@ -130,59 +131,60 @@
y = y + tl.Height + 4
NEXT
- ' now do ntfs partitions the same way
- sDump1 = ""
- 'sDisks.Clear
- SHELL "probepart | grep -i ntfs | cut -f 1 -d \' \'" TO sDump1
- sDump1 = Trim(sDump1)
- wintfs = Split(sDump1, "\n")
- FOR i = 0 TO wintfs.Count - 1
- sPartNo = Right(wintfs[i], Len(wintfs[i]) - Len("/dev/hda"))
- IF Len(sPartNo) > 1 THEN
- sBlank = ""
- ELSE
- sBlank = " "
- END IF
- 'we need to know if this fails. it fails on a test machine
here with "bad partition table"
- SHELL "export s=$(parted " & Left(wintfs[i], Len("/dev/hda"))
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'
\'" TO sPartsize
- 'IF sPartSize.len = 0 THEN
- IF Len(sPartsize) = 0 THEN
- sPartSize = "UNKNOWN"
- ENDIF
- tl = NEW TextLabel(FrmWinDrives.svWinDrives)
- WITH tl
- .y = y
- .x = x
- .text = wintfs[i] & " [ " & sPartsize & " ]"
- .Width = 200
- .Height = 21
- .tag = wintfs[i]
- .Alignment = Align.Normal
- END WITH
- ME.tlWnParts.Add(tl)
- cb = NEW ComboBox(FrmWinDrives.svWinDrives)
- WITH cb
- .x = cbx
- .y = tl.top
- .Width = tl.Width * 0.75
- .Height = 21
- .tag = wintfs[i]
- .Add("/mnt" &/ Right(.tag, Len(.tag) -
RInStr(.tag, "/")))
- .Add(("Do not mount"))
-
- '.ReadOnly = TRUE
- END WITH
- ME.oWMntPoints.Add(cb)
-
-
-
- y = y + tl.Height + 4
- NEXT
-
-
-
-
- 'END IF
+ ' ' ' now do ntfs partitions the same way
+ ' ' sDump1 = ""
+ ' ' 'sDisks.Clear
+ ' ' 'SHELL "probepart | grep -i ntfs | cut -f 1 -d \' \'" TO
sDump1\
+ ' ' SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT16|FAT32|HPFS|NTFS|
Win)\' | cut -f 1 -d \' \'" TO sDump1
+ ' ' sDump1 = Trim(sDump1)
+ ' ' wintfs = Split(sDump1, "\n")
+ ' ' FOR i = 0 TO wintfs.Count - 1
+ ' ' sPartNo = Right(wintfs[i], Len(wintfs[i]) -
Len("/dev/hda"))
+ ' ' IF Len(sPartNo) > 1 THEN
+ ' ' sBlank = ""
+ ' ' ELSE
+ ' ' sBlank = " "
+ ' ' END IF
+ ' ' 'we need to know if this fails. it fails on a test machine
here with "bad partition table"
+ ' ' SHELL "export s=$(parted " & Left(wintfs[i],
Len("/dev/hda")) & " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s |
cut -f 4 -d \' \'" TO sPartsize
+ ' ' 'IF sPartSize.len = 0 THEN
+ ' ' IF Len(sPartsize) = 0 THEN
+ ' ' sPartSize = "UNKNOWN"
+ ' ' ENDIF
+ ' ' tl = NEW TextLabel(FrmWinDrives.svWinDrives)
+ ' ' WITH tl
+ ' ' .y = y
+ ' ' .x = x
+ ' ' .text = wintfs[i] & " [ " & sPartsize & " ]"
+ ' ' .Width = 200
+ ' ' .Height = 21
+ ' ' .tag = wintfs[i]
+ ' ' .Alignment = Align.Normal
+ ' ' END WITH
+ ' ' ME.tlWnParts.Add(tl)
+ ' ' cb = NEW ComboBox(FrmWinDrives.svWinDrives)
+ ' ' WITH cb
+ ' ' .x = cbx
+ ' ' .y = tl.top
+ ' ' .Width = tl.Width * 0.75
+ ' ' .Height = 21
+ ' ' .tag = wintfs[i]
+ ' ' .Add("/mnt" &/ Right(.tag, Len(.tag) -
RInStr(.tag, "/")))
+ ' ' .Add(("Do not mount"))
+ ' '
+ ' ' '.ReadOnly = TRUE
+ ' ' END WITH
+ ' ' ME.oWMntPoints.Add(cb)
+ ' '
+ ' '
+ ' '
+ ' ' y = y + tl.Height + 4
+ ' ' NEXT
+ ' '
+ ' '
+ ' '
+ ' '
+ ' ' 'END IF
ELSE
' no widnows partitions found
|
|
From: <cod...@go...> - 2008-11-23 04:55:18
|
Author: M0...@gm...
Date: Sat Nov 22 20:53:53 2008
New Revision: 319
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/MdlLilo.module
branches/iVL/MdlWinDrives.module
Log:
Attempt to fix lilo and windows partition detection woes
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/.project
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsGlobal.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsPartSel.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/ClsWinDrives.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FMain.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmDiskPart.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartScheme.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPartSel.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmPkgSel.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSelISO.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmSummary.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/FrmWinDrives.class
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlCore.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlDiskPart.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlObjSizer.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPartSel.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlPkgSel.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSetup.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlSummarize.module
+# /home/henriquez/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 Sat Nov 22 20:53:53 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer2/MdlWinDrives.module
+# /home/henriquez/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Sat Nov 22 20:53:53 2008
@@ -396,7 +396,7 @@
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") OR IF IsDir(sTmpMountPoint &/ "winnt") THEN
+ IF Exist(sTmpMountPoint &/ "*winnt*"
&/ "*system32*" &/ "*winver.exe*") OR IF Exist(sTmpMountPoint
&/ "*WINDOWS*" &/ "*system32*" &/ "*winver.exe*") OR IF
IsDir(sTmpMountPoint &/ "*winnt*") THEN
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
.Index = .Count - 1
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Sat Nov 22 20:53:53 2008
@@ -145,7 +145,8 @@
END IF
'we need to know if this fails. it fails on a test machine
here with "bad partition table"
SHELL "export s=$(parted " & Left(wintfs[i], Len("/dev/hda"))
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'
\'" TO sPartsize
- IF sPartSize.len = 0 THEN
+ 'IF sPartSize.len = 0 THEN
+ IF Len(sPartsize) = 0 THEN
sPartSize = "UNKNOWN"
ENDIF
tl = NEW TextLabel(FrmWinDrives.svWinDrives)
|
|
From: <cod...@go...> - 2008-11-23 04:34:18
|
Author: uelsk8s
Date: Sat Nov 22 20:33:46 2008
New Revision: 318
Modified:
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlWinDrives.module
branches/iVL/installer.gambas
Log:
changed detection of windows updated installer
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Sat Nov 22 20:33:46 2008
@@ -30,7 +30,7 @@
msgid "Do not mount"
msgstr ""
-#: MdlWinDrives.module:186
+#: MdlWinDrives.module:190
msgid "No Windows partitions detected"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sat Nov 22 20:33:46 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=FMain
-Version=0.1.5
+Version=0.1.6
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Sat Nov 22 20:33:46 2008
@@ -123,8 +123,9 @@
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 IF IsDir("/mnt" &/ sWinAddr &/ "winnt") = TRUE
THEN '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
+ IF IsDir("/mnt" &/ sWinAddr &/ "windows") OR IF IsDir("/mnt"
&/ sWinAddr &/ "WINDOWS") OR IF IsDir("/mnt" &/ sWinAddr &/ "winnt") OR IF
IsDir("/mnt" &/ sWinAddr &/ "WINNT") = TRUE THEN
' this is indeed a windows installation
WITH FrmLilo.tsOsSetup
Modified: branches/iVL/MdlWinDrives.module
==============================================================================
--- branches/iVL/MdlWinDrives.module (original)
+++ branches/iVL/MdlWinDrives.module Sat Nov 22 20:33:46 2008
@@ -143,7 +143,11 @@
ELSE
sBlank = " "
END IF
+ 'we need to know if this fails. it fails on a test machine
here with "bad partition table"
SHELL "export s=$(parted " & Left(wintfs[i], Len("/dev/hda"))
& " print | grep ^\'" & sBlank & sPartNo & "\'); echo $s | cut -f 4 -d \'
\'" TO sPartsize
+ IF sPartSize.len = 0 THEN
+ sPartSize = "UNKNOWN"
+ ENDIF
tl = NEW TextLabel(FrmWinDrives.svWinDrives)
WITH tl
.y = y
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-22 08:07:59
|
Author: uelsk8s
Date: Sat Nov 22 00:05:52 2008
New Revision: 317
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/MdlConfLilo.module
branches/iVL/MdlInstallSys.module
branches/iVL/installer.gambas
Log:
updated installer
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 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 Sat Nov 22 00:05:52 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmUserAdd
-Version=0.1.2
+Startup=FMain
+Version=0.1.5
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,6 +17,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/root/gui-installer2/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Sat Nov 22 00:05:52 2008
@@ -352,7 +352,7 @@
SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
SHELL "touch " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
sOut = "#!/bin/bash \n" &
- "/sbin/vxconf" &
+ "/sbin/vxconf \n" &
"#/sbin/config-stage1 gui-installer" & gb.NewLine
File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",
sOut)
' 'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Sat Nov 22 00:05:52 2008
@@ -850,7 +850,7 @@
FOR i = 0 TO sList.count - 1
'sLine = Trim(sList[i])
'PRINT sList[i]
- IF Left(sList[i], Len("BULK")) = "BULK" THEN
+ IF Left(sList[i], Len("CONF")) = "CONF" THEN
sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
sTrimmed = Left(sTrimmed, InStr(sTrimmed, "\'") - 1)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-22 07:10:57
|
Author: uelsk8s
Date: Fri Nov 21 23:09:46 2008
New Revision: 316
Modified:
branches/iVL/MdlConfLilo.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
added xconf after boot, fixed progress for conf bulk
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Nov 21 23:09:46 2008
@@ -348,14 +348,15 @@
SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &"
-' SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-' SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-' SHELL "touch " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
-' sOut = "#!/bin/bash \n" &
-' "/sbin/config-stage1 gui-installer" & gb.NewLine
-' File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",
sOut)
+ SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+ SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+ SHELL "touch " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
+ sOut = "#!/bin/bash \n" &
+ "/sbin/vxconf" &
+ "#/sbin/config-stage1 gui-installer" & gb.NewLine
+ File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",
sOut)
' 'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
-' SHELL "chmod +x " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
+ SHELL "chmod +x " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
' 'SHELL "chroot /mnt/target " WAIT
END
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Fri Nov 21 23:09:46 2008
@@ -796,7 +796,7 @@
ELSE
ii = (i + 1)
ENDIF
- FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & ii & " of " & iTlzTotal 'sTlzName
+ FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & ii & " of " & (iTlzTotal + 1) 'sTlzName
'hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
hproc = EXEC ["installpkg", sTlzPath, "-R",
ClsGlobal.sTargetMnt]
'hproc = exec
["installpkg",sTlzPath,"-R",ClsGlobal.sTargetMnt
@@ -828,52 +828,60 @@
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
-
+ DIM sList AS String[]
+ DIM sCount AS String[]
+ DIM sTrimmed AS String
+ DIM sLineArr AS String[]
+ DIM sBulkPath AS String
+ DIM vBulkSize AS Variant
+ DIM sBulkDesc AS String
+ DIM vTargetSize AS Variant
+ DIM i AS Integer
+ 'DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "veclinux"
&/ "SETUP.CONF")
+ DIM sLine AS String
+
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
+ sList = Split(sRawList, "\n")
+ 'PRINT sRawList & "srawlist " & sList.Count
+ FOR i = 0 TO sList.count - 1
+ 'sLine = Trim(sList[i])
+ 'PRINT sList[i]
+ IF Left(sList[i], Len("BULK")) = "BULK" THEN
+
+ sTrimmed = Right(sList[i], Len(sList[i]) - InStr(sList[i], "\'"))
+ sTrimmed = Left(sTrimmed, InStr(sTrimmed, "\'") - 1)
+ sLineArr = Split(sTrimmed, ":")
+ sBulkPath = sLineArr[0]
+ vBulkSize = sLineArr[1]
+ sBulkDesc = sLineArr[2]
+ 'PRINT sBulkPath & vBulkSize & sBulkDesc
+ FrmInstallSys.pbInstallProg.Value = 0
+ 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 & " ..."
+ 'ME.BULK_INSTALL(ClsGlobal.sSourceMnt &/ "veclinux" &/
sBulkPath)
+ hproc = SHELL "lzmadec <" & ClsGlobal.sSourceMnt
&/ "veclinux" &/ sBulkPath & " | tar -xp -C " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ PRINT sBulkPath
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT 2
+ 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
+ END IF
+ END IF
+ FrmInstallSys.pbInstallProg.Value = 1
+ WAIT
+ 'FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+ NEXT
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Nov 21 23:09:46 2008
@@ -557,7 +557,7 @@
ELSE IF Exist(sBasePath &/ "gentoo-release") THEN
sDesc = "Gentoo"
ELSE IF Exist(sBasePath &/ "debian_version") THEN
- SHELL "grep -m 1 cdrom " & sBasePath &/ "apt" &/ "sources.list |
cut -d \"[\" -f1 | cut -d \" \" -f 1,2" TO sDesc
+ SHELL "grep -m 1 cdrom " & sBasePath &/ "apt" &/ "sources.list |
cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sDesc
sDesc = Trim(sDesc)
IF sDesc <> ""
sDesc = Replace(sDesc, " ", "_")
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Fri Nov 21 23:09:46 2008
@@ -192,7 +192,7 @@
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.iPkgCnt = ClsGlobal.iPkgCnt + 1
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + 3
ClsGlobal.iPkgTot = ClsGlobal.iBulkCnt + ClsGlobal.iPkgCnt
PRINT ClsGlobal.iPkgTot
ELSE ' GOING FOR CUSTOM INSTALL
@@ -249,8 +249,8 @@
UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
i = i + irs ' the count to the total
'add pkgs TO ClsGlobal.iPkgCnt
- ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs + 1
- ClsGlobal.iPkgTot = i + 1
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs + 3
+ ClsGlobal.iPkgTot = i + 3
END IF
PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
ClsGlobal.fPbInc = 0.6 / ClsGlobal.iBulkCnt
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-21 18:35:50
|
Author: M0E.lnx
Date: Fri Nov 21 10:31:36 2008
New Revision: 315
Modified:
branches/iVL/installer.gambas
Log:
updated binary
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-21 18:31:42
|
Author: M0E.lnx
Date: Fri Nov 21 10:30:58 2008
New Revision: 314
Modified:
branches/iVL/.project
branches/iVL/FrmUserAdd.class
branches/iVL/MdlLilo.module
branches/iVL/MdlLiloOsList.module
branches/iVL/installer.gambas
Log:
Added code to improve OS detection
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Nov 21 10:30:58 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmUserAdd
Version=0.1.2
Library=gb.gtk
Library=gb.form
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Fri Nov 21 10:30:58 2008
@@ -28,10 +28,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- .FrmCurr = ME
- .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- .tvPlan["Conf3"].picture = MdlCore.sNowPic
- .tvPlan["Conf3"].Selected = TRUE
+ ' .FrmCurr = ME
+ ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -58,6 +58,7 @@
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
FMain.btnext.Enabled = TRUE
+ ME.tbUsername.SetFocus
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Fri Nov 21 10:30:58 2008
@@ -396,7 +396,7 @@
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
+ IF Exist(sTmpMountPoint &/ "winnt" &/ "system32"
&/ "winver.exe") OR IF Exist(sTmpMountPoint &/ "WINDOWS" &/ "system32"
&/ "winver.exe") OR IF IsDir(sTmpMountPoint &/ "winnt") THEN
'Message(sPartition & " has a windows install")
WITH FrmLiloSetup.tsLIloTabs
.Index = .Count - 1
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Fri Nov 21 10:30:58 2008
@@ -557,7 +557,13 @@
ELSE IF Exist(sBasePath &/ "gentoo-release") THEN
sDesc = "Gentoo"
ELSE IF Exist(sBasePath &/ "debian_version") THEN
- sDesc = "Debian"
+ SHELL "grep -m 1 cdrom " & sBasePath &/ "apt" &/ "sources.list |
cut -d \"[\" -f1 | cut -d \" \" -f 1,2" TO sDesc
+ sDesc = Trim(sDesc)
+ IF sDesc <> ""
+ sDesc = Replace(sDesc, " ", "_")
+ ELSE
+ sDesc = "Debian"
+ END IF
ELSE IF Exist(sBasePath &/ "mandrake-release") THEN
sDesc = "Makdrake"
ELSE IF Exist(sBasePath &/ "redhat-release") THEN
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-21 14:39:54
|
Author: M0E.lnx
Date: Fri Nov 21 06:38:42 2008
New Revision: 313
Modified:
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmUserAdd.class
branches/iVL/installer.gambas
Log:
Removed X configuration, updated binary, fixed version numbers
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Nov 21 06:38:42 2008
@@ -1,8 +1,8 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=FrmUserAdd
-Version=0.0.220
+Startup=MdlCore
+Version=0.1.2
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Fri Nov 21 06:38:42 2008
@@ -521,11 +521,11 @@
END IF
- ' CONFIGURE X QUIETLY HERE
- Message.Warning(("VectorLinux will now try to detect and
configure your graphics hardware.") & "<br>" &
- ("Your screen may flicker or go blank for a few seconds during
this process."))
-
- MdlXconf.QUIET_XORG_CONFIGURATION()
+ ' ' ' ' ' CONFIGURE X QUIETLY HERE
+ ' ' ' ' Message.Warning(("VectorLinux will now try to detect and
configure your graphics hardware.") & "<br>" &
+ ' ' ' ' ("Your screen may flicker or go blank for a few seconds
during this process."))
+ ' ' ' '
+ ' ' ' ' MdlXconf.QUIET_XORG_CONFIGURATION()
frmNext = FrmDone
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Fri Nov 21 06:38:42 2008
@@ -28,10 +28,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- ' .FrmCurr = ME
- ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
- ' .tvPlan["Conf3"].Selected = TRUE
+ .FrmCurr = ME
+ .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-21 14:09:45
|
Author: M0E.lnx
Date: Fri Nov 21 06:08:39 2008
New Revision: 312
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/.project
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
Log:
fixed frame around user list
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/devel/installer/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,4 +1,4 @@
-# /home/henriquez/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 Fri Nov 21 06:08:39 2008
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmUserAdd
Version=0.0.220
Library=gb.gtk
Library=gb.form
@@ -11,7 +11,7 @@
Library=gb.form.mdi
Library=gb.gtk.ext
Description=GUI installer for Vector linux
-Authors=M0E-lnx
+Authors=M0E-lnx\nuelsk8s
TabSize=2
Translate=1
Language=en_US
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Fri Nov 21 06:08:39 2008
@@ -28,10 +28,10 @@
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
- .FrmCurr = ME
- .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- .tvPlan["Conf3"].picture = MdlCore.sNowPic
- .tvPlan["Conf3"].Selected = TRUE
+ ' .FrmCurr = ME
+ ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -292,7 +292,7 @@
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
.pbUsrPic.Move(.btgrpHelp.Left, .btgrpHelp.Top + .btgrpHelp.Height + 2)
.frmUserList.Move(iListLeft, iListTop, 160, iListBottom - iListTop)
- .LstUsers.Move(4, 8, 150, .frmUserList.Height - (.LstUsers.Top * 2))
+ .LstUsers.Move(4, 16, 150, .frmUserList.Height - (.LstUsers.Top) *
1.25)
' .LstUsers.Move(iListLeft, iListTop, 150, iListBottom - iListTop)
icby = 16
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Fri Nov 21 06:08:39 2008
@@ -102,11 +102,9 @@
{ frmUserList Frame
MoveScaled(35,16,18.8889,17)
Text = ("User Accounts")
- { LstUsers ListContainer
- MoveScaled(1,3,17,13)
- Visible = False
- Background = Color.Background
- ToolTip = ("List of created user accounts")
+ { LstUsers ScrollView
+ MoveScaled(1,2,17,13)
+ Border = False
}
}
}
|
|
From: <cod...@go...> - 2008-11-21 02:54:26
|
Author: M0...@gm...
Date: Thu Nov 20 18:53:18 2008
New Revision: 311
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/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
Log:
Modified size of user list
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Thu Nov 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/henriquez/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 Thu Nov 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/henriquez/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 20 18:53:18 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/henriquez/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Nov 20 18:53:18 2008
@@ -291,7 +291,9 @@
'.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
.pbUsrPic.Move(.btgrpHelp.Left, .btgrpHelp.Top + .btgrpHelp.Height + 2)
- .LstUsers.Move(iListLeft, iListTop, 170, iListBottom - iListTop)
+ .frmUserList.Move(iListLeft, iListTop, 160, iListBottom - iListTop)
+ .LstUsers.Move(4, 8, 150, .frmUserList.Height - (.LstUsers.Top * 2))
+ ' .LstUsers.Move(iListLeft, iListTop, 150, iListBottom - iListTop)
icby = 16
icbspace = 4
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Thu Nov 20 18:53:18 2008
@@ -99,10 +99,14 @@
Text = ("Real Name")
Alignment = Align.Normal
}
- { LstUsers ListContainer
- MoveScaled(36,18,21,12)
- Visible = False
- Background = Color.Background
- ToolTip = ("List of created user accounts")
+ { frmUserList Frame
+ MoveScaled(35,16,18.8889,17)
+ Text = ("User Accounts")
+ { LstUsers ListContainer
+ MoveScaled(1,3,17,13)
+ Visible = False
+ Background = Color.Background
+ ToolTip = ("List of created user accounts")
+ }
}
}
|
|
From: <cod...@go...> - 2008-11-20 22:00:59
|
Author: M0...@gm...
Date: Thu Nov 20 13:59:44 2008
New Revision: 310
Modified:
branches/iVL/.project
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
fixed bug in lilo step
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 20 13:59:44 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.219
+Version=0.0.220
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 20 13:59:44 2008
@@ -177,7 +177,7 @@
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
- sSection = "image = " & sBootPath &/ sKernel & "\n" &
+ sClisection = "image = " & sBootPath &/ sKernel & "\n"
&
"root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
"label = " & sLabel & "-tui" & "\n" &
"append = \"2 splash=verbose\"" & "\n" &
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-20 21:28:38
|
Author: M0...@gm...
Date: Thu Nov 20 13:27:23 2008
New Revision: 309
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlLilo.module
branches/iVL/MdlNetConf.module
branches/iVL/installer.gambas
Log:
Fixed woes in lilo and network steps
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Nov 20 13:27:23 2008
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:193
+#: FMain.class:195
msgid "Restart"
msgstr ""
-#: FMain.class:220
+#: FMain.class:222
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:221
+#: FMain.class:223
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:228
+#: FMain.class:230
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:241
+#: FMain.class:243
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "Yes"
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "No"
msgstr ""
-#: FMain.class:274
+#: FMain.class:276
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:278
+#: FMain.class:280
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:293
+#: FMain.class:295
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:293
+#: FMain.class:295
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:352
+#: FMain.class:354
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:354
+#: FMain.class:356
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:354
+#: FMain.class:356
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:368
+#: FMain.class:370
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:455
+#: FMain.class:459
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:773
+#: FMain.class:784
msgid "Back"
msgstr ""
-#: FMain.class:785
+#: FMain.class:796
msgid "Exit Installation"
msgstr ""
-#: FMain.class:797
+#: FMain.class:808
msgid "Next"
msgstr ""
-#: FMain.class:811
+#: FMain.class:822
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 20 13:27:23 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.218
+Version=0.0.219
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Nov 20 13:27:23 2008
@@ -95,6 +95,8 @@
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()
+ME.Maximized = TRUE
+
END
PUBLIC SUB AUTOSIZE_LEFT_PANE()
@@ -449,11 +451,14 @@
MdlConfLilo.GENERATE_LILO_DOT_CONF()
MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
MdlConfLilo.WRITE_LILO_DOT_CONF()
- IF MdlConfLilo.EXECUTE_LILO() <> 0 THEN RETURN
+ IF MdlConfLilo.EXECUTE_LILO() <> 0 THEN
+ STOP EVENT
+ RETURN
ELSE
' lilo installation / setup has been skipped
FrmLilo.tlBanner.Text = "<b>" & ("Skipping lilo setup") & "</b>"
END IF
+ END IF
SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&
/etc/rc.d/rc.udev restart"
'frmNext = FrmLiloOsList
frmNext = FrmZoneSet
@@ -676,5 +681,11 @@
PUBLIC SUB tvPlan_Click()
STOP EVENT
+
+END
+
+PUBLIC SUB PnlRight_MouseDown()
+
+
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Thu Nov 20 13:27:23 2008
@@ -3,6 +3,7 @@
{ Form Form
MoveScaled(0,0,96,74)
Text = ("")
+ Maximized = True
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
MoveScaled(1,1,94,10)
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Nov 20 13:27:23 2008
@@ -96,7 +96,8 @@
END IF
SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'" TO
sCHAR
- SHELL "grep -e ^" & ME.tbUsername.Text & Space(1) &
ClsGlobal.sTargetMnt &/ "etc/passwd" TO sLogE
+ 'SHELL "grep -e ^" & ME.tbUsername.Text & Space(1) &
ClsGlobal.sTargetMnt &/ "etc/passwd" TO sLogE
+ SHELL "grep -e ^" & ME.tbUsername.Text & ": " & clsglobal.sTargetMnt
&/ "etc" &/ "passwd" TO sLogE
IF sCHAR <> "" THEN
Message(("Username contains illegal characters"))
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 20 13:27:23 2008
@@ -27,14 +27,15 @@
PRIVATE i AS Integer ' used for object key
-PUBLIC SUB TRIGGER_LILO_SETUP()
+PUBLIC FUNCTION TRIGGER_LILO_SETUP() AS Integer
+ DIM IRET AS Integer
ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
'Moved binding to FMain.class right after packages finish installing.
'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
- MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
-
+ IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
+ RETURN IRET
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Thu Nov 20 13:27:23 2008
@@ -72,7 +72,7 @@
objIntTypes = NEW Object[]
- 'SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo
\"$res\" | tr -s \' \'" TO seths
+ 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")))
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-20 19:43:50
|
Author: M0...@gm...
Date: Thu Nov 20 11:42:47 2008
New Revision: 308
Modified:
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FrmLilo.class
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/installer.gambas
Log:
- Fixed list of user accounts created
- Fixed LILO errors
- Added default append line values
- Updated binary
- Installer is ready for testing.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 20 11:42:47 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.213
+Version=0.0.218
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Nov 20 11:42:47 2008
@@ -1,3 +1,5 @@
-- Resized (smaller) textboxes for hostname and domain name on Netconf
window (for better looks @ lower resolutions
+- Fixed list of user accounts created
+- Fixed LILO errors
+- Added default append line values
- Updated binary
-
+- Installer is ready for testing.
\ No newline at end of file
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Thu Nov 20 11:42:47 2008
@@ -50,6 +50,9 @@
MdlLiloOsList.list_boot_options()
ME.tsOsSetup.Index = 0
ME.cbDefBoot.Text = "Linux"
+
+'ME.cbDefBoot.Selection
+
FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Thu Nov 20 11:42:47 2008
@@ -18,24 +18,12 @@
PUBLIC SUB Form_Open()
-
-
- '
- ' 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
- ' ' '
- ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-' FMain.tvPlan["Inst1"].Selected = TRUE
- 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
+
ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
- ' ' ' FMain.tvPlan[" Conf0 "].Selected = TRUE"
- ' ' ' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
- ' ' ' FMain.tvPlan["Inst1"].Picture = MdlCore.sDoneP>"
+""
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
ME.list_video_modes()
FMain.FrmCurr = ME
@@ -46,12 +34,16 @@
MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
FMain.btnext.Enabled = TRUE
ME.cbVideoRes.text = "Bootsplash High"
+' ME.cbBootDefault_Click
+ME.cbVideoRes_Click()
ME.cbBootDefault.Text = "VectorLinux"
+
END
PUBLIC SUB CLEANUP_TABSTRIP()
DIM i AS Integer
+
' will remove blank tabstrip
FOR i = 0 TO ME.tsLIloTabs.Count
tsLIloTabs.Index = i
@@ -61,7 +53,7 @@
END IF
NEXT
-
+ ' fix append lines
END
@@ -123,7 +115,12 @@
FOR EACH tb IN MdlLilo.arrLinuxAppendtxtBoxes
IF InStr(tb.Text, "splash=") = FALSE THEN
IF tb.Tag <> "" THEN
- tb.Text = tb.Text & " splash=silent"
+ IF tb.Text = "" THEN
+ tb.Text = "splash=silent"
+ ELSE
+ tb.Text = tb.Text & " splash=silent"
+ END IF
+
ELSE
tb.Text = "splash=silent"
END IF
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Nov 20 11:42:47 2008
@@ -29,9 +29,9 @@
MdlUsrAdd.iUsrAccts = 0
WITH FMain
.FrmCurr = ME
- ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
- ' .tvPlan["Conf3"].Selected = TRUE
+ .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -68,7 +68,7 @@
DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
DIM sGroups AS
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
DIM cb AS CheckBox
- DIM tl AS TextBox
+ DIM tl AS TextLabel
'DIM tly AS Integer
@@ -159,13 +159,13 @@
ENDIF
'Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("was created."))
' easy way to create the account here
- tl = NEW TextLabel
+ tl = NEW TextLabel(ME.LstUsers)
WITH tl
.Text = ME.tbUsername.Text
.Height = 21
.Width = MdlObjSizer.get_object_width(.Text)
.ToolTip = ME.tbRealname.Text
- .Move(2, tly)
+ .Move(4, tly)
END WITH
tly = tly + tl.Height + 2
btClrFrm_Click() ' clear the form
@@ -187,7 +187,7 @@
'SHELL "umount /mnt/target/sys" WAIT
'ME.LIST_NEW_USER_ACCOUNT()
-
+ ME.LstUsers.Visible = TRUE
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Thu Nov 20 11:42:47 2008
@@ -101,6 +101,7 @@
}
{ LstUsers ListContainer
MoveScaled(36,18,21,12)
+ Visible = False
Background = Color.Background
ToolTip = ("List of created user accounts")
}
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-20 16:45:16
|
Author: M0...@gm...
Date: Thu Nov 20 08:44:57 2008
New Revision: 307
Modified:
branches/iVL/.project
branches/iVL/FrmDone.class
branches/iVL/FrmUserAdd.class
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
fixed lilo bug in CLI entry. resized user list in user add window
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 20 08:44:57 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.210
+Version=0.0.213
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Nov 20 08:44:57 2008
@@ -38,6 +38,7 @@
("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
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Nov 20 08:44:57 2008
@@ -18,7 +18,7 @@
PUBLIC iUID AS Integer = 1000
-
+PRIVATE tly AS Integer
PRIVATE otl AS Object[]
PUBLIC otb AS Object[]
@@ -68,6 +68,8 @@
DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
DIM sGroups AS
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
DIM cb AS CheckBox
+ DIM tl AS TextBox
+ 'DIM tly AS Integer
' increment the number of user accounts created
@@ -155,7 +157,17 @@
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."))
+ 'Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("was created."))
+ ' easy way to create the account here
+ tl = NEW TextLabel
+ WITH tl
+ .Text = ME.tbUsername.Text
+ .Height = 21
+ .Width = MdlObjSizer.get_object_width(.Text)
+ .ToolTip = ME.tbRealname.Text
+ .Move(2, tly)
+ END WITH
+ tly = tly + tl.Height + 2
btClrFrm_Click() ' clear the form
INC iUID
ELSE
@@ -174,7 +186,7 @@
'SHELL "umount /mnt/target/tmp" WAIT
'SHELL "umount /mnt/target/sys" WAIT
-ME.LIST_NEW_USER_ACCOUNT()
+'ME.LIST_NEW_USER_ACCOUNT()
END
@@ -203,12 +215,12 @@
sUsrRlName = arrline[4]
sUsrHome = arrline[5]
NEXT
- IF iUID >= 1000 THEN
+ IF iUID >= 500 THEN
tl = NEW TextLabel(LstUsers) AS "UserList"
WITH tl
.Height = 21
- .Width = LstUsers.Width
.Text = sUsrLogin
+ .Width = MdlObjSizer.get_object_width(.Text)
.ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
"<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
.Move(0, tly)
@@ -278,7 +290,7 @@
'.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
.pbUsrPic.Move(.btgrpHelp.Left, .btgrpHelp.Top + .btgrpHelp.Height + 2)
- .LstUsers.Move(iListLeft, iListTop, 200, iListBottom - iListTop)
+ .LstUsers.Move(iListLeft, iListTop, 170, iListBottom - iListTop)
icby = 16
icbspace = 4
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Nov 20 08:44:57 2008
@@ -175,10 +175,16 @@
"read-only" & "\n"
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\"")
- sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "\n"
+ IF chbox.tag = cb.Tag THEN
+ sSection = "image = " & sBootPath &/ sKernel & "\n" &
+ "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
+ "label = " & sLabel & "-tui" & "\n" &
+ "append = \"2 splash=verbose\"" & "\n" &
+ "initrd = " & sBootPath &/ sInitrd & "\n" &
+ "read-only" & "\n"
+ ' sClisection = sSection
+ ' sClisection = Replace(sClisection, "append = " &
sAppend, "append = \"2 splash=verbose\"")
+ ' sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "\n"
ELSE
sClisection = ""
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-20 14:26:09
|
Author: M0...@gm...
Date: Thu Nov 20 06:25:21 2008
New Revision: 306
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/installer.gambas
Log:
Added listing of created user accounts
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Nov 20 06:25:21 2008
@@ -86,23 +86,23 @@
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:454
+#: FMain.class:455
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:772
+#: FMain.class:773
msgid "Back"
msgstr ""
-#: FMain.class:784
+#: FMain.class:785
msgid "Exit Installation"
msgstr ""
-#: FMain.class:796
+#: FMain.class:797
msgid "Next"
msgstr ""
-#: FMain.class:810
+#: FMain.class:811
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Nov 20 06:25:21 2008
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:198
+#: MdlSetup.module:199
msgid "Calculating package count ... Please wait"
msgstr ""
-#: MdlSetup.module:254
+#: MdlSetup.module:255
msgid "Total bulks to be installed = "
msgstr ""
-#: MdlSetup.module:257
+#: MdlSetup.module:258
msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlSetup.module:300
+#: MdlSetup.module:301
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:316
+#: MdlSetup.module:317
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:318
+#: MdlSetup.module:319
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Nov 20 06:25:21 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.209
+Version=0.0.210
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/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Nov 20 06:25:21 2008
@@ -29,9 +29,9 @@
MdlUsrAdd.iUsrAccts = 0
WITH FMain
.FrmCurr = ME
- .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- .tvPlan["Conf3"].picture = MdlCore.sNowPic
- .tvPlan["Conf3"].Selected = TRUE
+ ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf3"].Selected = TRUE
END WITH
WITH ME
.tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -174,18 +174,63 @@
'SHELL "umount /mnt/target/tmp" WAIT
'SHELL "umount /mnt/target/sys" WAIT
-
+ME.LIST_NEW_USER_ACCOUNT()
END
+ PUBLIC SUB LIST_NEW_USER_ACCOUNT()
+ 'needs to verify with /etc/passwd to check for user account
+ DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt
&/ "etc" &/ "passwd")))
+ DIM arrline AS String[]
+ DIM i, ii, iUID AS Integer
+ DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
+ DIM vuid AS Variant
+ DIM tl AS TextLabel
+ DIM tly AS Integer
+
+ FrmUserAdd.LstUsers.Clear
+ tly = 4
+ FOR i = 0 TO sFile.count - 1
+ sLine = sFile[i]
+ ' now split each line
+ arrline = Split(sLine, ":")
+ FOR ii = 0 TO arrline.count - 1
+ sSec = Trim(arrline[ii])
+ vuid = arrline[2]
+ iUID = CInt(vuid)
+ sUsrLogin = arrline[0]
+ sUsrRlName = arrline[4]
+ sUsrHome = arrline[5]
+ NEXT
+ IF iUID >= 1000 THEN
+ tl = NEW TextLabel(LstUsers) AS "UserList"
+ WITH tl
+ .Height = 21
+ .Width = LstUsers.Width
+ .Text = sUsrLogin
+ .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "
& "</b > " & iUid &
+ "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
+ .Move(0, tly)
+ END WITH
+ tly = tly + tl.Height + 2
+ END IF
+ NEXT
+
+
+
+
+END
+
+
+
PUBLIC SUB Form_Resize()
DIM iboxleft AS Integer
DIM iboxwidth AS Integer = 250
DIM cb AS CheckBox
- DIM icbspace AS Integer
+ DIM icbspace, iListBottom, iListTop, iListLeft AS Integer
DIM icby AS Integer
DIM tl AS TextLabel
DIM tb AS TextBox
@@ -210,6 +255,9 @@
IF tb.tag = "line4" THEN itlbottom = tl.top + tl.Height + 8
NEXT
+ iListTop = tbUsername.Top
+ iListLeft = tbUsername.Left + tbUsername.Width + 8
+ iListBottom = tbPasswd2.top + tbPasswd2.Height
WITH ME
@@ -227,8 +275,10 @@
.Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8,
MdlObjSizer.get_object_width(.Button1.Text) + 36)
.btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
'.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
- .pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
+ '.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
+ .pbUsrPic.Move(.btgrpHelp.Left, .btgrpHelp.Top + .btgrpHelp.Height + 2)
+ .LstUsers.Move(iListLeft, iListTop, 200, iListBottom - iListTop)
icby = 16
icbspace = 4
@@ -388,14 +438,15 @@
END
PUBLIC SUB Form_Show()
-
- Fmain.frmcurr = ME
-
- WITH FMain
- .FrmCurr = ME
- .tvPlan["Conf2"].Picture = MdlCore.sDonePic
- .tvPlan["Conf3"].picture = MdlCore.sNowPic
- .tvPlan["Conf3"].Selected = TRUE
- END WITH
+ '
+ ME.Form_Open()
+ ' Fmain.frmcurr = ME
+ '
+ ' WITH FMain
+ ' .FrmCurr = ME
+ ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf3"].Selected = TRUE
+ ' END WITH
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Thu Nov 20 06:25:21 2008
@@ -52,6 +52,10 @@
Text = ("Help")
Picture = Picture["icon:/16/help"]
}
+ { pbUsrPic PictureBox
+ MoveScaled(58,6,8,8)
+ Stretch = True
+ }
}
{ Button1 Button
MoveScaled(1,63,14,3)
@@ -89,14 +93,15 @@
{ hrSep Separator
MoveScaled(22,7,12,1)
}
- { pbUsrPic PictureBox
- MoveScaled(35,19,8,8)
- Stretch = True
- }
{ tlRealName TextLabel
MoveScaled(2,21,12,3)
Tag = "line2"
Text = ("Real Name")
Alignment = Align.Normal
+ }
+ { LstUsers ListContainer
+ MoveScaled(36,18,21,12)
+ Background = Color.Background
+ ToolTip = ("List of created user accounts")
}
}
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-20 03:29:53
|
Author: uelsk8s
Date: Wed Nov 19 19:28:54 2008
New Revision: 305
Modified:
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmLiloSetup.class
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlLilo.module
branches/iVL/MdlNetConf.module
branches/iVL/MdlSetup.module
Log:
fixed progress bar bug
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 19 19:28:54 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.200
+Version=0.0.209
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,6 +17,7 @@
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 Wed Nov 19 19:28:54 2008
@@ -413,7 +413,8 @@
'POST INSTALL CONFIGURATION
CASE "FrmInstallSys"
MdlInstallSys.WRITE_NEW_DISTRO_ID()
- MdlConfLilo.PERFORM_BINDING()
+ 'moved binding to end of install in MdlInstallCustom.INSTALL_KERNELS
+ 'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for system
config
'frmNext = FrmLilo
frmNext = FrmLiloSetup
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Wed Nov 19 19:28:54 2008
@@ -45,6 +45,8 @@
ME.CLEANUP_TABSTRIP()
MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
FMain.btnext.Enabled = TRUE
+ ME.cbVideoRes.text = "Bootsplash High"
+ ME.cbBootDefault.Text = "VectorLinux"
END
PUBLIC SUB CLEANUP_TABSTRIP()
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Wed Nov 19 19:28:54 2008
@@ -24,7 +24,7 @@
PRIVATE sDump AS String
PRIVATE sErr AS String
'PRIVATE iPkgCnt AS Integer
-PRIVATE iPkgNum AS Integer
+'PRIVATE iPkgNum AS Integer
PUBLIC SUB PERFORM_CUSTOM_INSTALL()
@@ -41,26 +41,26 @@
'ME.CALCULATE_TOTAL_PACKAGES()
'RETURN
WAIT 2
- iRet = ME.INSTALL_REQUIRED_BULKS()
PRINT " INSTALLING REQUIRED BULKS"
+ iRet = ME.INSTALL_REQUIRED_BULKS()
IF iRet <> 0 THEN
'exit this is an error
Message.Error(("There as been an error while installing required
system software. ") & gb.newline & sErr)
RETURN
END IF
+ PRINT "INSTALING USER-SELECTED BULKS"
iRet = ME.INSTALL_USER_SELECTED_BULKS()
'Message("Installing user-selected bulks")
- PRINT "INSTALING USER-SELECTED BULKS"
IF iRet <> 0 THEN
Message.Error(("There has been an error while installing optional
software to your system. ") & gb.newline & sErr)
RETURN
END IF
'iret = ME.INSTALL_USER_SELECTED_PACKAGES()
+ PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
iret = ME.INSTALL_USER_PACKAGES() ' new code based on the gridview
'Message("Installing user-selected packages")
- PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
IF iRet <> 0 THEN
Message.Error(("There has been an error while installing optional
software to your system.") & gb.newline & sErr)
RETURN
@@ -70,9 +70,8 @@
' Make sure we set the right value for the progress bar here
'MdlInstallSys.iPkgCnt = iPkgCnt
'MdlInstallSys.iPkgNum = iPkgNum
- iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
PRINT "INSTALLING ADDITIONAL REQUIRED SOFTWARE"
-
+ iret = MdlInstallSys.INSTALL_REQUIRED_PACKAGES()
IF iret <> 0 THEN
Message.Error(("Error while installing required system software. ") &
gb.NewLine & sErr)
RETURN
@@ -80,20 +79,28 @@
'iret = ME.INSTALL_CONF_PACKAGES()
'/ USE THE FUNCTION IN MDLINSTALLSYS.MODULE DOES THE EXACT SAME THING
AND HAS PROGRESS UPDATING
- iret = MdlInstallSys.INSTALL_CONFIG_PACKAGES()
PRINT "INSTALLING CONFIGURATION PACKAGES"
+ iret = MdlInstallSys.INSTALL_CONFIG_PACKAGES()
IF iret <> 0 THEN
Message.Error(("Error while installing system configuration. ") &
gb.NewLine & sErr)
RETURN
END IF
- iret = ME.INSTALL_KERNELS()
PRINT "INSTALLING KERNELS"
+ iret = ME.INSTALL_KERNELS()
IF iret <> 0 THEN
Message.Error(("Unable to install kernels. ") & gb.NewLine & sErr)
RETURN
END IF
+ PRINT "Binding and config"
+ MdlConfLilo.PERFORM_BINDING()
+ 'iret = MdlConfLilo.PERFORM_BINDING()
+ 'IF iret <> 0 THEN
+ ' Message.Error(("Unable to Bind Mount. ") & gb.NewLine & sErr)
+ ' RETURN
+ 'END IF
+
' write new fstab now
MdlInstallSys.WRITE_NEW_FSTAB()
@@ -197,8 +204,8 @@
EXEC ["echo \" \" > /tmp/installdump"] WAIT
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)
+ INC ClsGlobal.iPkgNum
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.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"]
@@ -275,9 +282,9 @@
' update step progress
INC i
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
- INC iPkgNum
+ INC ClsGlobal.iPkgNum
'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
'IF InStr(sDump, "FAILED") > 0 THEN
IF hproc.Value > 0 THEN
Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
@@ -389,7 +396,7 @@
' EXEC ["gzise=$(df | grep " & ClsGlobal.sTargetMnt & ") && echo $gzise
| cut -f3 -d \' \'"] TO vTargetSize
END IF
FrmInstallSys.pbInstallProg.Value = 0
- INC iPkgNum
+ INC ClsGlobal.iPkgNum
PRINT " Installing " & sBulkPath
MdlSetup.SHOW_PROGRESS_CONTROLS()
FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
@@ -406,7 +413,7 @@
FrmInstallSys.tlCurrPkg.Text = Trim(sDesc)
IF vSize <> "" THEN
'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),
CFloat(vSize))
- MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize, iPkgNum)
+ MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize,
ClsGlobal.iPkgNum)
FrmInstallSys.pbInstallProg2.Value =
(FrmInstallSys.pbInstallProg2.Value + (ClsGlobal.fPbInc - (ClsGlobal.fPbInc
* FrmInstallSys.pbInstallProg.Value)) / 100)
END IF
@@ -420,7 +427,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(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
RETURN 0
END IF
' END IF
@@ -441,8 +448,8 @@
SHELL "gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo $gsize
| cut -f3 -d \' \'" TO vTargetSize
END IF
FrmInstallSys.pbInstallProg.Value = 0
- INC iPkgNum
- PRINT "Package " & iPkgNum & " of " & ClsGlobal.iPkgTot
+ INC ClsGlobal.iPkgNum
+ PRINT "Package " & ClsGlobal.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
@@ -457,7 +464,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), iPkgNum)
+ MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, CInt(vSize),
ClsGlobal.iPkgNum)
END IF
UNTIL
@@ -472,7 +479,7 @@
ELSE
FrmInstallSys.pbInstallProg.Value = 1
WAIT
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
RETURN 0
END IF
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Wed Nov 19 19:28:54 2008
@@ -315,21 +315,22 @@
ClsGlobal.iPkgTot = MdlSetup.CALCULATE_PACKAGE_COUNT(FALSE)
'Message.Info("Total packages = " & iPkgCnt)
PRINT "Total packages to be installed " & ClsGlobal.iPkgTot
+
PRINT "Installing bulks"
MdlSetup.SHOW_PROGRESS_CONTROLS()
-
iret = ME.INSTALL_BULK_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing bulks ... exit"
RETURN
END IF
+
PRINT "installing packages"
-
iret = ME.INSTALL_PACKAGES_NEW()
IF iret <> 0 THEN
PRINT "error installing packages ... exit"
RETURN
END IF
+
PRINT "Installing packages/required"
'MdlSetup.SHOW_PROGRESS_CONTROLS()
iret = ME.INSTALL_REQUIRED_PACKAGES()
@@ -337,9 +338,9 @@
PRINT "Error installing packages/required ... exit"
RETURN
END IF
+
PRINT "installing CONFIG packages from SETUP.CONF"
'MdlSetup.SHOW_PROGRESS_CONTROLS()
-
iret = ME.INSTALL_CONFIG_PACKAGES()
IF iret <> 0 THEN
PRINT "Error installing config packages ... exit"
@@ -353,6 +354,14 @@
RETURN
END IF
+ PRINT "Binding and config"
+ MdlConfLilo.PERFORM_BINDING()
+ 'iret = MdlConfLilo.PERFORM_BINDING()
+ 'IF iret <> 0 THEN
+ ' Message.Error(("Unable to Bind Mount. ") & gb.NewLine & sErr)
+ ' RETURN
+ 'END IF
+
' WRITE THE FSTAB NOW
MdlInstallSys.WRITE_NEW_FSTAB()
FrmInstallSys.pbInstallProg.Value = 1
@@ -751,7 +760,7 @@
PUBLIC FUNCTION INSTALL_REQUIRED_PACKAGES() AS Integer
- DIM i AS Integer
+ DIM i, ii AS Integer
DIM sList AS String[]
DIM sRawList AS String
'DIM sRawFile AS String
@@ -782,7 +791,12 @@
' clear the dump
'SHELL "echo \' \' > /tmp/installdump" WAIT
'EXEC "echo", " ", "/tmp/installdump"] WAIT
- FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & sTlzName
+ IF i > iTlzTotal THEN
+ ii = iTlzTotal
+ ELSE
+ ii = (i + 1)
+ ENDIF
+ FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & ii & " of " & iTlzTotal 'sTlzName
'hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
hproc = EXEC ["installpkg", sTlzPath, "-R",
ClsGlobal.sTargetMnt]
'hproc = exec
["installpkg",sTlzPath,"-R",ClsGlobal.sTargetMnt
@@ -804,7 +818,7 @@
INC ClsGlobal.iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, ClsGlobal.iPkgNum)
+ FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
'Message(sTlzPath & "<br>" & sTlzName)
@@ -851,7 +865,7 @@
hproc.State = Process.Stopped
END IF
INC ClsGlobal.iPkgNum
- FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgCnt, 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
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 19 19:28:54 2008
@@ -31,7 +31,8 @@
ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
- MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
+ 'Moved binding to FMain.class right after packages finish installing.
+ 'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
@@ -176,7 +177,7 @@
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, "append = " &
sAppend, "append = \"2 splash=verbose\"")
sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "\n"
ELSE
sClisection = ""
@@ -299,7 +300,7 @@
END IF
NEXT
-EXEC ["umount", "/mnt/target"] WAIT
+'EXEC ["umount", "/mnt/target"] WAIT
END
Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module (original)
+++ branches/iVL/MdlNetConf.module Wed Nov 19 19:28:54 2008
@@ -72,10 +72,10 @@
objIntTypes = NEW Object[]
- SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo
\"$res\" | tr -s \' \'" TO seths
+ '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
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Nov 19 19:28:54 2008
@@ -192,6 +192,7 @@
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.iPkgCnt = ClsGlobal.iPkgCnt + 1
ClsGlobal.iPkgTot = ClsGlobal.iBulkCnt + ClsGlobal.iPkgCnt
PRINT ClsGlobal.iPkgTot
ELSE ' GOING FOR CUSTOM INSTALL
@@ -223,8 +224,8 @@
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
+ 'add config bulks to ClsGlobal.iBulkCnt
+ ClsGlobal.iBulkCnt = ClsGlobal.iBulkCnt + sOutArr.Count
ELSE
i = i + 1
'add config bulks to ClsGlobal.iPkgCnt cause they are small and at
the end
@@ -248,8 +249,8 @@
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
+ ClsGlobal.iPkgCnt = ClsGlobal.iPkgCnt + irs + 1
+ ClsGlobal.iPkgTot = i + 1
END IF
PRINT ("Total bulks to be installed = ") & ClsGlobal.iBulkCnt
ClsGlobal.fPbInc = 0.6 / ClsGlobal.iBulkCnt
|
|
From: <cod...@go...> - 2008-11-19 22:25:33
|
Author: M0...@gm...
Date: Wed Nov 19 14:24:38 2008
New Revision: 304
Modified:
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FrmNetConf.form
branches/iVL/installer.gambas
Log:
- Resized (smaller) textboxes for hostname and domain name on Netconf
window (for better looks @ lower resolutions
- Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 19 14:24:38 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.199
+Version=0.0.200
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Nov 19 14:24:38 2008
@@ -1,3 +1,3 @@
-- Fixed bugs in LILO setup step
-- Fixed syntax errors in generated lilo.conf
-- Optimized Network and Install windows for 800x600 resolutions
+- Resized (smaller) textboxes for hostname and domain name on Netconf
window (for better looks @ lower resolutions
+- Updated binary
+
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Wed Nov 19 14:24:38 2008
@@ -25,17 +25,17 @@
Alignment = Align.Normal
}
{ txtHostName TextBox
- MoveScaled(16,0,28,3)
+ MoveScaled(16,0,22.8571,3)
Text = ("")
MaxLength = 24
}
{ tlDomainName TextLabel
- MoveScaled(45,0,9,3)
+ MoveScaled(41,0,9,3)
Text = ("Domain")
Alignment = Align.Normal
}
{ tbDomain TextBox
- MoveScaled(56,0,29,3)
+ MoveScaled(52,0,22.8571,3)
Text = ("")
MaxLength = 24
}
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-19 22:11:26
|
Author: M0...@gm...
Date: Wed Nov 19 14:10:16 2008
New Revision: 303
Modified:
branches/iVL/.project
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
More bugfixes on lilo setup
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 19 14:10:16 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.192
+Version=0.0.199
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 19 14:10:16 2008
@@ -30,7 +30,8 @@
PUBLIC SUB TRIGGER_LILO_SETUP()
ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf
- MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
+ ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place
+ MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
@@ -55,7 +56,7 @@
sOutput = "# VESA framebuffer console @ 1024x768x64k \n" &
"vga = " & sVga & "\n" &
-"# Normal VGA console n" &
+"# Normal VGA console \n" &
"#vga = normal \n" &
"#VESA framebuffer console @ 1024 x768x64k \n" &
"#vga = 791 \n" &
@@ -74,7 +75,8 @@
"#VESA framebuffer console @ 640 x480x32k \n" &
"#vga = 784 \n" &
"#VESA framebuffer console @ 640 x480x256 \n" &
-"#vga = 769"
+"#vga = 769 \n" &
+"# Begin listing OS Choices \n"
RETURN sOutput
@@ -119,8 +121,8 @@
sHeader = sHeader & "\n" &
"bitmap = /boot/bitmap/boot.bmp \n"
END IF
- sHeader = sHeader & "\n" &
- "# Begin listing OS Choices \n"
+ 'sHeader = sHeader & "\n" &
+
RETURN sHeader
@@ -169,7 +171,7 @@
"label = " & sLabel & "\n" &
"append = \"" & sAppend & "\"" & "\n" &
"initrd = " & sBootPath &/ sInitrd & "\n" &
- "read only" & "\n"
+ "read-only" & "\n"
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
@@ -183,7 +185,17 @@
END IF
NEXT
- FOR EACH chbox IN ME.arrWinBootChecks
+
+ 'Message(sSection)
+ sOsEntries = sOsEntries & "\n" & sSection & "\n" &
sClisection '& "\n" & sWinSection
+
+ ' IF sClisection THEN Message(sClisection)
+ 'sSection = "image=" & "boot" &/ tb.Text
+ 'Message(sSection)
+ 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
@@ -195,26 +207,16 @@
ELSE
sWinSection = ""
END IF
+ sOsEntries = sOsEntries & "\n" & sWinSection
+
NEXT
END IF
NEXT
-
-
-
-
- 'Message(sSection)
- sOsEntries = sOsEntries & "\n" & sSection & "\n" & sClisection
& "\n" & 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()
sVidModeSection = ME.GENERATE_LILO_DOT_CONF_VIDEOMODES_SECTION()
- sFile = sHeader & "<br>" & sVidModeSection & "<br><br>" & sOsEntries
+ sFile = sHeader & "\n" & sVidModeSection & "\n \n" & sOsEntries
'Message(sFile)
@@ -249,9 +251,9 @@
'ClsPartSel.sRoot = "/dev/sdb8"
'ClsPartSel.fRoot = "reiserfs"
- ' TRY MKDIR ClsGlobal.sTargetMnt &/ "boot"
- ' TRY MKDIR ClsGlobal.sTargetMnt &/ "boot" &/ "tamu"
- ' TRY MKDIR ClsGlobal.sTargetMnt &/ "etc"
+ TRY MKDIR ClsGlobal.sTargetMnt &/ "boot"
+ TRY MKDIR ClsGlobal.sTargetMnt &/ "boot" &/ "tamu"
+ 'TRY MKDIR ClsGlobal.sTargetMnt &/ "etc"
FOR EACH cb IN MdlLilo.arrLinuxIncCheckboxes
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-19 18:37:06
|
Author: M0...@gm...
Date: Wed Nov 19 10:34:27 2008
New Revision: 302
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/DevLog
branches/iVL/FMain.class
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmLiloSetup.form
branches/iVL/FrmNetConf.class
branches/iVL/FrmNetConf.form
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
- Fixed bugs in LILO setup step
- Fixed syntax errors in generated lilo.conf
- Optimized Network and Install windows for 800x600 resolutions
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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.
@@ -18,91 +18,91 @@
msgid "Restart"
msgstr ""
-#: FMain.class:242
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr ""
-
-#: FMain.class:244
-msgid "Please wait while setup analyses your current partition setup."
-msgstr ""
-
-#: FMain.class:244
-msgid "This may take a while ..."
-msgstr ""
-
-#: FMain.class:258
-msgid "You must select a \"/\" partition. This is the target where the
system will install to"
-msgstr ""
-
-#: FMain.class:313
+#: FMain.class:220
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:314
+#: FMain.class:221
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:321
+#: FMain.class:228
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:344
-msgid "Skipping lilo setup"
-msgstr ""
-
-#: FMain.class:358
+#: FMain.class:241
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "Yes"
msgstr ""
-#: FMain.class:373
+#: FMain.class:256
msgid "No"
msgstr ""
-#: FMain.class:391
+#: FMain.class:274
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:395
+#: FMain.class:278
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:410
+#: FMain.class:293
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:410
+#: FMain.class:293
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:662
+#: FMain.class:352
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr ""
+
+#: FMain.class:354
+msgid "Please wait while setup analyses your current partition setup."
+msgstr ""
+
+#: FMain.class:354
+msgid "This may take a while ..."
+msgstr ""
+
+#: FMain.class:368
+msgid "You must select a \"/\" partition. This is the target where the
system will install to"
+msgstr ""
+
+#: FMain.class:454
+msgid "Skipping lilo setup"
+msgstr ""
+
+#: FMain.class:772
msgid "Back"
msgstr ""
-#: FMain.class:674
+#: FMain.class:784
msgid "Exit Installation"
msgstr ""
-#: FMain.class:686
+#: FMain.class:796
msgid "Next"
msgstr ""
-#: FMain.class:700
+#: FMain.class:810
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Nov 19 10:34:27 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.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 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 Wed Nov 19 10:34:27 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.172
+Version=0.0.192
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Nov 19 10:34:27 2008
@@ -1,2 +1,3 @@
-- 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.
+- Fixed bugs in LILO setup step
+- Fixed syntax errors in generated lilo.conf
+- Optimized Network and Install windows for 800x600 resolutions
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Nov 19 10:34:27 2008
@@ -202,15 +202,125 @@
END IF
- IF Application.Args[1] = "-C" THEN
+ IF Application.Args[1] = "-C" THEN
' navigation for configuration
SELECT CASE FrmCurr.Name
CASE "FrmPartSel"
- frmNext = FrmLilo
+ frmNext = FrmLiloSetup
+
+ CASE FrmInstallSys
+ frmNext = FrmLiloSetup
+ CASE "FrmLiloSetup"
+
+ IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
+ IF FrmLiloSetup.cbBootDefault.Te ' FMain.tvPlan["Inst0"].Picture
= MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3xt = "" 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 "FrmZoneSet"
+ 'MdlZoneSet.TIME_ZONES()
+ MdlZoneSet.SET_ZONE(Trim(FrmZoneSet.lbTmZone.text))
+ MdlZoneSet.WRITE_CONF()
+ frmNext = FrmRootPass
+
+ CASE "FrmRootPass"
+ IF FrmRootPass.tbPasswd1.Text <> FrmRootPass.tbPasswd2.Text THEN
+ Balloon.Error(("Passwords do not match. Please enter the same
password twice"), FrmRootPass.tbPasswd2)
+ FrmRootPass.tbPasswd2.SelectAll
+ RETURN
+ END IF
+ FrmRootPass.Button1_Click()
+ frmNext = FrmUserAdd
+
+
+ CASE "FrmUserAdd"
+
+ IF MdlUsrAdd.iUsrAccts = 0 THEN
+ 'IF FrmUserAdd.tbUsername.text = "" THEN
+ IF MdlUsrAdd.CREATE_USER_ON_A_SNAP() = FALSE THEN
+ SELECT CASE Message.Question(("You have not created any user
accounts for this system yet. There is not enough information") & "<br>" &
+ ("to create an account here. It is recommended that you create
at least one.") & "<br>" &
+ "<br>" & ("Would you like to continue anyway?"), ("Yes"),
("No"))
+
+ CASE 2
+ RETURN
+ END SELECT
+ ELSE IF MdlUsrAdd.CREATE_USER_ON_A_SNAP() = TRUE THEN
+ FrmUserAdd.Button1_Click()
+ END IF
+ END IF
+
+ SHELL "cp /mnt/target/etc/modules.conf >/etc/modules.conf" WAIT
+ SHELL "ifconfig eth0 up" WAIT
+ SHELL "chmod 700 /mnt/target/home/*"
+ frmNext = FrmNetConf
+
+
+ CASE "FrmNetConf"
+ IF Trim(FrmNetConf.txtHostName.Text) = "" THEN
+ Balloon.Error(("Please specify a hostname for this computer"),
FrmNetConf.txtHostName)
+ RETURN
+ END IF
+ IF Trim(FrmNetConf.tbDomain.Text) = "" THEN
+ Balloon.Error(("Please specify the domain this computer belongs
to"), FrmNetConf.tbDomain)
+ RETURN
+ END IF
+
+ 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
+ Message.Warning(("VectorLinux will now try to detect and
configure your graphics hardware.") & "<br>" &
+ ("Your screen may flicker or go blank for a few seconds during
this process."))
+
+ MdlXconf.QUIET_XORG_CONFIGURATION()
+
+ frmNext = FrmDone
+
+ 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
+
+ CASE "FrmAlsaConf"
+
+ frmNext = FrmXconf
+
END SELECT
- 'FrmCurr.Hide
- frmNext.Reparent(FrmCurr.Parent)
+ ' ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+ ' .tvPlan["Conf4"].Selected = TRUE
+ ' END WITH FrmCurr.Hide
+ ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+ ' .tvPlan["Conf4"].Selected = TRUE
+ ' END WITH
+ frmNext.Reparent(FrmCurr.Parent)
frmNext.Show
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Wed Nov 19 10:34:27 2008
@@ -48,12 +48,16 @@
FMain.FrmCurr = ME
-' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+FMain.tvPlan["Inst1"].Selected = TRUE
+ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
+ ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
+' ME.tlCurrPkg2.Text
+ ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
' FMain.tvPlan["Inst1"].Selected = TRUE
- 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3>"
- ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
- ME.tlCurrPkg2.Text = "<b>" & tlCurrPkg2.Text & "</b>"
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3= "<b>" &
tlCurrPkg2.Text & "</b>"
ME.tlCurrStepLbl.Text = ("Current Step")
@@ -72,7 +76,13 @@
FrmCredits.Reparent(ME.embCredits)
FrmCredits.Show
+ ' temporaryli allow this
+ 'FMain.btnext.Enabled = TRUE
+ ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
END
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Wed Nov 19 10:34:27 2008
@@ -7,11 +7,13 @@
{ HPanel1 HPanel
MoveScaled(1,1,94,10)
{ tlBanner TextLabel
- MoveScaled(0,0,63,7)
+ MoveScaled(0,0,63,5)
+ Expand = True
Text = ("Vectorlinux is currently being installed to your system...
Please wait")
}
{ hrsep Separator
- MoveScaled(0,6,48,2)
+ MoveScaled(0,5,48,2)
+ Expand = True
}
}
{ HPanel2 HPanel
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Wed Nov 19 10:34:27 2008
@@ -26,8 +26,16 @@
' FMain.FrmCurr = ME
FMain.tvPlan["Conf0"].Selected = TRUE
FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
- FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
-
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ ' ' '
+ ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+' FMain.tvPlan["Inst1"].Selected = TRUE
+ 'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
+ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
+ ' ' ' FMain.tvPlan[" Conf0 "].Selected = TRUE"
+ ' ' ' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
+ ' ' ' FMain.tvPlan["Inst1"].Picture = MdlCore.sDoneP>"
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
ME.list_video_modes()
FMain.FrmCurr = ME
Modified: branches/iVL/FrmLiloSetup.form
==============================================================================
--- branches/iVL/FrmLiloSetup.form (original)
+++ branches/iVL/FrmLiloSetup.form Wed Nov 19 10:34:27 2008
@@ -7,9 +7,9 @@
{ HPanel1 HPanel
MoveScaled(1,1,71,6)
{ tlBanner TextLabel
- MoveScaled(1,1,21,3)
+ MoveScaled(1,1,30,3)
Expand = True
- Text = ("Bootloaded Setup")
+ Text = ("Boot Manager Configuration")
}
{ Separator1 Separator
MoveScaled(2,4,22,1)
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Wed Nov 19 10:34:27 2008
@@ -52,7 +52,7 @@
.tvPlan["Conf4"].Picture = MdlCore.sNowPic
.tvPlan["Conf4"].Selected = TRUE
END WITH
-
+
ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()
MdlNetConf.LIST_NETWORK_INTERFACES()
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Wed Nov 19 10:34:27 2008
@@ -1,11 +1,11 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,114,74)
+ MoveScaled(0,0,91,74)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
- MoveScaled(1,1,94,7)
+ MoveScaled(1,1,86,7)
{ tlBanner TextLabel
MoveScaled(1,0,45,4)
Expand = True
@@ -18,7 +18,7 @@
}
}
{ HPanel2 HPanel
- MoveScaled(1,8,92,4)
+ MoveScaled(1,8,87,4)
{ tlHostNameLbl TextLabel
MoveScaled(0,0,15,3)
Text = ("Computer Name")
@@ -29,17 +29,13 @@
Text = ("")
MaxLength = 24
}
- { Panel3 Panel
- MoveScaled(45,0,4,3)
- Arrangement = Arrange.Horizontal
- }
{ tlDomainName TextLabel
- MoveScaled(49,0,9,3)
+ MoveScaled(45,0,9,3)
Text = ("Domain")
Alignment = Align.Normal
}
{ tbDomain TextBox
- MoveScaled(59,0,29,3)
+ MoveScaled(56,0,29,3)
Text = ("")
MaxLength = 24
}
@@ -52,10 +48,10 @@
}
}
{ Panel2 Panel
- MoveScaled(1,16,93,6)
+ MoveScaled(1,16,80,6)
{ txtPrimaryDNS TextBox txtManDNSBoxes
Name = "txtPrimaryDNS"
- MoveScaled(26,0,18.125,3)
+ MoveScaled(26,0,18,3)
Enabled = False
Text = ("192.168.1.254")
}
@@ -66,7 +62,7 @@
}
{ txtSecDNS TextBox txtManDNSBoxes
Name = "txtSecDNS"
- MoveScaled(26,3,18.125,3)
+ MoveScaled(26,3,18,3)
Enabled = False
Text = ("")
}
@@ -77,17 +73,14 @@
}
}
{ HBox1 HBox
- MoveScaled(1,24,94,1)
+ MoveScaled(1,24,84,1)
{ Separator1 Separator
MoveScaled(3,0,35,1)
Expand = True
}
}
- { HPanel5 HPanel
- MoveScaled(1,26,95,1)
- }
{ Panel1 Panel
- MoveScaled(1,29,105,42)
+ MoveScaled(1,27,88,42)
Expand = True
Arrangement = Arrange.Horizontal
{ TSNetDevices TabStrip
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 19 10:34:27 2008
@@ -54,7 +54,7 @@
END SELECT
sOutput = "# VESA framebuffer console @ 1024x768x64k \n" &
-"vga = " & sVga & "<br>" &
+"vga = " & sVga & "\n" &
"# Normal VGA console n" &
"#vga = normal \n" &
"#VESA framebuffer console @ 1024 x768x64k \n" &
@@ -164,18 +164,18 @@
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" & "<br>"
+ sSection = "image = " & sBootPath &/ sKernel & "\n" &
+ "root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
+ "label = " & sLabel & "\n" &
+ "append = \"" & sAppend & "\"" & "\n" &
+ "initrd = " & sBootPath &/ sInitrd & "\n" &
+ "read only" & "\n"
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") & "<br>"
+ sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "\n"
ELSE
sClisection = ""
END IF
@@ -189,9 +189,9 @@
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>"
+ sWinSection = "other = " & sTag & "\n"
& 'Right(tb.tag, Len(tb.Tag) - InStr(tb.Tag, "/")) & "<br>" &
+ "label = " & tb.Text & "\n" &
+ "table = " & Left(sTag, 8) & "\n"
ELSE
sWinSection = ""
END IF
@@ -203,7 +203,7 @@
'Message(sSection)
- sOsEntries = sOsEntries & "<br>" & sSection & "<br>" &
sClisection & "<br>" & sWinSection
+ sOsEntries = sOsEntries & "\n" & sSection & "\n" & sClisection
& "\n" & sWinSection
' IF sClisection THEN Message(sClisection)
'sSection = "image=" & "boot" &/ tb.Text
@@ -668,37 +668,43 @@
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.tsLIloTabs.Text = LAST.text
-
- 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
- 'IF FrmLiloSetup.cbBootDefault.Find(sOld) <> -1 THEN
FrmLiloSetup.cbBootDefault.Remove
-
- 'Message(sOld)
+PUBLIC SUB OsNameTxtBox_LostFocus()
+ FrmLiloSetup.cbBootDefault.Clear()
+ ME.LIST_DEFAULT_BOOT_OPTIONS()
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.tsLIloTabs.Text = LAST.text
- 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
-
-
-
-END
+
+' PUBLIC SUB OsNameTxtBox_KeyPress()
+'
+' DIM sOld AS String
+' DIM iKey AS Integer
+' 'sOld = Left(LAST.Text, Len(LAST.text) - 1)
+' 'iKey = FrmLiloSetup.cbBootDefault.Find(sOld)
+'
+' 'IF iKey <> -1 THEN FrmLiloSetup.cbBootDefault.Remove(iKey)
+' 'FrmLiloSetup.cbBootDefault.Clear()
+' 'ME.LIST_DEFAULT_BOOT_OPTIONS
+' 'FrmLiloSetup.tsLIloTabs.Text = LAST.text
+' 'IF FrmLiloSetup.cbBootDefault.Find(sOld) <> -1 THEN
FrmLiloSetup.cbBootDefault.Remove(FrmLiloSetup.cbBootDefault.Find(sOld))
+' 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
+' '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.Clear()
+ME.LIST_DEFAULT_BOOT_OPTIONS()
+ FrmLiloSetup.tsLIloTabs.Text = LAST.text
+' 'FrmLiloSetup.cbBootDefault.Add(LAST.text)
+'
+'
+'
+ END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-18 23:07:12
|
Author: M0...@gm...
Date: Tue Nov 18 15:06:41 2008
New Revision: 301
Modified:
branches/iVL/.project
branches/iVL/FrmNetConf.class
branches/iVL/FrmNetConf.form
branches/iVL/installer.gambas
Log:
fixed more navigation woes. needs optimizing for lower resolutions
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Nov 18 15:06:41 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.170
+Version=0.0.172
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Tue Nov 18 15:06:41 2008
@@ -47,11 +47,11 @@
FMain.FrmCurr = ME
ME.tlHostNameLbl.Alignment = Align.Normal
- ' ' WITH FMain
- ' ' .tvPlan["Conf3"].Picture = MdlCore.sDonePic
- ' ' .tvPlan["Conf4"].Picture = MdlCore.sNowPic
- ' ' .tvPlan["Conf4"].Selected = TRUE
- ' ' END WITH
+ WITH FMain
+ .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+ .tvPlan["Conf4"].Selected = TRUE
+ END WITH
ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()
@@ -67,7 +67,7 @@
FOR EACH cb IN MdlNetConf.objCombos
cb.Refresh
NEXT
- ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
+' ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form (original)
+++ branches/iVL/FrmNetConf.form Tue Nov 18 15:06:41 2008
@@ -55,7 +55,7 @@
MoveScaled(1,16,93,6)
{ txtPrimaryDNS TextBox txtManDNSBoxes
Name = "txtPrimaryDNS"
- MoveScaled(26,0,18.1429,3)
+ MoveScaled(26,0,18.125,3)
Enabled = False
Text = ("192.168.1.254")
}
@@ -66,7 +66,7 @@
}
{ txtSecDNS TextBox txtManDNSBoxes
Name = "txtSecDNS"
- MoveScaled(26,3,18.1429,3)
+ MoveScaled(26,3,18.125,3)
Enabled = False
Text = ("")
}
@@ -91,17 +91,11 @@
Expand = True
Arrangement = Arrange.Horizontal
{ TSNetDevices TabStrip
- MoveScaled(2,1,70,35)
+ MoveScaled(1,0,70,35)
Expand = True
Index = 0
Text = ("Tab 0")
Index = 0
- }
- { frmNetDevices Frame
- MoveScaled(4,1,85,40)
- Visible = False
- Expand = True
- Text = ("")
}
}
}
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-18 22:50:07
|
Author: M0...@gm...
Date: Tue Nov 18 14:49:21 2008
New Revision: 300
Removed:
branches/iVL/FrmInstallSysN.class
branches/iVL/FrmInstallSysN.form
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.project
branches/iVL/FrmInstallSys.class
branches/iVL/FrmInstallSys.form
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/installer.gambas
Log:
Fixed more woes in LILo setup
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Nov 18 14:49:21 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/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Nov 18 14:49:21 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.0.167
+Version=0.0.170
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class (original)
+++ branches/iVL/FrmInstallSys.class Tue Nov 18 14:49:21 2008
@@ -131,27 +131,27 @@
-PUBLIC SUB Form_Resize()
-
- WITH ME
- .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.x * 2))
- .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
- '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientwidth - (.FrmProg.left * 2), (.tlBanner.Height *
4))
- ' items inside the frame
- .tlCurrPkg.Move(4, .hrsep.top + .hrsep.Height + 48, .hrsep.Width)
-
- '.tlCurrPkg.Move(4, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
- .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
- '.pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
- '.pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width + 4,
tlCurrStepLbl.top + (tlCurrStepLbl.Height / 4), .ClientWidth -
(.pbInstallProg.Left - 4), .tlCurrStepLbl.Height / 2) '.hrsep.Width -
(pbInstallProg.Left))
- .tlCurrPkg2.Move(4, .pbInstallProg.top + .pbInstallProg.Height + 24,
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
- '.pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
- .pbInstallProg2.Move(4, tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .hrsep.Width)
- .embCredits.Move(.ClientWidth / 2 - (.embCredits.Width /
2), .pbInstallProg2.top + .pbInstallProg2.Height + 8)
- .embCredits.Height = .ClientH - .embCredits.top - 16
- END WITH
-
-END
+' PUBLIC SUB Form_Resize()
+'
+' WITH ME
+' .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.x * 2))
+' .hrsep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
+' '.FrmProg.Move(4, .hrsep.top + .hrsep.Height
+ .tlBanner.Height, .clientwidth - (.FrmProg.left * 2), (.tlBanner.Height *
4))
+' ' items inside the frame
+' .tlCurrPkg.Move(4, .hrsep.top + .hrsep.Height + 48, .hrsep.Width)
+'
+' '.tlCurrPkg.Move(4, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
+' .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 4,
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
+' '.pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +
(.tlCurrStepLbl.left * 2)))
+' '.pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width +
4, tlCurrStepLbl.top + (tlCurrStepLbl.Height / 4), .ClientWidth -
(.pbInstallProg.Left - 4), .tlCurrStepLbl.Height / 2) '.hrsep.Width -
(pbInstallProg.Left))
+' .tlCurrPkg2.Move(4, .pbInstallProg.top + .pbInstallProg.Height +
24, MdlObjSizer.get_object_width(.tlCurrPkg2.text))
+' '.pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
+' .pbInstallProg2.Move(4, tlCurrPkg2.top + .tlCurrPkg2.Height +
2, .hrsep.Width)
+' .embCredits.Move(.ClientWidth / 2 - (.embCredits.Width /
2), .pbInstallProg2.top + .pbInstallProg2.Height + 8)
+' .embCredits.Height = .ClientH - .embCredits.top - 16
+' END WITH
+'
+' END
PUBLIC SUB Form_Activate()
Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form (original)
+++ branches/iVL/FrmInstallSys.form Tue Nov 18 14:49:21 2008
@@ -11,7 +11,7 @@
Text = ("Vectorlinux is currently being installed to your system...
Please wait")
}
{ hrsep Separator
- MoveScaled(1,7,48,2)
+ MoveScaled(0,6,48,2)
}
}
{ HPanel2 HPanel
@@ -44,12 +44,13 @@
Expand = True
}
{ tlCurrPkg2 TextLabel
- MoveScaled(0,12,45,3)
+ MoveScaled(0,6,45,3)
Expand = True
Text = ("Total progress")
}
{ pbInstallProg2 ProgressBar
- MoveScaled(0,15,44,3)
+ MoveScaled(0,9,44,3)
+ Expand = True
}
}
{ embCredits Panel
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Tue Nov 18 14:49:21 2008
@@ -24,9 +24,9 @@
' 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
+ 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()
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Tue Nov 18 14:49:21 2008
@@ -57,6 +57,7 @@
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
+ FMain.btnext.Enabled = TRUE
END
@@ -383,6 +384,7 @@
.Button1.Enabled = TRUE
.Button1.ForeColor = Color.Black
END WITH
+
END
PUBLIC SUB Form_Show()
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Tue Nov 18 14:49:21 2008
@@ -24,7 +24,7 @@
Password = True
}
{ tbPasswd2 TextBox
- MoveScaled(16,27,16,3)
+ MoveScaled(17,27,16,3)
Tag = "line4"
Text = ("")
Password = True
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-11-18 17:01:04
|
Author: M0...@gm...
Date: Tue Nov 18 09:00:09 2008
New Revision: 299
Modified:
branches/iVL/FrmLiloSetup.class
Log:
fixed bug in LILO module. Installer was getting stuck. Ready for testing
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Tue Nov 18 09:00:09 2008
@@ -30,7 +30,7 @@
MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
ME.list_video_modes()
-
+FMain.FrmCurr = ME
MdlLilo.LIST_LINUX_OS()
MdlLilo.LIST_WIN_INSTALLS()
|
|
From: <cod...@go...> - 2008-11-17 23:59:58
|
Author: M0...@gm...
Date: Mon Nov 17 15:57:42 2008
New Revision: 298
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
branches/iVL/FrmLilo.class
branches/iVL/FrmLiloSetup.class
branches/iVL/FrmNetConf.class
branches/iVL/FrmPartScheme.class
branches/iVL/FrmPartSel.class
branches/iVL/FrmPkgSel.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmSelISO.class
branches/iVL/FrmSummary.class
branches/iVL/FrmUserAdd.form
branches/iVL/FrmUsrPkgSel.class
branches/iVL/FrmWinDrives.class
branches/iVL/FrmZoneSet.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
Log:
LILO still broken, added accidental double-click protection to next button
switched install processes to use EXEC instead of SHELL
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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.
@@ -14,95 +14,95 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:191
+#: FMain.class:193
msgid "Restart"
msgstr ""
-#: FMain.class:240
+#: FMain.class:242
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:242
+#: FMain.class:244
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:242
+#: FMain.class:244
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:256
+#: FMain.class:258
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:311
+#: FMain.class:313
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:312
+#: FMain.class:314
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:319
+#: FMain.class:321
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:342
+#: FMain.class:344
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:356
+#: FMain.class:358
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "Yes"
msgstr ""
-#: FMain.class:371
+#: FMain.class:373
msgid "No"
msgstr ""
-#: FMain.class:389
+#: FMain.class:391
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:393
+#: FMain.class:395
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:408
+#: FMain.class:410
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:408
+#: FMain.class:410
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:660
+#: FMain.class:662
msgid "Back"
msgstr ""
-#: FMain.class:672
+#: FMain.class:674
msgid "Exit Installation"
msgstr ""
-#: FMain.class:684
+#: FMain.class:686
msgid "Next"
msgstr ""
-#: FMain.class:698
+#: FMain.class:700
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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.
@@ -26,27 +26,27 @@
msgid "Use this option if you already prepared your partitions using the
VectorLinux installer"
msgstr ""
-#: FrmPartScheme.class:70
+#: FrmPartScheme.class:71
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:71
msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
msgstr ""
-#: FrmPartScheme.class:112
+#: FrmPartScheme.class:113
msgid "Disk Partitioning Options"
msgstr ""
-#: FrmPartScheme.class:117
+#: FrmPartScheme.class:118
msgid "Use existing disk partitions"
msgstr ""
-#: FrmPartScheme.class:122
+#: FrmPartScheme.class:123
msgid "Modify my disk partitions to make room for new installation"
msgstr ""
-#: FrmPartScheme.class:127
+#: FrmPartScheme.class:128
msgid "TextLabel1"
msgstr ""
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Mon Nov 17 15:57:42 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.
@@ -14,75 +14,75 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Linux is a modular operating system. This means that is has the
ability to store system and"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "user data separately for added data security. You may install the
system to a single partition"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "by simply selecting a \"/\" value on this screen. The rest is
optional. The following is a"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "suggested setup for a typical Linux installation"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Used to store system data. This particular install requires a
minimum of"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "for this"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "but you should considear a higher value to make sure you have room
to install additional software"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "in case you wish to."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Used to store user documents, pictures, videos. Give yourself as
much room as you want"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Typically, you want to use the largest partition for this."
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "Using a swap partition is suggested if your total RAM is less than
1GB. Suggested ammount"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "for this is"
msgstr ""
-#: FrmPartSel.class:149
+#: FrmPartSel.class:150
msgid "but can also be calculated as 2 times your ammount of RAM"
msgstr ""
-#: FrmPartSel.class:180
+#: FrmPartSel.class:181
msgid "Please select the partitions you wish to use and how to use them"
msgstr ""
-#: FrmPartSel.class:185
+#: FrmPartSel.class:186
msgid "Help"
msgstr ""
-#: FrmPartSel.class:205
+#: FrmPartSel.class:206
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:207
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 17 15:57:42 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.
@@ -30,23 +30,23 @@
msgid "Size"
msgstr ""
-#: FrmPkgSel.class:70
+#: FrmPkgSel.class:71
msgid "Installs all optional components in your VectorLinux media to your
system"
msgstr ""
-#: FrmPkgSel.class:80
+#: FrmPkgSel.class:81
msgid "Choose your optional components to install."
msgstr ""
-#: FrmPkgSel.class:195
+#: FrmPkgSel.class:196
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:205
+#: FrmPkgSel.class:206
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:210
+#: FrmPkgSel.class:211
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Mon Nov 17 15:57:42 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.
@@ -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:116
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:148
+#: FrmSelISO.class:151
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:251
+#: FrmSelISO.class:254
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:257
+#: FrmSelISO.class:260
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:262
+#: FrmSelISO.class:265
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:267
+#: FrmSelISO.class:270
msgid "Search Again"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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.
@@ -26,15 +26,15 @@
msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlSetup.module:304
+#: MdlSetup.module:300
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:320
+#: MdlSetup.module:316
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:322
+#: MdlSetup.module:318
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 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 Mon Nov 17 15:57:42 2008
@@ -187,6 +187,8 @@
DIM sLang AS String
'tvPlan.Refresh()
+ FMain.btnext.Enabled = FALSE
+
IF LAST.TEXT = ("Restart") THEN
'EXEC "shutdown", "-r", " now"
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Mon Nov 17 15:57:42 2008
@@ -50,6 +50,7 @@
MdlLiloOsList.list_boot_options()
ME.tsOsSetup.Index = 0
ME.cbDefBoot.Text = "Linux"
+FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class (original)
+++ branches/iVL/FrmLiloSetup.class Mon Nov 17 15:57:42 2008
@@ -36,6 +36,7 @@
MdlLilo.LIST_WIN_INSTALLS()
ME.CLEANUP_TABSTRIP()
MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
+ FMain.btnext.Enabled = TRUE
END
PUBLIC SUB CLEANUP_TABSTRIP()
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Mon Nov 17 15:57:42 2008
@@ -68,6 +68,7 @@
cb.Refresh
NEXT
ME.frmNetDevices.Text = Space(1) & ("Network Interfaces") & Space(1)
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class (original)
+++ branches/iVL/FrmPartScheme.class Mon Nov 17 15:57:42 2008
@@ -60,6 +60,7 @@
"<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
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmPartSel.class
==============================================================================
--- branches/iVL/FrmPartSel.class (original)
+++ branches/iVL/FrmPartSel.class Mon Nov 17 15:57:42 2008
@@ -55,6 +55,8 @@
ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>"
FMain.FrmCurr = ME
+ FMain.tvPlan["Prep2"].Selected = TRUE
+ FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
ME.btHelp.Width = MdlObjSizer.get_object_width(btHelp.text) + 32
ME.Resize(ME.Parent.Width, ME.Parent.Height - (ME.cbDoWin.height * 3))
ME.tlBanner.Adjust
@@ -64,9 +66,8 @@
ClsPartSel.bDoWin = FALSE
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
- FMain.tvPlan["Prep2"].Selected = TRUE
- FMain.tvPlan["Prep2"].Picture = MdlCore.sNowPic
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB Form_Hide()
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Mon Nov 17 15:57:42 2008
@@ -46,6 +46,7 @@
END WITH
ME.FILL_IN_BULK_LIST()
+FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Mon Nov 17 15:57:42 2008
@@ -2,6 +2,12 @@
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
+
+ WITH FMain
+ .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf2"].picture = MdlCore.sNowPic
+ .tvPlan["Conf2"].Selected = TRUE
+ END WITH
WITH ME
.tlbanner.text = "<h3>" & ("System Administrator Password") & "</h3>"
.tlBanner.Width = MdlObjSizer.get_object_width(.tlBanner.text)
@@ -20,12 +26,8 @@
.Button1.Visible = FALSE
END WITH
- WITH FMain
- .tvPlan["Conf1"].Picture = MdlCore.sDonePic
- .tvPlan["Conf2"].picture = MdlCore.sNowPic
- .tvPlan["Conf2"].Selected = TRUE
- END WITH
ME.Frame1.text = Space(1) & ("About the root account") & Space(1)
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Mon Nov 17 15:57:42 2008
@@ -53,6 +53,11 @@
ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>"
+ FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
+ FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Prep1"].Selected = TRUE
+
+
ME.Width = ME.Parent.Width
ME.Height = ME.Parent.Height
ME.btResCan.Height = ME.lstInstallableImg.Height
@@ -87,10 +92,8 @@
.btnext.ForeColor = Color.Black
END WITH
END IF
- FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
- FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic
- FMain.tvPlan["Prep1"].Selected = TRUE
-
+
+FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Mon Nov 17 15:57:42 2008
@@ -23,7 +23,7 @@
'ME.GridView2.Visible = FALSE
END IF
ME.prepare_partition_summary()
-
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Mon Nov 17 15:57:42 2008
@@ -8,7 +8,7 @@
Text = ("Choose a unique name for each user. Enter the password for
twice for accuracy. You can make as many users as you want, and when you
are finished click next to continue.")
}
{ tbUsername TextBox
- MoveScaled(16,18,15,3)
+ MoveScaled(17,18,15,3)
Tag = "line1"
Text = ("")
}
@@ -87,10 +87,10 @@
Text = ("")
}
{ hrSep Separator
- MoveScaled(30,8,12,1)
+ MoveScaled(22,7,12,1)
}
{ pbUsrPic PictureBox
- MoveScaled(58,21,8,8)
+ MoveScaled(35,19,8,8)
Stretch = True
}
{ tlRealName TextLabel
Modified: branches/iVL/FrmUsrPkgSel.class
==============================================================================
--- branches/iVL/FrmUsrPkgSel.class (original)
+++ branches/iVL/FrmUsrPkgSel.class Mon Nov 17 15:57:42 2008
@@ -24,6 +24,7 @@
END WITH
ME.LIST_PACKAGES
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB LIST_PACKAGES()
Modified: branches/iVL/FrmWinDrives.class
==============================================================================
--- branches/iVL/FrmWinDrives.class (original)
+++ branches/iVL/FrmWinDrives.class Mon Nov 17 15:57:42 2008
@@ -26,7 +26,7 @@
FMain.btback.Enabled = TRUE
FMain.btback.ForeColor = Color.Black
-
+FMain.btnext.Enabled = TRUE
END
PUBLIC SUB Form_Resize()
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Mon Nov 17 15:57:42 2008
@@ -28,6 +28,7 @@
FMain.btnext.Enabled = FALSE
MdlZoneSet.TIME_ZONES()
'ME.lbTmZone.Index = 9
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Mon Nov 17 15:57:42 2008
@@ -301,6 +301,7 @@
DIM sOut AS String
DIM cb AS CheckBox
+ DIM cbox AS ComboBox
' 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
@@ -312,9 +313,9 @@
' 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
+ FOR EACH cbox IN MdlPartSel.oMountPoints
+ IF cbox.Text = "/home" THEN
+ EXEC ["mount", CStr(cbox.Tag), ClsGlobal.sTargetMnt &/ "home"] WAIT
END IF
NEXT
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Mon Nov 17 15:57:42 2008
@@ -168,85 +168,6 @@
END
-' ' PUBLIC FUNCTION INSTALL_CONF_PACKAGES() AS Integer
-' '
-' ' DIM sOutput, sLine, sPkg, sPkgPath AS String
-' ' DIM i, iret AS Integer
-' ' DIM sList, sLinearr AS String[]
-' '
-' ' SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF |
grep ^CONF" TO sOutput
-' ' sOutput = Trim(sOutput)
-' ' IF InStr(sOutput, "\n") > 0 THEN
-' ' sList = Split(sOutput, "\n")
-' ' FOR i = 0 TO sList.Count - 1
-' ' sLine = sList[i]
-' ' sPkg = Right(sLine, Len(sLine) - InStr(sLine, "\'"))
-' ' sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
-' ' sLinearr = Split(sPkg, ":")
-' ' sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
-' ' ' install it now
-' ' PRINT " + Install " & sPkgPath
-' ' 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
-' ' iret = ME.INSTALL_THIS_BULK(sPkgPath)
-' ' IF iret <> 0 THEN
-' ' RETURN iret
-' ' END IF
-' ' PRINT " ! " & sPkgPath & " is installed"
-' ' NEXT
-' ' ELSE ' single CONF line
-' ' sPkg = Right(sOutput, Len(sOutput) - InStr(sOutput, "\'"))
-' ' sPkg = Left(sPkg, RInStr(sPkg, "\'") - 1)
-' ' sLinearr = Split(sPkg, ":")
-' ' sPkgPath = ClsGlobal.sSourceMnt &/ "veclinux" &/ sLinearr[0]
-' ' 'iret = ME.INSTALL_THIS_PACKAGE(sPkgPath)
-' ' iret = ME.INSTALL_THIS_BULK(sPkgPath)
-' ' IF iret <> 0 THEN
-' ' RETURN iret
-' ' END IF
-' ' END IF
-' ' END
-
-
-' ' ' PUBLIC FUNCTION INSTALL_PACKAGES_REQUIRED() AS Integer
-' ' '
-' ' ' DIM i, iRet AS Integer
-' ' ' DIM sPkg AS String
-' ' ' DIM sDump AS String
-' ' ' DIM ii AS Integer
-' ' ' FOR EACH spkg IN RDir(ClsGlobal.sSetupConfPath &/ "packages"
&/ "required", "t?z")
-' ' ' INC ii
-' ' ' NEXT
-' ' '
-' ' ' i = 0
-' ' ' FOR EACH sPkg IN RDir(ClsGlobal.sSourceMnt &/ "packages"
&/ "required")
-' ' ' SELECT CASE File.Ext(ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg)
-' ' ' CASE "tlz", "tgz"
-' ' ' INC i
-' ' ' PRINT " + Install " & ClsGlobal.sSourceMnt &/ "packages"
&/ "required" &/ sPkg
-' ' ' 'iret = ME.INSTALL_THIS_PACKAGE(ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg)
-' ' ' SHELL "echo \"\" > /tmp/installdump" WAIT
-' ' '
-' ' ' hproc = SHELL "installpkg " & ClsGlobal.sSourceMnt
&/ "packages" &/ "required" &/ sPkg & " -R " & ClsGlobal.sTargetMnt & " ||
echo \'FAILED\' 2> /tmp/installdump"
-' ' ' WAIT 1
-' ' ' IF hproc.State = Process.Running THEN
-' ' ' REPEAT
-' ' ' WAIT
-' ' ' UNTIL hproc.State = Process.Stopped
-' ' ' END IF
-' ' ' sDump = File.Load("/tmp/installdump")
-' ' ' IF InStr(sDump, "FAILED") THEN
-' ' ' RETURN 1
-' ' ' END IF
-' ' '
-' ' ' PRINT " ! " & ClsGlobal.sSourceMnt &/ "packages" &/ "required"
&/ sPkg & " is installed"
-' ' ' FrmInstallSys.pbInstallProg.Value = i / ii
-' ' '
-' ' ' INC iPkgNum
-' ' '
-' ' ' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-' ' ' END SELECT
-' ' ' NEXT
-' ' ' END
PUBLIC FUNCTION INSTALL_USER_PACKAGES() AS Integer
@@ -341,7 +262,8 @@
SHELL "echo \"\" > /tmp/installdump" WAIT
'Message.Info(sBasePath &/ cb.tag)
FrmInstallSys.tlCurrPkg.Text = ("Installing user-selected
package") & Space(1) & File.Name(sBasePath &/ cb.Tag)
- hproc = SHELL "installpkg " & sBasePath &/ cb.tag & Space(1)
& "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo \'FAILED\'
2> /tmp/installdump" 'WAIT
+ 'hproc = SHELL "installpkg " & sBasePath &/ cb.tag & Space(1)
& "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo \'FAILED\'
2> /tmp/installdump" 'WAIT
+ hproc = EXEC ["installpkg", sBasePath &/ cb.tag, "-R",
ClsGlobal.sTargetMnt]
'
WAIT 1
IF hproc.State = Process.running THEN
@@ -349,14 +271,15 @@
WAIT
UNTIL hproc.State = Process.Stopped
END IF
- sDump = File.Load("/tmp/installdump")
+ 'sDump = File.Load("/tmp/installdump")
' update step progress
INC i
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
INC iPkgNum
'MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, iPkgNum)
- IF InStr(sDump, "FAILED") > 0 THEN
+ 'IF InStr(sDump, "FAILED") > 0 THEN
+ IF hproc.Value > 0 THEN
Message.Error("Error installing user-selected package" &
Space(1) & cb.Text)
RETURN 1
' ELSE
@@ -369,136 +292,6 @@
NEXT
'Message.Info("End installation of user selected software")
END
-' '
-' '
-' '
-' '
-' ' DIM i AS Integer
-' ' DIM sFile AS String[]
-' ' DIM sLine AS String
-' ' DIM sRawFile AS String
-' ' DIM sTlzPath AS String
-' ' DIM sTlzName AS String
-' ' DIM sTlzDesc AS String
-' ' DIM iTlzSize AS Integer
-' ' DIM sTlzBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
-' ' DIM sTargetSize AS Variant
-' ' DIM cb AS CheckBox
-' ' DIM sName AS String
-' '
-' ' sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
-' '
-' ' sFile = Split(sRawFile, "\n")
-' '
-' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' sName = Trim(cb.text)
-' '
-' '
-' ' FOR i = 0 TO sFile.count - 1
-' ' sLine = Trim(sFile[i])
-' ' IF InStr(sLine, sName) THEN
-' ' IF Left(sLine, Len("PACKAGE NAME")) = "PACKAGE NAME" THEN
-' ' sTlzName = Trim(Right(sLine, Len(sLine) -
InStr(sLine, ":")))
-' ' sTlzPath = Trim(Right(sFile[i + 1], Len(sFile[i + 1]) -
InStr(sFile[i + 1], ":")))
-' ' sTlzPath = Right(sTlzPath, Len(sTlzPath) - 2) ' remove
the ./ from the location line
-' ' iTlzSize = Trim(Right(sFile[i + 3], Len(sFile[i + 3]) -
InStr(sFile[i + 3], ":")))
-' ' 'iTlzSize = Left(iTlzSize, Len(iTlzSize) - 1)
-' ' 'iTlzSize = Trim(iTlzSize)
-' ' FrmInstallSys.tlCurrPkg.Text = "Installing " & sTlzName
& " ..."
-' ' FrmInstallSys.pbInstallProg.Value = 0.0
-' '
-' ' 'IF sTlzName = sName THEN
-' ' Message.Info(sTlzName)
-' ' 'RETURN
-' '
-' ' PRINT " Install " & sTlzBasePath &/ sTlzPath &/ sTlzName
-' ' ' install each package
-' ' SHELL "export gsize=$(df| grep " & ClsPartSel.sRoot & "
) && echo $gsize | cut -f3 -d \' \'" TO sTargetSize
-' ' sTargetSize = Trim(CStr(sTargetSize))
-' ' SHELL "echo \"\" > /tmp/installdump" WAIT
-' ' sDump = ""
-' ' sErr = ""
-' ' 'hproc = SHELL "install-pkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR
READ
-' ' hproc = SHELL "installpkg " & sTlzBasePath &/ sTlzPath
&/ sTlzName & " -R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump" WAIT 'FOR READ
-' ' WAIT 1
-' ' IF hproc.State = Process.Running THEN
-' ' REPEAT
-' ' WAIT 1
-' ' MdlInstallSys.UPDATE_STEP_PROGRESS(sTargetSize,
iTlzSize)
-' '
-' ' ' figure out the progress again
-' '
-' ' UNTIL
-' ' hproc.State = Process.Stopped
-' ' sDump = File.Load("/tmp/installdump")
-' '
-' ' IF InStr(sDump, "FAILED") > 0 THEN
-' ' ERROR
-' ' RETURN 1
-' ' ELSE
-' ' IF FrmInstallSys.pbInstallProg.Value <> 1
THEN
-' ' FrmInstallSys.pbInstallProg.Value = 1
-' ' END IF
-' ' END IF
-' ' END IF
-' ' INC iPkgNum
-' ' FrmInstallSys.pbInstallProg2.Value =
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
-' ' END IF
-' ' END IF
-' ' NEXT
-' ' NEXT
-' ' END
-' '
-' '
-' '
-' '
-' ' ' ' ' PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES_OLD() AS Integer
-' ' ' ' '
-' ' ' ' ' DIM i, iret AS Integer
-' ' ' ' ' DIM sPkg AS String
-' ' ' ' ' DIM cb AS CheckBox
-' ' ' ' ' DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "packages"
-' ' ' ' ' DIM sPkgLoc AS String
-' ' ' ' ' DIM sFile AS String[]
-' ' ' ' ' DIM sLine AS String
-' ' ' ' ' DIM sConfig AS String
-' ' ' ' ' DIM ii AS Integer
-' ' ' ' ' ' needs to read PACKAES.TXT to get package name and
location
-' ' ' ' '
-' ' ' ' ' 'sFile = Split(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"), "\n")
-' ' ' ' ' ii = 0
-' ' ' ' ' sConfig = "WORKINGDIR=" & ClsGlobal.sTargetMnt &/ "home"
&/ "ftp" &/ "pub" &/ "veclinux" & "\n" &
-' ' ' ' ' "SOURCE=" & ClsGlobal.sSourceMnt &/ "packages"
-' ' ' ' '
-' ' ' ' ' File.Save(Temp("sources"))
-' ' ' ' ' IF Exist(ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux")
= FALSE THEN
-' ' ' ' ' MKDIR ClsGlobal.sTargetMnt &/ "home/ftp/pub/veclinux"
-' ' ' ' ' END IF
-' ' ' ' ' SHELL "slapt-get -u -c " & Temp("sources") WAIT
-' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' ' ' IF cb.value = TRUE THEN
-' ' ' ' ' 'spkg = cb.Text
-' ' ' ' ' INC ii
-' ' ' ' ' NEXT
-' ' ' ' '
-' ' ' ' ' ' now to install them
-' ' ' ' '
-' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
-' ' ' ' ' IF cb.Value = TRUE THEN
-' ' ' ' ' sPkg =
-' ' ' ' '
-' ' ' ' '
-' ' ' ' ' FOR i = 0 TO ClsPkgSel.arrPkgs.count - 1
-' ' ' ' ' sPkg = ClsPkgSel.arrPkgs[i]
-' ' ' ' ' PRINT " + Install " & sPkgPath &/ sPkg
-' ' ' ' ' iret = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
-' ' ' ' ' IF iret <> 0 THEN
-' ' ' ' ' RETURN iret
-' ' ' ' ' END IF
-' ' ' ' ' PRINT " ! " & sPkgPath &/ sPkg & " is installed"
-' ' ' ' ' NEXT
-' ' ' ' ' END
-
PUBLIC FUNCTION INSTALL_USER_SELECTED_BULKS() AS Integer
@@ -520,122 +313,9 @@
UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
-
-' ' ' '
-' ' ' '
-' ' ' ' FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
-' ' ' ' sPkg = ClsPkgSel.arrBulks[i]
-' ' ' ' 'install the packages now
-' ' ' ' PRINT " + Install " & sPkgPath &/ sPkg
-' ' ' ' 'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
-' ' ' ' iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
-' ' ' ' IF iRet <> 0 THEN
-' ' ' ' RETURN 1
-' ' ' ' END IF
-' ' ' ' PRINT " ! " & sPkgPath &/ sPkg & " is installed"
-' ' ' ' NEXT
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
DIM sOutput AS String
@@ -767,7 +447,8 @@
FrmInstallSys.tlCurrPkg.Text = "Processing " & File.Name(sPackagePath)
'hproc = SHELL "install-pkg " & sPackagePath & Space(1) &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'" FOR READ
IF Right(sPackagePath, 3) LIKE "t?z" THEN
- hproc = SHELL "installpkg " & sPackagePath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ 'hproc = SHELL "installpkg " & sPackagePath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+ hproc = EXEC ["installpkg", sPackagePath, "-R", ClsGlobal.sTargetMnt]
ENDIF
WAIT 1
IF hproc.State = Process.Running THEN
@@ -782,9 +463,10 @@
UNTIL
hproc.state = Process.Stopped
' now do the error checking here and return a value
- sDump = File.Load("/tmp/installdump")
+ 'sDump = File.Load("/tmp/installdump")
- IF InStr(sDump, "FAILED") > 0 THEN
+ 'IF InStr(sDump, "FAILED") > 0 THEN
+ IF hproc.Value > 0 THEN
'ERROR HAS OCCURRED
RETURN 1
ELSE
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Mon Nov 17 15:57:42 2008
@@ -399,7 +399,8 @@
'ME.PACKAGE_INSTALL(ClsGlobal.sSourceMnt &/ "packages"
&/ sPkgPath &/ sPkgName)
' move the process here locally
SHELL "echo \"\" /tmp/installdump" WAIT
- hproc = SHELL "installpkg " &
ClsGlobal.sSourceMnt &/ "packages" &/ sPkgPath &/ sPkgName & " -R " &
ClsGlobal.sTargetMnt & " 2> /tmp/installdump"
+ 'hproc = SHELL "installpkg " &
ClsGlobal.sSourceMnt &/ "packages" &/ sPkgPath &/ sPkgName & " -R " &
ClsGlobal.sTargetMnt & " 2> /tmp/installdump"
+ hproc = EXEC ["installpkg", ClsGlobal.sSourceMnt
&/ "packages" &/ sPkgPath &/ sPkgName, "-R", ClsGlobal.sTargetMnt]
WAIT
IF hproc.State = Process.Running THEN
REPEAT
@@ -409,7 +410,8 @@
UNTIL
hproc.State = Process.Stopped
END IF
- IF InStr(sDump, "FAILED") > 0 THEN
+ 'IF InStr(sDump, "FAILED") > 0 THEN
+ IF hproc.value > 0 THEN
PRINT sPkgName & " failed to install "
RETURN 1
ELSE
@@ -761,7 +763,7 @@
DIM iTlzTotal AS Integer = 0
DIM iCurrTlz AS Integer '= 0
MdlCore.LOCK_GUI()
- SHELL "echo \"\" > /tmp/installdump" WAIT
+ 'SHELL "echo \"\" > /tmp/installdump" WAIT
'sRawFile = DConv(File.Load(ClsGlobal.sSourceMnt &/ "packages"
&/ "PACKAGES.TXT"))
'/ NO PACKAGE SIZE DATA AVAILABLE FOR PACKAGES/REQUIRED.
@@ -778,9 +780,12 @@
sTlzName = File.Name(sTlzPath)
FrmInstallSys.pbInstallProg.Value = i / iTlzTotal
' clear the dump
- SHELL "echo \' \' > /tmp/installdump" WAIT
+ 'SHELL "echo \' \' > /tmp/installdump" WAIT
+ 'EXEC "echo", " ", "/tmp/installdump"] WAIT
FrmInstallSys.tlCurrPkg.Text = ("Installing Required
Package ...") & sTlzName
- hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
+ 'hproc = SHELL "installpkg " & sTlzPath & " -R " &
ClsGlobal.sTargetMnt & " || echo \'FAILED\'"
+ hproc = EXEC ["installpkg", sTlzPath, "-R",
ClsGlobal.sTargetMnt]
+ 'hproc = exec
["installpkg",sTlzPath,"-R",ClsGlobal.sTargetMnt
WAIT
IF hproc.State = Process.Running THEN
REPEAT
@@ -788,8 +793,9 @@
UNTIL hproc.State = Process.Stopped
END IF
sDump = ""
- sDump = File.Load("/tmp/installdump")
- IF InStr(sDUmp, "FAILED") > 0 THEN
+ 'sDump = File.Load("/tmp/installdump")
+ ' IF InStr(sDUmp, "FAILED") > 0 THEN
+ IF hproc.Value > 0 THEN
Message.Error(sTlzName & Space(1) & ("Failed to
install"))
RETURN 1
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Mon Nov 17 15:57:42 2008
@@ -271,11 +271,7 @@
DIM sFile AS String[] = Split(sCreditFile, "\n")
DIM i AS Integer
tlOutput.Text = ""
-
- ' File.Save(Temp("Credits"), DConv(File.Load("/CREDIT")))
- ' sCreditFile = File.Load(Temp("Credits"))
- ' sFile = Split(sCreditFile, "\n")
-
+
FOR i = 0 TO sFile.count - 1
IF Left(Trim(sFile[i]), Len("M0E-lnx")) = "M0E-lnx" THEN
sFile[i] = "M0E-lnx [ vpackager, vasmCC, GUI installer ]"
|
14 messages has been excluded from this view by a project administrator.