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-12-05 04:37:34
|
Author: M0...@gm...
Date: Thu Dec 4 20:34:57 2008
New Revision: 372
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmDone.class
branches/iVL/installer.gambas
Log:
Fixed error right before reboot
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 20:34:57 2008
@@ -18,107 +18,107 @@
msgid "Restart"
msgstr ""
-#: FMain.class:227
+#: FMain.class:228
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:228
+#: FMain.class:229
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:236
+#: FMain.class:237
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:249
+#: FMain.class:250
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:264
+#: FMain.class:265
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:264
+#: FMain.class:265
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:264
+#: FMain.class:265
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:264
+#: FMain.class:265
msgid "Yes"
msgstr ""
-#: FMain.class:264
+#: FMain.class:265
msgid "No"
msgstr ""
-#: FMain.class:282
+#: FMain.class:283
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:286
+#: FMain.class:287
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:301
+#: FMain.class:302
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:301
+#: FMain.class:302
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:364
+#: FMain.class:365
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:366
+#: FMain.class:367
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:366
+#: FMain.class:367
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:380
+#: FMain.class:381
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:452
+#: FMain.class:453
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:478
+#: FMain.class:479
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:494
+#: FMain.class:495
msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FMain.class:512
+#: FMain.class:513
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:512
+#: FMain.class:513
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:839
+#: FMain.class:840
msgid "Back"
msgstr ""
-#: FMain.class:850
+#: FMain.class:851
msgid "Exit Installation"
msgstr ""
-#: FMain.class:861
+#: FMain.class:862
msgid "Next"
msgstr ""
-#: FMain.class:875
+#: FMain.class:876
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 20:34:57 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.12
+Version=0.1.13
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 20:34:57 2008
@@ -198,7 +198,8 @@
IF LAST.TEXT = ("Restart") THEN
'EXEC "shutdown", "-r", " now"
- EXEC ["init", "6"]
+ 'EXEC ["init", "6"]
+ SHELL "init 6"
ELSE
IF FrmLangSel.Visible = TRUE THEN
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 20:34:57 2008
@@ -60,6 +60,7 @@
("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
FMain.btnext.Enabled = TRUE
FMain.btQuit.Enabled = TRUE
+ FMain.btnext.Text = ("Restart")
ME.tlMsg.Text = sText
ME.tmBgMon.Enabled = FALSE
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-05 04:10:29
|
Author: M0...@gm...
Date: Thu Dec 4 20:09:53 2008
New Revision: 371
Modified:
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/installer.gambas
Log:
Fixed bad method reference in Fmain.class
\ Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 20:09:53 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.11
+Version=0.1.12
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 20:09:53 2008
@@ -348,7 +348,7 @@
FrmPartScheme.rbUseExisting.ForeColor = Color.Gray
ELSE
FrmPartScheme.rbUseExisting.Enabled = TRUE
- FrmPartScheme.rbUseExisting.Color = Color.Black
+ FrmPartScheme.rbUseExisting.foreColor = Color.Black
END IF
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 22:49:04
|
Author: M0...@gm...
Date: Thu Dec 4 13:46:33 2008
New Revision: 368
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/en_US.mo
branches/iVL/.lang/en_US.po
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmDiskPart.form
branches/iVL/FrmDone.class
branches/iVL/FrmDone.form
branches/iVL/FrmUserAdd.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
Fixed accidental exit before finishing setup
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 13:46:33 2008
@@ -106,19 +106,19 @@
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:826
+#: FMain.class:828
msgid "Back"
msgstr ""
-#: FMain.class:837
+#: FMain.class:839
msgid "Exit Installation"
msgstr ""
-#: FMain.class:848
+#: FMain.class:850
msgid "Next"
msgstr ""
-#: FMain.class:862
+#: FMain.class:864
msgid "Button1"
msgstr ""
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 Thu Dec 4 13:46:33 2008
@@ -10,1371 +10,1288 @@
"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:199 FrmDone.class:28
-msgid "Restart"
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
msgstr ""
-#: FMain.class:226
-msgid "Please select a default operating system to boot before proceeding"
+#: FrmXconf.class:348
+msgid "1024x768"
msgstr ""
-#: FMain.class:227
-msgid "Select an entry from this list"
+#: FrmXconf.class:348
+msgid "1280x1024"
msgstr ""
-#: FMain.class:234
-msgid "Skipping boot loaded setup"
+#: FrmXconf.class:348
+msgid "1280x800"
msgstr ""
-#: FMain.class:247
-msgid "Passwords do not match. Please enter the same password twice"
+#: FrmXconf.class:348
+msgid "1440x900"
msgstr ""
-#: FMain.class:262
-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:262
-msgid ""
-"to create an account here. It is recommended that you create at least
one."
+#: FrmXconf.class:348
+msgid "1600x1200"
msgstr ""
-#: FMain.class:262
-msgid "Would you like to continue anyway?"
-msgstr ""
+#: FrmNetConf.class:239
+msgid "192.168.1.254"
+msgstr "-"
-#: FMain.class:262 FrmSummary.class:59
-msgid "Yes"
+#: FrmXconf.class:348
+msgid "1920x1280"
msgstr ""
-#: FMain.class:262 FrmSummary.class:61
-msgid "No"
+#: FrmXconf.class:335
+msgid "24 bit True Color"
msgstr ""
-#: FMain.class:280
-msgid "Please specify a hostname for this computer"
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
msgstr ""
-#: FMain.class:284
-msgid "Please specify the domain this computer belongs to"
+#: FrmXconf.class:348
+msgid "640x480"
msgstr ""
-#: FMain.class:299
-msgid ""
-"VectorLinux will now try to detect and configure your graphics hardware."
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
msgstr ""
-#: FMain.class:299
-msgid ""
-"Your screen may flicker or go blank for a few seconds during this
process."
+#: FrmXconf.class:348
+msgid "800x600"
msgstr ""
-#: FMain.class:351
-msgid "Please wait while setup attampts to run the partitioning utility"
-msgstr "Please wait while setup attempts to run the partitioning utility"
-
-#: FMain.class:353
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Please wait while setup analyses your current partition setup."
-
-#: FMain.class:353
-msgid "This may take a while ..."
-msgstr "This may take a while ..."
+#: FrmPartSel.class:150
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
-#: FMain.class:367
-msgid ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
+#: FrmRootPass.class:29
+msgid "About the root account"
msgstr ""
-"You must select a \"/\" partition. This is the target where the system
will "
-"install to"
-#: FMain.class:461
-msgid "Skipping lilo setup"
-msgstr "Skipping lilo setup per user request"
+#: MdlNetConf.module:277
+msgid "Access Point"
+msgstr "ESSID"
-#: FMain.class:799
-msgid "Back"
-msgstr "Back"
+#: FrmImportAccts.class:290
+msgid "Account"
+msgstr ""
-#: FMain.class:810
-msgid "Exit Installation"
-msgstr "Exit Installation"
+#: MdlSetup.module:317
+msgid "Activating swap space"
+msgstr ""
-#: FMain.class:821
-msgid "Next"
-msgstr "Next"
+#: MdlLiloOsList.module:396
+msgid "Add option to boot this Operating system into Text mode."
+msgstr ""
-#: FMain.class:835
-msgid "Button1"
-msgstr "-"
+#: MdlLilo.module:684
+msgid "Add option to boot this operating system into text mode"
+msgstr ""
-#: FrmAlsaConf.class:36
-msgid ""
-"This portion of the setup process allows you to sutup your soundcard for "
-"your new operating system."
+#: FrmDone.class:58
+msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
msgstr ""
-#: FrmAlsaConf.class:36
-msgid "Please use the setup program below to setup the sound system."
+#: MdlUsrAdd.module:119
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
msgstr ""
-#: FrmDiskPart.class:58
-msgid ""
-"When finished making changes, exit the partitioning application to "
-"continue ..."
+#: MdlUsrAdd.module:122
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
msgstr ""
-#: FrmDiskPart.class:117
-msgid "Disk Partitioning:"
-msgstr "Disk Partitioning:"
+#: MdlNetConf.module:321
+msgid "Automatic settings via DHCP."
+msgstr "Automatic settings via DHCP."
-#: FrmDone.class:32
-msgid "Exit"
-msgstr ""
+#: MdlNetConf.module:193
+msgid "Automatically activate this interface at start-up"
+msgstr "Automatically activate this interface at start-up"
-#: FrmDone.class:39
-msgid ""
-"has been installed to your system. Your new system has been configured
with "
-"the default factory settings."
+#: MdlSetup.module:301
+msgid "BROUGHT TO YOU BY"
msgstr ""
-#: FrmDone.class:39
-msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
+#: FrmSummary.class:186
+msgid "BULK PACKAGES"
msgstr ""
-#: FrmDone.class:39
-msgid ""
-"Your computer needs to be restarted so that you can use your new
operating "
-"system. Click"
-msgstr ""
+#: MdlSummarize.module:58
+msgid "BULK PACKAGES:"
+msgstr "BULK PACKAGES:"
-#: FrmDone.class:39
-msgid "to restart your computer now or click"
-msgstr ""
+#: FMain.class:828
+msgid "Back"
+msgstr "Back"
-#: FrmDone.class:39
-msgid "to restart your computer at a later time"
+#: MdlResetSettings.module:43
+msgid "Bash init script"
msgstr ""
-#: FrmDone.class:39
-msgid ""
-"If you installed from CD-ROM/R/RW media, please remove de disk before "
-"restarting."
-msgstr ""
+#: FrmLilo.class:284 FrmLiloSetup.class:242
+msgid "Boot Default"
+msgstr "Boot Default"
-#: FrmDone.class:75
-msgid "Installation is finished"
+#: FrmLiloSetup.class:176
+msgid "Boot Manager Configuration"
msgstr ""
-#: FrmHalSwitch.class:20
-msgid "Would you like to use Vl-Hot or HAL to manage your removable
devices?"
-msgstr ""
+#: MdlCore.module:497
+msgid "Boot Menu Options"
+msgstr "Boot Menu Options"
-#: FrmHalSwitch.class:25
-msgid "HAL"
+#: MdlConfLilo.module:98
+msgid "Boot loader has been setup successfully"
+msgstr "Boot loader has been setup successfully"
+
+#: MdlConfLilo.module:126 MdlLilo.module:98
+msgid "Bootsector of "
msgstr ""
-#: FrmHalSwitch.class:30
-msgid "VL-Hot"
+#: FrmLiloSetup.class:66 MdlLilo.module:56
+msgid "Bootsplash Extra High"
msgstr ""
-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
-msgstr "Vectorlinux is preparing your system for installation. Please
wait."
+#: FrmLilo.class:262
+msgid "Bootsplash Extra high"
+msgstr "Bootsplash Extra High"
-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Current Status"
+#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:54
+msgid "Bootsplash High"
+msgstr "Bootsplash High"
-#: FrmHostPrep.class:139 FrmLilo.class:236 FrmPartScheme.class:128
-#: FrmPkgSel.class:196 FrmPkgsel2.class:86 FrmSelISO.class:265
-#: FrmSummaryOld.class:87
-msgid "TextLabel1"
+#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:52
+msgid "Bootsplash Med"
+msgstr "Bootsplash Med"
+
+#: MdlCore.module:400
+msgid "Build Date: "
+msgstr "Build Date: "
+
+#: FMain.class:864
+msgid "Button1"
msgstr "-"
-#: FrmImportAccts.class:33 FrmUserAdd.class:343
-msgid "Select picture for user Login"
-msgstr ""
+#: MdlSetup.module:199
+msgid "Calculating package count ... Please wait"
+msgstr "Calculating package count ... Please wait"
-#: FrmImportAccts.class:52
-msgid "Reset settings for"
-msgstr ""
+#: MdlCore.module:478
+msgid "Cannot find SETUP.CONF"
+msgstr "Cannot find SETUP.CONF"
-#: FrmImportAccts.class:69
-msgid "Please select an account name from the dropdown list."
-msgstr ""
+#: 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"
-#: FrmImportAccts.class:74
-msgid "Password fields cannot be blank. Please enter a password for"
+#: FrmUserAdd.class:488
+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:145
+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."
+
+#: FrmZoneSet.class:133
+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 ""
-#: FrmImportAccts.class:78
-msgid "Selected passwords dont match. Please enter the same password twice"
+#: FrmUserAdd.class:560
+msgid "Clear Form"
msgstr ""
-#: FrmImportAccts.class:259
-#, fuzzy
-msgid "Account"
-msgstr "User Accounts"
+#: FrmSelISO.class:79
+msgid "Click"
+msgstr "Click"
-#: FrmImportAccts.class:271
-#, fuzzy
-msgid "New Password"
-msgstr "Set Password"
+#: FrmXconf.class:322
+msgid "Color Depth"
+msgstr ""
-#: FrmImportAccts.class:288
-#, fuzzy
-msgid "Select login Image"
-msgstr "Select your language"
+#: FrmZoneSet.class:138
+msgid "ComboBox1"
+msgstr "-"
-#: FrmImportAccts.class:298 FrmUserAdd.class:515
-msgid "Select"
-msgstr ""
+#: FrmNetConf.class:200
+msgid "Computer Name"
+msgstr "Computer Name"
-#: FrmImportAccts.class:308
-#, fuzzy
-msgid "Verify Password"
-msgstr "Enter Password"
+#: FrmLilo.class:219
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Configure and install lilo (Linux Boot Loader)"
-#: FrmImportAccts.class:319 FrmUserAdd.class:526
-msgid "User Rights Management"
-msgstr ""
+#: FrmUserAdd.class:554
+msgid "Create User"
+msgstr "Create User"
-#: FrmImportAccts.class:325
-msgid "Select Settings to reset"
+#: FrmUserAdd.class:60
+msgid "Create User Accounts"
msgstr ""
-#: FrmImportAccts.class:332
-#, fuzzy
-msgid "Import Account"
-msgstr "User Accounts"
-
-#: FrmImportAccts.class:339
-msgid "Cancel"
+#: FrmUserAdd.class:103
+msgid "Creating user account ... Please wait"
msgstr ""
-#: FrmImportAccts.class:347 FrmUserAdd.class:602
-#, fuzzy
-msgid "Import Existing User Accounts"
-msgstr "User Accounts"
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Current Status"
#: FrmInstallSys.class:63
msgid "Current Step"
msgstr "Current Step"
-#: FrmInstallSys.class:204
-msgid "Vectorlinux is currently being installed to your system... Please
wait"
-msgstr "Vectorlinux is currently being installed to your system... Please
wait"
-
-#: FrmInstallSys.class:219
-msgid "Installing ..."
-msgstr "Installing ..."
-
#: FrmInstallSys.class:230
msgid "Current Step "
msgstr "Current Step "
-#: FrmInstallSys.class:252
-msgid "Total progress"
-msgstr "Total progress"
-
-#: FrmLangSel.class:130
-msgid "Select your language"
-msgstr "Select your language"
-
-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "LICENSE AGREEMENT"
-
-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: FrmSummary.class:17 MdlSummarize.module:56
+msgid "Custom"
+msgstr "Custom"
-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "Yes, I Agree to the License Agreement"
-
-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No, I Do Not Agree"
+#: FrmPkgSel.class:211
+msgid "Custom Install"
+msgstr "Custom Install"
-#: FrmLilo.class:37
-msgid ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
+#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
+msgid "Description"
msgstr ""
-"The following Operating Systems have been detected on this computer.
Choose "
-"your desired option"
-#: FrmLilo.class:37
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
+#: MdlResetSettings.module:49
+msgid "Desktop icons, folders, launchers"
msgstr ""
-"for each one of them by clicking on each tab. To proceed with the
default "
-"pre-set values, simply click"
-#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:50
-msgid "Standard"
-msgstr "Standard"
-
-#: FrmLilo.class:219
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Configure and install lilo (Linux Boot Loader)"
+#: 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"
-#: FrmLilo.class:224
-msgid "Don't Install Lilo"
-msgstr "Don't Install Lilo"
+#: MdlCore.module:489
+msgid "Disk Partitioning"
+msgstr "Disk Partitioning"
-#: FrmLilo.class:230 FrmLiloSetup.class:292 FrmNetConf.class:279
-msgid "Tab 0"
-msgstr "-"
+#: FrmPartScheme.class:113
+msgid "Disk Partitioning Options"
+msgstr "Disk Partitioning Options"
-#: FrmLilo.class:248 FrmLiloSetup.class:224
-msgid "Target"
-msgstr "Target"
+#: FrmDiskPart.class:119
+msgid "Disk Partitioning:"
+msgstr "Disk Partitioning:"
-#: FrmLilo.class:254 FrmLiloSetup.class:203
-msgid "Video Resolution"
-msgstr "Video Resolution"
+#: MdlPartSel.module:141
+msgid "Do not format"
+msgstr "Do not format"
-#: FrmLilo.class:262 FrmLiloSetup.class:64 MdlLilo.module:52
-msgid "Bootsplash Med"
-msgstr "Bootsplash Med"
+#: FrmLiloSetup.class:192
+msgid "Do not install LILO"
+msgstr ""
-#: FrmLilo.class:262 FrmLiloSetup.class:65 MdlLilo.module:54
-msgid "Bootsplash High"
-msgstr "Bootsplash High"
+#: FrmSummary.class:123 MdlInstallSys.module:197 MdlWinDrives.module:124
+msgid "Do not mount"
+msgstr "Do not mount"
-#: FrmLilo.class:262
-msgid "Bootsplash Extra high"
-msgstr "Bootsplash Extra High"
+#: FrmNetConf.class:212
+msgid "Domain"
+msgstr ""
-#: FrmLilo.class:267 FrmLiloSetup.class:263
-msgid "Prompt Timeout"
-msgstr "Prompt Timeout"
+#: FrmLilo.class:224
+msgid "Don't Install Lilo"
+msgstr "Don't Install Lilo"
-#: FrmLilo.class:278 FrmLiloSetup.class:274
-msgid "Seconds"
-msgstr "Seconds"
+#: FrmImportAccts.class:370 FrmResetSettings.class:122
+msgid "Done"
+msgstr ""
-#: FrmLilo.class:284 FrmLiloSetup.class:242
-msgid "Boot Default"
-msgstr "Boot Default"
+#: MdlNetConf.module:321
+msgid "Dynamic Host Control Protocol"
+msgstr "Dynamic Host Control Protocol"
-#: FrmLiloSetup.class:66 MdlLilo.module:56
-msgid "Bootsplash Extra High"
+#: MdlUsrAdd.module:116
+msgid "Elite user"
msgstr ""
-#: FrmLiloSetup.class:176
-msgid "Boot Manager Configuration"
+#: MdlNetConf.module:258
+msgid "Encryption key"
+msgstr "Encryption Key"
+
+#: MdlNetConf.module:232
+msgid "Encryption type"
+msgstr "Encryption type"
+
+#: FrmRootPass.class:142 FrmUserAdd.class:574
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: FrmRootPass.class:38
+msgid "Enter a Password for root."
msgstr ""
-#: FrmLiloSetup.class:192
-msgid "Do not install LILO"
+#: FrmUserAdd.class:140
+msgid "Enter a password for"
msgstr ""
-#: FrmNetConf.class:184 MdlCore.module:501
-msgid "Network Configuration"
-msgstr "Network Configuration"
+#: FrmUserAdd.class:111
+msgid "Enter the login name that this user will user to login to this
system."
+msgstr ""
-#: FrmNetConf.class:199
-msgid "Computer Name"
-msgstr "Computer Name"
+#: FrmUserAdd.class:197
+msgid "Enter the same password twice"
+msgstr ""
-#: FrmNetConf.class:211
-msgid "Domain"
+#: MdlInstallSys.module:535
+msgid "Error occurred while installing"
msgstr ""
-#: FrmNetConf.class:227
-msgid "Manual DNS Server Specification"
-msgstr "Manual DNS Server Specification"
+#: MdlInstallCustom.module:351
+msgid "Error while installing "
+msgstr "Error while installing "
-#: FrmNetConf.class:238
-msgid "192.168.1.254"
-msgstr "-"
+#: MdlInstallCustom.module:76
+msgid "Error while installing required system software. "
+msgstr "Error while installing required system software. "
-#: FrmNetConf.class:243
-msgid "Primary DNS Server"
-msgstr "Primary DNS Server"
+#: MdlInstallCustom.module:85
+msgid "Error while installing system configuration. "
+msgstr "Error while installing system configuration. "
-#: FrmNetConf.class:256
-msgid "Secondary DNS Server"
-msgstr "Secondary DNS Server"
+#: FMain.class:839
+msgid "Exit Installation"
+msgstr "Exit Installation"
-#: 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"
+#: MdlPartSel.module:92
+msgid "FILESYSTEM"
+msgstr "FYLESYSTEM"
-#: FrmPartScheme.class:61
-msgid "This option will overwrite any existing data in the selected
partitions"
+#: MdlInstallSys.module:830
+msgid "Failed to install"
msgstr ""
-"This option will overwrite any existing data in the selected partitions"
-#: FrmPartScheme.class:61
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
+#: MdlInstallCustom.module:222
+msgid "Failed to install. Installation will stop"
msgstr ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-#: 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."
+#: FrmXconf.class:342
+msgid "Fbdev"
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:71
-msgid ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
+#: FrmSummary.class:43
+msgid "Filesystem"
msgstr ""
-"This option is the safest choice if you have other existing
installations "
-"that you wish to keep."
-#: FrmPartScheme.class:113
-msgid "Disk Partitioning Options"
-msgstr "Disk Partitioning Options"
-
-#: FrmPartScheme.class:118
-msgid "Use existing disk partitions"
-msgstr "Use existing disk partitions"
+#: MdlCore.module:502
+msgid "Final Hardware Configuration"
+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"
+#: MdlCore.module:488
+msgid "Find installation media"
+msgstr "Find installation media"
-#: FrmPartSel.class:150
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "ABOUT SYSTEM PARTITIONING IN LINUX"
+#: MdlInstallSys.module:656
+msgid "Finished intalling Bulks"
+msgstr "Finished intalling Bulks"
-#: FrmPartSel.class:150
-msgid ""
-"Linux is a modular operating system. This means that is has the ability
to "
-"store system and"
+#: MdlConfLilo.module:131 MdlLilo.module:100
+msgid "Floppy"
msgstr ""
-"Linux is a modular operating system. This means that it has the ability
to "
-"store system and"
-#: FrmPartSel.class:150
-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"
+#: 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"
-#: FrmPartSel.class:150
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
+#: FrmSummary.class:46
+msgid "Format ?"
msgstr ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.
The "
-"following is a"
-#: FrmPartSel.class:150
-msgid "suggested setup for a typical Linux installation"
-msgstr "suggested setup for a typical Linux installation"
+#: FrmSummary.class:21 MdlSummarize.module:69
+msgid "Full"
+msgstr "Full"
-#: FrmPartSel.class:150
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
+#: FrmPkgSel.class:206
+msgid "Full Install"
+msgstr "Full Install"
+
+#: MdlResetSettings.module:39
+msgid "GTK Tookit theme Settings"
msgstr ""
-"Used to store system data. This particular install requires a minimum of"
-#: FrmPartSel.class:150
-msgid "for this"
-msgstr "for this"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "GUI installer for Vector linux"
-#: FrmPartSel.class:150
-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"
+#: MdlNetConf.module:429
+msgid "Gateway Address"
+msgstr "Gateway Address"
-#: FrmPartSel.class:150
-msgid "in case you wish to."
-msgstr "in case you wish to."
+#: 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"
-#: FrmPartSel.class:150
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
msgstr ""
-"Used to store user documents, pictures, videos. Give yourself as much
room "
-"as you want"
-#: FrmPartSel.class:150
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Typically, you want to use the largest partition for this."
-
-#: FrmPartSel.class:150
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
+#: MdlResetSettings.module:47
+msgid "Graphical inteface preferences"
msgstr ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-#: FrmPartSel.class:150
-msgid "for this is"
-msgstr "for this is"
+#: FrmUserAdd.class:418
+msgid "Groups are a way of administering permissions for your users. You
grant the user"
+msgstr ""
-#: FrmPartSel.class:150
-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"
+#: FrmHalSwitch.class:25
+msgid "HAL"
+msgstr ""
-#: 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"
+#: MdlNetConf.module:153
+msgid "Hardware Address"
+msgstr "Hardware Address"
-#: FrmPartSel.class:186 FrmUserAdd.class:530
+#: FrmPartSel.class:186 FrmUserAdd.class:541
msgid "Help"
msgstr "Help"
-#: 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"
+#: MdlSummarize.module:56
+msgid "INSTALL TYPE:"
+msgstr "INSTALL TYPE:"
-#: 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"
+#: MdlNetConf.module:384
+msgid "IP Address"
+msgstr "IP Address"
-#: FrmPkgSel.class:25
-msgid "Choose your installation mode"
-msgstr "Choose your installation mode"
+#: MdlResetSettings.module:51
+msgid "IceWM settings, preferences, menu"
+msgstr ""
-#: FrmPkgSel.class:40
-msgid "Package"
+#: MdlNetConf.module:321
+msgid "If in doubt, choose this option"
+msgstr "If in doubt, choose this option"
+
+#: FrmDone.class:58
+msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
msgstr ""
-#: FrmPkgSel.class:41 FrmUsrPkgSel.class:17
-msgid "Description"
+#: FrmImportAccts.class:363
+msgid "Import Account"
msgstr ""
-#: FrmPkgSel.class:42 FrmSummary.class:41 FrmUsrPkgSel.class:19
-msgid "Size"
+#: FrmImportAccts.class:378 FrmUserAdd.class:613
+msgid "Import Existing User Accounts"
msgstr ""
-#: FrmPkgSel.class:71
-msgid ""
-"Installs all optional components in your VectorLinux media to your system"
+#: MdlLilo.module:592
+msgid "Include in boot menu"
msgstr ""
-#: FrmPkgSel.class:81
-msgid "Choose your optional components to install."
+#: MdlLilo.module:504 MdlLiloOsList.module:149
+msgid "Include this installation in the boot menu"
+msgstr "Include this installation in the boot menu"
+
+#: MdlLiloOsList.module:302
+msgid "Include this operating system in the boot menu"
+msgstr "Include this operating system in the boot menu"
+
+#: MdlLiloOsList.module:334
+msgid "Initial Ram Disk"
+msgstr "Initial Ram Disk"
+
+#: MdlLilo.module:628
+msgid "Initrd"
msgstr ""
-#: FrmPkgSel.class:206
-msgid "Full Install"
-msgstr "Full Install"
+#: MdlCore.module:495
+msgid "Install Operating System"
+msgstr "Install Operating System"
-#: FrmPkgSel.class:211
-msgid "Custom Install"
-msgstr "Custom Install"
+#: MdlCore.module:492
+msgid "Installation"
+msgstr "Installation"
-#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
-msgid "Select your indivirual packages to install."
-msgstr "Select your individual packages to install"
+#: FrmSummary.class:14 MdlCore.module:493
+msgid "Installation Summary"
+msgstr "Installation Summary"
-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "To install them all, just click next"
+#: FrmSummary.class:289
+msgid "Installation Type"
+msgstr ""
-#: FrmResetSettings.class:112
-msgid "Select which settings to reset"
+#: FrmDone.class:89
+msgid "Installation is finished"
msgstr ""
-#: FrmResetSettings.class:121
-#, fuzzy
-msgid "Done"
-msgstr "None"
+#: MdlInstallSys.module:771
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Installation phase complete. Ready for configuration"
-#: FrmRootPass.class:12
-msgid "System Administrator Password"
-msgstr "System Administrator Password"
+#: MdlInstallCustom.module:208 MdlInstallSys.module:497
+msgid "Installing"
+msgstr "Installing"
-#: 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."
+#: FrmInstallSys.class:219
+msgid "Installing ..."
+msgstr "Installing ..."
-#: FrmRootPass.class:19
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
+#: MdlInstallSys.module:816
+msgid "Installing Required Package ..."
msgstr ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
-#: FrmRootPass.class:29
-msgid "About the root account"
+#: MdlInstallSys.module:774
+msgid "Installing default system configuration and required software."
+msgstr "Installing default system configuration and required software."
+
+#: MdlInstallCustom.module:268
+msgid "Installing user-selected package"
msgstr ""
-#: FrmRootPass.class:38
-msgid "Enter a Password for root."
+#: FrmPkgSel.class:71
+msgid "Installs all optional components in your VectorLinux media to your
system"
msgstr ""
-#: FrmRootPass.class:47
-msgid ""
-"Passwords do not match. Please enter the same password twice for
accuracy."
+#: MdlNetConf.module:174
+msgid "Interface Type"
+msgstr "Interface Type"
+
+#: 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"
+
+#: MdlResetSettings.module:35
+msgid "KDE Settings (Menu, Window decorations, etc)"
msgstr ""
-#: FrmRootPass.class:115 MdlCore.module:499
-msgid "System Administrator"
-msgstr "System Administrator"
+#: MdlLilo.module:661 MdlLiloOsList.module:359
+msgid "Kernel boot options"
+msgstr "Kernel boot options"
-#: FrmRootPass.class:128
-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."
+#: MdlLiloOsList.module:158
+msgid "Label"
+msgstr "Label"
-#: FrmRootPass.class:134 FrmUserAdd.class:563
-msgid "Enter Password"
-msgstr "Enter Password"
+#: MdlCore.module:487
+msgid "Language Selection"
+msgstr "Language Selection"
-#: FrmRootPass.class:139
-msgid "Re-Enter Password"
-msgstr "Re-Enter Password"
+#: MdlConfLilo.module:94
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo returned an error. Please see below"
-#: FrmRootPass.class:156
-msgid "Set Password"
-msgstr "Set Password"
+#: 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"
-#: FrmSelISO.class:30 MdlCore.module:237
-msgid "No Installable Media Found"
-msgstr "No Installable Media Found"
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Loading gparted ... Please wait"
-#: FrmSelISO.class:79
-msgid "Click"
-msgstr "Click"
+#: FrmZoneSet.class:140
+msgid "LocalTime"
+msgstr "LocalTime"
-#: FrmSelISO.class:79
-msgid "to begin installating"
-msgstr "to begin installating"
+#: FrmUserAdd.class:567
+msgid "Login Name"
+msgstr ""
-#: FrmSelISO.class:81
-msgid "Unable to locate any installable media."
+#: FrmUserAdd.class:119
+msgid "Login name field contains illegal characters. Please use only
lowercase letters and numbers"
msgstr ""
-#: FrmSelISO.class:87
-msgid "Select installation media from the list below"
+#: MdlLilo.module:96
+msgid "MBR of"
msgstr ""
-#: FrmSelISO.class:116
-msgid "Unable to identify distro."
-msgstr "Unable to identify distro."
+#: MdlConfLilo.module:119
+msgid "MBR of "
+msgstr ""
+
+#: MdlCore.module:400
+msgid "MINIMUM REQUIREMENTS"
+msgstr "MINIMUM REQUIREMENTS"
+
+#: MdlPartSel.module:82
+msgid "MOUNT POINT"
+msgstr "MOUNT POINT"
+
+#: MdlWinDrives.module:85
+msgid "MOUNT TO"
+msgstr "MOUNT TO"
+
+#: MdlResetSettings.module:57
+msgid "MPlayer Multimedia Player Settings"
+msgstr ""
+
+#: FrmNetConf.class:228
+msgid "Manual DNS Server Specification"
+msgstr "Manual DNS Server Specification"
#: FrmSelISO.class:151
msgid "Minimum Disk Space Requirements"
msgstr "Minimum Disk Space Requirements"
-#: FrmSelISO.class:254
-msgid "No installable images found."
-msgstr "No installable images found."
+#: 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"
-#: 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"
+#: 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."
-#: FrmSelISO.class:270
-msgid "Search Again"
-msgstr "Search Again"
+#: FrmSummary.class:45
+msgid "Mount Point"
+msgstr ""
-#: FrmSummary.class:14 MdlCore.module:493
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#: MdlLilo.module:514 MdlLiloOsList.module:313
+msgid "Name"
+msgstr "Name"
-#: FrmSummary.class:17 MdlSummarize.module:56
-msgid "Custom"
-msgstr "Custom"
+#: FrmNetConf.class:185 MdlCore.module:501
+msgid "Network Configuration"
+msgstr "Network Configuration"
-#: FrmSummary.class:21 MdlSummarize.module:69
-msgid "Full"
-msgstr "Full"
+#: FrmImportAccts.class:302
+msgid "New Password"
+msgstr ""
-#: FrmSummary.class:37
-#, fuzzy
-msgid "Preparing Installation Summary ... Please wait"
-msgstr "Installation Summary"
+#: FMain.class:850
+msgid "Next"
+msgstr "Next"
-#: FrmSummary.class:39
-msgid "Partition"
+#: FrmUserAdd.class:35
+msgid "No"
msgstr ""
-#: FrmSummary.class:43
-msgid "Filesystem"
-msgstr ""
+#: FrmSelISO.class:30 MdlCore.module:237
+msgid "No Installable Media Found"
+msgstr "No Installable Media Found"
-#: FrmSummary.class:45
-msgid "Mount Point"
+#: MdlWinDrives.module:141
+msgid "No Windows partitions detected"
+msgstr "No Windows partitions detected"
+
+#: MdlNetConf.module:93
+msgid "No ethernet neworking devices found"
msgstr ""
-#: FrmSummary.class:46
-msgid "Format ?"
-msgstr ""
+#: FrmSelISO.class:254
+msgid "No installable images found."
+msgstr "No installable images found."
+
+#: FrmSummary.class:100 MdlLilo.module:174 MdlNetConf.module:245
+msgid "None"
+msgstr "None"
-#: FrmSummary.class:52 MdlInstallSys.module:142 MdlPartSel.module:143
+#: FrmSummary.class:52 MdlInstallSys.module:149 MdlPartSel.module:148
msgid "Not Used"
msgstr "Not Used"
-#: FrmSummary.class:58
-#, fuzzy
-msgid "Do not Format"
-msgstr "Do not format"
+#: FrmUserAdd.class:419
+msgid "OK"
+msgstr ""
-#: FrmSummary.class:99 MdlNetConf.module:245
-msgid "None"
-msgstr "None"
+#: MdlSummarize.module:62
+msgid "OPTIONAL PACKAGES:"
+msgstr "OPTIONAL PACKAGES:"
-#: FrmSummary.class:121 MdlInstallSys.module:190 MdlWinDrives.module:124
-msgid "Do not mount"
-msgstr "Do not mount"
+#: MdlSummarize.module:49
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+msgstr "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
-#: FrmSummary.class:174 FrmUsrPkgSel.class:16
-msgid "Package Name"
+#: MdlLiloOsList.module:290
+msgid "Operating system installed in"
msgstr ""
-#: FrmSummary.class:183
-msgid "BULK PACKAGES"
-msgstr ""
+#: MdlPartSel.module:71 MdlWinDrives.module:75
+msgid "PARTITION"
+msgstr "PARTITION"
-#: FrmSummary.class:210
-msgid "USER-SELECTED PACKAGES"
-msgstr ""
+#: MdlSummarize.module:28
+msgid "PARTITIONING LAYOUT"
+msgstr "PARTITION LAYOUT"
-#: FrmSummary.class:286
-msgid "Installation Type"
+#: FrmPkgSel.class:40
+msgid "Package"
msgstr ""
-#: FrmSummary.class:296
-msgid "Partition Selection Scheme"
+#: FrmSummary.class:177 FrmUsrPkgSel.class:16
+msgid "Package Name"
msgstr ""
-#: FrmSummary.class:306 FrmUsrPkgSel.class:147 MdlCore.module:490
-msgid "Software Selection"
-msgstr "Software Selection"
-
-#: FrmUserAdd.class:54
-msgid "Create User Accounts"
+#: MdlInstallCustom.module:112
+msgid "Packages have been Installed. Please click next to move on to
System Configuration."
msgstr ""
-#: FrmUserAdd.class:92
-#, fuzzy
-msgid "Creating user account ... Please wait"
-msgstr "Calculating package count ... Please wait"
+#: MdlInstallSys.module:386
+msgid "Packages have been installed in your system. Please click"
+msgstr "Packages have been installed to your system. Please click"
-#: FrmUserAdd.class:100
-msgid "Enter the login name that this user will user to login to this
system."
+#: FrmSummary.class:39
+msgid "Partition"
msgstr ""
-#: FrmUserAdd.class:108
-msgid ""
-"Login name field contains illegal characters. Please use only lowercase "
-"letters and numbers"
+#: FrmSummary.class:299
+msgid "Partition Selection Scheme"
msgstr ""
-#: FrmUserAdd.class:122
-msgid "Username contains illegal characters"
+#: FrmImportAccts.class:86
+msgid "Password fields cannot be blank. Please enter a password for"
msgstr ""
-#: FrmUserAdd.class:125
-msgid "User account for"
+#: FrmUserAdd.class:196
+msgid "Passwords do not match"
msgstr ""
-#: FrmUserAdd.class:125
-msgid "already exists"
+#: FMain.class:249
+msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FrmUserAdd.class:129
-msgid "Enter a password for"
+#: FrmRootPass.class:49
+msgid "Passwords do not match. Please enter the same password twice for
accuracy."
msgstr ""
-#: FrmUserAdd.class:185
-msgid "Passwords do not match"
+#: FMain.class:483
+msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FrmUserAdd.class:186
-msgid "Enter the same password twice"
+#: FMain.class:227
+msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FrmUserAdd.class:382
-msgid ""
-"Your password selections do not match. Please enter the same password
twice"
+#: FrmImportAccts.class:81
+msgid "Please select an account name from the dropdown list."
msgstr ""
-#: FrmUserAdd.class:407
-msgid ""
-"Groups are a way of administering permissions for your users. You grant
the "
-"user"
-msgstr ""
+#: MdlPartSel.module:294
+msgid "Please select only one "
+msgstr "Please select only one "
-#: FrmUserAdd.class:407
-msgid "permission to do certain things by adding them to certain groups."
+#: 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:282
+msgid "Please specify a hostname for this computer"
msgstr ""
-#: FrmUserAdd.class:407
-msgid "Select which groups you want this user to be a part of here"
+#: FMain.class:286
+msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FrmUserAdd.class:408
-msgid "OK"
+#: FrmAlsaConf.class:36
+msgid "Please use the setup program below to setup the sound system."
msgstr ""
-#: FrmUserAdd.class:477
-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."
+#: FMain.class:355
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Please wait while setup analyses your current partition setup."
-#: FrmUserAdd.class:521
-msgid "Use Picture ID for Login greeting"
-msgstr ""
+#: FMain.class:353
+msgid "Please wait while setup attampts to run the partitioning utility"
+msgstr "Please wait while setup attempts to run the partitioning utility"
-#: FrmUserAdd.class:543
-msgid "Create User"
-msgstr "Create User"
+#: MdlNetConf.module:132
+msgid "Plugged-in"
+msgstr "Plugged-in"
-#: FrmUserAdd.class:549
-msgid "Clear Form"
+#: MdlCore.module:486
+msgid "Preparation"
+msgstr "Preparation"
+
+#: FrmSummary.class:37
+msgid "Preparing Installation Summary ... Please wait"
msgstr ""
-#: FrmUserAdd.class:556
-msgid "Login Name"
+#: MdlSetup.module:319
+msgid "Preparing filesystems"
msgstr ""
-#: FrmUserAdd.class:570
-msgid "ReEnter Password"
-msgstr "ReEnter Password"
+#: FrmNetConf.class:244
+msgid "Primary DNS Server"
+msgstr "Primary DNS Server"
-#: FrmUserAdd.class:586
-msgid "Real Name"
+#: FrmXconf.class:27
+msgid "Probe hardware to setup your Graphical Environment using your
preffered settings"
msgstr ""
-#: FrmUserAdd.class:592 MdlCore.module:500
-msgid "User Accounts"
-msgstr "User Accounts"
-
-#: FrmUsrPkgSel.class:11
-msgid "To install them all, just click"
+#: MdlNetConf.module:60
+msgid "Probing your networking hardware ... Please wait"
msgstr ""
-#: FrmUsrPkgSel.class:40
-#, fuzzy
-msgid "Reading available software selection ... Please wait"
-msgstr "Loagind gparted ... Please wait"
+#: FrmLilo.class:267 FrmLiloSetup.class:263
+msgid "Prompt Timeout"
+msgstr "Prompt Timeout"
-#: 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"
+#: MdlResetSettings.module:37
+msgid "QT Toolkit settings (KDE Visual Effects)"
+msgstr ""
-#: FrmXconf.class:25
-msgid "Uses the default (failsafe) configuration."
+#: MdlResetSettings.module:55
+msgid "ROX Filer Desktop settings"
msgstr ""
-#: FrmXconf.class:27
-msgid ""
-"Probe hardware to setup your Graphical Environment using your preffered "
-"settings"
+#: FrmRootPass.class:147
+msgid "Re-Enter Password"
+msgstr "Re-Enter Password"
+
+#: FrmUserAdd.class:581
+msgid "ReEnter Password"
+msgstr "ReEnter Password"
+
+#: FrmUsrPkgSel.class:40
+msgid "Reading available software selection ... Please wait"
msgstr ""
-#: FrmXconf.class:29
-msgid "Use the console framebuffer driver"
+#: FrmUserAdd.class:597
+msgid "Real Name"
msgstr ""
-#: FrmXconf.class:301
-msgid "Graphical Interface Settings"
+#: MdlCore.module:498
+msgid "Regional Settings"
+msgstr "Regional Settings"
+
+#: FrmImportAccts.class:52
+msgid "Reset settings for"
msgstr ""
-#: FrmXconf.class:311
-msgid "Video Driver"
+#: FMain.class:199
+msgid "Restart"
msgstr ""
-#: FrmXconf.class:322
-msgid "Color Depth"
+#: MdlUsrAdd.module:110
+msgid "Restricted administrator (backup)"
msgstr ""
+#: MdlNetConf.module:305
+msgid "STATUS:"
+msgstr "STATUS:"
+
+#: MdlCore.module:221
+msgid "Scanning system for installable media. Please wait ..."
+msgstr "Scanning system for installable media. Please wait ..."
+
#: FrmXconf.class:328
msgid "Screen Resolution"
msgstr ""
-#: FrmXconf.class:335
-msgid "24 bit True Color"
-msgstr ""
+#: FrmSelISO.class:270
+msgid "Search Again"
+msgstr "Search Again"
-#: FrmXconf.class:335
-msgid "16 bit Pseudo Color"
-msgstr ""
+#: FrmNetConf.class:257
+msgid "Secondary DNS Server"
+msgstr "Secondary DNS Server"
-#: FrmXconf.class:335
-msgid "8 bit 256 Color"
-msgstr ""
+#: FrmLilo.class:278 FrmLiloSetup.class:274
+msgid "Seconds"
+msgstr "Seconds"
-#: FrmXconf.class:335
-msgid "4 bit 16 Color"
+#: FrmImportAccts.class:329 FrmUserAdd.class:526
+msgid "Select"
msgstr ""
-#: FrmXconf.class:335
-msgid "1 bit Mono B/W"
+#: FrmImportAccts.class:356
+msgid "Select Settings to reset"
msgstr ""
-#: FrmXconf.class:340
-msgid "Vesa"
+#: FMain.class:228
+msgid "Select an entry from this list"
msgstr ""
-#: FrmXconf.class:342
-msgid "Fbdev"
+#: FrmSelISO.class:87
+msgid "Select installation media from the list below"
msgstr ""
-#: FrmXconf.class:348
-msgid "1920x1280"
+#: FrmImportAccts.class:319
+msgid "Select login Image"
msgstr ""
-#: FrmXconf.class:348
-msgid "1600x1200"
+#: FrmImportAccts.class:33 FrmUserAdd.class:354
+msgid "Select picture for user Login"
msgstr ""
-#: FrmXconf.class:348
-msgid "1440x900"
-msgstr ""
+#: 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"
-#: FrmXconf.class:348
-msgid "1280x1024"
-msgstr ""
+#: 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"
-#: FrmXconf.class:348
-msgid "1280x800"
-msgstr ""
+#: 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."
-#: FrmXconf.class:348
-msgid "1024x768"
+#: 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"
+
+#: FrmUserAdd.class:418
+msgid "Select which groups you want this user to be a part of here"
msgstr ""
-#: FrmXconf.class:348
-msgid "800x600"
+#: FrmResetSettings.class:112
+msgid "Select which settings to reset"
msgstr ""
-#: FrmXconf.class:348
-msgid "640x480"
+#: FrmPkgsel2.class:21 FrmUsrPkgSel.class:11
+msgid "Select your indivirual packages to install."
+msgstr "Select your individual packages to install"
+
+#: FrmLangSel.class:130
+msgid "Select your language"
+msgstr "Select your language"
+
+#: FrmImportAccts.class:90
+msgid "Selected passwords dont match. Please enter the same password twice"
msgstr ""
-#: FrmZoneSet.class:21
-msgid "Timezone configuration"
-msgstr "Timezone configuration"
+#: FrmRootPass.class:164
+msgid "Set Password"
+msgstr "Set Password"
-#: FrmZoneSet.class:171
-msgid "Choose the correct timezone for the area in which you live."
-msgstr "Choose the correct timezone for the area in which you live."
+#: MdlNetConf.module:206
+msgid "Setup Mode"
+msgstr "Setup Mode"
-#: FrmZoneSet.class:176
-msgid "ComboBox1"
-msgstr "-"
+#: FMain.class:501
+msgid "Setup has detected existing directories in the partition you
selected for /home."
+msgstr ""
-#: FrmZoneSet.class:178
-msgid "LocalTime"
-msgstr "LocalTime"
+#: FrmUserAdd.class:35
+msgid "Setup has detected existing user directories in your selected /home
partition. Would you like to import these user accounts into your new
installation?"
+msgstr ""
-#: FrmZoneSet.class:178
-msgid "UTC"
-msgstr "UTC"
+#: MdlCore.module:405
+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"
-#: FrmZoneSet.class:183
-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."
+#: 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"
-#: MdlConfLilo.module:97
-msgid "Lilo returned an error. Please see below"
-msgstr "Lilo returned an error. Please see below"
+#: MdlCore.module:239
+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 "
-#: MdlConfLilo.module:100
-msgid "Boot loader has been setup successfully"
-msgstr "Boot loader has been setup successfully"
+#: MdlDiskPart.module:95
+msgid "Several windows found. I will take the first one!"
+msgstr "Several windows found. I will take the first one!"
-#: MdlConfLilo.module:124
-msgid "MBR of "
+#: FrmPkgSel.class:42 FrmSummary.class:41 FrmUsrPkgSel.class:19
+msgid "Size"
msgstr ""
-#: MdlConfLilo.module:131 MdlLilo.module:98
-msgid "Bootsector of "
+#: FMain.class:236
+msgid "Skipping boot loaded setup"
msgstr ""
-#: MdlConfLilo.module:136 MdlLilo.module:100
-msgid "Floppy"
+#: FMain.class:441
+msgid "Skipping boot loader setup"
msgstr ""
-#: MdlCore.module:28
-#, fuzzy
-msgid "Working ... Please Wait"
-msgstr "Loagind gparted ... Please wait"
+#: FMain.class:467
+msgid "Skipping lilo setup"
+msgstr "Skipping lilo setup per user request"
-#: MdlCore.module:221
-msgid "Scanning system for installable media. Please wait ..."
-msgstr "Scanning system for installable media. Please wait ..."
+#: FrmSummary.class:309 FrmUsrPkgSel.class:147 MdlCore.module:490
+msgid "Software Selection"
+msgstr "Software Selection"
-#: MdlCore.module:239
-msgid ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
+#: MdlResetSettings.module:45
+msgid "Sound system preferences"
msgstr ""
-"Setup was unable to find any installable media on your system. Please
insert "
-"your VectorLinux "
-#: MdlCore.module:239
-msgid "installation CD and click"
-msgstr ""
+#: FrmLilo.class:139 FrmLiloSetup.class:63 MdlLilo.module:50
+msgid "Standard"
+msgstr "Standard"
-#: MdlCore.module:239
-msgid "to try again"
-msgstr "to try again"
+#: MdlNetConf.module:362
+msgid "Static IP Address Settings"
+msgstr ""
-#: MdlCore.module:400
-msgid "Build Date: "
-msgstr "Build Date: "
+#: MdlNetConf.module:407
+msgid "Subnet Mask"
+msgstr "Subnet Mask"
-#: MdlCore.module:400
-msgid "MINIMUM REQUIREMENTS"
-msgstr "MINIMUM REQUIREMENTS"
+#: FrmRootPass.class:123 MdlCore.module:499
+msgid "System Administrator"
+msgstr "System Administrator"
-#: MdlCore.module:405
-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"
+#: FrmRootPass.class:12
+msgid "System Administrator Password"
+msgstr "System Administrator Password"
-#: MdlCore.module:478
-msgid "Cannot find SETUP.CONF"
-msgstr "Cannot find SETUP.CONF"
+#: MdlCore.module:496
+msgid "System Configuration"
+msgstr "System Configuration"
-#: MdlCore.module:486
-msgid "Preparation"
-msgstr "Preparation"
+#: FrmLilo.class:230 FrmLiloSetup.class:292 FrmNetConf.class:280
+msgid "Tab 0"
+msgstr "-"
-#: MdlCore.module:487
-msgid "Language Selection"
-msgstr "Language Selection"
+#: FrmLilo.class:248 FrmLiloSetup.class:224
+msgid "Target"
+msgstr "Target"
-#: MdlCore.module:488
-msgid "Find installation media"
-msgstr "Find installation media"
+#: FrmSummaryOld.class:87
+msgid "TextLabel1"
+msgstr "-"
-#: MdlCore.module:489
-msgid "Disk Partitioning"
-msgstr "Disk Partitioning"
+#: FrmLilo.class:37
+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"
-#: MdlCore.module:492
-msgid "Installation"
-msgstr "Installation"
+#: FrmRootPass.class:136
+msgid "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
+msgstr "The linux root account is pre-assigned to be used as the system
administrator's account. This account is used to perform system-wide
changes such as software upgrades, managing user accounts etc. \n\nMost
other operations do not require administrative priviledges.\nThe root
password must be entered twice for ensured accuracy. When choosing a root
password, think of something easy for you to remember, but hard for others
to guess."
-#: MdlCore.module:495
-msgid "Install Operating System"
-msgstr "Install Operating System"
+#: MdlInstallCustom.module:48
+msgid "There as been an error while installing required system software. "
+msgstr "There as been an error while installing required system software. "
-#: MdlCore.module:496
-msgid "System Configuration"
-msgstr "System Configuration"
+#: MdlInstallSys.module:644
+msgid "There has been an error extracting"
+msgstr "There has been an error extracting"
-#: MdlCore.module:497
-msgid "Boot Menu Options"
-msgstr "Boot Menu Options"
+#: MdlInstallCustom.module:65
+msgid "There has been an error while installing optional software to your
system."
+msgstr ""
-#: MdlCore.module:498
-msgid "Regional Settings"
-msgstr "Regional Settings"
+#: MdlInstallCustom.module:56
+msgid "There has been an error while installing optional software to your
system. "
+msgstr "There has been an error while installing optional software to your
system. "
-#: MdlCore.module:502
-msgid "Final Hardware Configuration"
+#: MdlPartFrmt.module:103
+msgid "There has been an error while trying to format "
msgstr ""
-#: 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."
+#: FMain.class:355
+msgid "This may take a while ..."
+msgstr "This may take a while ..."
-#: 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"
+#: FrmPartScheme.class:71
+msgid "This option is the safest choice if you have other existing
installations that you wish to keep."
+msgstr "This option is the safest choice if you have other existing
installations that you wish to keep."
-#: 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"
+#: 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"
-#: MdlDiskPart.module:57
-msgid "Loading gparted ... Please wait"
-msgstr "Loagind gparted ... Please wait"
+#: FrmAlsaConf.class:36
+msgid "This portion of the setup process allows you to sutup your
soundcard for your new operating system."
+msgstr ""
-#: MdlDiskPart.module:90
-msgid ""
-"Setup is unable to successfully run gparted on this system. This may be
a "
-"sign of "
+#: MdlUsrAdd.module:89
+msgid "This user can access CD/DVD devices"
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."
+#: MdlUsrAdd.module:92
+msgid "This user can access floppy disks"
+msgstr ""
-#: MdlDiskPart.module:95
-msgid "Several windows found. I will take the first one!"
-msgstr "Several windows found. I will take the first one!"
+#: MdlUsrAdd.module:98
+msgid "This user can access scanner devices"
+msgstr ""
-#: MdlInstallCustom.module:48
-msgid "There as been an error while installing required system software. "
-msgstr "There as been an error while installing required system software. "
+#: MdlUsrAdd.module:113
+msgid "This user is a system administrator"
+msgstr ""
-#: MdlInstallCustom.module:56
-msgid ""
-"There has been an error while installing optional software to your
system. "
+#: MdlUsrAdd.module:101
+msgid "This user is allowed to change audio settings"
msgstr ""
-"There has been an error while installing optional software to your
system. "
-#: MdlInstallCustom.module:65
-msgid ""
-"There has been an error while installing optional software to your
system."
+#: MdlUsrAdd.module:104
+msgid "This user is allowed to change video settings"
msgstr ""
-#: MdlInstallCustom.module:76
-msgid "Error while installing required system software. "
-msgstr "Error while installing required system software. "
+#: MdlUsrAdd.module:107
+msgid "This user is allowed to play restricted games"
+msgstr ""
-#: MdlInstallCustom.module:85
-msgid "Error while installing system configuration. "
-msgstr "Error while installing system configuration. "
+#: MdlUsrAdd.module:95
+msgid "This user is allowed to print"
+msgstr ""
-#: MdlInstallCustom.module:92
-msgid "Unable to install kernels. "
-msgstr "Unable to install kernels. "
+#: MdlNetConf.module:321
+msgid "This will work if you use a cable or DSL modem on a home network."
+msgstr "This will work if you use a cable or DSL modem on a home network."
-#: MdlInstallCustom.module:111
-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."
+#: FrmZoneSet.class:21
+msgid "Timezone configuration"
+msgstr "Timezone configuration"
-#: MdlInstallCustom.module:112
-msgid ""
-"packages have been Installed. Please click next to move on to System "
-"Configuration."
+#: FrmUsrPkgSel.class:11
+msgid "To install them all, just click"
msgstr ""
-"packages have been Installed. Please click next to move on to System "
-"Configuration."
-#: MdlInstallCustom.module:205 MdlInstallSys.module:480
-msgid "Installing"
-msgstr "Installing"
+#: FrmPkgsel2.class:21
+msgid "To install them all, just click next"
+msgstr "To install them all, just click next"
-#: MdlInstallCustom.module:225
-msgid "Failed to install. Installation will stop"
+#: MdlSetup.module:255
+msgid "Total bulks to be installed = "
msgstr ""
-#: MdlInstallCustom.module:271
-msgid "Installing user-selected package"
+#: MdlSetup.module:258
+msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlInstallCustom.module:354
-msgid "Error while installing "
-msgstr "Error while installing "
+#: FrmInstallSys.class:252
+msgid "Total progress"
+msgstr "Total progress"
-#: MdlInstallCustom.module:423
-msgid "failed to install. Installation will stop now"
+#: FrmPartSel.class:150
+msgid "Typically, you want to use the largest partition for this."
+msgstr "Typically, you want to use the largest partition for this."
+
+#: FrmSummary.class:213
+msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: MdlInstallSys.module:118
-msgid "Writing new /etc/fstab to system"
-msgstr "Writing new /etc/fstab to system"
+#: FrmZoneSet.class:140
+msgid "UTC"
+msgstr "UT...
[truncated message content] |
|
From: <cod...@go...> - 2008-12-04 22:34:07
|
Author: M0...@gm...
Date: Thu Dec 4 14:01:47 2008
New Revision: 369
Modified:
branches/iVL/.project
branches/iVL/FrmDone.class
branches/iVL/installer.gambas
Log:
Updated binary
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 14:01:47 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.47
+Version=0.1.48
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 14:01:47 2008
@@ -46,11 +46,13 @@
'IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
'Message.Info("Found /tmp/status")
+ ME.tlBanner.Text = "<b>" & ("Configuration in progress") & "</b>"
sText = "<br><br><br>" & ClsGlobal.DISTRO & Space(1) & ("is
performing final system configuration. Please wait a moment.")
FMain.btnext.Enabled = FALSE
FMain.btQuit.Enabled = FALSE
ELSE
- Message.Info("Found /tmp/status")
+ 'Message.Info("Found /tmp/status")
+ ME.tlBanner.Text = "<b>" & ("Installation is complete") & "</b>"
sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 22:29:28
|
Author: M0...@gm...
Date: Thu Dec 4 14:27:59 2008
New Revision: 370
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmDiskPart.class
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
- Added test to check for existing partitions before offering to use
existing partitions
This way if no partitions are found (unpartitioned hard drive) the user
will be lead into gparted
- Updated binary
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 14:27:59 2008
@@ -70,55 +70,55 @@
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:353
+#: FMain.class:364
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:355
+#: FMain.class:366
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:355
+#: FMain.class:366
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:369
+#: FMain.class:380
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:441
+#: FMain.class:452
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:467
+#: FMain.class:478
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:483
+#: FMain.class:494
msgid "Please enter the root password. For your security purposes, do not
leave this blank"
msgstr ""
-#: FMain.class:501
+#: FMain.class:512
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:501
+#: FMain.class:512
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:828
+#: FMain.class:839
msgid "Back"
msgstr ""
-#: FMain.class:839
+#: FMain.class:850
msgid "Exit Installation"
msgstr ""
-#: FMain.class:850
+#: FMain.class:861
msgid "Next"
msgstr ""
-#: FMain.class:864
+#: FMain.class:875
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Dec 4 14:27:59 2008
@@ -18,7 +18,7 @@
msgid "When finished making changes, exit the partitioning application to
continue ..."
msgstr ""
-#: FrmDiskPart.class:119
+#: FrmDiskPart.class:120
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Dec 4 14:27:59 2008
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlSetup.module:199
+#: MdlSetup.module:216
msgid "Calculating package count ... Please wait"
msgstr ""
-#: MdlSetup.module:255
+#: MdlSetup.module:272
msgid "Total bulks to be installed = "
msgstr ""
-#: MdlSetup.module:258
+#: MdlSetup.module:275
msgid "Total pkgs to be installed = "
msgstr ""
-#: MdlSetup.module:301
+#: MdlSetup.module:318
msgid "BROUGHT TO YOU BY"
msgstr ""
-#: MdlSetup.module:317
+#: MdlSetup.module:334
msgid "Activating swap space"
msgstr ""
-#: MdlSetup.module:319
+#: MdlSetup.module:336
msgid "Preparing filesystems"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 14:27:59 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.48
+Version=0.1.11
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Dec 4 14:27:59 2008
@@ -1,4 +1,3 @@
-- Fixed missing format? indicator for non-linux partitions (win)
-- Extended blue background for swap partition row to the 4th column.
-- Allowed user to mount the host partition (on hosted install) to
/mnt/hdxx only.
-- Fixed problem with back navigation... users getting locked out.
+- Added test to check for existing partitions before offering to use
existing partitions
+ This way if no partitions are found (unpartitioned hard drive) the user
will be lead into gparted
+- Updated binary
\ No newline at end of file
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 14:27:59 2008
@@ -342,6 +342,17 @@
END IF
frmNext = FrmPartScheme
+ ' Try to determine if partitions are available before offering to
select.
+ IF MdlSetup.QUICK_PARTITION_PROBE() = 0 THEN
+ FrmPartScheme.rbUseExisting.Enabled = FALSE
+ FrmPartScheme.rbUseExisting.ForeColor = Color.Gray
+ ELSE
+ FrmPartScheme.rbUseExisting.Enabled = TRUE
+ FrmPartScheme.rbUseExisting.Color = Color.Black
+ END IF
+
+
+
CASE "FrmPartScheme"
' The next form is defined from the radio buttons in Frm
PartScheme. But let's see if we can display some status text
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Thu Dec 4 14:27:59 2008
@@ -66,10 +66,11 @@
MdlCore.WARN_STATUS("")
FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning
scheme... Please wait<br>This will take a few seconds...</h3>"
+ MdlCore.WARN_STATUS("")
FrmDiskPart.tlBanner.Refresh
FrmDiskPart.tlBanner.Adjust
'Message("Exiting GParted")
- MdlCore.warn_status_off()
+ 'MdlCore.warn_status_off()
WAIT 1
bReboot = MdlSetup.CHECK_IF_REBOOT_NEEDED()
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 4 14:27:59 2008
@@ -15,6 +15,23 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC FUNCTION QUICK_PARTITION_PROBE() AS Integer
+
+ DIM sDump AS String
+ SHELL "probepart | grep ^/dev" TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) > 0 THEN
+ RETURN 1
+ ELSE
+ RETURN 0
+ END IF
+
+
+END
+
+
+
PUBLIC SUB GO_WITH_SELECTED(sDev AS String, sISONAME AS String) ' this
will mount the drive and display the license agreement
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 20:05:08
|
Author: M0...@gm...
Date: Thu Dec 4 12:04:03 2008
New Revision: 367
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmDone.class
branches/iVL/FrmDone.form
branches/iVL/MdlConfLilo.module
branches/iVL/installer.gambas
Log:
New attempt to fix background monitor
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 12:04:03 2008
@@ -94,27 +94,31 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:498
+#: FMain.class:483
+msgid "Please enter the root password. For your security purposes, do not
leave this blank"
+msgstr ""
+
+#: FMain.class:501
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:498
+#: FMain.class:501
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:823
+#: FMain.class:826
msgid "Back"
msgstr ""
-#: FMain.class:834
+#: FMain.class:837
msgid "Exit Installation"
msgstr ""
-#: FMain.class:845
+#: FMain.class:848
msgid "Next"
msgstr ""
-#: FMain.class:859
+#: FMain.class:862
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 12:04:03 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.41
+Version=0.1.43
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 12:04:03 2008
@@ -479,7 +479,10 @@
CASE "FrmRootPass"
- IF FrmRootPass.tbPasswd1.Text = "" THEN RETURN
+ IF FrmRootPass.tbPasswd1.Text = "" THEN
+ Message.Error(("Please enter the root password. For your
security purposes, do not leave this blank"))
+ RETURN
+ END IF
IF FrmRootPass.tbPasswd1.Text <> FrmRootPass.tbPasswd2.Text THEN
Balloon.Error(("Passwords do not match. Please enter the same
password twice"), FrmRootPass.tbPasswd2)
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 12:04:03 2008
@@ -30,38 +30,57 @@
FMain.btback.Enabled = FALSE
FMain.btback.ForeColor = Color.Gray
- sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
+' sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
FMain.btnext.Enabled = FALSE
FMain.btQuit.Enabled = FALSE
'REPEAT
- IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
- REPEAT
- WAIT
- 'IF ME.MONITOR_BACKGROUND() = 1 THEN
- ME.tlMsg.Text = sText
- UNTIL MdlConfLilo.hBgConfigProc.State = Process.Stopped
- END IF
+ ' ' IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
+ ' ' REPEAT
+ ' ' WAIT
+ ' ' 'IF ME.MONITOR_BACKGROUND() = 1 THEN
+ ' ' ME.tlMsg.Text = sText
+ ' ' UNTIL MdlConfLilo.hBgConfigProc.State = Process.Stopped
+ ' ' END IF
+ ' '
+ ' ' sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to
your system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+ ' ' ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+ ' ' ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+ ' ' ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ' ' ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
+ ' '
+ ' ' ME.tlMsg.Text = sText
+ ' ' FMain.btnext.Enabled = TRUE
+ ' ' FMain.btQuit.Enabled = TRUE
+ 'MdlSetup.END_INSTALLER()
+
+
+END
+
+
+PUBLIC SUB tmBgMon_Timer()
+
+DIM sText AS String
+
+ IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
+ sText = ClsGlobal.DISTRO & Space(1) & ("is performing final
system configuration. Please wait a moment.")
+ FMain.btnext.Enabled = FALSE
+ FMain.btQuit.Enabled = FALSE
+ ELSE
sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
-
+ FMain.btnext.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
+ ME.tlMsg.Text = sText
+ ME.tmBgMon.Enabled = FALSE
+
+ END IF
ME.tlMsg.Text = sText
- FMain.btnext.Enabled = TRUE
- FMain.btQuit.Enabled = TRUE
- 'MdlSetup.END_INSTALLER()
+ 'FMain.btnext.Enabled = TRUE
+ 'FMain.btQuit.Enabled = TRUE
-END
-
-PUBLIC FUNCTION MONITOR_BACKGROUND() AS Integer
-
- IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") THEN
- RETURN 0
- ELSE
- RETURN 1
- END IF
-
END
Modified: branches/iVL/FrmDone.form
==============================================================================
--- branches/iVL/FrmDone.form (original)
+++ branches/iVL/FrmDone.form Thu Dec 4 12:04:03 2008
@@ -22,4 +22,8 @@
Text = ("")
}
}
+ { tmBgMon #Timer
+ #X = 168
+ #Y = 217
+ }
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Dec 4 12:04:03 2008
@@ -349,6 +349,7 @@
EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "config-vinstall-ng"] WAIT
SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
hBgConfigProc = SHELL "chroot /mnt/target
/var/log/setup/config-vinstall-ng"
+FrmDone.tmBgMon.Enabled = TRUE
SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 19:37:54
|
Author: M0...@gm...
Date: Thu Dec 4 11:36:42 2008
New Revision: 366
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmDone.class
branches/iVL/FrmRootPass.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlInstallCustom.module
branches/iVL/MdlInstallSys.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
Stopped scrolling credits after installation is finished changed background
process monitoring
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 11:36:42 2008
@@ -94,27 +94,27 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:495
+#: FMain.class:498
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:495
+#: FMain.class:498
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:820
+#: FMain.class:823
msgid "Back"
msgstr ""
-#: FMain.class:831
+#: FMain.class:834
msgid "Exit Installation"
msgstr ""
-#: FMain.class:842
+#: FMain.class:845
msgid "Next"
msgstr ""
-#: FMain.class:856
+#: FMain.class:859
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Dec 4 11:36:42 2008
@@ -38,35 +38,3 @@
msgid "Preparing filesystems"
msgstr ""
-#: MdlSetup.module:345
-msgid "is performing final system configuration. Please wait a moment."
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "has been installed to your system. Your new system has been
configured with the default factory settings."
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "Your computer needs to be restarted so that you can use your new
operating system. Click"
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "to restart your computer now or click"
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "to restart your computer at a later time"
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
-msgstr ""
-
-#: MdlSetup.module:356
-msgid "Restart"
-msgstr ""
-
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 11:36:42 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.39
+Version=0.1.41
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 11:36:42 2008
@@ -478,6 +478,9 @@
frmNext = FrmRootPass
CASE "FrmRootPass"
+
+ IF FrmRootPass.tbPasswd1.Text = "" THEN RETURN
+
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
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 11:36:42 2008
@@ -19,6 +19,8 @@
PUBLIC SUB Form_Open()
+DIM sText AS String
+
FMain.FrmCurr = ME
Fmain.tvPlan["Conf4"].Picture = MdlCore.sDonePic
Fmain.tvPlan["Conf5"].Picture = MdlCore.sNowPic
@@ -28,7 +30,38 @@
FMain.btback.Enabled = FALSE
FMain.btback.ForeColor = Color.Gray
+ sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
+ FMain.btnext.Enabled = FALSE
+ FMain.btQuit.Enabled = FALSE
+ 'REPEAT
+ IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
+ REPEAT
+ WAIT
+ 'IF ME.MONITOR_BACKGROUND() = 1 THEN
+ ME.tlMsg.Text = sText
+ UNTIL MdlConfLilo.hBgConfigProc.State = Process.Stopped
+ END IF
+
+ sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+ ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+ ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+ ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
+
+ ME.tlMsg.Text = sText
+ FMain.btnext.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
+ 'MdlSetup.END_INSTALLER()
- MdlSetup.END_INSTALLER()
+END
+
+PUBLIC FUNCTION MONITOR_BACKGROUND() AS Integer
+
+ IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") THEN
+ RETURN 0
+ ELSE
+ RETURN 1
+ END IF
+
END
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Thu Dec 4 11:36:42 2008
@@ -36,6 +36,8 @@
MdlCore.WARN_STATUS("")
IF ME.tbPasswd1.Text = "" THEN
Message(("Enter a Password for root."))
+ RETURN
+ STOP EVENT
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Dec 4 11:36:42 2008
@@ -15,10 +15,7 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
-
-
-' PUBLIC Vmlinuz AS Object[]
-
+PUBLIC hBgConfigProc AS Process
PRIVATE sDotConf AS String
PUBLIC FUNCTION WRITE_LILO_DOT_CONF() AS Integer
@@ -343,14 +340,15 @@
"for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
"update-mime-database /usr/share/mime/" & gb.NewLine &
-"sleep 20" & gb.NewLine &
-"echo done >/tmp/status" & gb.NewLine
+"sleep 20"
+'"echo done >/tmp/status" & gb.NewLine
File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt
&/ "var/log/setup/config-vinstall-ng"
-SHELL "chmod +x " & ClsGlobal.sTargetMnt
&/ "var/log/setup/config-vinstall-ng" WAIT
+'SHELL "chmod +x " & ClsGlobal.sTargetMnt
&/ "var/log/setup/config-vinstall-ng" WAIT
+EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "config-vinstall-ng"] WAIT
SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
-SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &"
+hBgConfigProc = 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
Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module (original)
+++ branches/iVL/MdlInstallCustom.module Thu Dec 4 11:36:42 2008
@@ -109,7 +109,10 @@
FrmInstallSys.pbInstallProg2.Value = 1
'Message.Info("packages have been installed in your system. Please click
next to configure it.")
FrmInstallSys.tlBanner.Text = ("Vectorlinux is now installed in your
system. Please click next to configure it.")
- FrmInstallSys.tlCurrPkg.Text = ("packages have been Installed. Please
click next to move on to System Configuration.")
+ FrmInstallSys.tlCurrPkg.Text = ("Packages have been Installed. Please
click next to move on to System Configuration.")
+ FrmCredits.Timer1.Stop
+ FrmCredits.ScrollView1.Scroll(0, 0)
+
WITH FMain
.btQuit.Enabled = TRUE
.btQuit.ForeColor = Color.Black
@@ -206,13 +209,7 @@
FrmInstallSys.pbInstallProg.Value = i / iStepTotal
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"]
- 'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg & "
-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump"]
- 'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/
sPkg, "-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump"] WAIT
- 'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg &
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>
/tmp/installdump"] WAIT
- 'hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo
\'FAILED\' 2> /tmp/installdump" 'WAIT
+
hproc = EXEC ["installpkg", "-R", ClsGlobal.sTargetMnt,
sBasePath &/ sLoc &/ sPkg] ' WAIT
'if hpro
WAIT 1
@@ -486,20 +483,7 @@
END
-' PUBLIC SUB Process_read()
-'
-' DIM sLine AS String
-' READ #LAST, sLine, -256
-' sDump = sDump & gb.NewLine & sLine
-' PRINT sLine
-' END
-' PUBLIC SUB Process_kill()
-'
-' DIM sDump AS String = File.Load("/tmp/installdump")
-' IF InStr(sDump, "FAILED") > 0 THEN
-' Message.Error("The install process has returned an error.")
-'
-' END
+
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 4 11:36:42 2008
@@ -384,6 +384,8 @@
'Message.Info("Vectorlinux is now installed in your system. Please click
next to configure it.")
FrmInstallSys.tlBanner.Text = "<h3>" & ("Vectorlinux is now installed in
your system. Please click") & Space(1) & FMain.btnext.text & Space(1) &
("to configure it.") & "</h3>"
FrmInstallSys.tlCurrPkg.Text = "<h3>" & ("Packages have been installed
in your system. Please click") & Space(1) & FMain.btnext.text & Space(1) &
("to configure it.") & "</h3>"
+ FrmCredits.Timer1.Stop
+ FrmCredits.ScrollView1.Scroll(0, 0)
WITH FMain
.btQuit.Enabled = TRUE
.btQuit.ForeColor = Color.Black
@@ -900,13 +902,6 @@
END
-' ' PUBLIC SUB Process_read()
-' '
-' ' DIM sLine AS String
-' ' READ #LAST, sLine, -256
-' ' sDump = sDump & gb.NewLine & sLine
-' ' PRINT sLine
-' ' END
PUBLIC SUB process_error(msg AS String)
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 4 11:36:42 2008
@@ -335,35 +335,35 @@
RETURN sDump
END
-
-PUBLIC SUB END_INSTALLER()
-DIM sText AS String
- ' Check for /tmp/status in the target installation
- IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
- REPEAT
- WAIT
- sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
- FrmDone.tlMsg.Text = sText
- 'FrmDone.tlMsg.Adjust
- UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
- sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
- ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
- ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
- ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
- ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
- FrmDone.tlMsg.Text = sText
- FMain.btnext.Enabled = TRUE
- FMain.btnext.Text = ("Restart")
- FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) +
36
-
- 'FrmDone.tlBanner
-
- ENDIF
-
-
-
-
-END
+'
+' PUBLIC SUB END_INSTALLER()
+' DIM sText AS String
+' ' Check for /tmp/status in the target installation
+' IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
+' REPEAT
+' WAIT
+' sText = ClsGlobal.DISTRO & Space(1) & ("is performing final
system configuration. Please wait a moment.")
+' FrmDone.tlMsg.Text = sText
+' 'FrmDone.tlMsg.Adjust
+' UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
+' sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to
your system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+' ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+' ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+' ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+' ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
+' FrmDone.tlMsg.Text = sText
+' FMain.btnext.Enabled = TRUE
+' FMain.btnext.Text = ("Restart")
+' FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text)
+ 36
+'
+' 'FrmDone.tlBanner
+'
+' ENDIF
+'
+'
+'
+'
+' END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 18:31:43
|
Author: M0...@gm...
Date: Thu Dec 4 10:30:29 2008
New Revision: 365
Modified:
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/FrmDiskPart.class
branches/iVL/FrmDone.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmZoneSet.class
branches/iVL/MdlSetup.module
branches/iVL/MdlZoneSet.module
Log:
Minor bugfixes... ready for testing
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Thu Dec 4 10:30:29 2008
@@ -18,7 +18,7 @@
msgid "When finished making changes, exit the partitioning application to
continue ..."
msgstr ""
-#: FrmDiskPart.class:117
+#: FrmDiskPart.class:119
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Thu Dec 4 10:30:29 2008
@@ -38,3 +38,35 @@
msgid "Preparing filesystems"
msgstr ""
+#: MdlSetup.module:345
+msgid "is performing final system configuration. Please wait a moment."
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "has been installed to your system. Your new system has been
configured with the default factory settings."
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "After reboot you can use vasm or vasmCC to fine tune your
installation."
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "Your computer needs to be restarted so that you can use your new
operating system. Click"
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "to restart your computer now or click"
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "to restart your computer at a later time"
+msgstr ""
+
+#: MdlSetup.module:353
+msgid "If you installed from CD-ROM/R/RW media, please remove de disk
before restarting."
+msgstr ""
+
+#: MdlSetup.module:356
+msgid "Restart"
+msgstr ""
+
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Thu Dec 4 10:30:29 2008
@@ -64,6 +64,7 @@
DIM bReboot AS Boolean
+ MdlCore.WARN_STATUS("")
FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning
scheme... Please wait<br>This will take a few seconds...</h3>"
FrmDiskPart.tlBanner.Refresh
FrmDiskPart.tlBanner.Adjust
@@ -95,4 +96,5 @@
FMain.btQuit.Enabled = TRUE
FMain.btQuit.ForeColor = Color.Black
END IF
+ MdlCore.warn_status_off()
END
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 10:30:29 2008
@@ -25,31 +25,10 @@
Fmain.tvPlan["Conf5"].Selected = TRUE
tlbanner.text = "<b>" & tlbanner.text & "</b>"
- FMain.btnext.Text = ("Restart")
- FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) + 36
+
FMain.btback.Enabled = FALSE
FMain.btback.ForeColor = Color.Gray
- FMain.btQuit.Text = ("Exit")
- FMain.btQuit.Width = MdlObjSizer.get_object_width(FMain.btQuit.Text) + 36
- WITH ME.tlMsg
- .Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
- ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
- ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
- ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
- ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
- END WITH
- FMain.btnext.Enabled = TRUE
-
-END
-
-PUBLIC SUB tlMsg_MouseDown()
-
-
-
-END
-
-PUBLIC SUB PnlMsg_MouseDown()
-
+ MdlSetup.END_INSTALLER()
END
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Thu Dec 4 10:30:29 2008
@@ -46,6 +46,8 @@
PUBLIC SUB Form_Open()
+ DIM cb AS CheckBox
+
Fmain.frmcurr = ME
MdlUsrAdd.iUsrAccts = 0
WITH FMain
@@ -76,7 +78,12 @@
.Add(ME.tbUsername)
END WITH
-
+ IF MdlUsrAdd.objGrps THEN
+ FOR EACH cb IN MdlUsrAdd.objGrps
+ cb.Delete
+ NEXT
+ END IF
+
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.fGroupSel)
FMain.btnext.Enabled = TRUE
ME.tbUsername.SetFocus
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Thu Dec 4 10:30:29 2008
@@ -40,14 +40,7 @@
END
-' ' ' PUBLIC SUB Button1_Click()
-' ' ' ' THis is not necessary, since the next button on the main window
handles this
-' ' '
-' ' ' MdlZoneSet.SET_ZONE(ME.lbTmZone.Text)
-' ' ' MdlZoneSet.WRITE_CONF()
-' ' ' 'Message("TimeZone " & ME.lbTmZone.Text & " Was set.")
-' ' '
-' ' ' END
+
PUBLIC SUB Form_Resize()
@@ -96,38 +89,7 @@
RETURN
END IF
LOOP
-' ' ' ' '
-' ' ' ' '
-' ' ' ' '
-' ' ' ' ' 'Message(lbTmZone[2].text)
-' ' ' ' '
-' ' ' ' ' lbTmZone.Index = 0
-' ' ' ' ' REPEAT
-' ' ' ' ' 'INC lbTmZone.Index
-' ' ' ' '
-' ' ' ' ' IF lbTmZone[lbTmZone.Index].text LIKE Key.Text & "*" THEN
-' ' ' ' '
-' ' ' ' ' 'Message.Info(lbTmZone.text)
-' ' ' ' ' BREAK
-' ' ' ' ' END IF
-' ' ' ' ' INC lbTmZone.Index
-' ' ' ' ' IF lbTmZone.Index = lbTmZone.Count THEN RETURN ' nothing
found
-' ' ' ' ' UNTIL lbTmZone.Index = lbTmZone.Count
-' ' ' ' '
-
- ' DIM iScan AS Integer
- ' IF Key.text > "z" OR Key.text < " " THEN RETURN ' not scannable
- '
- ' iScan = lbTmZone.Index
- ' DO
- ' INC iScan
- ' IF iScan >= lbTmZone.Count THEN iScan = 0 ' back to top
- ' IF iScan = lbTmZone.Index THEN RETURN ' went back to were we
started
- ' IF lbTmZone[iScan].text LIKE Key.text & "*[*]*" THEN ' found
a match
- ' lbTmZone.Index = iScan
- ' END IF
- ' RETURN
- ' LOOP
+
END
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 4 10:30:29 2008
@@ -336,4 +336,34 @@
END
+PUBLIC SUB END_INSTALLER()
+DIM sText AS String
+ ' Check for /tmp/status in the target installation
+ IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
+ REPEAT
+ WAIT
+ sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
+ FrmDone.tlMsg.Text = sText
+ 'FrmDone.tlMsg.Adjust
+ UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
+ sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+ ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+ ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+ ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
+ FrmDone.tlMsg.Text = sText
+ FMain.btnext.Enabled = TRUE
+ FMain.btnext.Text = ("Restart")
+ FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) +
36
+
+ 'FrmDone.tlBanner
+
+ ENDIF
+
+
+
+
+END
+
+
Modified: branches/iVL/MdlZoneSet.module
==============================================================================
--- branches/iVL/MdlZoneSet.module (original)
+++ branches/iVL/MdlZoneSet.module Thu Dec 4 10:30:29 2008
@@ -37,7 +37,7 @@
stz = Split(sTimeZones, ",")
FOR EACH stz
- FrmZoneSet.lbTmZone.add(stz[i])
+ FrmZoneSet.lbTmZone.add(Trim(stz[i]))
INC i
NEXT
|
|
From: <cod...@go...> - 2008-12-04 17:05:05
|
Author: M0...@gm...
Date: Thu Dec 4 08:55:00 2008
New Revision: 364
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/FMain.class
Log:
Fixed error where it was getting stuck @ root passwd
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 08:55:00 2008
@@ -94,27 +94,27 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:491
+#: FMain.class:495
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:491
+#: FMain.class:495
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:816
+#: FMain.class:820
msgid "Back"
msgstr ""
-#: FMain.class:827
+#: FMain.class:831
msgid "Exit Installation"
msgstr ""
-#: FMain.class:838
+#: FMain.class:842
msgid "Next"
msgstr ""
-#: FMain.class:852
+#: FMain.class:856
msgid "Button1"
msgstr ""
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 08:55:00 2008
@@ -486,6 +486,10 @@
FrmRootPass.Button1_Click()
' Scan home partition for user home dirs
+ IF NOT ClsPartSel.sHome OR ClsPartSel.sHome = ClsPartSel.sRoot
OR ClsPartSel.sHome = "" THEN
+ frmNext = FrmUserAdd
+ ELSE
+
IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt
&/ "home")) > 0 THEN
SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home.") & "<br>" &
("Would you like to import these user accounts into your
new Operating System"), ("Yes"), ("No"))
@@ -495,7 +499,7 @@
frmNext = FrmUserAdd
END SELECT
END IF
-
+ END IF
CASE "FrmUserAdd"
|
|
From: <cod...@go...> - 2008-12-04 16:40:00
|
Author: M0...@gm...
Date: Thu Dec 4 08:39:19 2008
New Revision: 363
Modified:
branches/iVL/.project
branches/iVL/FrmRootPass.class
branches/iVL/installer.gambas
Log:
fixed bug in next button getting disabled @ root pass
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 08:39:19 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.38
+Version=0.1.39
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Thu Dec 4 08:39:19 2008
@@ -89,3 +89,9 @@
END WITH
END
+
+PUBLIC SUB tbPasswd2_KeyPress()
+
+ FMain.btnext.Enabled = TRUE
+
+END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 16:23:52
|
Author: M0...@gm...
Date: Thu Dec 4 08:23:33 2008
New Revision: 362
Modified:
branches/iVL/MdlInstallSys.module
Log:
Updated syntax mdlinstallsys
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 4 08:23:33 2008
@@ -300,7 +300,7 @@
FOR EACH cb IN MdlPartSel.oSwaps
IF cb.Text = "Swap" THEN
- EXEC ["grep", cb.Tag, "/etc/fstab"] TO sDump
+ SHELL "cat /etc/fstab | grep ^" & cb.Tag TO sDump
sDump = Trim(sDump)
IF Len(sDump) < 1 THEN
SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >>
/etc/fstab" WAIT
|
|
From: <cod...@go...> - 2008-12-04 16:19:50
|
Author: M0...@gm...
Date: Thu Dec 4 08:17:33 2008
New Revision: 361
Modified:
branches/iVL/MdlInstallSys.module
Log:
Fixed syntax error in mdlinstallsys
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 4 08:17:33 2008
@@ -305,10 +305,11 @@
IF Len(sDump) < 1 THEN
SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >>
/etc/fstab" WAIT
END IF
- NEXT
+' NEXT
'SHELL "swapon -a" WAIT
END IF
+ NEXT
EXEC ["swapon", "-a"] WAIT
END
|
|
From: <cod...@go...> - 2008-12-04 16:16:04
|
Author: M0...@gm...
Date: Thu Dec 4 08:15:03 2008
New Revision: 360
Modified:
branches/iVL/MdlInstallSys.module
Log:
Modified installsys swap activation
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 4 08:15:03 2008
@@ -25,7 +25,7 @@
PUBLIC FUNCTION MOUNT_DEFINED_PARTITIONS() AS Integer
-
+ DIM cb AS ComboBox
' this is where we need to set the mount target
ClsGlobal.sTargetMnt = "/mnt/target"
@@ -33,7 +33,9 @@
IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
TRY MKDIR ClsGlobal.sTargetMnt
END IF
- SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
+ 'SHELL "umount " & ClsGlobal.sTargetMnt WAIT 'clear the mount point
+ EXEC ["umount", ClsGlobal.sTargetMnt] WAIT
+
'/DISABLED FOR TESTING INSTALL ONLY
SHELL "mount " & ClsPartSel.sRoot & Space(1) & ClsGlobal.sTargetMnt
WAIT 'moun the root partition first
@@ -76,6 +78,11 @@
ELSE
MdlInstallSys.PERFORM_FULL_INSTALL()
END IF
+
+ FOR EACH cb IN MdlPartSel.oMountPoints
+ IF Left(cb.Text, Len("/mnt")) = "/mnt" THEN EXEC ["mkdir", "-p",
ClsGlobal.sTargetMnt &/ cb.Text] WAIT
+ NEXT
+
END
PUBLIC SUB WRITE_NEW_DISTRO_ID()
@@ -292,15 +299,17 @@
DIM sDump AS String
FOR EACH cb IN MdlPartSel.oSwaps
+ IF cb.Text = "Swap" THEN
EXEC ["grep", cb.Tag, "/etc/fstab"] TO sDump
sDump = Trim(sDump)
- IF Len(sDump) = 0 THEN
+ IF Len(sDump) < 1 THEN
SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >>
/etc/fstab" WAIT
END IF
NEXT
- SHELL "swapon -a" WAIT
-
+ 'SHELL "swapon -a" WAIT
+ END IF
+ EXEC ["swapon", "-a"] WAIT
END
|
|
From: <cod...@go...> - 2008-12-04 16:03:00
|
Author: M0...@gm...
Date: Thu Dec 4 08:01:25 2008
New Revision: 359
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.project
branches/iVL/DevLog
branches/iVL/FMain.class
branches/iVL/FrmSummary.class
branches/iVL/MdlInstallSys.module
branches/iVL/MdlPartSel.module
branches/iVL/installer.gambas
Log:
- Fixed missing format? indicator for non-linux partitions (win)
- Extended blue background for swap partition row to the 4th column.
- Allowed user to mount the host partition (on hosted install) to /mnt/hdxx
only.
- Fixed problem with back navigation... users getting locked out.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 08:01:25 2008
@@ -102,19 +102,19 @@
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:815
+#: FMain.class:816
msgid "Back"
msgstr ""
-#: FMain.class:826
+#: FMain.class:827
msgid "Exit Installation"
msgstr ""
-#: FMain.class:837
+#: FMain.class:838
msgid "Next"
msgstr ""
-#: FMain.class:851
+#: FMain.class:852
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Thu Dec 4 08:01:25 2008
@@ -54,47 +54,47 @@
msgid "Not Used"
msgstr ""
-#: FrmSummary.class:75
+#: FrmSummary.class:71
msgid "Do not format"
msgstr ""
-#: FrmSummary.class:76
+#: FrmSummary.class:72
msgid "No"
msgstr ""
-#: FrmSummary.class:78
+#: FrmSummary.class:74
msgid "Yes"
msgstr ""
-#: FrmSummary.class:104
+#: FrmSummary.class:100
msgid "None"
msgstr ""
-#: FrmSummary.class:126
+#: FrmSummary.class:123
msgid "Do not mount"
msgstr ""
-#: FrmSummary.class:179
+#: FrmSummary.class:177
msgid "Package Name"
msgstr ""
-#: FrmSummary.class:188
+#: FrmSummary.class:186
msgid "BULK PACKAGES"
msgstr ""
-#: FrmSummary.class:215
+#: FrmSummary.class:213
msgid "USER-SELECTED PACKAGES"
msgstr ""
-#: FrmSummary.class:291
+#: FrmSummary.class:289
msgid "Installation Type"
msgstr ""
-#: FrmSummary.class:301
+#: FrmSummary.class:299
msgid "Partition Selection Scheme"
msgstr ""
-#: FrmSummary.class:311
+#: FrmSummary.class:309
msgid "Software Selection"
msgstr ""
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Thu Dec 4 08:01:25 2008
@@ -30,15 +30,15 @@
msgid "Do not format"
msgstr ""
-#: MdlPartSel.module:143
+#: MdlPartSel.module:148
msgid "Not Used"
msgstr ""
-#: MdlPartSel.module:289
+#: MdlPartSel.module:294
msgid "Please select only one "
msgstr ""
-#: MdlPartSel.module:289
+#: MdlPartSel.module:294
msgid "partition"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 08:01:25 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.37
+Version=0.1.38
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Thu Dec 4 08:01:25 2008
@@ -1,5 +1,4 @@
-- Fixed typo in gparted module
-- Fixed issue with user icon now showing up after first user account.
-- Added auto-modifying of -cli lilo entry if the chosen label is too long.
Added warning to user interface to warn accordingly
-- Relabeled "Sector" to "Bootsector of" in LIlo setup
-- Fine tuned lilo target options in the search for a floppy drive
+- Fixed missing format? indicator for non-linux partitions (win)
+- Extended blue background for swap partition row to the 4th column.
+- Allowed user to mount the host partition (on hosted install) to
/mnt/hdxx only.
+- Fixed problem with back navigation... users getting locked out.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 08:01:25 2008
@@ -686,6 +686,7 @@
'Message(System.Language)
MdlCore.frmInit = FrmSelISO
MdlCore.main
+ FMain.btnext.Enabled = TRUE
END
Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class (original)
+++ branches/iVL/FrmSummary.class Thu Dec 4 08:01:25 2008
@@ -55,11 +55,7 @@
sMountPnt = cb.Text
FOR EACH cb1 IN MdlPartSel.oFsTypes
IF cb1.tag = cb.tag THEN sFsType = cb1.Text
- ' IF cb1.Text = ("Do not format") THEN
- ' bForm = ("No")
- ' ELSE
- ' bForm = ("Yes")
- ' END IF
+
NEXT
FOR EACH tl IN MdlPartSel.oPartLbls
IF tl.tag = cb.tag THEN
@@ -111,6 +107,7 @@
.GridView1[irow, 2].BackColor = Color.LightBackground
.GridView1[irow, 3].Text = sMountPnt
.GridView1[irow, 3].BackColor = Color.LightBackground
+ .GridView1[irow, 4].BackColor = Color.LightBackground
END WITH
INC irow
'INC GridView1.Rows.Count
@@ -150,6 +147,7 @@
.GridView1[irow, 2].text = sFsType
.GridView1[irow, 3].text = sMountPnt
.GridView1[irow, 3].BackColor = Color.LightGray
+ .GridView1[irow, 4].Text = ("No")
END WITH
INC irow
END IF
Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module (original)
+++ branches/iVL/MdlInstallSys.module Thu Dec 4 08:01:25 2008
@@ -289,9 +289,14 @@
PUBLIC SUB ACTIVATE_SWAP_SPACE()
DIM cb AS ComboBox
+ DIM sDump AS String
FOR EACH cb IN MdlPartSel.oSwaps
- SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >> /etc/fstab" WAIT
+ EXEC ["grep", cb.Tag, "/etc/fstab"] TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) = 0 THEN
+ SHELL "echo \'" & cb.Tag & " none swap sw 0 0 \' >>
/etc/fstab" WAIT
+ END IF
NEXT
SHELL "swapon -a" WAIT
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Thu Dec 4 08:01:25 2008
@@ -140,6 +140,11 @@
.Height = tl.Height
.Width = MdlObjSizer.get_object_width(("Do not format")) *
1.5 'tl.Width"
.ReadOnly = TRUE
+ ' Allow the user to only mount this partition at boot
time if it is the host of an ISO
+ IF InStr(FrmSelISO.lstInstallableImg.Text, .Tag) THEN
+ .Add("/mnt" &/ Right(.Tag, Len(.Tag) -
RInStr(.Tag, "/")))
+
+ ELSE
.Add(("Not Used"))
.Add("/")
.Add("/home")
@@ -149,10 +154,10 @@
.Add("/tmp")
.Add("/mnt" &/ Right(.tag, Len(.tag) -
RInStr(.tag, "/"))) ' Add option to mount linux partitions to /mnt/xdx
.Add("Swap")
- IF InStr(FrmSelISO.lstInstallableImg.Text, .tag) THEN
- .Enabled = FALSE
- ELSE
- .Enabled = TRUE
+ 'IF InStr(FrmSelISO.lstInstallableImg.Text, .tag) THEN
+ ' .Enabled = FALSE
+ 'ELSE
+ ' .Enabled = TRUE
END IF
END WITH
oMountPoints.Add(cb)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 15:46:40
|
Author: M0...@gm...
Date: Thu Dec 4 07:45:11 2008
New Revision: 358
Modified:
branches/iVL/.project
branches/iVL/FrmNetConf.class
branches/iVL/MdlLilo.module
branches/iVL/MdlPartSel.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
Fixed annoyance where it asks to import accounts when no /home was selected
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 07:45:11 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.36
+Version=0.1.37
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class (original)
+++ branches/iVL/FrmNetConf.class Thu Dec 4 07:45:11 2008
@@ -49,6 +49,7 @@
WITH FMain
.tvPlan["Conf3"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf2"].Picture = MdlCore.sDonePic
.tvPlan["Conf4"].Picture = MdlCore.sNowPic
.tvPlan["Conf4"].Selected = TRUE
END WITH
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Dec 4 07:45:11 2008
@@ -37,7 +37,7 @@
'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
RETURN IRET
- 'MdlCore.warn_status_off()
+ MdlCore.warn_status_off()
END
@@ -146,7 +146,7 @@
DIM sBootPath, sHeader, sFile, sVidModeSection AS String
'Message.Info(ClsPartSel.sRoot)
-
+ MdlCore.WARN_STATUS("")
FOR EACH cb IN arrLinuxIncCheckboxes
@@ -285,7 +285,7 @@
DIM sKernelPath, sPart, sShortpart AS String
DIM sKernel, sInitrd, sKernelLoc AS String
-
+ MdlCore.WARN_STATUS("")
' PREPARE HOST PARTITION
'EXEC ["mount", "/dev/sdb8", "/mnt/target"] WAIT
EXEC ["mount", ClsPartSel.sRoot, "/mnt/target"] WAIT
@@ -347,6 +347,7 @@
END IF
NEXT
'EXEC ["umount", "/mnt/target"] WAIT
+MdlCore.warn_status_off()
END
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Thu Dec 4 07:45:11 2008
@@ -420,6 +420,7 @@
MdlCore.WARN_STATUS("")
FOR EACH cb IN oMountPoints
IF cb.Text = "/" THEN ClsPartSel.sRoot = cb.Tag
+ IF cb.Text = "/home" THEN ClsPartSel.sHome = cb.Tag
FOR EACH cc IN oFsTypes
IF cb.tag = cc.tag THEN
ME.SET_PARTITION_FORMAT(cb.text, cc.Text)
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Thu Dec 4 07:45:11 2008
@@ -325,6 +325,10 @@
PUBLIC FUNCTION SCAN_HOME_DIRS(sHomePartition AS String) AS String
DIM sDump AS String
+
+ IF NOT ClsPartSel.sHome THEN RETURN ""
+ IF ClsPartSel.sRoot = ClsPartSel.sHome THEN RETURN ""
+
SHELL "ls " & sHomePartition & " | grep -v ftp | grep -v lost+found |
grep -v .*" TO sDump
sDump = Trim(sDump)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 15:23:30
|
Author: M0...@gm...
Date: Thu Dec 4 07:15:17 2008
New Revision: 357
Modified:
branches/iVL/.project
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
Fixed lilo problem when no initrd was selected
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 07:15:17 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.35
+Version=0.1.36
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -12,7 +12,6 @@
Library=gb.gtk.ext
Description=GUI installer for Vector linux
Authors=M0E-lnx\nuelsk8s
-Arguments="-C"
TabSize=2
Translate=1
Language=en_US
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Thu Dec 4 07:15:17 2008
@@ -194,9 +194,12 @@
sSection = "image = " & sBootPath &/ sKernel & "\n" &
"root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
"label = " & sLabel & "\n" &
- "append = \"" & sAppend & "\"" & "\n" &
- "initrd = " & sInitrd & "\n" & ' sBootPath &/ sInitrd & "\n" &
- "read-only" & "\n"
+ "append = \"" & sAppend & "\"" & "\n"
+ IF sInitrd <> "noinitrd" THEN
+ sSection = sSection & "initrd = " & sInitrd & "\n" '
sBootPath &/ sInitrd & "\n"
+ END IF
+ sSection = sSection & "read-only" & "\n"
+
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
@@ -209,9 +212,9 @@
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" &
- "initrd = " & sInitrd & "\n" & '& sBootPath &/ sInitrd & "\n" &
- "read-only" & "\n"
+ "append = \"2 splash=verbose\"" & "\n"
+ IF sInitrd <> "noinitrd" THEN sClisection = sClisection
& "initrd = " & sInitrd & "\n" '& sBootPath &/ sInitrd & "\n"
+ sClisection = sClisection & "read-only" & "\n"
' sClisection = sSection
' sClisection = Replace(sClisection, "append = " &
sAppend, "append = \"2 splash=verbose\"")
' sClisection = Replace(sClisection, "label = " &
sLabel, "label = " & sLabel & "-cli") & "\n"
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-04 00:27:47
|
Author: M0...@gm...
Date: Wed Dec 3 16:20:59 2008
New Revision: 356
Modified:
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/FrmUserAdd.class
Log:
Fixed problem that surfaced when writing user import module
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 3 16:20:59 2008
@@ -12,6 +12,7 @@
Library=gb.gtk.ext
Description=GUI installer for Vector linux
Authors=M0E-lnx\nuelsk8s
+Arguments="-C"
TabSize=2
Translate=1
Language=en_US
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 16:20:59 2008
@@ -56,9 +56,20 @@
PUBLIC SUB btcancel_Click()
- FrmUserAdd.Reparent(FMain.pnlwinhost)
- FrmUserAdd.Show()
- ME.Hide()
+ SELECT CASE Message.Question(("Would you like to continue adding new
user accounts now?"), ("Yes"), ("No"))
+ CASE 1
+ FrmUserAdd.Reparent(FMain.pnlwinhost)
+ MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
+ FrmUserAdd.Show()
+ ME.Close()
+ CASE ELSE
+ FMain.frmNext = FrmNetConf
+ FrmNetConf.Reparent(FMain.pnlwinhost)
+ FrmNetConf.Show()
+ 'ME.Hide()
+ ME.Close()
+ END SELECT
+
'ME.Close()
END
@@ -93,6 +104,7 @@
MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
Message.Info(("User account for") & Space(1) &
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
+ INC MdlUsrAdd.iUsrAccts
END IF
'ME.Close
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Dec 3 16:20:59 2008
@@ -375,7 +375,7 @@
FOR EACH cb IN MdlUsrAdd.objGrps
cb.Delete
NEXT
- MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS
+ MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.fGroupSel)
END
|
|
From: <cod...@go...> - 2008-12-03 22:17:23
|
Author: M0...@gm...
Date: Wed Dec 3 14:11:38 2008
New Revision: 355
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmImportAccts.class
branches/iVL/FrmImportAccts.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLilo.module
branches/iVL/MdlPartSel.module
branches/iVL/installer.gambas
Log:
Fixed lilo setup, fixed user importing module ...ready for testing
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Dec 3 14:11:38 2008
@@ -18,103 +18,103 @@
msgid "Restart"
msgstr ""
-#: FMain.class:226
+#: FMain.class:227
msgid "Please select a default operating system to boot before proceeding"
msgstr ""
-#: FMain.class:227
+#: FMain.class:228
msgid "Select an entry from this list"
msgstr ""
-#: FMain.class:234
+#: FMain.class:236
msgid "Skipping boot loaded setup"
msgstr ""
-#: FMain.class:247
+#: FMain.class:249
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "Yes"
msgstr ""
-#: FMain.class:262
+#: FMain.class:264
msgid "No"
msgstr ""
-#: FMain.class:280
+#: FMain.class:282
msgid "Please specify a hostname for this computer"
msgstr ""
-#: FMain.class:284
+#: FMain.class:286
msgid "Please specify the domain this computer belongs to"
msgstr ""
-#: FMain.class:299
+#: FMain.class:301
msgid "VectorLinux will now try to detect and configure your graphics
hardware."
msgstr ""
-#: FMain.class:299
+#: FMain.class:301
msgid "Your screen may flicker or go blank for a few seconds during this
process."
msgstr ""
-#: FMain.class:351
+#: FMain.class:353
msgid "Please wait while setup attampts to run the partitioning utility"
msgstr ""
-#: FMain.class:353
+#: FMain.class:355
msgid "Please wait while setup analyses your current partition setup."
msgstr ""
-#: FMain.class:353
+#: FMain.class:355
msgid "This may take a while ..."
msgstr ""
-#: FMain.class:367
+#: FMain.class:369
msgid "You must select a \"/\" partition. This is the target where the
system will install to"
msgstr ""
-#: FMain.class:439
+#: FMain.class:441
msgid "Skipping boot loader setup"
msgstr ""
-#: FMain.class:465
+#: FMain.class:467
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:489
-msgid "Setup has detected existing directories in the partition you
selected for /home. Would you like to import these "
+#: FMain.class:491
+msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:489
-msgid "user accounts into your new Operating System"
+#: FMain.class:491
+msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:813
+#: FMain.class:815
msgid "Back"
msgstr ""
-#: FMain.class:824
+#: FMain.class:826
msgid "Exit Installation"
msgstr ""
-#: FMain.class:835
+#: FMain.class:837
msgid "Next"
msgstr ""
-#: FMain.class:849
+#: FMain.class:851
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 3 14:11:38 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.30
+Version=0.1.35
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Dec 3 14:11:38 2008
@@ -212,19 +212,21 @@
' navigation for configuration
SELECT CASE FrmCurr.Name
CASE "FrmPartSel"
+ MdlPartSel.SET_LINUX_PARTITION_TYPES()
frmNext = FrmLiloSetup
-
- CASE FrmInstallSys
+ IF ERROR THEN Message.Error(Error.Where & "<br>" &
Error.Text)
+ CASE "FrmInstallSys"
frmNext = FrmLiloSetup
CASE "FrmLiloSetup"
IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
- IF FrmLiloSetup.cbBootDefault.Te ' FMain.tvPlan["Inst0"].Picture
= MdlCore.sDonePic
+ IF FrmLiloSetup.cbBootDefault.Text = "" THEN '
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)
+ FMain.btnext.Enabled = TRUE
STOP EVENT
RETURN
END IF
@@ -485,8 +487,8 @@
' Scan home partition for user home dirs
IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt
&/ "home")) > 0 THEN
- SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home. Would you like to
import these ") & "<br>" &
- ("user accounts into your new Operating System"), ("Yes"),
("No"))
+ SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home.") & "<br>" &
+ ("Would you like to import these user accounts into your
new Operating System"), ("Yes"), ("No"))
CASE 1
frmNext = FrmImportAccts
CASE 2
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 14:11:38 2008
@@ -112,7 +112,7 @@
DIM iTlY AS Integer
DIM hproc AS Process
- Message(sname)
+ 'Message(sname)
' Prepare group list
FOR EACH cb IN MdlUsrAdd.objGrps
Modified: branches/iVL/FrmImportAccts.form
==============================================================================
--- branches/iVL/FrmImportAccts.form (original)
+++ branches/iVL/FrmImportAccts.form Wed Dec 3 14:11:38 2008
@@ -71,8 +71,8 @@
}
{ btcancel Button
MoveScaled(26,49,14,3)
- Text = ("Cancel")
- Picture = Picture["icon:/16/cancel"]
+ Text = ("Done")
+ Picture = Picture["icon:/16/first"]
Border = False
}
{ tlBanner TextLabel
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Dec 3 14:11:38 2008
@@ -101,10 +101,7 @@
Message(("Boot loader has been setup successfully"))
RETURN 0
END IF
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT
- 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT
- 'Message("Vectorlinux has been installed click OK to reboot")
- 'SHELL "reboot"
+
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Dec 3 14:11:38 2008
@@ -145,24 +145,45 @@
DIM sLabel, sKernel, sInitrd, sAppend, sTag AS String
DIM sBootPath, sHeader, sFile, sVidModeSection AS String
+ 'Message.Info(ClsPartSel.sRoot)
+
FOR EACH cb IN arrLinuxIncCheckboxes
+
+
+ ' ' This is not working well
IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
sBootPath = "/boot"
+ sKernel = "vmlinuz"
+ 'sInitrd = "initrd"
ELSE
sBootPath = "/boot/tamu"
+ sKernel = "vmlinuz-" & Right(cb.Tag, Len(cb.Tag) -
RInStr(cb.Tag, "/"))
END IF
+
+
IF cb.Value = TRUE THEN
FOR EACH tb IN arrLinuxNametxtboxes
- IF tb.Tag = cb.Tag THEN
- sLabel = tb.Text
- sKernel = "vmlinuz-" & Right(tb.Tag, Len(tb.Tag) -
RInStr(tb.Tag, "/"))
- END IF
+
+ IF tb.Tag = cb.Tag THEN sLabel = tb.Text
+
+
NEXT
+ ' Now do the initrds
FOR EACH cbox IN arrCbInitrds
- IF cb.Tag = cbox.Tag AND cbox.Text = ("None") THEN
- sInitrd = "noinitrd"
- ELSE
- sInitrd = sBootPath &/ Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ IF cb.Tag = cbox.Tag THEN 'AND cbox.Text = ("None") THEN
+ IF cbox.Text = ("None") THEN
+ sInitrd = "noinitrd"
+ 'ELSE
+ 'IF cb.Tag = ClsPartSel.sRoot THEN
+ 'IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
+ 'sInitrd = "initrd"
+ ELSE
+ IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
+ sInitrd = sBootPath &/ Trim(cbox.Text)
+ ELSE
+ sInitrd = sBootPath &/ Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ END IF
+ END IF
END IF
NEXT
FOR EACH tb IN arrLinuxAppendtxtBoxes
@@ -241,7 +262,9 @@
IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf") THEN
TRY MOVE ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf" TO
ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf.dist"
END IF
-
+ File.Save(User.home &/ "lilo.test", sFile)
+ 'Message(sFile)
+ 'RETURN
File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "lilo.conf", sFile)
' write the file to the target
@@ -278,9 +301,9 @@
sShortpart = Right(sPart, Len(sPart) - RInStr(sPart, "/"))
IF sPart = ClsPartSel.sRoot THEN
- sKernelPath = "boot"
+ sKernelPath = "/boot"
ELSE
- sKernelPath = "boot/tamu"
+ sKernelPath = "/boot/tamu"
END IF
' get the initrd name
@@ -302,10 +325,14 @@
sKernelLoc = "/tmp/lilo_tmp"
END IF
' Do not copy current kernel..
- IF sShortpart <> Right(ClsPartSel.sRoot,
Len(ClsPartSel.sRoot) - InStr(ClsPartSel.sRoot, "/")) THEN
+ IF "/dev" &/ sShortpart <> ClsPartSel.sRoot THEN
+ 'IF sShortpart <> Right(ClsPartSel.sRoot,
Len(ClsPartSel.sRoot) - InStr(ClsPartSel.sRoot, "/")) THEN
' EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt
&/ "boot/tamu"] WAIT
+ IF sInitrd <> ("None")
EXEC ["cp", sKernelLoc &/ sInitrd,
ClsGlobal.sTargetMnt &/ sKernelPath &/ sInitrd & "-" & sShortpart] WAIT
+ END IF
EXEC ["cp", sKernelLoc &/ "vmlinuz",
ClsGlobal.sTargetMnt &/ sKernelPath &/ "vmlinuz-" & sShortpart] WAIT
+ 'END IF
END IF
EXEC ["sync"] WAIT
Modified: branches/iVL/MdlPartSel.module
==============================================================================
--- branches/iVL/MdlPartSel.module (original)
+++ branches/iVL/MdlPartSel.module Wed Dec 3 14:11:38 2008
@@ -417,7 +417,9 @@
DIM cb AS ComboBox
DIM cc AS ComboBox
+ MdlCore.WARN_STATUS("")
FOR EACH cb IN oMountPoints
+ IF cb.Text = "/" THEN ClsPartSel.sRoot = cb.Tag
FOR EACH cc IN oFsTypes
IF cb.tag = cc.tag THEN
ME.SET_PARTITION_FORMAT(cb.text, cc.Text)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-03 19:49:50
|
Author: M0...@gm...
Date: Wed Dec 3 11:46:58 2008
New Revision: 354
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmUserAdd.class
branches/iVL/MdlConfLilo.module
branches/iVL/MdlLilo.module
branches/iVL/MdlSetup.module
branches/iVL/installer.gambas
Log:
Fixed user account import module
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -94,19 +94,27 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:803
+#: FMain.class:489
+msgid "Setup has detected existing directories in the partition you
selected for /home. Would you like to import these "
+msgstr ""
+
+#: FMain.class:489
+msgid "user accounts into your new Operating System"
+msgstr ""
+
+#: FMain.class:813
msgid "Back"
msgstr ""
-#: FMain.class:814
+#: FMain.class:824
msgid "Exit Installation"
msgstr ""
-#: FMain.class:825
+#: FMain.class:835
msgid "Next"
msgstr ""
-#: FMain.class:839
+#: FMain.class:849
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -1,4 +1,4 @@
-# /root/gui-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 Dec 3 11:46:58 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.26
+Version=0.1.30
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Dec 3 11:46:58 2008
@@ -482,7 +482,17 @@
RETURN
END IF
FrmRootPass.Button1_Click()
- frmNext = FrmUserAdd
+
+ ' Scan home partition for user home dirs
+ IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt
&/ "home")) > 0 THEN
+ SELECT CASE Message.Question(("Setup has detected existing
directories in the partition you selected for /home. Would you like to
import these ") & "<br>" &
+ ("user accounts into your new Operating System"), ("Yes"),
("No"))
+ CASE 1
+ frmNext = FrmImportAccts
+ CASE 2
+ frmNext = FrmUserAdd
+ END SELECT
+ END IF
CASE "FrmUserAdd"
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Dec 3 11:46:58 2008
@@ -32,6 +32,10 @@
sDump = Trim(sDump)
IF Len(sDump) > 0 THEN FrmUserAdd.btImportAcct.Enabled = TRUE
+ SELECT CASE Message.Question(("Setup has detected existing user
directories in your selected /home partition. Would you like to import
these user accounts into your new installation?"), ("Yes"), ("No"))
+ CASE 1
+ btImportAcct_Click()
+ END SELECT
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Dec 3 11:46:58 2008
@@ -95,6 +95,7 @@
SHELL "chroot " & ClsGlobal.sTargetMnt & " /sbin/lilo -v || echo
\'FAILED\' " TO sDump
IF InStr(sDump, "FAILED") > 0 THEN
Message.Error(("Lilo returned an error. Please see below") &
gb.NewLine & sDump)
+ FMain.btnext.Enabled = TRUE
RETURN 1
ELSE
Message(("Boot loader has been setup successfully"))
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Dec 3 11:46:58 2008
@@ -144,10 +144,7 @@
DIM cbox AS ComboBox
DIM sLabel, sKernel, sInitrd, sAppend, sTag AS String
DIM sBootPath, sHeader, sFile, sVidModeSection AS String
-
-
-
-
+
FOR EACH cb IN arrLinuxIncCheckboxes
IF Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1) =
ClsPartSel.sRoot THEN
sBootPath = "/boot"
@@ -165,7 +162,7 @@
IF cb.Tag = cbox.Tag AND cbox.Text = ("None") THEN
sInitrd = "noinitrd"
ELSE
- sInitrd = Trim(cbox.Text) & "-" & Right(cbox.Tag,
Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ sInitrd = sBootPath &/ Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
END IF
NEXT
FOR EACH tb IN arrLinuxAppendtxtBoxes
@@ -177,7 +174,7 @@
"root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
"label = " & sLabel & "\n" &
"append = \"" & sAppend & "\"" & "\n" &
- "initrd = " & sBootPath &/ sInitrd & "\n" &
+ "initrd = " & sInitrd & "\n" & ' sBootPath &/ sInitrd & "\n" &
"read-only" & "\n"
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
@@ -192,7 +189,7 @@
"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" &
+ "initrd = " & sInitrd & "\n" & '& sBootPath &/ sInitrd & "\n" &
"read-only" & "\n"
' sClisection = sSection
' sClisection = Replace(sClisection, "append = " &
sAppend, "append = \"2 splash=verbose\"")
@@ -611,12 +608,13 @@
.Width = 200
.Height = 21
.Tag = i & sHostPart
- .Add(("None"))
+
' BROWSE FOR INITRD IMAGES
FOR EACH sDump IN
Dir(sInitrdLoc, "initrd*").Sort(gb.Ascent)
IF
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
NEXT
+ .Add(("None"))
.Sorted = gb.Ascent
'.Sorted = TRUE
END WITH
Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module (original)
+++ branches/iVL/MdlSetup.module Wed Dec 3 11:46:58 2008
@@ -322,3 +322,14 @@
END
+PUBLIC FUNCTION SCAN_HOME_DIRS(sHomePartition AS String) AS String
+
+ DIM sDump AS String
+ SHELL "ls " & sHomePartition & " | grep -v ftp | grep -v lost+found |
grep -v .*" TO sDump
+
+ sDump = Trim(sDump)
+ RETURN sDump
+
+END
+
+
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-03 18:44:40
|
Author: M0...@gm...
Date: Wed Dec 3 10:34:04 2008
New Revision: 353
Modified:
branches/iVL/.project
branches/iVL/FrmImportAccts.class
branches/iVL/MdlLilo.module
branches/iVL/MdlUsrAdd.module
branches/iVL/installer.gambas
Log:
Added noinitrd option to lilo initrd lists
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 3 10:34:04 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.24
+Version=0.1.26
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 10:34:04 2008
@@ -92,6 +92,7 @@
MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS(ME.frmUsrGrps)
MdlUsrAdd.LIST_NEW_USER_ACCOUNT()
Message.Info(("User account for") & Space(1) &
Trim(ME.cbAccntList.Text) & Space(1) & ("successfully imported"))
+ ME.cbAccntList.Remove(ME.cbAccntList.Find(Trim(ME.cbAccntList.Text)))
END IF
'ME.Close
@@ -151,17 +152,19 @@
IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname
&/ ".face.icon") THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname
&/ ".face.icon"
SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & sname
& ".face.icon" WAIT 'link for KDM
' Tweak for the GDM face icon to work
- TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ sname &/ ".face"
- SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname
&/ ".face" WAIT
+ ' TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ sname &/ ".face"
+ EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt &/ "home" &/
sname &/ ".face "] WAIT
+ EXEC ["chmod", "664", clsglobal.sTargetMnt &/ "home" &/ sname
&/ ".face"] WAIT
+ 'SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname
&/ ".face" WAIT
SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " & sname &
Space(1) &/ "home" &/ sname &/ ".face" WAIT
SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " & sname &
Space(1) &/ "home/" & sname &/ ".face" WAIT
IF ERROR THEN Message.Error(Error.Where & gb.NewLine &
Error.Text)
END IF
' Increase the value of the iUID
- INC FrmUserAdd.iUID
- ME.LIST_IMPORTED_USER_ACCOUNT()
- ME.cbAccntList.Remove(ME.cbAccntList.Find(sname))
+ 'INC FrmUserAdd.iUID
+ 'ME.LIST_IMPORTED_USER_ACCOUNT()
+
END
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Dec 3 10:34:04 2008
@@ -37,7 +37,7 @@
'MdlConfLilo.PERFORM_BINDING() ' Performs binding mounts for LILO setup
IRET = MdlConfLilo.EXECUTE_LILO() ' Execute lilo in chroot mode
RETURN IRET
- MdlCore.warn_status_off()
+ 'MdlCore.warn_status_off()
END
@@ -162,7 +162,11 @@
END IF
NEXT
FOR EACH cbox IN arrCbInitrds
- IF cb.Tag = cbox.Tag THEN sInitrd = Trim(cbox.Text) & "-" &
Right(cbox.Tag, Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ IF cb.Tag = cbox.Tag AND cbox.Text = ("None") THEN
+ sInitrd = "noinitrd"
+ ELSE
+ sInitrd = Trim(cbox.Text) & "-" & Right(cbox.Tag,
Len(cbox.Tag) - RInStr(cbox.tag, "/"))
+ END IF
NEXT
FOR EACH tb IN arrLinuxAppendtxtBoxes
IF cb.Tag = tb.Tag THEN sAppend = Trim(tb.Text)
@@ -300,11 +304,12 @@
ELSE
sKernelLoc = "/tmp/lilo_tmp"
END IF
-
+ ' Do not copy current kernel..
+ IF sShortpart <> Right(ClsPartSel.sRoot,
Len(ClsPartSel.sRoot) - InStr(ClsPartSel.sRoot, "/")) THEN
' EXEC ["mkdir", "-p", ClsGlobal.sTargetMnt
&/ "boot/tamu"] WAIT
EXEC ["cp", sKernelLoc &/ sInitrd,
ClsGlobal.sTargetMnt &/ sKernelPath &/ sInitrd & "-" & sShortpart] WAIT
EXEC ["cp", sKernelLoc &/ "vmlinuz",
ClsGlobal.sTargetMnt &/ sKernelPath &/ "vmlinuz-" & sShortpart] WAIT
-
+ END IF
EXEC ["sync"] WAIT
EXEC ["umount", "/tmp/lilo_tmp"] WAIT
@@ -606,7 +611,9 @@
.Width = 200
.Height = 21
.Tag = i & sHostPart
+ .Add(("None"))
' BROWSE FOR INITRD IMAGES
+
FOR EACH sDump IN
Dir(sInitrdLoc, "initrd*").Sort(gb.Ascent)
IF
cbox.Find(Trim(sDump)) = -1 THEN cbox.Add(Trim(sDump))
NEXT
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Wed Dec 3 10:34:04 2008
@@ -30,7 +30,7 @@
DIM tl AS TextLabel
DIM tly AS Integer
- FrmUserAdd.LstUsers.Clear
+' FrmUserAdd.LstUsers.Clear
tly = 4
FOR i = 0 TO sFile.count - 1
sLine = sFile[i]
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-03 18:27:29
|
Author: M0...@gm...
Date: Wed Dec 3 08:33:24 2008
New Revision: 351
Modified:
branches/iVL/FrmImportAccts.class
Log:
attempt to fix user import
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 08:33:24 2008
@@ -161,7 +161,7 @@
' Increase the value of the iUID
INC FrmUserAdd.iUID
ME.LIST_IMPORTED_USER_ACCOUNT()
- ME.cbAccntList.Remove(ME.cbAccntList.Find(SaCC))
+ ME.cbAccntList.Remove(ME.cbAccntList.Find(sname))
END
|
|
From: <cod...@go...> - 2008-12-03 17:24:20
|
Author: M0...@gm...
Date: Wed Dec 3 08:59:16 2008
New Revision: 352
Modified:
branches/iVL/FrmImportAccts.class
Log:
debugging user import
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 08:59:16 2008
@@ -138,8 +138,8 @@
END IF
hproc = SHELL "chroot /mnt/target /usr/sbin/groupdel " & sname WAIT
- IF hproc.Value > 0 THEN RETURN hproc.Value
- hproc = SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1)
& FrmUserAdd.iUID & Space(1) &/ sname WAIT
+ 'IF hproc.Value > 0 THEN RETURN hproc.Value
+ hproc = SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1)
& FrmUserAdd.iUID & Space(1) & sname WAIT
IF hproc.Value > 0 THEN RETURN hproc.Value
hproc = SHELL "chroot /mnt/target /usr/sbin/useradd -g " & sname & "
-p " & ME.tbPass1.Text & " -u " & FrmUserAdd.iUID & " -G " & "\'users," &
sGroups & "\' -s /bin/bash " & sname & " -d /home/" & sname WAIT
IF hproc.Value > 0 THEN RETURN hproc.Value
|
|
From: <cod...@go...> - 2008-12-03 16:34:07
|
Author: uelsk8s
Date: Wed Dec 3 08:26:47 2008
New Revision: 349
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/installer.gambas
Log:
moved higher priority BG config items first
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /root/gui-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 Wed Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /root/gui-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 Dec 3 08:26:47 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /root/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Dec 3 08:26:47 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.23
+Version=0.1.24
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,6 +17,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Dec 3 08:26:47 2008
@@ -335,15 +335,17 @@
"chmod +x /etc/rc.d/rc.udev" & gb.NewLine &
"/etc/rc.d/rc.udev restart" & gb.NewLine &
"/etc/rc.d/rc.modules" & gb.NewLine &
+"sleep 2" & gb.NewLine &
"/sbin/vlsetup" & gb.NewLine &
"/sbin/vhwconf" & gb.NewLine &
-"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
+"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &
gb.NewLine &
+"/sbin/valsaconf-quiet" & gb.NewLine &
+"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &
gb.NewLine &
"rm -r /root/.mc 2>/dev/null" & gb.NewLine &
"for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
-"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &
gb.NewLine &
+"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
"update-mime-database /usr/share/mime/" & gb.NewLine &
-"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &
gb.NewLine &
-"/sbin/valsaconf-quiet" & gb.NewLine &
+"sleep 20" & gb.NewLine &
"echo done >/tmp/status" & gb.NewLine
File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2008-12-03 16:30:07
|
Author: M0...@gm...
Date: Wed Dec 3 08:28:22 2008
New Revision: 350
Modified:
branches/iVL/FrmImportAccts.class
Log:
More testing
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 08:28:22 2008
@@ -82,7 +82,7 @@
'IF ME.pbLogin THEN ME.pbLogin.Delete
'pbLogin = NEW PictureBox(ME)
'me.pbLogin.Move(
- ME.cbAccntList.Remove(ME.cbAccntList.Find(SaCC)))
+
ME.cbAccntList.Sorted = TRUE
'RETURN
IF ME.CREATE_IMPORTED_ACCOUNT(SaCC) > 0 THEN
@@ -111,6 +111,7 @@
DIM iTlY AS Integer
DIM hproc AS Process
+ Message(sname)
' Prepare group list
FOR EACH cb IN MdlUsrAdd.objGrps
@@ -160,7 +161,7 @@
' Increase the value of the iUID
INC FrmUserAdd.iUID
ME.LIST_IMPORTED_USER_ACCOUNT()
-
+ ME.cbAccntList.Remove(ME.cbAccntList.Find(SaCC))
END
|
|
From: <cod...@go...> - 2008-12-03 15:44:35
|
Author: M0...@gm...
Date: Wed Dec 3 07:43:33 2008
New Revision: 348
Modified:
branches/iVL/FrmImportAccts.class
Log:
Fixed bug with existing face icon
Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class (original)
+++ branches/iVL/FrmImportAccts.class Wed Dec 3 07:43:33 2008
@@ -147,6 +147,7 @@
IF ERROR THEN Message.Error(Error.Where & gb.NewLine & Error.Text)
' Add the face icon
IF Len(ME.tbPicPath.Text) > 0 THEN
+ IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname
&/ ".face.icon") THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname
&/ ".face.icon"
SHELL "cd " & sPicdir & " && ln -s " &
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & sname
& ".face.icon" WAIT 'link for KDM
' Tweak for the GDM face icon to work
TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"
&/ sname &/ ".face"
|
14 messages has been excluded from this view by a project administrator.
