Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r553 - - Modified installation form to hide credits.
|
From: <cod...@go...> - 2009-05-21 19:09:54
|
Author: M0...@gm...
Date: Thu May 21 12:08:44 2009
New Revision: 553
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Conf0.pot
branches/speedy/.lang/FDone.pot
branches/speedy/.lang/MdlAutoPartition.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/MdlStartUp.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/Step3a3a.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step9.pot
branches/speedy/.project
branches/speedy/Conf0.class
branches/speedy/FDone.class
branches/speedy/MdlAutoPartition.module
branches/speedy/MdlBootMngr.module
branches/speedy/MdlMain.module
branches/speedy/MdlStartUp.module
branches/speedy/Step3.class
branches/speedy/Step3.form
branches/speedy/Step3a.class
branches/speedy/Step3a1.class
branches/speedy/Step3a1a.class
branches/speedy/Step3a2.class
branches/speedy/Step3a3a.class
branches/speedy/Step5.class
branches/speedy/Step7a.class
branches/speedy/Step7b.class
branches/speedy/Step9.class
branches/speedy/Step9.form
branches/speedy/vinstall-ng.gambas
Log:
- Modified installation form to hide credits.
- Removed hard coded distro name
- Updated binary.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu May 21 12:08:44 2009
@@ -64,9 +64,11 @@
msgstr ""
#: Conf0.class:359
-msgid ""
-"You may not be able to start your VectorLinux installation. Do not
choose "
-"this option"
+msgid "You may not be able to start your"
+msgstr ""
+
+#: Conf0.class:359
+msgid "installation. Do not choose this option"
msgstr ""
#: Conf0.class:359
@@ -242,7 +244,7 @@
msgid "When finished, Click"
msgstr ""
-#: Conf3.class:47 MdlMain.module:572 Step3a1a.class:177 Step3a2.class:359
+#: Conf3.class:47 MdlMain.module:576 Step3a1a.class:177 Step3a2.class:359
#: Step3a3a.class:72 Step5.class:177
msgid "to continue"
msgstr ""
@@ -509,7 +511,7 @@
msgstr ""
#: FDone.class:31
-msgid "VectorLinux has been installed in your system."
+msgid "has been installed in your system."
msgstr ""
#: FDone.class:31
@@ -518,7 +520,8 @@
"configuration."
msgstr ""
-#: FDone.class:31 Step1.class:98 Step2.class:198 Step5.class:177
+#: FDone.class:31 Step1.class:98 Step2.class:198 Step3a3a.class:72
+#: Step5.class:177
msgid "Click"
msgstr ""
@@ -589,7 +592,7 @@
msgstr ""
#: MdlAutoPartition.module:560
-msgid "Total space for VectorLinux"
+msgid "Total space for"
msgstr ""
#: MdlAutoPartition.module:617
@@ -672,59 +675,59 @@
msgid "Problem while installing"
msgstr ""
-#: MdlMain.module:483
+#: MdlMain.module:487
msgid "Preparing system partitions"
msgstr ""
-#: MdlMain.module:485
+#: MdlMain.module:489
msgid "An error occurred while preparing partitions. Unable to continue"
msgstr ""
-#: MdlMain.module:493
+#: MdlMain.module:497
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:541
+#: MdlMain.module:545
msgid "Unable to install contents of"
msgstr ""
-#: MdlMain.module:541
+#: MdlMain.module:545
msgid "Cannot continue"
msgstr ""
-#: MdlMain.module:572
+#: MdlMain.module:576
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:574
+#: MdlMain.module:578
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:574
+#: MdlMain.module:578
msgid "to continue."
msgstr ""
-#: MdlMain.module:576
+#: MdlMain.module:580
msgid "Error while installing kernels and initrds"
msgstr ""
-#: MdlMain.module:599
+#: MdlMain.module:603
msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:599
+#: MdlMain.module:603
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:682
+#: MdlMain.module:686
msgid "Installing"
msgstr ""
-#: MdlMain.module:682
+#: MdlMain.module:686
msgid "Part of"
msgstr ""
-#: MdlMain.module:684
+#: MdlMain.module:688
msgid "Error installing"
msgstr ""
@@ -748,7 +751,7 @@
msgid "Software Selection"
msgstr ""
-#: MdlStartUp.module:48
+#: MdlStartUp.module:48 Step7a.class:27 Step7b.class:23
msgid "Installation"
msgstr ""
@@ -757,7 +760,7 @@
msgstr ""
#: MdlStartUp.module:50
-msgid "Install VectorLinux"
+msgid "Copy Operating System Files"
msgstr ""
#: MdlStartUp.module:51
@@ -1026,29 +1029,37 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:176
-msgid "Automatic"
-msgstr ""
-
-#: Step3.class:186
+#: Step3.class:32
msgid ""
"Automatically resize your partitions and / or create the correct disk
space "
-"for VectorLinux."
+"for"
+msgstr ""
+
+#: Step3.class:33 Step3a2.class:25
+msgid "Install"
msgstr ""
-#: Step3.class:193
+#: Step3.class:33
+msgid "to existing partitions on my hard drive"
+msgstr ""
+
+#: Step3.class:178
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:195
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:203
+#: Step3.class:205
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:210
+#: Step3.class:212
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:220
+#: Step3.class:222
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
@@ -1061,7 +1072,11 @@
msgstr ""
#: Step3a.class:22
-msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgid "Allow"
+msgstr ""
+
+#: Step3a.class:22
+msgid "to use an entire hard disk in your system."
msgstr ""
#: Step3a.class:22
@@ -1069,8 +1084,11 @@
msgstr ""
#: Step3a.class:24
-msgid ""
-"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgid "Locate free (unpartitioned) space on hard disk and install"
+msgstr ""
+
+#: Step3a.class:24
+msgid "there."
msgstr ""
#: Step3a.class:24
@@ -1078,9 +1096,11 @@
msgstr ""
#: Step3a.class:26
-msgid ""
-"Resize your existing partitions to make room for a VectorLinux partition "
-"scheme"
+msgid "Resize your existing partitions to make room for a"
+msgstr ""
+
+#: Step3a.class:26
+msgid "partition scheme"
msgstr ""
#: Step3a.class:26
@@ -1100,7 +1120,7 @@
msgstr ""
#: Step3a1.class:20
-msgid "Use Entire Hard Disk for VectorLinux"
+msgid "Use Entire Hard Disk for"
msgstr ""
#: Step3a1.class:22
@@ -1131,12 +1151,15 @@
msgstr ""
#: Step3a1a.class:82
-msgid "Vectorlinux has detected an existing swap partition in your system."
+msgid "has detected an existing swap partition in your system."
msgstr ""
#: Step3a1a.class:82
-msgid ""
-"Would you like to let VectorLinux use this partition or create a new one?"
+msgid "Would you like to let"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "use this partition or create a new one?"
msgstr ""
#: Step3a1a.class:82
@@ -1184,7 +1207,7 @@
msgstr ""
#: Step3a2.class:25
-msgid "Install VectorLinux to free space on disk"
+msgid "to free space on disk"
msgstr ""
#: Step3a2.class:45
@@ -1208,9 +1231,7 @@
msgstr ""
#: Step3a2.class:143
-msgid ""
-"Select the location on your hard drive where you would like to install "
-"VectorLinux"
+msgid "Select the location on your hard drive where you would like to
install"
msgstr ""
#: Step3a2.class:192
@@ -1278,7 +1299,11 @@
msgstr ""
#: Step3a3a.class:26
-msgid "to make room for your vectorlinux installation."
+msgid "to make room for your"
+msgstr ""
+
+#: Step3a3a.class:26
+msgid "installation."
msgstr ""
#: Step3a3a.class:26
@@ -1297,13 +1322,15 @@
msgstr ""
#: Step3a3a.class:67
-msgid ""
-"Shrinking partitions and creating new environment for VectorLinux ...
Please "
-"Wait"
+msgid "Shrinking partitions and creating new environment for"
+msgstr ""
+
+#: Step3a3a.class:67
+msgid "Please Wait"
msgstr ""
#: Step3a3a.class:72
-msgid "Partitions are ready for VectorLinux. Click"
+msgid "Partitions are ready for"
msgstr ""
#: Step3a3a.class:133
@@ -1342,9 +1369,11 @@
msgstr ""
#: Step5.class:103
-msgid ""
-"The VectorLinux installer is unable to embed the gparted partitioning "
-"utility."
+msgid "The"
+msgstr ""
+
+#: Step5.class:103
+msgid "installer is unable to embed the gparted partitioning utility."
msgstr ""
#: Step5.class:103
@@ -1357,9 +1386,7 @@
msgstr ""
#: Step5.class:125
-msgid ""
-"VectorLinux is about to launch the GParted partitioning tool. Use this "
-"utility to"
+msgid "is about to launch the GParted partitioning tool. Use this utility
to"
msgstr ""
#: Step5.class:125
@@ -1505,7 +1532,7 @@
msgstr ""
#: Step7a.class:27 Step7b.class:23
-msgid "Customize Your VectorLinux Installation"
+msgid "Customize Your"
msgstr ""
#: Step7a.class:34
@@ -1634,14 +1661,14 @@
msgid "Something went wrong during installation. Please try again"
msgstr ""
-#: Step9.class:171
+#: Step9.class:179
msgid "Installation in progress"
msgstr ""
-#: Step9.class:254
+#: Step9.class:262
msgid "Install Process"
msgstr ""
-#: Step9.class:270
+#: Step9.class:279
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.lang/Conf0.pot
==============================================================================
--- branches/speedy/.lang/Conf0.pot (original)
+++ branches/speedy/.lang/Conf0.pot Thu May 21 12:08:44 2009
@@ -63,7 +63,11 @@
msgstr ""
#: Conf0.class:359
-msgid "You may not be able to start your VectorLinux installation. Do not
choose this option"
+msgid "You may not be able to start your"
+msgstr ""
+
+#: Conf0.class:359
+msgid "installation. Do not choose this option"
msgstr ""
#: Conf0.class:359
Modified: branches/speedy/.lang/FDone.pot
==============================================================================
--- branches/speedy/.lang/FDone.pot (original)
+++ branches/speedy/.lang/FDone.pot Thu May 21 12:08:44 2009
@@ -19,7 +19,7 @@
msgstr ""
#: FDone.class:31
-msgid "VectorLinux has been installed in your system."
+msgid "has been installed in your system."
msgstr ""
#: FDone.class:31
Modified: branches/speedy/.lang/MdlAutoPartition.pot
==============================================================================
--- branches/speedy/.lang/MdlAutoPartition.pot (original)
+++ branches/speedy/.lang/MdlAutoPartition.pot Thu May 21 12:08:44 2009
@@ -43,7 +43,7 @@
msgstr ""
#: MdlAutoPartition.module:560
-msgid "Total space for VectorLinux"
+msgid "Total space for"
msgstr ""
#: MdlAutoPartition.module:617
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Thu May 21 12:08:44 2009
@@ -42,63 +42,63 @@
msgid "Problem while installing"
msgstr ""
-#: MdlMain.module:483
+#: MdlMain.module:487
msgid "Preparing system partitions"
msgstr ""
-#: MdlMain.module:485
+#: MdlMain.module:489
msgid "An error occurred while preparing partitions. Unable to continue"
msgstr ""
-#: MdlMain.module:493
+#: MdlMain.module:497
msgid "Error during installation of required software. Unable to continue"
msgstr ""
-#: MdlMain.module:541
+#: MdlMain.module:545
msgid "Unable to install contents of"
msgstr ""
-#: MdlMain.module:541
+#: MdlMain.module:545
msgid "Cannot continue"
msgstr ""
-#: MdlMain.module:572
+#: MdlMain.module:576
msgid "Installation is complete. Click"
msgstr ""
-#: MdlMain.module:572
+#: MdlMain.module:576
msgid "to continue"
msgstr ""
-#: MdlMain.module:574
+#: MdlMain.module:578
msgid "Installation complete... Click"
msgstr ""
-#: MdlMain.module:574
+#: MdlMain.module:578
msgid "to continue."
msgstr ""
-#: MdlMain.module:576
+#: MdlMain.module:580
msgid "Error while installing kernels and initrds"
msgstr ""
-#: MdlMain.module:599
+#: MdlMain.module:603
msgid "Unable to install the components of"
msgstr ""
-#: MdlMain.module:599
+#: MdlMain.module:603
msgid "Unable to continue."
msgstr ""
-#: MdlMain.module:682
+#: MdlMain.module:686
msgid "Installing"
msgstr ""
-#: MdlMain.module:682
+#: MdlMain.module:686
msgid "Part of"
msgstr ""
-#: MdlMain.module:684
+#: MdlMain.module:688
msgid "Error installing"
msgstr ""
Modified: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- branches/speedy/.lang/MdlStartUp.pot (original)
+++ branches/speedy/.lang/MdlStartUp.pot Thu May 21 12:08:44 2009
@@ -43,7 +43,7 @@
msgstr ""
#: MdlStartUp.module:50
-msgid "Install VectorLinux"
+msgid "Copy Operating System Files"
msgstr ""
#: MdlStartUp.module:51
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Thu May 21 12:08:44 2009
@@ -22,27 +22,35 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:176
-msgid "Automatic"
+#: Step3.class:32
+msgid "Automatically resize your partitions and / or create the correct
disk space for"
+msgstr ""
+
+#: Step3.class:33
+msgid "Install"
msgstr ""
-#: Step3.class:186
-msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
+#: Step3.class:33
+msgid "to existing partitions on my hard drive"
+msgstr ""
+
+#: Step3.class:178
+msgid "Automatic"
msgstr ""
-#: Step3.class:193
+#: Step3.class:195
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:203
+#: Step3.class:205
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:210
+#: Step3.class:212
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:220
+#: Step3.class:222
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Thu May 21 12:08:44 2009
@@ -23,7 +23,11 @@
msgstr ""
#: Step3a.class:22
-msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgid "Allow"
+msgstr ""
+
+#: Step3a.class:22
+msgid "to use an entire hard disk in your system."
msgstr ""
#: Step3a.class:22
@@ -31,7 +35,11 @@
msgstr ""
#: Step3a.class:24
-msgid "Locate free (unpartitioned) space on hard disk and install
VectorLinux there."
+msgid "Locate free (unpartitioned) space on hard disk and install"
+msgstr ""
+
+#: Step3a.class:24
+msgid "there."
msgstr ""
#: Step3a.class:24
@@ -39,7 +47,11 @@
msgstr ""
#: Step3a.class:26
-msgid "Resize your existing partitions to make room for a VectorLinux
partition scheme"
+msgid "Resize your existing partitions to make room for a"
+msgstr ""
+
+#: Step3a.class:26
+msgid "partition scheme"
msgstr ""
#: Step3a.class:26
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Thu May 21 12:08:44 2009
@@ -15,7 +15,7 @@
"Content-Transfer-Encoding: 8bit\n"
#: Step3a1.class:20
-msgid "Use Entire Hard Disk for VectorLinux"
+msgid "Use Entire Hard Disk for"
msgstr ""
#: Step3a1.class:22
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Thu May 21 12:08:44 2009
@@ -31,11 +31,15 @@
msgstr ""
#: Step3a1a.class:82
-msgid "Vectorlinux has detected an existing swap partition in your system."
+msgid "has detected an existing swap partition in your system."
msgstr ""
#: Step3a1a.class:82
-msgid "Would you like to let VectorLinux use this partition or create a
new one?"
+msgid "Would you like to let"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "use this partition or create a new one?"
msgstr ""
#: Step3a1a.class:82
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Thu May 21 12:08:44 2009
@@ -15,7 +15,11 @@
"Content-Transfer-Encoding: 8bit\n"
#: Step3a2.class:25
-msgid "Install VectorLinux to free space on disk"
+msgid "Install"
+msgstr ""
+
+#: Step3a2.class:25
+msgid "to free space on disk"
msgstr ""
#: Step3a2.class:45
@@ -39,7 +43,7 @@
msgstr ""
#: Step3a2.class:143
-msgid "Select the location on your hard drive where you would like to
install VectorLinux"
+msgid "Select the location on your hard drive where you would like to
install"
msgstr ""
#: Step3a2.class:192
Modified: branches/speedy/.lang/Step3a3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a3a.pot (original)
+++ branches/speedy/.lang/Step3a3a.pot Thu May 21 12:08:44 2009
@@ -19,7 +19,11 @@
msgstr ""
#: Step3a3a.class:26
-msgid "to make room for your vectorlinux installation."
+msgid "to make room for your"
+msgstr ""
+
+#: Step3a3a.class:26
+msgid "installation."
msgstr ""
#: Step3a3a.class:26
@@ -35,11 +39,19 @@
msgstr ""
#: Step3a3a.class:67
-msgid "Shrinking partitions and creating new environment for
VectorLinux ... Please Wait"
+msgid "Shrinking partitions and creating new environment for"
+msgstr ""
+
+#: Step3a3a.class:67
+msgid "Please Wait"
+msgstr ""
+
+#: Step3a3a.class:72
+msgid "Partitions are ready for"
msgstr ""
#: Step3a3a.class:72
-msgid "Partitions are ready for VectorLinux. Click"
+msgid "Click"
msgstr ""
#: Step3a3a.class:72
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Thu May 21 12:08:44 2009
@@ -35,7 +35,11 @@
msgstr ""
#: Step5.class:103
-msgid "The VectorLinux installer is unable to embed the gparted
partitioning utility."
+msgid "The"
+msgstr ""
+
+#: Step5.class:103
+msgid "installer is unable to embed the gparted partitioning utility."
msgstr ""
#: Step5.class:103
@@ -47,7 +51,7 @@
msgstr ""
#: Step5.class:125
-msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
+msgid "is about to launch the GParted partitioning tool. Use this utility
to"
msgstr ""
#: Step5.class:125
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Thu May 21 12:08:44 2009
@@ -15,7 +15,11 @@
"Content-Transfer-Encoding: 8bit\n"
#: Step7a.class:27
-msgid "Customize Your VectorLinux Installation"
+msgid "Customize Your"
+msgstr ""
+
+#: Step7a.class:27
+msgid "Installation"
msgstr ""
#: Step7a.class:34
Modified: branches/speedy/.lang/Step7b.pot
==============================================================================
--- branches/speedy/.lang/Step7b.pot (original)
+++ branches/speedy/.lang/Step7b.pot Thu May 21 12:08:44 2009
@@ -15,7 +15,11 @@
"Content-Transfer-Encoding: 8bit\n"
#: Step7b.class:23
-msgid "Customize Your VectorLinux Installation"
+msgid "Customize Your"
+msgstr ""
+
+#: Step7b.class:23
+msgid "Installation"
msgstr ""
#: Step7b.class:27
Modified: branches/speedy/.lang/Step9.pot
==============================================================================
--- branches/speedy/.lang/Step9.pot (original)
+++ branches/speedy/.lang/Step9.pot Thu May 21 12:08:44 2009
@@ -34,15 +34,15 @@
msgid "Something went wrong during installation. Please try again"
msgstr ""
-#: Step9.class:171
+#: Step9.class:179
msgid "Installation in progress"
msgstr ""
-#: Step9.class:254
+#: Step9.class:262
msgid "Install Process"
msgstr ""
-#: Step9.class:270
+#: Step9.class:279
msgid "The development Crew"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Thu May 21 12:08:44 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.12
Title=VectorLinux Installer
Startup=MdlStartUp
-Version=0.0.5
+Version=0.0.8
Library=gb.gtk
Library=gb.form
Library=gb.desktop
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Thu May 21 12:08:44 2009
@@ -39,7 +39,7 @@
i = 0
WITH objTabStrip
.Index = i
- .Text = "VectorLinux"
+ .Text = ClsGlobal.sDistroName
END WITH
ELSE
i = objTabStrip.Count - 1
@@ -355,7 +355,7 @@
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>" &
+ ("You may not be able to start your") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ("installation. Do not choose this
option") & "<br>" &
("unless you are fully aware of what you are doing."))
END IF
Timer1.Enabled = FALSE
Modified: branches/speedy/FDone.class
==============================================================================
--- branches/speedy/FDone.class (original)
+++ branches/speedy/FDone.class Thu May 21 12:08:44 2009
@@ -26,7 +26,7 @@
WITH ME
.tlbanner.Text = "<h2>" & tlbanner.Text & "</h2>"
- .TextLabel1.Text = ("VectorLinux has been installed in your system.")
& "<br><br>" &
+ .TextLabel1.Text = ClsGlobal.sDistroName & Space(1) & ("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.")
Modified: branches/speedy/MdlAutoPartition.module
==============================================================================
--- branches/speedy/MdlAutoPartition.module (original)
+++ branches/speedy/MdlAutoPartition.module Thu May 21 12:08:44 2009
@@ -44,7 +44,7 @@
lMBAmmountToUseForVL = ClsGlobal.lTotalMBforVL
- PRINT " --- -> Preparing to allocate " & lMBAmmountToUseForVL & " MB of
space for VectorLinux from " & sPartition & " <- ---"
+ PRINT " --- -> Preparing to allocate " & lMBAmmountToUseForVL & " MB of
space for" & Space(1) & ClsGlobal.sDistroName & Space(1) & "from " &
sPartition & " <- ---"
WAIT 1
iPart = Right(sPartition, Len(sPartition) - Len("/dev/hda"))
IF iPart < 10 THEN
@@ -557,7 +557,7 @@
tl = NEW TextLabel(hb)
WITH tl
- .Text = ("Total space for VectorLinux") & ":" & Space(1)
+ .Text = ("Total space for") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ":" & Space(1)
.Height = 21
'.Width = .Parent.Width * 0.5
.Alignment = Align.Left
@@ -662,7 +662,7 @@
FOR EACH tl IN objTls
IF tl.Tag = LAST.tag THEN
- tl.Text = ("Total space for VectorLinux") & ":" & Space(1) & (100
- LAST.Value) & "%" & Space(1) & "-" & " ( " & sAllocated & " MB )"
+ tl.Text = ("Total space for") & ClsGlobal.sDistroName & ":" &
Space(1) & (100 - LAST.Value) & "%" & Space(1) & "-" & " ( " & sAllocated
& " MB )"
'lMBAmmountToUseForVL = sAllocated
ClsGlobal.lTotalMBforVL = sAllocated
END IF
@@ -677,7 +677,7 @@
NEXT
IF sAllocated <= (4 * 1024) THEN
- Message("We need at least 4GB for vectorlinux")
+ Message("We need at least 4GB for" & Space(1) & ClsGlobal.sDistroName)
STOP EVENT
RETURN
END IF
Modified: branches/speedy/MdlBootMngr.module
==============================================================================
--- branches/speedy/MdlBootMngr.module (original)
+++ branches/speedy/MdlBootMngr.module Thu May 21 12:08:44 2009
@@ -62,7 +62,7 @@
ELSE IF InStr(sDump, "Deluxe") THEN
sRes = "VL-SOHO DLX"
ELSE
- sRes = "VectorLinux"
+ sRes = ClsGlobal.sDistroName
END IF
'IF InStr sDump LIKE "Light" THEN
@@ -207,7 +207,7 @@
iTimeOut = Conf0.SbTimeOut.Value * 10
sOutput = "# LILO Configuration File \n" &
- "# Generated by the VectorLinux Installer \n \n" &
+ "# Generated by the " & ClsGlobal.sDistroName & " Installer \n \n" &
"# Begin lilo global configuration \n \n" &
"boot = " & sTarget & "\n" &
"default = " & sDefBoot & "\n" &
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Thu May 21 12:08:44 2009
@@ -416,6 +416,10 @@
DEBUG "Error copying initrd"
RETURN 1
END IF
+
+ ' Activate credits now
+ ' MdlMain.CREATE_CREDIT_LABELS(Step9.svInstallProc)
+ ' Step9.tmScroll.Enabled = TRUE
@@ -709,7 +713,7 @@
'$hproc = EXEC ["/sbin/installpkg ", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] WAIT
'$hproc = SHELL "/sbin/installpkg -R " & ClsGlobal.sTargetPath &
Space(1) & sFullPkgPath WAIT 'TO sBuff
'$hproc = EXEC ["/sbin/installpkg", "-q", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] FOR READ 'WAIT
- $hproc = EXEC ["/sbin/installpkg", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] WAIT FOR OUTPUT
+ $hproc = EXEC ["/sbin/installpkg", "-q", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] WAIT FOR OUTPUT
IF $hproc.Value > 0 THEN
DEBUG sFullPkgPath & Space(1) & "failed to install"
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Thu May 21 12:08:44 2009
@@ -47,7 +47,7 @@
ClsGlobal.fRunningMainForm.listview1.add("Step3", ("Software
Selection"), pTodo)
ClsGlobal.fRunningMainForm.listview1.add("Cat1", Space(3) &
("Installation"), pCategory)
ClsGlobal.fRunningMainForm.listview1.add("Step4", ("Installation
Summary"), pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step5", ("Install
VectorLinux"), pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step5", ("Copy Operating
System Files"), pTodo) '("Install") & Space(1) & ClsGlobal.sDistroName,
pToDo)
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)
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Thu May 21 12:08:44 2009
@@ -29,6 +29,8 @@
ME.tlbanner.Alignment = Align.Center
ME.tlbanner.Alignment = Align.Normal
ME.tlPartHelp.Text = ("Select the partitioning method you would like to
use")
+ ME.tlautopart.Text = ("Automatically resize your partitions and / or
create the correct disk space for") & Space(1) & ClsGlobal.sDistroName
+ ME.TextLabel1.Text = ("Install") & Space(1) & ClsGlobal.sDistroName &
Space(1) & ("to existing partitions on my hard drive")
FMain.btNext.Enabled = TRUE
FMain0.btNext.Enabled = TRUE
Modified: branches/speedy/Step3.form
==============================================================================
--- branches/speedy/Step3.form (original)
+++ branches/speedy/Step3.form Thu May 21 12:08:44 2009
@@ -50,7 +50,7 @@
{ tlautopart TextLabel
MoveScaled(4,6,55,4)
Expand = True
- Text = ("Automatically resize your partitions and / or create the
correct disk space for VectorLinux.")
+ Text = ("")
}
{ rbCustomPart RadioButton rbGroup
Name = "rbCustomPart"
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Thu May 21 12:08:44 2009
@@ -18,11 +18,11 @@
ME.tlbanner.Text = "<h2>" & ("Automatic Partitioning Options") & "</h2>"
ME.tlActionExp.Text = ("Select one of the following options")
- ME.tlEntireDisc.Text = ("Allow VectorLinux to use an entire hard disk in
your system.") & "<br>" &
+ ME.tlEntireDisc.Text = ("Allow") & Space(1) & ClsGlobal.sDistroName &
Space(1) & ("to use an entire hard disk in your system.") & "<br>" &
"<b>" & ("This option will wipe out any data on the disk you select.")
& "</b>"
- ME.tlFreeSpace.Text = ("Locate free (unpartitioned) space on hard disk
and install VectorLinux there.") & "<br>" &
+ ME.tlFreeSpace.Text = ("Locate free (unpartitioned) space on hard disk
and install") & Space(1) & ClsGlobal.sDistroName & Space(1) & ("there.")
& "<br>" &
"<i>" & ("This option will not harm any data on your hard drive")
& "</i>"
- ME.tlFreeSpace2.Text = ("Resize your existing partitions to make room
for a VectorLinux partition scheme") & "<br>" &
+ ME.tlFreeSpace2.Text = ("Resize your existing partitions to make room
for a") & Space(1) & ClsGlobal.sDistroName & Space(1) & ("partition
scheme") & "<br>" &
"<i>" & ("This option will not harm any existing data on your hard
drive") & "</i>"
Modified: branches/speedy/Step3a1.class
==============================================================================
--- branches/speedy/Step3a1.class (original)
+++ branches/speedy/Step3a1.class Thu May 21 12:08:44 2009
@@ -17,7 +17,7 @@
PUBLIC objPosTargets AS Object[]
PUBLIC SUB Form_Open()
- ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk for VectorLinux")
& "</H2>"
+ ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk for") & Space(1) &
ClsGlobal.sDistroName & "</H2>"
ME.TLwARNING.Text = "<b><u>" & ("WARNING:") & "</u></b><br>" &
"<i>" & ("All existing data in the device you select here will be
destroyed.") & "</i>"
Modified: branches/speedy/Step3a1a.class
==============================================================================
--- branches/speedy/Step3a1a.class (original)
+++ branches/speedy/Step3a1a.class Thu May 21 12:08:44 2009
@@ -78,8 +78,8 @@
sDump = Trim(sDump)
IF sDump THEN
' swap exists
- SELECT CASE Message.Question(("Vectorlinux has detected an
existing swap partition in your system.") & "<br>" &
- ("Would you like to let VectorLinux use this partition or
create a new one?"), ("Use Existing"), ("Create New"))
+ SELECT CASE Message.Question(ClsGlobal.sDistroName &
Space(1) & ("has detected an existing swap partition in your system.")
& "<br>" &
+ ("Would you like to let") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ("use this partition or create a new
one?"), ("Use Existing"), ("Create New"))
CASE 1
' use existing partition
SHELL "probepart | grep \"^/dev\" | grep -i \"linux
swap\" | tr -s \' \',\"\" | cut -f 1 -d \' \'" TO sSwapList
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Thu May 21 12:08:44 2009
@@ -22,7 +22,7 @@
PUBLIC SUB Form_Open()
- ME.tlbanner.Text = "<h2>" & ("Install VectorLinux to free space on
disk") & "</H2>"
+ ME.tlbanner.Text = "<h2>" & ("Install") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ("to free space on disk") & "</H2>"
ME.MovieBox1.Path = "images/throbber.gif"
ME.MovieBox1.Playing = FALSE
'objTargetOptions = NEW Object[]
@@ -140,7 +140,7 @@
'Message("Largest unused area found: " & sLargestDev & " with " &
lLargest & " kb of unused space")
PRINT " -++- Largest unused area found in :" & sLargestDev & "
totaling " & lLargest & " kb of free space"
- ME.tlSelAutoTarget.Text = ("Select the location on your hard drive where
you would like to install VectorLinux")
+ ME.tlSelAutoTarget.Text = ("Select the location on your hard drive where
you would like to install") & Space(1) & ClsGlobal.sDistroName
END
Modified: branches/speedy/Step3a3a.class
==============================================================================
--- branches/speedy/Step3a3a.class (original)
+++ branches/speedy/Step3a3a.class Thu May 21 12:08:44 2009
@@ -21,7 +21,7 @@
ME.tlExp.Text = "<h2>" & ME.tlExp.text & "</h2>"
- sText = ("You are about to shink") & Space(1) &
MdlAutoPartition.sPartitionToShrink & Space(1) & ("to make room for your
vectorlinux installation.") & Space(1)&
+ sText = ("You are about to shink") & Space(1) &
MdlAutoPartition.sPartitionToShrink & Space(1) & ("to make room for your")
& Space(1) & ClsGlobal.sDistroName & Space(1) & ("installation.") &
Space(1)&
("This is generally a safe procedure, however, you should always
consider making copies of your valuable data before making changes such as
this one to your system")&
"<br><br>" & ("When you are ready to continue, click the") & Space(1)
& "\"<b>" & btstart.Text & "\" </b>" & Space(1) & ("button.")
ClsGlobal.fRunningMainForm.btnext.enabled = FALSE
@@ -64,12 +64,12 @@
ME.tlWarning.Visible = FALSE
ME.HBox2.Visible = TRUE
ME.MovieBox1.path = "images/throbber.gif"
- ME.tlExp.Text = ("Shrinking partitions and creating new environment for
VectorLinux ... Please Wait")
+ ME.tlExp.Text = ("Shrinking partitions and creating new environment
for") & Space(1) & ClsGlobal.sDistroName & Space(1) & "..." & ("Please
Wait")
ME.MovieBox1.Playing = TRUE
LAST.enabled = FALSE
MdlAutoPartition.PERFORM_AUTO_PARTITION_FROM_FREE_SPACE(MdlAutoPartition.sPartitionToShrink)
- ME.tlExp.Text = ("Partitions are ready for VectorLinux. Click") &
Space(1) & "\"" & ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1)
& ("to continue")
+ ME.tlExp.Text = ("Partitions are ready for") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ". " & ("Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue")
MovieBox1.Playing = FALSE
ME.MovieBox1.Enabled = FALSE
ClsGlobal.fRunningMainForm.btnext.enabled = TRUE
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Thu May 21 12:08:44 2009
@@ -98,7 +98,7 @@
CATCH
Message.Error(Error.Text & gb.NewLine & Error.Where)
ELSE
- Message.Warning(("The VectorLinux installer is unable to embed the
gparted partitioning utility.") & gb.NewLine &
+ Message.Warning(("The") & Space(1) & ClsGlobal.sDistroName & Space(1)
& ("installer is unable to embed the gparted partitioning utility.") &
gb.NewLine &
("Please consider using the automatic partition option, or use other
means of") & gb.NewLine &
("partitioning your hard drives."))
END IF
@@ -120,7 +120,7 @@
ME.HBox1.Visible = FALSE
ME.tlEmbDone.Visible = FALSE
- Message.Warning(("VectorLinux is about to launch the GParted
partitioning tool. Use this utility to") & gb.NewLine &
+ Message.Warning(ClsGlobal.sDistroName & Space(1) & ("is about to
launch the GParted partitioning tool. Use this utility to") & gb.NewLine &
("move, resize, delete or create partitions.") & "<b>" & gb.NewLine &
gb.NewLine &
("When you are finished, you will need to exit the utility from the")
& Space(1) & ("GParted") & Space(1) & ("menu") & "</b>")
WITH ClsGlobal.fRunningMainForm
Modified: branches/speedy/Step7a.class
==============================================================================
--- branches/speedy/Step7a.class (original)
+++ branches/speedy/Step7a.class Thu May 21 12:08:44 2009
@@ -24,7 +24,7 @@
'btTglSel.Value = FALSE
- ME.tlbanner.Text = "<h2>" & ("Customize Your VectorLinux Installation")
& "</h2>"
+ ME.tlbanner.Text = "<h2>" & ("Customize Your") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ("Installation") & "</h2>"
WITH ME.gvBulkSel
.Columns.count = 4
.Rows.Count = 2
Modified: branches/speedy/Step7b.class
==============================================================================
--- branches/speedy/Step7b.class (original)
+++ branches/speedy/Step7b.class Thu May 21 12:08:44 2009
@@ -20,7 +20,7 @@
PUBLIC SUB Form_Open()
- ME.tlbanner.Text = "<h2>" & ("Customize Your VectorLinux Installation")
& "</h2>"
+ ME.tlbanner.Text = "<h2>" & ("Customize Your") & Space(1) &
ClsGlobal.sDistroName & Space(1) & ("Installation") & "</h2>"
ME.gvOptions.Rows.count = 3
ME.gvOptions.Columns.count = 5
Modified: branches/speedy/Step9.class
==============================================================================
--- branches/speedy/Step9.class (original)
+++ branches/speedy/Step9.class Thu May 21 12:08:44 2009
@@ -28,8 +28,8 @@
WAIT 1
' MdlMain.CREATE_CREDIT_LABELS(ME.ScrlCredits) ' Fill out credits list
'ME.tmScroll.Enabled = TRUE ' Start scrolling
- FrmCredits.Reparent(ME.wsScroll)
- FrmCredits.Show()
+ 'FrmCredits.Reparent(ME.wsScroll)
+ 'FrmCredits.Show()
ME.create_installation_process_layout() ' triggers installation process
@@ -128,3 +128,11 @@
'
'
' END
+
+PUBLIC SUB tmScroll_Timer()
+
+ INC svInstallProc.ScrollY
+ 'IF ScrollView1.ScrollY = ScrollView1.scrollh - ScrollView1.Height THEN
ScrollView1.Scroll(0, 0)
+ IF svinstallproc.scrolly = svinstallproc.ScrollH - svinstallproc.Height
THEN svinstallproc.Scroll(0, 0)
+
+END
Modified: branches/speedy/Step9.form
==============================================================================
--- branches/speedy/Step9.form (original)
+++ branches/speedy/Step9.form Thu May 21 12:08:44 2009
@@ -93,6 +93,7 @@
}
{ Frame2 Frame
MoveScaled(37,1,33,28)
+ Visible = False
Expand = True
Text = ("The development Crew")
{ wsScroll Workspace
Modified: branches/speedy/vinstall-ng.gambas
==============================================================================
Binary files. No diff available.
|
