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...> - 2009-05-04 16:10:34
|
Author: M0...@gm...
Date: Mon May 4 08:52:36 2009
New Revision: 542
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/Conf1.pot
branches/speedy/.lang/Conf2.pot
branches/speedy/.lang/Conf5.pot
branches/speedy/.lang/FDone.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.project
branches/speedy/ClsGlobal.class
branches/speedy/Conf0.class
branches/speedy/Conf1.class
branches/speedy/Conf2.class
branches/speedy/Conf3.class
branches/speedy/Conf4.class
branches/speedy/Conf5.class
branches/speedy/FDone.class
branches/speedy/MdlBootMngr.module
branches/speedy/MdlMain.module
branches/speedy/Step1.class
branches/speedy/Step3.class
branches/speedy/Step7.class
branches/speedy/Step8.class
Log:
- Cleaned up unused code off MdlBootMngr
- Fixed option to skip bootloader setup in boot manager window.
- Updated navigation status tree
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon May 4 08:52:36 2009
@@ -38,7 +38,7 @@
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:225 MdlBootMngr.module:373
+#: Conf0.class:225 MdlBootMngr.module:171
msgid "Standard"
msgstr ""
@@ -46,118 +46,118 @@
msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:225 MdlBootMngr.module:377
+#: Conf0.class:225 MdlBootMngr.module:175
msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:225 MdlBootMngr.module:379
+#: Conf0.class:225 MdlBootMngr.module:177
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:337 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:360 Step1.class:434 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:407
+#: Conf0.class:435
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:414
+#: Conf0.class:442
msgid "Offer"
msgstr ""
-#: Conf0.class:414
+#: Conf0.class:442
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:450
+#: Conf0.class:478
msgid "Title"
msgstr ""
-#: Conf0.class:472
+#: Conf0.class:500
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:528
+#: Conf0.class:556
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:537
+#: Conf0.class:565
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:646
+#: Conf0.class:680
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:662
+#: Conf0.class:696
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:671
+#: Conf0.class:705
msgid "LILO"
msgstr ""
-#: Conf0.class:678
+#: Conf0.class:712
msgid "GRUB"
msgstr ""
-#: Conf0.class:684
+#: Conf0.class:718
msgid "NONE"
msgstr ""
-#: Conf0.class:693
+#: Conf0.class:727
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:703
+#: Conf0.class:737
msgid "Target"
msgstr ""
-#: Conf0.class:715
+#: Conf0.class:749
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:734
+#: Conf0.class:768
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:745
+#: Conf0.class:779
msgid "Seconds"
msgstr ""
-#: Conf0.class:752
+#: Conf0.class:786
msgid "Boot Default"
msgstr ""
-#: Conf0.class:775
+#: Conf0.class:809
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:791
+#: Conf0.class:825
msgid "Tab 0"
msgstr ""
-#: Conf1.class:141 MdlStartUp.module:53
+#: Conf1.class:144 MdlStartUp.module:53
msgid "Regional Settings"
msgstr ""
-#: Conf1.class:154
+#: Conf1.class:157
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -166,19 +166,19 @@
"Choose localtime since most PCs are setup this way."
msgstr ""
-#: Conf1.class:170
+#: Conf1.class:173
msgid "Choose the correct timezone for the area in which you live."
msgstr ""
-#: Conf1.class:181
+#: Conf1.class:184
msgid "ComboBox1"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:186
msgid "LocalTime"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:186
msgid "UTC"
msgstr ""
@@ -208,27 +208,27 @@
msgid "DO NOT LEAVE THIS BLANK"
msgstr ""
-#: Conf2.class:58
+#: Conf2.class:60
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: Conf2.class:64
+#: Conf2.class:66
msgid "Password was not set. See error log below"
msgstr ""
-#: Conf2.class:132
+#: Conf2.class:134
msgid "System Administrator Account"
msgstr ""
-#: Conf2.class:149
+#: Conf2.class:151
msgid "About the linux root account"
msgstr ""
-#: Conf2.class:181
+#: Conf2.class:183
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198 Conf3.class:381
+#: Conf2.class:200 Conf3.class:381
msgid "Re-enter Password"
msgstr ""
@@ -387,7 +387,7 @@
msgid "Setting"
msgstr ""
-#: Conf3a.class:118 Conf5.class:34 Step7a.class:49 Step7b.class:28
+#: Conf3a.class:118 Conf5.class:36 Step7a.class:49 Step7b.class:28
msgid "Description"
msgstr ""
@@ -438,15 +438,15 @@
msgid "Linux.net"
msgstr ""
-#: Conf5.class:33
+#: Conf5.class:35
msgid "Service"
msgstr ""
-#: Conf5.class:124
+#: Conf5.class:126
msgid "System Serices"
msgstr ""
-#: Conf5.class:145
+#: Conf5.class:147
msgid "Select system services to run on start-up"
msgstr ""
@@ -472,11 +472,11 @@
msgid "to restart your computer now."
msgstr ""
-#: FDone.class:73
+#: FDone.class:72
msgid "Installation Complete"
msgstr ""
-#: FDone.class:90
+#: FDone.class:89
msgid "About your VectorLinux installation"
msgstr ""
@@ -540,51 +540,45 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:352
+#: MdlBootMngr.module:150
msgid "None"
msgstr ""
-#: MdlBootMngr.module:363
+#: MdlBootMngr.module:161
msgid "MBR Of"
msgstr ""
-#: MdlBootMngr.module:365
+#: MdlBootMngr.module:163
msgid "Bootsector Of"
msgstr ""
-#: MdlBootMngr.module:367
+#: MdlBootMngr.module:165
msgid "Floppy"
msgstr ""
-#: MdlBootMngr.module:375
+#: MdlBootMngr.module:173
msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:497
+#: MdlBootMngr.module:347
msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:505
+#: MdlBootMngr.module:355
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:587
+#: MdlBootMngr.module:401
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:591
-msgid ""
-"Check this box to make this your default operating system, or select
another "
-"tab."
-msgstr ""
-
-#: MdlBootMngr.module:599
+#: MdlBootMngr.module:419
msgid ""
"Found duplicate operating system names. Please use unique labels for
each "
"menu entry"
msgstr ""
-#: MdlBootMngr.module:602
+#: MdlBootMngr.module:422
msgid "Check these boxes to make sure they have unique names"
msgstr ""
@@ -730,63 +724,63 @@
msgid "to search for installation media again"
msgstr ""
-#: Step1.class:149
+#: Step1.class:150
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:168
+#: Step1.class:169
msgid "Found"
msgstr ""
-#: Step1.class:168
+#: Step1.class:169
msgid "in partition"
msgstr ""
-#: Step1.class:209
+#: Step1.class:210
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:222
+#: Step1.class:223
msgid "Scanning"
msgstr ""
-#: Step1.class:232
+#: Step1.class:233
msgid "in"
msgstr ""
-#: Step1.class:260
+#: Step1.class:261
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:353
+#: Step1.class:354
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:356
+#: Step1.class:357
msgid "VERSION"
msgstr ""
-#: Step1.class:433
+#: Step1.class:434
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433
+#: Step1.class:434
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:443
+#: Step1.class:444
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:511
+#: Step1.class:512
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:550
+#: Step1.class:551
msgid "Search Again"
msgstr ""
-#: Step1.class:580
+#: Step1.class:581
msgid "Check Installation media before installing"
msgstr ""
@@ -898,29 +892,29 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:175
+#: Step3.class:176
msgid "Automatic"
msgstr ""
-#: Step3.class:185
+#: Step3.class:186
msgid ""
"Automatically resize your partitions and / or create the correct disk
space "
"for VectorLinux."
msgstr ""
-#: Step3.class:192
+#: Step3.class:193
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:202
+#: Step3.class:203
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:209
+#: Step3.class:210
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:219
+#: Step3.class:220
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
@@ -1344,27 +1338,27 @@
msgid "Select Installation Mode"
msgstr ""
-#: Step7.class:108
+#: Step7.class:109
msgid "Full Install"
msgstr ""
-#: Step7.class:118
+#: Step7.class:119
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:137
+#: Step7.class:127 Step8.class:137
msgid "Customized"
msgstr ""
-#: Step7.class:136
+#: Step7.class:137
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:139
+#: Step7.class:145 Step8.class:139
msgid "Minimal"
msgstr ""
-#: Step7.class:154
+#: Step7.class:155
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Mon May 4 08:52:36 2009
@@ -54,99 +54,99 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid "WARNING:"
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:337
+#: Conf0.class:360
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:407
+#: Conf0.class:435
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:414
+#: Conf0.class:442
msgid "Offer"
msgstr ""
-#: Conf0.class:414
+#: Conf0.class:442
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:450
+#: Conf0.class:478
msgid "Title"
msgstr ""
-#: Conf0.class:472
+#: Conf0.class:500
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:528
+#: Conf0.class:556
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:537
+#: Conf0.class:565
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:646
+#: Conf0.class:680
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:662
+#: Conf0.class:696
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:671
+#: Conf0.class:705
msgid "LILO"
msgstr ""
-#: Conf0.class:678
+#: Conf0.class:712
msgid "GRUB"
msgstr ""
-#: Conf0.class:684
+#: Conf0.class:718
msgid "NONE"
msgstr ""
-#: Conf0.class:693
+#: Conf0.class:727
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:703
+#: Conf0.class:737
msgid "Target"
msgstr ""
-#: Conf0.class:715
+#: Conf0.class:749
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:734
+#: Conf0.class:768
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:745
+#: Conf0.class:779
msgid "Seconds"
msgstr ""
-#: Conf0.class:752
+#: Conf0.class:786
msgid "Boot Default"
msgstr ""
-#: Conf0.class:775
+#: Conf0.class:809
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:791
+#: Conf0.class:825
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/Conf1.pot
==============================================================================
--- branches/speedy/.lang/Conf1.pot (original)
+++ branches/speedy/.lang/Conf1.pot Mon May 4 08:52:36 2009
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf1.class:141
+#: Conf1.class:144
msgid "Regional Settings"
msgstr ""
-#: Conf1.class:154
+#: Conf1.class:157
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 ""
-#: Conf1.class:170
+#: Conf1.class:173
msgid "Choose the correct timezone for the area in which you live."
msgstr ""
-#: Conf1.class:181
+#: Conf1.class:184
msgid "ComboBox1"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:186
msgid "LocalTime"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:186
msgid "UTC"
msgstr ""
Modified: branches/speedy/.lang/Conf2.pot
==============================================================================
--- branches/speedy/.lang/Conf2.pot (original)
+++ branches/speedy/.lang/Conf2.pot Mon May 4 08:52:36 2009
@@ -34,27 +34,27 @@
msgid "DO NOT LEAVE THIS BLANK"
msgstr ""
-#: Conf2.class:58
+#: Conf2.class:60
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: Conf2.class:64
+#: Conf2.class:66
msgid "Password was not set. See error log below"
msgstr ""
-#: Conf2.class:132
+#: Conf2.class:134
msgid "System Administrator Account"
msgstr ""
-#: Conf2.class:149
+#: Conf2.class:151
msgid "About the linux root account"
msgstr ""
-#: Conf2.class:181
+#: Conf2.class:183
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198
+#: Conf2.class:200
msgid "Re-enter Password"
msgstr ""
Modified: branches/speedy/.lang/Conf5.pot
==============================================================================
--- branches/speedy/.lang/Conf5.pot (original)
+++ branches/speedy/.lang/Conf5.pot Mon May 4 08:52:36 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf5.class:33
+#: Conf5.class:35
msgid "Service"
msgstr ""
-#: Conf5.class:34
+#: Conf5.class:36
msgid "Description"
msgstr ""
-#: Conf5.class:124
+#: Conf5.class:126
msgid "System Serices"
msgstr ""
-#: Conf5.class:145
+#: Conf5.class:147
msgid "Select system services to run on start-up"
msgstr ""
Modified: branches/speedy/.lang/FDone.pot
==============================================================================
--- branches/speedy/.lang/FDone.pot (original)
+++ branches/speedy/.lang/FDone.pot Mon May 4 08:52:36 2009
@@ -34,11 +34,11 @@
msgid "to restart your computer now."
msgstr ""
-#: FDone.class:73
+#: FDone.class:72
msgid "Installation Complete"
msgstr ""
-#: FDone.class:90
+#: FDone.class:89
msgid "About your VectorLinux installation"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Mon May 4 08:52:36 2009
@@ -14,59 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:352
+#: MdlBootMngr.module:150
msgid "None"
msgstr ""
-#: MdlBootMngr.module:363
+#: MdlBootMngr.module:161
msgid "MBR Of"
msgstr ""
-#: MdlBootMngr.module:365
+#: MdlBootMngr.module:163
msgid "Bootsector Of"
msgstr ""
-#: MdlBootMngr.module:367
+#: MdlBootMngr.module:165
msgid "Floppy"
msgstr ""
-#: MdlBootMngr.module:373
+#: MdlBootMngr.module:171
msgid "Standard"
msgstr ""
-#: MdlBootMngr.module:375
+#: MdlBootMngr.module:173
msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:377
+#: MdlBootMngr.module:175
msgid "Bootsplash High"
msgstr ""
-#: MdlBootMngr.module:379
+#: MdlBootMngr.module:177
msgid "Bootsplash Extra High"
msgstr ""
-#: MdlBootMngr.module:497
+#: MdlBootMngr.module:347
msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:505
+#: MdlBootMngr.module:355
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:587
+#: MdlBootMngr.module:401
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:591
-msgid "Check this box to make this your default operating system, or
select another tab."
-msgstr ""
-
-#: MdlBootMngr.module:599
+#: MdlBootMngr.module:419
msgid "Found duplicate operating system names. Please use unique labels
for each menu entry"
msgstr ""
-#: MdlBootMngr.module:602
+#: MdlBootMngr.module:422
msgid "Check these boxes to make sure they have unique names"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Mon May 4 08:52:36 2009
@@ -58,67 +58,67 @@
msgid "to search for installation media again"
msgstr ""
-#: Step1.class:149
+#: Step1.class:150
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:168
+#: Step1.class:169
msgid "Found"
msgstr ""
-#: Step1.class:168
+#: Step1.class:169
msgid "in partition"
msgstr ""
-#: Step1.class:209
+#: Step1.class:210
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:222
+#: Step1.class:223
msgid "Scanning"
msgstr ""
-#: Step1.class:232
+#: Step1.class:233
msgid "in"
msgstr ""
-#: Step1.class:260
+#: Step1.class:261
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:353
+#: Step1.class:354
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:356
+#: Step1.class:357
msgid "VERSION"
msgstr ""
-#: Step1.class:433
+#: Step1.class:434
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433
+#: Step1.class:434
msgid "WARNING:"
msgstr ""
-#: Step1.class:433
+#: Step1.class:434
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:443
+#: Step1.class:444
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:511
+#: Step1.class:512
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:550
+#: Step1.class:551
msgid "Search Again"
msgstr ""
-#: Step1.class:580
+#: Step1.class:581
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Mon May 4 08:52:36 2009
@@ -22,27 +22,27 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:175
+#: Step3.class:176
msgid "Automatic"
msgstr ""
-#: Step3.class:185
+#: Step3.class:186
msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
msgstr ""
-#: Step3.class:192
+#: Step3.class:193
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:202
+#: Step3.class:203
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:209
+#: Step3.class:210
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:219
+#: Step3.class:220
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Mon May 4 08:52:36 2009
@@ -18,27 +18,27 @@
msgid "Select Installation Mode"
msgstr ""
-#: Step7.class:108
+#: Step7.class:109
msgid "Full Install"
msgstr ""
-#: Step7.class:118
+#: Step7.class:119
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126
+#: Step7.class:127
msgid "Customized"
msgstr ""
-#: Step7.class:136
+#: Step7.class:137
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144
+#: Step7.class:145
msgid "Minimal"
msgstr ""
-#: Step7.class:154
+#: Step7.class:155
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Mon May 4 08:52:36 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=MdlStartUp
+Startup=Conf5
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Mon May 4 08:52:36 2009
@@ -72,4 +72,6 @@
' auto partition by shinking existing partitions
STATIC PUBLIC lTotalMBforVL AS Long
+STATIC PUBLIC sDefBoot AS String
+
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Mon May 4 08:52:36 2009
@@ -232,6 +232,13 @@
ME.PROBE_SYSTEM_FOR_OS("lilo")
ME.Timer1.Enabled = TRUE
+
+ ' Update status tree
+ MdlMain.ADVANCE_STATUS_TREE("Step4", "Step5")
+ MdlMain.ADVANCE_STATUS_TREE("Step5", "Step6")
+ 'ClsGlobal.fRunningMainForm.listview1["Step4"].picture =
MdlStartUp.pDone
+ 'ClsGlobal.fRunningMainForm.listview1["Step5"].picture =
MdlStartUp.pDone
+ 'ClsGlobal.fRunningMainForm.listview1["Step6"].picture =
MdlStartUp.pNow
END
@@ -242,6 +249,8 @@
END
PUBLIC SUB OnExit()
+ IF rbNone.Value = TRUE THEN RETURN
+
IF MdlBootMngr.CHECK_LILO_VALUES(FALSE) > 0 THEN
RETURN
STOP EVENT
@@ -350,6 +359,8 @@
("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
("unless you are fully aware of what you are doing."))
END IF
+ Timer1.Enabled = FALSE
+ ClsGlobal.fRunningMainForm.btnext.enabled = TRUE
ME.Toggle_window_controls(FALSE)
END
@@ -374,6 +385,7 @@
DIM i AS Integer
DIM $ob AS Object
ME.Toggle_window_controls(TRUE)
+
FOR i = 0 TO TsOsList.Count - 1
FOR EACH $ob IN TsOsList[i].Children
$ob.Delete
@@ -382,7 +394,7 @@
NEXT
TsOsList.Count = 1
ME.PROBE_SYSTEM_FOR_OS(LCase(LAST.text))
-
+ Timer1.Enabled = TRUE
END
@@ -562,19 +574,25 @@
DIM cb AS CheckBox
DIM tb AS TextBox
+
+ IF objDefOs.Count > 1 THEN
FOR EACH cb IN objDefOs
IF cb <> LAST THEN cb.Value = FALSE
NEXT
+ END IF
FOR EACH tb IN objNames
IF tb.Tag = LAST.tag THEN
- cbDefBoot.Tag = tb.Text
+ 'cbDefBoot.Tag = tb.Text
+ ClsGlobal.sDefBoot = tb.Text
END IF
NEXT
+ 'END IF
IF LAST.value = FALSE THEN
FOR EACH tb IN objNames
IF tb.Tag = LAST.tag THEN
IF cbDefBoot.Tag = tb.Text THEN
- cbDefBoot.Tag = ""
+ IF ClsGlobal.sDefBoot = tb.Text THEN ClsGlobal.sDefBoot = ""
+ ' cbDefBoot.Tag = ""
END IF
END IF
NEXT
@@ -608,5 +626,7 @@
PUBLIC SUB Timer1_Timer()
ClsGlobal.fRunningMainForm.btnext.enabled =
MdlBootMngr.CHECK_LILO_VALUES(TRUE) < 1
+ 'DEBUG "Timer tick"
+ 'PRINT MdlBootMngr.CHECK_LILO_VALUES(TRUE)
END
Modified: branches/speedy/Conf1.class
==============================================================================
--- branches/speedy/Conf1.class (original)
+++ branches/speedy/Conf1.class Mon May 4 08:52:36 2009
@@ -23,6 +23,9 @@
' default the time zone to us/central
ME.lbTmZone[ME.lbTmZone.Find("US/Central")].Selected = TRUE
+
+ ' update status tree
+ MdlMain.ADVANCE_STATUS_TREE("Step6", "Step7")
END
Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class (original)
+++ branches/speedy/Conf2.class Mon May 4 08:52:36 2009
@@ -25,6 +25,8 @@
END WITH
ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
+' update status tree
+ MdlMain.ADVANCE_STATUS_TREE("Step7", "Step8")
END
PUBLIC SUB Form_Resize()
Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class (original)
+++ branches/speedy/Conf3.class Mon May 4 08:52:36 2009
@@ -159,7 +159,7 @@
'-== Make sure we have valid entries before trying to create a user
account ==-
IF Check_Text_Entry() = FALSE THEN
IF MdlMain.CHECK_EXISTING_USER(Trim(ME.txtLogin.Text)) = FALSE THEN
- IF MdlMain.CREATE_NEW_USER_ACCOUNT(Trim(txtLogin.Text),
Trim(txtRealName.Text), btPicSel.Picture, Trim(txtPass2.Text)) > 0 THEN '
create new account while checking for errors
+ IF MdlMain.CREATE_NEW_USER_ACCOUNT(Trim(txtLogin.Text),
Trim(txtRealName.Text), Picture.Load(btPicSel.Picture),
Trim(txtPass2.Text)) > 0 THEN ' create new account while checking for errors
Message.Error(("Unable to successfully create user account. Please
run VasmCC after installation is done."))
END IF
ELSE ' user exists
Modified: branches/speedy/Conf4.class
==============================================================================
--- branches/speedy/Conf4.class (original)
+++ branches/speedy/Conf4.class Mon May 4 08:52:36 2009
@@ -18,7 +18,7 @@
PUBLIC SUB Form_Open()
-
+ MdlMain.ADVANCE_STATUS_TREE("Step8", "Step9")
END
PUBLIC FUNCTION GetNext() AS String
Modified: branches/speedy/Conf5.class
==============================================================================
--- branches/speedy/Conf5.class (original)
+++ branches/speedy/Conf5.class Mon May 4 08:52:36 2009
@@ -1,5 +1,4 @@
' Gambas class file
-
' This file is part of vinstall-ng
' vinstall-ng is free software: you can redistribute it and/or modify
@@ -14,57 +13,26 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
-'
-'-= system services window =-
+' ==================== services configuration settings =================
+PRIVATE picStatus AS Picture
PUBLIC SUB Form_Open()
- ME.prepare_grid()
- ME.LIST_AVAILABLE_SERVICES()
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
+ END WITH
+ ME.Prepare_Grid()
+ ME.lIST_SERVICES()
END
-PUBLIC SUB prepare_grid()
+PUBLIC FUNCTION GetNext() AS String
- ME.svServiceList.Columns.count = 4
- ME.svServiceList.Rows.Count = 3
- ME.svServiceList.Columns[0].Width = 24
- ME.svServiceList.Columns[1].Width = 32
- ME.svServiceList.Columns[2].Width = 200
- ME.svServiceList.Rows[1].Height = 12
- ME.svServiceList[0, 2].Text = ("Service")
- ME.svServiceList[0, 3].Text = ("Description")
- ME.svServiceList[0, 2].Alignment = Align.Center
- ME.svServiceList[0, 3].Alignment = Align.Center
- ME.svServiceList[0, 2].Font.Bold = TRUE
- ME.svServiceList[0, 3].Font.Bold = TRUE
- ME.svServiceList[0, 0].BackColor = Color.SelectedBackground
- ME.svServiceList[0, 1].BackColor = Color.SelectedBackground
- ME.svServiceList[0, 2].BackColor = Color.SelectedBackground
- ME.svServiceList[0, 3].BackColor = Color.SelectedBackground
+ 'ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
+ 'ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
-END
-
-PUBLIC SUB LIST_AVAILABLE_SERVICES()
-
- DIM irow AS Integer = 2
- DIM sFile AS String
-
- 'FOR EACH sFile IN Dir(ClsGlobal.sTargetPath &/ "etc" &/ "rc.d"
&/ "init.d", "*", gb.File)
- FOR EACH sFile IN Dir("/etc/rc.d/init.d", "*", gb.File)
- svServiceList[irow, 2].Text = sFile
- INC irow
- INC svServiceList.Rows.Count
- NEXT
- DEC svServiceList.Rows.Count
- 'Message("Done")
-
-END
-
-
-PUBLIC FUNCTION GetNext() AS String
+ 'MdlMain.ADVANCE_STATUS_TREE("Step9", "Step10")
RETURN "FDone"
-
END
PUBLIC SUB StartUp()
@@ -73,22 +41,160 @@
END
PUBLIC SUB OnExit()
-
+ ME.SAVE_SERVICES_LIST()
END
-
PUBLIC SUB Form_Resize()
WITH ME
- .svServiceList.Height = .ClientH - (.svServiceList.top + 12)
+ .gvSvcList.Height = .ClientH - (.gvSvcList.Top + 12)
+ .gvSvcList.Columns[2].Width = .gvSvcList.Width -
(.gvSvcList.Columns[2].Left + 12)
+ END WITH
+
+END
+PUBLIC SUB Prepare_Grid()
+ DIM i AS Integer
+ WITH ME
+ .gvSvcList.Rows.Count = 3
+ .gvSvcList.columns.Count = 4
+ .gvheader.rows.Count = 1
+ .gvheader.Columns.Count = 3
+ .gvheader[0, 2].Text = UCase(("Service"))
+ FOR i = 0 TO gvheader.columns.Count - 1
+ .gvheader[0, i].BackColor = Color.SelectedBackground
+ .gvheader[0, i].Alignment = Align.Center
+ NEXT
+ .gvSvcList.columns[0].Width = 24
+ .gvheader.Columns[0].Width = 24
+ .gvSvcList.Columns[1].Width = 64
+ .gvheader.Columns[1].Width = 64
+ .gvSvcList.Columns[3].Width = 1
END WITH
+
+
+END
+
+PUBLIC SUB lIST_SERVICES()
+
+ DIM irow AS Integer
+ DIM sService, sDesc AS String
+ DIM sPic AS Picture
+ DIM sLogo AS Image
+ DIM sSvcPath AS String = "/etc/rc.d/init.d" 'ClsGlobal.sTargetPath
&/ "etc" &/ "rc.d" &/ "init.d"
+
+ picStatus = Picture.Load("images/16px-check.png")
+
+ FOR EACH sService IN Dir(sSvcPath, "*", gb.File)
+ SELECT CASE sService
+ CASE "cron"
+ sDesc = ("System task scheduler")
+ sPic = picStatus
+ CASE "bluetooth"
+ sDesc = ("Bluetooth device manager")
+ sPic = ""
+ CASE "sshd"
+ sDesc = ("Secure Shell remote access")
+ sPic = ""
+ CASE "gslaptd"
+ sDesc = ("Software update notifications")
+ sPic = picStatus
+ CASE "wifi-radar"
+ sDesc = ("Wireless network scanner")
+ sPic = ""
+ CASE "cups"
+ sDesc = ("Printing service")
+ sPic = picStatus
+ CASE "fuse"
+ sDesc = ("File in userspace daemon")
+ sPic = ""
+ CASE "inetd"
+ sDesc = ("Internet Super Server")
+ sPic = ""
+ CASE "portmap"
+ sDesc = ("RPC Port Mapper")
+ sPic = ""
+ CASE "samba"
+ sDesc = ("Windows networking service")
+ sPic = ""
+ CASE "vmware"
+ sDesc = ("VMWare modules")
+ sPic = ""
+ CASE "wicd"
+ sDesc = ("Network interface manager")
+ sPic = picStatus
+ CASE "firewall"
+ sDesc = ("Enhanced network security")
+ sPic = ""
+ CASE "gpm"
+ sDesc = ("Mouse driver for Text Mode interface")
+ sPic = ""
+ END SELECT
+ IF Exist("images" &/ sService & ".svg") THEN
+ sLogo = Image.Load("images" &/ sService & ".svg")
+ ELSE
+ sLogo = Image.Load("images" &/ "service.svg")
+ END IF
+
+
+ IF sDesc THEN
+ ME.gvSvcList[irow, 0].Picture = sPic
+ IF sLogo THEN
+ ME.gvSvcList[irow, 1].Picture = sLogo.Picture
+ ME.gvSvcList[irow, 1].Alignment = Align.Center
+ END IF
+ ME.gvSvcList.rows[irow].Height = 64 'sLogo.Height
+ ME.gvSvcList[irow, 0].Alignment = Align.Center
+ ME.gvSvcList[irow, 2].Text = UCase(sService) & gb.NewLine &
gb.NewLine & sDesc
+ ME.gvSvcList[irow, 3].Text = sService
+ INC irow
+ INC gvSvcList.Rows.Count
+ END IF
+ NEXT
+
+ DEC gvSvcList.Rows.Count
+ DEC gvSvcList.Rows.Count
+ DEC gvSvcList.Rows.Count
+
+
END
-PUBLIC SUB TextLabel1_Menu()
- MdlBootMngr.PROBE_SYSTEM_FOR_OS("LILO")
+PUBLIC SUB gvSvcList_Click()
+
+ IF LAST.column > 1 THEN RETURN
+ IF gvSvcList[LAST.row, 0].Picture = picStatus THEN
+ gvSvcList[LAST.row, 0].Picture = ""
+ ELSE
+ gvSvcList[LAST.row, 0].Picture = picStatus
+ END IF
+
+ gvSvcList.Refresh()
+
+END
+PUBLIC SUB SAVE_SERVICES_LIST()
+
+ DIM irow AS Integer
+ DIM sSVc AS String
+
+ ' We will default to runlevel 4 (GUI Mode) for services.
+ FOR irow = 0 TO ME.gvSvcList.Rows.Count - 1
+ sSVc = gvSvcList[irow, 3].Text
+ IF gvSvcList[irow, 0].Picture = picStatus THEN
+ PRINT " \\__ Setting up services" & gb.NewLine
+ PRINT " \\- " & sSVc
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/service -s " &
sSVc & " 4" WAIT
+ END IF
+
+ NEXT
+
+END
+
+
+PUBLIC SUB gvSvcList_Menu()
+
+ ME.SAVE_SERVICES_LIST()
END
Modified: branches/speedy/FDone.class
==============================================================================
--- branches/speedy/FDone.class (original)
+++ branches/speedy/FDone.class Mon May 4 08:52:36 2009
@@ -32,8 +32,7 @@
END WITH
-ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
-ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
+MdlMain.ADVANCE_STATUS_TREE("Step10", "Step11")
END
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Mon May 4 08:52:36 2009
@@ -119,208 +119,6 @@
END
-' PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
-'
-' DIM i AS Integer
-' DIM tb AS TextBox
-' DIM tl AS TextLabel
-' DIM cb AS CheckBox
-' DIM hb AS HBox
-' DIM comb AS ComboBox
-'
-' IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
-' 'Message(sLinux)
-' IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
-' i = 0
-' WITH objTabStrip
-' .Index = i
-' .Text = "VectorLinux"
-' END WITH
-' ELSE
-' i = objTabStrip.Count - 1
-' WITH objTabStrip
-' .Index = i
-' .Text = sLinux
-' END WITH
-' END IF
-'
-' tl = NEW TextLabel(objTabStrip) AS "Banner"
-' WITH tl
-' .Text = ("Installation found in") & Space(1) & sLinuxRoot
-' .Height = 24
-' .Alignment = Align.Left
-' .Width = 200
-' .Expand = TRUE
-' '.Border = Border.Plain
-' '.AutoResize = TRUE
-' .Move(4, 4)
-' END WITH
-' hb = NEW HBox(objTabStrip) ' separator space
-' WITH hb
-' .Height = 16
-' .Width = 12
-' .Expand = TRUE
-' END WITH
-' cb = NEW CheckBox(objTabStrip) ' Inlcude/Exclude OS from boot menu
-' WITH cb
-' .Expand = TRUE
-' .Text = ("Include in boot menu")
-' .Value = TRUE
-' .Height = 24
-' .Tag = sLinuxRoot
-' END WITH
-' objChecks.Add(cb)
-' hb = NEW HBox(objTabStrip) ' separator space
-' WITH hb
-' .Height = 12
-' .Expand = TRUE
-' END WITH
-' hb = NEW HBox(objTabStrip) ' This will hold a few objects of it's own
-' WITH hb
-' .Height = 28
-' .Expand = TRUE
-' .Padding = 2
-' .Spacing = 2
-' END WITH
-' tl = NEW TextLabel(hb) ' Name label
-' WITH tl
-' .Text = ("Name")
-' .Expand = FALSE
-' .Width = 200
-' .Adjust()
-' .AutoResize = TRUE
-' .Height = .Parent.Height
-' .Alignment = Align.Left
-' END WITH
-' tb = NEW TextBox(hb) AS "tbOsLabel" ' Name entry box
-' WITH tb
-' .Expand = TRUE
-' .Height = .Parent.Height
-' .Text = sLinux ' default to the distro found
-' .Tag = sLinuxRoot
-' END WITH
-' objNames.Add(tb)
-' tl = NEW TextLabel(hb) ' initrd label
-' WITH tl
-' .text = ("Initial RAM disk image")
-' .Alignment = Align.Right
-' .Height = .Parent.Height
-' .Expand = TRUE
-' END WITH
-'
-' comb = NEW ComboBox(hb) ' initrd selection combobox
-' WITH comb
-' .Height = .Parent.Height
-' .Expand = TRUE
-' .READonly = TRUE
-' .Tag = sLinuxRoot
-' END WITH
-' ' populate the initrd box
-' 'Message(sLinuxRoot)
-' ME.find_initrds_for_this_linux(sLinuxRoot, comb) ' populate
initrd selection
-'
-' objinitrds.Add(comb)
-' hb = NEW HBox(objTabStrip) ' blank space separator
-' hb.Height = 8
-' hb.Expand = TRUE
-' tl = NEW TextLabel(objTabStrip) ' append line textlabel
-' WITH tl
-' .Text = ("Kernel boot options")
-' .Height = 24
-' .Width = 200
-' .Alignment = Align.Left objappends = NEW Object[]
- ' objChecks = NEW Object[]
- ' objinitrds = NEW Object[]
- ' objNames = NEW Object[]
-
-' .Expand = FALSE
-' .AutoResize = TRUE
-' END WITH
-' tb = NEW TextBox(objTabStrip) ' append input line
-' WITH tb
-' .Text = "splash=silent"
-' .Height = 24
-' .Expand = TRUE
-' .Tag = sLinuxRoot
-' END WITH
-' objappends.Add(tb)
-'
-' ' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
-' IF sLinuxRoot = ClsGlobal.sRoot THEN
-' hb = NEW HBox(objTabStrip) ' yet another separator
-' WITH hb
-' .Expand = TRUE
-' .Height = 8
-' END WITH
-' cb = NEW CheckBox(objTabStrip) AS "bCLIOption"
-' WITH cb
-' .Value = TRUE
-' .Text = ("Add option to boot this operating system into text
mode")
-' .Height = 24
-' .Expand = TRUE
-' .Tag = sLinuxRoot
-' END WITH
-' ' hb = NEW HBox(objTabStrip)
-' ' hb.Height = 4
-' ' hb.Expand = TRUE
-'
-' END IF
-' objTabStrip.Refresh()
-'
-'
-'
-' END
-
-
-' PUBLIC SUB List_Other_Linuxes(objTabStrip AS TabStrip) ' tell me where
you want the results.
-
-' DIM sDump, sPartitions, sPart AS String
-' DIM sPartList AS String[]
-' DIM i AS Integer
-' DIM sOutcome AS String
-'
-' objappends = NEW Object[]
-' objChecks = NEW Object[]
-' objinitrds = NEW Object[]
-' objNames = NEW Object[]
-'
-' bScanned = TRUE
-' 'Message(ClsGlobal.sRoot)
-' ' Message(Trim(sPartList[i]))
-'
-' ' First, and foremost, we will list the recently isntalled VectorLinux
-' 'populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
-' ' Now list all other linuxes
=================================================
-' SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux
| tr -s \' \' | cut -f 1 -d \' \'" TO sDump
-' sDump = Trim(sDump)
-' IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ...
-' sPartList = Split(sDump, gb.NewLine)
-' FOR i = 0 TO sPartList.Max
-' sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
-'
-' 'IF Trim(ClsGlobal.sRoot) <> Trim(sPartList[i]) THEN
-' 'sOutcome = Find_Linux(Trim(sPartList[i]))
-' 'Message(sOutcome)
-' ' will only list the linux IF one IS present
-' 'IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
-' 'IF Find_Linux(Trim(sPartList[i])) <> "None" THEN
-' sOutcome = Find_Linux(Trim(sPartList[i]))
-' IF sOutcome AND sOutcome <> "None" THEN
-' 'INC objTabStrip.Count
-' objTabStrip.Index = objTabStrip.Count - 1
-' populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
-' INC objTabStrip.Count
-' END IF
-' 'END IF
-'
-' NEXT
-' DEC objTabStrip.Count ' remove the trailing blank tab from the
tabstrip.
-'
-'
-' ' now list all other Windows os's
============================================
-'
-'
-' END
PUBLIC SUB find_initrds_for_this_linux(sLinuxRoot AS String, object AS
ComboBox)
@@ -405,7 +203,7 @@
"# Begin listing OS Choices \n"
- sDefBoot = Conf0.cbDefBoot.Tag
+ sDefBoot = ClsGlobal.sDefBoot
iTimeOut = Conf0.SbTimeOut.Value * 10
sOutput = "# LILO Configuration File \n" &
@@ -448,7 +246,7 @@
IF cb.tag = tl.Name THEN sInitrd = cb.Text
NEXT
-
+ END IF
' now that we got kernel and initrd, copy them over
IF sKernel AND IF sInitrd THEN
SHELL "cp " & sKernel & Space(1) & ClsGlobal.sTargetPath &/ "boot"
@@ -560,48 +358,6 @@
END
-' PUBLIC SUB PROBE_SYSTEM_FOR_OS(sBootManager AS String)
-'
-' DIM sDump, sOs, sRoot, sLongDesc, sType, sTitle AS String
-' DIM i AS Integer
-' DIM sOsList, sOsLine, sBootLine, sDumparr AS String[]
-' DIM sKernel, sInitrd, sAppendLine AS String
-' DIM sBootargs AS String
-'
-' sOsList = Split(Trim(File.Load("/tmp/os.lst")), gb.NewLine)
-' FOR i = 0 TO sOsList.Max
-' sOsLine = Split(Trim(sOsList[i]), ":")
-' sType = Trim(sOsLine[3])
-' sLongDesc = Trim(sOsLine[1])
-' sOs = Trim(sOsLine[2])
-' sRoot = Trim(sOsLine[0])
-' IF sBootManager LIKE "lilo" THEN
-' sTitle = sOs
-' ELSE
-' sTitle = sLongDesc
-' END IF
-'
-' ' Message(sLongDesc & " was found in " & sRoot)
-' ' -= NOW I NEED TO GET THE KERNEL, INITRD AND APPEND LINES FOR
THIS OS. =-
-' IF sType LIKE "linux" THEN
-' ' this function will return an array separated by "," in
this order
-' ' /path/to/kernel, /path/to/initrd, appendline here
-'
-' sBootargs = Get_OS_Boot_Params(sRoot)
-' IF NOT (sBootargs) THEN
-' '= CAN NOT FIND BOOT ARGUMENTS FOR THIS OS ='
-' PRINT ("Unable to find boot arguments for OS in") &
Space(1) & sRoot
-' RETURN
-' ELSE
-' Message(sTitle & "<br>" & sBootargs)
-' END IF
-'
-' END IF
-'
-' NEXT
-'
-' END
-
PUBLIC FUNCTION Get_OS_Boot_Params(sOsRoot AS String) AS String
DIM $kern, $initrd, $append, sDump AS String
@@ -614,11 +370,17 @@
SHELL "cat " & $file & " | grep ^" & sOsRoot TO sDump
sDump = Trim(sDump)
$dumparr = Split(sDump, gb.NewLine)
+ IF NOT ($dumparr) THEN RETURN
' always grab the first line only for each os
$line = Trim($dumparr[0])
IF NOT ($line) THEN RETURN
- $append = Right($line, Len($line) - InStr($line, "append") + 1)
& "\""
+
$linearr = Split($line, ":")
+ IF InStr($line, "append") THEN
+ $append = Right($line, Len($line) - InStr($line, "append") +
1) & "\"" ' this works for LILO booted os's only.
+ ELSE
+ $append = Trim($linearr[5]) ' for grub botted os's
+ END IF
$kern = Trim($linearr[3])
$initrd = Trim($linearr[4])
@@ -634,17 +396,23 @@
DIM tb, tb1, tb2 AS TextBox
DIM cb AS CheckBox
DIM sTag AS String = Conf0.TsOsList.Current.Text
- IF NOT (Conf0.cbDefBoot.tag) THEN
- IF bquiet = FALSE THEN
- Message.Error(("You must select one operating system to be started
by default"))
- END IF
- FOR EACH cb IN Conf0.objDefOs
- IF cb.Tag = sTag THEN
- IF bquiet = FALSE THEN Balloon.Error(("Check this box to make
this your default operating system, or select another tab."), cb, cb.Left +
24)
+ IF NOT (ClsGlobal.sDefBoot) THEN
+ IF bquiet = FALSE THEN
+ Message.Error(("You must select one operating system to be
started by default"))
END IF
- NEXT
+ ' FOR EACH cb IN Conf0.objDefOs
+ ' IF cb.Tag = sTag THEN
+ ' IF bquiet = FALSE THEN
+ ' Balloon.Error(("Check this box to make this your default
operating system, or select another tab."), cb, cb.Left + 24)
+ ' 'RETURN 1
+ ' END IF
+ ' END IF
+ ' NEXT
+ 'DEBUG "No default OS selected"
+
RETURN 1
END IF
+ IF Conf0.objNames.Count > 1 THEN
FOR EACH tb IN Conf0.objNames
FOR EACH tb1 IN Conf0.objNames
IF tb <> tb1 AND IF tb.Text = tb1.Text THEN
@@ -658,7 +426,7 @@
END IF
NEXT
NEXT
-
+END IF
+ RETURN 0
END
-
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Mon May 4 08:52:36 2009
@@ -216,3 +216,11 @@
END
+PUBLIC SUB ADVANCE_STATUS_TREE(sPrev AS String, sNow AS String)
+
+ ClsGlobal.fRunningMainForm.listview1[sPrev].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1[sNow].picture = MdlStartUp.pNow
+
+END
+
+
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Mon May 4 08:52:36 2009
@@ -107,8 +107,9 @@
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step0"].picture =
MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pNow
+ MdlMain.ADVANCE_STATUS_TREE("Step0", "Step1")
+ ' ClsGlobal.fRunningMainForm.listview1["Step0"].picture =
MdlStartUp.pDone
+ ' ClsGlobal.fRunningMainForm.listview1["Step1"].picture =
MdlStartUp.pNow
IF bcheckmedia.Value = TRUE THEN
RETURN "Step2"
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Mon May 4 08:52:36 2009
@@ -37,9 +37,10 @@
END
PUBLIC FUNCTION GetNext() AS String
-
- ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
+
+ MdlMain.ADVANCE_STATUS_TREE("Step1", "Step2")
+ ' ClsGlobal.fRunningMainForm.listview1["Step1"].picture =
MdlStartUp.pDone
+ ' ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
IF ME.rbAutoPart.Value = TRUE THEN
RETURN "Step3a"
Modified: branches/speedy/Step7.class
==============================================================================
--- branches/speedy/Step7.class (original)
+++ branches/speedy/Step7.class Mon May 4 08:52:36 2009
@@ -18,8 +18,9 @@
ME.tlbanner.Text = "<h2>" & ("Select Installation Mode") & "</h2>"
- ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pNow
+ MdlMain.ADVANCE_STATUS_TREE("Step2", "Step3")
+ ' ClsGlobal.fRunningMainForm.listview1["Step2"].picture =
MdlStartUp.pDone
+ ' ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pNow
END
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Mon May 4 08:52:36 2009
@@ -35,9 +35,9 @@
END
PUBLIC FUNCTION GetNext() AS String
-
- ClsGlobal.fRunningMainForm.listview1["Step4"].Picture = MdlStartUp.pNow
- ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pDone
+ MdlMain.ADVANCE_STATUS_TREE("Step3", "Step4")
+ ' ClsGlobal.fRunningMainForm.listview1["Step4"].Picture = MdlStartUp.pNow
+ ' ClsGlobal.fRunningMainForm.listview1["Step3"].picture =
MdlStartUp.pDone
RETURN "Conf0"
|
|
From: <cod...@go...> - 2009-05-01 22:09:22
|
Author: M0...@gm...
Date: Fri May 1 13:34:06 2009
New Revision: 541
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.project
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
Log:
- Completed lilo setup window
-- Ready for testing
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri May 1 13:34:06 2009
@@ -54,102 +54,102 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:336 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:337 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:406
+#: Conf0.class:407
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:413
+#: Conf0.class:414
msgid "Offer"
msgstr ""
-#: Conf0.class:413
+#: Conf0.class:414
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:449
+#: Conf0.class:450
msgid "Title"
msgstr ""
-#: Conf0.class:471
+#: Conf0.class:472
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:527
+#: Conf0.class:528
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:536
+#: Conf0.class:537
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:628
+#: Conf0.class:646
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:644
+#: Conf0.class:662
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:653
+#: Conf0.class:671
msgid "LILO"
msgstr ""
-#: Conf0.class:660
+#: Conf0.class:678
msgid "GRUB"
msgstr ""
-#: Conf0.class:666
+#: Conf0.class:684
msgid "NONE"
msgstr ""
-#: Conf0.class:675
+#: Conf0.class:693
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:685
+#: Conf0.class:703
msgid "Target"
msgstr ""
-#: Conf0.class:697
+#: Conf0.class:715
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:716
+#: Conf0.class:734
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:727
+#: Conf0.class:745
msgid "Seconds"
msgstr ""
-#: Conf0.class:734
+#: Conf0.class:752
msgid "Boot Default"
msgstr ""
-#: Conf0.class:754
+#: Conf0.class:775
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:770
+#: Conf0.class:791
msgid "Tab 0"
msgstr ""
@@ -568,23 +568,23 @@
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:586
+#: MdlBootMngr.module:587
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:589
+#: MdlBootMngr.module:591
msgid ""
"Check this box to make this your default operating system, or select
another "
"tab."
msgstr ""
-#: MdlBootMngr.module:597
+#: MdlBootMngr.module:599
msgid ""
"Found duplicate operating system names. Please use unique labels for
each "
"menu entry"
msgstr ""
-#: MdlBootMngr.module:600
+#: MdlBootMngr.module:602
msgid "Check these boxes to make sure they have unique names"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri May 1 13:34:06 2009
@@ -54,99 +54,99 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid "WARNING:"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:337
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:406
+#: Conf0.class:407
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:413
+#: Conf0.class:414
msgid "Offer"
msgstr ""
-#: Conf0.class:413
+#: Conf0.class:414
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:449
+#: Conf0.class:450
msgid "Title"
msgstr ""
-#: Conf0.class:471
+#: Conf0.class:472
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:527
+#: Conf0.class:528
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:536
+#: Conf0.class:537
msgid "Boot this operating system by default"
msgstr ""
-#: Conf0.class:628
+#: Conf0.class:646
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:644
+#: Conf0.class:662
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:653
+#: Conf0.class:671
msgid "LILO"
msgstr ""
-#: Conf0.class:660
+#: Conf0.class:678
msgid "GRUB"
msgstr ""
-#: Conf0.class:666
+#: Conf0.class:684
msgid "NONE"
msgstr ""
-#: Conf0.class:675
+#: Conf0.class:693
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:685
+#: Conf0.class:703
msgid "Target"
msgstr ""
-#: Conf0.class:697
+#: Conf0.class:715
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:716
+#: Conf0.class:734
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:727
+#: Conf0.class:745
msgid "Seconds"
msgstr ""
-#: Conf0.class:734
+#: Conf0.class:752
msgid "Boot Default"
msgstr ""
-#: Conf0.class:754
+#: Conf0.class:775
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:770
+#: Conf0.class:791
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Fri May 1 13:34:06 2009
@@ -54,19 +54,19 @@
msgid "Bootsector of"
msgstr ""
-#: MdlBootMngr.module:586
+#: MdlBootMngr.module:587
msgid "You must select one operating system to be started by default"
msgstr ""
-#: MdlBootMngr.module:589
+#: MdlBootMngr.module:591
msgid "Check this box to make this your default operating system, or
select another tab."
msgstr ""
-#: MdlBootMngr.module:597
+#: MdlBootMngr.module:599
msgid "Found duplicate operating system names. Please use unique labels
for each menu entry"
msgstr ""
-#: MdlBootMngr.module:600
+#: MdlBootMngr.module:602
msgid "Check these boxes to make sure they have unique names"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Fri May 1 13:34:06 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=Conf0
+Startup=MdlStartUp
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Fri May 1 13:34:06 2009
@@ -231,6 +231,7 @@
MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
ME.PROBE_SYSTEM_FOR_OS("lilo")
+ ME.Timer1.Enabled = TRUE
END
@@ -241,7 +242,21 @@
END
PUBLIC SUB OnExit()
-
+ IF MdlBootMngr.CHECK_LILO_VALUES(FALSE) > 0 THEN
+ RETURN
+ STOP EVENT
+ END IF
+ MdlBootMngr.GENERATE_LILO_HEADER()
+ MdlBootMngr.GENERATE_LILO_OS_LIST()
+ ' after that's done, we need to run lilo. The config file has already
been saved to /mnt/target/etc/lilo.conf
+ IF Exist(ClsGlobal.sTargetPath &/ "etc" &/ "lilo.conf") THEN
+ MdlBootMngr.SETUP_LILO_BOOT_MANAGER()
+ PRINT " \\ --> Lilo boot manager installed successfully."
+ ELSE
+ DEBUG ClsGlobal.sTargetPath &/ "etc/lilo.conf not found...cannot
install lilo."
+ RETURN
+ END IF
+
END
PUBLIC SUB StartUp()
@@ -379,6 +394,8 @@
DIM sKernel, sInitrd, sAppendLine AS String
DIM sBootargs AS String
+ SHELL "/bin/os-prober > /tmp/os.lst"
+
sOsList = Split(Trim(File.Load("/tmp/os.lst")), gb.NewLine)
FOR i = 0 TO sOsList.Max
TsOsList.Index = TsOsList.Count - 1
@@ -398,7 +415,7 @@
IF sType LIKE "linux" THEN
' this function will return an array separated by "," in this
order
' /path/to/kernel, /path/to/initrd, appendline here
-
+ SHELL "/bin/linux-boot-prober " & sRoot & "
>/tmp/bootargs.lst" WAIT ' we need to hunt these arguments for every OS
found
sBootargs = MdlBootMngr.Get_OS_Boot_Params(sRoot)
IF NOT (sBootargs) THEN
@@ -553,6 +570,16 @@
cbDefBoot.Tag = tb.Text
END IF
NEXT
+ IF LAST.value = FALSE THEN
+ FOR EACH tb IN objNames
+ IF tb.Tag = LAST.tag THEN
+ IF cbDefBoot.Tag = tb.Text THEN
+ cbDefBoot.Tag = ""
+ END IF
+ END IF
+ NEXT
+ END IF
+
@@ -561,9 +588,7 @@
PUBLIC SUB TLoSlIST_MouseDown()
- IF MdlBootMngr.CHECK_LILO_VALUES() > 0 THEN RETURN
- MdlBootMngr.GENERATE_LILO_HEADER()
- MdlBootMngr.GENERATE_LILO_OS_LIST()
+
END
PUBLIC SUB OsNameBox_KeyRelease()
@@ -579,3 +604,9 @@
END
+
+PUBLIC SUB Timer1_Timer()
+
+ ClsGlobal.fRunningMainForm.btnext.enabled =
MdlBootMngr.CHECK_LILO_VALUES(TRUE) < 1
+
+END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Fri May 1 13:34:06 2009
@@ -110,6 +110,10 @@
}
}
}
+ { Timer1 #Timer
+ #X = 608
+ #Y = 208
+ }
{ HBox5 HBox
MoveScaled(1,27,58,3.5)
Expand = True
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Fri May 1 13:34:06 2009
@@ -430,6 +430,55 @@
END
+PUBLIC SUB SETUP_LILO_BOOT_MANAGER()
+
+ DIM cbx AS CheckBox
+ DIM cb AS ComboBox
+ DIM tl AS TextLabel
+ DIM sKernel, sInitrd, sArch AS String
+
+ ' find kernels and initrds, copy them to /boot on the target dir
+ ' can't use /boot/tamu anymore... all has to go into /boot
+ FOR EACH cbx IN Conf0.objMenuObjects
+ IF cbx.Value = TRUE THEN
+ FOR EACH tl IN Conf0.objKernels
+ IF cbx.Tag = tl.Name THEN sKernel = tl.Tag
+ NEXT
+ FOR EACH cb IN Conf0.objinitrds
+ IF cb.tag = tl.Name THEN sInitrd = cb.Text
+
+ NEXT
+
+ ' now that we got kernel and initrd, copy them over
+ IF sKernel AND IF sInitrd THEN
+ SHELL "cp " & sKernel & Space(1) & ClsGlobal.sTargetPath &/ "boot"
+ SHELL "cp " & sInitrd & Space(1) & ClsGlobal.sTargetPath &/ "boot"
+ END IF
+
+ NEXT
+
+ ' determine wether we need to update modules
+ EXEC ["uname", "-r"] TO sArch
+ IF Exist("/lib" &/ "modules" &/ Trim(sArch)) = FALSE THEN ' hosted
install detected
+ EXEC ["mkdir", "-p", "/lib" &/ "modules" &/ Trim(sArch)] WAIT
+ SHELL "mount -o bind " & ClsGlobal.sTargetPath &/ "lib/modules" &/
Trim(sArch) & Space(1) & "/lib/modules" &/ Trim(sarch) & " && depmod -aq"
WAIT
+ END IF
+
+
+ ' now that kernels have been copied, I need to run lilo
+ ' Bind mount the target /tmp and sys dirs now
+ ' See PUBLIC SUB_PERFORM_BINDING on iVL branch
+ EXEC ["mount", "-o", "bind", "/sys", ClsGlobal.sTargetPath &/ "sys"] WAIT
+ EXEC ["mount", "-o", "bind", "/proc", ClsGlobal.sTargetPath &/ "proc"]
WAIT
+ EXEC ["mount", "-o", "bind", "/tmp", ClsGlobal.sTargetPath &/ "tmp"] WAIT
+ EXEC ["mount", "-o", "bind", "/dev", ClsGlobal.sTargetPath &/ "dev"] WAIT
+
+ ' now, we need to run the lilo command itself
+ SHELL "chroot " & ClsGlobal.sTargetPath & " && /sbin/depmod -aq &&
lilo " WAIT
+
+END
+
+
PUBLIC SUB GENERATE_LILO_OS_LIST()
DIM ckb AS CheckBox
@@ -477,7 +526,10 @@
'load the header
sHeader = File.Load(Temp("lilo.in"))
sFullFile = sHeader & sBody
- Message(sFullFile)
+ 'Message(sFullFile)
+ IF Exist(ClsGlobal.sTargetPath &/ "etc/lilo.conf") THEN MOVE
ClsGlobal.sTargetPath &/ "etc/lilo.conf" TO ClsGlobal.sTargetPath
&/ "etc/lilo.old"
+
+ File.Save(ClsGlobal.sTargetPath &/ "etc/lilo.conf", Trim(sFullFile))
END
@@ -575,7 +627,7 @@
END
-PUBLIC FUNCTION CHECK_LILO_VALUES() AS Integer
+PUBLIC FUNCTION CHECK_LILO_VALUES(bquiet AS Boolean) AS Integer
' will return 0 for clear
' 1 for error
@@ -583,21 +635,23 @@
DIM cb AS CheckBox
DIM sTag AS String = Conf0.TsOsList.Current.Text
IF NOT (Conf0.cbDefBoot.tag) THEN
+ IF bquiet = FALSE THEN
Message.Error(("You must select one operating system to be started
by default"))
+ END IF
FOR EACH cb IN Conf0.objDefOs
IF cb.Tag = sTag THEN
- Balloon.Error(("Check this box to make this your default
operating system, or select another tab."), cb, cb.Left + 24)
+ IF bquiet = FALSE THEN Balloon.Error(("Check this box to make
this your default operating system, or select another tab."), cb, cb.Left +
24)
END IF
NEXT
RETURN 1
END IF
FOR EACH tb IN Conf0.objNames
FOR EACH tb1 IN Conf0.objNames
- IF tb.Text = tb1.Text THEN
- Message.Error(("Found duplicate operating system names. Please use
unique labels for each menu entry"))
+ IF tb <> tb1 AND IF tb.Text = tb1.Text THEN
+ IF bquiet = FALSE THEN Message.Error(("Found duplicate operating
system names. Please use unique labels for each menu entry"))
FOR EACH tb2 IN Conf0.objNames
IF tb2.Tag = sTag THEN
- Balloon.Error(("Check these boxes to make sure they have
unique names"), tb2, tb2.Left + 24)
+ IF bquiet = FALSE THEN Balloon.Error(("Check these boxes to
make sure they have unique names"), tb2, tb2.Left + 24)
END IF
NEXT
RETURN 1
|
|
From: <cod...@go...> - 2009-04-30 21:28:29
|
Author: M0...@gm...
Date: Thu Apr 30 14:27:20 2009
New Revision: 540
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
Log:
- Wrote code to generate lilo.conf from the results of os-prober.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Apr 30 14:27:20 2009
@@ -14,138 +14,142 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:51
+#: Conf0.class:54
msgid "Installation found in"
msgstr ""
-#: Conf0.class:69
+#: Conf0.class:72
msgid "Include in boot menu"
msgstr ""
-#: Conf0.class:89
+#: Conf0.class:92
msgid "Name"
msgstr ""
-#: Conf0.class:107
+#: Conf0.class:110
msgid "Initial RAM disk image"
msgstr ""
-#: Conf0.class:130
+#: Conf0.class:133
msgid "Kernel boot options"
msgstr ""
-#: Conf0.class:156
+#: Conf0.class:159
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:222 MdlBootMngr.module:373
+#: Conf0.class:225 MdlBootMngr.module:373
msgid "Standard"
msgstr ""
-#: Conf0.class:222
+#: Conf0.class:225
msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:222 MdlBootMngr.module:377
+#: Conf0.class:225 MdlBootMngr.module:377
msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:222 MdlBootMngr.module:379
+#: Conf0.class:225 MdlBootMngr.module:379
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:336 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:400
+#: Conf0.class:406
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:407
+#: Conf0.class:413
msgid "Offer"
msgstr ""
-#: Conf0.class:407
+#: Conf0.class:413
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:441
+#: Conf0.class:449
msgid "Title"
msgstr ""
-#: Conf0.class:462
+#: Conf0.class:471
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:514
+#: Conf0.class:527
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:567
+#: Conf0.class:536
+msgid "Boot this operating system by default"
+msgstr ""
+
+#: Conf0.class:628
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:583
+#: Conf0.class:644
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:592
+#: Conf0.class:653
msgid "LILO"
msgstr ""
-#: Conf0.class:598
+#: Conf0.class:660
msgid "GRUB"
msgstr ""
-#: Conf0.class:604
+#: Conf0.class:666
msgid "NONE"
msgstr ""
-#: Conf0.class:613
+#: Conf0.class:675
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:623
+#: Conf0.class:685
msgid "Target"
msgstr ""
-#: Conf0.class:635
+#: Conf0.class:697
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:654
+#: Conf0.class:716
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:665
+#: Conf0.class:727
msgid "Seconds"
msgstr ""
-#: Conf0.class:671
+#: Conf0.class:734
msgid "Boot Default"
msgstr ""
-#: Conf0.class:690
+#: Conf0.class:754
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:706
+#: Conf0.class:770
msgid "Tab 0"
msgstr ""
@@ -556,12 +560,32 @@
msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:445
+#: MdlBootMngr.module:497
msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:453
+#: MdlBootMngr.module:505
msgid "Bootsector of"
+msgstr ""
+
+#: MdlBootMngr.module:586
+msgid "You must select one operating system to be started by default"
+msgstr ""
+
+#: MdlBootMngr.module:589
+msgid ""
+"Check this box to make this your default operating system, or select
another "
+"tab."
+msgstr ""
+
+#: MdlBootMngr.module:597
+msgid ""
+"Found duplicate operating system names. Please use unique labels for
each "
+"menu entry"
+msgstr ""
+
+#: MdlBootMngr.module:600
+msgid "Check these boxes to make sure they have unique names"
msgstr ""
#: MdlMain.module:35
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Thu Apr 30 14:27:20 2009
@@ -14,135 +14,139 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:51
+#: Conf0.class:54
msgid "Installation found in"
msgstr ""
-#: Conf0.class:69
+#: Conf0.class:72
msgid "Include in boot menu"
msgstr ""
-#: Conf0.class:89
+#: Conf0.class:92
msgid "Name"
msgstr ""
-#: Conf0.class:107
+#: Conf0.class:110
msgid "Initial RAM disk image"
msgstr ""
-#: Conf0.class:130
+#: Conf0.class:133
msgid "Kernel boot options"
msgstr ""
-#: Conf0.class:156
+#: Conf0.class:159
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:222
+#: Conf0.class:225
msgid "Standard"
msgstr ""
-#: Conf0.class:222
+#: Conf0.class:225
msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:222
+#: Conf0.class:225
msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:222
+#: Conf0.class:225
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "WARNING:"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:400
+#: Conf0.class:406
msgid "Unable to find boot arguments for OS in"
msgstr ""
-#: Conf0.class:407
+#: Conf0.class:413
msgid "Offer"
msgstr ""
-#: Conf0.class:407
+#: Conf0.class:413
msgid "as a bootable choice"
msgstr ""
-#: Conf0.class:441
+#: Conf0.class:449
msgid "Title"
msgstr ""
-#: Conf0.class:462
+#: Conf0.class:471
msgid "Initial RAM Disk"
msgstr ""
-#: Conf0.class:514
+#: Conf0.class:527
msgid "Include this Operating System in boot menu"
msgstr ""
-#: Conf0.class:567
+#: Conf0.class:536
+msgid "Boot this operating system by default"
+msgstr ""
+
+#: Conf0.class:628
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:583
+#: Conf0.class:644
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:592
+#: Conf0.class:653
msgid "LILO"
msgstr ""
-#: Conf0.class:598
+#: Conf0.class:660
msgid "GRUB"
msgstr ""
-#: Conf0.class:604
+#: Conf0.class:666
msgid "NONE"
msgstr ""
-#: Conf0.class:613
+#: Conf0.class:675
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:623
+#: Conf0.class:685
msgid "Target"
msgstr ""
-#: Conf0.class:635
+#: Conf0.class:697
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:654
+#: Conf0.class:716
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:665
+#: Conf0.class:727
msgid "Seconds"
msgstr ""
-#: Conf0.class:671
+#: Conf0.class:734
msgid "Boot Default"
msgstr ""
-#: Conf0.class:690
+#: Conf0.class:754
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:706
+#: Conf0.class:770
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Thu Apr 30 14:27:20 2009
@@ -46,11 +46,27 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: MdlBootMngr.module:445
+#: MdlBootMngr.module:497
msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:453
+#: MdlBootMngr.module:505
msgid "Bootsector of"
+msgstr ""
+
+#: MdlBootMngr.module:586
+msgid "You must select one operating system to be started by default"
+msgstr ""
+
+#: MdlBootMngr.module:589
+msgid "Check this box to make this your default operating system, or
select another tab."
+msgstr ""
+
+#: MdlBootMngr.module:597
+msgid "Found duplicate operating system names. Please use unique labels
for each menu entry"
+msgstr ""
+
+#: MdlBootMngr.module:600
+msgid "Check these boxes to make sure they have unique names"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Thu Apr 30 14:27:20 2009
@@ -15,10 +15,13 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'=====================================================================================
-PRIVATE objinitrds AS NEW Object[]
-PRIVATE objChecks AS NEW Object[]
-PRIVATE objappends AS NEW Object[]
-PRIVATE objNames AS NEW Object[]
+PUBLIC objinitrds AS NEW Object[]
+PUBLIC objChecks AS NEW Object[]
+PUBLIC objappends AS NEW Object[]
+PUBLIC objNames AS NEW Object[]
+PUBLIC objDefOs AS NEW Object[]
+PUBLIC objMenuObjects AS NEW Object[]
+PUBLIC objKernels AS NEW Object[]
PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
@@ -226,6 +229,7 @@
'ME.List_Other_Linuxes(ME.TsOsList)
'ME.Update_Default_boot_choices()
MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
+ ME.PROBE_SYSTEM_FOR_OS("lilo")
END
@@ -363,6 +367,7 @@
NEXT
TsOsList.Count = 1
ME.PROBE_SYSTEM_FOR_OS(LCase(LAST.text))
+
END
@@ -376,6 +381,7 @@
sOsList = Split(Trim(File.Load("/tmp/os.lst")), gb.NewLine)
FOR i = 0 TO sOsList.Max
+ TsOsList.Index = TsOsList.Count - 1
sOsLine = Split(Trim(sOsList[i]), ":")
sType = Trim(sOsLine[3])
sLongDesc = Trim(sOsLine[1])
@@ -407,15 +413,17 @@
PRINT ("Offer") & Space(1) & sTitle & Space(1) & ("as a
bootable choice")
PRINT " --\\ Kernel=" & sKernel
PRINT " --\\ Initrd=" & sInitrd
+ PRINT " --\\ Root=" & sRoot
'print " --\ Options=" &
TsOsList.Current.Text = sRoot
Populate_linux_tab(sRoot, sTitle, sKernel, sInitrd,
sAppendLine, sBootManager)
+ INC TsOsList.Count
END IF
END IF
NEXT
-
+ DEC TsOsList.Count ' remove trailing empty tab
END
PUBLIC SUB Populate_linux_tab($OsRoot AS String, $Title AS String, $kernel
AS String, $initrd AS String, $appendline AS String, sBootLoader AS String)
@@ -456,6 +464,7 @@
.MaxLength = 64
END IF
END WITH
+ objNames.Add($tb)
$tl = NEW TextLabel($cont) '---------------------------- initrd label
-------------
WITH $tl
.Height = 28
@@ -473,19 +482,22 @@
.Expand = FALSE
.Width = 200
END WITH
-
+ objinitrds.Add($cb)
$cont = NEW HBox(TsOsList) ' --------------------------- new container
(hbox) ----------
$cont.Height = 28
$cont.Expand = TRUE
- $tl = NEW TextLabel($cont) ' ------------------------ append label
----------------------
+ $tl = NEW TextLabel($cont) ' ------------------------ append label
(holds the kernel path (hidden))----------------------
WITH $tl
.Text = ("Kernel boot options")
.Width = 150
.Height = 28
+ .Name = $OsRoot
.Expand = FALSE
+ .Tag = $kernel ' set the kernel path here..
.Alignment = Align.Left
END WITH
+ objKernels.Add($tl)
$tb = NEW TextBox($cont)
WITH $tb
.Height = 28
@@ -504,6 +516,7 @@
.Expand = TRUE
END WITH
+ objappends.Add($tb)
$chk = NEW CheckBox(TsOsList) AS "IncludeOs"
WITH $chk
@@ -513,8 +526,56 @@
.Tag = $OsRoot
.Text = ("Include this Operating System in boot menu")
END WITH
+ objMenuObjects.Add($chk) ' Add to array of bootable OS's
+ $chk = NEW CheckBox(TsOsList) AS "DefOS"
+ WITH $chk
+ .Expand = TRUE
+ .Value = FALSE
+ .Height = 28
+ .Tag = $OsRoot
+ .Text = ("Boot this operating system by default")
+ END WITH
+ objDefOs.Add($chk)
+
+END
+
+PUBLIC SUB DefOS_Click()
+
+ DIM cb AS CheckBox
+ DIM tb AS TextBox
+ FOR EACH cb IN objDefOs
+ IF cb <> LAST THEN cb.Value = FALSE
+ NEXT
+ FOR EACH tb IN objNames
+ IF tb.Tag = LAST.tag THEN
+ cbDefBoot.Tag = tb.Text
+ END IF
+ NEXT
+
+
+
+END
+
+
+PUBLIC SUB TLoSlIST_MouseDown()
+
+ IF MdlBootMngr.CHECK_LILO_VALUES() > 0 THEN RETURN
+ MdlBootMngr.GENERATE_LILO_HEADER()
+ MdlBootMngr.GENERATE_LILO_OS_LIST()
+
+END
+PUBLIC SUB OsNameBox_KeyRelease()
+
+ DIM cb AS CheckBox
+ FOR EACH cb IN objDefOs
+ IF cb.Value = TRUE THEN
+ IF cb.Tag = LAST.tag THEN ' we are modifying the default OS value
+ cbDefBoot.Tag = LAST.text
+ END IF
+ END IF
+ NEXT
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Thu Apr 30 14:27:20 2009
@@ -35,6 +35,7 @@
}
{ rbGrub RadioButton
MoveScaled(16,1,14,3.5)
+ Enabled = False
Expand = True
Text = ("GRUB")
}
@@ -85,7 +86,7 @@
MoveScaled(1,0,16,3.5)
Text = ("Prompt Time Out")
}
- { SpinBox1 SpinBox
+ { sbTimeOut SpinBox
MoveScaled(18,0,6,3.5)
Value = 5
}
@@ -97,11 +98,13 @@
}
{ TextLabel4 TextLabel
MoveScaled(38,0,15,3.5)
+ Visible = False
Text = ("Boot Default")
Alignment = Align.Right
}
{ cbDefBoot ComboBox
MoveScaled(56,0,25,3.5)
+ Visible = False
Text = ("")
ReadOnly = True
}
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Thu Apr 30 14:27:20 2009
@@ -359,7 +359,7 @@
DIM sTarget, sVidMod, sDefBoot, sVGA, sVidImput, sVidText, sOutput AS
String
DIM iTimeOut AS Integer
- sTarget = Trim(Conf0.cbLiloTarget.Text)
+ sTarget = Trim(Conf0.cbTarget.Text)
IF InStr(sTarget, ("MBR Of")) THEN
sTarget = Right(sTarget, Len(sTarget) - InStr(sTarget, "/") + 1)
ELSE IF sTarget = ("Bootsector Of") & Space(1) & ClsGlobal.sRoot THEN
@@ -405,7 +405,7 @@
"# Begin listing OS Choices \n"
-
+ sDefBoot = Conf0.cbDefBoot.Tag
iTimeOut = Conf0.SbTimeOut.Value * 10
sOutput = "# LILO Configuration File \n" &
@@ -421,7 +421,7 @@
"change-rules \n" &
"reset \n" &
"bitmap = /boot/bitmap/boot.bmp \n" &
- "#\n#\n#\n" &
+ "#\n\n" &
sVidText
File.Save(Temp("lilo.in"), sOutput)
@@ -430,6 +430,58 @@
END
+PUBLIC SUB GENERATE_LILO_OS_LIST()
+
+ DIM ckb AS CheckBox
+ DIM cb AS ComboBox
+ DIM tb AS TextBox
+ DIM tl AS TextLabel
+ DIM sTitle, sRoot, sInitrd, sKernel, sAppend AS String
+ DIM sBody AS String
+ DIM sHeader, sFullFile AS String
+
+ FOR EACH ckb IN Conf0.objMenuObjects
+ IF ckb.Value = TRUE THEN
+ sRoot = ckb.Tag
+ FOR EACH tb IN Conf0.objNames
+ IF tb.Tag = ckb.Tag THEN sTitle = tb.Text
+ NEXT
+ ' get the initrd
+ FOR EACH cb IN Conf0.objinitrds
+ IF cb.Tag = sRoot THEN sInitrd = Trim(cb.Text)
+ NEXT
+ ' get the append line
+ FOR EACH tb IN Conf0.objappends
+ IF tb.tag = sRoot THEN sAppend = tb.Text
+ NEXT
+ FOR EACH tl IN Conf0.objKernels
+ IF tl.Name = sRoot THEN sKernel = tl.Tag
+ NEXT
+ sBody = sBody & gb.NewLine &
+ "# Menu entry for " & sTitle & "\n" &
+ "image = " & Trim(sKernel) & "\n" &
+ "root = " & sRoot & "\n" &
+ "label = " & sTitle & "\n" &
+ "append = \"" & sAppend & "\"\n" &
+ "read-only \n"
+ 'IF sBody THEN Message(Trim(sBody))
+ END IF
+
+ ' Reset these variables for future use
+ sKernel = ""
+ sRoot = ""
+ sTitle = ""
+ sAppend = ""
+ NEXT
+ 'IF sBody THEN Message(sBody)
+ 'load the header
+ sHeader = File.Load(Temp("lilo.in"))
+ sFullFile = sHeader & sBody
+ Message(sFullFile)
+END
+
+
+
PUBLIC SUB Display_Bootmanager_Target_Options(objCB AS ComboBox)
DIM sList, sTarget, sDump AS String
@@ -521,10 +573,38 @@
RETURN $kern & "," & $initrd & "," & $append
-
+END
+
+PUBLIC FUNCTION CHECK_LILO_VALUES() AS Integer
+ ' will return 0 for clear
+ ' 1 for error
+ DIM tb, tb1, tb2 AS TextBox
+ DIM cb AS CheckBox
+ DIM sTag AS String = Conf0.TsOsList.Current.Text
+ IF NOT (Conf0.cbDefBoot.tag) THEN
+ Message.Error(("You must select one operating system to be started
by default"))
+ FOR EACH cb IN Conf0.objDefOs
+ IF cb.Tag = sTag THEN
+ Balloon.Error(("Check this box to make this your default
operating system, or select another tab."), cb, cb.Left + 24)
+ END IF
+ NEXT
+ RETURN 1
+ END IF
+ FOR EACH tb IN Conf0.objNames
+ FOR EACH tb1 IN Conf0.objNames
+ IF tb.Text = tb1.Text THEN
+ Message.Error(("Found duplicate operating system names. Please use
unique labels for each menu entry"))
+ FOR EACH tb2 IN Conf0.objNames
+ IF tb2.Tag = sTag THEN
+ Balloon.Error(("Check these boxes to make sure they have
unique names"), tb2, tb2.Left + 24)
+ END IF
+ NEXT
+ RETURN 1
+ END IF
+ NEXT
+ NEXT
END
-
|
|
From: <cod...@go...> - 2009-04-24 21:46:36
|
Author: M0...@gm...
Date: Fri Apr 24 13:52:36 2009
New Revision: 538
Modified:
branches/speedy/Conf0.class
branches/speedy/Conf1.class
branches/speedy/Conf2.class
branches/speedy/Conf3.class
branches/speedy/Conf3a.class
branches/speedy/Conf4.class
branches/speedy/Conf4.form
branches/speedy/Conf5.class
branches/speedy/Conf5.form
branches/speedy/MdlBootMngr.module
branches/speedy/MdlStartUp.module
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step6.class
Log:
- Began implementing new OS detection method on boot manager
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Fri Apr 24 13:52:36 2009
@@ -223,8 +223,8 @@
.TLoSlIST.Text = "<b>" & UCase(.TLoSlIST.Text) & "</b>"
END WITH
'ME.Fake_Names()
- ME.List_Other_Linuxes(ME.TsOsList)
- ME.Update_Default_boot_choices()
+ 'ME.List_Other_Linuxes(ME.TsOsList)
+ 'ME.Update_Default_boot_choices()
MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
@@ -232,10 +232,6 @@
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step5"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step4"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step6"].picture = MdlStartUp.pNow
-
RETURN "Conf1"
END
@@ -340,13 +336,185 @@
END
PUBLIC SUB rbGrub_Click()
-
+ DIM i AS Integer
+ DIM $ob AS Object
+
ME.Toggle_window_controls(TRUE)
+ FOR i = 0 TO TsOsList.Count - 1
+ FOR EACH $ob IN TsOsList[i].Children
+ $ob.Delete
+ NEXT
+ TRY TsOsList[i].Delete
+ NEXT
+ TsOsList.Count = 1
+ ME.PROBE_SYSTEM_FOR_OS(LCase(LAST.text))
END
PUBLIC SUB rbLilo_Click()
-
+ DIM i AS Integer
+ DIM $ob AS Object
ME.Toggle_window_controls(TRUE)
+ FOR i = 0 TO TsOsList.Count - 1
+ FOR EACH $ob IN TsOsList[i].Children
+ $ob.Delete
+ NEXT
+ TRY TsOsList[i].Delete
+ NEXT
+ TsOsList.Count = 1
+ ME.PROBE_SYSTEM_FOR_OS(LCase(LAST.text))
+
+END
+PUBLIC SUB PROBE_SYSTEM_FOR_OS(sBootManager AS String)
+
+ DIM sDump, sOs, sRoot, sLongDesc, sType, sTitle AS String
+ DIM i AS Integer
+ DIM sOsList, sOsLine, sBootLine, sDumparr AS String[]
+ DIM sKernel, sInitrd, sAppendLine AS String
+ DIM sBootargs AS String
+
+ sOsList = Split(Trim(File.Load("/tmp/os.lst")), gb.NewLine)
+ FOR i = 0 TO sOsList.Max
+ sOsLine = Split(Trim(sOsList[i]), ":")
+ sType = Trim(sOsLine[3])
+ sLongDesc = Trim(sOsLine[1])
+ sOs = Trim(sOsLine[2])
+ sRoot = Trim(sOsLine[0])
+ IF sBootManager LIKE "lilo" THEN
+ sTitle = sOs
+ ELSE
+ sTitle = sLongDesc
+ END IF
+
+ ' Message(sLongDesc & " was found in " & sRoot)
+ ' -= NOW I NEED TO GET THE KERNEL, INITRD AND APPEND LINES FOR
THIS OS. =-
+ IF sType LIKE "linux" THEN
+ ' this function will return an array separated by "," in this
order
+ ' /path/to/kernel, /path/to/initrd, appendline here
+
+ sBootargs = MdlBootMngr.Get_OS_Boot_Params(sRoot)
+
+ IF NOT (sBootargs) THEN
+ '= CAN NOT FIND BOOT ARGUMENTS FOR THIS OS ='
+ PRINT ("Unable to find boot arguments for OS in") &
Space(1) & sRoot
+ RETURN
+ ELSE
+ sBootLine = Split(sbootargs, ",")
+ sKernel = sBootLine[0]
+ sInitrd = sBootLine[1]
+ sAppendLine = sBootLine[2]
+ PRINT ("Offer") & Space(1) & sTitle & Space(1) & ("as a
bootable choice")
+ PRINT " --\\ Kernel=" & sKernel
+ PRINT " --\\ Initrd=" & sInitrd
+ 'print " --\ Options=" &
+ TsOsList.Current.Text = sRoot
+ Populate_linux_tab(sRoot, sTitle, sKernel, sInitrd,
sAppendLine, sBootManager)
+ END IF
+
+ END IF
+
+ NEXT
+
END
+
+PUBLIC SUB Populate_linux_tab($OsRoot AS String, $Title AS String, $kernel
AS String, $initrd AS String, $appendline AS String, sBootLoader AS String)
+
+ DIM $tb AS TextBox
+ DIM $tl AS textlabel
+ DIM $cb AS ComboBox
+ DIM $cont AS HBox
+ DIM $chk AS CheckBox
+
+
+ $cont = NEW HBox(ME.TsOsList)
+ $cont.Height = 12
+ $cont.Expand = TRUE
+ $cont = NEW HBox(ME.TsOsList)
+ $cont.Height = 28
+ $cont.Expand = TRUE
+ $cont.Spacing = 4
+ $cont.Padding = 2
+
+ $tl = NEW TextLabel($cont)
+ WITH $tl
+ .text = ("Title") '--------------- title label -----------
+ .Expand = FALSE
+ .height = 28
+ .Width = 64
+ .Alignment = Align.Left
+ END WITH
+ $tb = NEW TextBox($cont) AS "OsNameBox" ' ------------ Title text box
------------
+ WITH $tb
+ .Height = 28
+ .Tag = $OsRoot
+ .Expand = TRUE
+ .Text = $Title
+ IF sBootLoader LIKE "lilo" THEN
+ .MaxLength = 15
+ ELSE
+ .MaxLength = 64
+ END IF
+ END WITH
+ $tl = NEW TextLabel($cont) '---------------------------- initrd label
-------------
+ WITH $tl
+ .Height = 28
+ .Text = ("Initial RAM Disk")
+ .Alignment = Align.Left
+ .Width = 100
+ .Expand = FALSE
+ END WITH
+ $cb = NEW ComboBox($cont) '-------------------------- initrd combobox
--------------
+ WITH $cb
+ .ReadOnly = TRUE
+ .Tag = $OsRoot
+ .List = [$initrd]
+ .Height = 28
+ .Expand = FALSE
+ .Width = 200
+ END WITH
+
+ $cont = NEW HBox(TsOsList) ' --------------------------- new container
(hbox) ----------
+ $cont.Height = 28
+ $cont.Expand = TRUE
+
+ $tl = NEW TextLabel($cont) ' ------------------------ append label
----------------------
+ WITH $tl
+ .Text = ("Kernel boot options")
+ .Width = 150
+ .Height = 28
+ .Expand = FALSE
+ .Alignment = Align.Left
+ END WITH
+ $tb = NEW TextBox($cont)
+ WITH $tb
+ .Height = 28
+ .Tag = $OsRoot
+ IF InStr($AppendLine, "append") THEN
+ .Text = Right($appendline, Len($appendline) - Len("append"))
+
+ ELSE
+ .Text = $appendline
+ END IF
+ .Text = Trim(Replace(.Text, "\"", ""))
+ IF Left(Trim(.Text)) = "=" THEN
+ .Text = Right(.Text, Len(.Text) - 1)
+ END IF
+ .Text = Trim(.Text)
+
+ .Expand = TRUE
+ END WITH
+
+ $chk = NEW CheckBox(TsOsList) AS "IncludeOs"
+ WITH $chk
+ .Expand = TRUE
+ .Value = TRUE
+ .Height = 28
+ .Tag = $OsRoot
+ .Text = ("Include this Operating System in boot menu")
+ END WITH
+
+
+
+END
+
Modified: branches/speedy/Conf1.class
==============================================================================
--- branches/speedy/Conf1.class (original)
+++ branches/speedy/Conf1.class Fri Apr 24 13:52:36 2009
@@ -23,14 +23,10 @@
' default the time zone to us/central
ME.lbTmZone[ME.lbTmZone.Find("US/Central")].Selected = TRUE
-
END
PUBLIC FUNCTION GetNext() AS String
-
- ClsGlobal.fRunningMainForm.listview1["Step6"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step7"].picture = MdlStartUp.pNow
RETURN "Conf2"
Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class (original)
+++ branches/speedy/Conf2.class Fri Apr 24 13:52:36 2009
@@ -34,8 +34,6 @@
END
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step7"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step8"].picture = MdlStartUp.pNow
RETURN "Conf3"
Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class (original)
+++ branches/speedy/Conf3.class Fri Apr 24 13:52:36 2009
@@ -50,7 +50,7 @@
END WITH
WAIT 0.1
Button1.Enabled = ME.check_for_impartable_accounts()
- ClsGlobal.fRunningMainForm.btnext.Enabled = TRUE
+ 'MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
END
PUBLIC FUNCTION GetNext() AS String
@@ -71,7 +71,6 @@
obj.delete
NEXT
MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
- ClsGlobal.fRunningMainForm.btnext.Enabled = TRUE
END
@@ -160,7 +159,9 @@
'-== Make sure we have valid entries before trying to create a user
account ==-
IF Check_Text_Entry() = FALSE THEN
IF MdlMain.CHECK_EXISTING_USER(Trim(ME.txtLogin.Text)) = FALSE THEN
- MdlMain.CREATE_NEW_USER_ACCOUNT(Trim(txtLogin.Text),
Trim(txtRealName.Text), btPicSel.Picture, Trim(txtPass2.Text)) ' create new
account
+ IF MdlMain.CREATE_NEW_USER_ACCOUNT(Trim(txtLogin.Text),
Trim(txtRealName.Text), btPicSel.Picture, Trim(txtPass2.Text)) > 0 THEN '
create new account while checking for errors
+ Message.Error(("Unable to successfully create user account. Please
run VasmCC after installation is done."))
+ END IF
ELSE ' user exists
Message.Error(("User") & Space(1) & "\"" & Trim(ME.txtLogin.Text)
& "\"" & Space(1) & ("already exists in the system.") & "<br>" &
("Please select another user login name"))
Modified: branches/speedy/Conf3a.class
==============================================================================
--- branches/speedy/Conf3a.class (original)
+++ branches/speedy/Conf3a.class Fri Apr 24 13:52:36 2009
@@ -173,7 +173,11 @@
END IF
NEXT
sList = Trim(sList)
-
+ ' IF sList THEN
+ ' Message(sList)
+ ' ELSE
+ ' Message("No settings to reset")
+ ' END IF
END
Modified: branches/speedy/Conf4.class
==============================================================================
--- branches/speedy/Conf4.class (original)
+++ branches/speedy/Conf4.class Fri Apr 24 13:52:36 2009
@@ -13,22 +13,16 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
-'
-' ================ network setup window ========
+
+'-= network configuration window =-
PUBLIC SUB Form_Open()
- WITH ME
- .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
- END WITH
+
END
-
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step8"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pNow
-
RETURN "Conf5"
END
@@ -42,5 +36,3 @@
END
-
-
Modified: branches/speedy/Conf4.form
==============================================================================
--- branches/speedy/Conf4.form (original)
+++ branches/speedy/Conf4.form Fri Apr 24 13:52:36 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,83,54)
+ MoveScaled(0,0,89,48)
Text = ("")
Arrangement = Arrange.Row
{ HPanel1 HPanel
@@ -10,11 +10,45 @@
{ tlbanner TextLabel
MoveScaled(12,0,33,3)
Expand = True
- Text = ("Network Settings")
+ Text = ("Network Configuration")
}
{ Separator1 Separator
MoveScaled(13,4,25,1)
Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,6,1)
+ Expand = True
+ }
+ { HBox2 HBox
+ MoveScaled(0,7,88,3.5)
+ Expand = True
+ Spacing = 4
+ Padding = 2
+ { TextLabel1 TextLabel
+ MoveScaled(1,0,18.75,3.5)
+ Text = ("Computer Name")
+ Alignment = Align.Left
+ }
+ { txtHostname TextBox
+ MoveScaled(20,0,25,3.5)
+ Text = ("VLocity")
+ }
+ }
+ { HBox4 HBox
+ MoveScaled(0,10,53,3.5)
+ Expand = True
+ Spacing = 4
+ Padding = 2
+ { TextLabel2 TextLabel
+ MoveScaled(1,0,18.75,3.5)
+ Text = ("Domain")
+ Alignment = Align.Left
+ }
+ { txtDomain TextBox
+ MoveScaled(24,0,25,3.5)
+ Text = ("Linux.net")
}
}
}
Modified: branches/speedy/Conf5.class
==============================================================================
--- branches/speedy/Conf5.class (original)
+++ branches/speedy/Conf5.class Fri Apr 24 13:52:36 2009
@@ -1,4 +1,5 @@
' Gambas class file
+
' This file is part of vinstall-ng
' vinstall-ng is free software: you can redistribute it and/or modify
@@ -13,23 +14,57 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+'
+'-= system services window =-
-' ==================== services configuration settings =================
-PRIVATE picStatus AS Picture
PUBLIC SUB Form_Open()
- WITH ME
- .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
- END WITH
- ME.Prepare_Grid()
- ME.lIST_SERVICES()
+ ME.prepare_grid()
+ ME.LIST_AVAILABLE_SERVICES()
+END
+PUBLIC SUB prepare_grid()
+
+ ME.svServiceList.Columns.count = 4
+ ME.svServiceList.Rows.Count = 3
+ ME.svServiceList.Columns[0].Width = 24
+ ME.svServiceList.Columns[1].Width = 32
+ ME.svServiceList.Columns[2].Width = 200
+ ME.svServiceList.Rows[1].Height = 12
+ ME.svServiceList[0, 2].Text = ("Service")
+ ME.svServiceList[0, 3].Text = ("Description")
+ ME.svServiceList[0, 2].Alignment = Align.Center
+ ME.svServiceList[0, 3].Alignment = Align.Center
+ ME.svServiceList[0, 2].Font.Bold = TRUE
+ ME.svServiceList[0, 3].Font.Bold = TRUE
+ ME.svServiceList[0, 0].BackColor = Color.SelectedBackground
+ ME.svServiceList[0, 1].BackColor = Color.SelectedBackground
+ ME.svServiceList[0, 2].BackColor = Color.SelectedBackground
+ ME.svServiceList[0, 3].BackColor = Color.SelectedBackground
+
+END
+
+PUBLIC SUB LIST_AVAILABLE_SERVICES()
+
+ DIM irow AS Integer = 2
+ DIM sFile AS String
+
+ 'FOR EACH sFile IN Dir(ClsGlobal.sTargetPath &/ "etc" &/ "rc.d"
&/ "init.d", "*", gb.File)
+ FOR EACH sFile IN Dir("/etc/rc.d/init.d", "*", gb.File)
+ svServiceList[irow, 2].Text = sFile
+ INC irow
+ INC svServiceList.Rows.Count
+ NEXT
+ DEC svServiceList.Rows.Count
+ 'Message("Done")
+
END
+
+
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
RETURN "FDone"
+
END
PUBLIC SUB StartUp()
@@ -38,160 +73,22 @@
END
PUBLIC SUB OnExit()
- ME.SAVE_SERVICES_LIST()
+
END
-PUBLIC SUB Form_Resize()
- WITH ME
- .gvSvcList.Height = .ClientH - (.gvSvcList.Top + 12)
- .gvSvcList.Columns[2].Width = .gvSvcList.Width -
(.gvSvcList.Columns[2].Left + 12)
- END WITH
+PUBLIC SUB Form_Resize()
-END
-PUBLIC SUB Prepare_Grid()
- DIM i AS Integer
WITH ME
- .gvSvcList.Rows.Count = 3
- .gvSvcList.columns.Count = 4
- .gvheader.rows.Count = 1
- .gvheader.Columns.Count = 3
- .gvheader[0, 2].Text = UCase(("Service"))
- FOR i = 0 TO gvheader.columns.Count - 1
- .gvheader[0, i].BackColor = Color.SelectedBackground
- .gvheader[0, i].Alignment = Align.Center
- NEXT
- .gvSvcList.columns[0].Width = 24
- .gvheader.Columns[0].Width = 24
- .gvSvcList.Columns[1].Width = 64
- .gvheader.Columns[1].Width = 64
- .gvSvcList.Columns[3].Width = 1
+ .svServiceList.Height = .ClientH - (.svServiceList.top + 12)
END WITH
-
-
-END
-
-PUBLIC SUB lIST_SERVICES()
-
- DIM irow AS Integer
- DIM sService, sDesc AS String
- DIM sPic AS Picture
- DIM sLogo AS Image
- DIM sSvcPath AS String = "/etc/rc.d/init.d" 'ClsGlobal.sTargetPath
&/ "etc" &/ "rc.d" &/ "init.d"
-
- picStatus = Picture.Load("images/16px-check.png")
-
- FOR EACH sService IN Dir(sSvcPath, "*", gb.File)
- SELECT CASE sService
- CASE "cron"
- sDesc = ("System task scheduler")
- sPic = picStatus
- CASE "bluetooth"
- sDesc = ("Bluetooth device manager")
- sPic = ""
- CASE "sshd"
- sDesc = ("Secure Shell remote access")
- sPic = ""
- CASE "gslaptd"
- sDesc = ("Software update notifications")
- sPic = picStatus
- CASE "wifi-radar"
- sDesc = ("Wireless network scanner")
- sPic = ""
- CASE "cups"
- sDesc = ("Printing service")
- sPic = picStatus
- CASE "fuse"
- sDesc = ("File in userspace daemon")
- sPic = ""
- CASE "inetd"
- sDesc = ("Internet Super Server")
- sPic = ""
- CASE "portmap"
- sDesc = ("RPC Port Mapper")
- sPic = ""
- CASE "samba"
- sDesc = ("Windows networking service")
- sPic = ""
- CASE "vmware"
- sDesc = ("VMWare modules")
- sPic = ""
- CASE "wicd"
- sDesc = ("Network interface manager")
- sPic = picStatus
- CASE "firewall"
- sDesc = ("Enhanced network security")
- sPic = ""
- CASE "gpm"
- sDesc = ("Mouse driver for Text Mode interface")
- sPic = ""
- END SELECT
- IF Exist("images" &/ sService & ".svg") THEN
- sLogo = Image.Load("images" &/ sService & ".svg")
- ELSE
- sLogo = Image.Load("images" &/ "service.svg")
- END IF
-
-
- IF sDesc THEN
- ME.gvSvcList[irow, 0].Picture = sPic
- IF sLogo THEN
- ME.gvSvcList[irow, 1].Picture = sLogo.Picture
- ME.gvSvcList[irow, 1].Alignment = Align.Center
- END IF
- ME.gvSvcList.rows[irow].Height = 64 'sLogo.Height
- ME.gvSvcList[irow, 0].Alignment = Align.Center
- ME.gvSvcList[irow, 2].Text = UCase(sService) & gb.NewLine &
gb.NewLine & sDesc
- ME.gvSvcList[irow, 3].Text = sService
- INC irow
- INC gvSvcList.Rows.Count
- END IF
- NEXT
-
- DEC gvSvcList.Rows.Count
- DEC gvSvcList.Rows.Count
- DEC gvSvcList.Rows.Count
-
-
END
+PUBLIC SUB TextLabel1_Menu()
-PUBLIC SUB gvSvcList_Click()
-
- IF LAST.column > 1 THEN RETURN
- IF gvSvcList[LAST.row, 0].Picture = picStatus THEN
- gvSvcList[LAST.row, 0].Picture = ""
- ELSE
- gvSvcList[LAST.row, 0].Picture = picStatus
- END IF
-
- gvSvcList.Refresh()
-
-END
-PUBLIC SUB SAVE_SERVICES_LIST()
-
- DIM irow AS Integer
- DIM sSVc AS String
-
- ' We will default to runlevel 4 (GUI Mode) for services.
- FOR irow = 0 TO ME.gvSvcList.Rows.Count - 1
- sSVc = gvSvcList[irow, 3].Text
- IF gvSvcList[irow, 0].Picture = picStatus THEN
- PRINT " \\__ Setting up services" & gb.NewLine
- PRINT " \\- " & sSVc
- SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/service -s " &
sSVc & " 4" WAIT
- END IF
-
- NEXT
-
-END
-
-
-PUBLIC SUB gvSvcList_Menu()
-
- ME.SAVE_SERVICES_LIST()
+ MdlBootMngr.PROBE_SYSTEM_FOR_OS("LILO")
END
Modified: branches/speedy/Conf5.form
==============================================================================
--- branches/speedy/Conf5.form (original)
+++ branches/speedy/Conf5.form Fri Apr 24 13:52:36 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,92,59)
+ MoveScaled(0,0,64,45)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
@@ -11,7 +11,7 @@
{ tlbanner TextLabel
MoveScaled(12,0,33,3)
Expand = True
- Text = ("System Services")
+ Text = ("System Serices")
}
{ Separator1 Separator
MoveScaled(13,4,25,1)
@@ -19,31 +19,24 @@
}
}
{ HBox1 HBox
- MoveScaled(4,5,6,2)
+ MoveScaled(0,5,6,1)
Expand = True
}
{ HBox2 HBox
- MoveScaled(0,7,59,3.5)
+ MoveScaled(0,6,56,5)
Expand = True
- { tlExp TextLabel
- MoveScaled(1,0,21,3.5)
+ { TextLabel1 TextLabel
+ MoveScaled(1,0,51,4)
Expand = True
- Text = ("Select the system services to be launched at start-up.")
+ Text = ("Select system services to run on start-up")
}
}
{ HBox3 HBox
- MoveScaled(1,11,4,2)
+ MoveScaled(0,11,5,2)
Expand = True
}
- { gvheader GridView
- MoveScaled(1,13,56,3)
+ { svServiceList GridView
+ MoveScaled(1,14,62,27)
Expand = True
- Scrollbar = Scroll.None
- Border = False
- }
- { gvSvcList GridView
- MoveScaled(1,18,56,19)
- Expand = True
- Scrollbar = Scroll.Vertical
}
}
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Fri Apr 24 13:52:36 2009
@@ -456,23 +456,74 @@
END
-PUBLIC FUNCTION convert_to_grub_format(sPartitionAddr AS String) AS String
+' PUBLIC SUB PROBE_SYSTEM_FOR_OS(sBootManager AS String)
+'
+' DIM sDump, sOs, sRoot, sLongDesc, sType, sTitle AS String
+' DIM i AS Integer
+' DIM sOsList, sOsLine, sBootLine, sDumparr AS String[]
+' DIM sKernel, sInitrd, sAppendLine AS String
+' DIM sBootargs AS String
+'
+' sOsList = Split(Trim(File.Load("/tmp/os.lst")), gb.NewLine)
+' FOR i = 0 TO sOsList.Max
+' sOsLine = Split(Trim(sOsList[i]), ":")
+' sType = Trim(sOsLine[3])
+' sLongDesc = Trim(sOsLine[1])
+' sOs = Trim(sOsLine[2])
+' sRoot = Trim(sOsLine[0])
+' IF sBootManager LIKE "lilo" THEN
+' sTitle = sOs
+' ELSE
+' sTitle = sLongDesc
+' END IF
+'
+' ' Message(sLongDesc & " was found in " & sRoot)
+' ' -= NOW I NEED TO GET THE KERNEL, INITRD AND APPEND LINES FOR
THIS OS. =-
+' IF sType LIKE "linux" THEN
+' ' this function will return an array separated by "," in
this order
+' ' /path/to/kernel, /path/to/initrd, appendline here
+'
+' sBootargs = Get_OS_Boot_Params(sRoot)
+' IF NOT (sBootargs) THEN
+' '= CAN NOT FIND BOOT ARGUMENTS FOR THIS OS ='
+' PRINT ("Unable to find boot arguments for OS in") &
Space(1) & sRoot
+' RETURN
+' ELSE
+' Message(sTitle & "<br>" & sBootargs)
+' END IF
+'
+' END IF
+'
+' NEXT
+'
+' END
+
+PUBLIC FUNCTION Get_OS_Boot_Params(sOsRoot AS String) AS String
- DIM sAlpha AS String[] = Split("a b c d e f g h i k l m n o p q r s t u
v w x y z", Space(1))
- DIM sDrive, sPartAlpha, sRetVal AS String
- DIM i, iPartNu AS Integer
+ DIM $kern, $initrd, $append, sDump AS String
+ DIM i AS Integer
+ DIM $dumparr, $linearr AS String[]
+ DIM $file AS String = "/tmp/bootargs.lst"
+ DIM $line AS String
+ 'dim sListarr as String[] = Split(Trim(File.Load("/tmp/bootargs.
+ SHELL "cat " & $file & " | grep ^" & sOsRoot TO sDump
+ sDump = Trim(sDump)
+ $dumparr = Split(sDump, gb.NewLine)
+ ' always grab the first line only for each os
+ $line = Trim($dumparr[0])
+ IF NOT ($line) THEN RETURN
+ $append = Right($line, Len($line) - InStr($line, "append") + 1)
& "\""
+ $linearr = Split($line, ":")
+ $kern = Trim($linearr[3])
+ $initrd = Trim($linearr[4])
+
- 'IF InStr(sPartitionAddr, "/") < 2 THEN RETURN ' invalid entry
- 'IF InStr(sPartitionAddr, "*[0-9]*") = FALSE THEN RETURN 'invalid entry
- sPartAlpha = Left(sPartitionAddr, Len("/dev/hda")) ' trim this out
- iPartNu = Right(sPartitionAddr, Len(sPartitionAddr) - Len("/dev/hda")) '
cut the partition number from the string
- i = sAlpha.Find(Right(sPartAlpha))
+ RETURN $kern & "," & $initrd & "," & $append
+
+
- ' To grub, it's always "hd" even if the drive is a sata interface
- sRetVal = "(hd" & i & "," & iPartNu & ")"
- RETURN sRetVal
-
+
END
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Fri Apr 24 13:52:36 2009
@@ -51,7 +51,7 @@
ClsGlobal.fRunningMainForm.listview1.add("Cat2", Space(3) & ("System
Configuration"), pCategory)
ClsGlobal.fRunningMainForm.listview1.add("Step6", ("System Boot
Manager"), pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step7", ("Regional Settings"),
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step8", ("User Accounts"),
pToDO)
+ ClsGlobal.fRunningMainForm.listview1.add("Step8", ("User Accounts"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step9", ("Network Settings"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step10", ("Startup Options"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step11", ("Final
Configuration"), pToDo)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Fri Apr 24 13:52:36 2009
@@ -195,9 +195,9 @@
PUBLIC SUB FIND_CD_INSTALL_MEDIA()
DIM sDump, sDrive, sOutput, sShortDrive AS String
- DIM sName, sVersion, sMntPnt AS String
+ DIM sName, sVersion AS String
DIM i AS Integer
- DIM sDriveList, sDumparr AS String[]
+ DIM sDriveList AS String[]
ME.mvLooking.Playing = TRUE
WAIT 1
@@ -216,23 +216,13 @@
sDriveList = Split(sOutput, "\n")
FOR i = 0 TO sDriveList.Count - 1
sShortDrive = Right(Trim(sDriveList[i]), Len(Trim(sDriveList[i])) -
RInStr(Trim(sDriveList[i]), "/"))
- sMntPnt = "/mnt" &/ sShortDrive
- IF IsDir(sMntPnt) = FALSE THEN
- EXEC ["mkdir", "-p", sMntPnt] WAIT
- END IF
+ EXEC ["mkdir", "-p", "/mnt" &/ sShortDrive] WAIT
+ 'EXEC ["mount", "-o", "ro", Trim(sDriveList[i]), "/mnt" &/
sShortDrive] WAIT
+ SHELL "mount " & Trim(sDriveList[i]) & Space(1) & "/mnt" &/
sShortDrive & " 2>/dev/null" WAIT
PRINT ("Scanning") & Space(1) & sDriveList[i]
- SHELL "mount | grep \"^" & Trim(sDriveList[i]) & "\" | cut -f 3
-d \' \'" TO sDump
- sDump = Trim(sDump)
- IF NOT (sDump) THEN
- SHELL "mount " & Trim(sDriveList[i]) & Space(1) & sMntPnt
& " 2>/dev/null" WAIT
- ELSE
- sDumparr = Split(sDump, gb.NewLine)
- sMntPnt = Trim(sDumparr[0])
- END IF
-
- IF Exist(sMntPnt &/ "veclinux" &/ "VINSTALL.CONF") THEN
- SHELL "grep \"^DISTRO=\"" & sMntPnt &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
- SHELL "grep \"^VERSION=\"" & sMntPnt &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
+ IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF")
THEN
+ SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
+ SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
sName = Trim(Replace(sName, "\'", ""))
sVersion = Trim(Replace(sVersion, "\'", ""))
File.Save(Temp(sShortDrive), File.Load("/mnt" &/
sShortDrive &/ "veclinux" &/ "VINSTALL.CONF"))
@@ -257,10 +247,10 @@
PUBLIC SUB FIND_ISO_INSTALL_MEDIA()
- DIM sOutput, sPart, sISoName, sFile, sDump AS String
- DIM sName, sVersion, sMntPnt AS String
+ DIM sOutput, sPart, sISoName, sFile AS String
+ DIM sName, sVersion AS String
DIM i AS Integer
- DIM sPartList, sDumparr AS String[]
+ DIM sPartList AS String[]
ME.ComboBox1.Enabled = FALSE
@@ -275,21 +265,11 @@
sPartList = Split(sOutput, "\n")
FOR i = 0 TO sPartList.Count - 1
sPart = Trim(Right(Trim(sPartList[i]), Len(Trim(sPartList[i])) -
RInStr(Trim(sPartList[i]), "/")))
- sMntPnt = "/mnt" &/ sPart
- IF IsDir(sMntPnt) = FALSE THEN
- EXEC ["mkdir", "-p", sMntPnt] WAIT
- END IF
- SHELL "mount | grep \"^/dev" &/ Trim(spart) & "\" | cut -f 3
-d \' \'" TO sDump
- sDump = Trim(sDump)
- IF sDump THEN
- sDumparr = Split(sDump, gb.NewLine)
- sMntPnt = Trim(sDumparr[0])
- ELSE
- EXEC ["mount", "/dev" &/ Trim(sPart), sMntPnt] WAIT
- END IF
- FOR EACH sFile IN Dir(sMntPnt, "*.iso", gb.File)
+ EXEC ["mkdir", "/mnt" &/ Trim(sPart)] WAIT
+ EXEC ["mount", "/dev" &/ Trim(sPart), "/mnt" &/ Trim(sPart)] WAIT
+ FOR EACH sFile IN Dir("/mnt" &/ Trim(sPart), "*.iso")
TRY MKDIR "/mnt/loop"
- EXEC ["mount", "-o", "loop", sMntPnt &/
Trim(sFile), "/mnt/loop"] WAIT
+ EXEC ["mount", "-o", "loop", "/mnt" &/ Trim(sPart) &/
Trim(sFile), "/mnt/loop"] WAIT
IF Exist("/mnt/loop/veclinux/VINSTALL.CONF") THEN
'PRINT "Adding temp file" & Space(1) &
Temp(Trim(sFile) & "-" & Trim(sPart))
File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)),
File.Load("/mnt/loop/veclinux/VINSTALL.CONF"))
@@ -302,9 +282,9 @@
NEXT
- EXEC ["umount", sMntPnt] WAIT
+ EXEC ["umount", "/mnt" &/ Trim(sPart)] WAIT
EXEC ["sync"] WAIT
- TRY RMDIR sMntPnt
+ TRY RMDIR "/mnt" &/ Trim(sPart)
'EXEC ["rm,", "-rf", "/mnt" &/ Trim(sPart)] WAIT
@@ -493,5 +473,3 @@
ME.tlNext.Visible = TRUE
END
-
-
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Fri Apr 24 13:52:36 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,67,69)
+ MoveScaled(0,0,67,59)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -18,7 +18,7 @@
}
}
{ Panel1 Panel
- MoveScaled(1,8,60,56)
+ MoveScaled(1,8,60,45)
Expand = True
Arrangement = Arrange.Row
{ TextLabel2 TextLabel
@@ -68,14 +68,14 @@
Expand = True
Text = ("Check Installation media before installing")
}
+ { mvLooking MovieBox
+ MoveScaled(5,24,11,25)
+ Expand = True
+ }
{ tlNext TextLabel
MoveScaled(2,26,45,6)
Expand = True
Text = ("")
- }
- { mvLooking MovieBox
- MoveScaled(4,27,11,28)
- Expand = True
}
}
}
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Apr 24 13:52:36 2009
@@ -255,12 +255,12 @@
'IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
IF LAST.TEXT <> ("Swap") THEN
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
- LAST.text = ("Not Used")
- STOP EVENT
- RETURN
- END IF
- END IF
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ LAST.text = ("Not Used")
+ STOP EVENT
+ RETURN
+ END IF
+ END IF
END IF
IF LAST.text <> ("Not Used") THEN
@@ -328,27 +328,77 @@
DIM sPart, sFormat, sSize, sMntPoint AS String
DIM i, irow AS Integer
- FOR EACH cb IN ME.objMntPoints
- IF cb.Text <> ("Not Used") THEN
- FOR irow = 0 TO gvPartListing.Rows.Count - 1
+
+ ' ================= get the list of vital partitions
=====================
+ FOR irow = 2 TO gvPartListing.Rows.count - 1
+ IF Trim(gvPartListing[irow, 2].Text) THEN
+ IF Trim(gvPartListing[irow, 2].Text) <> ("Not Used") AND
Trim(gvPartListing[irow, 2].Text) <> ("Swap") THEN
sPart = Trim(gvPartListing[irow, 0].Text)
sSize = Trim(gvPartListing[irow, 1].Text)
sMntPoint = Trim(gvPartListing[irow, 2].Text)
sFormat = Trim(gvPartListing[irow, 4].Text)
- IF sPart = cb.Tag THEN ' we found a match.
- IF cb.Text <> ("Swap") THEN
- ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart
& "-" & sSize & "-" & sMntPoint & "-" & sFormat & "|"
- ELSE
- ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & sPart
& "-" & sSize & "|"
- END IF
- END IF
- NEXT
+ ' Message(gvPartListing[irow, 0].Text & " - (" &
gvPartListing[irow, 1].Text & ") - " & gvPartListing[irow, 2].Text)
+ ' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList &
cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
+ ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart & "-" &
sSize & "-" & sMntPoint & "-" & sFormat & "|"
+
+ END IF
+ END IF
+
+ NEXT
+
+ ' =========== get list of swap partitions selected .(if any)
=====================
+
+ FOR irow = 2 TO gvPartListing.Rows.count - 1
+ IF Trim(gvPartListing[irow, 2].Text) = ("Swap") THEN
+ sPart = Trim(gvPartListing[irow, 0].Text)
+ sSize = Trim(gvPartListing[irow, 1].Text)
+ ' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
+ ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & spart & "-" &
sSize & "|"
END IF
NEXT
-
+
+
+ 'Message(ClsGlobal.sVitalPartList)
+'
+' FOR EACH cbox IN objMntPoints
+' IF cbox.Text <> ("Not Used") THEN
+' i = 2
+' REPEAT
+' IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN
+' sSize = Trim(gvPartListing[i, 1].Text)
+' END IF
+' INC i
+' UNTIL sSize OR i = gvPartListing.Rows.Count
+'
+' FOR EACH cb IN objFS
+' IF cbox.tag = cb.Tag THEN
+' sFormat = Trim(cb.Text)
+' BREAK
+' ELSE
+' sFormat = ""
+' END IF
+' NEXT
+' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
+' END IF
+' NEXT
+'
+' FOR i = 2 TO gvPartListing.Rows.count - 1
+' IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN
+' FOR EACH cbox IN objMntPoints
+' IF cbox.tag = gvPartListing[i, 0].Text THEN
+' IF cbox.text <> ("Not Used") THEN
+' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
+' END IF
+' END IF
+' NEXT
+' END IF
+' NEXT
+'
+'
END
-
+'
+'
PUBLIC SUB Form_Open()
@@ -395,6 +445,4 @@
cbYN.Visible = FALSE
END
-
-
|
|
From: <cod...@go...> - 2009-04-24 21:40:37
|
Author: M0...@gm...
Date: Fri Apr 24 13:59:01 2009
New Revision: 539
Added:
branches/speedy/.lang/Conf1.pot
branches/speedy/.lang/Conf2.pot
branches/speedy/.lang/Conf3.pot
branches/speedy/.lang/Conf3a.pot
branches/speedy/.lang/Conf4.pot
branches/speedy/.lang/Conf5.pot
branches/speedy/.lang/FDone.pot
Modified:
branches/speedy/.lang/#project.pot
branches/speedy/.lang/.pot
branches/speedy/.lang/ClsFstab.pot
branches/speedy/.lang/ClsGlobal.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/MdlAutoPartition.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/MdlHelpSystem.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/MdlStartUp.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/.lang/Step3a3a.pot
branches/speedy/.lang/Step4.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
Log:
- Updated .lang dir
Modified: branches/speedy/.lang/#project.pot
==============================================================================
--- branches/speedy/.lang/#project.pot (original)
+++ branches/speedy/.lang/#project.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/.project
+# /home/lightuser/devel/speedy/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Apr 24 13:59:01 2009
@@ -54,82 +54,106 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:336 Step1.class:453 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:399
+#: Conf0.class:400
+msgid "Unable to find boot arguments for OS in"
+msgstr ""
+
+#: Conf0.class:407
+msgid "Offer"
+msgstr ""
+
+#: Conf0.class:407
+msgid "as a bootable choice"
+msgstr ""
+
+#: Conf0.class:441
+msgid "Title"
+msgstr ""
+
+#: Conf0.class:462
+msgid "Initial RAM Disk"
+msgstr ""
+
+#: Conf0.class:514
+msgid "Include this Operating System in boot menu"
+msgstr ""
+
+#: Conf0.class:567
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:415
+#: Conf0.class:583
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:424
+#: Conf0.class:592
msgid "LILO"
msgstr ""
-#: Conf0.class:430
+#: Conf0.class:598
msgid "GRUB"
msgstr ""
-#: Conf0.class:436
+#: Conf0.class:604
msgid "NONE"
msgstr ""
-#: Conf0.class:445
+#: Conf0.class:613
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:455
+#: Conf0.class:623
msgid "Target"
msgstr ""
-#: Conf0.class:467
+#: Conf0.class:635
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:486
+#: Conf0.class:654
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:497
+#: Conf0.class:665
msgid "Seconds"
msgstr ""
-#: Conf0.class:503
+#: Conf0.class:671
msgid "Boot Default"
msgstr ""
-#: Conf0.class:522
+#: Conf0.class:690
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:538
+#: Conf0.class:706
msgid "Tab 0"
msgstr ""
-#: Conf1.class:145 MdlStartUp.module:53
+#: Conf1.class:141 MdlStartUp.module:53
msgid "Regional Settings"
msgstr ""
-#: Conf1.class:158
+#: Conf1.class:154
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -138,19 +162,19 @@
"Choose localtime since most PCs are setup this way."
msgstr ""
-#: Conf1.class:174
+#: Conf1.class:170
msgid "Choose the correct timezone for the area in which you live."
msgstr ""
-#: Conf1.class:185
+#: Conf1.class:181
msgid "ComboBox1"
msgstr ""
-#: Conf1.class:187
+#: Conf1.class:183
msgid "LocalTime"
msgstr ""
-#: Conf1.class:187
+#: Conf1.class:183
msgid "UTC"
msgstr ""
@@ -180,27 +204,27 @@
msgid "DO NOT LEAVE THIS BLANK"
msgstr ""
-#: Conf2.class:60
+#: Conf2.class:58
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: Conf2.class:66
+#: Conf2.class:64
msgid "Password was not set. See error log below"
msgstr ""
-#: Conf2.class:134
+#: Conf2.class:132
msgid "System Administrator Account"
msgstr ""
-#: Conf2.class:151
+#: Conf2.class:149
msgid "About the linux root account"
msgstr ""
-#: Conf2.class:183
+#: Conf2.class:181
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:200 Conf3.class:380
+#: Conf2.class:198 Conf3.class:381
msgid "Re-enter Password"
msgstr ""
@@ -221,79 +245,85 @@
msgid "to continue"
msgstr ""
-#: Conf3.class:99
+#: Conf3.class:98
msgid "Select picture ID"
msgstr ""
-#: Conf3.class:101
+#: Conf3.class:100
msgid "Select picture ID for"
msgstr ""
-#: Conf3.class:133
+#: Conf3.class:132
msgid "You must enter a login name first."
msgstr ""
-#: Conf3.class:136
+#: Conf3.class:135
msgid "Please select a password for"
msgstr ""
-#: Conf3.class:136
+#: Conf3.class:135
msgid "before continuing"
msgstr ""
-#: Conf3.class:139
+#: Conf3.class:138
msgid "You must enter the password twice for added security"
msgstr ""
-#: Conf3.class:166
+#: Conf3.class:163
+msgid ""
+"Unable to successfully create user account. Please run VasmCC after "
+"installation is done."
+msgstr ""
+
+#: Conf3.class:167
msgid "User"
msgstr ""
-#: Conf3.class:166
+#: Conf3.class:167
msgid "already exists in the system."
msgstr ""
-#: Conf3.class:166
+#: Conf3.class:167
msgid "Please select another user login name"
msgstr ""
-#: Conf3.class:211
+#: Conf3.class:212
msgid "Use only lowercase letters and numbers for this field"
msgstr ""
-#: Conf3.class:281
+#: Conf3.class:282
msgid "Create User Accounts"
msgstr ""
-#: Conf3.class:331
+#: Conf3.class:332
msgid "Login Name"
msgstr ""
-#: Conf3.class:347
+#: Conf3.class:348
msgid "Real Name"
msgstr ""
-#: Conf3.class:363
+#: Conf3.class:364
msgid "Enter Password"
msgstr ""
-#: Conf3.class:408
+#: Conf3.class:409
msgid "Click here to select user Login picture"
msgstr ""
-#: Conf3.class:418
+#: Conf3.class:419
msgid "Create User"
msgstr ""
-#: Conf3.class:435
+#: Conf3.class:436
msgid "Import Existing User"
msgstr ""
-#: Conf3.class:451
+#: Conf3.class:452
msgid "Clear Form"
msgstr ""
-#: Conf3.class:466
+#: Conf3.class:467
msgid "User Rights Management"
msgstr ""
@@ -353,107 +383,67 @@
msgid "Setting"
msgstr ""
-#: Conf3a.class:118 Step7a.class:49 Step7b.class:28
+#: Conf3a.class:118 Conf5.class:34 Step7a.class:49 Step7b.class:28
msgid "Description"
msgstr ""
-#: Conf3a.class:233
+#: Conf3a.class:237
msgid "Import user accounts into VectorLinux"
msgstr ""
-#: Conf3a.class:246
+#: Conf3a.class:250
msgid ""
"Select which user account to import, and which settings to reset.
Un-checked "
"items will be carried over, while checked items will be reset to factory "
"defaults."
msgstr ""
-#: Conf3a.class:256
+#: Conf3a.class:260
msgid "User account to import"
msgstr ""
-#: Conf3a.class:275
+#: Conf3a.class:279
msgid "Account Contents to reset"
msgstr ""
-#: Conf3a.class:302
+#: Conf3a.class:306
msgid "Accept"
msgstr ""
-#: Conf3a.class:308
+#: Conf3a.class:312
msgid "Cancel"
msgstr ""
-#: Conf4.class:70 MdlStartUp.module:55
-msgid "Network Settings"
-msgstr ""
-
-#: Conf5.class:61
-msgid "Service"
-msgstr ""
-
-#: Conf5.class:90
-msgid "System task scheduler"
+#: Conf4.class:69
+msgid "Network Configuration"
msgstr ""
-#: Conf5.class:93
-msgid "Bluetooth device manager"
+#: Conf4.class:91
+msgid "Computer Name"
msgstr ""
-#: Conf5.class:96
-msgid "Secure Shell remote access"
+#: Conf4.class:97
+msgid "VLocity"
msgstr ""
-#: Conf5.class:99
-msgid "Software update notifications"
+#: Conf4.class:109
+msgid "Domain"
msgstr ""
-#: Conf5.class:102
-msgid "Wireless network scanner"
+#: Conf4.class:115
+msgid "Linux.net"
msgstr ""
-#: Conf5.class:105
-msgid "Printing service"
-msgstr ""
-
-#: Conf5.class:108
-msgid "File in userspace daemon"
-msgstr ""
-
-#: Conf5.class:111
-msgid "Internet Super Server"
-msgstr ""
-
-#: Conf5.class:114
-msgid "RPC Port Mapper"
-msgstr ""
-
-#: Conf5.class:117
-msgid "Windows networking service"
-msgstr ""
-
-#: Conf5.class:120
-msgid "VMWare modules"
-msgstr ""
-
-#: Conf5.class:123
-msgid "Network interface manager"
-msgstr ""
-
-#: Conf5.class:126
-msgid "Enhanced network security"
-msgstr ""
-
-#: Conf5.class:129
-msgid "Mouse driver for Text Mode interface"
+#: Conf5.class:33
+msgid "Service"
msgstr ""
-#: Conf5.class:228
-msgid "System Services"
+#: Conf5.class:124
+msgid "System Serices"
msgstr ""
-#: Conf5.class:249
-msgid "Select the system services to be launched at start-up."
+#: Conf5.class:145
+msgid "Select system services to run on start-up"
msgstr ""
#: FDone.class:23 FMain.class:317 FMain0.class:318
@@ -630,6 +620,10 @@
msgid "User Accounts"
msgstr ""
+#: MdlStartUp.module:55
+msgid "Network Settings"
+msgstr ""
+
#: MdlStartUp.module:56
msgid "Startup Options"
msgstr ""
@@ -728,47 +722,47 @@
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:223
+#: Step1.class:222
msgid "Scanning"
msgstr ""
-#: Step1.class:242
+#: Step1.class:232
msgid "in"
msgstr ""
-#: Step1.class:270
+#: Step1.class:260
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:373
+#: Step1.class:353
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:376
+#: Step1.class:356
msgid "VERSION"
msgstr ""
-#: Step1.class:453
+#: Step1.class:433
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:453
+#: Step1.class:433
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:463
+#: Step1.class:443
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:537
+#: Step1.class:511
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:576
+#: Step1.class:550
msgid "Search Again"
msgstr ""
-#: Step1.class:606
+#: Step1.class:580
msgid "Check Installation media before installing"
msgstr ""
@@ -1021,11 +1015,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:462 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:462 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
msgid "No"
msgstr ""
@@ -1318,7 +1312,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:355
+#: Step6.class:405
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/ClsFstab.pot
==============================================================================
--- branches/speedy/.lang/ClsFstab.pot (original)
+++ branches/speedy/.lang/ClsFstab.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/ClsFstab.class
+# /home/lightuser/devel/speedy/ClsFstab.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/ClsGlobal.pot
==============================================================================
--- branches/speedy/.lang/ClsGlobal.pot (original)
+++ branches/speedy/.lang/ClsGlobal.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/ClsGlobal.class
+# /home/lightuser/devel/speedy/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Conf0.class
+# /home/lightuser/devel/speedy/Conf0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -54,71 +54,95 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid "WARNING:"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:336
+#: Conf0.class:332
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:399
+#: Conf0.class:400
+msgid "Unable to find boot arguments for OS in"
+msgstr ""
+
+#: Conf0.class:407
+msgid "Offer"
+msgstr ""
+
+#: Conf0.class:407
+msgid "as a bootable choice"
+msgstr ""
+
+#: Conf0.class:441
+msgid "Title"
+msgstr ""
+
+#: Conf0.class:462
+msgid "Initial RAM Disk"
+msgstr ""
+
+#: Conf0.class:514
+msgid "Include this Operating System in boot menu"
+msgstr ""
+
+#: Conf0.class:567
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:415
+#: Conf0.class:583
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:424
+#: Conf0.class:592
msgid "LILO"
msgstr ""
-#: Conf0.class:430
+#: Conf0.class:598
msgid "GRUB"
msgstr ""
-#: Conf0.class:436
+#: Conf0.class:604
msgid "NONE"
msgstr ""
-#: Conf0.class:445
+#: Conf0.class:613
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:455
+#: Conf0.class:623
msgid "Target"
msgstr ""
-#: Conf0.class:467
+#: Conf0.class:635
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:486
+#: Conf0.class:654
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:497
+#: Conf0.class:665
msgid "Seconds"
msgstr ""
-#: Conf0.class:503
+#: Conf0.class:671
msgid "Boot Default"
msgstr ""
-#: Conf0.class:522
+#: Conf0.class:690
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:538
+#: Conf0.class:706
msgid "Tab 0"
msgstr ""
Added: branches/speedy/.lang/Conf1.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Conf1.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,40 @@
+# /home/lightuser/devel/speedy/Conf1.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Conf1.class:141
+msgid "Regional Settings"
+msgstr ""
+
+#: Conf1.class:154
+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 ""
+
+#: Conf1.class:170
+msgid "Choose the correct timezone for the area in which you live."
+msgstr ""
+
+#: Conf1.class:181
+msgid "ComboBox1"
+msgstr ""
+
+#: Conf1.class:183
+msgid "LocalTime"
+msgstr ""
+
+#: Conf1.class:183
+msgid "UTC"
+msgstr ""
+
Added: branches/speedy/.lang/Conf2.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Conf2.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,60 @@
+# /home/lightuser/devel/speedy/Conf2.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Conf2.class:24
+msgid "The linux root account is pre-defined to be used as the system
administrator's account. "
+msgstr ""
+
+#: Conf2.class:24
+msgid "This account is used to perform system-wide changes such as adding
/ removing software, system-qide updates, managing user accounts, etc."
+msgstr ""
+
+#: Conf2.class:24
+msgid "Most oter every-day tasks do not require administrative
priviledges."
+msgstr ""
+
+#: Conf2.class:24
+msgid "For added security, use a password that is easy for you to
remember, but hard for others to guess."
+msgstr ""
+
+#: Conf2.class:24
+msgid "DO NOT LEAVE THIS BLANK"
+msgstr ""
+
+#: Conf2.class:58
+msgid "Passwords do not match. Please enter the same password twice"
+msgstr ""
+
+#: Conf2.class:64
+msgid "Password was not set. See error log below"
+msgstr ""
+
+#: Conf2.class:132
+msgid "System Administrator Account"
+msgstr ""
+
+#: Conf2.class:149
+msgid "About the linux root account"
+msgstr ""
+
+#: Conf2.class:181
+msgid "Enter Passwrord"
+msgstr ""
+
+#: Conf2.class:198
+msgid "Re-enter Password"
+msgstr ""
+
Added: branches/speedy/.lang/Conf3.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Conf3.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,116 @@
+# /home/lightuser/devel/speedy/Conf3.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Conf3.class:43
+msgid "Create as many user accounts as you want / need here."
+msgstr ""
+
+#: Conf3.class:43
+msgid "Choose a unique login name for each user account."
+msgstr ""
+
+#: Conf3.class:47
+msgid "When finished, Click"
+msgstr ""
+
+#: Conf3.class:47
+msgid "to continue"
+msgstr ""
+
+#: Conf3.class:98
+msgid "Select picture ID"
+msgstr ""
+
+#: Conf3.class:100
+msgid "Select picture ID for"
+msgstr ""
+
+#: Conf3.class:132
+msgid "You must enter a login name first."
+msgstr ""
+
+#: Conf3.class:135
+msgid "Please select a password for"
+msgstr ""
+
+#: Conf3.class:135
+msgid "before continuing"
+msgstr ""
+
+#: Conf3.class:138
+msgid "You must enter the password twice for added security"
+msgstr ""
+
+#: Conf3.class:163
+msgid "Unable to successfully create user account. Please run VasmCC after
installation is done."
+msgstr ""
+
+#: Conf3.class:167
+msgid "User"
+msgstr ""
+
+#: Conf3.class:167
+msgid "already exists in the system."
+msgstr ""
+
+#: Conf3.class:167
+msgid "Please select another user login name"
+msgstr ""
+
+#: Conf3.class:212
+msgid "Use only lowercase letters and numbers for this field"
+msgstr ""
+
+#: Conf3.class:282
+msgid "Create User Accounts"
+msgstr ""
+
+#: Conf3.class:332
+msgid "Login Name"
+msgstr ""
+
+#: Conf3.class:348
+msgid "Real Name"
+msgstr ""
+
+#: Conf3.class:364
+msgid "Enter Password"
+msgstr ""
+
+#: Conf3.class:381
+msgid "Re-enter Password"
+msgstr ""
+
+#: Conf3.class:409
+msgid "Click here to select user Login picture"
+msgstr ""
+
+#: Conf3.class:419
+msgid "Create User"
+msgstr ""
+
+#: Conf3.class:436
+msgid "Import Existing User"
+msgstr ""
+
+#: Conf3.class:452
+msgid "Clear Form"
+msgstr ""
+
+#: Conf3.class:467
+msgid "User Rights Management"
+msgstr ""
+
Added: branches/speedy/.lang/Conf3a.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Conf3a.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,100 @@
+# /home/lightuser/devel/speedy/Conf3a.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Conf3a.class:56
+msgid "KDE Settings (Menu, Window decorations, etc)"
+msgstr ""
+
+#: Conf3a.class:58
+msgid "QT Toolkit settings (KDE Visual Effects)"
+msgstr ""
+
+#: Conf3a.class:60
+msgid "GTK Tookit theme Settings"
+msgstr ""
+
+#: Conf3a.class:62
+msgid "X-window basic settings (includes xterm settings)"
+msgstr ""
+
+#: Conf3a.class:64
+msgid "Bash init script"
+msgstr ""
+
+#: Conf3a.class:66
+msgid "Sound system preferences"
+msgstr ""
+
+#: Conf3a.class:68
+msgid "Graphical inteface preferences"
+msgstr ""
+
+#: Conf3a.class:70
+msgid "Desktop icons, folders, launchers"
+msgstr ""
+
+#: Conf3a.class:72
+msgid "IceWM settings, preferences, menu"
+msgstr ""
+
+#: Conf3a.class:74
+msgid "XMMS Audio player preferences"
+msgstr ""
+
+#: Conf3a.class:76
+msgid "ROX Filer Desktop settings"
+msgstr ""
+
+#: Conf3a.class:78
+msgid "MPlayer Multimedia Player Settings"
+msgstr ""
+
+#: Conf3a.class:80
+msgid "Default graphical session settings"
+msgstr ""
+
+#: Conf3a.class:117
+msgid "Setting"
+msgstr ""
+
+#: Conf3a.class:118
+msgid "Description"
+msgstr ""
+
+#: Conf3a.class:237
+msgid "Import user accounts into VectorLinux"
+msgstr ""
+
+#: Conf3a.class:250
+msgid "Select which user account to import, and which settings to reset.
Un-checked items will be carried over, while checked items will be reset to
factory defaults."
+msgstr ""
+
+#: Conf3a.class:260
+msgid "User account to import"
+msgstr ""
+
+#: Conf3a.class:279
+msgid "Account Contents to reset"
+msgstr ""
+
+#: Conf3a.class:306
+msgid "Accept"
+msgstr ""
+
+#: Conf3a.class:312
+msgid "Cancel"
+msgstr ""
+
Added: branches/speedy/.lang/Conf4.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Conf4.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,36 @@
+# /home/lightuser/devel/speedy/Conf4.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Conf4.class:69
+msgid "Network Configuration"
+msgstr ""
+
+#: Conf4.class:91
+msgid "Computer Name"
+msgstr ""
+
+#: Conf4.class:97
+msgid "VLocity"
+msgstr ""
+
+#: Conf4.class:109
+msgid "Domain"
+msgstr ""
+
+#: Conf4.class:115
+msgid "Linux.net"
+msgstr ""
+
Added: branches/speedy/.lang/Conf5.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Conf5.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,32 @@
+# /home/lightuser/devel/speedy/Conf5.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Conf5.class:33
+msgid "Service"
+msgstr ""
+
+#: Conf5.class:34
+msgid "Description"
+msgstr ""
+
+#: Conf5.class:124
+msgid "System Serices"
+msgstr ""
+
+#: Conf5.class:145
+msgid "Select system services to run on start-up"
+msgstr ""
+
Added: branches/speedy/.lang/FDone.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/FDone.pot Fri Apr 24 13:59:01 2009
@@ -0,0 +1,44 @@
+# /home/lightuser/devel/speedy/FDone.class
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: FDone.class:23
+msgid "Next"
+msgstr ""
+
+#: FDone.class:31
+msgid "VectorLinux has been installed in your system."
+msgstr ""
+
+#: FDone.class:31
+msgid "After your computer restarts, you may use VasmCC to perform any
additional configuration."
+msgstr ""
+
+#: FDone.class:31
+msgid "Click"
+msgstr ""
+
+#: FDone.class:31
+msgid "to restart your computer now."
+msgstr ""
+
+#: FDone.class:73
+msgid "Installation Complete"
+msgstr ""
+
+#: FDone.class:90
+msgid "About your VectorLinux installation"
+msgstr ""
+
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/FMain.class
+# /home/lightuser/devel/speedy/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/FMain0.class
+# /home/lightuser/devel/speedy/FMain0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlAutoPartition.pot
==============================================================================
--- branches/speedy/.lang/MdlAutoPartition.pot (original)
+++ branches/speedy/.lang/MdlAutoPartition.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlAutoPartition.module
+# /home/lightuser/devel/speedy/MdlAutoPartition.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlBootMngr.module
+# /home/lightuser/devel/speedy/MdlBootMngr.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlHelpSystem.pot
==============================================================================
--- branches/speedy/.lang/MdlHelpSystem.pot (original)
+++ branches/speedy/.lang/MdlHelpSystem.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlHelpSystem.module
+# /home/lightuser/devel/speedy/MdlHelpSystem.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlMain.module
+# /home/lightuser/devel/speedy/MdlMain.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- branches/speedy/.lang/MdlStartUp.pot (original)
+++ branches/speedy/.lang/MdlStartUp.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlStartUp.module
+# /home/lightuser/devel/speedy/MdlStartUp.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step0.class
+# /home/lightuser/devel/speedy/Step0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step1.class
+# /home/lightuser/devel/speedy/Step1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -74,51 +74,51 @@
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:223
+#: Step1.class:222
msgid "Scanning"
msgstr ""
-#: Step1.class:242
+#: Step1.class:232
msgid "in"
msgstr ""
-#: Step1.class:270
+#: Step1.class:260
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:373
+#: Step1.class:353
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:376
+#: Step1.class:356
msgid "VERSION"
msgstr ""
-#: Step1.class:453
+#: Step1.class:433
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:453
+#: Step1.class:433
msgid "WARNING:"
msgstr ""
-#: Step1.class:453
+#: Step1.class:433
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:463
+#: Step1.class:443
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:537
+#: Step1.class:511
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:576
+#: Step1.class:550
msgid "Search Again"
msgstr ""
-#: Step1.class:606
+#: Step1.class:580
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step2.class
+# /home/lightuser/devel/speedy/Step2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3.class
+# /home/lightuser/devel/speedy/Step3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a.class
+# /home/lightuser/devel/speedy/Step3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a1.class
+# /home/lightuser/devel/speedy/Step3a1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a1a.class
+# /home/lightuser/devel/speedy/Step3a1a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a2.class
+# /home/lightuser/devel/speedy/Step3a2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- branches/speedy/.lang/Step3a3.pot (original)
+++ branches/speedy/.lang/Step3a3.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a3.class
+# /home/lightuser/devel/speedy/Step3a3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a3a.pot (original)
+++ branches/speedy/.lang/Step3a3a.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a3a.class
+# /home/lightuser/devel/speedy/Step3a3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step4.pot
==============================================================================
--- branches/speedy/.lang/Step4.pot (original)
+++ branches/speedy/.lang/Step4.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step4.class
+# /home/lightuser/devel/speedy/Step4.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step5.class
+# /home/lightuser/devel/speedy/Step5.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step6.class
+# /home/lightuser/devel/speedy/Step6.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -58,15 +58,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:355
+#: Step6.class:405
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:462
+#: Step6.class:510
msgid "Yes"
msgstr ""
-#: Step6.class:462
+#: Step6.class:510
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step7.class
+# /home/lightuser/devel/speedy/Step7.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step7a.class
+# /home/lightuser/devel/speedy/Step7a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step7b.class
+# /home/lightuser/devel/speedy/Step7b.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Fri Apr 24 13:59:01 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step8.class
+# /home/lightuser/devel/speedy/Step8.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Fri Apr 24 13:59:01 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
-# Compiled with Gambas 2.10.2
+# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=MdlStartUp
+Startup=Conf0
Version=0.0.2
Library=gb.gtk
Library=gb.form
|
|
From: <cod...@go...> - 2009-04-22 15:05:10
|
Author: M0...@gm...
Date: Wed Apr 22 08:03:36 2009
New Revision: 537
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step6.pot
branches/speedy/MdlBootMngr.module
branches/speedy/Step1.class
Log:
- Added function to convert strings like "/dev/hda1" to grub format
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Apr 22 08:03:36 2009
@@ -760,15 +760,15 @@
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:531
+#: Step1.class:537
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:570
+#: Step1.class:576
msgid "Search Again"
msgstr ""
-#: Step1.class:600
+#: Step1.class:606
msgid "Check Installation media before installing"
msgstr ""
@@ -1021,11 +1021,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:462 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:462 Step7a.class:143
msgid "No"
msgstr ""
@@ -1318,7 +1318,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:433
+#: Step6.class:355
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Wed Apr 22 08:03:36 2009
@@ -110,15 +110,15 @@
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:531
+#: Step1.class:537
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:570
+#: Step1.class:576
msgid "Search Again"
msgstr ""
-#: Step1.class:600
+#: Step1.class:606
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Wed Apr 22 08:03:36 2009
@@ -58,15 +58,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:433
+#: Step6.class:355
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:540
+#: Step6.class:462
msgid "Yes"
msgstr ""
-#: Step6.class:540
+#: Step6.class:462
msgid "No"
msgstr ""
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Wed Apr 22 08:03:36 2009
@@ -456,5 +456,24 @@
END
+PUBLIC FUNCTION convert_to_grub_format(sPartitionAddr AS String) AS String
+
+ DIM sAlpha AS String[] = Split("a b c d e f g h i k l m n o p q r s t u
v w x y z", Space(1))
+ DIM sDrive, sPartAlpha, sRetVal AS String
+ DIM i, iPartNu AS Integer
+
+
+ 'IF InStr(sPartitionAddr, "/") < 2 THEN RETURN ' invalid entry
+ 'IF InStr(sPartitionAddr, "*[0-9]*") = FALSE THEN RETURN 'invalid entry
+ sPartAlpha = Left(sPartitionAddr, Len("/dev/hda")) ' trim this out
+ iPartNu = Right(sPartitionAddr, Len(sPartitionAddr) - Len("/dev/hda")) '
cut the partition number from the string
+ i = sAlpha.Find(Right(sPartAlpha))
+
+ ' To grub, it's always "hd" even if the drive is a sata interface
+ sRetVal = "(hd" & i & "," & iPartNu & ")"
+ RETURN sRetVal
+
+
+END
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Wed Apr 22 08:03:36 2009
@@ -493,3 +493,5 @@
ME.tlNext.Visible = TRUE
END
+
+
|
|
From: <cod...@go...> - 2009-04-17 19:38:55
|
Author: M0...@gm...
Date: Fri Apr 17 12:07:23 2009
New Revision: 536
Added:
branches/speedy/FDone.class
branches/speedy/FDone.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step6.pot
branches/speedy/Conf0.class
branches/speedy/Conf1.class
branches/speedy/Conf2.class
branches/speedy/Conf4.class
branches/speedy/Conf5.class
branches/speedy/Conf5.form
branches/speedy/MdlStartUp.module
branches/speedy/Step1.class
branches/speedy/Step6.class
Log:
- Finished services step.
- Updated navigation indicators
- Fixed bug in partition selection reading.
- Added final Step
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Apr 17 12:07:23 2009
@@ -54,82 +54,82 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:336 Step1.class:453 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:399
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:411
+#: Conf0.class:415
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:420
+#: Conf0.class:424
msgid "LILO"
msgstr ""
-#: Conf0.class:426
+#: Conf0.class:430
msgid "GRUB"
msgstr ""
-#: Conf0.class:432
+#: Conf0.class:436
msgid "NONE"
msgstr ""
-#: Conf0.class:441
+#: Conf0.class:445
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:451
+#: Conf0.class:455
msgid "Target"
msgstr ""
-#: Conf0.class:463
+#: Conf0.class:467
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:482
+#: Conf0.class:486
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:493
+#: Conf0.class:497
msgid "Seconds"
msgstr ""
-#: Conf0.class:499
+#: Conf0.class:503
msgid "Boot Default"
msgstr ""
-#: Conf0.class:518
+#: Conf0.class:522
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:534
+#: Conf0.class:538
msgid "Tab 0"
msgstr ""
-#: Conf1.class:141 MdlStartUp.module:53
+#: Conf1.class:145 MdlStartUp.module:53
msgid "Regional Settings"
msgstr ""
-#: Conf1.class:154
+#: Conf1.class:158
msgid ""
"Choose how\n"
"your hardware clock is set up.\n"
@@ -138,19 +138,19 @@
"Choose localtime since most PCs are setup this way."
msgstr ""
-#: Conf1.class:170
+#: Conf1.class:174
msgid "Choose the correct timezone for the area in which you live."
msgstr ""
-#: Conf1.class:181
+#: Conf1.class:185
msgid "ComboBox1"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:187
msgid "LocalTime"
msgstr ""
-#: Conf1.class:183
+#: Conf1.class:187
msgid "UTC"
msgstr ""
@@ -180,27 +180,27 @@
msgid "DO NOT LEAVE THIS BLANK"
msgstr ""
-#: Conf2.class:58
+#: Conf2.class:60
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: Conf2.class:64
+#: Conf2.class:66
msgid "Password was not set. See error log below"
msgstr ""
-#: Conf2.class:132
+#: Conf2.class:134
msgid "System Administrator Account"
msgstr ""
-#: Conf2.class:149
+#: Conf2.class:151
msgid "About the linux root account"
msgstr ""
-#: Conf2.class:181
+#: Conf2.class:183
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198 Conf3.class:380
+#: Conf2.class:200 Conf3.class:380
msgid "Re-enter Password"
msgstr ""
@@ -384,78 +384,108 @@
msgid "Cancel"
msgstr ""
-#: Conf4.class:68 MdlStartUp.module:55
+#: Conf4.class:70 MdlStartUp.module:55
msgid "Network Settings"
msgstr ""
-#: Conf5.class:59
+#: Conf5.class:61
msgid "Service"
msgstr ""
-#: Conf5.class:88
+#: Conf5.class:90
msgid "System task scheduler"
msgstr ""
-#: Conf5.class:91
+#: Conf5.class:93
msgid "Bluetooth device manager"
msgstr ""
-#: Conf5.class:94
+#: Conf5.class:96
msgid "Secure Shell remote access"
msgstr ""
-#: Conf5.class:97
+#: Conf5.class:99
msgid "Software update notifications"
msgstr ""
-#: Conf5.class:100
+#: Conf5.class:102
msgid "Wireless network scanner"
msgstr ""
-#: Conf5.class:103
+#: Conf5.class:105
msgid "Printing service"
msgstr ""
-#: Conf5.class:106
+#: Conf5.class:108
msgid "File in userspace daemon"
msgstr ""
-#: Conf5.class:109
+#: Conf5.class:111
msgid "Internet Super Server"
msgstr ""
-#: Conf5.class:112
+#: Conf5.class:114
msgid "RPC Port Mapper"
msgstr ""
-#: Conf5.class:115
+#: Conf5.class:117
msgid "Windows networking service"
msgstr ""
-#: Conf5.class:118
+#: Conf5.class:120
msgid "VMWare modules"
msgstr ""
-#: Conf5.class:121
+#: Conf5.class:123
msgid "Network interface manager"
msgstr ""
-#: Conf5.class:124
+#: Conf5.class:126
msgid "Enhanced network security"
msgstr ""
-#: Conf5.class:127
+#: Conf5.class:129
msgid "Mouse driver for Text Mode interface"
msgstr ""
-#: Conf5.class:202
+#: Conf5.class:228
msgid "System Services"
msgstr ""
-#: Conf5.class:223
+#: Conf5.class:249
msgid "Select the system services to be launched at start-up."
msgstr ""
+#: FDone.class:23 FMain.class:317 FMain0.class:318
+msgid "Next"
+msgstr ""
+
+#: FDone.class:31
+msgid "VectorLinux has been installed in your system."
+msgstr ""
+
+#: FDone.class:31
+msgid ""
+"After your computer restarts, you may use VasmCC to perform any
additional "
+"configuration."
+msgstr ""
+
+#: FDone.class:31 Step1.class:98 Step2.class:198 Step5.class:177
+msgid "Click"
+msgstr ""
+
+#: FDone.class:31
+msgid "to restart your computer now."
+msgstr ""
+
+#: FDone.class:73
+msgid "Installation Complete"
+msgstr ""
+
+#: FDone.class:90
+msgid "About your VectorLinux installation"
+msgstr ""
+
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
@@ -468,10 +498,6 @@
msgid "Back"
msgstr ""
-#: FMain.class:317 FMain0.class:318
-msgid "Next"
-msgstr ""
-
#: FMain.class:328 FMain0.class:329
msgid "Quit"
msgstr ""
@@ -670,10 +696,6 @@
msgid "to search for media again"
msgstr ""
-#: Step1.class:98 Step2.class:198 Step5.class:177
-msgid "Click"
-msgstr ""
-
#: Step1.class:98
msgid "to begin installing"
msgstr ""
@@ -706,47 +728,47 @@
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:222
+#: Step1.class:223
msgid "Scanning"
msgstr ""
-#: Step1.class:232
+#: Step1.class:242
msgid "in"
msgstr ""
-#: Step1.class:260
+#: Step1.class:270
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:353
+#: Step1.class:373
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:356
+#: Step1.class:376
msgid "VERSION"
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:443
+#: Step1.class:463
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:511
+#: Step1.class:531
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:550
+#: Step1.class:570
msgid "Search Again"
msgstr ""
-#: Step1.class:580
+#: Step1.class:600
msgid "Check Installation media before installing"
msgstr ""
@@ -999,11 +1021,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:540 Step7a.class:143
msgid "No"
msgstr ""
@@ -1296,7 +1318,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:405
+#: Step6.class:433
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri Apr 17 12:07:23 2009
@@ -54,71 +54,71 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "WARNING:"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:332
+#: Conf0.class:336
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:399
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:411
+#: Conf0.class:415
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:420
+#: Conf0.class:424
msgid "LILO"
msgstr ""
-#: Conf0.class:426
+#: Conf0.class:430
msgid "GRUB"
msgstr ""
-#: Conf0.class:432
+#: Conf0.class:436
msgid "NONE"
msgstr ""
-#: Conf0.class:441
+#: Conf0.class:445
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:451
+#: Conf0.class:455
msgid "Target"
msgstr ""
-#: Conf0.class:463
+#: Conf0.class:467
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:482
+#: Conf0.class:486
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:493
+#: Conf0.class:497
msgid "Seconds"
msgstr ""
-#: Conf0.class:499
+#: Conf0.class:503
msgid "Boot Default"
msgstr ""
-#: Conf0.class:518
+#: Conf0.class:522
msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0.class:534
+#: Conf0.class:538
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Apr 17 12:07:23 2009
@@ -74,51 +74,51 @@
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:222
+#: Step1.class:223
msgid "Scanning"
msgstr ""
-#: Step1.class:232
+#: Step1.class:242
msgid "in"
msgstr ""
-#: Step1.class:260
+#: Step1.class:270
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:353
+#: Step1.class:373
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:356
+#: Step1.class:376
msgid "VERSION"
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "WARNING:"
msgstr ""
-#: Step1.class:433
+#: Step1.class:453
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:443
+#: Step1.class:463
msgid "Searching your system for installable media"
msgstr ""
-#: Step1.class:511
+#: Step1.class:531
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:550
+#: Step1.class:570
msgid "Search Again"
msgstr ""
-#: Step1.class:580
+#: Step1.class:600
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Apr 17 12:07:23 2009
@@ -58,15 +58,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:405
+#: Step6.class:433
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:510
+#: Step6.class:540
msgid "Yes"
msgstr ""
-#: Step6.class:510
+#: Step6.class:540
msgid "No"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Fri Apr 17 12:07:23 2009
@@ -232,6 +232,10 @@
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step5"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step4"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step6"].picture = MdlStartUp.pNow
+
RETURN "Conf1"
END
Modified: branches/speedy/Conf1.class
==============================================================================
--- branches/speedy/Conf1.class (original)
+++ branches/speedy/Conf1.class Fri Apr 17 12:07:23 2009
@@ -23,10 +23,14 @@
' default the time zone to us/central
ME.lbTmZone[ME.lbTmZone.Find("US/Central")].Selected = TRUE
+
END
PUBLIC FUNCTION GetNext() AS String
+
+ ClsGlobal.fRunningMainForm.listview1["Step6"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step7"].picture = MdlStartUp.pNow
RETURN "Conf2"
Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class (original)
+++ branches/speedy/Conf2.class Fri Apr 17 12:07:23 2009
@@ -34,6 +34,8 @@
END
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step7"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step8"].picture = MdlStartUp.pNow
RETURN "Conf3"
Modified: branches/speedy/Conf4.class
==============================================================================
--- branches/speedy/Conf4.class (original)
+++ branches/speedy/Conf4.class Fri Apr 17 12:07:23 2009
@@ -26,6 +26,8 @@
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step8"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pNow
RETURN "Conf5"
Modified: branches/speedy/Conf5.class
==============================================================================
--- branches/speedy/Conf5.class (original)
+++ branches/speedy/Conf5.class Fri Apr 17 12:07:23 2009
@@ -26,6 +26,8 @@
END
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
RETURN "FDone"
END
@@ -36,7 +38,7 @@
END
PUBLIC SUB OnExit()
-
+ ME.SAVE_SERVICES_LIST()
END
@@ -159,7 +161,7 @@
PUBLIC SUB gvSvcList_Click()
- IF LAST.column > 0 THEN RETURN
+ IF LAST.column > 1 THEN RETURN
IF gvSvcList[LAST.row, 0].Picture = picStatus THEN
gvSvcList[LAST.row, 0].Picture = ""
ELSE
@@ -167,5 +169,29 @@
END IF
gvSvcList.Refresh()
+
+END
+PUBLIC SUB SAVE_SERVICES_LIST()
+
+ DIM irow AS Integer
+ DIM sSVc AS String
+
+ ' We will default to runlevel 4 (GUI Mode) for services.
+ FOR irow = 0 TO ME.gvSvcList.Rows.Count - 1
+ sSVc = gvSvcList[irow, 3].Text
+ IF gvSvcList[irow, 0].Picture = picStatus THEN
+ PRINT " \\__ Setting up services" & gb.NewLine
+ PRINT " \\- " & sSVc
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/service -s " &
sSVc & " 4" WAIT
+ END IF
+
+ NEXT
+
+END
+
+
+PUBLIC SUB gvSvcList_Menu()
+
+ ME.SAVE_SERVICES_LIST()
END
Modified: branches/speedy/Conf5.form
==============================================================================
--- branches/speedy/Conf5.form (original)
+++ branches/speedy/Conf5.form Fri Apr 17 12:07:23 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,94,47)
+ MoveScaled(0,0,92,59)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
Added: branches/speedy/FDone.class
==============================================================================
--- (empty file)
+++ branches/speedy/FDone.class Fri Apr 17 12:07:23 2009
@@ -0,0 +1,44 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC SUB Form_Open()
+
+ DIM sTxt AS String
+ IF ClsGlobal.fRunningMainForm THEN
+ sTxt = ClsGlobal.fRunningMainForm.btnext.text
+ ELSE
+ sTxt = ("Next")
+ END IF
+
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
+ .TextLabel1.Text = ("VectorLinux has been installed in your system.")
& "<br><br>" &
+ "<br>" & ("After your computer restarts, you may use VasmCC to perform
any additional configuration.") & "<br>" & "<br>" &
+ ("Click") & Space(1) & "\"" & sTxt & "\"" & Space(1) & ("to restart
your computer now.")
+
+ END WITH
+
+ClsGlobal.fRunningMainForm.listview1["Step9"].picture = MdlStartUp.pDone
+ClsGlobal.fRunningMainForm.listview1["Step10"].picture = MdlStartUp.pNow
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ ME.HBox2.Width = hbox2.Parent.Width - (hbox2.Left * 2)
+
+END
Added: branches/speedy/FDone.form
==============================================================================
--- (empty file)
+++ branches/speedy/FDone.form Fri Apr 17 12:07:23 2009
@@ -0,0 +1,39 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,82,49)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("Installation Complete")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(1,6,8,5)
+ Expand = True
+ }
+ { Frame1 Frame
+ MoveScaled(1,9,78,31)
+ Expand = True
+ Text = ("About your VectorLinux installation")
+ { HBox2 HBox
+ MoveScaled(1,3,76,27)
+ Expand = True
+ { TextLabel1 TextLabel
+ MoveScaled(1,3,69,10)
+ Expand = True
+ Text = ("")
+ }
+ }
+ }
+}
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Fri Apr 17 12:07:23 2009
@@ -51,7 +51,7 @@
ClsGlobal.fRunningMainForm.listview1.add("Cat2", Space(3) & ("System
Configuration"), pCategory)
ClsGlobal.fRunningMainForm.listview1.add("Step6", ("System Boot
Manager"), pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step7", ("Regional Settings"),
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step8", ("User Accounts"),
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step8", ("User Accounts"),
pToDO)
ClsGlobal.fRunningMainForm.listview1.add("Step9", ("Network Settings"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step10", ("Startup Options"),
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step11", ("Final
Configuration"), pToDo)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Fri Apr 17 12:07:23 2009
@@ -195,9 +195,9 @@
PUBLIC SUB FIND_CD_INSTALL_MEDIA()
DIM sDump, sDrive, sOutput, sShortDrive AS String
- DIM sName, sVersion AS String
+ DIM sName, sVersion, sMntPnt AS String
DIM i AS Integer
- DIM sDriveList AS String[]
+ DIM sDriveList, sDumparr AS String[]
ME.mvLooking.Playing = TRUE
WAIT 1
@@ -216,13 +216,23 @@
sDriveList = Split(sOutput, "\n")
FOR i = 0 TO sDriveList.Count - 1
sShortDrive = Right(Trim(sDriveList[i]), Len(Trim(sDriveList[i])) -
RInStr(Trim(sDriveList[i]), "/"))
- EXEC ["mkdir", "-p", "/mnt" &/ sShortDrive] WAIT
- 'EXEC ["mount", "-o", "ro", Trim(sDriveList[i]), "/mnt" &/
sShortDrive] WAIT
- SHELL "mount " & Trim(sDriveList[i]) & Space(1) & "/mnt" &/
sShortDrive & " 2>/dev/null" WAIT
+ sMntPnt = "/mnt" &/ sShortDrive
+ IF IsDir(sMntPnt) = FALSE THEN
+ EXEC ["mkdir", "-p", sMntPnt] WAIT
+ END IF
PRINT ("Scanning") & Space(1) & sDriveList[i]
- IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF")
THEN
- SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
- SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
+ SHELL "mount | grep \"^" & Trim(sDriveList[i]) & "\" | cut -f 3
-d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF NOT (sDump) THEN
+ SHELL "mount " & Trim(sDriveList[i]) & Space(1) & sMntPnt
& " 2>/dev/null" WAIT
+ ELSE
+ sDumparr = Split(sDump, gb.NewLine)
+ sMntPnt = Trim(sDumparr[0])
+ END IF
+
+ IF Exist(sMntPnt &/ "veclinux" &/ "VINSTALL.CONF") THEN
+ SHELL "grep \"^DISTRO=\"" & sMntPnt &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName
+ SHELL "grep \"^VERSION=\"" & sMntPnt &/ "veclinux"
&/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion
sName = Trim(Replace(sName, "\'", ""))
sVersion = Trim(Replace(sVersion, "\'", ""))
File.Save(Temp(sShortDrive), File.Load("/mnt" &/
sShortDrive &/ "veclinux" &/ "VINSTALL.CONF"))
@@ -247,10 +257,10 @@
PUBLIC SUB FIND_ISO_INSTALL_MEDIA()
- DIM sOutput, sPart, sISoName, sFile AS String
- DIM sName, sVersion AS String
+ DIM sOutput, sPart, sISoName, sFile, sDump AS String
+ DIM sName, sVersion, sMntPnt AS String
DIM i AS Integer
- DIM sPartList AS String[]
+ DIM sPartList, sDumparr AS String[]
ME.ComboBox1.Enabled = FALSE
@@ -265,11 +275,21 @@
sPartList = Split(sOutput, "\n")
FOR i = 0 TO sPartList.Count - 1
sPart = Trim(Right(Trim(sPartList[i]), Len(Trim(sPartList[i])) -
RInStr(Trim(sPartList[i]), "/")))
- EXEC ["mkdir", "/mnt" &/ Trim(sPart)] WAIT
- EXEC ["mount", "/dev" &/ Trim(sPart), "/mnt" &/ Trim(sPart)] WAIT
- FOR EACH sFile IN Dir("/mnt" &/ Trim(sPart), "*.iso")
+ sMntPnt = "/mnt" &/ sPart
+ IF IsDir(sMntPnt) = FALSE THEN
+ EXEC ["mkdir", "-p", sMntPnt] WAIT
+ END IF
+ SHELL "mount | grep \"^/dev" &/ Trim(spart) & "\" | cut -f 3
-d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF sDump THEN
+ sDumparr = Split(sDump, gb.NewLine)
+ sMntPnt = Trim(sDumparr[0])
+ ELSE
+ EXEC ["mount", "/dev" &/ Trim(sPart), sMntPnt] WAIT
+ END IF
+ FOR EACH sFile IN Dir(sMntPnt, "*.iso", gb.File)
TRY MKDIR "/mnt/loop"
- EXEC ["mount", "-o", "loop", "/mnt" &/ Trim(sPart) &/
Trim(sFile), "/mnt/loop"] WAIT
+ EXEC ["mount", "-o", "loop", sMntPnt &/
Trim(sFile), "/mnt/loop"] WAIT
IF Exist("/mnt/loop/veclinux/VINSTALL.CONF") THEN
'PRINT "Adding temp file" & Space(1) &
Temp(Trim(sFile) & "-" & Trim(sPart))
File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)),
File.Load("/mnt/loop/veclinux/VINSTALL.CONF"))
@@ -282,9 +302,9 @@
NEXT
- EXEC ["umount", "/mnt" &/ Trim(sPart)] WAIT
+ EXEC ["umount", sMntPnt] WAIT
EXEC ["sync"] WAIT
- TRY RMDIR "/mnt" &/ Trim(sPart)
+ TRY RMDIR sMntPnt
'EXEC ["rm,", "-rf", "/mnt" &/ Trim(sPart)] WAIT
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Apr 17 12:07:23 2009
@@ -255,12 +255,12 @@
'IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
IF LAST.TEXT <> ("Swap") THEN
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
- LAST.text = ("Not Used")
- STOP EVENT
- RETURN
- END IF
- END IF
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ LAST.text = ("Not Used")
+ STOP EVENT
+ RETURN
+ END IF
+ END IF
END IF
IF LAST.text <> ("Not Used") THEN
@@ -328,77 +328,27 @@
DIM sPart, sFormat, sSize, sMntPoint AS String
DIM i, irow AS Integer
-
- ' ================= get the list of vital partitions
=====================
- FOR irow = 2 TO gvPartListing.Rows.count - 1
- IF Trim(gvPartListing[irow, 2].Text) THEN
- IF Trim(gvPartListing[irow, 2].Text) <> ("Not Used") AND
Trim(gvPartListing[irow, 2].Text) <> ("Swap") THEN
+ FOR EACH cb IN ME.objMntPoints
+ IF cb.Text <> ("Not Used") THEN
+ FOR irow = 0 TO gvPartListing.Rows.Count - 1
sPart = Trim(gvPartListing[irow, 0].Text)
sSize = Trim(gvPartListing[irow, 1].Text)
sMntPoint = Trim(gvPartListing[irow, 2].Text)
sFormat = Trim(gvPartListing[irow, 4].Text)
-
- ' Message(gvPartListing[irow, 0].Text & " - (" &
gvPartListing[irow, 1].Text & ") - " & gvPartListing[irow, 2].Text)
- ' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList &
cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
- ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart & "-" &
sSize & "-" & sMntPoint & "-" & sFormat & "|"
-
+ IF sPart = cb.Tag THEN ' we found a match.
+ IF cb.Text <> ("Swap") THEN
+ ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart
& "-" & sSize & "-" & sMntPoint & "-" & sFormat & "|"
+ ELSE
+ ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & sPart
& "-" & sSize & "|"
+ END IF
END IF
- END IF
-
- NEXT
-
- ' =========== get list of swap partitions selected .(if any)
=====================
-
- FOR irow = 2 TO gvPartListing.Rows.count - 1
- IF Trim(gvPartListing[irow, 2].Text) = ("Swap") THEN
- sPart = Trim(gvPartListing[irow, 0].Text)
- sSize = Trim(gvPartListing[irow, 1].Text)
- ' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
- ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & spart & "-" &
sSize & "|"
+
+ NEXT
END IF
NEXT
-
-
- 'Message(ClsGlobal.sVitalPartList)
-'
-' FOR EACH cbox IN objMntPoints
-' IF cbox.Text <> ("Not Used") THEN
-' i = 2
-' REPEAT
-' IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN
-' sSize = Trim(gvPartListing[i, 1].Text)
-' END IF
-' INC i
-' UNTIL sSize OR i = gvPartListing.Rows.Count
-'
-' FOR EACH cb IN objFS
-' IF cbox.tag = cb.Tag THEN
-' sFormat = Trim(cb.Text)
-' BREAK
-' ELSE
-' sFormat = ""
-' END IF
-' NEXT
-' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag
& "-" & sSize & "-" & cbox.Text & "-" & sFormat & ","
-' END IF
-' NEXT
-'
-' FOR i = 2 TO gvPartListing.Rows.count - 1
-' IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN
-' FOR EACH cbox IN objMntPoints
-' IF cbox.tag = gvPartListing[i, 0].Text THEN
-' IF cbox.text <> ("Not Used") THEN
-' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList &
gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & ","
-' END IF
-' END IF
-' NEXT
-' END IF
-' NEXT
-'
-'
+
END
-'
-'
+
PUBLIC SUB Form_Open()
@@ -445,4 +395,6 @@
cbYN.Visible = FALSE
END
+
+
|
|
From: <cod...@go...> - 2009-04-16 21:13:00
|
Author: M0...@gm...
Date: Thu Apr 16 14:12:19 2009
New Revision: 535
Modified:
branches/speedy/.lang/.pot
branches/speedy/.project
branches/speedy/Conf3.class
branches/speedy/Conf5.class
branches/speedy/Conf5.form
branches/speedy/Step1.form
Log:
- Implemented services window into host project.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Apr 16 14:12:19 2009
@@ -200,7 +200,7 @@
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198 Conf3.class:379
+#: Conf2.class:198 Conf3.class:380
msgid "Re-enter Password"
msgstr ""
@@ -221,79 +221,79 @@
msgid "to continue"
msgstr ""
-#: Conf3.class:98
+#: Conf3.class:99
msgid "Select picture ID"
msgstr ""
-#: Conf3.class:100
+#: Conf3.class:101
msgid "Select picture ID for"
msgstr ""
-#: Conf3.class:132
+#: Conf3.class:133
msgid "You must enter a login name first."
msgstr ""
-#: Conf3.class:135
+#: Conf3.class:136
msgid "Please select a password for"
msgstr ""
-#: Conf3.class:135
+#: Conf3.class:136
msgid "before continuing"
msgstr ""
-#: Conf3.class:138
+#: Conf3.class:139
msgid "You must enter the password twice for added security"
msgstr ""
-#: Conf3.class:165
+#: Conf3.class:166
msgid "User"
msgstr ""
-#: Conf3.class:165
+#: Conf3.class:166
msgid "already exists in the system."
msgstr ""
-#: Conf3.class:165
+#: Conf3.class:166
msgid "Please select another user login name"
msgstr ""
-#: Conf3.class:210
+#: Conf3.class:211
msgid "Use only lowercase letters and numbers for this field"
msgstr ""
-#: Conf3.class:280
+#: Conf3.class:281
msgid "Create User Accounts"
msgstr ""
-#: Conf3.class:330
+#: Conf3.class:331
msgid "Login Name"
msgstr ""
-#: Conf3.class:346
+#: Conf3.class:347
msgid "Real Name"
msgstr ""
-#: Conf3.class:362
+#: Conf3.class:363
msgid "Enter Password"
msgstr ""
-#: Conf3.class:407
+#: Conf3.class:408
msgid "Click here to select user Login picture"
msgstr ""
-#: Conf3.class:417
+#: Conf3.class:418
msgid "Create User"
msgstr ""
-#: Conf3.class:434
+#: Conf3.class:435
msgid "Import Existing User"
msgstr ""
-#: Conf3.class:450
+#: Conf3.class:451
msgid "Clear Form"
msgstr ""
-#: Conf3.class:465
+#: Conf3.class:466
msgid "User Rights Management"
msgstr ""
@@ -388,11 +388,11 @@
msgid "Network Settings"
msgstr ""
-#: Conf5.class:58
+#: Conf5.class:59
msgid "Service"
msgstr ""
-#: Conf5.class:87
+#: Conf5.class:88
msgid "System task scheduler"
msgstr ""
@@ -400,59 +400,59 @@
msgid "Bluetooth device manager"
msgstr ""
-#: Conf5.class:95
+#: Conf5.class:94
msgid "Secure Shell remote access"
msgstr ""
-#: Conf5.class:99
+#: Conf5.class:97
msgid "Software update notifications"
msgstr ""
-#: Conf5.class:103
+#: Conf5.class:100
msgid "Wireless network scanner"
msgstr ""
-#: Conf5.class:107
+#: Conf5.class:103
msgid "Printing service"
msgstr ""
-#: Conf5.class:111
+#: Conf5.class:106
msgid "File in userspace daemon"
msgstr ""
-#: Conf5.class:114
+#: Conf5.class:109
msgid "Internet Super Server"
msgstr ""
-#: Conf5.class:117
+#: Conf5.class:112
msgid "RPC Port Mapper"
msgstr ""
-#: Conf5.class:120
+#: Conf5.class:115
msgid "Windows networking service"
msgstr ""
-#: Conf5.class:123
+#: Conf5.class:118
msgid "VMWare modules"
msgstr ""
-#: Conf5.class:126
+#: Conf5.class:121
msgid "Network interface manager"
msgstr ""
-#: Conf5.class:129
+#: Conf5.class:124
msgid "Enhanced network security"
msgstr ""
-#: Conf5.class:132
+#: Conf5.class:127
msgid "Mouse driver for Text Mode interface"
msgstr ""
-#: Conf5.class:206
+#: Conf5.class:202
msgid "System Services"
msgstr ""
-#: Conf5.class:227
+#: Conf5.class:223
msgid "Select the system services to be launched at start-up."
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Thu Apr 16 14:12:19 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
-Startup=Conf5
+Startup=MdlStartUp
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class (original)
+++ branches/speedy/Conf3.class Thu Apr 16 14:12:19 2009
@@ -50,7 +50,7 @@
END WITH
WAIT 0.1
Button1.Enabled = ME.check_for_impartable_accounts()
- 'MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
+ ClsGlobal.fRunningMainForm.btnext.Enabled = TRUE
END
PUBLIC FUNCTION GetNext() AS String
@@ -71,6 +71,7 @@
obj.delete
NEXT
MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
+ ClsGlobal.fRunningMainForm.btnext.Enabled = TRUE
END
Modified: branches/speedy/Conf5.class
==============================================================================
--- branches/speedy/Conf5.class (original)
+++ branches/speedy/Conf5.class Thu Apr 16 14:12:19 2009
@@ -45,6 +45,7 @@
WITH ME
.gvSvcList.Height = .ClientH - (.gvSvcList.Top + 12)
+ .gvSvcList.Columns[2].Width = .gvSvcList.Width -
(.gvSvcList.Columns[2].Left + 12)
END WITH
END
@@ -52,19 +53,19 @@
DIM i AS Integer
WITH ME
.gvSvcList.Rows.Count = 3
- .gvSvcList.columns.Count = 3
+ .gvSvcList.columns.Count = 4
.gvheader.rows.Count = 1
.gvheader.Columns.Count = 3
.gvheader[0, 2].Text = UCase(("Service"))
- FOR i = 0 TO gvSvcList.columns.Count - 1
+ FOR i = 0 TO gvheader.columns.Count - 1
.gvheader[0, i].BackColor = Color.SelectedBackground
-
.gvheader[0, i].Alignment = Align.Center
NEXT
.gvSvcList.columns[0].Width = 24
.gvheader.Columns[0].Width = 24
.gvSvcList.Columns[1].Width = 64
.gvheader.Columns[1].Width = 64
+ .gvSvcList.Columns[3].Width = 1
END WITH
@@ -86,27 +87,21 @@
CASE "cron"
sDesc = ("System task scheduler")
sPic = picStatus
- 'sLogo = Image.Load("images/cron.svg")
CASE "bluetooth"
sDesc = ("Bluetooth device manager")
sPic = ""
- 'sLogo = Image.Load("images/bluetooth.svg")
CASE "sshd"
sDesc = ("Secure Shell remote access")
sPic = ""
- 'sLogo = Image.Load("images/sshd.svg")
CASE "gslaptd"
sDesc = ("Software update notifications")
sPic = picStatus
- 'sLogo = Image.Load("images/gslaptd.svg")
CASE "wifi-radar"
sDesc = ("Wireless network scanner")
sPic = ""
- 'sLogo = Image.Load("images/wifi-radar.svg")
CASE "cups"
sDesc = ("Printing service")
sPic = picStatus
-
CASE "fuse"
sDesc = ("File in userspace daemon")
sPic = ""
@@ -148,6 +143,7 @@
ME.gvSvcList.rows[irow].Height = 64 'sLogo.Height
ME.gvSvcList[irow, 0].Alignment = Align.Center
ME.gvSvcList[irow, 2].Text = UCase(sService) & gb.NewLine &
gb.NewLine & sDesc
+ ME.gvSvcList[irow, 3].Text = sService
INC irow
INC gvSvcList.Rows.Count
END IF
Modified: branches/speedy/Conf5.form
==============================================================================
--- branches/speedy/Conf5.form (original)
+++ branches/speedy/Conf5.form Thu Apr 16 14:12:19 2009
@@ -44,5 +44,6 @@
{ gvSvcList GridView
MoveScaled(1,18,56,19)
Expand = True
+ Scrollbar = Scroll.Vertical
}
}
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Thu Apr 16 14:12:19 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,67,59)
+ MoveScaled(0,0,67,69)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -18,7 +18,7 @@
}
}
{ Panel1 Panel
- MoveScaled(1,8,60,45)
+ MoveScaled(1,8,60,56)
Expand = True
Arrangement = Arrange.Row
{ TextLabel2 TextLabel
@@ -68,14 +68,14 @@
Expand = True
Text = ("Check Installation media before installing")
}
- { mvLooking MovieBox
- MoveScaled(5,24,11,25)
- Expand = True
- }
{ tlNext TextLabel
MoveScaled(2,26,45,6)
Expand = True
Text = ("")
+ }
+ { mvLooking MovieBox
+ MoveScaled(4,27,11,28)
+ Expand = True
}
}
}
|
|
From: <cod...@go...> - 2009-04-16 20:01:47
|
Author: M0...@gm...
Date: Thu Apr 16 12:58:36 2009
New Revision: 534
Added:
branches/speedy/Conf4.class
branches/speedy/Conf4.form
branches/speedy/Conf5.class
branches/speedy/Conf5.form
branches/speedy/images/bluetooth.svg
branches/speedy/images/cron.svg
branches/speedy/images/cups.svg
branches/speedy/images/firewall.svg
branches/speedy/images/gslaptd.svg
branches/speedy/images/inetd.svg
branches/speedy/images/network-wired.svg
branches/speedy/images/samba.svg (contents, props changed)
branches/speedy/images/service.svg
branches/speedy/images/sshd.svg
branches/speedy/images/wicd.svg
branches/speedy/images/wifi-radar.svg
Modified:
branches/speedy/.lang/#project.pot
branches/speedy/.lang/.pot
branches/speedy/.lang/ClsFstab.pot
branches/speedy/.lang/ClsGlobal.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/MdlAutoPartition.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/MdlHelpSystem.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/MdlStartUp.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/.lang/Step3a3a.pot
branches/speedy/.lang/Step4.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
branches/speedy/Conf3a.class
Log:
- Started services options window
- Added icons for services.
Modified: branches/speedy/.lang/#project.pot
==============================================================================
--- branches/speedy/.lang/#project.pot (original)
+++ branches/speedy/.lang/#project.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/.project
+# /home/vluser/devel/speedy/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Apr 16 12:58:36 2009
@@ -357,33 +357,105 @@
msgid "Description"
msgstr ""
-#: Conf3a.class:237
+#: Conf3a.class:233
msgid "Import user accounts into VectorLinux"
msgstr ""
-#: Conf3a.class:250
+#: Conf3a.class:246
msgid ""
"Select which user account to import, and which settings to reset.
Un-checked "
"items will be carried over, while checked items will be reset to factory "
"defaults."
msgstr ""
-#: Conf3a.class:260
+#: Conf3a.class:256
msgid "User account to import"
msgstr ""
-#: Conf3a.class:279
+#: Conf3a.class:275
msgid "Account Contents to reset"
msgstr ""
-#: Conf3a.class:306
+#: Conf3a.class:302
msgid "Accept"
msgstr ""
-#: Conf3a.class:312
+#: Conf3a.class:308
msgid "Cancel"
msgstr ""
+#: Conf4.class:68 MdlStartUp.module:55
+msgid "Network Settings"
+msgstr ""
+
+#: Conf5.class:58
+msgid "Service"
+msgstr ""
+
+#: Conf5.class:87
+msgid "System task scheduler"
+msgstr ""
+
+#: Conf5.class:91
+msgid "Bluetooth device manager"
+msgstr ""
+
+#: Conf5.class:95
+msgid "Secure Shell remote access"
+msgstr ""
+
+#: Conf5.class:99
+msgid "Software update notifications"
+msgstr ""
+
+#: Conf5.class:103
+msgid "Wireless network scanner"
+msgstr ""
+
+#: Conf5.class:107
+msgid "Printing service"
+msgstr ""
+
+#: Conf5.class:111
+msgid "File in userspace daemon"
+msgstr ""
+
+#: Conf5.class:114
+msgid "Internet Super Server"
+msgstr ""
+
+#: Conf5.class:117
+msgid "RPC Port Mapper"
+msgstr ""
+
+#: Conf5.class:120
+msgid "Windows networking service"
+msgstr ""
+
+#: Conf5.class:123
+msgid "VMWare modules"
+msgstr ""
+
+#: Conf5.class:126
+msgid "Network interface manager"
+msgstr ""
+
+#: Conf5.class:129
+msgid "Enhanced network security"
+msgstr ""
+
+#: Conf5.class:132
+msgid "Mouse driver for Text Mode interface"
+msgstr ""
+
+#: Conf5.class:206
+msgid "System Services"
+msgstr ""
+
+#: Conf5.class:227
+msgid "Select the system services to be launched at start-up."
+msgstr ""
+
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
@@ -530,10 +602,6 @@
#: MdlStartUp.module:54
msgid "User Accounts"
-msgstr ""
-
-#: MdlStartUp.module:55
-msgid "Network Settings"
msgstr ""
#: MdlStartUp.module:56
Modified: branches/speedy/.lang/ClsFstab.pot
==============================================================================
--- branches/speedy/.lang/ClsFstab.pot (original)
+++ branches/speedy/.lang/ClsFstab.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/ClsFstab.class
+# /home/vluser/devel/speedy/ClsFstab.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/ClsGlobal.pot
==============================================================================
--- branches/speedy/.lang/ClsGlobal.pot (original)
+++ branches/speedy/.lang/ClsGlobal.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/ClsGlobal.class
+# /home/vluser/devel/speedy/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Conf0.class
+# /home/vluser/devel/speedy/Conf0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/FMain.class
+# /home/vluser/devel/speedy/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/FMain0.class
+# /home/vluser/devel/speedy/FMain0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlAutoPartition.pot
==============================================================================
--- branches/speedy/.lang/MdlAutoPartition.pot (original)
+++ branches/speedy/.lang/MdlAutoPartition.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlAutoPartition.module
+# /home/vluser/devel/speedy/MdlAutoPartition.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlBootMngr.module
+# /home/vluser/devel/speedy/MdlBootMngr.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlHelpSystem.pot
==============================================================================
--- branches/speedy/.lang/MdlHelpSystem.pot (original)
+++ branches/speedy/.lang/MdlHelpSystem.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlHelpSystem.module
+# /home/vluser/devel/speedy/MdlHelpSystem.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlMain.module
+# /home/vluser/devel/speedy/MdlMain.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- branches/speedy/.lang/MdlStartUp.pot (original)
+++ branches/speedy/.lang/MdlStartUp.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/MdlStartUp.module
+# /home/vluser/devel/speedy/MdlStartUp.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step0.class
+# /home/vluser/devel/speedy/Step0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step1.class
+# /home/vluser/devel/speedy/Step1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step2.class
+# /home/vluser/devel/speedy/Step2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3.class
+# /home/vluser/devel/speedy/Step3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a.class
+# /home/vluser/devel/speedy/Step3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a1.class
+# /home/vluser/devel/speedy/Step3a1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a1a.class
+# /home/vluser/devel/speedy/Step3a1a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a2.class
+# /home/vluser/devel/speedy/Step3a2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- branches/speedy/.lang/Step3a3.pot (original)
+++ branches/speedy/.lang/Step3a3.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a3.class
+# /home/vluser/devel/speedy/Step3a3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a3a.pot (original)
+++ branches/speedy/.lang/Step3a3a.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step3a3a.class
+# /home/vluser/devel/speedy/Step3a3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step4.pot
==============================================================================
--- branches/speedy/.lang/Step4.pot (original)
+++ branches/speedy/.lang/Step4.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step4.class
+# /home/vluser/devel/speedy/Step4.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step5.class
+# /home/vluser/devel/speedy/Step5.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step6.class
+# /home/vluser/devel/speedy/Step6.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step7.class
+# /home/vluser/devel/speedy/Step7.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step7a.class
+# /home/vluser/devel/speedy/Step7a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step7b.class
+# /home/vluser/devel/speedy/Step7b.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Thu Apr 16 12:58:36 2009
@@ -1,4 +1,4 @@
-# /home/lightuser/devel/speedy/Step8.class
+# /home/vluser/devel/speedy/Step8.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Thu Apr 16 12:58:36 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
-# Compiled with Gambas 2.12
+# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
-Startup=MdlStartUp
+Startup=Conf5
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/Conf3a.class
==============================================================================
--- branches/speedy/Conf3a.class (original)
+++ branches/speedy/Conf3a.class Thu Apr 16 12:58:36 2009
@@ -173,11 +173,7 @@
END IF
NEXT
sList = Trim(sList)
- ' IF sList THEN
- ' Message(sList)
- ' ELSE
- ' Message("No settings to reset")
- ' END IF
+
END
Added: branches/speedy/Conf4.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf4.class Thu Apr 16 12:58:36 2009
@@ -0,0 +1,44 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+'
+' ================ network setup window ========
+
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
+ END WITH
+
+END
+
+PUBLIC FUNCTION GetNext() AS String
+
+
+ RETURN "Conf5"
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
Added: branches/speedy/Conf4.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf4.form Thu Apr 16 12:58:36 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,83,54)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("Network Settings")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
Added: branches/speedy/Conf5.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf5.class Thu Apr 16 12:58:36 2009
@@ -0,0 +1,175 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+' ==================== services configuration settings =================
+PRIVATE picStatus AS Picture
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
+ END WITH
+ ME.Prepare_Grid()
+ ME.lIST_SERVICES()
+END
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "FDone"
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .gvSvcList.Height = .ClientH - (.gvSvcList.Top + 12)
+ END WITH
+
+END
+PUBLIC SUB Prepare_Grid()
+ DIM i AS Integer
+ WITH ME
+ .gvSvcList.Rows.Count = 3
+ .gvSvcList.columns.Count = 3
+ .gvheader.rows.Count = 1
+ .gvheader.Columns.Count = 3
+ .gvheader[0, 2].Text = UCase(("Service"))
+ FOR i = 0 TO gvSvcList.columns.Count - 1
+ .gvheader[0, i].BackColor = Color.SelectedBackground
+
+ .gvheader[0, i].Alignment = Align.Center
+ NEXT
+ .gvSvcList.columns[0].Width = 24
+ .gvheader.Columns[0].Width = 24
+ .gvSvcList.Columns[1].Width = 64
+ .gvheader.Columns[1].Width = 64
+ END WITH
+
+
+END
+
+
+PUBLIC SUB lIST_SERVICES()
+
+ DIM irow AS Integer
+ DIM sService, sDesc AS String
+ DIM sPic AS Picture
+ DIM sLogo AS Image
+ DIM sSvcPath AS String = "/etc/rc.d/init.d" 'ClsGlobal.sTargetPath
&/ "etc" &/ "rc.d" &/ "init.d"
+
+ picStatus = Picture.Load("images/16px-check.png")
+
+ FOR EACH sService IN Dir(sSvcPath, "*", gb.File)
+ SELECT CASE sService
+ CASE "cron"
+ sDesc = ("System task scheduler")
+ sPic = picStatus
+ 'sLogo = Image.Load("images/cron.svg")
+ CASE "bluetooth"
+ sDesc = ("Bluetooth device manager")
+ sPic = ""
+ 'sLogo = Image.Load("images/bluetooth.svg")
+ CASE "sshd"
+ sDesc = ("Secure Shell remote access")
+ sPic = ""
+ 'sLogo = Image.Load("images/sshd.svg")
+ CASE "gslaptd"
+ sDesc = ("Software update notifications")
+ sPic = picStatus
+ 'sLogo = Image.Load("images/gslaptd.svg")
+ CASE "wifi-radar"
+ sDesc = ("Wireless network scanner")
+ sPic = ""
+ 'sLogo = Image.Load("images/wifi-radar.svg")
+ CASE "cups"
+ sDesc = ("Printing service")
+ sPic = picStatus
+
+ CASE "fuse"
+ sDesc = ("File in userspace daemon")
+ sPic = ""
+ CASE "inetd"
+ sDesc = ("Internet Super Server")
+ sPic = ""
+ CASE "portmap"
+ sDesc = ("RPC Port Mapper")
+ sPic = ""
+ CASE "samba"
+ sDesc = ("Windows networking service")
+ sPic = ""
+ CASE "vmware"
+ sDesc = ("VMWare modules")
+ sPic = ""
+ CASE "wicd"
+ sDesc = ("Network interface manager")
+ sPic = picStatus
+ CASE "firewall"
+ sDesc = ("Enhanced network security")
+ sPic = ""
+ CASE "gpm"
+ sDesc = ("Mouse driver for Text Mode interface")
+ sPic = ""
+ END SELECT
+ IF Exist("images" &/ sService & ".svg") THEN
+ sLogo = Image.Load("images" &/ sService & ".svg")
+ ELSE
+ sLogo = Image.Load("images" &/ "service.svg")
+ END IF
+
+
+ IF sDesc THEN
+ ME.gvSvcList[irow, 0].Picture = sPic
+ IF sLogo THEN
+ ME.gvSvcList[irow, 1].Picture = sLogo.Picture
+ ME.gvSvcList[irow, 1].Alignment = Align.Center
+ END IF
+ ME.gvSvcList.rows[irow].Height = 64 'sLogo.Height
+ ME.gvSvcList[irow, 0].Alignment = Align.Center
+ ME.gvSvcList[irow, 2].Text = UCase(sService) & gb.NewLine &
gb.NewLine & sDesc
+ INC irow
+ INC gvSvcList.Rows.Count
+ END IF
+ NEXT
+
+ DEC gvSvcList.Rows.Count
+ DEC gvSvcList.Rows.Count
+ DEC gvSvcList.Rows.Count
+
+
+END
+
+
+PUBLIC SUB gvSvcList_Click()
+
+ IF LAST.column > 0 THEN RETURN
+ IF gvSvcList[LAST.row, 0].Picture = picStatus THEN
+ gvSvcList[LAST.row, 0].Picture = ""
+ ELSE
+ gvSvcList[LAST.row, 0].Picture = picStatus
+ END IF
+
+ gvSvcList.Refresh()
+
+END
Added: branches/speedy/Conf5.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf5.form Thu Apr 16 12:58:36 2009
@@ -0,0 +1,48 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,94,47)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("System Services")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(4,5,6,2)
+ Expand = True
+ }
+ { HBox2 HBox
+ MoveScaled(0,7,59,3.5)
+ Expand = True
+ { tlExp TextLabel
+ MoveScaled(1,0,21,3.5)
+ Expand = True
+ Text = ("Select the system services to be launched at start-up.")
+ }
+ }
+ { HBox3 HBox
+ MoveScaled(1,11,4,2)
+ Expand = True
+ }
+ { gvheader GridView
+ MoveScaled(1,13,56,3)
+ Expand = True
+ Scrollbar = Scroll.None
+ Border = False
+ }
+ { gvSvcList GridView
+ MoveScaled(1,18,56,19)
+ Expand = True
+ }
+}
Added: branches/speedy/images/bluetooth.svg
==============================================================================
--- (empty file)
+++ branches/speedy/images/bluetooth.svg Thu Apr 16 12:58:36 2009
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2160"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docname="bluetooth-applet-48.svg"
+ sodipodi:docbase="/home/lapo/Scrivania/bluetooth-icons"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+
inkscape:export-filename="/home/andreas/Desktop/bluetooth/bluetooth-applet-16.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2162">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3393">
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1;"
+ offset="0"
+ id="stop3395" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:0;"
+ offset="1"
+ id="stop3397" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3383">
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1"
+ offset="0"
+ id="stop3385" />
+ <stop
+ style="stop-color:#3465a4;stop-opacity:1"
+ offset="1"
+ id="stop3387" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4140"
+ inkscape:collect="always">
+ <stop
+ id="stop4142"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1" />
+ <stop
+ id="stop4144"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient8692"
+ inkscape:collect="always">
+ <stop
+ id="stop8694"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop8696"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ id="filter3274">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.511583"
+ id="feGaussianBlur3276" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8692"
+ id="radialGradient3286"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(0.8963782,0,6.4445216e-6,0.1737589,2.7974976,36.922651)"
+ cx="27"
+ cy="45.047184"
+ fx="27"
+ fy="45.047184"
+ r="17.625" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3383"
+ id="radialGradient3288"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(2.9717705,-0.4142331,0.1691176,1.2132755,-27.792082,-2.2504815)"
+ cx="10.930984"
+ cy="8.4716578"
+ fx="10.930984"
+ fy="8.4716578"
+ r="17.000002" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3393"
+ id="linearGradient3290"
+ gradientUnits="userSpaceOnUse"
+ x1="23.25"
+ y1="48.216961"
+ x2="23.25"
+ y2="32.278145" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4140"
+ id="linearGradient3292"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(2.8151854,0,0,2.6854398,-6.9670375,-7.8825588)"
+ x1="8.2285843"
+ y1="7.8516045"
+ x2="19.823189"
+ y2="24.029535" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="-31.207866"
+ inkscape:cy="23.321019"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ width="48px"
+ height="48px"
+ inkscape:window-width="872"
+ inkscape:window-height="946"
+ inkscape:window-x="418"
+ inkscape:window-y="49"
+ gridspacingx="0.5px"
+ gridspacingy="0.5px"
+ gridempspacing="2"
+ inkscape:grid-points="true"
+ inkscape:showpageshadow="false"
+ showborder="false" />
+ <metadata
+ id="metadata2165">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g3278"
+ transform="translate(0,1)">
+ <path
+ transform="matrix(1.0212766,0,0,1.2040816,-3.5744683,-10.244898)"
+ d="M 44.625 44.6875 A 17.625 3.0625 0 1 1 9.375,44.6875 A 17.625
3.0625 0 1 1 44.625 44.6875 z"
+ sodipodi:ry="3.0625"
+ sodipodi:rx="17.625"
+ sodipodi:cy="44.6875"
+ sodipodi:cx="27"
+ id="path3361"
+
style="opacity:0.46330273;fill:url(#radialGradient3286);fill-opacity:1;stroke:none;stroke-width:0.80671531;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <rect
+ ry="16.484543"
+ rx="16.484543"
+ y="0.51545823"
+ x="7.5154586"
+ height="44.969082"
+ width="32.969086"
+ id="rect3363"
+
style="color:#000000;fill:url(#radialGradient3288);fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:1.03091633;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
/>
+ <rect
+ ry="16.129303"
+ rx="15.999998"
+ y="0.99999833"
+ x="8.0000029"
+ height="44"
+ width="31.999996"
+ id="rect3391"
+
style="color:#000000;fill:url(#linearGradient3290);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.03091633;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
/>
+ <rect
+ ry="15.48352"
+ rx="15.48352"
+ y="1.516481"
+ x="8.5164804"
+ height="42.967037"
+ width="30.967039"
+ id="rect3365"
+
style="opacity:0.39768342;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3292);stroke-width:1.03296196;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
/>
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path3401"
+ d="M 14.638608,32.077196 L 32.499999,16.291697 L
23.58028,7.4999996 L 23.553586,36.5 L 32.493732,27.775843 L
14.500001,14.606097"
+
style="fill:none;fill-rule:evenodd;stroke:#3465a4;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3274)"
/>
+ <path
+ sodipodi:nodetypes="cccccc"
+ id="path3367"
+ d="M 14.638608,33.077196 L 32.499999,17.291697 L
23.58028,8.4999996 L 23.553586,37.5 L 32.493732,28.775843 L
14.500001,15.606097"
+
style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ </g>
+ </g>
+</svg>
Added: branches/speedy/images/cron.svg
==============================================================================
--- (empty file)
+++ branches/speedy/images/cron.svg Thu Apr 16 12:58:36 2009
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg1307"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ version="1.0"
+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/status"
+ sodipodi:docname="appointment-soon.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <sodipodi:namedview
+ inkscape:cy="5.2420515"
+ inkscape:cx="16.1388"
+ inkscape:zoom="4"
+ inkscape:window-height="974"
+ inkscape:window-width="1070"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:showpageshadow="false"
+ inkscape:window-x="296"
+ inkscape:window-y="44"
+ inkscape:current-layer="layer1"
+ showborder="false" />
+ <defs
+ id="defs1309">
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2789"
+ id="linearGradient5969"
+ gradientUnits="userSpaceOnUse"
+ x1="21.347506"
+ y1="45.17091"
+ x2="21.347506"
+ y2="4.3226557" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2789"
+ id="linearGradient5971"
+ gradientUnits="userSpaceOnUse"
+ x1="25.593685"
+ y1="20.92672"
+ x2="26.1399"
+ y2="51.027462" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2276"
+ id="linearGradient5978"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(2.742212,0,0,2.838566,-4.403543,-5.255819)"
+ x1="7.2744212"
+ y1="7.1350532"
+ x2="9.814188"
+ y2="5.6588697" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2276"
+ id="radialGradient5981"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(2.147084,4.691471e-7,-4.692465e-7,2.147071,1.426465,0.43105)"
+ cx="10.5"
+ cy="10.498917"
+ fx="10.5"
+ fy="10.498917"
+ r="10.495841" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6917">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6919" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop6921" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2789">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop2791" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop2793" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2322">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop2324" />
+ <stop
+ style="stop-color:#c1c7bc;stop-opacity:1;"
+ offset="1"
+ id="stop2326" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2276">
+ <stop
+ style="stop-color:#f57900;stop-opacity:1;"
+ offset="0"
+ id="stop2278" />
+ <stop
+ style="stop-color:#fcaf3e;stop-opacity:1;"
+ offset="1"
+ id="stop2280" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6917"
+ id="radialGradient6175"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2886598,0,19.828608)"
+ cx="16"
+ cy="27.875"
+ fx="16"
+ fy="27.875"
+ r="12.125" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2322"
+ id="radialGradient6177"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(0.4044676,0,0,0.427577,4.3012139,2.476585)"
+ cx="10.78257"
+ cy="15.491104"
+ fx="10.78257"
+ fy="15.491104"
+ r="17.709194" />
+ </defs>
+ <sodipodi:namedview
+ id="namedview25"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.598901"
+ inkscape:cx="33.956881"
+ inkscape:cy="16"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="736"
+ inkscape:window-height="928"
+ inkscape:window-x="198"
+ inkscape:window-y="12" />
+ <metadata
+ id="metadata1312">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Appointment Soon</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Rodney Dawes</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>appointment</rdf:li>
+ <rdf:li>soon</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g6139">
+ <path
+ transform="matrix(1.7319588,0,0,1.9999999,-3.7113407,-15.749998)"
+ d="M 28.125 27.875 A 12.125 3.5 0 1 1 3.875,27.875 A 12.125 3.5
0 1 1 28.125 27.875 z"
+ sodipodi:ry="3.5"
+ sodipodi:rx="12.125"
+ sodipodi:cy="27.875"
+ sodipodi:cx="16"
+ id="path6156"
+
style="opacity:0.4;color:#000000;fill:url(#radialGradient6175);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(2.7107753,0,0,2.464925,0.447975,-1.8415564)"
+ d="M 15.092248 10.078017 A 6.4298334 7.0996075 0 1 1
2.2325811,10.078017 A 6.4298334 7.0996075 0 1 1 15.092248 10.078017 z"
+ sodipodi:ry="7.0996075"
+ sodipodi:rx="6.4298334"
+ sodipodi:cy="10.078017"
+ sodipodi:cx="8.6624146"
+ id="path6158"
+
style="fill:url(#radialGradient6177);fill-opacity:1;stroke:#babdb6;stroke-width:0.38685802;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ id="path6160"
+ d="M 23.96875,5.3393085 C 14.464374,5.3393085 6.75,13.021982
6.75,22.52681 C 6.75,22.912451 6.7875273,23.303738 6.8125,23.68306 C
7.4129186,14.722893 14.856864,7.6518085 23.96875,7.6518085 C
33.080637,7.6518085 40.524581,14.722894 41.125,23.68306 C
41.149973,23.303738 41.1875,22.912451 41.1875,22.52681 C 41.1875,13.021983
33.473127,5.3393084 23.96875,5.3393085 z "
+
style="opacity:0.11855672;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ id="path6162"
+ d="M 23.165684,1.5068059 C 11.702548,1.9429331
2.5000026,11.407295 2.5000026,22.975303 C 2.5000026,34.820942
12.123906,44.443799 23.97084,44.443799 C 35.817772,44.443799
45.441678,34.820946 45.441678,22.975303 C 45.441678,11.129661
35.817772,1.5068058 23.97084,1.5068059 C 23.693177,1.5068059
23.440799,1.4963388 23.165684,1.5068059 z M 23.098587,5.8005051 C
23.391363,5.7856631 23.674395,5.8005051 23.97084,5.8005051 C
33.457129,5.8005051 41.14751,13.49846 41.14751,22.975303 C
41.14751,32.452145 33.457129,40.150099 23.97084,40.150099 C
14.48455,40.150099 6.7941703,32.452145 6.7941703,22.975303 C
6.7941703,13.79461 14.022552,6.2606052 23.098587,5.8005051 z "
+
style="fill:url(#radialGradient5981);fill-opacity:1;stroke:#ce5c00;stroke-width:1.00000107;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path6164"
+ d="M 24.493279,24.492024 L 24.498392,8.5427514 C
19.056113,8.7363025 15.099477,10.659248 11.948663,14.987783 L
24.493279,24.492024 z "
+
style="fill:url(#linearGradient5978);fill-opacity:1;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ transform="matrix(1.029875,0,0,1.029875,-0.233294,-2.458137)"
+ d="M 43.375 24.75 A 19.875 19.875 0 1 1 3.625,24.75 A 19.875
19.875 0 1 1 43.375 24.75 z"
+ sodipodi:ry="19.875"
+ sodipodi:rx="19.875"
+ sodipodi:cy="24.75"
+ sodipodi:cx="23.5"
+ id="path6166"
+
style="opacity:0.51030926;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5971);stroke-width:0.97099239;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path6168"
+ d="M 11.623626,14.879722 L 23.204863,26.812341 L
35.561623,25.437341 L 24.3617,23.762517 L 11.623626,14.879722 z "
+
style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <path
+ d="M 26.25 25.0625 A 2.6875 2.6875 0 1 1 20.875,25.0625 A 2.6875
2.6875 0 1 1 26.25 25.0625 z"
+ sodipodi:ry="2.6875"
+ sodipodi:rx="2.6875"
+ sodipodi:cy="25.0625"
+ sodipodi:cx="23.5625"
+ id="path6170"
+
style="color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(-0.6,0,0,-0.6,36.49775,38.66472)"
+ d="M 23.5 23.65625 A 1.25 1.25 0 1 1 21,23.65625 A 1.25 1.25 0 1
1 23.5 23.65625 z"
+ sodipodi:ry="1.25"
+ sodipodi:rx="1.25"
+ sodipodi:cy="23.65625"
+ sodipodi:cx="22.25"
+ id="path6172"
+
style="opacity:0.47422683;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+
style="opacity:0.51030926;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5969);stroke-width:1.09181988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path5967"
+ sodipodi:cx="23.5"
+ sodipodi:cy="24.75"
+ sodipodi:rx="19.875"
+ sodipodi:ry="19.875"
+ d="M 43.375 24.75 A 19.875 19.875 0 1 1 3.625,24.75 A 19.875
19.875 0 1 1 43.375 24.75 z"
+ transform="matrix(0.9159027,0,0,0.9159027,2.4450561,0.3626785)" />
+ </g>
+ </g>
+</svg>
Added: branches/speedy/images/cups.svg
==============================================================================
--- (empty file)
+++ branches/speedy/images/cups.svg Thu Apr 16 12:58:36 2009
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ version="1.0"
+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/status"
+ sodipodi:docname="printer-printing.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8702">
+ <stop
+ style="stop-color:#fce94f;stop-opacity:1;"
+ offset="0"
+ id="stop8704" />
+ <stop
+ style="stop-color:#fce94f;stop-opacity:0;"
+ offset="1"
+ id="stop8706" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7658"
+ inkscape:collect="always">
+ <stop
+ id="stop7660"
+ offset="0"
+ style="stop-color:#d3d7cf" />
+ <stop
+ id="stop7662"
+ offset="1"
+ style="stop-color:#eeeeec" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7652">
+ <stop
+ id="stop7654"
+ offset="0"
+ style="stop-color:#555753;stop-opacity:1;" />
+ <stop
+ id="stop7656"
+ offset="1"
+ style="stop-color:#babdb6;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7644">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop7646" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop7648" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7591">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop7593" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop7595" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7486">
+ <stop
+ style="stop-color:#204a87;stop-opacity:1"
+ offset="0"
+ id="stop7488" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1"
+ offset="1"
+ id="stop7490" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7434">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop7436" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop7438" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7426">
+ <stop
+ style="stop-color:#555753;stop-opacity:1;"
+ offset="0"
+ id="stop7428" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:1"
+ offset="1"
+ id="stop7430" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7413">
+ <stop
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0"
+ id="stop7415" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1"
+ id="stop7417" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7392">
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1;"
+ offset="0"
+ id="stop7394" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:0;"
+ offset="1"
+ id="stop7396" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7376">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop7378" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop7380" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient7368">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop7370" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop7372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1385">
+ <stop
+ style="stop-color:#888a85"
+ offset="0"
+ id="stop1387" />
+ <stop
+ style="stop-color:#d3d7cf"
+ offset="1"
+ id="stop1389" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2326"
+ inkscape:collect="always">
+ <stop
+ id="stop2328"
+ offset="0"
+ style="stop-color:#fcaf3e" />
+ <stop
+ id="stop2330"
+ offset="1"
+ style="stop-color:#fce94f" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2304">
+ <stop
+ style="stop-color:#babdb6"
+ offset="0"
+ id="stop2306" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop2308" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2253">
+ <stop
+ style="stop-color:#e3e3e0;stop-opacity:1;"
+ offset="0"
+ id="stop2255" />
+ <stop
+ id="stop2261"
+ offset="0.63095236"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ style="stop-color:#babdb6"
+ offset="1"
+ id="stop2257" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2224">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2227" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2229" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2311">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2313" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2315" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2248">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop2250" />
+ <stop
+ style="stop-color:#babdb6"
+ offset="1"
+ id="stop2252" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2222">
+ <stop
+ style="stop-color:#d3d7cf"
+ offset="0"
+ id="stop2224" />
+ <stop
+ style="stop-color:#eeeeec"
+ offset="1"
+ id="stop2226" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2222"
+ id="linearGradient2220"
+ x1="35.5"
+ y1="31.190165"
+ x2="35.5"
+ y2="24.248672"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.921571,0,6.278146)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2311"
+ id="radialGradient2317"
+ cx="25.323261"
+ cy="38.763416"
+ fx="25.323261"
+ fy="38.763416"
+ r="25.234873"
+ gradientTransform="matrix(1,0,0,0.194396,0,31.22797)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2224"
+ id="linearGradient2231"
+ x1="16.5625"
+ y1="26.5625"
+ x2="16.5625"
+ y2="19.551628"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.148148,0,0,1,-3.555554,3)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2253"
+ id="linearGradient2259"
+ x1="23.422913"
+ y1="21.085749"
+ x2="23.422913"
+ y2="28"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(1.1477854,0,0,0.9996857,-3.5468225,3.0088016)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2326"
+ id="linearGradient2322"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6666666,0,0,1,15.000001,4.0000011)"
+ x1="40.791222"
+ y1="30.003317"
+ x2="40.791222"
+ y2="29.084894" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2304"
+ id="linearGradient2324"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(0.8853266,0,0,1.499469,5.4882691,-11.73433)"
+ x1="38.742561"
+ y1="29.743778"
+ x2="38.742561"
+ y2="31.167559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7426"
+ id="linearGradient4695"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(1.129032,0,0,1.3333314,-3.096776,-12.166573)"
+ x1="15.91675"
+ y1="46.601612"
+ x2="15.91675"
+ y2="37.330025" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7392"
+ id="linearGradient7398"
+ x1="27.568041"
+ y1="20.773342"
+ x2="15.437893"
+ y2="-11.026649"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7368"
+ id="linearGradient7405"
+ gradientUnits="userSpaceOnUse"
+ x1="21.566757"
+ y1="6.1923113"
+ x2="34.825008"
+ y2="28.819729" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7376"
+ id="linearGradient7407"
+ gradientUnits="userSpaceOnUse"
+ x1="24.03125"
+ y1="18.107733"
+ x2="15.95064"
+ y2="5.480763" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7413"
+ id="linearGradient7424"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,-1,0,49)"
+ x1="27"
+ y1="30.003056"
+ x2="27"
+ y2="34.066803" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7426"
+ id="linearGradient7432"
+ x1="0.75"
+ y1="67.989044"
+ x2="0.75"
+ y2="24.367777"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7434"
+ id="linearGradient7440"
+ x1="5.126524"
+ y1="25.372583"
+ x2="5.126524"
+ y2="69.140259"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7486"
+ id="linearGradient7492"
+ x1="21.875"
+ y1="17.470722"
+ x2="17.625"
+ y2="2.5"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
...
[truncated message content] |
|
From: <cod...@go...> - 2009-04-14 21:32:32
|
Author: M0...@gm...
Date: Tue Apr 14 14:25:23 2009
New Revision: 533
Added:
branches/speedy/Conf3a.class
branches/speedy/Conf3a.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.project
branches/speedy/ClsGlobal.class
branches/speedy/Conf2.class
branches/speedy/Conf3.class
branches/speedy/MdlBootMngr.module
branches/speedy/MdlMain.module
Log:
- Finished user import window - Added code to import existing user account
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Apr 14 14:25:23 2009
@@ -200,103 +200,190 @@
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198 Conf3.class:324
+#: Conf2.class:198 Conf3.class:379
msgid "Re-enter Password"
msgstr ""
-#: Conf3.class:22
+#: Conf3.class:43
msgid "Create as many user accounts as you want / need here."
msgstr ""
-#: Conf3.class:22
+#: Conf3.class:43
msgid "Choose a unique login name for each user account."
msgstr ""
-#: Conf3.class:26
+#: Conf3.class:47
msgid "When finished, Click"
msgstr ""
-#: Conf3.class:26 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72
+#: Conf3.class:47 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72
#: Step5.class:177
msgid "to continue"
msgstr ""
-#: Conf3.class:76
+#: Conf3.class:98
msgid "Select picture ID"
msgstr ""
-#: Conf3.class:78
+#: Conf3.class:100
msgid "Select picture ID for"
msgstr ""
-#: Conf3.class:109
+#: Conf3.class:132
msgid "You must enter a login name first."
msgstr ""
-#: Conf3.class:112
+#: Conf3.class:135
msgid "Please select a password for"
msgstr ""
-#: Conf3.class:112
+#: Conf3.class:135
msgid "before continuing"
msgstr ""
-#: Conf3.class:115
+#: Conf3.class:138
msgid "You must enter the password twice for added security"
msgstr ""
-#: Conf3.class:145
+#: Conf3.class:165
msgid "User"
msgstr ""
-#: Conf3.class:145
+#: Conf3.class:165
msgid "already exists in the system."
msgstr ""
-#: Conf3.class:145
+#: Conf3.class:165
msgid "Please select another user login name"
msgstr ""
-#: Conf3.class:162
+#: Conf3.class:210
msgid "Use only lowercase letters and numbers for this field"
msgstr ""
-#: Conf3.class:225
+#: Conf3.class:280
msgid "Create User Accounts"
msgstr ""
-#: Conf3.class:275
+#: Conf3.class:330
msgid "Login Name"
msgstr ""
-#: Conf3.class:291
+#: Conf3.class:346
msgid "Real Name"
msgstr ""
-#: Conf3.class:307
+#: Conf3.class:362
msgid "Enter Password"
msgstr ""
-#: Conf3.class:352
+#: Conf3.class:407
msgid "Click here to select user Login picture"
msgstr ""
-#: Conf3.class:362
+#: Conf3.class:417
msgid "Create User"
msgstr ""
-#: Conf3.class:379
+#: Conf3.class:434
msgid "Import Existing User"
msgstr ""
-#: Conf3.class:395
+#: Conf3.class:450
msgid "Clear Form"
msgstr ""
-#: Conf3.class:410
+#: Conf3.class:465
msgid "User Rights Management"
msgstr ""
+#: Conf3a.class:56
+msgid "KDE Settings (Menu, Window decorations, etc)"
+msgstr ""
+
+#: Conf3a.class:58
+msgid "QT Toolkit settings (KDE Visual Effects)"
+msgstr ""
+
+#: Conf3a.class:60
+msgid "GTK Tookit theme Settings"
+msgstr ""
+
+#: Conf3a.class:62
+msgid "X-window basic settings (includes xterm settings)"
+msgstr ""
+
+#: Conf3a.class:64
+msgid "Bash init script"
+msgstr ""
+
+#: Conf3a.class:66
+msgid "Sound system preferences"
+msgstr ""
+
+#: Conf3a.class:68
+msgid "Graphical inteface preferences"
+msgstr ""
+
+#: Conf3a.class:70
+msgid "Desktop icons, folders, launchers"
+msgstr ""
+
+#: Conf3a.class:72
+msgid "IceWM settings, preferences, menu"
+msgstr ""
+
+#: Conf3a.class:74
+msgid "XMMS Audio player preferences"
+msgstr ""
+
+#: Conf3a.class:76
+msgid "ROX Filer Desktop settings"
+msgstr ""
+
+#: Conf3a.class:78
+msgid "MPlayer Multimedia Player Settings"
+msgstr ""
+
+#: Conf3a.class:80
+msgid "Default graphical session settings"
+msgstr ""
+
+#: Conf3a.class:117
+msgid "Setting"
+msgstr ""
+
+#: Conf3a.class:118 Step7a.class:49 Step7b.class:28
+msgid "Description"
+msgstr ""
+
+#: Conf3a.class:237
+msgid "Import user accounts into VectorLinux"
+msgstr ""
+
+#: Conf3a.class:250
+msgid ""
+"Select which user account to import, and which settings to reset.
Un-checked "
+"items will be carried over, while checked items will be reset to factory "
+"defaults."
+msgstr ""
+
+#: Conf3a.class:260
+msgid "User account to import"
+msgstr ""
+
+#: Conf3a.class:279
+msgid "Account Contents to reset"
+msgstr ""
+
+#: Conf3a.class:306
+msgid "Accept"
+msgstr ""
+
+#: Conf3a.class:312
+msgid "Cancel"
+msgstr ""
+
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
@@ -1179,10 +1266,6 @@
#: Step7a.class:34
msgid "Component"
-msgstr ""
-
-#: Step7a.class:49 Step7b.class:28
-msgid "Description"
msgstr ""
#: Step7a.class:143
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Apr 14 14:25:23 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=Conf3
+Startup=MdlStartUp
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Tue Apr 14 14:25:23 2009
@@ -17,6 +17,7 @@
STATIC PUBLIC fRunningMainForm AS Object
+STATIC PUBLIC sTargetPath AS String
STATIC PUBLIC sDistroName AS String
STATIC PUBLIC sDistroVer AS String
Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class (original)
+++ branches/speedy/Conf2.class Tue Apr 14 14:25:23 2009
@@ -59,7 +59,7 @@
STOP EVENT
RETURN FALSE
ELSE
- SHELL "chroot /mnt/target /sbin/passwdx root " & Trim(textbox1.Text)
& " || echo ERROR" TO sRes
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/passwdx root " &
Trim(textbox1.Text) & " || echo ERROR" TO sRes
IF InStr(sRes, "ERROR") THEN
Message.Error(("Password was not set. See error log below")
& "<br>" & Trim(sRes))
RETURN FALSE
Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class (original)
+++ branches/speedy/Conf3.class Tue Apr 14 14:25:23 2009
@@ -13,6 +13,27 @@
' 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 sListToReset AS String
+
+PUBLIC FUNCTION check_for_impartable_accounts() AS Boolean
+
+ DIM sFile AS String
+ DIM sDump AS String
+ DIM sMajorDump AS String
+ FOR EACH sFile IN Dir(ClsGlobal.sTargetPath &/ "home/", "*",
gb.Directory)
+ IF sFile <> "ftp" THEN
+ SHELL "grep ^" & Trim(sFile) & ClsGlobal.sTargetPath
&/ "etc/group" TO sDump
+ sDump = Trim(sDump)
+ IF sDump THEN sMajorDump = sMajorDump & sDump
+ END IF
+
+ NEXT
+ sMajorDump = Trim(sMajorDump)
+ IF sMajorDump THEN RETURN TRUE
+
+
+END
+
PUBLIC SUB Form_Open()
@@ -28,6 +49,7 @@
.btPicSel.Picture =
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
END WITH
WAIT 0.1
+ Button1.Enabled = ME.check_for_impartable_accounts()
'MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
END
@@ -98,6 +120,7 @@
' default the picture
ME.btPicSel.Picture =
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
Dialog.Path = ""
+ sListToReset = ""
END
@@ -148,10 +171,33 @@
STOP EVENT
END IF
' clear the form now
+ IF sListToReset THEN
+ ' user account is being imported
+ Reset_Accounts_Settings(Trim(ME.txtLogin.Text))
+ END IF
+
Button2_Click()
END
+PUBLIC SUB Reset_Accounts_Settings(sUsrLogin AS String)
+
+ DIM sSkelPath AS String = ClsGlobal.sTargetPath &/ "etc/skel"
+ DIM sTargetPath AS String = ClsGlobal.sTargetPath &/ "home" &/ sUsrLogin
+ DIM sSettings AS String[] =
Split(Replace(Trim(sListToReset), " ", ","), ",")
+ DIM sFile AS String
+ DIM i AS Integer
+
+ FOR i = 0 TO sSettings.Max
+ sFile = Trim(sSettings[i])
+ TRY KILL sTargetPath &/ sFile
+ SHELL "cp -r " & sSkelPath &/ sFile & Space(1) & sTargetPath WAIT
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /bin/chown " & sUsrLogin
& ":users " & sTargetPath &/ sFile WAIT
+ NEXT
+
+
+
+END
PUBLIC SUB txtLogin_KeyPress()
@@ -167,3 +213,10 @@
END
+
+PUBLIC SUB Button1_Click()
+
+ Button2_Click()
+ Conf3a.Import_User()
+
+END
Added: branches/speedy/Conf3a.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf3a.class Tue Apr 14 14:25:23 2009
@@ -0,0 +1,200 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+' ========= import user accounts =================
+PRIVATE $UserProps AS NEW Object[]
+PRIVATE pyes AS Picture
+PRIVATE pno AS Picture
+PUBLIC sListToReset AS String
+
+PUBLIC SUB LIST_USER_ACCOUNTS()
+
+ DIM sList AS String
+ DIM sFile, sDump AS String
+ FOR EACH sFile IN Dir("/home", "*", gb.Directory)
+ IF sFile <> "ftp" THEN
+ ' -== search /etc/group to make sure this user does not already
exist ==-
+ SHELL "grep ^" & sFile & Space(1) & ClsGlobal.sTargetPath
&/ "etc/group" TO sDump
+ sDump = Trim(sDump)
+ IF NOT (sDump) THEN ' user does not exist in the system yet
+ cbAcctLst.Add(sFile)
+ END IF
+ END IF
+ NEXT
+
+
+END
+
+PUBLIC SUB List_Resetable_settings()
+
+ DIM cb AS CheckBox
+ DIM sSetting, sDesc, sFile AS String
+ DIM irow AS Integer
+ DIM sSkelPath AS String = ClsGlobal.sTargetPath &/ "etc/skel"
+ DIM sTargetPath AS String = ClsGlobal.sTargetPath &/ "home" &/
Trim(cbAcctLst.Text)
+
+ ' load the pictures
+ pyes = Picture.Load("images/16px-check.png")
+ 'pno = Picture.Load("images/16px-Nocheck.png")
+ irow = 1
+ FOR EACH sFile IN Dir(sSkelPath, "*")
+ SELECT CASE sFile
+ CASE ".kde"
+ sDesc = ("KDE Settings (Menu, Window decorations, etc)")
+ CASE ".qt"
+ sDesc = ("QT Toolkit settings (KDE Visual Effects)")
+ CASE ".gtkrc-*"
+ sDesc = ("GTK Tookit theme Settings")
+ CASE ".Xdefaults"
+ sDesc = ("X-window basic settings (includes xterm settings)")
+ CASE ".bashrc"
+ sDesc = ("Bash init script")
+ CASE ".asoundrc"
+ sDesc = ("Sound system preferences")
+ CASE ".xinitrc"
+ sDesc = ("Graphical inteface preferences")
+ CASE "Desktop"
+ sDesc = ("Desktop icons, folders, launchers")
+ CASE ".IceWM", ".icewm"
+ sDesc = ("IceWM settings, preferences, menu")
+ CASE ".xmms"
+ sDesc = ("XMMS Audio player preferences")
+ CASE ".Choices", "Choices"
+ sDesc = ("ROX Filer Desktop settings")
+ CASE ".mplayer"
+ sDesc = ("MPlayer Multimedia Player Settings")
+ CASE ".xsession"
+ sDesc = ("Default graphical session settings")
+ CASE ELSE
+ sDesc = ""
+ END SELECT
+
+ IF Exist(sTargetPath &/ sFile) THEN
+ ' add to the list
+ IF sDesc THEN
+ INC irow
+ gvSettingsList.Rows.Count = irow + 1
+ ME.gvSettingsList[irow, 0].Picture = pyes
+ ME.gvSettingsList[irow, 0].Alignment = Align.Center
+ ME.gvSettingsList[irow, 1].Text = sFile
+ ME.gvSettingsList[irow, 2].Text = sDesc
+ 'INC irow
+
+ END IF
+ END IF
+ NEXT
+
+
+
+END
+
+
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<b>" & tlbanner.text & "</b>"
+ .gvSettingsList.Rows.Count = 3
+ .gvSettingsList.Columns.Count = 3
+ .gvSettingsList.Columns[0].Width = 32
+ .gvSettingsList.Columns[2].Width = 150
+ .gvSettingsList.Rows[1].Height = 12
+ .gvSettingsList[0, 0].BackColor = Color.SelectedBackground
+ .gvSettingsList[0, 1].BackColor = Color.SelectedBackground
+ .gvSettingsList[0, 2].BackColor = Color.SelectedBackground
+ .gvSettingsList[0, 1].Text = ("Setting")
+ .gvSettingsList[0, 2].Text = ("Description")
+ .gvSettingsList[0, 1].Font.Bold = TRUE
+ .gvSettingsList[0, 1].Alignment = Align.Center
+ .gvSettingsList[0, 2].Font.Bold = TRUE
+ .gvSettingsList[0, 2].Alignment = Align.Center
+
+ END WITH
+ ME.LIST_USER_ACCOUNTS()
+END
+
+PUBLIC SUB Form_Resize()
+
+ WITH ME
+ .hbox2.Width = .HBox2.Parent.Width - (.HBox2.Left * 2)
+ .Frame1.Height = ME.ClientH - (.Frame1.Top + hbox5.Height + 8)
+ .HBox2.Height = .HBox2.Parent.Height - (.HBox2.top * 1.25)
+ END WITH
+
+END
+
+PUBLIC SUB cbAcctLst_Click()
+
+ List_Resetable_settings()
+
+END
+
+PUBLIC SUB gvSettingsList_Click()
+
+ IF LAST.Column > 1 THEN RETURN
+' PRINT gvSettingsList[LAST.row, 1].text
+ IF gvSettingsList[LAST.row, 0].Picture = pyes THEN
+ gvSettingsList[LAST.row, 0].Picture = pno
+ ELSE IF gvSettingsList[LAST.row, 0].Picture = pno THEN
+ gvSettingsList[LAST.row, 0].Picture = pyes
+ END IF
+
+ gvSettingsList.Refresh
+
+
+END
+
+PUBLIC SUB btCancel_Click()
+
+ sListToReset = ""
+ ME.Close
+
+END
+
+PUBLIC SUB Get_Selected_Settings_For_Reset()
+
+ DIM irow AS Integer
+ DIM sList AS String
+ FOR irow = 2 TO gvSettingsList.Rows.Count - 1
+ IF gvSettingsList[irow, 0].Picture = pyes THEN
+ sList = sList & Space(1) & gvSettingsList[irow, 1].Text
+ END IF
+ NEXT
+ sList = Trim(sList)
+ ' IF sList THEN
+ ' Message(sList)
+ ' ELSE
+ ' Message("No settings to reset")
+ ' END IF
+
+
+END
+
+
+PUBLIC SUB btOK_Click()
+
+ Get_Selected_Settings_For_Reset()
+ Conf3.txtLogin.Text = Trim(ME.cbAcctLst.Text)
+ Conf3.sListToReset = sListToReset
+ ME.Close
+
+END
+PUBLIC FUNCTION Import_User() AS String
+
+
+ ME.Show()
+
+END
+
Added: branches/speedy/Conf3a.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf3a.form Tue Apr 14 14:25:23 2009
@@ -0,0 +1,80 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,57)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("Import user accounts into VectorLinux")
+ Alignment = Align.Center
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(1,6,61,8)
+ Expand = True
+ Text = ("Select which user account to import, and which settings to
reset. Un-checked items will be carried over, while checked items will be
reset to factory defaults.")
+ }
+ { HBox1 HBox
+ MoveScaled(1,14,54,3.5)
+ Expand = True
+ { TextLabel2 TextLabel
+ MoveScaled(0,0,26,3.5)
+ Expand = True
+ Text = ("User account to import")
+ Alignment = Align.Left
+ }
+ { cbAcctLst ComboBox
+ MoveScaled(28,0,26,4)
+ Text = ("")
+ ReadOnly = True
+ }
+ }
+ { HBox4 HBox
+ MoveScaled(36,18,12,1)
+ Expand = True
+ }
+ { Frame1 Frame
+ MoveScaled(1,19,61,33)
+ Expand = True
+ Text = ("Account Contents to reset")
+ { HBox2 HBox
+ MoveScaled(1,3,58,29)
+ Expand = True
+ { gvSettingsList GridView
+ MoveScaled(2,4,32,19)
+ Expand = True
+ }
+ { HBox3 HBox
+ MoveScaled(37,8,11,1)
+ Visible = False
+ Expand = True
+ }
+ }
+ }
+ { HBox5 HBox
+ MoveScaled(2,53,52,3.5)
+ Expand = True
+ Spacing = 4
+ Padding = 2
+ { btOK Button
+ MoveScaled(0,0,14,3.5)
+ Text = ("Accept")
+ Picture = Picture["icon:/small/apply"]
+ }
+ { btCancel Button
+ MoveScaled(18,0,17,3.5)
+ Text = ("Cancel")
+ Picture = Picture["icon:/small/cancel"]
+ }
+ }
+}
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Tue Apr 14 14:25:23 2009
@@ -447,7 +447,7 @@
NEXT
'Determine how the root partition was formatted
- SHELL "df -hT /mnt/target | tr -s \' \' | grep \"^/dev\" | cut -f 2
-d \' \'" TO sDump
+ SHELL "df -hT " & ClsGlobal.sTargetPath & " | tr -s \' \' | grep
\"^/dev\" | cut -f 2 -d \' \'" TO sDump
sDump = Trim(sDump)
IF LCase(sDump) <> "xfs" THEN
objCB.Add(("Bootsector of") & Space(1) & ClsGlobal.sRoot)
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Tue Apr 14 14:25:23 2009
@@ -98,7 +98,7 @@
END
PUBLIC SUB SET_TIME_ZONE(sTimeZone AS String, hwclock AS String)
- DIM sTarget AS String = "/mnt/target"
+ DIM sTarget AS String = ClsGlobal.sTargetPath
DIM sCfg AS String
TRY KILL sTarget &/ "etc" &/ "localtime-copied-from"
@@ -148,7 +148,7 @@
DIM sDump AS String
- SHELL "grep ^\"" & sName & "\" /mnt/target/etc/group" TO sDump
+ SHELL "grep ^\"" & sName & "\" " & ClsGlobal.sTargetPath &/ "etc/group"
TO sDump
sDump = Trim(sDump)
IF Len(sDump) > 0 THEN
RETURN TRUE
@@ -180,11 +180,11 @@
'-== Just to be safe, make sure the group user does not exist before
trying to create a new user ==-
- SHELL "chroot /mnt/target /usr/sbin/groupdel " & sUsrLogIn & " >
/dev/null " WAIT
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /usr/sbin/groupdel " &
sUsrLogIn & " > /dev/null " WAIT
'-== Create new group for user ==-
- SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & (1000 + iUID) &
Space(1) & sUsrLogIn & " > /dev/null" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /usr/sbin/groupadd -g " &
(1000 + iUID) & Space(1) & sUsrLogIn & " > /dev/null" WAIT
'-== Create new user account ==-
- SHELL "chroot /mnt/target /usr/sbin/useradd -m -c \'" & sUsrRlName & "\'
-g " & sUsrLogIn &
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /usr/sbin/useradd -m -c \'"
& sUsrRlName & "\' -g " & sUsrLogIn &
" -p " & Trim(sPass) & " -u " & (1000 + iUID) & " -G \'"
& "users," & sGrpLst & "\' -s /bin/bash " &
Trim(sUsrLogIn) & " || echo FAILED" TO sDump
' [Quick error check]
@@ -194,18 +194,18 @@
RETURN 1
END IF
' -== Just to be sure... re-run the password to make sure it's set ==-'
- SHELL "chroot /mnt/target /sbin/passwdx " & sUsrLogIn & Space(1) & sPass
& " >/dev/null " WAIT
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /sbin/passwdx " & sUsrLogIn
& Space(1) & sPass & " >/dev/null " WAIT
' -== Set the face icon ==-
IF sPicPath THEN
' -= fix for KDM login (KDE3) =-
- TRY LINK "/mnt/target/usr/share/apps/kdm/pics/users" &/
sUsrLogIn & ".face.icon" TO sPicPath
+ TRY LINK ClsGlobal.sTargetPath
&/ "usr/share/apps/kdm/pics/users" &/ sUsrLogIn & ".face.icon" TO sPicPath
' CATCH
' SHELL "ln -s " & sPicPath & Space(1)
& "/mnt/target/usr/share/apps/kdm/pics/users" &/ sUsrLogIn &/ ".face.icon"
' -= fix for GDM login =-
- TRY COPY sPicPath TO "/mnt/target/home" &/ sUsrLogIn &/ ".face"
- SHELL "chmod 664 /mnt/target/home" &/ sUsrLogIn &/ ".face
2>/dev/null" WAIT
- SHELL "chroot /mnt/target /bin/chown " & sUsrLogIn & Space(1)
& "/home/" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
- SHELL "chroot /mnt/target /bin/chgrp " & sUsrLogIn & Space(1)
& "/home" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
+ TRY COPY sPicPath TO ClsGlobal.sTargetPath &/ "home" &/
sUsrLogIn &/ ".face"
+ SHELL "chmod 664 " & ClsGlobal.sTargetPath &/ "home" &/
sUsrLogIn &/ ".face 2>/dev/null" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /bin/chown " &
sUsrLogIn & Space(1) & "/home/" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
+ SHELL "chroot " & ClsGlobal.sTargetPath & " /bin/chgrp " &
sUsrLogIn & Space(1) & "/home" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
END IF
' USER ACCOUNT HAS BEEN CREATED
|
|
From: <cod...@go...> - 2009-04-14 16:19:26
|
Author: M0...@gm...
Date: Tue Apr 14 09:01:05 2009
New Revision: 532
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.project
branches/speedy/Conf3.class
branches/speedy/MdlMain.module
Log:
- Finished code for user add window.
- TODO: Import using accounts
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Apr 14 09:01:05 2009
@@ -200,7 +200,7 @@
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:198 Conf3.class:311
+#: Conf2.class:198 Conf3.class:324
msgid "Re-enter Password"
msgstr ""
@@ -229,71 +229,71 @@
msgid "Select picture ID for"
msgstr ""
-#: Conf3.class:108
+#: Conf3.class:109
msgid "You must enter a login name first."
msgstr ""
-#: Conf3.class:111
+#: Conf3.class:112
msgid "Please select a password for"
msgstr ""
-#: Conf3.class:111
+#: Conf3.class:112
msgid "before continuing"
msgstr ""
-#: Conf3.class:114
+#: Conf3.class:115
msgid "You must enter the password twice for added security"
msgstr ""
-#: Conf3.class:133
+#: Conf3.class:145
msgid "User"
msgstr ""
-#: Conf3.class:133
+#: Conf3.class:145
msgid "already exists in the system."
msgstr ""
-#: Conf3.class:133
+#: Conf3.class:145
msgid "Please select another user login name"
msgstr ""
-#: Conf3.class:150
+#: Conf3.class:162
msgid "Use only lowercase letters and numbers for this field"
msgstr ""
-#: Conf3.class:212
+#: Conf3.class:225
msgid "Create User Accounts"
msgstr ""
-#: Conf3.class:262
+#: Conf3.class:275
msgid "Login Name"
msgstr ""
-#: Conf3.class:278
+#: Conf3.class:291
msgid "Real Name"
msgstr ""
-#: Conf3.class:294
+#: Conf3.class:307
msgid "Enter Password"
msgstr ""
-#: Conf3.class:339
+#: Conf3.class:352
msgid "Click here to select user Login picture"
msgstr ""
-#: Conf3.class:349
+#: Conf3.class:362
msgid "Create User"
msgstr ""
-#: Conf3.class:366
+#: Conf3.class:379
msgid "Import Existing User"
msgstr ""
-#: Conf3.class:382
+#: Conf3.class:395
msgid "Clear Form"
msgstr ""
-#: Conf3.class:397
+#: Conf3.class:410
msgid "User Rights Management"
msgstr ""
@@ -389,12 +389,16 @@
msgid "Bootsector of"
msgstr ""
-#: MdlMain.module:34
+#: MdlMain.module:35
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:34
+#: MdlMain.module:35
msgid "to"
+msgstr ""
+
+#: MdlMain.module:193
+msgid "Failed to create user account. See error below."
msgstr ""
#: MdlStartUp.module:42
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Tue Apr 14 09:01:05 2009
@@ -14,11 +14,15 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlMain.module:34
+#: MdlMain.module:35
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:34
+#: MdlMain.module:35
msgid "to"
+msgstr ""
+
+#: MdlMain.module:193
+msgid "Failed to create user account. See error below."
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Apr 14 09:01:05 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=MdlStartUp
+Startup=Conf3
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class (original)
+++ branches/speedy/Conf3.class Tue Apr 14 09:01:05 2009
@@ -97,6 +97,7 @@
MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
' default the picture
ME.btPicSel.Picture =
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
+ Dialog.Path = ""
END
@@ -119,22 +120,35 @@
PUBLIC SUB btAddUsr_Click()
-
+ DIM sPicpath AS String
'1) Check to make sure all entries are filled in
'2) Check to see if the user does not already exist
'3) If conditions 1 & 2 are passed, then create the account.
'4) Check for errors during account creation ^^^^^^^^^^^^^ (done in
step3)
+ '-== Get the right picture path ==-
+ IF NOT (Dialog.Path) THEN
+ sPicpath = "/usr/share/apps/kdm/pics/users/default2.png"
+ ELSE
+ sPicpath = Dialog.Path
+ END IF
+
+ '-== Make sure we have valid entries before trying to create a user
account ==-
IF Check_Text_Entry() = FALSE THEN
IF MdlMain.CHECK_EXISTING_USER(Trim(ME.txtLogin.Text)) = FALSE THEN
- MdlMain.CREATE_NEW_USER_ACCOUNT() ' create new account
+ MdlMain.CREATE_NEW_USER_ACCOUNT(Trim(txtLogin.Text),
Trim(txtRealName.Text), btPicSel.Picture, Trim(txtPass2.Text)) ' create new
account
ELSE ' user exists
Message.Error(("User") & Space(1) & "\"" & Trim(ME.txtLogin.Text)
& "\"" & Space(1) & ("already exists in the system.") & "<br>" &
("Please select another user login name"))
RETURN
STOP EVENT
END IF
+ ELSE
+ RETURN
+ STOP EVENT
END IF
+ ' clear the form now
+ Button2_Click()
END
@@ -152,3 +166,4 @@
END IF
END
+
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Tue Apr 14 09:01:05 2009
@@ -16,6 +16,7 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
PUBLIC $objUsrGroups AS NEW Object[]
+PRIVATE iUID AS Integer
PUBLIC FUNCTION FORMAT_THIS_PARTITION(sPartition AS String, sFilesystem AS
String) AS Integer
@@ -158,131 +159,59 @@
END
-PUBLIC FUNCTION CREATE_NEW_USER_ACCOUNT() AS Integer
+PUBLIC FUNCTION CREATE_NEW_USER_ACCOUNT(sUsrLogIn AS String, sUsrRlName AS
String, sPicPath AS String, sPass AS String) AS Integer
' will return
' 0 = operation successful
' 1 = operation failed
- ' PUBLIC SUB Button1_Click()
- ' DIM sCAPS AS String
- ' DIM sCHAR AS String
- ' DIM sLogE AS String
- ' DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
- ' DIM sGroups AS
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
- ' DIM cb AS CheckBox
- ' DIM tl AS TextLabel
- ' 'DIM tly AS Integer
- '
- ' MdlCore.WARN_STATUS(("Creating user account ... Please wait"))
- '
- ' ' increment the number of user accounts created
- ' INC MdlUsrAdd.iUsrAccts
- '
- ' 'Message("Ateempting to create user now")
- '
- ' IF ME.tbUsername.Text = "" THEN
- ' Balloon.Error(("Enter the login name that this user will user to
login to this system."), ME.tbUsername)
- ' 'Message(("Enter the login name that this user will use to login
to this system."))
- ' RETURN
- ' STOP EVENT
- ' ELSE
- ' 'SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[A-Z]\'" TO
sCAPS
- ' IF ME.tbUsername.text LIKE "*[A-Z]*" THEN
- ' 'IF ME.tbUsername.textNOT LIKE "*[a-z0-9_-]*" THEN
- ' Balloon.Error(("Login name field contains illegal characters.
Please use only lowercase letters and numbers"), ME.tbUsername)
- ' 'Message.Error(("Login name field contains illegal characters.
Please use only lowercase letters and numbers"))
- ' RETURN
- ' STOP EVENT
- ' 'ELSE IF ME.tbUsernameNOT LIKE "*[a-z0-9_-]*" THEN
- '
- '
- ' END IF
- '
- ' SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'"
TO sCHAR
- ' 'SHELL "grep -e ^" & ME.tbUsername.Text & Space(1) &
ClsGlobal.sTargetMnt &/ "etc/passwd" TO sLogE
- ' SHELL "grep -e ^" & ME.tbUsername.Text & ": " &
clsglobal.sTargetMnt &/ "etc" &/ "passwd" TO sLogE
- '
- ' IF sCHAR <> "" THEN
- ' Message(("Username contains illegal characters"))
- ' RETURN
- ' ELSE IF sLogE <> "" THEN
- ' Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("already exists"))
- ' RETURN
- ' ELSE
- ' IF ME.tbPasswd1.Text = "" THEN
- ' Message(("Enter a password for") & Space(1) &
ME.tbUsername.text)
- ' RETURN
- ' ELSE
- ' IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
- '
- ' 'COMPILE LIST OF GROUPS THIS USER WILL BELONG TO
- ' FOR EACH cb IN MdlUsrAdd.objGrps
- ' IF cb.Value = TRUE THEN
- ' sGroups = sGroups & "," & cb.Text
- ' END IF
- ' NEXT
- ' sGroups = Right(sGroups, Len(sGroups) - 1)
- ' 'Message(sGroups)
- '
- ' SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
- ' PRINT "Creating new user group"
- ' SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" &
Space(1) & iUID & Space(1) & ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
- '
- ' 'Message("chroot /mnt/target /usr/sbin/useradd -m -s
/bin/bash -u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
ME.tbUsername.Text)
- '
- ' 'SHELL "chroot /mnt/target /usr/sbin/useradd -m -s
/bin/bash -u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
Space(1) & ME.tbUsername.Text WAIT
- ' PRINT "Creating new user account"
- ' SHELL "chroot /mnt/target /usr/sbin/useradd -m -c " & "\'" &
ME.tbRealname.text & "\'" & " -g " & ME.tbUsername.text &
- ' " -p " & ME.tbPasswd1.text & " -u " & iUID & " -G "
& "\'users," & sGroups & "\' -s /bin/bash " & ME.tbUsername.Text WAIT
- ' ' sDocmd = "useradd -m -c " & "\'" & sname & "\'" & " -g " &
slogin & " -p " & ME.txtpass1.Text &
- ' '" -G " & "\'" & sgrparse & "\' " & slogin
- '
- ' 'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
- ' SHELL "chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text WAIT
- ' 'IF IsDir(sPicdir) THEN
- ' IF bUsePic.Value = TRUE THEN
- '
- ' 'this next line is for kdm
- ' SHELL "cd " & sPicdir & "; ln -s " &
Replace(tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
tbUsername.Text & ".face.icon" WAIT
- ' 'the next lines are for gdm
- ' 'PRINT tbPicPath.Text
- ' 'SHELL "cp " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
- ' 'COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt
&/ "home" &/ tbUsername.text &/ ".face"
- ' EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt
&/ "home" &/ tbUsername.Text &/ ".face"] WAIT
- ' SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
- ' SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
- ' SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
- ' ENDIF
- ' 'Message(("User account for") & Space(1) &
ME.tbUsername.Text & Space(1) & ("was created."))
- ' ' easy way to create the account here
- ' tl = NEW TextLabel(ME.LstUsers)
- ' WITH tl
- ' .Text = ME.tbUsername.Text
- ' .Height = 21
- ' .Width = MdlObjSizer.get_object_width(.Text)
- ' .ToolTip = ME.tbRealname.Text
- ' .Move(4, tly)
- ' END WITH
- ' tly = tly + tl.Height + 2
- ' btClrFrm_Click() ' clear the form
- ' INC iUID
- ' ELSE
- ' Message(("Passwords do not match"))
- ' Balloon.Info(("Enter the same password twice"), ME.tbPasswd1)
- ' ME.tbPasswd1.Clear
- ' ME.tbPasswd2.Clear
- ' RETURN
- ' STOP EVENT
- ' ENDIF
- ' ENDIF
- ' ENDIF
- ' ENDIF
- '
- ' ME.LstUsers.Visible = TRUE
- ' ME.pbUsrPic.Visible = FALSE
- ' MdlCore.warn_status_off()
- ' END
+ DIM cb AS CheckBox
+ DIM sGrpLst, sDump AS String
+
+
+ ' -= Get the list of groups this user belongs to =-
+ FOR EACH cb IN $objUsrGroups
+ IF cb.Value = TRUE THEN
+ sGrpLst = sGrpLst & Space(1) & cb.Text
+ END IF
+ NEXT
+ sGrpLst = Trim(sGrpLst)
+ sGrpLst = Replace(sGrpLst, " ", ",")
+
+
+ '-== Just to be safe, make sure the group user does not exist before
trying to create a new user ==-
+ SHELL "chroot /mnt/target /usr/sbin/groupdel " & sUsrLogIn & " >
/dev/null " WAIT
+ '-== Create new group for user ==-
+ SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & (1000 + iUID) &
Space(1) & sUsrLogIn & " > /dev/null" WAIT
+ '-== Create new user account ==-
+ SHELL "chroot /mnt/target /usr/sbin/useradd -m -c \'" & sUsrRlName & "\'
-g " & sUsrLogIn &
+ " -p " & Trim(sPass) & " -u " & (1000 + iUID) & " -G \'"
& "users," & sGrpLst & "\' -s /bin/bash " &
+ Trim(sUsrLogIn) & " || echo FAILED" TO sDump
+ ' [Quick error check]
+ sDump = Trim(sDump)
+ IF InStr(sDump, "FAILED") THEN
+ Message.Error(("Failed to create user account. See error
below.") & "<br><br>" & sDump)
+ RETURN 1
+ END IF
+ ' -== Just to be sure... re-run the password to make sure it's set ==-'
+ SHELL "chroot /mnt/target /sbin/passwdx " & sUsrLogIn & Space(1) & sPass
& " >/dev/null " WAIT
+ ' -== Set the face icon ==-
+ IF sPicPath THEN
+ ' -= fix for KDM login (KDE3) =-
+ TRY LINK "/mnt/target/usr/share/apps/kdm/pics/users" &/
sUsrLogIn & ".face.icon" TO sPicPath
+' CATCH
+' SHELL "ln -s " & sPicPath & Space(1)
& "/mnt/target/usr/share/apps/kdm/pics/users" &/ sUsrLogIn &/ ".face.icon"
+ ' -= fix for GDM login =-
+ TRY COPY sPicPath TO "/mnt/target/home" &/ sUsrLogIn &/ ".face"
+ SHELL "chmod 664 /mnt/target/home" &/ sUsrLogIn &/ ".face
2>/dev/null" WAIT
+ SHELL "chroot /mnt/target /bin/chown " & sUsrLogIn & Space(1)
& "/home/" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
+ SHELL "chroot /mnt/target /bin/chgrp " & sUsrLogIn & Space(1)
& "/home" &/ sUsrLogIn &/ ".face 2> /dev/null" WAIT
+ END IF
+
+ ' USER ACCOUNT HAS BEEN CREATED
+ '-= increase the iUID number every time this sub runs =-
+ INC iUID
+ RETURN 0
END
|
|
From: <cod...@go...> - 2009-04-13 21:23:31
|
Author: M0...@gm...
Date: Mon Apr 13 14:14:56 2009
New Revision: 531
Modified:
branches/speedy/.lang/.pot
branches/speedy/.project
branches/speedy/Conf2.class
branches/speedy/Conf3.class
branches/speedy/Conf3.form
branches/speedy/MdlMain.module
Log:
- Designed user add window. A little more coding to do there.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Apr 13 14:14:56 2009
@@ -180,27 +180,27 @@
msgid "DO NOT LEAVE THIS BLANK"
msgstr ""
-#: Conf2.class:56
+#: Conf2.class:58
msgid "Passwords do not match. Please enter the same password twice"
msgstr ""
-#: Conf2.class:62
+#: Conf2.class:64
msgid "Password was not set. See error log below"
msgstr ""
-#: Conf2.class:116
+#: Conf2.class:132
msgid "System Administrator Account"
msgstr ""
-#: Conf2.class:133
+#: Conf2.class:149
msgid "About the linux root account"
msgstr ""
-#: Conf2.class:165
+#: Conf2.class:181
msgid "Enter Passwrord"
msgstr ""
-#: Conf2.class:182
+#: Conf2.class:198 Conf3.class:311
msgid "Re-enter Password"
msgstr ""
@@ -221,8 +221,80 @@
msgid "to continue"
msgstr ""
-#: Conf3.class:70
+#: Conf3.class:76
+msgid "Select picture ID"
+msgstr ""
+
+#: Conf3.class:78
+msgid "Select picture ID for"
+msgstr ""
+
+#: Conf3.class:108
+msgid "You must enter a login name first."
+msgstr ""
+
+#: Conf3.class:111
+msgid "Please select a password for"
+msgstr ""
+
+#: Conf3.class:111
+msgid "before continuing"
+msgstr ""
+
+#: Conf3.class:114
+msgid "You must enter the password twice for added security"
+msgstr ""
+
+#: Conf3.class:133
+msgid "User"
+msgstr ""
+
+#: Conf3.class:133
+msgid "already exists in the system."
+msgstr ""
+
+#: Conf3.class:133
+msgid "Please select another user login name"
+msgstr ""
+
+#: Conf3.class:150
+msgid "Use only lowercase letters and numbers for this field"
+msgstr ""
+
+#: Conf3.class:212
msgid "Create User Accounts"
+msgstr ""
+
+#: Conf3.class:262
+msgid "Login Name"
+msgstr ""
+
+#: Conf3.class:278
+msgid "Real Name"
+msgstr ""
+
+#: Conf3.class:294
+msgid "Enter Password"
+msgstr ""
+
+#: Conf3.class:339
+msgid "Click here to select user Login picture"
+msgstr ""
+
+#: Conf3.class:349
+msgid "Create User"
+msgstr ""
+
+#: Conf3.class:366
+msgid "Import Existing User"
+msgstr ""
+
+#: Conf3.class:382
+msgid "Clear Form"
+msgstr ""
+
+#: Conf3.class:397
+msgid "User Rights Management"
msgstr ""
#: FMain.class:253 FMain0.class:253
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Mon Apr 13 14:14:56 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=Conf3
+Startup=MdlStartUp
Version=0.0.2
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/Conf2.class
==============================================================================
--- branches/speedy/Conf2.class (original)
+++ branches/speedy/Conf2.class Mon Apr 13 14:14:56 2009
@@ -23,6 +23,7 @@
("Most oter every-day tasks do not require administrative
priviledges.") & "<br>" & "<br>" &
("For added security, use a password that is easy for you to remember,
but hard for others to guess.") & "<br><br>" & ("DO NOT LEAVE THIS BLANK")
END WITH
+ ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
END
@@ -39,14 +40,15 @@
END
PUBLIC SUB StartUp()
- ClsGlobal.fRunningMainForm.btnext.enabled = Len(textbox1.Text) > 0
+ ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
END
PUBLIC SUB OnExit()
-
- IF compare_passwords() = FALSE THEN RETURN
-
+ ' -== Commented for testing purposers ==-
+ 'IF compare_passwords() = FALSE THEN RETURN
+ ME.TextBox1.Clear
+ ME.TextBox2.Clear
END
PUBLIC FUNCTION compare_passwords() AS Boolean
@@ -74,5 +76,19 @@
PUBLIC SUB TextBox2_KeyRelease()
ClsGlobal.fRunningMainForm.btnext.enabled = textbox2.Text = textbox1.Text
+
+END
+
+PUBLIC SUB Form_Enter()
+
+ IF Len(ME.TextBox1.Text) > 0 THEN
+ IF textbox2.Text = textbox1.Text THEN
+ ClsGlobal.fRunningMainForm.btnext.enabled = TRUE
+ ELSE
+ ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
+ END IF
+ ELSE
+ ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
+ END IF
END
Modified: branches/speedy/Conf3.class
==============================================================================
--- branches/speedy/Conf3.class (original)
+++ branches/speedy/Conf3.class Mon Apr 13 14:14:56 2009
@@ -25,9 +25,18 @@
.tlTxt.Text = tlTxt.Text &
("When finished, Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue")
END IF
+ .btPicSel.Picture =
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
END WITH
+ WAIT 0.1
+ 'MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
END
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Conf4"
+
+END
+
PUBLIC SUB OnExit()
@@ -35,9 +44,111 @@
END
PUBLIC SUB StartUp()
+ DIM obj AS Object
+ FOR EACH obj IN lbUsrGrps.Children
+ obj.delete
+ NEXT
+ MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ ME.scrlConts.Height = ME.ClientH - (ME.scrlConts.Top + 8)
+ ME.lbUsrGrps.Width = ME.lbUsrGrps.Parent.Width - (ME.lbUsrGrps.Left * 2)
+ ME.lbUsrGrps.Height = ME.lbUsrGrps.Parent.Height - (ME.lbUsrGrps.Top *
1.25)
+
+END
+
+PUBLIC SUB TextBox4_KeyPress()
+
+
+
+END
+
+
+PUBLIC SUB btPicSel_Click()
+ Dialog.Path = "/usr/share/apps/kdm/pics/users"
+ IF NOT (txtLogin.Text) THEN
+ Dialog.Title = ("Select picture ID")
+ ELSE
+ Dialog.Title = ("Select picture ID for") & Space(1) & ME.txtLogin.Text
+ END IF
+ Dialog.Filter = ["*.png;*.jpg;*.jpeg", "Picture Files"]
+ IF Dialog.OpenFile() THEN RETURN
+ LAST.Picture = Picture.Load(Dialog.Path)
+
+END
+
+PUBLIC SUB Button2_Click()
+ DIM obj AS Object
+ ' clear this form
+ ME.txtLogin.Clear
+ ME.txtRealName.Clear
+ ME.txtPass1.Clear
+ ME.txtPass2.Clear
+
+ FOR EACH obj IN ME.lbUsrGrps.Children
+ obj.delete
+ NEXT
+ MdlMain.Display_User_Group_Choices(ME.lbUsrGrps)
+ ' default the picture
+ ME.btPicSel.Picture =
Picture.Load("/usr/share/apps/kdm/pics/users/default2.png")
+
+END
+
+PRIVATE FUNCTION Check_Text_Entry() AS Boolean
+ ' will return true for faulty entry, false for clear
+ ' tHIS FUNCTION WILL MAKE SURE EVERYTHING IS CLEAR FOR USER ACCOUNT TO
BE CREATED.
+ IF NOT (txtLogin.Text) THEN
+ Balloon.Error(("You must enter a login name first."), txtLogin)
+ RETURN TRUE
+ ELSE IF NOT (txtPass1.Text) THEN
+ Balloon.Error(("Please select a password for") & Space(1) &
txtLogin.Text & Space(1) & ("before continuing"), txtPass1)
+ RETURN TRUE
+ ELSE IF NOT (txtPass2.Text) THEN
+ Balloon.Error(("You must enter the password twice for added
security"), txtPass2)
+ RETURN TRUE
+ END IF
+ RETURN FALSE
+END
+
+PUBLIC SUB btAddUsr_Click()
+
+ '1) Check to make sure all entries are filled in
+ '2) Check to see if the user does not already exist
+ '3) If conditions 1 & 2 are passed, then create the account.
+ '4) Check for errors during account creation ^^^^^^^^^^^^^ (done in
step3)
+
+ IF Check_Text_Entry() = FALSE THEN
+ IF MdlMain.CHECK_EXISTING_USER(Trim(ME.txtLogin.Text)) = FALSE THEN
+ MdlMain.CREATE_NEW_USER_ACCOUNT() ' create new account
+ ELSE ' user exists
+ Message.Error(("User") & Space(1) & "\"" & Trim(ME.txtLogin.Text)
& "\"" & Space(1) & ("already exists in the system.") & "<br>" &
+ ("Please select another user login name"))
+ RETURN
+ STOP EVENT
+ END IF
+ END IF
+
END
+PUBLIC SUB txtLogin_KeyPress()
+
+
+ IF Key.Text LIKE "*[a-z]*" OR Key.Text LIKE "*[0-9]*" THEN
+ ' legal characters
+ ELSE
+ ' illegal characters
+ Balloon.Info(("Use only lowercase letters and numbers for this
field"), LAST)
+ STOP EVENT
+ END IF
+
+END
Modified: branches/speedy/Conf3.form
==============================================================================
--- branches/speedy/Conf3.form (original)
+++ branches/speedy/Conf3.form Mon Apr 13 14:14:56 2009
@@ -1,9 +1,10 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,72,48)
+ MoveScaled(0,0,96,55)
Text = ("")
Arrangement = Arrange.Row
+ Padding = 2
{ HPanel1 HPanel
MoveScaled(0,0,60,5)
Expand = True
@@ -18,18 +19,159 @@
}
}
{ HBox1 HBox
- MoveScaled(0,5,7,2)
+ MoveScaled(0,5,7,1)
Expand = True
}
{ HBox2 HBox
- MoveScaled(0,7,71,12)
+ MoveScaled(0,6,70,12)
Expand = True
Padding = 2
{ tlTxt TextLabel
- MoveScaled(1,0,15,11)
+ MoveScaled(1,0,52,11)
Expand = True
Text = ("")
- Alignment = Align.Left
+ Alignment = Align.TopLeft
+ }
+ }
+ { HBox3 HBox
+ MoveScaled(1,18,4,1)
+ Expand = True
+ }
+ { scrlConts ScrollView
+ MoveScaled(1,19,93,33)
+ Expand = True
+ Arrangement = Arrange.Row
+ Border = False
+ { Panel1 Panel
+ MoveScaled(1,1,91,35)
+ Expand = True
+ Arrangement = Arrange.Horizontal
+ Padding = 2
+ { HPanel2 HPanel
+ MoveScaled(0,1,64,33)
+ Expand = True
+ { TextLabel1 TextLabel
+ MoveScaled(0,0,22.5,3.5)
+ Text = ("Login Name")
+ Alignment = Align.Left
+ }
+ { txtLogin TextBox
+ MoveScaled(16,0,37.5,3.5)
+ Text = ("")
+ }
+ { HBox4 HBox
+ MoveScaled(40,1,9,1)
+ Expand = True
+ }
+ { TextLabel2 TextLabel
+ MoveScaled(0,4,22.5,3.5)
+ Text = ("Real Name")
+ Alignment = Align.Left
+ }
+ { txtRealName TextBox
+ MoveScaled(16,4,37.5,3.5)
+ Text = ("")
+ }
+ { HBox5 HBox
+ MoveScaled(41,5,8,1)
+ Expand = True
+ }
+ { TextLabel3 TextLabel
+ MoveScaled(0,9,22.5,3.5)
+ Text = ("Enter Password")
+ Alignment = Align.Left
+ }
+ { txtPass1 TextBox
+ MoveScaled(17,9,37.5,3.5)
+ Text = ("")
+ Password = True
+ }
+ { HBox6 HBox
+ MoveScaled(41,11,10,1)
+ Expand = True
+ }
+ { TextLabel4 TextLabel
+ MoveScaled(0,13,22.5,3.5)
+ Text = ("Re-enter Password")
+ Alignment = Align.Left
+ }
+ { txtPass2 TextBox
+ MoveScaled(17,13,37.5,3.5)
+ Text = ("")
+ Password = True
+ }
+ { HBox7 HBox
+ MoveScaled(47,14,7,1)
+ Expand = True
+ }
+ { HBox9 HBox
+ MoveScaled(1,17,24,1)
+ Expand = True
+ }
+ { HBox10 HBox
+ MoveScaled(1,19,60,12)
+ Expand = True
+ Spacing = 4
+ Padding = 2
+ { btPicSel Button
+ MoveScaled(0,0,12,12)
+ ToolTip = ("Click here to select user Login picture")
+ Text = ("")
+ }
+ { HPanel3 HPanel
+ MoveScaled(13,0,30,12)
+ Expand = True
+ { btAddUsr Button
+ MoveScaled(1,1,25,3)
+ Text = ("Create User")
+ Picture = Picture["icon:/small/add"]
+ Default = True
+ }
+ { HBox12 HBox
+ MoveScaled(27,2,2,1)
+ Expand = True
+ }
+ { HBox8 HBox
+ MoveScaled(18,4,4,1)
+ Expand = True
+ }
+ { Button1 Button
+ MoveScaled(1,5,25,3)
+ Text = ("Import Existing User")
+ Picture = Picture["icon:/small/redo"]
+ }
+ { HBox13 HBox
+ MoveScaled(27,6,2,1)
+ Expand = True
+ }
+ { HBox11 HBox
+ MoveScaled(13,8,6,1)
+ Expand = True
+ }
+ { Button2 Button
+ MoveScaled(1,9,25,3)
+ Text = ("Clear Form")
+ Picture = Picture["icon:/small/clear"]
+ Cancel = True
+ }
+ { HBox14 HBox
+ MoveScaled(27,10,3,1)
+ Expand = True
+ }
+ }
+ }
+ }
+ { frmRights Frame
+ MoveScaled(66,0,24,34)
+ Text = ("User Rights Management")
+ { lbUsrGrps ScrollView
+ MoveScaled(1,3,19,27)
+ Arrangement = Arrange.Row
+ Padding = 2
+ Border = False
+ ScrollBar = Scroll.Vertical
+ }
+ }
}
}
}
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Mon Apr 13 14:14:56 2009
@@ -15,7 +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 $objUsrGroups AS NEW Object[]
PUBLIC FUNCTION FORMAT_THIS_PARTITION(sPartition AS String, sFilesystem AS
String) AS Integer
@@ -117,4 +117,173 @@
END
+PUBLIC SUB Display_User_Group_Choices(lbCont AS Container)
+
+ DIM cb AS CheckBox
+ DIM sList AS String[] =
["plugdev", "disk", "cdrom", "floppy", "lp", "scanner", "audio", "video", "games", "slocate", "adm", "sys", "wheel", "power"]
+ DIM sDesc AS String[] = ["User can un/mount pendrives", "User can
un/mount removable HD", "User can access CD/CDW/DVD devices", "User can
access floppy disks", "User can access printers", "User can access
scanners", "User can access audio devices", "User can access video
devices", "User can play restricted games", "User can use the system\'s
locate database", "Restricted System Administrator", "Unlimited system
administrator", "elite users", "User can shut the system down"]
+
+
+ DIM i AS Integer
+
+ FOR i = 0 TO sList.Max
+ cb = NEW CheckBox(lbCont) AS "GroupBoxes"
+ WITH cb
+ .Text = sList[i]
+ .Height = 28
+ .ToolTip = sDesc[i]
+ IF i <= 9 OR i = 13 THEN
+ .Value = TRUE
+ ELSE
+ .Value = FALSE
+ END IF
+ .Expand = TRUE
+ END WITH
+ $objUsrGroups.Add(cb)
+ NEXT
+END
+
+PUBLIC FUNCTION CHECK_EXISTING_USER(sName AS String) AS Boolean
+
+ DIM sDump AS String
+
+ SHELL "grep ^\"" & sName & "\" /mnt/target/etc/group" TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) > 0 THEN
+ RETURN TRUE
+ END IF
+ RETURN FALSE
+
+
+END
+
+
+PUBLIC FUNCTION CREATE_NEW_USER_ACCOUNT() AS Integer
+
+ ' will return
+ ' 0 = operation successful
+ ' 1 = operation failed
+
+ ' PUBLIC SUB Button1_Click()
+ ' DIM sCAPS AS String
+ ' DIM sCHAR AS String
+ ' DIM sLogE AS String
+ ' DIM sPicdir AS String = ClsGlobal.sTargetMnt
&/ "usr/share/apps/kdm/pics/users/"
+ ' DIM sGroups AS
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
+ ' DIM cb AS CheckBox
+ ' DIM tl AS TextLabel
+ ' 'DIM tly AS Integer
+ '
+ ' MdlCore.WARN_STATUS(("Creating user account ... Please wait"))
+ '
+ ' ' increment the number of user accounts created
+ ' INC MdlUsrAdd.iUsrAccts
+ '
+ ' 'Message("Ateempting to create user now")
+ '
+ ' IF ME.tbUsername.Text = "" THEN
+ ' Balloon.Error(("Enter the login name that this user will user to
login to this system."), ME.tbUsername)
+ ' 'Message(("Enter the login name that this user will use to login
to this system."))
+ ' RETURN
+ ' STOP EVENT
+ ' ELSE
+ ' 'SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[A-Z]\'" TO
sCAPS
+ ' IF ME.tbUsername.text LIKE "*[A-Z]*" THEN
+ ' 'IF ME.tbUsername.textNOT LIKE "*[a-z0-9_-]*" THEN
+ ' Balloon.Error(("Login name field contains illegal characters.
Please use only lowercase letters and numbers"), ME.tbUsername)
+ ' 'Message.Error(("Login name field contains illegal characters.
Please use only lowercase letters and numbers"))
+ ' RETURN
+ ' STOP EVENT
+ ' 'ELSE IF ME.tbUsernameNOT LIKE "*[a-z0-9_-]*" THEN
+ '
+ '
+ ' END IF
+ '
+ ' SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[^a-z0-9_-]\'"
TO sCHAR
+ ' 'SHELL "grep -e ^" & ME.tbUsername.Text & Space(1) &
ClsGlobal.sTargetMnt &/ "etc/passwd" TO sLogE
+ ' SHELL "grep -e ^" & ME.tbUsername.Text & ": " &
clsglobal.sTargetMnt &/ "etc" &/ "passwd" TO sLogE
+ '
+ ' IF sCHAR <> "" THEN
+ ' Message(("Username contains illegal characters"))
+ ' RETURN
+ ' ELSE IF sLogE <> "" THEN
+ ' Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("already exists"))
+ ' RETURN
+ ' ELSE
+ ' IF ME.tbPasswd1.Text = "" THEN
+ ' Message(("Enter a password for") & Space(1) &
ME.tbUsername.text)
+ ' RETURN
+ ' ELSE
+ ' IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
+ '
+ ' 'COMPILE LIST OF GROUPS THIS USER WILL BELONG TO
+ ' FOR EACH cb IN MdlUsrAdd.objGrps
+ ' IF cb.Value = TRUE THEN
+ ' sGroups = sGroups & "," & cb.Text
+ ' END IF
+ ' NEXT
+ ' sGroups = Right(sGroups, Len(sGroups) - 1)
+ ' 'Message(sGroups)
+ '
+ ' SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
+ ' PRINT "Creating new user group"
+ ' SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" &
Space(1) & iUID & Space(1) & ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
+ '
+ ' 'Message("chroot /mnt/target /usr/sbin/useradd -m -s
/bin/bash -u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
ME.tbUsername.Text)
+ '
+ ' 'SHELL "chroot /mnt/target /usr/sbin/useradd -m -s
/bin/bash -u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups &
Space(1) & ME.tbUsername.Text WAIT
+ ' PRINT "Creating new user account"
+ ' SHELL "chroot /mnt/target /usr/sbin/useradd -m -c " & "\'" &
ME.tbRealname.text & "\'" & " -g " & ME.tbUsername.text &
+ ' " -p " & ME.tbPasswd1.text & " -u " & iUID & " -G "
& "\'users," & sGroups & "\' -s /bin/bash " & ME.tbUsername.Text WAIT
+ ' ' sDocmd = "useradd -m -c " & "\'" & sname & "\'" & " -g " &
slogin & " -p " & ME.txtpass1.Text &
+ ' '" -G " & "\'" & sgrparse & "\' " & slogin
+ '
+ ' 'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
+ ' SHELL "chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text WAIT
+ ' 'IF IsDir(sPicdir) THEN
+ ' IF bUsePic.Value = TRUE THEN
+ '
+ ' 'this next line is for kdm
+ ' SHELL "cd " & sPicdir & "; ln -s " &
Replace(tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) &
tbUsername.Text & ".face.icon" WAIT
+ ' 'the next lines are for gdm
+ ' 'PRINT tbPicPath.Text
+ ' 'SHELL "cp " & Replace(tbPicPath.Text,
ClsGlobal.sTargetMnt, "") & Space(1) & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
+ ' 'COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt
&/ "home" &/ tbUsername.text &/ ".face"
+ ' EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt
&/ "home" &/ tbUsername.Text &/ ".face"] WAIT
+ ' SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" &
tbUsername.Text & "/.face" WAIT
+ ' SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
+ ' SHELL "chroot " & ClsGlobal.sTargetMnt & " chgrp " &
tbUsername.Text & Space(1) &/ "home/" & tbUsername.Text & "/.face" WAIT
+ ' ENDIF
+ ' 'Message(("User account for") & Space(1) &
ME.tbUsername.Text & Space(1) & ("was created."))
+ ' ' easy way to create the account here
+ ' tl = NEW TextLabel(ME.LstUsers)
+ ' WITH tl
+ ' .Text = ME.tbUsername.Text
+ ' .Height = 21
+ ' .Width = MdlObjSizer.get_object_width(.Text)
+ ' .ToolTip = ME.tbRealname.Text
+ ' .Move(4, tly)
+ ' END WITH
+ ' tly = tly + tl.Height + 2
+ ' btClrFrm_Click() ' clear the form
+ ' INC iUID
+ ' ELSE
+ ' Message(("Passwords do not match"))
+ ' Balloon.Info(("Enter the same password twice"), ME.tbPasswd1)
+ ' ME.tbPasswd1.Clear
+ ' ME.tbPasswd2.Clear
+ ' RETURN
+ ' STOP EVENT
+ ' ENDIF
+ ' ENDIF
+ ' ENDIF
+ ' ENDIF
+ '
+ ' ME.LstUsers.Visible = TRUE
+ ' ME.pbUsrPic.Visible = FALSE
+ ' MdlCore.warn_status_off()
+ ' END
+
+
+END
|
|
From: <cod...@go...> - 2009-04-13 15:17:18
|
Author: M0...@gm...
Date: Mon Apr 13 08:13:48 2009
New Revision: 530
Added:
branches/speedy/Conf2.class
branches/speedy/Conf2.form
branches/speedy/Conf3.class
branches/speedy/Conf3.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.project
Log:
- Finished root password setup
- Start user accounts setup.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Apr 13 08:13:48 2009
@@ -154,6 +154,77 @@
msgid "UTC"
msgstr ""
+#: Conf2.class:24
+msgid ""
+"The linux root account is pre-defined to be used as the system "
+"administrator's account. "
+msgstr ""
+
+#: Conf2.class:24
+msgid ""
+"This account is used to perform system-wide changes such as adding / "
+"removing software, system-qide updates, managing user accounts, etc."
+msgstr ""
+
+#: Conf2.class:24
+msgid "Most oter every-day tasks do not require administrative
priviledges."
+msgstr ""
+
+#: Conf2.class:24
+msgid ""
+"For added security, use a password that is easy for you to remember, but "
+"hard for others to guess."
+msgstr ""
+
+#: Conf2.class:24
+msgid "DO NOT LEAVE THIS BLANK"
+msgstr ""
+
+#: Conf2.class:56
+msgid "Passwords do not match. Please enter the same password twice"
+msgstr ""
+
+#: Conf2.class:62
+msgid "Password was not set. See error log below"
+msgstr ""
+
+#: Conf2.class:116
+msgid "System Administrator Account"
+msgstr ""
+
+#: Conf2.class:133
+msgid "About the linux root account"
+msgstr ""
+
+#: Conf2.class:165
+msgid "Enter Passwrord"
+msgstr ""
+
+#: Conf2.class:182
+msgid "Re-enter Password"
+msgstr ""
+
+#: Conf3.class:22
+msgid "Create as many user accounts as you want / need here."
+msgstr ""
+
+#: Conf3.class:22
+msgid "Choose a unique login name for each user account."
+msgstr ""
+
+#: Conf3.class:26
+msgid "When finished, Click"
+msgstr ""
+
+#: Conf3.class:26 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72
+#: Step5.class:177
+msgid "to continue"
+msgstr ""
+
+#: Conf3.class:70
+msgid "Create User Accounts"
+msgstr ""
+
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
@@ -683,10 +754,6 @@
#: Step3a1a.class:177
msgid "Partitioning stage complete. Click"
-msgstr ""
-
-#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72 Step5.class:177
-msgid "to continue"
msgstr ""
#: Step3a1a.class:186
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Mon Apr 13 08:13:48 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.12
Title=VectorLinux Installer
-Startup=MdlStartUp
+Startup=Conf3
Version=0.0.2
Library=gb.gtk
Library=gb.form
Added: branches/speedy/Conf2.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf2.class Mon Apr 13 08:13:48 2009
@@ -0,0 +1,78 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<b>" & .tlbanner.Text & "</b>"
+ .TextLabel1.Text = ("The linux root account is pre-defined to be used
as the system administrator's account. ")&
+ ("This account is used to perform system-wide changes such as adding /
removing software, system-qide updates, managing user accounts, etc.")
& "<br><br>" &
+ ("Most oter every-day tasks do not require administrative
priviledges.") & "<br>" & "<br>" &
+ ("For added security, use a password that is easy for you to remember,
but hard for others to guess.") & "<br><br>" & ("DO NOT LEAVE THIS BLANK")
+ END WITH
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ hbox2.Width = hbox2.Parent.Width - (hbox2.Left * 2)
+
+END
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Conf3"
+
+
+END
+PUBLIC SUB StartUp()
+
+ ClsGlobal.fRunningMainForm.btnext.enabled = Len(textbox1.Text) > 0
+
+END
+
+PUBLIC SUB OnExit()
+
+ IF compare_passwords() = FALSE THEN RETURN
+
+END
+
+PUBLIC FUNCTION compare_passwords() AS Boolean
+ 'DIM hlproc AS Process
+ DIM sRes AS String
+ IF textbox1.Text <> textbox2.Text THEN
+ Message.Error(("Passwords do not match. Please enter the same password
twice"))
+ STOP EVENT
+ RETURN FALSE
+ ELSE
+ SHELL "chroot /mnt/target /sbin/passwdx root " & Trim(textbox1.Text)
& " || echo ERROR" TO sRes
+ IF InStr(sRes, "ERROR") THEN
+ Message.Error(("Password was not set. See error log below")
& "<br>" & Trim(sRes))
+ RETURN FALSE
+ STOP EVENT
+ END IF
+ END IF
+ textbox1.Clear
+ textbox2.Clear
+END
+
+
+
+
+PUBLIC SUB TextBox2_KeyRelease()
+
+ ClsGlobal.fRunningMainForm.btnext.enabled = textbox2.Text = textbox1.Text
+
+END
Added: branches/speedy/Conf2.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf2.form Mon Apr 13 08:13:48 2009
@@ -0,0 +1,81 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,78,47)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("System Administrator Account")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,6,2)
+ Expand = True
+ }
+ { Frame1 Frame
+ MoveScaled(1,8,74,23)
+ Expand = True
+ Text = ("About the linux root account")
+ { HBox2 HBox
+ MoveScaled(1,2,71,19)
+ Spacing = 4
+ Padding = 2
+ { PictureBox1 PictureBox
+ MoveScaled(1,3,6,12)
+ Picture = Picture["icon:/32/warning"]
+ Alignment = Align.Center
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(10,2,58,12)
+ Expand = True
+ Text = ("")
+ }
+ }
+ }
+ { HBox5 HBox
+ MoveScaled(2,31,15,2)
+ Expand = True
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,34,72,11)
+ Expand = True
+ { TextLabel2 TextLabel
+ MoveScaled(1,1,20,3.5)
+ Text = ("Enter Passwrord")
+ Alignment = Align.Left
+ }
+ { TextBox1 TextBox
+ MoveScaled(21,1,35,3.5)
+ Text = ("")
+ Password = True
+ }
+ { HBox3 HBox
+ MoveScaled(57,2,13,1)
+ Expand = True
+ }
+ { TextLabel3 TextLabel
+ MoveScaled(1,5,20,3.5)
+ Text = ("Re-enter Password")
+ Alignment = Align.Left
+ }
+ { TextBox2 TextBox
+ MoveScaled(21,5,35,3.5)
+ Text = ("")
+ Password = True
+ }
+ { HBox4 HBox
+ MoveScaled(57,6,13,1)
+ Expand = True
+ }
+ }
+}
Added: branches/speedy/Conf3.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf3.class Mon Apr 13 08:13:48 2009
@@ -0,0 +1,43 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<b>" & tlbanner.Text & "</b>"
+ .tlTxt.Text = ("Create as many user accounts as you want / need
here.") & "<br>" &
+ ("Choose a unique login name for each user account.") & "<br><br>" '
+ ' --- only if running embedded --- '
+ IF ClsGlobal.fRunningMainForm THEN
+ .tlTxt.Text = tlTxt.Text &
+ ("When finished, Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue")
+ END IF
+ END WITH
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+
+
+
Added: branches/speedy/Conf3.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf3.form Mon Apr 13 08:13:48 2009
@@ -0,0 +1,35 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,72,48)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("Create User Accounts")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,7,2)
+ Expand = True
+ }
+ { HBox2 HBox
+ MoveScaled(0,7,71,12)
+ Expand = True
+ Padding = 2
+ { tlTxt TextLabel
+ MoveScaled(1,0,15,11)
+ Expand = True
+ Text = ("")
+ Alignment = Align.Left
+ }
+ }
+}
|
|
From: <cod...@go...> - 2009-04-09 20:59:40
|
Author: M0...@gm...
Date: Thu Apr 9 13:58:01 2009
New Revision: 529
Added:
branches/speedy/Conf1.class
branches/speedy/Conf1.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/en_US.po
branches/speedy/MdlMain.module
Log:
- Added TimeZone configuration step and needed functions to set timeclock.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Apr 9 13:58:01 2009
@@ -125,6 +125,35 @@
msgid "Tab 0"
msgstr ""
+#: Conf1.class:141 MdlStartUp.module:53
+msgid "Regional Settings"
+msgstr ""
+
+#: Conf1.class:154
+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 ""
+
+#: Conf1.class:170
+msgid "Choose the correct timezone for the area in which you live."
+msgstr ""
+
+#: Conf1.class:181
+msgid "ComboBox1"
+msgstr ""
+
+#: Conf1.class:183
+msgid "LocalTime"
+msgstr ""
+
+#: Conf1.class:183
+msgid "UTC"
+msgstr ""
+
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
@@ -263,10 +292,6 @@
#: MdlStartUp.module:52
msgid "System Boot Manager"
-msgstr ""
-
-#: MdlStartUp.module:53
-msgid "Regional Settings"
msgstr ""
#: MdlStartUp.module:54
Modified: branches/speedy/.lang/en_US.po
==============================================================================
--- branches/speedy/.lang/en_US.po (original)
+++ branches/speedy/.lang/en_US.po Thu Apr 9 13:58:01 2009
@@ -14,23 +14,135 @@
msgid "VectorLinux Installer"
msgstr "VectorLinux Installer"
-#: FMain.class:247 FMain0.class:247 FMain0Old.class:233
+#: Conf0.class:51
+#, fuzzy
+msgid "Installation found in"
+msgstr "Select Installation Source"
+
+#: Conf0.class:69
+msgid "Include in boot menu"
+msgstr ""
+
+#: Conf0.class:89
+msgid "Name"
+msgstr ""
+
+#: Conf0.class:107
+msgid "Initial RAM disk image"
+msgstr ""
+
+#: Conf0.class:130
+msgid "Kernel boot options"
+msgstr ""
+
+#: Conf0.class:156
+msgid "Add option to boot this operating system into text mode"
+msgstr ""
+
+#: Conf0.class:222 MdlBootMngr.module:373
+msgid "Standard"
+msgstr ""
+
+#: Conf0.class:222
+msgid "Bootplash Med"
+msgstr ""
+
+#: Conf0.class:222 MdlBootMngr.module:377
+msgid "Bootsplash High"
+msgstr ""
+
+#: Conf0.class:222 MdlBootMngr.module:379
+msgid "Bootsplash Extra High"
+msgstr ""
+
+#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Step7a.class:143
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0.class:332
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0.class:332
+msgid ""
+"You may not be able to start your VectorLinux installation. Do not
choose "
+"this option"
+msgstr ""
+
+#: Conf0.class:332
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0.class:395
+msgid "System Bootloader Configuration"
+msgstr ""
+
+#: Conf0.class:411
+msgid "Select system boot manager to use"
+msgstr ""
+
+#: Conf0.class:420
+msgid "LILO"
+msgstr ""
+
+#: Conf0.class:426
+msgid "GRUB"
+msgstr ""
+
+#: Conf0.class:432
+msgid "NONE"
+msgstr ""
+
+#: Conf0.class:441
+msgid "Boot Menu Options"
+msgstr ""
+
+#: Conf0.class:451
+msgid "Target"
+msgstr ""
+
+#: Conf0.class:463
+msgid "Video Resolution"
+msgstr ""
+
+#: Conf0.class:482
+msgid "Prompt Time Out"
+msgstr ""
+
+#: Conf0.class:493
+msgid "Seconds"
+msgstr ""
+
+#: Conf0.class:499
+msgid "Boot Default"
+msgstr ""
+
+#: Conf0.class:518
+msgid "DETECTED OPERATING SYSTEMS."
+msgstr ""
+
+#: Conf0.class:534
+msgid "Tab 0"
+msgstr ""
+
+#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr "Process Overview"
-#: FMain.class:288 FMain0.class:288
+#: FMain.class:293 FMain0.class:294
msgid "Help"
msgstr ""
-#: FMain.class:301 FMain0.class:301 FMain0Old.class:271
+#: FMain.class:306 FMain0.class:307
msgid "Back"
msgstr "Back"
-#: FMain.class:312 FMain0.class:312 FMain0Old.class:282
+#: FMain.class:317 FMain0.class:318
msgid "Next"
msgstr "Next"
-#: FMain.class:323 FMain0.class:323 FMain0Old.class:293
+#: FMain.class:328 FMain0.class:329
msgid "Quit"
msgstr "Quit"
@@ -78,11 +190,40 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlMain.module:33
+#: MdlBootMngr.module:352
+#, fuzzy
+msgid "None"
+msgstr "on"
+
+#: MdlBootMngr.module:363
+msgid "MBR Of"
+msgstr ""
+
+#: MdlBootMngr.module:365
+msgid "Bootsector Of"
+msgstr ""
+
+#: MdlBootMngr.module:367
+msgid "Floppy"
+msgstr ""
+
+#: MdlBootMngr.module:375
+msgid "Bootsplash Med"
+msgstr ""
+
+#: MdlBootMngr.module:445
+msgid "MBR of"
+msgstr ""
+
+#: MdlBootMngr.module:453
+msgid "Bootsector of"
+msgstr ""
+
+#: MdlMain.module:34
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:33
+#: MdlMain.module:34
msgid "to"
msgstr ""
@@ -102,7 +243,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:135
+#: MdlStartUp.module:47 Step8.class:147
msgid "Software Selection"
msgstr ""
@@ -110,7 +251,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:218
+#: MdlStartUp.module:49 Step8.class:230
msgid "Installation Summary"
msgstr ""
@@ -265,10 +406,6 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:433 Step3a1.class:22 Step3a1a.class:186 Step7a.class:143
-msgid "WARNING:"
-msgstr ""
-
#: Step1.class:433
msgid "This process can take a long time to complete."
msgstr ""
@@ -545,11 +682,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:467 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:467 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
msgid "No"
msgstr ""
@@ -800,51 +937,51 @@
msgid "Restart Now"
msgstr ""
-#: Step6.class:66
+#: Step6.class:68
msgid "Partition"
msgstr ""
-#: Step6.class:67
+#: Step6.class:69
msgid "Size"
msgstr ""
-#: Step6.class:68
+#: Step6.class:70
msgid "Mount Point"
msgstr ""
-#: Step6.class:69
+#: Step6.class:71
msgid "File System"
msgstr ""
-#: Step6.class:142
+#: Step6.class:149
msgid "Swap"
msgstr ""
-#: Step6.class:142
+#: Step6.class:149
msgid "Not Used"
msgstr ""
-#: Step6.class:183 Step8.class:73
+#: Step6.class:190 Step8.class:82
msgid "Do not format"
msgstr ""
-#: Step6.class:228
+#: Step6.class:235
msgid "You have already selected"
msgstr ""
-#: Step6.class:228
+#: Step6.class:235
msgid "as your"
msgstr ""
-#: Step6.class:228
+#: Step6.class:235
msgid "partition."
msgstr ""
-#: Step6.class:228
+#: Step6.class:235
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:362
+#: Step6.class:405
msgid "Select which partitions to use for installation"
msgstr ""
@@ -861,7 +998,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:125
+#: Step7.class:126 Step8.class:137
msgid "Customized"
msgstr ""
@@ -869,7 +1006,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:127
+#: Step7.class:144 Step8.class:139
msgid "Minimal"
msgstr ""
@@ -934,60 +1071,60 @@
"include in your installation."
msgstr ""
-#: Step8.class:44
+#: Step8.class:50
msgid "Distribution"
msgstr ""
-#: Step8.class:62
+#: Step8.class:68
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:74
+#: Step8.class:83
msgid "Not Formatted"
msgstr ""
-#: Step8.class:74
+#: Step8.class:83
msgid "Mount to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:84
msgid "Format to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:84
msgid "and mount to"
msgstr ""
-#: Step8.class:88
+#: Step8.class:100
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:93
+#: Step8.class:105
msgid "Swap Space"
msgstr ""
-#: Step8.class:106
+#: Step8.class:118
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:123
+#: Step8.class:135
msgid "Full"
msgstr ""
-#: Step8.class:130
+#: Step8.class:142
#, fuzzy
msgid "Installation Method"
msgstr "Select Installation Source"
-#: Step8.class:136
+#: Step8.class:148
msgid "Major Components"
msgstr ""
-#: Step8.class:146
+#: Step8.class:158
msgid "Additional Software"
msgstr ""
-#: Step8.class:237
+#: Step8.class:249
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Added: branches/speedy/Conf1.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf1.class Thu Apr 9 13:58:01 2009
@@ -0,0 +1,106 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h3>" & tlbanner.Text & "</h3>"
+ MdlMain.DISPLAY_TIME_ZONES(ME.lbTmZone)
+
+ ' default the time zone to us/central
+ ME.lbTmZone[ME.lbTmZone.Find("US/Central")].Selected = TRUE
+
+END
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Conf2"
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC SUB OnExit()
+
+ MdlMain.SET_TIME_ZONE(Trim(ME.lbTmZone.Text), Trim(ME.cbHwClock.Text))
+
+
+END
+
+
+
+PUBLIC SUB lbTmZone_Click()
+
+ 'Message(ME.lbTmZone.Text)
+ FMain.btnext.Enabled = TRUE
+
+END
+
+
+
+PUBLIC SUB Form_Resize()
+
+ ME.hbox4.Height = ME.ClientHeight - (ME.HBox4.Top + 24)
+
+END
+
+PUBLIC SUB cbHwClock_Click()
+
+
+
+END
+
+PUBLIC SUB lbTmZone_KeyPress()
+
+
+
+ DIM i AS Integer
+
+ 'i = 0
+ IF Key.text > "z" OR Key.text < " " THEN RETURN ' not searchable
+
+ i = lbTmZone.Index
+ DO
+ INC i
+ IF i >= lbTmZone.Count THEN i = 0 'back to top
+ IF i = lbTmZone.Index THEN RETURN ' no other match found
+ IF lbTmZone[i].text LIKE Key.Text & "*" THEN
+ lbTmZone.Index = i
+ RETURN
+ END IF
+ LOOP
+
+
+
+END
+
+PUBLIC SUB Form_Show()
+
+ME.Form_Open()
+ ' Fmain.frmcurr = ME
+ ' ME.tlbanner.Text = "<h3>" & ("Timezone configuration") & "</h3>"
+ ' WITH FMain
+ ' .tvPlan["Conf0"].Picture = MdlCore.sDonePic
+ ' .tvPlan["Conf1"].picture = MdlCore.sNowPic
+ ' .tvPlan["Conf1"].Selected = TRUE
+ ' END WITH
+ '
+
+END
Added: branches/speedy/Conf1.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf1.form Thu Apr 9 13:58:01 2009
@@ -0,0 +1,68 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,81,55)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("Regional Settings")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(1,7,74,8)
+ Expand = True
+ AutoResize = True
+ Text = ("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.")
+ }
+ { HBox2 HBox
+ MoveScaled(1,15,67,1)
+ Expand = True
+ }
+ { HBox1 HBox
+ MoveScaled(2,19,65,3.5)
+ Expand = True
+ Padding = 2
+ { TextLabel2 TextLabel
+ MoveScaled(0,0,41,3)
+ Expand = True
+ Text = ("Choose the correct timezone for the area in which you
live.")
+ Alignment = Align.Left
+ }
+ }
+ { HBox5 HBox
+ MoveScaled(1,24,48,3.5)
+ Expand = True
+ { cbHwClock ComboBox
+ MoveScaled(0,0,34,3.5)
+ Text = ("ComboBox1")
+ ReadOnly = True
+ List = [("LocalTime"), ("UTC")]
+ }
+ }
+ { HBox3 HBox
+ MoveScaled(2,28,27,1)
+ Expand = True
+ }
+ { HBox4 HBox
+ MoveScaled(4,30,50,24)
+ Expand = True
+ { lbTmZone ListBox
+ MoveScaled(0,0,31,27)
+ Expand = True
+ }
+ { Panel1 Panel
+ MoveScaled(39,8,6,5)
+ Expand = True
+ }
+ }
+}
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Thu Apr 9 13:58:01 2009
@@ -70,3 +70,51 @@
END
+PUBLIC SUB DISPLAY_TIME_ZONES(objLb AS ListBox)
+
+ DIM sList AS String
+ DIM stz AS String[]
+ DIM i AS Integer
+
+ sList
= "US/Alaska,US/Aleutian,US/Arizona,US/Central,US/East-Indiana,US/Eastern,US/Hawaii,US/Indiana-Starke,
US/Michigan, US/Mountain, US/Pacific, US/Samoa, Africa/Abidjan,
Africa/Accra, Africa/Addis_Ababa, Africa/Algiers, Africa/Asmera,
Africa/Bamako, Africa/Bangui, Africa/Banjul, Africa/Bissau,
Africa/Blantyre, Africa/Brazzaville, Africa/Bujumbura, Africa/Cairo,
Africa/Casablanca, Africa/Ceuta, Africa/Conakry, Africa/Dakar,
Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Douala, Africa/El_Aaiun,
Africa/Freetown, Africa/Gaborone, Africa/Harare, Africa/Johannesburg,
Africa/Kampala, Africa/Khartoum, Africa/Kigali, Africa/Kinshasa,
Africa/Lagos, Africa/Libreville, Africa/Lome, Africa/Luanda,
Africa/Lubumbashi, Africa/Lusaka, Africa/Malabo, Africa/Maputo,
Africa/Maseru, Africa/Mbabane, Africa/Mogadishu, Africa/Monrovia,
Africa/Nairobi, Africa/Ndjamena, Africa/Niamey, Africa/Nouakchott,
Africa/Ouagadougou, Africa/Porto-Novo, Africa/Sao_Tome, Africa/Timbuktu,
Africa/Tripoli, Africa/Tunis, Africa/Windhoek, America/Adak,
America/Anchorage, America/Anguilla, America/Antigua, America/Araguaina,
America/Aruba, America/Asuncion, America/Atka, America/Barbados,
America/Belem, America/Belize, America/Boa_Vista, America/Bogota,
America/Boise, America/Buenos_Aires, America/Cambridge_Bay, America/Cancun,
America/Caracas, America/Catamarca, America/Cayenne, America/Cayman,
America/Chicago, America/Chihuahua, America/Cordoba, America/Costa_Rica,
America/Cuiaba, America/Curacao, America/Dawson, America/Dawson_Creek,
America/Denver, America/Detroit, America/Dominica, America/Edmonton,
America/Eirunepe, America/El_Salvador, America/Ensenada,
America/Fort_Wayne, America/Fortaleza, America/Glace_Bay, America/Godthab,
America/Goose_Bay, America/Grand_Turk, America/Grenada, America/Guadeloupe,
America/Guatemala, America/Guayaquil, America/Guyana, America/Halifax,
America/Havana, America/Hermosillo, America/Indiana/Indianapolis,
America/Indiana/Knox, America/Indiana/Marengo, America/Indiana/Vevay,
America/Indianapolis, America/Inuvik, America/Iqaluit, America/Jamaica,
America/Jujuy, America/Juneau, America/Kentucky/Louisville,
America/Kentucky/Monticello, America/Knox_IN, America/La_Paz, America/Lima,
America/Los_Angeles, America/Louisville, America/Maceio, America/Managua,
America/Manaus, America/Martinique, America/Mazatlan, America/Mendoza,
America/Menominee, America/Merida, America/Mexico_City, America/Miquelon,
America/Monterrey, America/Montevideo, America/Montreal,
America/Montserrat, America/Nassau, America/New_York, America/Nipigon,
America/Nome, America/Noronha, America/Panama, America/Pangnirtung,
America/Paramaribo, America/Phoenix, America/Port-au-Prince,
America/Port_of_Spain, America/Porto_Acre, America/Porto_Velho,
America/Puerto_Rico, America/Rainy_River, America/Rankin_Inlet,
America/Recife, America/Regina, America/Rosario, America/Santiago,
America/Santo_Domingo, America/Sao_Paulo, America/Scoresbysund,
America/Shiprock, America/St_Johns, America/St_Kitts, America/St_Lucia,
America/St_Thomas, America/St_Vincent, America/Swift_Current,
America/Tegucigalpa, America/Thule, America/Thunder_Bay, America/Tijuana,
America/Tortola, America/Vancouver, America/Virgin, America/Whitehorse,
America/Winnipeg, America/Yakutat, America/Yellowknife, Antarctica/Casey,
Antarctica/Davis, Antarctica/DumontDUrville, Antarctica/Mawson,
Antarctica/McMurdo, Antarctica/Palmer, Antarctica/South_Pole,
Antarctica/Syowa, Arctic/Longyearbyen," &
+"Asia/Aden, Asia/Almaty, Asia/Amman, Asia/Anadyr, Asia/Aqtau, Asia/Aqtobe,
Asia/Ashgabat, Asia/Ashkhabad, Asia/Baghdad, Asia/Bahrain, Asia/Baku,
Asia/Bangkok, Asia/Beirut, Asia/Bishkek,
Asia/Brunei,Asia/Calcutta,Asia/Chungking,Asia/Colombo,Asia/Dacca,Asia/Damascus,Asia/Dhaka,Asia/Dili,Asia/Dubai,Asia/Dushanbe,Asia/Gaza,Asia/Harbin,Asia/Hong_Kong,Asia/Hovd,Asia/Irkutsk,Asia/Istanbul,Asia/Jakarta,Asia/Jayapura,Asia/Jerusalem,Asia/Kabul,Asia/Kamchatka,Asia/Karachi,Asia/Kashgar,Asia/Katmandu,Asia/Krasnoyarsk,Asia/Kuala_Lumpur,Asia/Kuching,Asia/Kuwait,Asia/Macao,Asia/Macau,Asia/Magadan,Asia/Makassar,Asia/Manila,Asia/Muscat,Asia/Nicosia,Asia/Novosibirsk,Asia/Omsk,Asia/Oral,Asia/Phnom_Penh,Asia/Pyongyang,Asia/Qatar,Asia/Qyzylorda,Asia/Rangoon,Asia/Riyadh,Asia/Riyadh87,Asia/Riyadh88,Asia/Riyadh89,Asia/Saigon,Asia/Samarkand,Asia/Seoul,Asia/Shanghai,Asia/Singapore,Asia/Taipei,Asia/Tashkent,Asia/Tbilisi,Asia/Tehran,Asia/Tel_Aviv,Asia/Thimbu,Asia/Thimphu,Asia/Tokyo,Asia/Ujung_Pandang,Asia/Ulaanbaatar,Asia/Ulan_Bator,Asia/Urumqi,Asia/Vientiane,Asia/Vladivostok,Asia/Yakutsk,Asia/Yekaterinburg,Asia/Yerevan,Atlantic/Azores,Atlantic/Bermuda,Atlantic/Canary,Atlantic/Cape_Verde,Atlantic/Faeroe,Atlantic/Jan_Mayen,Atlantic/Madeira,Atlantic/Reykjavik,Atlantic/South_Georgia,Atlantic/St_Helena,Atlantic/Stanley,Australia/ACT,Australia/Adelaide,Australia/Brisbane,Australia/Broken_Hill,Australia/Canberra,Australia/Darwin,Australia/Hobart,Australia/LHI,Australia/Lindeman,Australia/Lord_Howe,Australia/Melbourne,Australia/NSW,Australia/North,Australia/Perth,Australia/Queensland,Australia/South,Australia/Sydney,Australia/Tasmania,Australia/Victoria,Australia/West,Australia/Yancowinna,Brazil/Acre,Brazil/DeNoronha,Brazil/East,Brazil/West,CET,CST6CDT,Canada/Atlantic,Canada/Central,Canada/East-Saskatchewan,Canada/Eastern,Canada/Mountain,Canada/Newfoundland,Canada/Pacific,Canada/Saskatchewan,Canada/Yukon,Chile/Continental,Chile/EasterIsland,Cuba,EET,EST,EST5EDT,Egypt,Eire,Etc/GMT,Etc/GMT+0,Etc/GMT+1,Etc/GMT+10,Etc/GMT+11,Etc/GMT+12,Etc/GMT+2,Etc/GMT+3,Etc/GMT+4,Etc/GMT+5,Etc/GMT+6,Etc/GMT+7,Etc/GMT+8,Etc/GMT+9,Etc/GMT-0,Etc/GMT-1,Etc/GMT-10,Etc/GMT-11,Etc/GMT-12,Etc/GMT-13,Etc/GMT-14,Etc/GMT-2,Etc/GMT-3,Etc/GMT-4,Etc/GMT-5,Etc/GMT-6,Etc/GMT-7,Etc/GMT-8,Etc/GMT-9,Etc/GMT0,Etc/Greenwich,Etc/UCT,Etc/UTC,Etc/Universal,Etc/Zulu,Europe/Amsterdam,Europe/Andorra,Europe/Athens,Europe/Belfast,Europe/Belgrade,Europe/Berlin,Europe/Bratislava,Europe/Brussels,Europe/Bucharest,Europe/Budapest,Europe/Chisinau,Europe/Copenhagen,Europe/Dublin,Europe/Gibraltar,Europe/Helsinki,Europe/Istanbul,Europe/Kaliningrad,Europe/Kiev,Europe/Lisbon,Europe/Ljubljana,Europe/London,Europe/Luxembourg,Europe/Madrid,Europe/Malta,Europe/Minsk,Europe/Monaco,Europe/Moscow,Europe/Nicosia,Europe/Oslo,Europe/Paris,Europe/Prague,Europe/Riga,Europe/Rome,Europe/Samara,Europe/San_Marino,Europe/Sarajevo,Europe/Simferopol,Europe/Skopje,Europe/Sofia,Europe/Stockholm,Europe/Tallinn,Europe/Tirane,Europe/Tiraspol,Europe/Uzhgorod,Europe/Vaduz,Europe/Vatican,Europe/Vienna,Europe/Vilnius,Europe/Warsaw,Europe/Zagreb,Europe/Zaporozhye,Europe/Zurich,Factory,GB,GB-Eire,GMT,GMT+0,GMT-0,GMT0,Greenwich,HST,Hongkong,Iceland,Indian/Antananarivo,Indian/Chagos,Indian/Christmas,Indian/Cocos,Indian/Comoro,Indian/Kerguelen,Indian/Mahe,Indian/Maldives,Indian/Mauritius,Indian/Mayotte,Indian/Reunion,"
&
+"Iran,Israel,Jamaica,Japan,Kwajalein,Libya,MET,MST,MST7MDT,Mexico/BajaNorte,Mexico/BajaSur,Mexico/General,Mideast/Riyadh87,Mideast/Riyadh88,Mideast/Riyadh89,NZ,NZ-CHAT,Navajo,PRC,PST8PDT,Pacific/Apia,Pacific/Auckland,Pacific/Chatham,Pacific/Easter,Pacific/Efate,Pacific/Enderbury,Pacific/Fakaofo,Pacific/Fiji,Pacific/Funafuti,Pacific/Galapagos,Pacific/Gambier,Pacific/Guadalcanal,Pacific/Guam,Pacific/Honolulu,Pacific/Johnston,Pacific/Kiritimati,Pacific/Kosrae,Pacific/Kwajalein,Pacific/Majuro,Pacific/Marquesas,Pacific/Midway,Pacific/Nauru,Pacific/Niue,Pacific/Norfolk,Pacific/Noumea,Pacific/Pago_Pago,Pacific/Palau,Pacific/Pitcairn,Pacific/Ponape,Pacific/Port_Moresby,Pacific/Rarotonga,Pacific/Saipan,Pacific/Samoa,Pacific/Tahiti,Pacific/Tarawa,Pacific/Tongatapu,Pacific/Truk,Pacific/Wake,Pacific/Wallis,Pacific/Yap,Poland,Portugal,ROC,ROK,Singapore,SystemV/AST4,SystemV/AST4ADT,SystemV/CST6,SystemV/CST6CDT,SystemV/EST5,SystemV/EST5EDT,SystemV/HST10,SystemV/MST7,SystemV/MST7MDT,SystemV/PST8,SystemV/PST8PDT,SystemV/YST9,SystemV/YST9YDT,Turkey,UCT,UTC,Universal,W-SU,WET,Zulu,posix/Africa/Abidjan,posix/Africa/Accra,posix/Africa/Addis_Ababa,posix/Africa/Algiers,posix/Africa/Asmera,posix/Africa/Bamako,posix/Africa/Bangui,posix/Africa/Banjul,posix/Africa/Bissau,posix/Africa/Blantyre,posix/Africa/Brazzaville,posix/Africa/Bujumbura,posix/Africa/Cairo,posix/Africa/Casablanca,posix/Africa/Ceuta,posix/Africa/Conakry,posix/Africa/Dakar,posix/Africa/Dar_es_Salaam,posix/Africa/Djibouti,posix/Africa/Douala,posix/Africa/El_Aaiun,posix/Africa/Freetown,posix/Africa/Gaborone,posix/Africa/Harare,posix/Africa/Johannesburg,posix/Africa/Kampala,posix/Africa/Khartoum,posix/Africa/Kigali,posix/Africa/Kinshasa,posix/Africa/Lagos,posix/Africa/Libreville,posix/Africa/Lome,posix/Africa/Luanda,posix/Africa/Lubumbashi,posix/Africa/Lusaka,posix/Africa/Malabo,posix/Africa/Maputo,posix/Africa/Maseru,posix/Africa/Mbabane,posix/Africa/Mogadishu,posix/Africa/Monrovia,posix/Africa/Nairobi,posix/Africa/Ndjamena,posix/Africa/Niamey,posix/Africa/Nouakchott,posix/Africa/Ouagadougou,posix/Africa/Porto-Novo,posix/Africa/Sao_Tome,posix/Africa/Timbuktu,posix/Africa/Tripoli,posix/Africa/Tunis,posix/Africa/Windhoek,posix/America/Adak,posix/America/Anchorage,posix/America/Anguilla,posix/America/Antigua,posix/America/Araguaina,posix/America/Aruba,posix/America/Asuncion,posix/America/Atka,posix/America/Barbados,posix/America/Belem,posix/America/Belize,posix/America/Boa_Vista,posix/America/Bogota,posix/America/Boise,posix/America/Buenos_Aires,posix/America/Cambridge_Bay,posix/America/Cancun,posix/America/Caracas,posix/America/Catamarca,posix/America/Cayenne,posix/America/Cayman,posix/America/Chicago,posix/America/Chihuahua,posix/America/Cordoba,posix/America/Costa_Rica,posix/America/Cuiaba,posix/America/Curacao,posix/America/Dawson,posix/America/Dawson_Creek,posix/America/Denver,posix/America/Detroit,posix/America/Dominica,posix/America/Edmonton,posix/America/Eirunepe,posix/America/El_Salvador,posix/America/Ensenada,posix/America/Fort_Wayne,posix/America/Fortaleza,posix/America/Glace_Bay,posix/America/Godthab,posix/America/Goose_Bay,posix/America/Grand_Turk,posix/America/Grenada,posix/America/Guadeloupe,posix/America/Guatemala,posix/America/Guayaquil,posix/America/Guyana,posix/America/Halifax,posix/America/Havana,posix/America/Hermosillo,posix/America/Indiana/Indianapolis,posix/America/Indiana/Knox,"
&
+"posix/America/Indiana/Marengo,posix/America/Indiana/Vevay,posix/America/Indianapolis,posix/America/Inuvik,posix/America/Iqaluit,posix/America/Jamaica,posix/America/Jujuy,posix/America/Juneau,posix/America/Kentucky/Louisville,posix/America/Kentucky/Monticello,posix/America/Knox_IN,posix/America/La_Paz,posix/America/Lima,posix/America/Los_Angeles,posix/America/Louisville,posix/America/Maceio,posix/America/Managua,posix/America/Manaus,posix/America/Martinique,posix/America/Mazatlan,posix/America/Mendoza,posix/America/Menominee,posix/America/Merida,posix/America/Mexico_City,posix/America/Miquelon,posix/America/Monterrey,posix/America/Montevideo,posix/America/Montreal,posix/America/Montserrat,posix/America/Nassau,posix/America/New_York,posix/America/Nipigon,posix/America/Nome,posix/America/Noronha,posix/America/Panama,posix/America/Pangnirtung,posix/America/Paramaribo,posix/America/Phoenix,posix/America/Port-au-Prince,posix/America/Port_of_Spain,posix/America/Porto_Acre,posix/America/Porto_Velho,posix/America/Puerto_Rico,posix/America/Rainy_River,posix/America/Rankin_Inlet,posix/America/Recife,posix/America/Regina,posix/America/Rosario,posix/America/Santiago,posix/America/Santo_Domingo,posix/America/Sao_Paulo,posix/America/Scoresbysund,posix/America/Shiprock,posix/America/St_Johns,posix/America/St_Kitts,posix/America/St_Lucia,posix/America/St_Thomas,posix/America/St_Vincent,posix/America/Swift_Current,posix/America/Tegucigalpa,posix/America/Thule,posix/America/Thunder_Bay,posix/America/Tijuana,posix/America/Tortola,posix/America/Vancouver,posix/America/Virgin,posix/America/Whitehorse,posix/America/Winnipeg,posix/America/Yakutat,posix/America/Yellowknife,posix/Antarctica/Casey,posix/Antarctica/Davis,posix/Antarctica/DumontDUrville,posix/Antarctica/Mawson,posix/Antarctica/McMurdo,posix/Antarctica/Palmer,posix/Antarctica/South_Pole,posix/Antarctica/Syowa,posix/Arctic/Longyearbyen,posix/Asia/Aden,posix/Asia/Almaty,posix/Asia/Amman,posix/Asia/Anadyr,posix/Asia/Aqtau,posix/Asia/Aqtobe,posix/Asia/Ashgabat,posix/Asia/Ashkhabad,posix/Asia/Baghdad,posix/Asia/Bahrain,posix/Asia/Baku,posix/Asia/Bangkok,posix/Asia/Beirut,posix/Asia/Bishkek,posix/Asia/Brunei,posix/Asia/Calcutta,posix/Asia/Chungking,posix/Asia/Colombo,posix/Asia/Dacca,posix/Asia/Damascus,posix/Asia/Dhaka,posix/Asia/Dili,posix/Asia/Dubai,posix/Asia/Dushanbe,posix/Asia/Gaza,posix/Asia/Harbin,posix/Asia/Hong_Kong,posix/Asia/Hovd,posix/Asia/Irkutsk,posix/Asia/Istanbul,posix/Asia/Jakarta,posix/Asia/Jayapura,posix/Asia/Jerusalem,posix/Asia/Kabul,posix/Asia/Kamchatka,posix/Asia/Karachi,posix/Asia/Kashgar,posix/Asia/Katmandu,posix/Asia/Krasnoyarsk,posix/Asia/Kuala_Lumpur,posix/Asia/Kuching,posix/Asia/Kuwait,posix/Asia/Macao,posix/Asia/Macau,posix/Asia/Magadan,posix/Asia/Makassar,posix/Asia/Manila,posix/Asia/Muscat,posix/Asia/Nicosia,posix/Asia/Novosibirsk,posix/Asia/Omsk,posix/Asia/Oral,posix/Asia/Phnom_Penh,posix/Asia/Pyongyang,posix/Asia/Qatar,posix/Asia/Qyzylorda,posix/Asia/Rangoon,posix/Asia/Riyadh,posix/Asia/Riyadh87,posix/Asia/Riyadh88,posix/Asia/Riyadh89,posix/Asia/Saigon,posix/Asia/Samarkand,posix/Asia/Seoul,posix/Asia/Shanghai,posix/Asia/Singapore,posix/Asia/Taipei,posix/Asia/Tashkent,posix/Asia/Tbilisi,posix/Asia/Tehran,posix/Asia/Tel_Aviv,posix/Asia/Thimbu,posix/Asia/Thimphu,posix/Asia/Tokyo,posix/Asia/Ujung_Pandang,posix/Asia/Ulaanbaatar,posix/Asia/Ulan_Bator,posix/Asia/Urumqi,posix/Asia/Vientiane,"
&
+"posix/Asia/Vladivostok,posix/Asia/Yakutsk,posix/Asia/Yekaterinburg,posix/Asia/Yerevan,posix/Atlantic/Azores,posix/Atlantic/Bermuda,posix/Atlantic/Canary,posix/Atlantic/Cape_Verde,posix/Atlantic/Faeroe,posix/Atlantic/Jan_Mayen,posix/Atlantic/Madeira,posix/Atlantic/Reykjavik,posix/Atlantic/South_Georgia,posix/Atlantic/St_Helena,posix/Atlantic/Stanley,posix/Australia/ACT,posix/Australia/Adelaide,posix/Australia/Brisbane,posix/Australia/Broken_Hill,posix/Australia/Canberra,posix/Australia/Darwin,posix/Australia/Hobart,posix/Australia/LHI,posix/Australia/Lindeman,posix/Australia/Lord_Howe,posix/Australia/Melbourne,posix/Australia/NSW,posix/Australia/North,posix/Australia/Perth,posix/Australia/Queensland,posix/Australia/South,posix/Australia/Sydney,posix/Australia/Tasmania,posix/Australia/Victoria,posix/Australia/West,posix/Australia/Yancowinna,posix/Brazil/Acre,posix/Brazil/DeNoronha,posix/Brazil/East,posix/Brazil/West,posix/CET,posix/CST6CDT,posix/Canada/Atlantic,posix/Canada/Central,posix/Canada/East-Saskatchewan,posix/Canada/Eastern,posix/Canada/Mountain,posix/Canada/Newfoundland,posix/Canada/Pacific,posix/Canada/Saskatchewan,posix/Canada/Yukon,posix/Chile/Continental,posix/Chile/EasterIsland,posix/Cuba,posix/EET,posix/EST,posix/EST5EDT,posix/Egypt,posix/Eire,posix/Etc/GMT,posix/Etc/GMT+0,posix/Etc/GMT+1,posix/Etc/GMT+10,posix/Etc/GMT+11,posix/Etc/GMT+12,posix/Etc/GMT+2,posix/Etc/GMT+3,posix/Etc/GMT+4,posix/Etc/GMT+5,posix/Etc/GMT+6,posix/Etc/GMT+7,posix/Etc/GMT+8,posix/Etc/GMT+9,posix/Etc/GMT-0,posix/Etc/GMT-1,posix/Etc/GMT-10,posix/Etc/GMT-11,posix/Etc/GMT-12,posix/Etc/GMT-13,posix/Etc/GMT-14,posix/Etc/GMT-2,posix/Etc/GMT-3,posix/Etc/GMT-4,posix/Etc/GMT-5,posix/Etc/GMT-6,posix/Etc/GMT-7,posix/Etc/GMT-8,posix/Etc/GMT-9,posix/Etc/GMT0,posix/Etc/Greenwich,posix/Etc/UCT,posix/Etc/UTC,posix/Etc/Universal,posix/Etc/Zulu,posix/Europe/Amsterdam,posix/Europe/Andorra,posix/Europe/Athens,posix/Europe/Belfast,posix/Europe/Belgrade,posix/Europe/Berlin,posix/Europe/Bratislava,posix/Europe/Brussels,posix/Europe/Bucharest,posix/Europe/Budapest,posix/Europe/Chisinau,posix/Europe/Copenhagen,posix/Europe/Dublin,posix/Europe/Gibraltar,posix/Europe/Helsinki,posix/Europe/Istanbul,posix/Europe/Kaliningrad,posix/Europe/Kiev,posix/Europe/Lisbon,posix/Europe/Ljubljana,posix/Europe/London,posix/Europe/Luxembourg,posix/Europe/Madrid,posix/Europe/Malta,posix/Europe/Minsk,posix/Europe/Monaco,posix/Europe/Moscow,posix/Europe/Nicosia,posix/Europe/Oslo,posix/Europe/Paris,posix/Europe/Prague,posix/Europe/Riga,posix/Europe/Rome,posix/Europe/Samara,posix/Europe/San_Marino,posix/Europe/Sarajevo,posix/Europe/Simferopol,posix/Europe/Skopje,posix/Europe/Sofia,posix/Europe/Stockholm,posix/Europe/Tallinn,posix/Europe/Tirane,posix/Europe/Tiraspol,posix/Europe/Uzhgorod,posix/Europe/Vaduz,posix/Europe/Vatican,posix/Europe/Vienna,posix/Europe/Vilnius,posix/Europe/Warsaw,posix/Europe/Zagreb,posix/Europe/Zaporozhye,posix/Europe/Zurich,posix/Factory,posix/GB,posix/GB-Eire,posix/GMT,posix/GMT+0,posix/GMT-0,posix/GMT0,posix/Greenwich,posix/HST,posix/Hongkong,posix/Iceland,posix/Indian/Antananarivo,posix/Indian/Chagos,posix/Indian/Christmas,posix/Indian/Cocos,posix/Indian/Comoro,posix/Indian/Kerguelen,posix/Indian/Mahe,posix/Indian/Maldives,posix/Indian/Mauritius,posix/Indian/Mayotte,posix/Indian/Reunion,posix/Iran,posix/Israel,posix/Jamaica,posix/Japan,posix/Kwajalein,posix/Libya,posix/MET,posix/MST,posix/MST7MDT,"
&
+"posix/Mexico/BajaNorte,posix/Mexico/BajaSur,posix/Mexico/General,posix/Mideast/Riyadh87,posix/Mideast/Riyadh88,posix/Mideast/Riyadh89,posix/NZ,posix/NZ-CHAT,posix/Navajo,posix/PRC,posix/PST8PDT,posix/Pacific/Apia,posix/Pacific/Auckland,posix/Pacific/Chatham,posix/Pacific/Easter,posix/Pacific/Efate,posix/Pacific/Enderbury,posix/Pacific/Fakaofo,posix/Pacific/Fiji,posix/Pacific/Funafuti,posix/Pacific/Galapagos,posix/Pacific/Gambier,posix/Pacific/Guadalcanal,posix/Pacific/Guam,posix/Pacific/Honolulu,posix/Pacific/Johnston,posix/Pacific/Kiritimati,posix/Pacific/Kosrae,posix/Pacific/Kwajalein,posix/Pacific/Majuro,posix/Pacific/Marquesas,posix/Pacific/Midway,posix/Pacific/Nauru,posix/Pacific/Niue,posix/Pacific/Norfolk,posix/Pacific/Noumea,posix/Pacific/Pago_Pago,posix/Pacific/Palau,posix/Pacific/Pitcairn,posix/Pacific/Ponape,posix/Pacific/Port_Moresby,posix/Pacific/Rarotonga,posix/Pacific/Saipan,posix/Pacific/Samoa,posix/Pacific/Tahiti,posix/Pacific/Tarawa,posix/Pacific/Tongatapu,posix/Pacific/Truk,posix/Pacific/Wake,posix/Pacific/Wallis,posix/Pacific/Yap,posix/Poland,posix/Portugal,posix/ROC,posix/ROK,posix/Singapore,posix/SystemV/AST4,posix/SystemV/AST4ADT,posix/SystemV/CST6,posix/SystemV/CST6CDT,posix/SystemV/EST5,posix/SystemV/EST5EDT,posix/SystemV/HST10,posix/SystemV/MST7,posix/SystemV/MST7MDT,posix/SystemV/PST8,posix/SystemV/PST8PDT,posix/SystemV/YST9,posix/SystemV/YST9YDT,posix/Turkey,posix/UCT,posix/US/Alaska,posix/US/Aleutian,posix/US/Arizona,posix/US/Central,posix/US/East-Indiana,posix/US/Eastern,posix/US/Hawaii,posix/US/Indiana-Starke,posix/US/Michigan,posix/US/Mountain,posix/US/Pacific,posix/US/Samoa,posix/UTC,posix/Universal,posix/W-SU,posix/WET,posix/Zulu,posixrules,right/Africa/Abidjan,right/Africa/Accra,right/Africa/Addis_Ababa,right/Africa/Algiers,right/Africa/Asmera,right/Africa/Bamako,right/Africa/Bangui,right/Africa/Banjul,right/Africa/Bissau,right/Africa/Blantyre,right/Africa/Brazzaville,right/Africa/Bujumbura,right/Africa/Cairo,right/Africa/Casablanca,right/Africa/Ceuta,right/Africa/Conakry,right/Africa/Dakar,right/Africa/Dar_es_Salaam,right/Africa/Djibouti,right/Africa/Douala,right/Africa/El_Aaiun,right/Africa/Freetown,right/Africa/Gaborone,right/Africa/Harare,right/Africa/Johannesburg,right/Africa/Kampala,right/Africa/Khartoum,right/Africa/Kigali,right/Africa/Kinshasa,right/Africa/Lagos,right/Africa/Libreville,right/Africa/Lome,right/Africa/Luanda,right/Africa/Lubumbashi,right/Africa/Lusaka,right/Africa/Malabo,right/Africa/Maputo,right/Africa/Maseru,right/Africa/Mbabane,right/Africa/Mogadishu,right/Africa/Monrovia,right/Africa/Nairobi,right/Africa/Ndjamena,right/Africa/Niamey,right/Africa/Nouakchott,right/Africa/Ouagadougou,right/Africa/Porto-Novo,right/Africa/Sao_Tome,right/Africa/Timbuktu,right/Africa/Tripoli,right/Africa/Tunis,right/Africa/Windhoek,right/America/Adak,right/America/Anchorage,right/America/Anguilla,right/America/Antigua,right/America/Araguaina,right/America/Aruba,right/America/Asuncion,right/America/Atka,right/America/Barbados,right/America/Belem,right/America/Belize,right/America/Boa_Vista,right/America/Bogota,right/America/Boise,right/America/Buenos_Aires,right/America/Cambridge_Bay,right/America/Cancun,right/America/Caracas,right/America/Catamarca,right/America/Cayenne,right/America/Cayman,right/America/Chicago,right/America/Chihuahua,right/America/Cordoba,right/America/Costa_Rica,right/America/Cuiaba,right/America/Curacao,right/America/Dawson,right/America/Dawson_Creek,right/America/Denver,right/America/Detroit,"
&
+"right/America/Dominica,right/America/Edmonton,right/America/Eirunepe,right/America/El_Salvador,right/America/Ensenada,right/America/Fort_Wayne,right/America/Fortaleza,right/America/Glace_Bay,right/America/Godthab,right/America/Goose_Bay,right/America/Grand_Turk,right/America/Grenada,right/America/Guadeloupe,right/America/Guatemala,right/America/Guayaquil,right/America/Guyana,right/America/Halifax,right/America/Havana,right/America/Hermosillo,right/America/Indiana/Indianapolis,right/America/Indiana/Knox,right/America/Indiana/Marengo,right/America/Indiana/Vevay,right/America/Indianapolis,right/America/Inuvik,right/America/Iqaluit,right/America/Jamaica,right/America/Jujuy,right/America/Juneau,right/America/Kentucky/Louisville,right/America/Kentucky/Monticello,right/America/Knox_IN,right/America/La_Paz,right/America/Lima,right/America/Los_Angeles,right/America/Louisville,right/America/Maceio,right/America/Managua,right/America/Manaus,right/America/Martinique,right/America/Mazatlan,right/America/Mendoza,right/America/Menominee,right/America/Merida,right/America/Mexico_City,right/America/Miquelon,right/America/Monterrey,right/America/Montevideo,right/America/Montreal,right/America/Montserrat,right/America/Nassau,right/America/New_York,right/America/Nipigon,right/America/Nome,right/America/Noronha,right/America/Panama,right/America/Pangnirtung,right/America/Paramaribo,right/America/Phoenix,right/America/Port-au-Prince,right/America/Port_of_Spain,right/America/Porto_Acre,right/America/Porto_Velho,right/America/Puerto_Rico,right/America/Rainy_River,right/America/Rankin_Inlet,right/America/Recife,right/America/Regina,right/America/Rosario,right/America/Santiago,right/America/Santo_Domingo,right/America/Sao_Paulo,right/America/Scoresbysund,right/America/Shiprock,right/America/St_Johns,right/America/St_Kitts,right/America/St_Lucia,right/America/St_Thomas,right/America/St_Vincent,right/America/Swift_Current,right/America/Tegucigalpa,right/America/Thule,right/America/Thunder_Bay,right/America/Tijuana,right/America/Tortola,right/America/Vancouver,right/America/Virgin,right/America/Whitehorse,right/America/Winnipeg,right/America/Yakutat,right/America/Yellowknife,right/Antarctica/Casey,right/Antarctica/Davis,right/Antarctica/DumontDUrville,right/Antarctica/Mawson,right/Antarctica/McMurdo,right/Antarctica/Palmer,right/Antarctica/South_Pole,right/Antarctica/Syowa,right/Arctic/Longyearbyen,right/Asia/Aden,right/Asia/Almaty,right/Asia/Amman,right/Asia/Anadyr,right/Asia/Aqtau,right/Asia/Aqtobe,right/Asia/Ashgabat,right/Asia/Ashkhabad,right/Asia/Baghdad,right/Asia/Bahrain,right/Asia/Baku,right/Asia/Bangkok,right/Asia/Beirut,right/Asia/Bishkek,right/Asia/Brunei,right/Asia/Calcutta,right/Asia/Chungking,right/Asia/Colombo,right/Asia/Dacca,right/Asia/Damascus,right/Asia/Dhaka,right/Asia/Dili,right/Asia/Dubai,right/Asia/Dushanbe,right/Asia/Gaza,right/Asia/Harbin,right/Asia/Hong_Kong,right/Asia/Hovd,right/Asia/Irkutsk,right/Asia/Istanbul,right/Asia/Jakarta,right/Asia/Jayapura,right/Asia/Jerusalem,right/Asia/Kabul,right/Asia/Kamchatka,right/Asia/Karachi,right/Asia/Kashgar,right/Asia/Katmandu,right/Asia/Krasnoyarsk,right/Asia/Kuala_Lumpur,right/Asia/Kuching,right/Asia/Kuwait,right/Asia/Macao,right/Asia/Macau,right/Asia/Magadan,right/Asia/Makassar,right/Asia/Manila,right/Asia/Muscat,right/Asia/Nicosia,right/Asia/Novosibirsk,right/Asia/Omsk,right/Asia/Oral,right/Asia/Phnom_Penh,right/Asia/Pyongyang,right/Asia/Qatar,right/Asia/Qyzylorda,right/Asia/Rangoon,right/Asia/Riyadh,right/Asia/Riyadh87,"
&
+"right/Asia/Riyadh88,right/Asia/Riyadh89,right/Asia/Saigon,right/Asia/Samarkand,right/Asia/Seoul,right/Asia/Shanghai,right/Asia/Singapore,right/Asia/Taipei,right/Asia/Tashkent,right/Asia/Tbilisi,right/Asia/Tehran,right/Asia/Tel_Aviv,right/Asia/Thimbu,right/Asia/Thimphu,right/Asia/Tokyo,right/Asia/Ujung_Pandang,right/Asia/Ulaanbaatar,right/Asia/Ulan_Bator,right/Asia/Urumqi,right/Asia/Vientiane,right/Asia/Vladivostok,right/Asia/Yakutsk,right/Asia/Yekaterinburg,right/Asia/Yerevan,right/Atlantic/Azores,right/Atlantic/Bermuda,right/Atlantic/Canary,right/Atlantic/Cape_Verde,right/Atlantic/Faeroe,right/Atlantic/Jan_Mayen,right/Atlantic/Madeira,right/Atlantic/Reykjavik,right/Atlantic/South_Georgia,right/Atlantic/St_Helena,right/Atlantic/Stanley,right/Australia/ACT,right/Australia/Adelaide,right/Australia/Brisbane,right/Australia/Broken_Hill,right/Australia/Canberra,right/Australia/Darwin,right/Australia/Hobart,right/Australia/LHI,right/Australia/Lindeman,right/Australia/Lord_Howe,right/Australia/Melbourne,right/Australia/NSW,right/Australia/North,right/Australia/Perth,right/Australia/Queensland,right/Australia/South,right/Australia/Sydney,right/Australia/Tasmania,right/Australia/Victoria,right/Australia/West,right/Australia/Yancowinna,right/Brazil/Acre,right/Brazil/DeNoronha,right/Brazil/East,right/Brazil/West,right/CET,right/CST6CDT,right/Canada/Atlantic,right/Canada/Central,right/Canada/East-Saskatchewan,right/Canada/Eastern,right/Canada/Mountain,right/Canada/Newfoundland,right/Canada/Pacific,right/Canada/Saskatchewan,right/Canada/Yukon,right/Chile/Continental,right/Chile/EasterIsland,right/Cuba,right/EET,right/EST,right/EST5EDT,right/Egypt,right/Eire,right/Etc/GMT,right/Etc/GMT+0,right/Etc/GMT+1,right/Etc/GMT+10,right/Etc/GMT+11,right/Etc/GMT+12,right/Etc/GMT+2,right/Etc/GMT+3,right/Etc/GMT+4,right/Etc/GMT+5,right/Etc/GMT+6,right/Etc/GMT+7,right/Etc/GMT+8,right/Etc/GMT+9,right/Etc/GMT-0,right/Etc/GMT-1,right/Etc/GMT-10,right/Etc/GMT-11,right/Etc/GMT-12,right/Etc/GMT-13,right/Etc/GMT-14,right/Etc/GMT-2,right/Etc/GMT-3,right/Etc/GMT-4,right/Etc/GMT-5,right/Etc/GMT-6,right/Etc/GMT-7,right/Etc/GMT-8,right/Etc/GMT-9,right/Etc/GMT0,right/Etc/Greenwich,right/Etc/UCT,right/Etc/UTC,right/Etc/Universal,right/Etc/Zulu,right/Europe/Amsterdam,right/Europe/Andorra,right/Europe/Athens,right/Europe/Belfast,right/Europe/Belgrade,right/Europe/Berlin,right/Europe/Bratislava,right/Europe/Brussels,right/Europe/Bucharest,right/Europe/Budapest,right/Europe/Chisinau,right/Europe/Copenhagen,right/Europe/Dublin,right/Europe/Gibraltar,right/Europe/Helsinki,right/Europe/Istanbul,right/Europe/Kaliningrad,right/Europe/Kiev,right/Europe/Lisbon,right/Europe/Ljubljana,right/Europe/London,right/Europe/Luxembourg,right/Europe/Madrid,right/Europe/Malta,right/Europe/Minsk,right/Europe/Monaco,right/Europe/Moscow,right/Europe/Nicosia,right/Europe/Oslo,right/Europe/Paris,right/Europe/Prague,right/Europe/Riga,right/Europe/Rome,right/Europe/Samara,right/Europe/San_Marino,right/Europe/Sarajevo,right/Europe/Simferopol,right/Europe/Skopje,right/Europe/Sofia,right/Europe/Stockholm,right/Europe/Tallinn,right/Europe/Tirane,right/Europe/Tiraspol,right/Europe/Uzhgorod,right/Europe/Vaduz,right/Europe/Vatican,right/Europe/Vienna,right/Europe/Vilnius,right/Europe/Warsaw,right/Europe/Zagreb,right/Europe/Zaporozhye,right/Europe/Zurich,right/Factory,right/GB,right/GB-Eire,right/GMT,right/GMT+0,right/GMT-0,right/GMT0,right/Greenwich,right/HST,right/Hongkong,right/Iceland,right/Indian/Antananarivo,right/Indian/Chagos,right/Indian/Christmas,right/Indian/Cocos,right/Indian/Comoro,right/Indian/Kerguelen,"
&
+"right/Indian/Mahe,right/Indian/Maldives,right/Indian/Mauritius,right/Indian/Mayotte,right/Indian/Reunion,right/Iran,right/Israel,right/Jamaica,right/Japan,right/Kwajalein,right/Libya,right/MET,right/MST,right/MST7MDT,right/Mexico/BajaNorte,right/Mexico/BajaSur,right/Mexico/General,right/Mideast/Riyadh87,right/Mideast/Riyadh88,right/Mideast/Riyadh89,right/NZ,right/NZ-CHAT,right/Navajo,right/PRC,right/PST8PDT,right/Pacific/Apia,right/Pacific/Auckland,right/Pacific/Chatham,right/Pacific/Easter,right/Pacific/Efate,right/Pacific/Enderbury,right/Pacific/Fakaofo,right/Pacific/Fiji,right/Pacific/Funafuti,right/Pacific/Galapagos,right/Pacific/Gambier,right/Pacific/Guadalcanal,right/Pacific/Guam,right/Pacific/Honolulu,right/Pacific/Johnston,right/Pacific/Kiritimati,right/Pacific/Kosrae,right/Pacific/Kwajalein,right/Pacific/Majuro,right/Pacific/Marquesas,right/Pacific/Midway,right/Pacific/Nauru,right/Pacific/Niue,right/Pacific/Norfolk,right/Pacific/Noumea,right/Pacific/Pago_Pago,right/Pacific/Palau,right/Pacific/Pitcairn,right/Pacific/Ponape,right/Pacific/Port_Moresby,right/Pacific/Rarotonga,right/Pacific/Saipan,right/Pacific/Samoa,right/Pacific/Tahiti,right/Pacific/Tarawa,right/Pacific/Tongatapu,right/Pacific/Truk,right/Pacific/Wake,right/Pacific/Wallis,right/Pacific/Yap,right/Poland,right/Portugal,right/ROC,right/ROK,right/Singapore,right/SystemV/AST4,right/SystemV/AST4ADT,right/SystemV/CST6,right/SystemV/CST6CDT,right/SystemV/EST5,right/SystemV/EST5EDT,right/SystemV/HST10,right/SystemV/MST7,right/SystemV/MST7MDT,right/SystemV/PST8,right/SystemV/PST8PDT,right/SystemV/YST9,right/SystemV/YST9YDT,right/Turkey,right/UCT,right/US/Alaska,right/US/Aleutian,right/US/Arizona,right/US/Central,right/US/East-Indiana,right/US/Eastern,right/US/Hawaii,right/US/Indiana-Starke,right/US/Michigan,right/US/Mountain,right/US/Pacific,right/US/Samoa,right/UTC,right/Universal,right/W-SU,right/WET,right/Zulu"
+
+
+
+ stz = Split(sList, ",")
+
+ FOR i = 0 TO stz.Max
+ objLb.Add(Trim(stz[i]))
+ NEXT
+
+END
+
+PUBLIC SUB SET_TIME_ZONE(sTimeZone AS String, hwclock AS String)
+ DIM sTarget AS String = "/mnt/target"
+ DIM sCfg AS String
+
+ TRY KILL sTarget &/ "etc" &/ "localtime-copied-from"
+ TRY LINK sTarget &/ "etc" &/ "localtime-copied-from" TO sTarget &/ "usr"
&/ "share" &/ "zoneinfo" &/ Trim(sTimeZone)
+ TRY KILL sTarget &/ "etc" &/ "localtime"
+ TRY COPY sTarget &/ "usr" &/ "share" &/ "zoneinfo" &/ Trim(sTimeZone) TO
sTarget &/ "etc" &/ "localtime"
+
+ ' write the hadwareclock configure script
+
+ sCfg = "# /etc/hardwareclock \n" &
+ "# \n" &
+ "# Tells how hardware clock is stored. \n" &
+ "# You should run vzoneset rather than editing this file manually \n" &
+ "\n\n" & hwclock
+
+ TRY File.Save(sTarget &/ "etc" &/ "hardwareclock", Trim(sCfg))
+
+END
+
+
|
|
From: <cod...@go...> - 2009-04-08 21:53:08
|
Author: M0...@gm...
Date: Wed Apr 8 13:51:49 2009
New Revision: 528
Removed:
branches/speedy/Conf0Old.class
branches/speedy/Conf0Old.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
Log:
- More work in the bootloader section
- Will use debian tools for menu.lst
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Apr 8 13:51:49 2009
@@ -38,113 +38,91 @@
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:373
+#: Conf0.class:222 MdlBootMngr.module:373
msgid "Standard"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67
+#: Conf0.class:222
msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:377
+#: Conf0.class:222 MdlBootMngr.module:377
msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:379
+#: Conf0.class:222 MdlBootMngr.module:379
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:352 Conf0Old.class:166
+#: Conf0.class:332 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Step7a.class:143
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0.class:332
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0.class:332
+msgid ""
+"You may not be able to start your VectorLinux installation. Do not
choose "
+"this option"
+msgstr ""
+
+#: Conf0.class:332
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0.class:395
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:368
+#: Conf0.class:411
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:376 Conf0Old.class:192
+#: Conf0.class:420
msgid "LILO"
msgstr ""
-#: Conf0.class:381
+#: Conf0.class:426
msgid "GRUB"
msgstr ""
-#: Conf0.class:386
+#: Conf0.class:432
msgid "NONE"
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:441
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:405 Conf0Old.class:224
+#: Conf0.class:451
msgid "Target"
msgstr ""
-#: Conf0.class:417 Conf0Old.class:238
+#: Conf0.class:463
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:436 Conf0Old.class:257
+#: Conf0.class:482
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:446 Conf0Old.class:270
+#: Conf0.class:493
msgid "Seconds"
msgstr ""
-#: Conf0.class:452 Conf0Old.class:278
+#: Conf0.class:499
msgid "Boot Default"
msgstr ""
-#: Conf0.class:474 Conf0Old.class:308
-msgid "Tab 0"
+#: Conf0.class:518
+msgid "DETECTED OPERATING SYSTEMS."
msgstr ""
-#: Conf0Old.class:88 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
-#: Step7a.class:143
-msgid "WARNING:"
-msgstr ""
-
-#: Conf0Old.class:88
-msgid "Selecting this option will bypass your boot manager configuration."
-msgstr ""
-
-#: Conf0Old.class:88
-msgid ""
-"You may not be able to start your VectorLinux installation. Do not
choose "
-"this option"
-msgstr ""
-
-#: Conf0Old.class:88
-msgid "unless you are fully aware of what you are doing."
-msgstr ""
-
-#: Conf0Old.class:184
-msgid "Select bootloader to be used"
-msgstr ""
-
-#: Conf0Old.class:198
-msgid "Grub"
-msgstr ""
-
-#: Conf0Old.class:203
-msgid ""
-"Select this option if you want to configure your system boot manager "
-"manually at a later time"
-msgstr ""
-
-#: Conf0Old.class:205
-msgid "None (Experts Only)"
-msgstr ""
-
-#: Conf0Old.class:213
-msgid "Boot menu options"
-msgstr ""
-
-#: Conf0Old.class:297
-msgid "OPERATING SYSTEMS DETECTED"
+#: Conf0.class:534
+msgid "Tab 0"
msgstr ""
#: FMain.class:253 FMain0.class:253
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Wed Apr 8 13:51:49 2009
@@ -54,51 +54,71 @@
msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:352
+#: Conf0.class:332
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0.class:332
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0.class:332
+msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
+msgstr ""
+
+#: Conf0.class:332
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0.class:395
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:368
+#: Conf0.class:411
msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:376
+#: Conf0.class:420
msgid "LILO"
msgstr ""
-#: Conf0.class:381
+#: Conf0.class:426
msgid "GRUB"
msgstr ""
-#: Conf0.class:386
+#: Conf0.class:432
msgid "NONE"
msgstr ""
-#: Conf0.class:395
+#: Conf0.class:441
msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:405
+#: Conf0.class:451
msgid "Target"
msgstr ""
-#: Conf0.class:417
+#: Conf0.class:463
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:436
+#: Conf0.class:482
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:446
+#: Conf0.class:493
msgid "Seconds"
msgstr ""
-#: Conf0.class:452
+#: Conf0.class:499
msgid "Boot Default"
msgstr ""
-#: Conf0.class:474
+#: Conf0.class:518
+msgid "DETECTED OPERATING SYSTEMS."
+msgstr ""
+
+#: Conf0.class:534
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Wed Apr 8 13:51:49 2009
@@ -220,6 +220,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
.cbVidRes.List = [("Standard"), ("Bootplash Med"), ("Bootsplash
High"), ("Bootsplash Extra High")]
+ .TLoSlIST.Text = "<b>" & UCase(.TLoSlIST.Text) & "</b>"
END WITH
'ME.Fake_Names()
ME.List_Other_Linuxes(ME.TsOsList)
@@ -303,5 +304,45 @@
hbox1.Width = hbox1.Parent.Width - (hbox1.Left * 2)
hbox2.Width = hbox2.Parent.Width - (hbox2.Left * 2)
hbox3.Width = hbox3.Parent.Width - (hbox3.Left * 2)
+
+END
+
+PUBLIC SUB Toggle_window_controls(bval AS Boolean)
+
+ DIM obj AS Object
+ 'DIM rb AS RadioButton
+
+ FOR EACH obj IN ME.Children
+ IF obj.Name <> "HPanel2" THEN
+ TRY obj.enabled = bval
+ END IF
+ NEXT
+ 'FOR EACH obj IN ME.HPanel2.Children
+ ' TRY obj.enabled = TRUE
+ 'NEXT
+END
+
+
+PUBLIC SUB rbNone_Click()
+
+ IF LAST.value = TRUE THEN
+ Message.Warning("<b>" & ("WARNING:") & "</b><br>" &
+ ("Selecting this option will bypass your boot manager configuration.")
& "<br>" &
+ ("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
+ ("unless you are fully aware of what you are doing."))
+ END IF
+ ME.Toggle_window_controls(FALSE)
+
+END
+
+PUBLIC SUB rbGrub_Click()
+
+ ME.Toggle_window_controls(TRUE)
+
+END
+
+PUBLIC SUB rbLilo_Click()
+
+ ME.Toggle_window_controls(TRUE)
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Wed Apr 8 13:51:49 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,84,51)
+ MoveScaled(0,0,84,54)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
@@ -28,16 +28,19 @@
{ HBox2 HBox
MoveScaled(1,3,71,3.5)
Expand = True
- { RadioButton1 RadioButton
+ { rbLilo RadioButton
MoveScaled(1,1,12,3.5)
+ Expand = True
Text = ("LILO")
}
- { RadioButton2 RadioButton
+ { rbGrub RadioButton
MoveScaled(16,1,14,3.5)
+ Expand = True
Text = ("GRUB")
}
- { RadioButton3 RadioButton
+ { rbNone RadioButton
MoveScaled(42,1,17,3.5)
+ Expand = True
Text = ("NONE")
}
}
@@ -84,6 +87,7 @@
}
{ SpinBox1 SpinBox
MoveScaled(18,0,6,3.5)
+ Value = 5
}
{ TextLabel3 TextLabel
MoveScaled(25,0,11,3.5)
@@ -103,8 +107,19 @@
}
}
}
+ { HBox5 HBox
+ MoveScaled(1,27,58,3.5)
+ Expand = True
+ { TLoSlIST TextLabel
+ MoveScaled(6,0,39,4)
+ Expand = True
+ Text = ("DETECTED OPERATING SYSTEMS.")
+ Alignment = Align.Center
+ Border = Border.Raised
+ }
+ }
{ HBox4 HBox
- MoveScaled(1,28,74,20)
+ MoveScaled(1,31,74,20)
Expand = True
Padding = 2
{ TsOsList TabStrip
|
|
From: <cod...@go...> - 2009-04-07 19:41:31
|
Author: M0...@gm...
Date: Tue Apr 7 12:34:26 2009
New Revision: 527
Added:
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/Conf0Old.class
branches/speedy/Conf0Old.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
branches/speedy/FMain.form
branches/speedy/MdlBootMngr.module
branches/speedy/MdlMain.module
branches/speedy/Step1.form
branches/speedy/Step7.class
branches/speedy/Step8.class
Log:
- Got bootloader window to work.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Apr 7 12:34:26 2009
@@ -14,108 +14,156 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:72 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
-#: Step7a.class:143
-msgid "WARNING:"
+#: Conf0.class:51
+msgid "Installation found in"
msgstr ""
-#: Conf0.class:72
-msgid "Selecting this option will bypass your boot manager configuration."
+#: Conf0.class:69
+msgid "Include in boot menu"
msgstr ""
-#: Conf0.class:72
-msgid ""
-"You may not be able to start your VectorLinux installation. Do not
choose "
-"this option"
+#: Conf0.class:89
+msgid "Name"
msgstr ""
-#: Conf0.class:72
-msgid "unless you are fully aware of what you are doing."
+#: Conf0.class:107
+msgid "Initial RAM disk image"
msgstr ""
-#: Conf0.class:129
-msgid "System Bootloader Configuration"
+#: Conf0.class:130
+msgid "Kernel boot options"
msgstr ""
-#: Conf0.class:147
-msgid "Select bootloader to be used"
+#: Conf0.class:156
+msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:155
-msgid "LILO"
+#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:373
+msgid "Standard"
msgstr ""
-#: Conf0.class:161
-msgid "Grub"
+#: Conf0.class:222 Conf0Old.class:67
+msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:166
-msgid ""
-"Select this option if you want to configure your system boot manager "
-"manually at a later time"
+#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:377
+msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:168
-msgid "None (Experts Only)"
+#: Conf0.class:222 Conf0Old.class:67 MdlBootMngr.module:379
+msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:176
-msgid "Boot menu options"
+#: Conf0.class:352 Conf0Old.class:166
+msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:187
-msgid "Target"
+#: Conf0.class:368
+msgid "Select system boot manager to use"
+msgstr ""
+
+#: Conf0.class:376 Conf0Old.class:192
+msgid "LILO"
msgstr ""
-#: Conf0.class:193
-msgid "ComboBox1"
+#: Conf0.class:381
+msgid "GRUB"
msgstr ""
-#: Conf0.class:206
-msgid "Video Resolution"
+#: Conf0.class:386
+msgid "NONE"
msgstr ""
-#: Conf0.class:212
-msgid "ComboBox2"
+#: Conf0.class:395
+msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:224
+#: Conf0.class:405 Conf0Old.class:224
+msgid "Target"
+msgstr ""
+
+#: Conf0.class:417 Conf0Old.class:238
+msgid "Video Resolution"
+msgstr ""
+
+#: Conf0.class:436 Conf0Old.class:257
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:237
+#: Conf0.class:446 Conf0Old.class:270
msgid "Seconds"
msgstr ""
-#: Conf0.class:250
+#: Conf0.class:452 Conf0Old.class:278
msgid "Boot Default"
msgstr ""
-#: Conf0.class:268
-msgid "OPERATING SYSTEMS DETECTED"
+#: Conf0.class:474 Conf0Old.class:308
+msgid "Tab 0"
msgstr ""
-#: Conf0.class:279
-msgid "Tab 0"
+#: Conf0Old.class:88 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Step7a.class:143
+msgid "WARNING:"
+msgstr ""
+
+#: Conf0Old.class:88
+msgid "Selecting this option will bypass your boot manager configuration."
+msgstr ""
+
+#: Conf0Old.class:88
+msgid ""
+"You may not be able to start your VectorLinux installation. Do not
choose "
+"this option"
+msgstr ""
+
+#: Conf0Old.class:88
+msgid "unless you are fully aware of what you are doing."
+msgstr ""
+
+#: Conf0Old.class:184
+msgid "Select bootloader to be used"
+msgstr ""
+
+#: Conf0Old.class:198
+msgid "Grub"
+msgstr ""
+
+#: Conf0Old.class:203
+msgid ""
+"Select this option if you want to configure your system boot manager "
+"manually at a later time"
+msgstr ""
+
+#: Conf0Old.class:205
+msgid "None (Experts Only)"
+msgstr ""
+
+#: Conf0Old.class:213
+msgid "Boot menu options"
+msgstr ""
+
+#: Conf0Old.class:297
+msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
-#: FMain.class:294 FMain0.class:294
+#: FMain.class:293 FMain0.class:294
msgid "Help"
msgstr ""
-#: FMain.class:307 FMain0.class:307
+#: FMain.class:306 FMain0.class:307
msgid "Back"
msgstr ""
-#: FMain.class:318 FMain0.class:318
+#: FMain.class:317 FMain0.class:318
msgid "Next"
msgstr ""
-#: FMain.class:329 FMain0.class:329
+#: FMain.class:328 FMain0.class:329
msgid "Quit"
msgstr ""
@@ -163,39 +211,39 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:159
-msgid "Installation found in"
+#: MdlBootMngr.module:352
+msgid "None"
msgstr ""
-#: MdlBootMngr.module:177
-msgid "Include in boot menu"
+#: MdlBootMngr.module:363
+msgid "MBR Of"
msgstr ""
-#: MdlBootMngr.module:197
-msgid "Name"
+#: MdlBootMngr.module:365
+msgid "Bootsector Of"
msgstr ""
-#: MdlBootMngr.module:215
-msgid "Initial RAM disk image"
+#: MdlBootMngr.module:367
+msgid "Floppy"
msgstr ""
-#: MdlBootMngr.module:238
-msgid "Kernel boot options"
+#: MdlBootMngr.module:375
+msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:264
-msgid "Add option to boot this operating system into text mode"
+#: MdlBootMngr.module:445
+msgid "MBR of"
msgstr ""
-#: MdlBootMngr.module:358
-msgid "None"
+#: MdlBootMngr.module:453
+msgid "Bootsector of"
msgstr ""
-#: MdlMain.module:33
+#: MdlMain.module:34
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:33
+#: MdlMain.module:34
msgid "to"
msgstr ""
@@ -215,7 +263,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:145
+#: MdlStartUp.module:47 Step8.class:147
msgid "Software Selection"
msgstr ""
@@ -223,7 +271,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:228
+#: MdlStartUp.module:49 Step8.class:230
msgid "Installation Summary"
msgstr ""
@@ -927,7 +975,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:190 Step8.class:80
+#: Step6.class:190 Step8.class:82
msgid "Do not format"
msgstr ""
@@ -963,7 +1011,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:135
+#: Step7.class:126 Step8.class:137
msgid "Customized"
msgstr ""
@@ -971,7 +1019,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:137
+#: Step7.class:144 Step8.class:139
msgid "Minimal"
msgstr ""
@@ -1035,59 +1083,59 @@
"include in your installation."
msgstr ""
-#: Step8.class:48
+#: Step8.class:50
msgid "Distribution"
msgstr ""
-#: Step8.class:66
+#: Step8.class:68
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:81
+#: Step8.class:83
msgid "Not Formatted"
msgstr ""
-#: Step8.class:81
+#: Step8.class:83
msgid "Mount to"
msgstr ""
-#: Step8.class:82
+#: Step8.class:84
msgid "Format to"
msgstr ""
-#: Step8.class:82
+#: Step8.class:84
msgid "and mount to"
msgstr ""
-#: Step8.class:98
+#: Step8.class:100
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:103
+#: Step8.class:105
msgid "Swap Space"
msgstr ""
-#: Step8.class:116
+#: Step8.class:118
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:133
+#: Step8.class:135
msgid "Full"
msgstr ""
-#: Step8.class:140
+#: Step8.class:142
msgid "Installation Method"
msgstr ""
-#: Step8.class:146
+#: Step8.class:148
msgid "Major Components"
msgstr ""
-#: Step8.class:156
+#: Step8.class:158
msgid "Additional Software"
msgstr ""
-#: Step8.class:247
+#: Step8.class:249
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Tue Apr 7 12:34:26 2009
@@ -14,83 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:72
-msgid "WARNING:"
+#: Conf0.class:51
+msgid "Installation found in"
msgstr ""
-#: Conf0.class:72
-msgid "Selecting this option will bypass your boot manager configuration."
+#: Conf0.class:69
+msgid "Include in boot menu"
msgstr ""
-#: Conf0.class:72
-msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
+#: Conf0.class:89
+msgid "Name"
msgstr ""
-#: Conf0.class:72
-msgid "unless you are fully aware of what you are doing."
+#: Conf0.class:107
+msgid "Initial RAM disk image"
msgstr ""
-#: Conf0.class:129
-msgid "System Bootloader Configuration"
+#: Conf0.class:130
+msgid "Kernel boot options"
msgstr ""
-#: Conf0.class:147
-msgid "Select bootloader to be used"
+#: Conf0.class:156
+msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: Conf0.class:155
-msgid "LILO"
+#: Conf0.class:222
+msgid "Standard"
msgstr ""
-#: Conf0.class:161
-msgid "Grub"
+#: Conf0.class:222
+msgid "Bootplash Med"
msgstr ""
-#: Conf0.class:166
-msgid "Select this option if you want to configure your system boot
manager manually at a later time"
+#: Conf0.class:222
+msgid "Bootsplash High"
msgstr ""
-#: Conf0.class:168
-msgid "None (Experts Only)"
+#: Conf0.class:222
+msgid "Bootsplash Extra High"
msgstr ""
-#: Conf0.class:176
-msgid "Boot menu options"
+#: Conf0.class:352
+msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:187
-msgid "Target"
+#: Conf0.class:368
+msgid "Select system boot manager to use"
msgstr ""
-#: Conf0.class:193
-msgid "ComboBox1"
+#: Conf0.class:376
+msgid "LILO"
msgstr ""
-#: Conf0.class:206
-msgid "Video Resolution"
+#: Conf0.class:381
+msgid "GRUB"
+msgstr ""
+
+#: Conf0.class:386
+msgid "NONE"
msgstr ""
-#: Conf0.class:212
-msgid "ComboBox2"
+#: Conf0.class:395
+msgid "Boot Menu Options"
msgstr ""
-#: Conf0.class:224
+#: Conf0.class:405
+msgid "Target"
+msgstr ""
+
+#: Conf0.class:417
+msgid "Video Resolution"
+msgstr ""
+
+#: Conf0.class:436
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:237
+#: Conf0.class:446
msgid "Seconds"
msgstr ""
-#: Conf0.class:250
+#: Conf0.class:452
msgid "Boot Default"
msgstr ""
-#: Conf0.class:268
-msgid "OPERATING SYSTEMS DETECTED"
-msgstr ""
-
-#: Conf0.class:279
+#: Conf0.class:474
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Tue Apr 7 12:34:26 2009
@@ -18,19 +18,19 @@
msgid "Process Overview"
msgstr ""
-#: FMain.class:294
+#: FMain.class:293
msgid "Help"
msgstr ""
-#: FMain.class:307
+#: FMain.class:306
msgid "Back"
msgstr ""
-#: FMain.class:318
+#: FMain.class:317
msgid "Next"
msgstr ""
-#: FMain.class:329
+#: FMain.class:328
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Tue Apr 7 12:34:26 2009
@@ -14,31 +14,43 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:159
-msgid "Installation found in"
+#: MdlBootMngr.module:352
+msgid "None"
msgstr ""
-#: MdlBootMngr.module:177
-msgid "Include in boot menu"
+#: MdlBootMngr.module:363
+msgid "MBR Of"
msgstr ""
-#: MdlBootMngr.module:197
-msgid "Name"
+#: MdlBootMngr.module:365
+msgid "Bootsector Of"
msgstr ""
-#: MdlBootMngr.module:215
-msgid "Initial RAM disk image"
+#: MdlBootMngr.module:367
+msgid "Floppy"
msgstr ""
-#: MdlBootMngr.module:238
-msgid "Kernel boot options"
+#: MdlBootMngr.module:373
+msgid "Standard"
msgstr ""
-#: MdlBootMngr.module:264
-msgid "Add option to boot this operating system into text mode"
+#: MdlBootMngr.module:375
+msgid "Bootsplash Med"
msgstr ""
-#: MdlBootMngr.module:358
-msgid "None"
+#: MdlBootMngr.module:377
+msgid "Bootsplash High"
+msgstr ""
+
+#: MdlBootMngr.module:379
+msgid "Bootsplash Extra High"
+msgstr ""
+
+#: MdlBootMngr.module:445
+msgid "MBR of"
+msgstr ""
+
+#: MdlBootMngr.module:453
+msgid "Bootsector of"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Tue Apr 7 12:34:26 2009
@@ -14,11 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlMain.module:33
+#: MdlMain.module:34
msgid "Unable to format"
msgstr ""
-#: MdlMain.module:33
+#: MdlMain.module:34
msgid "to"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Tue Apr 7 12:34:26 2009
@@ -14,79 +14,79 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:48
+#: Step8.class:50
msgid "Distribution"
msgstr ""
-#: Step8.class:66
+#: Step8.class:68
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:80
+#: Step8.class:82
msgid "Do not format"
msgstr ""
-#: Step8.class:81
+#: Step8.class:83
msgid "Not Formatted"
msgstr ""
-#: Step8.class:81
+#: Step8.class:83
msgid "Mount to"
msgstr ""
-#: Step8.class:82
+#: Step8.class:84
msgid "Format to"
msgstr ""
-#: Step8.class:82
+#: Step8.class:84
msgid "and mount to"
msgstr ""
-#: Step8.class:98
+#: Step8.class:100
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:103
+#: Step8.class:105
msgid "Swap Space"
msgstr ""
-#: Step8.class:116
+#: Step8.class:118
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:133
+#: Step8.class:135
msgid "Full"
msgstr ""
-#: Step8.class:135
+#: Step8.class:137
msgid "Customized"
msgstr ""
-#: Step8.class:137
+#: Step8.class:139
msgid "Minimal"
msgstr ""
-#: Step8.class:140
+#: Step8.class:142
msgid "Installation Method"
msgstr ""
-#: Step8.class:145
+#: Step8.class:147
msgid "Software Selection"
msgstr ""
-#: Step8.class:146
+#: Step8.class:148
msgid "Major Components"
msgstr ""
-#: Step8.class:156
+#: Step8.class:158
msgid "Additional Software"
msgstr ""
-#: Step8.class:228
+#: Step8.class:230
msgid "Installation Summary"
msgstr ""
-#: Step8.class:247
+#: Step8.class:249
msgid "Your VectorLinux installation is about to be performed as follows.
If you need to make any changes, this is your last chance."
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Apr 7 12:34:26 2009
@@ -6,6 +6,7 @@
Library=gb.gtk
Library=gb.form
Library=gb.desktop
+Library=gb.form.mdi
Library=gb.gtk.ext
Arguments="en_US"
TabSize=2
Added: branches/speedy/Conf0.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf0.class Tue Apr 7 12:34:26 2009
@@ -0,0 +1,307 @@
+' Gambas class file
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+'=====================================================================================
+
+PRIVATE objinitrds AS NEW Object[]
+PRIVATE objChecks AS NEW Object[]
+PRIVATE objappends AS NEW Object[]
+PRIVATE objNames AS NEW Object[]
+
+
+PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
+
+ DIM i AS Integer
+ DIM tb AS TextBox
+ DIM tl AS TextLabel
+ DIM cb AS CheckBox
+ DIM hb AS HBox
+ DIM comb AS ComboBox
+
+ IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
+ 'Message(sLinux)
+ IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
+ i = 0
+ WITH objTabStrip
+ .Index = i
+ .Text = "VectorLinux"
+ END WITH
+ ELSE
+ i = objTabStrip.Count - 1
+ WITH objTabStrip
+ .Index = i
+ .Text = sLinux
+ END WITH
+ END IF
+
+ tl = NEW TextLabel(objTabStrip) AS "Banner"
+ WITH tl
+ .Text = ("Installation found in") & Space(1) & sLinuxRoot
+ .Height = 24
+ .Alignment = Align.Left
+ .Width = 200
+ .Expand = TRUE
+ '.Border = Border.Plain
+ '.AutoResize = TRUE
+ .Move(4, 4)
+ END WITH
+ hb = NEW HBox(objTabStrip) ' separator space
+ WITH hb
+ .Height = 16
+ .Width = 12
+ .Expand = TRUE
+ END WITH
+ cb = NEW CheckBox(objTabStrip) ' Inlcude/Exclude OS from boot menu
+ WITH cb
+ .Expand = TRUE
+ .Text = ("Include in boot menu")
+ .Value = TRUE
+ .Height = 24
+ .Tag = sLinuxRoot
+ END WITH
+ objChecks.Add(cb)
+ hb = NEW HBox(objTabStrip) ' separator space
+ WITH hb
+ .Height = 12
+ .Expand = TRUE
+ END WITH
+ hb = NEW HBox(objTabStrip) ' This will hold a few objects of it's own
+ WITH hb
+ .Height = 28
+ .Expand = TRUE
+ .Padding = 2
+ .Spacing = 2
+ END WITH
+ tl = NEW TextLabel(hb) ' Name label
+ WITH tl
+ .Text = ("Name")
+ .Expand = FALSE
+ .Width = 200
+ .Adjust()
+ .AutoResize = TRUE
+ .Height = .Parent.Height
+ .Alignment = Align.Left
+ END WITH
+ tb = NEW TextBox(hb) AS "tbOsLabel" ' Name entry box
+ WITH tb
+ .Expand = TRUE
+ .Height = .Parent.Height
+ .Text = sLinux ' default to the distro found
+ .Tag = sLinuxRoot
+ END WITH
+ objNames.Add(tb)
+ tl = NEW TextLabel(hb) ' initrd label
+ WITH tl
+ .text = ("Initial RAM disk image")
+ .Alignment = Align.Right
+ .Height = .Parent.Height
+ .Expand = TRUE
+ END WITH
+
+ comb = NEW ComboBox(hb) ' initrd selection combobox
+ WITH comb
+ .Height = .Parent.Height
+ .Expand = TRUE
+ .READonly = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ ' populate the initrd box
+ 'Message(sLinuxRoot)
+ MdlBootMngr.find_initrds_for_this_linux(sLinuxRoot, comb) '
populate initrd selection
+
+ objinitrds.Add(comb)
+ hb = NEW HBox(objTabStrip) ' blank space separator
+ hb.Height = 8
+ hb.Expand = TRUE
+ tl = NEW TextLabel(objTabStrip) ' append line textlabel
+ WITH tl
+ .Text = ("Kernel boot options")
+ .Height = 24
+ .Width = 200
+ .Alignment = Align.Left
+ .Expand = FALSE
+ .AutoResize = TRUE
+ END WITH
+ tb = NEW TextBox(objTabStrip) ' append input line
+ WITH tb
+ .Text = "splash=silent"
+ .Height = 24
+ .Expand = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ objappends.Add(tb)
+
+ ' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
+ IF sLinuxRoot = ClsGlobal.sRoot THEN
+ hb = NEW HBox(objTabStrip) ' yet another separator
+ WITH hb
+ .Expand = TRUE
+ .Height = 8
+ END WITH
+ cb = NEW CheckBox(objTabStrip) AS "bCLIOption"
+ WITH cb
+ .Value = TRUE
+ .Text = ("Add option to boot this operating system into text mode")
+ .Height = 24
+ .Expand = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ ' hb = NEW HBox(objTabStrip)
+ ' hb.Height = 4
+ ' hb.Expand = TRUE
+
+ END IF
+ objTabStrip.Refresh()
+
+
+
+END
+
+
+
+
+PUBLIC SUB List_Other_Linuxes(objTabStrip AS TabStrip)
+ DIM sDump, sPartitions, sPart AS String
+ DIM sPartList AS String[]
+ DIM i AS Integer
+ DIM sOutcome AS String
+
+ ' objappends = NEW Object[]
+ ' objChecks = NEW Object[]
+ ' objinitrds = NEW Object[]
+ ' objNames = NEW Object[]
+ '
+ MdlBootMngr.bScanned = TRUE
+
+
+ ' First, and foremost, we will list the recently isntalled VectorLinux
+ 'populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
+ ' Now list all other linuxes
=================================================
+ SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux |
tr -s \' \' | cut -f 1 -d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ...
+ sPartList = Split(sDump, gb.NewLine)
+ FOR i = 0 TO sPartList.Max
+ sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
+
+ sOutcome = MdlBootMngr.Find_Linux(Trim(sPartList[i]))
+ IF sOutcome AND sOutcome <> "None" THEN
+ 'INC objTabStrip.Count
+ objTabStrip.Index = objTabStrip.Count - 1
+ populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
+ INC objTabStrip.Count
+ END IF
+ 'END IF
+
+ NEXT
+ DEC objTabStrip.Count ' remove the trailing blank tab from the
tabstrip.
+
+
+ ' now list all other Windows os's
============================================
+
+
+END
+
+
+PUBLIC SUB Form_Open()
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ .cbVidRes.List = [("Standard"), ("Bootplash Med"), ("Bootsplash
High"), ("Bootsplash Extra High")]
+ END WITH
+'ME.Fake_Names()
+ ME.List_Other_Linuxes(ME.TsOsList)
+ ME.Update_Default_boot_choices()
+ MdlBootMngr.Display_Bootmanager_Target_Options(ME.cbTarget)
+
+
+END
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Conf1"
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+
+PUBLIC SUB Fake_Names()
+
+ DIM tb AS TextBox
+ DIM i AS Integer
+
+ FOR i = 0 TO 2
+ TsOsList.Index = i
+ tb = NEW TextBox(ME.TsOsList) AS "Names"
+ tb.Height = 28
+ tb.Width = 200
+ tb.text = "Test" & i
+ tb.Tag = "Test" & i
+ objNames.Add(tb)
+ INC TsOsList.Count
+ NEXT
+
+END
+
+PUBLIC SUB Names_Change()
+
+
+
+ TsOsList.Current.Text = LAST.text
+ ME.Update_Default_boot_choices()
+
+
+END
+PUBLIC SUB Update_Default_boot_choices()
+ DIM tb AS TextBox
+ ME.cbDefBoot.Clear
+ FOR EACH tb IN objNames
+ cbDefBoot.Add(tb.text)
+ NEXT
+
+
+END
+
+PUBLIC SUB tbOsLabel_Change()
+
+ LAST.text = Replace(LAST.text, " ", "")
+ IF Len(LAST.text) > 15 THEN
+ RETURN
+ END IF
+
+ TsOsList.Current.Text = LAST.text
+ ME.Update_Default_boot_choices()
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ hbox4.Height = ME.ClientH - (hbox4.top + 30)
+ hbox1.Width = hbox1.Parent.Width - (hbox1.Left * 2)
+ hbox2.Width = hbox2.Parent.Width - (hbox2.Left * 2)
+ hbox3.Width = hbox3.Parent.Width - (hbox3.Left * 2)
+
+END
Added: branches/speedy/Conf0.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf0.form Tue Apr 7 12:34:26 2009
@@ -0,0 +1,119 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,84,51)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("System Bootloader Configuration")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(0,6,75,9)
+ Expand = True
+ { frmSelectLoader Frame
+ MoveScaled(-1,0,75,8)
+ Expand = True
+ Text = ("Select system boot manager to use")
+ { HBox2 HBox
+ MoveScaled(1,3,71,3.5)
+ Expand = True
+ { RadioButton1 RadioButton
+ MoveScaled(1,1,12,3.5)
+ Text = ("LILO")
+ }
+ { RadioButton2 RadioButton
+ MoveScaled(16,1,14,3.5)
+ Text = ("GRUB")
+ }
+ { RadioButton3 RadioButton
+ MoveScaled(42,1,17,3.5)
+ Text = ("NONE")
+ }
+ }
+ }
+ }
+ { Frame1 Frame
+ MoveScaled(0,16,75,11)
+ Expand = True
+ Text = ("Boot Menu Options")
+ { HBox1 HBox
+ MoveScaled(1,2,73,3.5)
+ Expand = True
+ Spacing = 2
+ Padding = 2
+ { lbTarget TextLabel
+ MoveScaled(1,0,16,3.5)
+ Text = ("Target")
+ }
+ { cbTarget ComboBox
+ MoveScaled(18,0,25,3.5)
+ Text = ("")
+ ReadOnly = True
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(38,0,17,4)
+ Expand = True
+ Text = ("Video Resolution")
+ Alignment = Align.Right
+ }
+ { cbVidRes ComboBox
+ MoveScaled(57,0,25,3.5)
+ Text = ("")
+ ReadOnly = True
+ }
+ }
+ { HBox3 HBox
+ MoveScaled(1,6,74,3.5)
+ Expand = True
+ Spacing = 2
+ Padding = 2
+ { TextLabel2 TextLabel
+ MoveScaled(1,0,16,3.5)
+ Text = ("Prompt Time Out")
+ }
+ { SpinBox1 SpinBox
+ MoveScaled(18,0,6,3.5)
+ }
+ { TextLabel3 TextLabel
+ MoveScaled(25,0,11,3.5)
+ Expand = True
+ Text = ("Seconds")
+ Alignment = Align.Left
+ }
+ { TextLabel4 TextLabel
+ MoveScaled(38,0,15,3.5)
+ Text = ("Boot Default")
+ Alignment = Align.Right
+ }
+ { cbDefBoot ComboBox
+ MoveScaled(56,0,25,3.5)
+ Text = ("")
+ ReadOnly = True
+ }
+ }
+ }
+ { HBox4 HBox
+ MoveScaled(1,28,74,20)
+ Expand = True
+ Padding = 2
+ { TsOsList TabStrip
+ MoveScaled(1,1,67,17)
+ Expand = True
+ Arrangement = Arrange.Row
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
+ }
+ }
+}
Added: branches/speedy/Conf0Old.class
==============================================================================
--- (empty file)
+++ branches/speedy/Conf0Old.class Tue Apr 7 12:34:26 2009
@@ -0,0 +1,120 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+'=====================================================================================
+
+
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ ClsGlobal.fRunningMainForm.listview1["Step6"].Picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step5"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step4"].picture = MdlStartUp.pDone
+
+ RETURN "Conf1"
+
+
+END
+PUBLIC SUB StartUp()
+
+' MdlBootMngr.Display_Bootmanager_Target_Options()
+ IF MdlBootMngr.bScanned = FALSE OR NOT MdlBootMngr.bScanned THEN
+ 'MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
+ ME.List_Found_Os_List(ME.TsOsListing)
+ MdlBootMngr.List_Default_Boot_Choices(ME.cbBootDef)
+ END IF
+
+
+END
+
+PUBLIC SUB List_Found_Os_List(objts AS TabStrip)
+
+ MdlBootMngr.List_Other_Linuxes(objts)
+
+END
+
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
+PUBLIC SUB Form_Open()
+
+' MdlBootMngr.trigger_default_boot_list
+
+
+ WITH ME
+ .tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ .tlSep.Text = "<b>" & tlsep.Text & "</b>"
+ .cbVidRes.List = [("Standard"), ("Bootplash Med"), ("Bootsplash
High"), ("Bootsplash Extra High")]
+ END WITH
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ ME.HBox2.Width = ME.Frame1.Width - (ME.HBox2.Left * 2)
+ ME.hbox3.Width = ME.Frame2.Width - (ME.HBox3.Left * 2)
+ ME.HBox5.Width = ME.Frame2.Width - (ME.hbox5.Left * 2)
+ ME.HBox6.Width = ME.Width
+' ME.TsOsListing.Height = ClsGlobal.fRunningMainForm.pnlstack.height -
(ME.TsOsListing.Top + 230)
+
+END
+
+PUBLIC SUB rbNone_Click()
+
+ IF LAST.value = TRUE THEN
+ Message.Warning("<b>" & ("WARNING:") & "</b><br>" &
+ ("Selecting this option will bypass your boot manager configuration.")
& "<br>" &
+ ("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
+ ("unless you are fully aware of what you are doing."))
+END IF
+
+END
+
+PUBLIC SUB tlLiloTarget_DblClick()
+
+ Balloon("This is a test" & "<br>" & "This is another string"
& "<br><br><br><br><br><br>" & "to see if the baloon has been fixed",
cbLiloTarget)
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ MdlBootMngr.GENERATE_LILO_HEADER()
+
+END
+
+PUBLIC SUB HPanel1_Menu()
+
+
+
+END
+
+PUBLIC SUB tlbanner_Menu()
+
+
+END
+
+PUBLIC SUB Timer1_Timer()
+
+ MdlBootMngr.List_Default_Boot_Choices(ME.cbBootDef)
+
+END
Added: branches/speedy/Conf0Old.form
==============================================================================
--- (empty file)
+++ branches/speedy/Conf0Old.form Tue Apr 7 12:34:26 2009
@@ -0,0 +1,137 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,84,67)
+ Text = ("")
+ Arrangement = Arrange.Row
+ Padding = 2
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,33,3)
+ Expand = True
+ Text = ("System Bootloader Configuration")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,34,1)
+ Visible = False
+ Expand = True
+ }
+ { Frame1 Frame
+ MoveScaled(0,6,55,7)
+ Expand = True
+ Text = ("Select bootloader to be used")
+ { HBox2 HBox
+ MoveScaled(1,3,52,3)
+ { rbLilo RadioButton
+ MoveScaled(1,0,11,3)
+ Expand = True
+ Text = ("LILO")
+ }
+ { rbGrub RadioButton
+ MoveScaled(14,0,10,3)
+ Expand = True
+ Text = ("Grub")
+ }
+ { rbNone RadioButton
+ MoveScaled(26,0,16,3)
+ ToolTip = ("Select this option if you want to configure your
system boot manager manually at a later time")
+ Expand = True
+ Text = ("None (Experts Only)")
+ }
+ }
+ }
+ { Frame2 Frame
+ MoveScaled(0,14,84,11)
+ Expand = True
+ Text = ("Boot menu options")
+ { HBox3 HBox
+ MoveScaled(1,2,70,3.5)
+ Expand = True
+ Spacing = 4
+ Padding = 2
+ { tlLiloTarget TextLabel
+ MoveScaled(1,0,16.25,3)
+ AutoResize = True
+ Text = ("Target")
+ Alignment = Align.Left
+ }
+ { cbLiloTarget ComboBox
+ MoveScaled(11,0,22.5,3)
+ Text = ("")
+ ReadOnly = True
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(36,0,15,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Video Resolution")
+ Alignment = Align.Right
+ }
+ { cbVidRes ComboBox
+ MoveScaled(52,0,22.5,3)
+ Text = ("")
+ ReadOnly = True
+ }
+ }
+ { HBox5 HBox
+ MoveScaled(1,6,78,3.5)
+ Spacing = 4
+ Padding = 2
+ { tlTimeOUt TextLabel
+ MoveScaled(-1,0,16.25,3)
+ AutoResize = True
+ Text = ("Prompt Time Out")
+ Alignment = Align.Left
+ }
+ { SbTimeOut SpinBox
+ MoveScaled(17,0,8,3)
+ Value = 5
+ }
+ { TextLabel2 TextLabel
+ MoveScaled(26,0,8,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Seconds")
+ Alignment = Align.Left
+ }
+ { tlBootDef TextLabel
+ MoveScaled(46,0,15,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Boot Default")
+ Alignment = Align.Right
+ }
+ { cbBootDef ComboBox
+ MoveScaled(61,0,22.5,3)
+ Text = ("")
+ ReadOnly = True
+ }
+ }
+ }
+ { HBox6 HBox
+ MoveScaled(16,25,44,3)
+ Expand = True
+ { tlSep TextLabel
+ MoveScaled(5,0,36,3)
+ Expand = True
+ Text = ("OPERATING SYSTEMS DETECTED")
+ Alignment = Align.Center
+ Border = Border.Etched
+ }
+ }
+ { TsOsListing TabStrip
+ MoveScaled(1,29,81,36)
+ Expand = True
+ Arrangement = Arrange.Row
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
+ }
+}
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Tue Apr 7 12:34:26 2009
@@ -50,10 +50,9 @@
MoveScaled(3,34,13,1)
}
}
- { pnlStack Panel
- MoveScaled(28,2,50,37)
+ { pnlStack Workspace
+ MoveScaled(32,3,37,32)
Expand = True
- Border = Border.Plain
}
}
{ HBox1 HBox
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Tue Apr 7 12:34:26 2009
@@ -16,16 +16,15 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'====================================================================================================
-PUBLIC objinitrds AS Object[]
-PUBLIC objChecks AS Object[]
-PUBLIC objappends AS Object[]
-PUBLIC objNames AS Object[]
-
+' PUBLIC objinitrds AS Object[]
+' PUBLIC objChecks AS Object[]
+' PUBLIC objappends AS Object[]
+' PUBLIC objNames AS Object[]
PUBLIC bScanned AS Boolean
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
DIM sRes AS String
-
+ DIM sDump AS String
IF Exist(sMountedLocation &/ "etc/arch-release") THEN
sRes = "Arch"
ELSE IF Exist(sMountedLocation &/ "etc/knoppix-version") THEN
@@ -50,7 +49,23 @@
ELSE IF Exist(sMountedLocation &/ "/etc/mandrake-release") THEN
sres = "Mandriva"
ELSE IF Exist(sMountedLocation &/ "etc/vector-version") THEN
- sres = "VectorLinux"
+ 'sres = "VectorLinux"
+ 'sDump = File.Load(sMountedLocation &/ "etc/vector-version")
+ SHELL "cat " & sMountedLocation &/ "etc/vector-version" TO sDump
+ 'Message(sDump)
+ IF InStr(sDump, "Light") THEN
+ sRes = "VL-Light"
+ ELSE IF InStr(sDump, "Standard") THEN
+ sRes = "VL-STD"
+ ELSE IF InStr(sDump, "SOHO") THEN
+ sRes = "VL-SOHO"
+ ELSE IF InStr(sDump, "Deluxe") THEN
+ sRes = "VL-SOHO DLX"
+ ELSE
+ sRes = "VectorLinux"
+ END IF
+ 'IF InStr sDump LIKE "Light" THEN
+
ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN
sres = "Slackware"
ELSE IF Exist(sMountedLocation & "/etc/SuSE-release") THEN
@@ -65,32 +80,7 @@
sres = "Linux"
END IF
-
- ' IF Exist(sMountedLocation &/ "etc/vector-version") THEN
- ' sres = "VectorLinux"
- ' ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN
- ' sres = "Slackware"
- ' ELSE IF Exist(sMountedLocation &/ "etc/Suse-release") OR
Exist(sMountedLocation &/ "UnitiedLinux-release") THEN
- ' sres = "SuSE"
- ' ELSE IF Exist(sMountedLocation &/ "etc/gentoo-release") THEN
- ' sres = "Gentoo"
- ' ELSE IF Exist(sMountedLocation &/ "etc/debian_version") THEN
- ' SHELL "grep -m 1 cdrom " & sMountedLocation &/ "etc" &/ "apt"
&/ "sources.list | cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sres
- ' IF Len(Trim(sres)) >= 0 THEN
- ' sres = Trim(Replace(sres, " ", "_"))
- ' ELSE
- ' sres = "Debian"
- ' END IF
- ' ELSE IF Exist(sMountedLocation &/ "etc/mandrake-release") THEN ' this
should be mandriva now
- ' sres = "Mandrake"
- ' ELSE IF Exist(sMountedLocation &/ "etc/redhat-release") THEN
- ' sres = "RedHat"
- ' ELSE IF Exist(sMountedLocation &/ "etc/fedora-release") THEN
- ' sres = "Fedora"
- ' ELSE
- ' sres = "Linux"
- '
- ' END IF
+
RETURN sres
@@ -129,204 +119,208 @@
END
-PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
-
- DIM i AS Integer
- DIM tb AS TextBox
- DIM tl AS TextLabel
- DIM cb AS CheckBox
- DIM hb AS HBox
- DIM comb AS ComboBox
-
- IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
- 'Message(sLinux)
- IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
- i = 0
- WITH objTabStrip
- .Index = i
- .Text = "VectorLinux"
- END WITH
- ELSE
- i = objTabStrip.Count - 1
- WITH objTabStrip
- .Index = i
- .Text = sLinux
- END WITH
- END IF
-
- tl = NEW TextLabel(objTabStrip) AS "Banner"
- WITH tl
- .Text = ("Installation found in") & Space(1) & sLinuxRoot
- .Height = 24
- .Alignment = Align.Left
- .Width = 200
- .Expand = TRUE
- '.Border = Border.Plain
- '.AutoResize = TRUE
- .Move(4, 4)
- END WITH
- hb = NEW HBox(objTabStrip) ' separator space
- WITH hb
- .Height = 16
- .Width = 12
- .Expand = TRUE
- END WITH
- cb = NEW CheckBox(objTabStrip) ' Inlcude/Exclude OS from boot menu
- WITH cb
- .Expand = TRUE
- .Text = ("Include in boot menu")
- .Value = TRUE
- .Height = 24
- .Tag = sLinuxRoot
- END WITH
- objChecks.Add(cb)
- hb = NEW HBox(objTabStrip) ' separator space
- WITH hb
- .Height = 12
- .Expand = TRUE
- END WITH
- hb = NEW HBox(objTabStrip) ' This will hold a few objects of it's own
- WITH hb
- .Height = 28
- .Expand = TRUE
- .Padding = 2
- .Spacing = 2
- END WITH
- tl = NEW TextLabel(hb) ' Name label
- WITH tl
- .Text = ("Name")
- .Expand = FALSE
- .Width = 200
- .Adjust()
- .AutoResize = TRUE
- .Height = .Parent.Height
- .Alignment = Align.Left
- END WITH
- tb = NEW TextBox(hb) ' Name entry box
- WITH tb
- .Expand = TRUE
- .Height = .Parent.Height
- .Text = sLinux ' default to the distro found
- .Tag = sLinuxRoot
- END WITH
- objNames.Add(tb)
- tl = NEW TextLabel(hb) ' initrd label
- WITH tl
- .text = ("Initial RAM disk image")
- .Alignment = Align.Right
- .Height = .Parent.Height
- .Expand = TRUE
- END WITH
-
- comb = NEW ComboBox(hb) ' initrd selection combobox
- WITH comb
- .Height = .Parent.Height
- .Expand = TRUE
- .READonly = TRUE
- .Tag = sLinuxRoot
- END WITH
- ' populate the initrd box
- 'Message(sLinuxRoot)
- ME.find_initrds_for_this_linux(sLinuxRoot, comb) ' populate initrd
selection
-
- objinitrds.Add(comb)
- hb = NEW HBox(objTabStrip) ' blank space separator
- hb.Height = 8
- hb.Expand = TRUE
- tl = NEW TextLabel(objTabStrip) ' append line textlabel
- WITH tl
- .Text = ("Kernel boot options")
- .Height = 24
- .Width = 200
- .Alignment = Align.Left
- .Expand = FALSE
- .AutoResize = TRUE
- END WITH
- tb = NEW TextBox(objTabStrip) ' append input line
- WITH tb
- .Text = "splash=silent"
- .Height = 24
- .Expand = TRUE
- .Tag = sLinuxRoot
- END WITH
- objappends.Add(tb)
-
- ' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
- IF sLinuxRoot = ClsGlobal.sRoot THEN
- hb = NEW HBox(objTabStrip) ' yet another separator
- WITH hb
- .Expand = TRUE
- .Height = 8
- END WITH
- cb = NEW CheckBox(objTabStrip) AS "bCLIOption"
- WITH cb
- .Value = TRUE
- .Text = ("Add option to boot this operating system into text mode")
- .Height = 24
- .Expand = TRUE
- .Tag = sLinuxRoot
- END WITH
- ' hb = NEW HBox(objTabStrip)
- ' hb.Height = 4
- ' hb.Expand = TRUE
-
- END IF
- objTabStrip.Refresh()
-
-
-
-END
-
-
-PUBLIC SUB List_Other_Linuxes(objTabStrip AS TabStrip) ' tell me where you
want the results.
-
- DIM sDump, sPartitions, sPart AS String
- DIM sPartList AS String[]
- DIM i AS Integer
- DIM sOutcome AS String
-
- objappends = NEW Object[]
- objChecks = NEW Object[]
- objinitrds = NEW Object[]
- objNames = NEW Object[]
-
- bScanned = TRUE
- 'Message(ClsGlobal.sRoot)
-' Message(Trim(sPartList[i]))
-
- ' First, and foremost, we will list the recently isntalled VectorLinux
- 'populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
- ' Now list all other linuxes
=================================================
- SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux |
tr -s \' \' | cut -f 1 -d \' \'" TO sDump
- sDump = Trim(sDump)
- IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ...
- sPartList = Split(sDump, gb.NewLine)
- FOR i = 0 TO sPartList.Max
- sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
-
- 'IF Trim(ClsGlobal.sRoot) <> Trim(sPartList[i]) THEN
- 'sOutcome = Find_Linux(Trim(sPartList[i]))
- 'Message(sOutcome)
- ' will only list the linux IF one IS present
- 'IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
- 'IF Find_Linux(Trim(sPartList[i])) <> "None" THEN
- sOutcome = Find_Linux(Trim(sPartList[i]))
- IF sOutcome AND sOutcome <> "None" THEN
- 'INC objTabStrip.Count
- objTabStrip.Index = objTabStrip.Count - 1
- populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
- INC objTabStrip.Count
- END IF
- 'END IF
-
- NEXT
- DEC objTabStrip.Count ' remove the trailing blank tab from the
tabstrip.
-
-
- ' now list all other Windows os's
============================================
-
-
-END
+' PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
+'
+' DIM i AS Integer
+' DIM tb AS TextBox
+' DIM tl AS TextLabel
+' DIM cb AS CheckBox
+' DIM hb AS HBox
+' DIM comb AS ComboBox
+'
+' IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
+' 'Message(sLinux)
+' IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
+' i = 0
+' WITH objTabStrip
+' .Index = i
+' .Text = "VectorLinux"
+' END WITH
+' ELSE
+' i = objTabStrip.Count - 1
+' WITH objTabStrip
+' .Index = i
+' .Text = sLinux
+' END WITH
+' END IF
+'
+' tl = NEW TextLabel(objTabStrip) AS "Banner"
+' WITH tl
+' .Text = ("Installation found in") & Space(1) & sLinuxRoot
+' .Height = 24
+' .Alignment = Align.Left
+' .Width = 200
+' .Expand = TRUE
+' '.Border = Border.Plain
+' '.AutoResize = TRUE
+' .Move(4, 4)
+' END WITH
+' hb = NEW HBox(objTabStrip) ' separator space
+' WITH hb
+' .Height = 16
+' .Width = 12
+' .Expand = TRUE
+' END WITH
+' cb = NEW CheckBox(objTabStrip) ' Inlcude/Exclude OS from boot menu
+' WITH cb
+' .Expand = TRUE
+' .Text = ("Include in boot menu")
+' .Value = TRUE
+' .Height = 24
+' .Tag = sLinuxRoot
+' END WITH
+' objChecks.Add(cb)
+' hb = NEW HBox(objTabStrip) ' separator space
+' WITH hb
+' .Height = 12
+' .Expand = TRUE
+' END WITH
+' hb = NEW HBox(objTabStrip) ' This will hold a few objects of it's own
+' WITH hb
+' .Height = 28
+' .Expand = TRUE
+' .Padding = 2
+' .Spacing = 2
+' END WITH
+' tl = NEW TextLabel(hb) ' Name label
+' WITH tl
+' .Text = ("Name")
+' .Expand = FALSE
+' .Width = 200
+' .Adjust()
+' .AutoResize = TRUE
+' .Height = .Parent.Height
+' .Alignment = Align.Left
+' END WITH
+' tb = NEW TextBox(hb) AS "tbOsLabel" ' Name entry box
+' WITH tb
+' .Expand = TRUE
+' .Height = .Parent.Height
+' .Text = sLinux ' default to the distro found
+' .Tag = sLinuxRoot
+' END WITH
+' objNames.Add(tb)
+' tl = NEW TextLabel(hb) ' initrd label
+' WITH tl
+' .text = ("Initial RAM disk image")
+' .Alignment = Align.Right
+' .Height = .Parent.Height
+' .Expand = TRUE
+' END WITH
+'
+' comb = NEW ComboBox(hb) ' initrd selection combobox
+' WITH comb
+' .Height = .Parent.Height
+' .Expand = TRUE
+' .READonly = TRUE
+' .Tag = sLinuxRoot
+' END WITH
+' ' populate the initrd box
+' 'Message(sLinuxRoot)
+' ME.find_initrds_for_this_linux(sLinuxRoot, comb) ' populate
initrd selection
+'
+' objinitrds.Add(comb)
+' hb = NEW HBox(objTabStrip) ' blank space separator
+' hb.Height = 8
+' hb.Expand = TRUE
+' tl = NEW TextLabel(objTabStrip) ' append line textlabel
+' WITH tl
+' .Text = ("Kernel boot options")
+' .Height = 24
+' .Width = 200
+' .Alignment = Align.Left objappends = NEW Object[]
+ ' objChecks = NEW Object[]
+ ' objinitrds = NEW Object[]
+ ' objNames = NEW Object[]
+
+' .Expand = FALSE
+' .AutoResize = TRUE
+' END WITH
+' tb = NEW TextBox(objTabStrip) ' append input line
+' WITH tb
+' .Text = "splash=silent"
+' .Height = 24
+' .Expand = TRUE
+' .Tag = sLinuxRoot
+' END WITH
+' objappends.Add(tb)
+'
+' ' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
+' IF sLinuxRoot = ClsGlobal.sRoot THEN
+' hb = NEW HBox(objTabStrip) ' yet another separator
+' WITH hb
+' .Expand = TRUE
+' .Height = 8
+' END WITH
+' cb = NEW CheckBox(objTabStrip) AS "bCLIOption"
+' WITH cb
+' .Value = TRUE
+' .Text = ("Add option to boot this operating system into text
mode")
+' .Height = 24
+' .Expand = TRUE
+' .Tag = sLinuxRoot
+' END WITH
+' ' hb = NEW HBox(objTabStrip)
+' ' hb.Height = 4
+' ' hb.Expand = TRUE
+'
+' END IF
+' objTabStrip.Refresh()
+'
+'
+'
+' END
+
+
+' PUBLIC SUB List_Other_Linuxes(objTabStrip AS TabStrip) ' tell me where
you want the results.
+
+' DIM sDump, sPartitions, sPart AS String
+' DIM sPartList AS String[]
+' DIM i AS Integer
+' DIM sOutcome AS String
+'
+' objappends = NEW Object[]
+' objChecks = NEW Object[]
+' objinitrds = NEW Object[]
+' objNames = NEW Object[]
+'
+' bScanned = TRUE
+' 'Message(ClsGlobal.sRoot)
+' ' Message(Trim(sPartList[i]))
+'
+' ' First, and foremost, we will list the recently isntalled VectorLinux
+' 'populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
+' ' Now list all other linuxes
=================================================
+' SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux
| tr -s \' \' | cut -f 1 -d \' \'" TO sDump
+' sDump = Trim(sDump)
+' IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ...
+' sPartList = Split(sDump, gb.NewLine)
+' FOR i = 0 TO sPartList.Max
+' sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
+'
+' 'IF Trim(ClsGlobal.sRoot) <> Trim(sPartList[i]) THEN
+' 'sOutcome = Find_Linux(Trim(sPartList[i]))
+' 'Message(sOutcome)
+' ' will only list the linux IF one IS present
+' 'IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+' 'IF Find_Linux(Trim(sPartList[i])) <> "None" THEN
+' sOutcome = Find_Linux(Trim(sPartList[i]))
+' IF sOutcome AND sOutcome <> "None" THEN
+' 'INC objTabStrip.Count
+' objTabStrip.Index = objTabStrip.Count - 1
+' populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
+' INC objTabStrip.Count
+' END IF
+' 'END IF
+'
+' NEXT
+' DEC objTabStrip.Count ' remove the trailing blank tab from the
tabstrip.
+'
+'
+' ' now list all other Windows os's
============================================
+'
+'
+' END
PUBLIC SUB find_initrds_for_this_linux(sLinuxRoot AS String, object AS
ComboBox)
@@ -358,5 +352,109 @@
object.Add(("None"))
END
+
+PUBLIC SUB GENERATE_LILO_HEADER()
+
+ DIM sTmp AS String
+ DIM sTarget, sVidMod, sDefBoot, sVGA, sVidImput, sVidText, sOutput AS
String
+ DIM iTimeOut AS Integer
+
+ sTarget = Trim(Conf0.cbLiloTarget.Text)
+ IF InStr(sTarget, ("MBR Of")) THEN
+ sTarget = Right(sTarget, Len(sTarget) - InStr(sTarget, "/") + 1)
+ ELSE IF sTarget = ("Bootsector Of") & Space(1) & ClsGlobal.sRoot THEN
+ sTarget = ClsGlobal.sRoot
+ ELSE IF sTarget = ("Floppy") THEN
+ sTarget = "/dev/df0"
+ END IF
+
+ sVidImput = Trim(Conf0.cbVidRes.Text)
+ SELECT CASE sVidImput
+ CASE ("Standard")
+ sVGA = "normal"
+ CASE ("Bootsplash Med")
+ svga = "788"
+ CASE ("Bootsplash High")
+ svga = "791"
+ CASE ("Bootsplash Extra High")
+ svga = "794"
+ END SELECT
+
+ sVidText = "# VESA framebuffer console @ 1024x768x64k \n" &
+"vga = " & sVga & "\n" &
+"# Normal VGA console \n" &
+"#vga = normal \n" &
+"#VESA framebuffer console @ 1024 x768x64k \n" &
+"#vga = 791 \n" &
+"#VESA framebuffer console @ 1024 x768x32k \n" &
+"#vga = 790 \n" &
+"#VESA framebuffer console @ 1024 x768x256 \n" &
+"#vga = 773 \n" &
+"#VESA framebuffer console @ 800 x600x64k \n" &
+"#vga = 788 \n" &
+"#VESA framebuffer console @ 800 x600x32k \n" &
+"#vga = 787 \n" &
+"#VESA framebuffer console @ 800 x600x256 \n" &
+"#vga = 771 \n" &
+"#VESA framebuffer console @ 640 x480x64k \n" &
+"#vga = 785 \n" &
+"#VESA framebuffer console @ 640 x480x32k \n" &
+"#vga = 784 \n" &
+"#VESA framebuffer console @ 640 x480x256 \n" &
+"#vga = 769 \n" &
+"# Begin listing OS Choices \n"
+
+
+
+ iTimeOut = Conf0.SbTimeOut.Value * 10
+
+ sOutput = "# LILO Configuration File \n" &
+ "# Generated by the VectorLinux Installer \n \n" &
+ "# Begin lilo global configuration \n \n" &
+ "boot = " & sTarget & "\n" &
+ "default = " & sDefBoot & "\n" &
+ "prompt \n" &
+ "compact \n" &
+ "timeout = " & iTimeOut & "\n" &
+ "#\n#\n#\n" &
+ "# Override dangerous defaults that require the partition table: \n" &
+ "change-rules \n" &
+ "reset \n" &
+ "bitmap = /boot/bitmap/boot.bmp \n" &
+ "#\n#\n#\n" &
+ sVidText
+
+ File.Save(Temp("lilo.in"), sOutput)
+
+ 'Message(File.Load(Temp("lilo.in")))
+
+END
+
+PUBLIC SUB Display_Bootmanager_Target_Options(objCB AS ComboBox)
+
+ DIM sList, sTarget, sDump AS String
+ DIM sListArr AS String[]
+ DIM i AS Integer
+ DIM cb, cbl AS ComboBox
+
+ SHELL "probedisk | grep -vi cdrom | cut -f 1 -d \'|\'" TO sList
+ sList = Trim(sList)
+
+ sListArr = Split(sList, "\n").Sort(gb.Ascent)
+ FOR i = 0 TO sListArr.Max
+ sTarget = ("MBR of") & Space(1) & Trim(sListArr[i])
+ objCB.Add(Trim(sTarget))
+ NEXT
+
+ 'Determine how the root partition was formatted
+ SHELL "df -hT /mnt/target | tr -s \' \' | grep \"^/dev\" | cut -f 2
-d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF LCase(sDump) <> "xfs" THEN
+ objCB.Add(("Bootsector of") & Space(1) & ClsGlobal.sRoot)
+
+ END IF
+
+END
+
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Tue Apr 7 12:34:26 2009
@@ -16,6 +16,7 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
PUBLIC FUNCTION FORMAT_THIS_PARTITION(sPartition AS String, sFilesystem AS
String) AS Integer
DIM hproc AS Process
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Tue Apr 7 12:34:26 2009
@@ -27,10 +27,10 @@
Text = ("Searching your system for installable media")
}
{ HBox1 HBox
- MoveScaled(1,3,54,3)
+ MoveScaled(1,3,54,3.5)
Expand = True
{ ComboBox1 ComboBox
- MoveScaled(0,0,22,1)
+ MoveScaled(0,0,22,3.5)
Expand = True
Text = ("")
ReadOnly = True
@@ -40,7 +40,7 @@
Text = ("")
}
{ btRescan Button
- MoveScaled(30,0,19,3)
+ MoveScaled(30,0,19,3.5)
Text = ("Search Again")
Picture = Picture["icon:/16/refresh"]
}
Modified: branches/speedy/Step7.class
==============================================================================
--- branches/speedy/Step7.class (original)
+++ branches/speedy/Step7.class Tue Apr 7 12:34:26 2009
@@ -39,7 +39,7 @@
END
PUBLIC SUB StartUp()
-
+ 'ClsGlobal.fRunningMainForm.btnext.enabled = TRUE
END
PUBLIC SUB OnExit()
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Tue Apr 7 12:34:26 2009
@@ -31,12 +31,14 @@
'ME.SUMMARIZE_DISTRO_INFO()
'ME.SUMMARIZE_PARTITION_SELECTION()
+
END
PUBLIC FUNCTION GetNext() AS String
ClsGlobal.fRunningMainForm.listview1["Step4"].Picture = MdlStartUp.pNow
ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pDone
+
RETURN "Conf0"
|
|
From: <cod...@go...> - 2009-04-03 19:10:35
|
Author: M0...@gm...
Date: Fri Apr 3 12:05:14 2009
New Revision: 526
Modified:
branches/speedy/.lang/#project.pot
branches/speedy/.lang/.pot
branches/speedy/.lang/ClsFstab.pot
branches/speedy/.lang/ClsGlobal.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/MdlAutoPartition.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/MdlHelpSystem.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/MdlStartUp.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/.lang/Step3a3a.pot
branches/speedy/.lang/Step4.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step8.pot
branches/speedy/MdlBootMngr.module
Log:
Added more distro ids
Modified: branches/speedy/.lang/#project.pot
==============================================================================
--- branches/speedy/.lang/#project.pot (original)
+++ branches/speedy/.lang/#project.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/.project
+# /home/lightuser/devel/speedy/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Apr 3 12:05:14 2009
@@ -163,31 +163,31 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:119
+#: MdlBootMngr.module:159
msgid "Installation found in"
msgstr ""
-#: MdlBootMngr.module:137
+#: MdlBootMngr.module:177
msgid "Include in boot menu"
msgstr ""
-#: MdlBootMngr.module:157
+#: MdlBootMngr.module:197
msgid "Name"
msgstr ""
-#: MdlBootMngr.module:175
+#: MdlBootMngr.module:215
msgid "Initial RAM disk image"
msgstr ""
-#: MdlBootMngr.module:198
+#: MdlBootMngr.module:238
msgid "Kernel boot options"
msgstr ""
-#: MdlBootMngr.module:224
+#: MdlBootMngr.module:264
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: MdlBootMngr.module:318
+#: MdlBootMngr.module:358
msgid "None"
msgstr ""
Modified: branches/speedy/.lang/ClsFstab.pot
==============================================================================
--- branches/speedy/.lang/ClsFstab.pot (original)
+++ branches/speedy/.lang/ClsFstab.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/ClsFstab.class
+# /home/lightuser/devel/speedy/ClsFstab.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/ClsGlobal.pot
==============================================================================
--- branches/speedy/.lang/ClsGlobal.pot (original)
+++ branches/speedy/.lang/ClsGlobal.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/ClsGlobal.class
+# /home/lightuser/devel/speedy/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Conf0.class
+# /home/lightuser/devel/speedy/Conf0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/FMain.class
+# /home/lightuser/devel/speedy/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/FMain0.class
+# /home/lightuser/devel/speedy/FMain0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlAutoPartition.pot
==============================================================================
--- branches/speedy/.lang/MdlAutoPartition.pot (original)
+++ branches/speedy/.lang/MdlAutoPartition.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlAutoPartition.module
+# /home/lightuser/devel/speedy/MdlAutoPartition.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlBootMngr.module
+# /home/lightuser/devel/speedy/MdlBootMngr.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,31 +14,31 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:119
+#: MdlBootMngr.module:159
msgid "Installation found in"
msgstr ""
-#: MdlBootMngr.module:137
+#: MdlBootMngr.module:177
msgid "Include in boot menu"
msgstr ""
-#: MdlBootMngr.module:157
+#: MdlBootMngr.module:197
msgid "Name"
msgstr ""
-#: MdlBootMngr.module:175
+#: MdlBootMngr.module:215
msgid "Initial RAM disk image"
msgstr ""
-#: MdlBootMngr.module:198
+#: MdlBootMngr.module:238
msgid "Kernel boot options"
msgstr ""
-#: MdlBootMngr.module:224
+#: MdlBootMngr.module:264
msgid "Add option to boot this operating system into text mode"
msgstr ""
-#: MdlBootMngr.module:318
+#: MdlBootMngr.module:358
msgid "None"
msgstr ""
Modified: branches/speedy/.lang/MdlHelpSystem.pot
==============================================================================
--- branches/speedy/.lang/MdlHelpSystem.pot (original)
+++ branches/speedy/.lang/MdlHelpSystem.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlHelpSystem.module
+# /home/lightuser/devel/speedy/MdlHelpSystem.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlMain.module
+# /home/lightuser/devel/speedy/MdlMain.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- branches/speedy/.lang/MdlStartUp.pot (original)
+++ branches/speedy/.lang/MdlStartUp.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/MdlStartUp.module
+# /home/lightuser/devel/speedy/MdlStartUp.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step0.class
+# /home/lightuser/devel/speedy/Step0.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step1.class
+# /home/lightuser/devel/speedy/Step1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step2.class
+# /home/lightuser/devel/speedy/Step2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3.class
+# /home/lightuser/devel/speedy/Step3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a.class
+# /home/lightuser/devel/speedy/Step3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a1.class
+# /home/lightuser/devel/speedy/Step3a1.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a1a.class
+# /home/lightuser/devel/speedy/Step3a1a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a2.class
+# /home/lightuser/devel/speedy/Step3a2.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- branches/speedy/.lang/Step3a3.pot (original)
+++ branches/speedy/.lang/Step3a3.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a3.class
+# /home/lightuser/devel/speedy/Step3a3.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step3a3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a3a.pot (original)
+++ branches/speedy/.lang/Step3a3a.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step3a3a.class
+# /home/lightuser/devel/speedy/Step3a3a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step4.pot
==============================================================================
--- branches/speedy/.lang/Step4.pot (original)
+++ branches/speedy/.lang/Step4.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step4.class
+# /home/lightuser/devel/speedy/Step4.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step5.class
+# /home/lightuser/devel/speedy/Step5.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step6.class
+# /home/lightuser/devel/speedy/Step6.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7.pot
==============================================================================
--- branches/speedy/.lang/Step7.pot (original)
+++ branches/speedy/.lang/Step7.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step7.class
+# /home/lightuser/devel/speedy/Step7.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step7a.class
+# /home/lightuser/devel/speedy/Step7a.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step7b.class
+# /home/lightuser/devel/speedy/Step7b.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Fri Apr 3 12:05:14 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/speedy/Step8.class
+# /home/lightuser/devel/speedy/Step8.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Fri Apr 3 12:05:14 2009
@@ -26,14 +26,12 @@
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
DIM sRes AS String
- IF Exist(sMountedLocation &/ "etc/vector-version") THEN
- sres = "VectorLinux"
- ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN
- sres = "Slackware"
- ELSE IF Exist(sMountedLocation &/ "etc/Suse-release") OR
Exist(sMountedLocation &/ "UnitiedLinux-release") THEN
- sres = "SuSE"
- ELSE IF Exist(sMountedLocation &/ "etc/gentoo-release") THEN
- sres = "Gentoo"
+ IF Exist(sMountedLocation &/ "etc/arch-release") THEN
+ sRes = "Arch"
+ ELSE IF Exist(sMountedLocation &/ "etc/knoppix-version") THEN
+ sRes = "Knoppix"
+ ELSE IF Exist(sMountedLocation &/ "etc/sidux-version") THEN
+ sRes = "Sidux"
ELSE IF Exist(sMountedLocation &/ "etc/debian_version") THEN
SHELL "grep -m 1 cdrom " & sMountedLocation &/ "etc" &/ "apt"
&/ "sources.list | cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sres
IF Len(Trim(sres)) >= 0 THEN
@@ -41,16 +39,58 @@
ELSE
sres = "Debian"
END IF
- ELSE IF Exist(sMountedLocation &/ "etc/mandrake-release") THEN ' this
should be mandriva now
- sres = "Mandrake"
- ELSE IF Exist(sMountedLocation &/ "etc/redhat-release") THEN
+ ELSE IF Exist(sMountedLocation &/ "/etc/gentoo-release") THEN
+ sres = "Gentoo"
+ ELSE IF Exist(sMountedLocation &/ "/etc/redhat-release") THEN
sres = "RedHat"
+ ELSE IF Exist(sMountedLocation &/ "/etc/pclinuxos-release") THEN
+ sres = "PCLinuxOS"
+ ELSE IF Exist(sMountedLocation &/ "/etc/mandriva-release") THEN
+ sres = "Mandriva"
+ ELSE IF Exist(sMountedLocation &/ "/etc/mandrake-release") THEN
+ sres = "Mandriva"
+ ELSE IF Exist(sMountedLocation &/ "etc/vector-version") THEN
+ sres = "VectorLinux"
+ ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN
+ sres = "Slackware"
+ ELSE IF Exist(sMountedLocation & "/etc/SuSE-release") THEN
+ sres = "SuSE"
+ ELSE IF Exist(sMountedLocation &/ "yellowdog-release") THEN
+ sres = "YellowDog"
+ ELSE IF Exist(sMountedLocation &/ "etc/zenwalk-version") THEN
+ sres = "Zenwalk"
ELSE IF Exist(sMountedLocation &/ "etc/fedora-release") THEN
sres = "Fedora"
ELSE
sres = "Linux"
-
END IF
+
+
+ ' IF Exist(sMountedLocation &/ "etc/vector-version") THEN
+ ' sres = "VectorLinux"
+ ' ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN
+ ' sres = "Slackware"
+ ' ELSE IF Exist(sMountedLocation &/ "etc/Suse-release") OR
Exist(sMountedLocation &/ "UnitiedLinux-release") THEN
+ ' sres = "SuSE"
+ ' ELSE IF Exist(sMountedLocation &/ "etc/gentoo-release") THEN
+ ' sres = "Gentoo"
+ ' ELSE IF Exist(sMountedLocation &/ "etc/debian_version") THEN
+ ' SHELL "grep -m 1 cdrom " & sMountedLocation &/ "etc" &/ "apt"
&/ "sources.list | cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sres
+ ' IF Len(Trim(sres)) >= 0 THEN
+ ' sres = Trim(Replace(sres, " ", "_"))
+ ' ELSE
+ ' sres = "Debian"
+ ' END IF
+ ' ELSE IF Exist(sMountedLocation &/ "etc/mandrake-release") THEN ' this
should be mandriva now
+ ' sres = "Mandrake"
+ ' ELSE IF Exist(sMountedLocation &/ "etc/redhat-release") THEN
+ ' sres = "RedHat"
+ ' ELSE IF Exist(sMountedLocation &/ "etc/fedora-release") THEN
+ ' sres = "Fedora"
+ ' ELSE
+ ' sres = "Linux"
+ '
+ ' END IF
RETURN sres
|
|
From: <cod...@go...> - 2009-03-31 21:40:57
|
Author: M0...@gm...
Date: Tue Mar 31 14:31:31 2009
New Revision: 525
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/Step8.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
branches/speedy/Step8.class
Log:
Repositioned objects in bootloader window and added object[] to store
objects
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Mar 31 14:31:31 2009
@@ -14,88 +14,88 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:64 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:72 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:121
+#: Conf0.class:129
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:139
+#: Conf0.class:147
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:147
+#: Conf0.class:155
msgid "LILO"
msgstr ""
-#: Conf0.class:153
+#: Conf0.class:161
msgid "Grub"
msgstr ""
-#: Conf0.class:158
+#: Conf0.class:166
msgid ""
"Select this option if you want to configure your system boot manager "
"manually at a later time"
msgstr ""
-#: Conf0.class:160
+#: Conf0.class:168
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:168
+#: Conf0.class:176
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:180
+#: Conf0.class:187
msgid "Target"
msgstr ""
-#: Conf0.class:187
+#: Conf0.class:193
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:200
+#: Conf0.class:206
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:207
+#: Conf0.class:212
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:219
+#: Conf0.class:224
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:231
+#: Conf0.class:237
msgid "Seconds"
msgstr ""
-#: Conf0.class:244
+#: Conf0.class:250
msgid "Boot Default"
msgstr ""
-#: Conf0.class:263
+#: Conf0.class:268
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:275
+#: Conf0.class:279
msgid "Tab 0"
msgstr ""
@@ -163,30 +163,34 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:114
+#: MdlBootMngr.module:119
msgid "Installation found in"
msgstr ""
-#: MdlBootMngr.module:132
+#: MdlBootMngr.module:137
msgid "Include in boot menu"
msgstr ""
-#: MdlBootMngr.module:151
+#: MdlBootMngr.module:157
msgid "Name"
msgstr ""
-#: MdlBootMngr.module:167
+#: MdlBootMngr.module:175
msgid "Initial RAM disk image"
msgstr ""
-#: MdlBootMngr.module:184
+#: MdlBootMngr.module:198
msgid "Kernel boot options"
msgstr ""
-#: MdlBootMngr.module:209
+#: MdlBootMngr.module:224
msgid "Add option to boot this operating system into text mode"
msgstr ""
+#: MdlBootMngr.module:318
+msgid "None"
+msgstr ""
+
#: MdlMain.module:33
msgid "Unable to format"
msgstr ""
@@ -211,7 +215,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:142
+#: MdlStartUp.module:47 Step8.class:145
msgid "Software Selection"
msgstr ""
@@ -219,7 +223,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:225
+#: MdlStartUp.module:49 Step8.class:228
msgid "Installation Summary"
msgstr ""
@@ -923,7 +927,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:190 Step8.class:77
+#: Step6.class:190 Step8.class:80
msgid "Do not format"
msgstr ""
@@ -959,7 +963,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:132
+#: Step7.class:126 Step8.class:135
msgid "Customized"
msgstr ""
@@ -967,7 +971,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:134
+#: Step7.class:144 Step8.class:137
msgid "Minimal"
msgstr ""
@@ -1031,59 +1035,59 @@
"include in your installation."
msgstr ""
-#: Step8.class:45
+#: Step8.class:48
msgid "Distribution"
msgstr ""
-#: Step8.class:63
+#: Step8.class:66
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Not Formatted"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Mount to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "Format to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "and mount to"
msgstr ""
-#: Step8.class:95
+#: Step8.class:98
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:100
+#: Step8.class:103
msgid "Swap Space"
msgstr ""
-#: Step8.class:113
+#: Step8.class:116
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:130
+#: Step8.class:133
msgid "Full"
msgstr ""
-#: Step8.class:137
+#: Step8.class:140
msgid "Installation Method"
msgstr ""
-#: Step8.class:143
+#: Step8.class:146
msgid "Major Components"
msgstr ""
-#: Step8.class:153
+#: Step8.class:156
msgid "Additional Software"
msgstr ""
-#: Step8.class:244
+#: Step8.class:247
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Tue Mar 31 14:31:31 2009
@@ -14,83 +14,83 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:64
+#: Conf0.class:72
msgid "WARNING:"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:64
+#: Conf0.class:72
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:121
+#: Conf0.class:129
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:139
+#: Conf0.class:147
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:147
+#: Conf0.class:155
msgid "LILO"
msgstr ""
-#: Conf0.class:153
+#: Conf0.class:161
msgid "Grub"
msgstr ""
-#: Conf0.class:158
+#: Conf0.class:166
msgid "Select this option if you want to configure your system boot
manager manually at a later time"
msgstr ""
-#: Conf0.class:160
+#: Conf0.class:168
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:168
+#: Conf0.class:176
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:180
+#: Conf0.class:187
msgid "Target"
msgstr ""
-#: Conf0.class:187
+#: Conf0.class:193
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:200
+#: Conf0.class:206
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:207
+#: Conf0.class:212
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:219
+#: Conf0.class:224
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:231
+#: Conf0.class:237
msgid "Seconds"
msgstr ""
-#: Conf0.class:244
+#: Conf0.class:250
msgid "Boot Default"
msgstr ""
-#: Conf0.class:263
+#: Conf0.class:268
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:275
+#: Conf0.class:279
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Tue Mar 31 14:31:31 2009
@@ -14,27 +14,31 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:114
+#: MdlBootMngr.module:119
msgid "Installation found in"
msgstr ""
-#: MdlBootMngr.module:132
+#: MdlBootMngr.module:137
msgid "Include in boot menu"
msgstr ""
-#: MdlBootMngr.module:151
+#: MdlBootMngr.module:157
msgid "Name"
msgstr ""
-#: MdlBootMngr.module:167
+#: MdlBootMngr.module:175
msgid "Initial RAM disk image"
msgstr ""
-#: MdlBootMngr.module:184
+#: MdlBootMngr.module:198
msgid "Kernel boot options"
msgstr ""
-#: MdlBootMngr.module:209
+#: MdlBootMngr.module:224
msgid "Add option to boot this operating system into text mode"
+msgstr ""
+
+#: MdlBootMngr.module:318
+msgid "None"
msgstr ""
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Tue Mar 31 14:31:31 2009
@@ -14,79 +14,79 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step8.class:45
+#: Step8.class:48
msgid "Distribution"
msgstr ""
-#: Step8.class:63
+#: Step8.class:66
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:77
+#: Step8.class:80
msgid "Do not format"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Not Formatted"
msgstr ""
-#: Step8.class:78
+#: Step8.class:81
msgid "Mount to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "Format to"
msgstr ""
-#: Step8.class:79
+#: Step8.class:82
msgid "and mount to"
msgstr ""
-#: Step8.class:95
+#: Step8.class:98
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:100
+#: Step8.class:103
msgid "Swap Space"
msgstr ""
-#: Step8.class:113
+#: Step8.class:116
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:130
+#: Step8.class:133
msgid "Full"
msgstr ""
-#: Step8.class:132
+#: Step8.class:135
msgid "Customized"
msgstr ""
-#: Step8.class:134
+#: Step8.class:137
msgid "Minimal"
msgstr ""
-#: Step8.class:137
+#: Step8.class:140
msgid "Installation Method"
msgstr ""
-#: Step8.class:142
+#: Step8.class:145
msgid "Software Selection"
msgstr ""
-#: Step8.class:143
+#: Step8.class:146
msgid "Major Components"
msgstr ""
-#: Step8.class:153
+#: Step8.class:156
msgid "Additional Software"
msgstr ""
-#: Step8.class:225
+#: Step8.class:228
msgid "Installation Summary"
msgstr ""
-#: Step8.class:244
+#: Step8.class:247
msgid "Your VectorLinux installation is about to be performed as follows.
If you need to make any changes, this is your last chance."
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Tue Mar 31 14:31:31 2009
@@ -16,8 +16,15 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'=====================================================================================
+
+
+
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step6"].Picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step5"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step4"].picture = MdlStartUp.pDone
+
RETURN "Conf1"
@@ -51,7 +58,8 @@
ME.hbox3.Width = ME.Frame2.Width - (ME.HBox3.Left * 2)
ME.HBox5.Width = ME.Frame2.Width - (ME.hbox5.Left * 2)
ME.HBox6.Width = ME.Width
- ME.TsOsListing.Height = ME.ClientHeight - (ME.HBox6.top +
(ME.HBox6.Height + 12)) 'ME.Heigh - (ME.HBox6.top + (ME.HBox6.Height * 2))
+ 'ME.TsOsListing.Height = ME.ClientHeight - (ME.HBox6.top +
(ME.HBox6.Height + 12)) 'ME.Heigh - (ME.HBox6.top + (ME.HBox6.Height * 2))
+ ME.TsOsListing.Height = ClsGlobal.fRunningMainForm.pnlstack.height -
(ME.TsOsListing.Top + 230)
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Tue Mar 31 14:31:31 2009
@@ -57,15 +57,13 @@
Spacing = 4
Padding = 2
{ tlLiloTarget TextLabel
- MoveScaled(1,0,10,3)
- Expand = True
+ MoveScaled(1,0,16.25,3)
AutoResize = True
Text = ("Target")
Alignment = Align.Left
}
{ cbLiloTarget ComboBox
- MoveScaled(11,0,16,3)
- Expand = True
+ MoveScaled(11,0,22.5,3)
Text = ("ComboBox1")
}
{ HBox4 HBox
@@ -81,8 +79,7 @@
Alignment = Align.Right
}
{ cbVidRes ComboBox
- MoveScaled(52,0,17,3)
- Expand = True
+ MoveScaled(52,0,22.5,3)
Text = ("ComboBox2")
}
}
@@ -98,6 +95,7 @@
}
{ SbTimeOut SpinBox
MoveScaled(17,0,8,3)
+ Value = 5
}
{ TextLabel2 TextLabel
MoveScaled(26,0,8,3)
@@ -118,8 +116,7 @@
Alignment = Align.Right
}
{ cbBootDef ComboBox
- MoveScaled(61,0,17,3)
- Expand = True
+ MoveScaled(61,0,22.5,3)
Text = ("ComboBox1")
}
}
@@ -139,7 +136,6 @@
MoveScaled(1,29,81,36)
Expand = True
Arrangement = Arrange.Row
- AutoResize = True
Index = 0
Text = ("Tab 0")
Index = 0
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Tue Mar 31 14:31:31 2009
@@ -16,6 +16,11 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'====================================================================================================
+PUBLIC objinitrds AS Object[]
+PUBLIC objChecks AS Object[]
+PUBLIC objappends AS Object[]
+PUBLIC objNames AS Object[]
+
PUBLIC bScanned AS Boolean
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
@@ -134,6 +139,7 @@
.Height = 24
.Tag = sLinuxRoot
END WITH
+ objChecks.Add(cb)
hb = NEW HBox(objTabStrip) ' separator space
WITH hb
.Height = 12
@@ -160,8 +166,10 @@
WITH tb
.Expand = TRUE
.Height = .Parent.Height
+ .Text = sLinux ' default to the distro found
.Tag = sLinuxRoot
END WITH
+ objNames.Add(tb)
tl = NEW TextLabel(hb) ' initrd label
WITH tl
.text = ("Initial RAM disk image")
@@ -169,6 +177,7 @@
.Height = .Parent.Height
.Expand = TRUE
END WITH
+
comb = NEW ComboBox(hb) ' initrd selection combobox
WITH comb
.Height = .Parent.Height
@@ -176,6 +185,11 @@
.READonly = TRUE
.Tag = sLinuxRoot
END WITH
+ ' populate the initrd box
+ 'Message(sLinuxRoot)
+ ME.find_initrds_for_this_linux(sLinuxRoot, comb) ' populate initrd
selection
+
+ objinitrds.Add(comb)
hb = NEW HBox(objTabStrip) ' blank space separator
hb.Height = 8
hb.Expand = TRUE
@@ -195,6 +209,7 @@
.Expand = TRUE
.Tag = sLinuxRoot
END WITH
+ objappends.Add(tb)
' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
IF sLinuxRoot = ClsGlobal.sRoot THEN
@@ -211,12 +226,12 @@
.Expand = TRUE
.Tag = sLinuxRoot
END WITH
- hb = NEW HBox(objTabStrip)
- hb.Height = 4
- hb.Expand = TRUE
+ ' hb = NEW HBox(objTabStrip)
+ ' hb.Height = 4
+ ' hb.Expand = TRUE
END IF
-
+ objTabStrip.Refresh()
@@ -230,12 +245,17 @@
DIM i AS Integer
DIM sOutcome AS String
+ objappends = NEW Object[]
+ objChecks = NEW Object[]
+ objinitrds = NEW Object[]
+ objNames = NEW Object[]
+
bScanned = TRUE
'Message(ClsGlobal.sRoot)
' Message(Trim(sPartList[i]))
' First, and foremost, we will list the recently isntalled VectorLinux
- populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
+ 'populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
' Now list all other linuxes
=================================================
SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux |
tr -s \' \' | cut -f 1 -d \' \'" TO sDump
sDump = Trim(sDump)
@@ -245,20 +265,57 @@
sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
'IF Trim(ClsGlobal.sRoot) <> Trim(sPartList[i]) THEN
- sOutcome = ME.Find_Linux(Trim(sPartList[i]))
+ 'sOutcome = Find_Linux(Trim(sPartList[i]))
+ 'Message(sOutcome)
' will only list the linux IF one IS present
- IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
- INC objTabStrip.Count
+ 'IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+ 'IF Find_Linux(Trim(sPartList[i])) <> "None" THEN
+ sOutcome = Find_Linux(Trim(sPartList[i]))
+ IF sOutcome AND sOutcome <> "None" THEN
+ 'INC objTabStrip.Count
objTabStrip.Index = objTabStrip.Count - 1
populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
+ INC objTabStrip.Count
END IF
'END IF
NEXT
+ DEC objTabStrip.Count ' remove the trailing blank tab from the
tabstrip.
' now list all other Windows os's
============================================
+
+END
+
+
+PUBLIC SUB find_initrds_for_this_linux(sLinuxRoot AS String, object AS
ComboBox)
+
+ DIM sResults AS String
+ DIM slines AS String[]
+ DIM i AS Integer
+ DIM sAdd, sBootPath AS String
+ ' need to find the mounted address to this linux
+ sAdd = Replace(sLinuxRoot, "/dev/", "/mnt/")
+ IF sLinuxRoot = ClsGlobal.sRoot THEN
+ sBootPath = sadd &/ "boot"
+ ELSE
+ sBootPath = sAdd &/ "boot"
+ END IF
+ SHELL "ls " & sBootPath & " | grep initrd" TO sResults
+ sResults = Trim(sResults)
+ 'Message(sResults)
+ IF NOT sResults THEN ' initrds are not located in the /boot directory
+ SHELL "ls " & sadd & " | grep initrd" TO sResults
+ END IF
+
+ sResults = Trim(sResults)
+
+ slines = Split(sResults, "\n")
+ FOR i = 0 TO slines.Max
+ IF Len(Trim(slines[i])) > 0 THEN object.Add(Trim(slines[i]))
+ NEXT
+ object.Add(("None"))
END
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Tue Mar 31 14:31:31 2009
@@ -34,7 +34,10 @@
END
PUBLIC FUNCTION GetNext() AS String
- 'RETURN "Step9"
+
+ ClsGlobal.fRunningMainForm.listview1["Step4"].Picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step3"].picture = MdlStartUp.pDone
+
RETURN "Conf0"
END
|
|
From: <cod...@go...> - 2009-03-27 21:29:57
|
Author: M0...@gm...
Date: Fri Mar 27 14:01:13 2009
New Revision: 524
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
Log:
better linux os detection
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Mar 27 14:01:13 2009
@@ -14,88 +14,88 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:63 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:64 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:120
+#: Conf0.class:121
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:138
+#: Conf0.class:139
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:146
+#: Conf0.class:147
msgid "LILO"
msgstr ""
-#: Conf0.class:152
+#: Conf0.class:153
msgid "Grub"
msgstr ""
-#: Conf0.class:157
+#: Conf0.class:158
msgid ""
"Select this option if you want to configure your system boot manager "
"manually at a later time"
msgstr ""
-#: Conf0.class:159
+#: Conf0.class:160
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:167
+#: Conf0.class:168
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:179
+#: Conf0.class:180
msgid "Target"
msgstr ""
-#: Conf0.class:186
+#: Conf0.class:187
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:199
+#: Conf0.class:200
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:206
+#: Conf0.class:207
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:218
+#: Conf0.class:219
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:230
+#: Conf0.class:231
msgid "Seconds"
msgstr ""
-#: Conf0.class:243
+#: Conf0.class:244
msgid "Boot Default"
msgstr ""
-#: Conf0.class:262
+#: Conf0.class:263
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:273
+#: Conf0.class:275
msgid "Tab 0"
msgstr ""
@@ -163,8 +163,28 @@
msgid "Select the location to which we will resize"
msgstr ""
-#: MdlBootMngr.module:110
+#: MdlBootMngr.module:114
msgid "Installation found in"
+msgstr ""
+
+#: MdlBootMngr.module:132
+msgid "Include in boot menu"
+msgstr ""
+
+#: MdlBootMngr.module:151
+msgid "Name"
+msgstr ""
+
+#: MdlBootMngr.module:167
+msgid "Initial RAM disk image"
+msgstr ""
+
+#: MdlBootMngr.module:184
+msgid "Kernel boot options"
+msgstr ""
+
+#: MdlBootMngr.module:209
+msgid "Add option to boot this operating system into text mode"
msgstr ""
#: MdlMain.module:33
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Fri Mar 27 14:01:13 2009
@@ -14,83 +14,83 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:63
+#: Conf0.class:64
msgid "WARNING:"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:63
+#: Conf0.class:64
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:120
+#: Conf0.class:121
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:138
+#: Conf0.class:139
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:146
+#: Conf0.class:147
msgid "LILO"
msgstr ""
-#: Conf0.class:152
+#: Conf0.class:153
msgid "Grub"
msgstr ""
-#: Conf0.class:157
+#: Conf0.class:158
msgid "Select this option if you want to configure your system boot
manager manually at a later time"
msgstr ""
-#: Conf0.class:159
+#: Conf0.class:160
msgid "None (Experts Only)"
msgstr ""
-#: Conf0.class:167
+#: Conf0.class:168
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:179
+#: Conf0.class:180
msgid "Target"
msgstr ""
-#: Conf0.class:186
+#: Conf0.class:187
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:199
+#: Conf0.class:200
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:206
+#: Conf0.class:207
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:218
+#: Conf0.class:219
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:230
+#: Conf0.class:231
msgid "Seconds"
msgstr ""
-#: Conf0.class:243
+#: Conf0.class:244
msgid "Boot Default"
msgstr ""
-#: Conf0.class:262
+#: Conf0.class:263
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:273
+#: Conf0.class:275
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Fri Mar 27 14:01:13 2009
@@ -14,7 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: MdlBootMngr.module:110
+#: MdlBootMngr.module:114
msgid "Installation found in"
+msgstr ""
+
+#: MdlBootMngr.module:132
+msgid "Include in boot menu"
+msgstr ""
+
+#: MdlBootMngr.module:151
+msgid "Name"
+msgstr ""
+
+#: MdlBootMngr.module:167
+msgid "Initial RAM disk image"
+msgstr ""
+
+#: MdlBootMngr.module:184
+msgid "Kernel boot options"
+msgstr ""
+
+#: MdlBootMngr.module:209
+msgid "Add option to boot this operating system into text mode"
msgstr ""
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Fri Mar 27 14:01:13 2009
@@ -24,7 +24,7 @@
END
PUBLIC SUB StartUp()
- 'MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
+ IF MdlBootMngr.bScanned = FALSE OR NOT MdlBootMngr.bScanned THEN
MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
END
PUBLIC SUB OnExit()
@@ -40,6 +40,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
.tlSep.Text = "<b>" & tlsep.Text & "</b>"
+
END WITH
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Fri Mar 27 14:01:13 2009
@@ -57,7 +57,7 @@
Spacing = 4
Padding = 2
{ tlLiloTarget TextLabel
- MoveScaled(1,0,16.25,3)
+ MoveScaled(1,0,10,3)
Expand = True
AutoResize = True
Text = ("Target")
@@ -138,6 +138,7 @@
{ TsOsListing TabStrip
MoveScaled(1,29,81,36)
Expand = True
+ Arrangement = Arrange.Row
AutoResize = True
Index = 0
Text = ("Tab 0")
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Fri Mar 27 14:01:13 2009
@@ -16,6 +16,8 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
'====================================================================================================
+PUBLIC bScanned AS Boolean
+
PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
DIM sRes AS String
@@ -88,6 +90,8 @@
DIM tb AS TextBox
DIM tl AS TextLabel
DIM cb AS CheckBox
+ DIM hb AS HBox
+ DIM comb AS ComboBox
IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
'Message(sLinux)
@@ -109,12 +113,111 @@
WITH tl
.Text = ("Installation found in") & Space(1) & sLinuxRoot
.Height = 24
+ .Alignment = Align.Left
.Width = 200
.Expand = TRUE
- .Border = Border.Plain
+ '.Border = Border.Plain
'.AutoResize = TRUE
.Move(4, 4)
END WITH
+ hb = NEW HBox(objTabStrip) ' separator space
+ WITH hb
+ .Height = 16
+ .Width = 12
+ .Expand = TRUE
+ END WITH
+ cb = NEW CheckBox(objTabStrip) ' Inlcude/Exclude OS from boot menu
+ WITH cb
+ .Expand = TRUE
+ .Text = ("Include in boot menu")
+ .Value = TRUE
+ .Height = 24
+ .Tag = sLinuxRoot
+ END WITH
+ hb = NEW HBox(objTabStrip) ' separator space
+ WITH hb
+ .Height = 12
+ .Expand = TRUE
+ END WITH
+ hb = NEW HBox(objTabStrip) ' This will hold a few objects of it's own
+ WITH hb
+ .Height = 28
+ .Expand = TRUE
+ .Padding = 2
+ .Spacing = 2
+ END WITH
+ tl = NEW TextLabel(hb) ' Name label
+ WITH tl
+ .Text = ("Name")
+ .Expand = FALSE
+ .Width = 200
+ .Adjust()
+ .AutoResize = TRUE
+ .Height = .Parent.Height
+ .Alignment = Align.Left
+ END WITH
+ tb = NEW TextBox(hb) ' Name entry box
+ WITH tb
+ .Expand = TRUE
+ .Height = .Parent.Height
+ .Tag = sLinuxRoot
+ END WITH
+ tl = NEW TextLabel(hb) ' initrd label
+ WITH tl
+ .text = ("Initial RAM disk image")
+ .Alignment = Align.Right
+ .Height = .Parent.Height
+ .Expand = TRUE
+ END WITH
+ comb = NEW ComboBox(hb) ' initrd selection combobox
+ WITH comb
+ .Height = .Parent.Height
+ .Expand = TRUE
+ .READonly = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ hb = NEW HBox(objTabStrip) ' blank space separator
+ hb.Height = 8
+ hb.Expand = TRUE
+ tl = NEW TextLabel(objTabStrip) ' append line textlabel
+ WITH tl
+ .Text = ("Kernel boot options")
+ .Height = 24
+ .Width = 200
+ .Alignment = Align.Left
+ .Expand = FALSE
+ .AutoResize = TRUE
+ END WITH
+ tb = NEW TextBox(objTabStrip) ' append input line
+ WITH tb
+ .Text = "splash=silent"
+ .Height = 24
+ .Expand = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+
+ ' ======================= ONLY FOR THE OS WE JUST INSTALLED
===============================
+ IF sLinuxRoot = ClsGlobal.sRoot THEN
+ hb = NEW HBox(objTabStrip) ' yet another separator
+ WITH hb
+ .Expand = TRUE
+ .Height = 8
+ END WITH
+ cb = NEW CheckBox(objTabStrip) AS "bCLIOption"
+ WITH cb
+ .Value = TRUE
+ .Text = ("Add option to boot this operating system into text mode")
+ .Height = 24
+ .Expand = TRUE
+ .Tag = sLinuxRoot
+ END WITH
+ hb = NEW HBox(objTabStrip)
+ hb.Height = 4
+ hb.Expand = TRUE
+
+ END IF
+
+
END
@@ -127,7 +230,7 @@
DIM i AS Integer
DIM sOutcome AS String
-
+ bScanned = TRUE
'Message(ClsGlobal.sRoot)
' Message(Trim(sPartList[i]))
@@ -145,6 +248,8 @@
sOutcome = ME.Find_Linux(Trim(sPartList[i]))
' will only list the linux IF one IS present
IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+ INC objTabStrip.Count
+ objTabStrip.Index = objTabStrip.Count - 1
populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
END IF
'END IF
|
|
From: <cod...@go...> - 2009-03-24 21:36:19
|
Author: M0...@gm...
Date: Tue Mar 24 14:23:30 2009
New Revision: 523
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/.lang/Step8.pot
branches/speedy/.project
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/MdlBootMngr.module
branches/speedy/Step8.class
Log:
More work in the boot manager section
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Mar 24 14:23:30 2009
@@ -14,30 +14,30 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:62 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:63 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:119
+#: Conf0.class:120
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:137
+#: Conf0.class:138
msgid "Select bootloader to be used"
msgstr ""
@@ -63,39 +63,39 @@
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:177
+#: Conf0.class:179
msgid "Target"
msgstr ""
-#: Conf0.class:185
+#: Conf0.class:186
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:196
+#: Conf0.class:199
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:203
+#: Conf0.class:206
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:215
+#: Conf0.class:218
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:227
+#: Conf0.class:230
msgid "Seconds"
msgstr ""
-#: Conf0.class:240
+#: Conf0.class:243
msgid "Boot Default"
msgstr ""
-#: Conf0.class:259
+#: Conf0.class:262
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:270
+#: Conf0.class:273
msgid "Tab 0"
msgstr ""
@@ -163,6 +163,10 @@
msgid "Select the location to which we will resize"
msgstr ""
+#: MdlBootMngr.module:110
+msgid "Installation found in"
+msgstr ""
+
#: MdlMain.module:33
msgid "Unable to format"
msgstr ""
@@ -187,7 +191,7 @@
msgid "Disk Partitioning"
msgstr ""
-#: MdlStartUp.module:47 Step8.class:139
+#: MdlStartUp.module:47 Step8.class:142
msgid "Software Selection"
msgstr ""
@@ -195,7 +199,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49 Step8.class:222
+#: MdlStartUp.module:49 Step8.class:225
msgid "Installation Summary"
msgstr ""
@@ -899,7 +903,7 @@
msgid "Not Used"
msgstr ""
-#: Step6.class:190 Step8.class:74
+#: Step6.class:190 Step8.class:77
msgid "Do not format"
msgstr ""
@@ -935,7 +939,7 @@
msgid "Install everthing in the image (Fully Automated)"
msgstr ""
-#: Step7.class:126 Step8.class:129
+#: Step7.class:126 Step8.class:132
msgid "Customized"
msgstr ""
@@ -943,7 +947,7 @@
msgid "Select the components you wish to install (Advanced)"
msgstr ""
-#: Step7.class:144 Step8.class:131
+#: Step7.class:144 Step8.class:134
msgid "Minimal"
msgstr ""
@@ -1015,51 +1019,51 @@
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Not Formatted"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Mount to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "Format to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "and mount to"
msgstr ""
-#: Step8.class:92
+#: Step8.class:95
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:97
+#: Step8.class:100
msgid "Swap Space"
msgstr ""
-#: Step8.class:110
+#: Step8.class:113
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:127
+#: Step8.class:130
msgid "Full"
msgstr ""
-#: Step8.class:134
+#: Step8.class:137
msgid "Installation Method"
msgstr ""
-#: Step8.class:140
+#: Step8.class:143
msgid "Major Components"
msgstr ""
-#: Step8.class:150
+#: Step8.class:153
msgid "Additional Software"
msgstr ""
-#: Step8.class:241
+#: Step8.class:244
msgid ""
"Your VectorLinux installation is about to be performed as follows. If
you "
"need to make any changes, this is your last chance."
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Tue Mar 24 14:23:30 2009
@@ -14,27 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:62
+#: Conf0.class:63
msgid "WARNING:"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:62
+#: Conf0.class:63
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:119
+#: Conf0.class:120
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:137
+#: Conf0.class:138
msgid "Select bootloader to be used"
msgstr ""
@@ -58,39 +58,39 @@
msgid "Boot menu options"
msgstr ""
-#: Conf0.class:177
+#: Conf0.class:179
msgid "Target"
msgstr ""
-#: Conf0.class:185
+#: Conf0.class:186
msgid "ComboBox1"
msgstr ""
-#: Conf0.class:196
+#: Conf0.class:199
msgid "Video Resolution"
msgstr ""
-#: Conf0.class:203
+#: Conf0.class:206
msgid "ComboBox2"
msgstr ""
-#: Conf0.class:215
+#: Conf0.class:218
msgid "Prompt Time Out"
msgstr ""
-#: Conf0.class:227
+#: Conf0.class:230
msgid "Seconds"
msgstr ""
-#: Conf0.class:240
+#: Conf0.class:243
msgid "Boot Default"
msgstr ""
-#: Conf0.class:259
+#: Conf0.class:262
msgid "OPERATING SYSTEMS DETECTED"
msgstr ""
-#: Conf0.class:270
+#: Conf0.class:273
msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- branches/speedy/.lang/MdlBootMngr.pot (original)
+++ branches/speedy/.lang/MdlBootMngr.pot Tue Mar 24 14:23:30 2009
@@ -14,3 +14,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: MdlBootMngr.module:110
+msgid "Installation found in"
+msgstr ""
+
Modified: branches/speedy/.lang/Step8.pot
==============================================================================
--- branches/speedy/.lang/Step8.pot (original)
+++ branches/speedy/.lang/Step8.pot Tue Mar 24 14:23:30 2009
@@ -22,71 +22,71 @@
msgid "Partitions to be used"
msgstr ""
-#: Step8.class:74
+#: Step8.class:77
msgid "Do not format"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Not Formatted"
msgstr ""
-#: Step8.class:75
+#: Step8.class:78
msgid "Mount to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "Format to"
msgstr ""
-#: Step8.class:76
+#: Step8.class:79
msgid "and mount to"
msgstr ""
-#: Step8.class:92
+#: Step8.class:95
msgid "NO SWAP SPACE SELECTED"
msgstr ""
-#: Step8.class:97
+#: Step8.class:100
msgid "Swap Space"
msgstr ""
-#: Step8.class:110
+#: Step8.class:113
msgid "Pre-formatted to reiserfs, and used for /"
msgstr ""
-#: Step8.class:127
+#: Step8.class:130
msgid "Full"
msgstr ""
-#: Step8.class:129
+#: Step8.class:132
msgid "Customized"
msgstr ""
-#: Step8.class:131
+#: Step8.class:134
msgid "Minimal"
msgstr ""
-#: Step8.class:134
+#: Step8.class:137
msgid "Installation Method"
msgstr ""
-#: Step8.class:139
+#: Step8.class:142
msgid "Software Selection"
msgstr ""
-#: Step8.class:140
+#: Step8.class:143
msgid "Major Components"
msgstr ""
-#: Step8.class:150
+#: Step8.class:153
msgid "Additional Software"
msgstr ""
-#: Step8.class:222
+#: Step8.class:225
msgid "Installation Summary"
msgstr ""
-#: Step8.class:241
+#: Step8.class:244
msgid "Your VectorLinux installation is about to be performed as follows.
If you need to make any changes, this is your last chance."
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Mar 24 14:23:30 2009
@@ -1,5 +1,5 @@
# Gambas Project File 2.0
-# Compiled with Gambas 2.11.1
+# Compiled with Gambas 2.12
Title=VectorLinux Installer
Startup=MdlStartUp
Version=0.0.2
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Tue Mar 24 14:23:30 2009
@@ -24,7 +24,7 @@
END
PUBLIC SUB StartUp()
- MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
+ 'MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
END
PUBLIC SUB OnExit()
@@ -50,6 +50,7 @@
ME.hbox3.Width = ME.Frame2.Width - (ME.HBox3.Left * 2)
ME.HBox5.Width = ME.Frame2.Width - (ME.hbox5.Left * 2)
ME.HBox6.Width = ME.Width
+ ME.TsOsListing.Height = ME.ClientHeight - (ME.HBox6.top +
(ME.HBox6.Height + 12)) 'ME.Heigh - (ME.HBox6.top + (ME.HBox6.Height * 2))
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Tue Mar 24 14:23:30 2009
@@ -29,7 +29,6 @@
Text = ("Select bootloader to be used")
{ HBox2 HBox
MoveScaled(1,3,52,3)
- Expand = True
{ rbLilo RadioButton
MoveScaled(1,0,11,3)
Expand = True
@@ -54,14 +53,15 @@
Text = ("Boot menu options")
{ HBox3 HBox
MoveScaled(1,2,70,3.5)
+ Expand = True
Spacing = 4
Padding = 2
{ tlLiloTarget TextLabel
MoveScaled(1,0,16.25,3)
+ Expand = True
AutoResize = True
Text = ("Target")
Alignment = Align.Left
- Border = Border.Plain
}
{ cbLiloTarget ComboBox
MoveScaled(11,0,16,3)
@@ -70,17 +70,19 @@
}
{ HBox4 HBox
MoveScaled(29,1,8,1)
+ Expand = True
AutoResize = True
}
{ TextLabel1 TextLabel
MoveScaled(36,0,15,3)
+ Expand = True
AutoResize = True
Text = ("Video Resolution")
Alignment = Align.Right
- Border = Border.Plain
}
{ cbVidRes ComboBox
MoveScaled(52,0,17,3)
+ Expand = True
Text = ("ComboBox2")
}
}
@@ -133,10 +135,10 @@
Border = Border.Etched
}
}
- { TsOSListing TabStrip
- MoveScaled(1,31,70,32)
+ { TsOsListing TabStrip
+ MoveScaled(1,29,81,36)
Expand = True
- Arrangement = Arrange.Row
+ AutoResize = True
Index = 0
Text = ("Tab 0")
Index = 0
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Tue Mar 24 14:23:30 2009
@@ -82,17 +82,40 @@
END
-PUBLIC SUB populate_linux_entry(sLinuxRoot AS String, objTabStrip AS
TabStrip)
+PUBLIC SUB populate_linux_entry(sLinux AS String, sLinuxRoot AS String,
objTabStrip AS TabStrip)
DIM i AS Integer
+ DIM tb AS TextBox
+ DIM tl AS TextLabel
+ DIM cb AS CheckBox
+
+ IF NOT sLinux OR Len(Trim(sLinux)) <= 0 THEN RETURN
+ 'Message(sLinux)
IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
i = 0
WITH objTabStrip
.Index = i
.Text = "VectorLinux"
END WITH
+ ELSE
+ i = objTabStrip.Count - 1
+ WITH objTabStrip
+ .Index = i
+ .Text = sLinux
+ END WITH
END IF
+ tl = NEW TextLabel(objTabStrip) AS "Banner"
+ WITH tl
+ .Text = ("Installation found in") & Space(1) & sLinuxRoot
+ .Height = 24
+ .Width = 200
+ .Expand = TRUE
+ .Border = Border.Plain
+ '.AutoResize = TRUE
+ .Move(4, 4)
+ END WITH
+
END
@@ -105,19 +128,25 @@
DIM sOutcome AS String
+ 'Message(ClsGlobal.sRoot)
+' Message(Trim(sPartList[i]))
- ' First, and foremost, we will ist the recently isntalled VectorLinux
- populate_linux_entry(ClsGlobal.sRoot, objTabStrip) ' This will list
the newly isntall VL OS
+ ' First, and foremost, we will list the recently isntalled VectorLinux
+ populate_linux_entry("VectorLinux", ClsGlobal.sRoot, objTabStrip) '
This will list the newly isntall VL OS
' Now list all other linuxes
=================================================
SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux |
tr -s \' \' | cut -f 1 -d \' \'" TO sDump
sDump = Trim(sDump)
- IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ... YAY!.
+ IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ...
sPartList = Split(sDump, gb.NewLine)
FOR i = 0 TO sPartList.Max
- sOutcome = ME.Find_Linux(Trim(sPartList[i]))
- IF Len(sOutcome) <= 0 THEN CONTINUE
- ' will only list the linux if one is present
- populate_linux_entry(Trim(sPartList[i]), objTabStrip)
+ sPart = Trim(Right(sPartList[i], Len(sPartList[i]) -
RInStr(sPartList[i], "/")))
+
+ 'IF Trim(ClsGlobal.sRoot) <> Trim(sPartList[i]) THEN
+ sOutcome = ME.Find_Linux(Trim(sPartList[i]))
+ ' will only list the linux IF one IS present
+ IF Trim(sPartList[i]) <> Trim(ClsGlobal.sRoot) THEN
+ populate_linux_entry(sOutcome, Trim(sPartList[i]),
objTabStrip)
+ END IF
'END IF
NEXT
Modified: branches/speedy/Step8.class
==============================================================================
--- branches/speedy/Step8.class (original)
+++ branches/speedy/Step8.class Tue Mar 24 14:23:30 2009
@@ -71,6 +71,9 @@
sSize = Trim(sEntry[1])
sMntPnt = Trim(sEntry[2])
sFs = Trim(sEntry[3])
+ ' set partition addresses to global class
+ IF sMntPnt = "/" THEN ClsGlobal.sRoot = sPart
+ IF sMntPnt = "/home" THEN ClsGlobal.shome = sPart
IF sfs LIKE ("Do not format") THEN
sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) &
("Mount to") & Space(1)
ELSE IF sfs = ("Format to") & Space(1) & sFs & Space(1) &
("and mount to") & Space(1)
|
|
From: <cod...@go...> - 2009-03-23 21:30:19
|
Author: M0...@gm...
Date: Mon Mar 23 14:26:32 2009
New Revision: 522
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step6.pot
Log:
Updated .pot files
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Mar 23 14:26:32 2009
@@ -14,68 +14,108 @@
msgid "VectorLinux Installer"
msgstr ""
-#: Conf0.class:58 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
+#: Conf0.class:62 Step1.class:433 Step3a1.class:22 Step3a1a.class:186
#: Step7a.class:143
msgid "WARNING:"
msgstr ""
-#: Conf0.class:58
+#: Conf0.class:62
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:58
+#: Conf0.class:62
msgid ""
"You may not be able to start your VectorLinux installation. Do not
choose "
"this option"
msgstr ""
-#: Conf0.class:58
+#: Conf0.class:62
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:92
+#: Conf0.class:119
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:110
+#: Conf0.class:137
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:119
+#: Conf0.class:146
msgid "LILO"
msgstr ""
-#: Conf0.class:125
+#: Conf0.class:152
msgid "Grub"
msgstr ""
-#: Conf0.class:130
+#: Conf0.class:157
msgid ""
"Select this option if you want to configure your system boot manager "
"manually at a later time"
msgstr ""
-#: Conf0.class:132
+#: Conf0.class:159
msgid "None (Experts Only)"
msgstr ""
-#: FMain.class:254 FMain0.class:254
+#: Conf0.class:167
+msgid "Boot menu options"
+msgstr ""
+
+#: Conf0.class:177
+msgid "Target"
+msgstr ""
+
+#: Conf0.class:185
+msgid "ComboBox1"
+msgstr ""
+
+#: Conf0.class:196
+msgid "Video Resolution"
+msgstr ""
+
+#: Conf0.class:203
+msgid "ComboBox2"
+msgstr ""
+
+#: Conf0.class:215
+msgid "Prompt Time Out"
+msgstr ""
+
+#: Conf0.class:227
+msgid "Seconds"
+msgstr ""
+
+#: Conf0.class:240
+msgid "Boot Default"
+msgstr ""
+
+#: Conf0.class:259
+msgid "OPERATING SYSTEMS DETECTED"
+msgstr ""
+
+#: Conf0.class:270
+msgid "Tab 0"
+msgstr ""
+
+#: FMain.class:253 FMain0.class:253
msgid "Process Overview"
msgstr ""
-#: FMain.class:295 FMain0.class:295
+#: FMain.class:294 FMain0.class:294
msgid "Help"
msgstr ""
-#: FMain.class:308 FMain0.class:308
+#: FMain.class:307 FMain0.class:307
msgid "Back"
msgstr ""
-#: FMain.class:319 FMain0.class:319
+#: FMain.class:318 FMain0.class:318
msgid "Next"
msgstr ""
-#: FMain.class:330 FMain0.class:330
+#: FMain.class:329 FMain0.class:329
msgid "Quit"
msgstr ""
@@ -851,31 +891,31 @@
msgid "File System"
msgstr ""
-#: Step6.class:148
+#: Step6.class:149
msgid "Swap"
msgstr ""
-#: Step6.class:148
+#: Step6.class:149
msgid "Not Used"
msgstr ""
-#: Step6.class:189 Step8.class:74
+#: Step6.class:190 Step8.class:74
msgid "Do not format"
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "You have already selected"
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "as your"
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "partition."
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "Please select only one partition for this purpose"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Mon Mar 23 14:26:32 2009
@@ -14,43 +14,83 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Conf0.class:58
+#: Conf0.class:62
msgid "WARNING:"
msgstr ""
-#: Conf0.class:58
+#: Conf0.class:62
msgid "Selecting this option will bypass your boot manager configuration."
msgstr ""
-#: Conf0.class:58
+#: Conf0.class:62
msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
msgstr ""
-#: Conf0.class:58
+#: Conf0.class:62
msgid "unless you are fully aware of what you are doing."
msgstr ""
-#: Conf0.class:92
+#: Conf0.class:119
msgid "System Bootloader Configuration"
msgstr ""
-#: Conf0.class:110
+#: Conf0.class:137
msgid "Select bootloader to be used"
msgstr ""
-#: Conf0.class:119
+#: Conf0.class:146
msgid "LILO"
msgstr ""
-#: Conf0.class:125
+#: Conf0.class:152
msgid "Grub"
msgstr ""
-#: Conf0.class:130
+#: Conf0.class:157
msgid "Select this option if you want to configure your system boot
manager manually at a later time"
msgstr ""
-#: Conf0.class:132
+#: Conf0.class:159
msgid "None (Experts Only)"
+msgstr ""
+
+#: Conf0.class:167
+msgid "Boot menu options"
+msgstr ""
+
+#: Conf0.class:177
+msgid "Target"
+msgstr ""
+
+#: Conf0.class:185
+msgid "ComboBox1"
+msgstr ""
+
+#: Conf0.class:196
+msgid "Video Resolution"
+msgstr ""
+
+#: Conf0.class:203
+msgid "ComboBox2"
+msgstr ""
+
+#: Conf0.class:215
+msgid "Prompt Time Out"
+msgstr ""
+
+#: Conf0.class:227
+msgid "Seconds"
+msgstr ""
+
+#: Conf0.class:240
+msgid "Boot Default"
+msgstr ""
+
+#: Conf0.class:259
+msgid "OPERATING SYSTEMS DETECTED"
+msgstr ""
+
+#: Conf0.class:270
+msgid "Tab 0"
msgstr ""
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Mon Mar 23 14:26:32 2009
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:254
+#: FMain.class:253
msgid "Process Overview"
msgstr ""
-#: FMain.class:295
+#: FMain.class:294
msgid "Help"
msgstr ""
-#: FMain.class:308
+#: FMain.class:307
msgid "Back"
msgstr ""
-#: FMain.class:319
+#: FMain.class:318
msgid "Next"
msgstr ""
-#: FMain.class:330
+#: FMain.class:329
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Mon Mar 23 14:26:32 2009
@@ -14,23 +14,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:254
+#: FMain0.class:253
msgid "Process Overview"
msgstr ""
-#: FMain0.class:295
+#: FMain0.class:294
msgid "Help"
msgstr ""
-#: FMain0.class:308
+#: FMain0.class:307
msgid "Back"
msgstr ""
-#: FMain0.class:319
+#: FMain0.class:318
msgid "Next"
msgstr ""
-#: FMain0.class:330
+#: FMain0.class:329
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Mon Mar 23 14:26:32 2009
@@ -30,31 +30,31 @@
msgid "File System"
msgstr ""
-#: Step6.class:148
+#: Step6.class:149
msgid "Swap"
msgstr ""
-#: Step6.class:148
+#: Step6.class:149
msgid "Not Used"
msgstr ""
-#: Step6.class:189
+#: Step6.class:190
msgid "Do not format"
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "You have already selected"
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "as your"
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "partition."
msgstr ""
-#: Step6.class:234
+#: Step6.class:235
msgid "Please select only one partition for this purpose"
msgstr ""
|
|
From: <cod...@go...> - 2009-03-23 21:26:13
|
Author: M0...@gm...
Date: Mon Mar 23 14:24:23 2009
New Revision: 521
Modified:
branches/speedy/Conf0.class
branches/speedy/Conf0.form
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/MdlBootMngr.module
branches/speedy/Step6.class
Log:
minor bugfixes.. populated boot manager stage
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Mon Mar 23 14:24:23 2009
@@ -24,7 +24,7 @@
END
PUBLIC SUB StartUp()
-
+ MdlBootMngr.List_Other_Linuxes(ME.TsOSListing)
END
PUBLIC SUB OnExit()
@@ -39,6 +39,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>"
+ .tlSep.Text = "<b>" & tlsep.Text & "</b>"
END WITH
END
@@ -46,6 +47,9 @@
PUBLIC SUB Form_Resize()
ME.HBox2.Width = ME.Frame1.Width - (ME.HBox2.Left * 2)
+ ME.hbox3.Width = ME.Frame2.Width - (ME.HBox3.Left * 2)
+ ME.HBox5.Width = ME.Frame2.Width - (ME.hbox5.Left * 2)
+ ME.HBox6.Width = ME.Width
END
@@ -57,5 +61,11 @@
("You may not be able to start your VectorLinux installation. Do not
choose this option") & "<br>" &
("unless you are fully aware of what you are doing."))
END IF
+
+END
+
+PUBLIC SUB tlLiloTarget_DblClick()
+
+ Balloon("This is a test" & "<br>" & "This is another string"
& "<br><br><br><br><br><br>" & "to see if the baloon has been fixed",
cbLiloTarget)
END
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Mon Mar 23 14:24:23 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,72,47)
+ MoveScaled(0,0,84,67)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
@@ -47,5 +47,98 @@
Text = ("None (Experts Only)")
}
}
+ }
+ { Frame2 Frame
+ MoveScaled(0,14,84,11)
+ Expand = True
+ Text = ("Boot menu options")
+ { HBox3 HBox
+ MoveScaled(1,2,70,3.5)
+ Spacing = 4
+ Padding = 2
+ { tlLiloTarget TextLabel
+ MoveScaled(1,0,16.25,3)
+ AutoResize = True
+ Text = ("Target")
+ Alignment = Align.Left
+ Border = Border.Plain
+ }
+ { cbLiloTarget ComboBox
+ MoveScaled(11,0,16,3)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ { HBox4 HBox
+ MoveScaled(29,1,8,1)
+ AutoResize = True
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(36,0,15,3)
+ AutoResize = True
+ Text = ("Video Resolution")
+ Alignment = Align.Right
+ Border = Border.Plain
+ }
+ { cbVidRes ComboBox
+ MoveScaled(52,0,17,3)
+ Text = ("ComboBox2")
+ }
+ }
+ { HBox5 HBox
+ MoveScaled(1,6,78,3.5)
+ Spacing = 4
+ Padding = 2
+ { tlTimeOUt TextLabel
+ MoveScaled(-1,0,16.25,3)
+ AutoResize = True
+ Text = ("Prompt Time Out")
+ Alignment = Align.Left
+ }
+ { SbTimeOut SpinBox
+ MoveScaled(17,0,8,3)
+ }
+ { TextLabel2 TextLabel
+ MoveScaled(26,0,8,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Seconds")
+ Alignment = Align.Left
+ }
+ { HBox7 HBox
+ MoveScaled(39,1,5,1)
+ Visible = False
+ }
+ { tlBootDef TextLabel
+ MoveScaled(46,0,15,3)
+ Expand = True
+ AutoResize = True
+ Text = ("Boot Default")
+ Alignment = Align.Right
+ }
+ { cbBootDef ComboBox
+ MoveScaled(61,0,17,3)
+ Expand = True
+ Text = ("ComboBox1")
+ }
+ }
+ }
+ { HBox6 HBox
+ MoveScaled(16,25,44,3)
+ Expand = True
+ { tlSep TextLabel
+ MoveScaled(5,0,36,3)
+ Expand = True
+ Text = ("OPERATING SYSTEMS DETECTED")
+ Alignment = Align.Center
+ Border = Border.Etched
+ }
+ }
+ { TsOSListing TabStrip
+ MoveScaled(1,31,70,32)
+ Expand = True
+ Arrangement = Arrange.Row
+ Index = 0
+ Text = ("Tab 0")
+ Index = 0
}
}
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Mon Mar 23 14:24:23 2009
@@ -33,7 +33,6 @@
MoveScaled(1,2,26,35)
Arrangement = Arrange.Vertical
Orientation = Align.Left
- Resizable = False
{ HBox5 HBox
MoveScaled(2,-1,21,3)
{ TextLabel1 TextLabel
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Mon Mar 23 14:24:23 2009
@@ -32,7 +32,6 @@
MoveScaled(1,2,26,35)
Arrangement = Arrange.Vertical
Orientation = Align.Left
- Resizable = False
{ HBox5 HBox
MoveScaled(2,-1,21,3)
{ TextLabel1 TextLabel
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Mon Mar 23 14:24:23 2009
@@ -84,6 +84,14 @@
END
PUBLIC SUB populate_linux_entry(sLinuxRoot AS String, objTabStrip AS
TabStrip)
+ DIM i AS Integer
+ IF sLinuxRoot = ClsGlobal.sRoot THEN ' This is the just installed linux
+ i = 0
+ WITH objTabStrip
+ .Index = i
+ .Text = "VectorLinux"
+ END WITH
+ END IF
END
@@ -110,7 +118,7 @@
IF Len(sOutcome) <= 0 THEN CONTINUE
' will only list the linux if one is present
populate_linux_entry(Trim(sPartList[i]), objTabStrip)
-
+ 'END IF
NEXT
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Mon Mar 23 14:24:23 2009
@@ -124,6 +124,7 @@
'NEXT
' add partition to the gridview
INC ME.gvPartListing.Rows.Count
+ ME.gvPartListing.Rows[irow].Height = 24
ME.gvPartListing[irow, 0].text = Trim(sDisks[i]) &
Trim(sPartNo)
ME.gvPartListing[irow, 1].Text = Trim(sSize)
IF sFs LIKE "linux-swap" THEN
@@ -253,9 +254,8 @@
'IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
- IF LAST.text <> ("Swap") THEN
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
- 'END IF
+ IF LAST.TEXT <> ("Swap") THEN
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
STOP EVENT
RETURN
|
|
From: <cod...@go...> - 2009-03-21 15:29:20
|
Author: M0...@gm...
Date: Sat Mar 21 08:27:24 2009
New Revision: 520
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step6.pot
branches/speedy/MdlBootMngr.module
branches/speedy/Step6.class
Log:
Fixed bug in swap partition selection
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Sat Mar 21 08:27:24 2009
@@ -582,11 +582,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:507 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:507 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:510 Step7a.class:143
msgid "No"
msgstr ""
@@ -879,7 +879,7 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:402
+#: Step6.class:405
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Sat Mar 21 08:27:24 2009
@@ -58,15 +58,15 @@
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:402
+#: Step6.class:405
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:507
+#: Step6.class:510
msgid "Yes"
msgstr ""
-#: Step6.class:507
+#: Step6.class:510
msgid "No"
msgstr ""
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Sat Mar 21 08:27:24 2009
@@ -110,7 +110,7 @@
IF Len(sOutcome) <= 0 THEN CONTINUE
' will only list the linux if one is present
populate_linux_entry(Trim(sPartList[i]), objTabStrip)
- END IF
+
NEXT
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Sat Mar 21 08:27:24 2009
@@ -251,12 +251,15 @@
y = LAST.y
- IF LAST.text = ("Swap") THEN RETURN
+ 'IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ IF LAST.text <> ("Swap") THEN
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ 'END IF
LAST.text = ("Not Used")
STOP EVENT
RETURN
+ END IF
END IF
END IF
|
|
From: <cod...@go...> - 2009-03-20 20:59:38
|
Author: M0...@gm...
Date: Fri Mar 20 13:58:07 2009
New Revision: 519
Added:
branches/speedy/.lang/MdlBootMngr.pot
branches/speedy/MdlBootMngr.module
Modified:
branches/speedy/Conf0.form
Log:
Began work in boot manager department
Added: branches/speedy/.lang/MdlBootMngr.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/MdlBootMngr.pot Fri Mar 20 13:58:07 2009
@@ -0,0 +1,16 @@
+# /home/vluser/devel/speedy/MdlBootMngr.module
+# Generated by Gambas compiler
+
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002-11-01
04:27+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
Modified: branches/speedy/Conf0.form
==============================================================================
--- branches/speedy/Conf0.form (original)
+++ branches/speedy/Conf0.form Fri Mar 20 13:58:07 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,72,44)
+ MoveScaled(0,0,72,47)
Text = ("")
Arrangement = Arrange.Row
Padding = 2
Added: branches/speedy/MdlBootMngr.module
==============================================================================
--- (empty file)
+++ branches/speedy/MdlBootMngr.module Fri Mar 20 13:58:07 2009
@@ -0,0 +1,123 @@
+' Gambas module file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+'====================================================================================================
+
+PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String
+ DIM sRes AS String
+
+ IF Exist(sMountedLocation &/ "etc/vector-version") THEN
+ sres = "VectorLinux"
+ ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN
+ sres = "Slackware"
+ ELSE IF Exist(sMountedLocation &/ "etc/Suse-release") OR
Exist(sMountedLocation &/ "UnitiedLinux-release") THEN
+ sres = "SuSE"
+ ELSE IF Exist(sMountedLocation &/ "etc/gentoo-release") THEN
+ sres = "Gentoo"
+ ELSE IF Exist(sMountedLocation &/ "etc/debian_version") THEN
+ SHELL "grep -m 1 cdrom " & sMountedLocation &/ "etc" &/ "apt"
&/ "sources.list | cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sres
+ IF Len(Trim(sres)) >= 0 THEN
+ sres = Trim(Replace(sres, " ", "_"))
+ ELSE
+ sres = "Debian"
+ END IF
+ ELSE IF Exist(sMountedLocation &/ "etc/mandrake-release") THEN ' this
should be mandriva now
+ sres = "Mandrake"
+ ELSE IF Exist(sMountedLocation &/ "etc/redhat-release") THEN
+ sres = "RedHat"
+ ELSE IF Exist(sMountedLocation &/ "etc/fedora-release") THEN
+ sres = "Fedora"
+ ELSE
+ sres = "Linux"
+
+ END IF
+
+ RETURN sres
+
+END
+
+
+PUBLIC FUNCTION Find_Linux(sPartition AS String) AS String
+ ' None: No linux found
+ ' Linux: Unknown linux found
+ ' DISTRO_NAME: DISTRO_NAME found
+ ' Fail: Error running function
+
+DIM sAddr AS String = Right(sPartition, Len(sPartition) -
RInStr(sPartition, "/"))
+DIM sTempTarget AS String = "/mnt" &/ sAddr
+DIM sres AS String
+
+
+ SHELL "mkdir -p /mnt" &/ sAddr & Space(1) & "2>/dev/null" WAIT
+ SHELL "mount " & sPartition & Space(1) & "/mnt" &/ sAddr & Space(1)
& "2>/dev/null" WAIT
+
+ ' perform test to see if there is a linux partition here
+ IF IsDir(sTempTarget &/ "boot") THEN ' this feels like linux here
+ IF IsDir(sTempTarget &/ "etc") THEN ' this is definitely linux
+ ' ============== IDENTIFY LINUX DISTRO ====================
+ sres = ID_LINUX(sTempTarget)
+
+ END IF
+ END IF
+ IF Len(Trim(sres)) > 0 THEN
+ sRes = Trim(sRes)
+ ELSE
+ sRes = "None"
+ END IF
+ RETURN sres
+
+
+
+END
+PUBLIC SUB populate_linux_entry(sLinuxRoot AS String, objTabStrip AS
TabStrip)
+
+
+
+END
+
+
+PUBLIC SUB List_Other_Linuxes(objTabStrip AS TabStrip) ' tell me where you
want the results.
+
+ DIM sDump, sPartitions, sPart AS String
+ DIM sPartList AS String[]
+ DIM i AS Integer
+ DIM sOutcome AS String
+
+
+
+ ' First, and foremost, we will ist the recently isntalled VectorLinux
+ populate_linux_entry(ClsGlobal.sRoot, objTabStrip) ' This will list
the newly isntall VL OS
+ ' Now list all other linuxes
=================================================
+ SHELL "probepart | grep \"^/dev\" | grep -vi swap | grep -i linux |
tr -s \' \' | cut -f 1 -d \' \'" TO sDump
+ sDump = Trim(sDump)
+ IF Len(sDump) <= 0 THEN RETURN ' nothing found, VL is the only
distro in this box ... YAY!.
+ sPartList = Split(sDump, gb.NewLine)
+ FOR i = 0 TO sPartList.Max
+ sOutcome = ME.Find_Linux(Trim(sPartList[i]))
+ IF Len(sOutcome) <= 0 THEN CONTINUE
+ ' will only list the linux if one is present
+ populate_linux_entry(Trim(sPartList[i]), objTabStrip)
+ END IF
+
+ NEXT
+
+
+ ' now list all other Windows os's
============================================
+
+
+END
+
+
|
|
From: <cod...@go...> - 2009-03-20 19:39:22
|
Author: M0...@gm...
Date: Fri Mar 20 11:30:20 2009
New Revision: 518
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step6.pot
branches/speedy/Step6.class
Log:
Fixed bug in partition listing caused by extended partitions
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Mar 20 11:30:20 2009
@@ -582,11 +582,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:186 Step6.class:503 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:507 Step7a.class:143
msgid "Yes"
msgstr ""
-#: Step3a1a.class:186 Step6.class:503 Step7a.class:143
+#: Step3a1a.class:186 Step6.class:507 Step7a.class:143
msgid "No"
msgstr ""
@@ -851,35 +851,35 @@
msgid "File System"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Swap"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Not Used"
msgstr ""
-#: Step6.class:185 Step8.class:74
+#: Step6.class:189 Step8.class:74
msgid "Do not format"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "You have already selected"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "as your"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "partition."
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:398
+#: Step6.class:402
msgid "Select which partitions to use for installation"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Mar 20 11:30:20 2009
@@ -30,43 +30,43 @@
msgid "File System"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Swap"
msgstr ""
-#: Step6.class:144
+#: Step6.class:148
msgid "Not Used"
msgstr ""
-#: Step6.class:185
+#: Step6.class:189
msgid "Do not format"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "You have already selected"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "as your"
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "partition."
msgstr ""
-#: Step6.class:230
+#: Step6.class:234
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:398
+#: Step6.class:402
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:503
+#: Step6.class:507
msgid "Yes"
msgstr ""
-#: Step6.class:503
+#: Step6.class:507
msgid "No"
msgstr ""
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Mar 20 11:30:20 2009
@@ -101,19 +101,23 @@
DIM sDisks, sPartitions, sPartLine AS String[]
DIM sDisk, sPartNo, sSize, sFs AS String
DIM i, ii, irow AS Integer
+ DIM hproc AS Process
objFS = NEW Object[]
objMntPoints = NEW Object[]
INC ME.gvPartListing.Rows.Count
irow = 2
- SHELL "probedisk | grep -v cdrom | cut -f 1 -d \'|\'" TO sDump ' This
gets the list of present hard drisks
+ SHELL "probedisk | grep -vi rom | cut -f 1 -d \'|\'" TO sDump ' This
gets the list of present hard drisks
sDisks = Split(Trim(sDump), "\n")
FOR i = 0 TO sDisks.Count - 1
- SHELL "parted " & Trim(sDisks[i]) & " print | grep \"^ [0-9]\" |
tr -s \' \',\"\"" TO sDump
+ 'hproc = SHELL "parted " & Trim(sDisks[i]) & " print | grep \"^
[0-9]\" | tr -s \' \',\"\"" ' just to test'
+ 'IF hproc.Value > 0 THEN CONTINUE
+ SHELL "parted " & Trim(sDisks[i]) & " print | grep \"^
[0-9]\" | grep -vi \"extended\" | tr -s \' \',\"\"" TO sDump
spartitions = Split(Trim(sdump), "\n")
FOR ii = 0 TO spartitions.count - 1
sPartLine = Split(Trim(spartitions[ii]), " ")
+ 'Message(spartitions[ii])
sPartNo = sPartLine[0]
sSize = sPartLine[3]
sFs = sPartLine[5]
@@ -247,7 +251,7 @@
y = LAST.y
-
+ IF LAST.text = ("Swap") THEN RETURN
IF LAST.text <> ("Not Used") THEN
IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
|
14 messages has been excluded from this view by a project administrator.
