Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r542 - - Cleaned up unused code off MdlBootMngr
|
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"
|
