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: Sriram D. <sri...@gm...> - 2009-02-19 23:46:41
|
Hi Kocil, I am in LosAngeles, and closer than uel by a few hundred miles.. So when are you coming? and where are you staying? if there are other VL devs/users in the area maybe we can meet up some place convenient to all. Cheers Ram On Thu, Feb 19, 2009 at 3:42 PM, uel archuletta <ue...@gm...> wrote: > Hi Kocil, > > I sure remember you. > I am in SLC, Utah about 1000 miles from there. > I think i am the closest, but not positive. > when will you be in San Diego? > > > On 2/19/09, Kocil <k0...@ya...> wrote: >> >> Hi all. >> >> Long time no see. >> If you still remember me, I'm Kocil, the former VL SOHO 5.0 chief. >> Just to let you know, >> I'm going to San Diego, CA this February for 1 week. >> >> Is anybody around there ? >> >> >> >> >> >> >> >> >> >> ------------------------------------------------------------------------------ >> Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, >> CA >> -OSBC tackles the biggest issue in open source: Open Sourcing the >> Enterprise >> -Strategies to boost innovation and cut costs with open source >> participation >> -Receive a $600 discount off the registration fee with the source code: >> SFAD >> http://p.sf.net/sfu/XcvMzF8H >> _______________________________________________ >> Vectorlinux-devel mailing list >> Vec...@li... >> https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel >> > > > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, > CA > -OSBC tackles the biggest issue in open source: Open Sourcing the > Enterprise > -Strategies to boost innovation and cut costs with open source > participation > -Receive a $600 discount off the registration fee with the source code: > SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > Vectorlinux-devel mailing list > Vec...@li... > https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel > > |
|
From: uel a. <ue...@gm...> - 2009-02-19 23:42:13
|
Hi Kocil, I sure remember you. I am in SLC, Utah about 1000 miles from there. I think i am the closest, but not positive. when will you be in San Diego? On 2/19/09, Kocil <k0...@ya...> wrote: > > Hi all. > > Long time no see. > If you still remember me, I'm Kocil, the former VL SOHO 5.0 chief. > Just to let you know, > I'm going to San Diego, CA this February for 1 week. > > Is anybody around there ? > > > > > > > > > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, > CA > -OSBC tackles the biggest issue in open source: Open Sourcing the > Enterprise > -Strategies to boost innovation and cut costs with open source > participation > -Receive a $600 discount off the registration fee with the source code: > SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > Vectorlinux-devel mailing list > Vec...@li... > https://lists.sourceforge.net/lists/listinfo/vectorlinux-devel > |
|
From: <cod...@go...> - 2009-02-19 23:28:00
|
Author: M0...@gm...
Date: Thu Feb 19 14:18:30 2009
New Revision: 497
Added:
branches/speedy/.lang/Step7b.pot
branches/speedy/.lang/Step8.pot
branches/speedy/Step7b.class
branches/speedy/Step7b.form
branches/speedy/Step8.class
branches/speedy/Step8.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/Step1.form
branches/speedy/Step7a.class
branches/speedy/Step7a.form
branches/speedy/images/throbber.gif
Log:
more details to customized installation. Up to install summary
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Feb 19 14:18:30 2009
@@ -62,7 +62,7 @@
msgid "Installation"
msgstr ""
-#: MdlStartUp.module:49
+#: MdlStartUp.module:49 Step8.class:65
msgid "Installation Summary"
msgstr ""
@@ -170,7 +170,7 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169
+#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:139
msgid "WARNING:"
msgstr ""
@@ -178,19 +178,19 @@
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:467
+#: Step1.class:468
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:485
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:506
+#: Step1.class:507
msgid "Search Again"
msgstr ""
-#: Step1.class:530
+#: Step1.class:537
msgid "Check Installation media before installing"
msgstr ""
@@ -451,11 +451,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169 Step6.class:386
+#: Step3a1a.class:169 Step6.class:386 Step7a.class:139
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:386
+#: Step3a1a.class:169 Step6.class:386 Step7a.class:139
msgid "No"
msgstr ""
@@ -707,20 +707,56 @@
msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
-#: Step7a.class:26
+#: Step7a.class:27 Step7b.class:21
msgid "Customize Your VectorLinux Installation"
msgstr ""
-#: Step7a.class:33
+#: Step7a.class:34
msgid "Component"
msgstr ""
-#: Step7a.class:48
+#: Step7a.class:49
msgid "Description"
msgstr ""
-#: Step7a.class:196
+#: Step7a.class:139
msgid ""
-"Major optional components available for installation. Please select which
of "
-"these you want to install"
+"This component is a dependancy to any graphical user interface progam on
the "
+"system"
+msgstr ""
+
+#: Step7a.class:139
+msgid ""
+"Choosing not to install this may result in a command-line (text mode) "
+"installation only"
+msgstr ""
+
+#: Step7a.class:139
+msgid "Are you sure you want to disable this conponent anyway?"
+msgstr ""
+
+#: Step7a.class:165
+msgid "Select All"
+msgstr ""
+
+#: Step7a.class:171
+msgid "Un-Select All"
+msgstr ""
+
+#: Step7a.class:231
+msgid ""
+"Major optional components available for installation. To select /
un-select "
+"a component, click it's name or the box to the left of it's name."
+msgstr ""
+
+#: Step7b.class:83
+msgid ""
+"Additional optional software available. Select which software packages
to "
+"include in your installation."
+msgstr ""
+
+#: Step8.class:84
+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/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Thu Feb 19 14:18:30 2009
@@ -66,19 +66,19 @@
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:467
+#: Step1.class:468
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:485
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:506
+#: Step1.class:507
msgid "Search Again"
msgstr ""
-#: Step1.class:530
+#: Step1.class:537
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step7a.pot
==============================================================================
--- branches/speedy/.lang/Step7a.pot (original)
+++ branches/speedy/.lang/Step7a.pot Thu Feb 19 14:18:30 2009
@@ -14,19 +14,51 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step7a.class:26
+#: Step7a.class:27
msgid "Customize Your VectorLinux Installation"
msgstr ""
-#: Step7a.class:33
+#: Step7a.class:34
msgid "Component"
msgstr ""
-#: Step7a.class:48
+#: Step7a.class:49
msgid "Description"
msgstr ""
-#: Step7a.class:196
-msgid "Major optional components available for installation. Please select
which of these you want to install"
+#: Step7a.class:139
+msgid "WARNING:"
+msgstr ""
+
+#: Step7a.class:139
+msgid "This component is a dependancy to any graphical user interface
progam on the system"
+msgstr ""
+
+#: Step7a.class:139
+msgid "Choosing not to install this may result in a command-line (text
mode) installation only"
+msgstr ""
+
+#: Step7a.class:139
+msgid "Are you sure you want to disable this conponent anyway?"
+msgstr ""
+
+#: Step7a.class:139
+msgid "Yes"
+msgstr ""
+
+#: Step7a.class:139
+msgid "No"
+msgstr ""
+
+#: Step7a.class:165
+msgid "Select All"
+msgstr ""
+
+#: Step7a.class:171
+msgid "Un-Select All"
+msgstr ""
+
+#: Step7a.class:231
+msgid "Major optional components available for installation. To select /
un-select a component, click it's name or the box to the left of it's name."
msgstr ""
Added: branches/speedy/.lang/Step7b.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step7b.pot Thu Feb 19 14:18:30 2009
@@ -0,0 +1,24 @@
+# /home/vluser/devel/speedy/Step7b.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"
+
+#: Step7b.class:21
+msgid "Customize Your VectorLinux Installation"
+msgstr ""
+
+#: Step7b.class:83
+msgid "Additional optional software available. Select which software
packages to include in your installation."
+msgstr ""
+
Added: branches/speedy/.lang/Step8.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step8.pot Thu Feb 19 14:18:30 2009
@@ -0,0 +1,24 @@
+# /home/vluser/devel/speedy/Step8.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"
+
+#: Step8.class:65
+msgid "Installation Summary"
+msgstr ""
+
+#: Step8.class:84
+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/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Thu Feb 19 14:18:30 2009
@@ -58,8 +58,13 @@
MoveScaled(1,11,52,9)
Expand = True
}
+ { HBox3 HBox
+ MoveScaled(1,20,7,2)
+ Expand = True
+ }
{ bCheckMedia CheckBox
- MoveScaled(1,21,41,3)
+ MoveScaled(1,22,41,3)
+ Visible = False
Expand = True
Text = ("Check Installation media before installing")
}
Modified: branches/speedy/Step7a.class
==============================================================================
--- branches/speedy/Step7a.class (original)
+++ branches/speedy/Step7a.class Thu Feb 19 14:18:30 2009
@@ -21,6 +21,7 @@
picYes = Picture.Load("images/16px-check.png")
picNo = Picture.Load("images/16px-Nocheck.png")
+'btTglSel.Value = FALSE
ME.tlbanner.Text = "<h2>" & ("Customize Your VectorLinux Installation")
& "</h2>"
@@ -130,12 +131,21 @@
PUBLIC SUB gvBulkSel_Click()
'IF LAST.column > 0 THEN RETURN
- IF LAST.column = 0 THEN
- IF gvBulkSel[LAST.row, LAST.column].Picture = picYes THEN
- gvBulkSel[LAST.row, LAST.column].Picture = picNo
+ IF LAST.column = 0 OR LAST.column = 1 AND LAST.row > 1 THEN
+ IF gvBulkSel[LAST.row, 0].Picture = picYes THEN
+ IF gvBulkSel[LAST.row, 1].text LIKE "x11" THEN
+ SELECT CASE Message.Warning("<b>" & ("WARNING:") & "</b>" &
Space(1) & ("This component is a dependancy to any graphical user interface
progam on the system") & "<br>" &
+ ("Choosing not to install this may result in a command-line
(text mode) installation only") & "<br>" &
+ ("Are you sure you want to disable this conponent anyway?"),
("Yes"), ("No"))
+ CASE 2
+ RETURN
+ STOP EVENT
+ END SELECT
+ END IF
+ gvBulkSel[LAST.row, 0].Picture = picNo
gvBulkSel[LAST.row, 3].Text = "no"
ELSE
- gvBulkSel[LAST.row, LAST.column].Picture = picYes
+ gvBulkSel[LAST.row, 0].Picture = picYes
gvBulkSel[LAST.row, 3].Text = "yes"
END IF
ELSE IF LAST.column = 2 THEN
@@ -143,6 +153,29 @@
END IF
gvBulkSel.Refresh
- 'Message(gvBulkSel[LAST.row, 3].Text)
+
+
+END
+PUBLIC SUB btTglSel_Click()
+
+ DIM irow AS Integer
+
+ 'IF LAST.value THEN
+ IF LAST.text = ("Select All") THEN
+ irow = 2
+ FOR irow = 2 TO gvBulkSel.Rows.count - 1
+ gvBulkSel[irow, 0].Picture = picyes
+ gvBulkSel[irow, 3].Text = "yes"
+ NEXT
+ LAST.text = ("Un-Select All")
+ ELSE
+ irow = 2
+ FOR irow = 2 TO gvBulkSel.Rows.count - 1
+ gvBulkSel[irow, 0].Picture = picno
+ gvBulkSel[irow, 3].Text = "no"
+ NEXT
+ LAST.text = ("Select All")
+ END IF
+gvBulkSel.Refresh
END
Modified: branches/speedy/Step7a.form
==============================================================================
--- branches/speedy/Step7a.form (original)
+++ branches/speedy/Step7a.form Thu Feb 19 14:18:30 2009
@@ -20,24 +20,32 @@
MoveScaled(0,5,10,1)
}
{ HBox2 HBox
- MoveScaled(0,7,70,4)
+ MoveScaled(0,7,70,8)
{ tlWinExp TextLabel
- MoveScaled(1,0,64,5)
+ MoveScaled(1,0,64,7)
Expand = True
- Text = ("Major optional components available for installation.
Please select which of these you want to install")
+ Text = ("Major optional components available for installation. To
select / un-select a component, click it's name or the box to the left of
it's name.")
}
}
{ Panel1 Panel
- MoveScaled(1,12,74,31)
+ MoveScaled(1,15,74,28)
Expand = True
Arrangement = Arrange.Fill
{ gvBulkSel GridView
- MoveScaled(2,0,71,29)
+ MoveScaled(2,4,71,25)
Expand = True
Border = False
}
}
+ { HBox4 HBox
+ MoveScaled(2,43,7,1)
+ }
{ HBox3 HBox
- MoveScaled(8,46,14,2)
+ MoveScaled(2,45,37,3)
+ { btTglSel ToggleButton
+ MoveScaled(0,0,24,3)
+ Text = ("Un-Select All")
+ Picture = Picture["icon:/16/refresh"]
+ }
}
}
Added: branches/speedy/Step7b.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step7b.class Thu Feb 19 14:18:30 2009
@@ -0,0 +1,38 @@
+' 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 = "<h2>" & ("Customize Your VectorLinux Installation")
& "</h2>"
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step8"
+
+END
Added: branches/speedy/Step7b.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step7b.form Thu Feb 19 14:18:30 2009
@@ -0,0 +1,30 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,64)
+ Text = ("")
+ Arrangement = Arrange.Vertical
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,10,1)
+ }
+ { HBox2 HBox
+ MoveScaled(0,7,70,8)
+ { tlWinExp TextLabel
+ MoveScaled(1,0,64,7)
+ Expand = True
+ Text = ("Additional optional software available. Select which
software packages to include in your installation.")
+ }
+ }
+}
Added: branches/speedy/Step8.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step8.class Thu Feb 19 14:18:30 2009
@@ -0,0 +1,38 @@
+' 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 = "<h2>" & tlbanner.text & "</h2>"
+
+END
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step9"
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+
+
Added: branches/speedy/Step8.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step8.form Thu Feb 19 14:18:30 2009
@@ -0,0 +1,34 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,64)
+ Text = ("")
+ Arrangement = Arrange.Vertical
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("Installation Summary")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(0,5,12,2)
+ }
+ { HBox2 HBox
+ MoveScaled(0,7,62,6)
+ { tlWarning TextLabel
+ MoveScaled(1,1,59,4)
+ Expand = True
+ Text = ("Your VectorLinux installation is about to be performed as
follows. If you need to make any changes, this is your last chance.")
+ }
+ }
+ { gvSumm GridView
+ MoveScaled(2,16,57,14)
+ Expand = True
+ }
+}
Modified: branches/speedy/images/throbber.gif
==============================================================================
Binary files. No diff available.
|
|
From: Kocil <k0...@ya...> - 2009-02-19 23:17:32
|
Hi all.
Long time no see.
If you still remember me, I'm Kocil, the former VL SOHO 5.0 chief.
Just to let you know,
I'm going to San Diego, CA this February for 1 week.
Is anybody around there ?
|
|
From: <cod...@go...> - 2009-02-18 23:31:03
|
Author: M0...@gm...
Date: Wed Feb 18 14:35:09 2009
New Revision: 496
Added:
branches/speedy/.lang/FMain0Old.pot
branches/speedy/.lang/Step7.pot
branches/speedy/.lang/Step7a.pot
branches/speedy/FMain0.class
branches/speedy/FMain0.form
branches/speedy/FMain0Old.class
branches/speedy/FMain0Old.form
branches/speedy/Step7.class
branches/speedy/Step7.form
branches/speedy/Step7a.class
branches/speedy/Step7a.form
branches/speedy/import/
branches/speedy/import/FMain1/
branches/speedy/import/FMain1/installer.png (contents, props changed)
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.lang/en_US.po
branches/speedy/.lang/es.mo
branches/speedy/.lang/es.po
branches/speedy/.project
branches/speedy/ClsGlobal.class
branches/speedy/Step0.class
branches/speedy/Step1.class
branches/speedy/Step6.class
branches/speedy/images/category.png
Log:
Began working on installation options and software selection
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 18 14:35:09 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:245 FMain0.class:233
+#: FMain.class:245 FMain0.class:246 FMain0Old.class:233
msgid "Process Overview"
msgstr ""
-#: FMain.class:287 FMain0.class:271
+#: FMain.class:287 FMain0.class:288 FMain0Old.class:271
msgid "Back"
msgstr ""
-#: FMain.class:298 FMain0.class:282
+#: FMain.class:298 FMain0.class:299 FMain0Old.class:282
msgid "Next"
msgstr ""
-#: FMain.class:309 FMain0.class:293
+#: FMain.class:309 FMain0.class:310 FMain0Old.class:293
msgid "Quit"
msgstr ""
@@ -110,19 +110,19 @@
msgid "English (US)"
msgstr ""
-#: Step0.class:253
+#: Step0.class:254
msgid "Select your language"
msgstr ""
-#: Step0.class:284
+#: Step0.class:285
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:303
+#: Step0.class:304
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:325
+#: Step0.class:326
msgid "Use this box to test your keyboard settings"
msgstr ""
@@ -130,67 +130,67 @@
msgid "on"
msgstr ""
-#: Step1.class:132
+#: Step1.class:131
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:151
+#: Step1.class:150
msgid "Found"
msgstr ""
-#: Step1.class:151
+#: Step1.class:150
msgid "in partition"
msgstr ""
-#: Step1.class:192
+#: Step1.class:191
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:205
+#: Step1.class:204
msgid "Scanning"
msgstr ""
-#: Step1.class:215
+#: Step1.class:214
msgid "in"
msgstr ""
-#: Step1.class:243
+#: Step1.class:242
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:336
+#: Step1.class:335
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:339
+#: Step1.class:338
msgid "VERSION"
msgstr ""
-#: Step1.class:416
+#: Step1.class:415
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
+#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step1.class:416
+#: Step1.class:415
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:468
+#: Step1.class:467
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:486
+#: Step1.class:485
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:507
+#: Step1.class:506
msgid "Search Again"
msgstr ""
-#: Step1.class:531
+#: Step1.class:530
msgid "Check Installation media before installing"
msgstr ""
@@ -286,7 +286,7 @@
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:198 Step5.class:174
+#: Step2.class:198 Step5.class:166
msgid "Click"
msgstr ""
@@ -435,7 +435,7 @@
msgid "Partitioning stage complete. Click"
msgstr ""
-#: Step3a1a.class:160 Step3a2.class:322 Step5.class:174
+#: Step3a1a.class:160 Step3a2.class:322 Step5.class:166
msgid "to continue"
msgstr ""
@@ -451,11 +451,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169 Step6.class:385
+#: Step3a1a.class:169 Step6.class:386
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:385
+#: Step3a1a.class:169 Step6.class:386
msgid "No"
msgstr ""
@@ -593,88 +593,134 @@
msgid "menu"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "SYSTEM RESTART SUGGESTED"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid ""
"Your system still contains some non-linux partitions. If you still have
a "
"Windows operating system installed, it is recomended "
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "that you reboot your system at this time. "
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "Click the"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "button to restart your computer now, or click"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "to continue without restarting."
msgstr ""
-#: Step5.class:174
+#: Step5.class:166
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:190
+#: Step5.class:182
msgid "Your computer will restart in 10 seconds"
msgstr ""
-#: Step5.class:247
+#: Step5.class:239
msgid "Loading partitioning utility ... Please Wait"
msgstr ""
-#: Step5.class:256
+#: Step5.class:248
msgid "Restart Now"
msgstr ""
-#: Step6.class:58
+#: Step6.class:59
msgid "Partition"
msgstr ""
-#: Step6.class:59
+#: Step6.class:60
msgid "Size"
msgstr ""
-#: Step6.class:60
+#: Step6.class:61
msgid "Mount Point"
msgstr ""
-#: Step6.class:61
+#: Step6.class:62
msgid "File System"
msgstr ""
-#: Step6.class:133
+#: Step6.class:134
msgid "Not Used"
msgstr ""
-#: Step6.class:154
+#: Step6.class:155
msgid "Do not format"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "You have already selected"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "as your"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "partition."
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:280
+#: Step6.class:281
msgid "Select which partitions to use for installation"
+msgstr ""
+
+#: Step7.class:19
+msgid "Select Installation Mode"
+msgstr ""
+
+#: Step7.class:107
+msgid "Full Install"
+msgstr ""
+
+#: Step7.class:117
+msgid "Install everthing in the image (Fully Automated)"
+msgstr ""
+
+#: Step7.class:125
+msgid "Customized"
+msgstr ""
+
+#: Step7.class:135
+msgid "Select the components you wish to install (Advanced)"
+msgstr ""
+
+#: Step7.class:143
+msgid "Minimal"
+msgstr ""
+
+#: Step7.class:153
+msgid "Install the most minimal working confuguration (For older hardware)"
+msgstr ""
+
+#: Step7a.class:26
+msgid "Customize Your VectorLinux Installation"
+msgstr ""
+
+#: Step7a.class:33
+msgid "Component"
+msgstr ""
+
+#: Step7a.class:48
+msgid "Description"
+msgstr ""
+
+#: Step7a.class:196
+msgid ""
+"Major optional components available for installation. Please select which
of "
+"these you want to install"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Wed Feb 18 14:35:09 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:233
+#: FMain0.class:246
msgid "Process Overview"
msgstr ""
-#: FMain0.class:271
+#: FMain0.class:288
msgid "Back"
msgstr ""
-#: FMain0.class:282
+#: FMain0.class:299
msgid "Next"
msgstr ""
-#: FMain0.class:293
+#: FMain0.class:310
msgid "Quit"
msgstr ""
Added: branches/speedy/.lang/FMain0Old.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/FMain0Old.pot Wed Feb 18 14:35:09 2009
@@ -0,0 +1,32 @@
+# /home/vluser/devel/speedy/FMain0Old.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"
+
+#: FMain0Old.class:233
+msgid "Process Overview"
+msgstr ""
+
+#: FMain0Old.class:271
+msgid "Back"
+msgstr ""
+
+#: FMain0Old.class:282
+msgid "Next"
+msgstr ""
+
+#: FMain0Old.class:293
+msgid "Quit"
+msgstr ""
+
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Wed Feb 18 14:35:09 2009
@@ -26,19 +26,19 @@
msgid "English (US)"
msgstr ""
-#: Step0.class:253
+#: Step0.class:254
msgid "Select your language"
msgstr ""
-#: Step0.class:284
+#: Step0.class:285
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:303
+#: Step0.class:304
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:325
+#: Step0.class:326
msgid "Use this box to test your keyboard settings"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Wed Feb 18 14:35:09 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:132
+#: Step1.class:131
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:151
+#: Step1.class:150
msgid "Found"
msgstr ""
-#: Step1.class:151
+#: Step1.class:150
msgid "in partition"
msgstr ""
-#: Step1.class:192
+#: Step1.class:191
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:205
+#: Step1.class:204
msgid "Scanning"
msgstr ""
-#: Step1.class:215
+#: Step1.class:214
msgid "in"
msgstr ""
-#: Step1.class:243
+#: Step1.class:242
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:336
+#: Step1.class:335
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:339
+#: Step1.class:338
msgid "VERSION"
msgstr ""
-#: Step1.class:416
+#: Step1.class:415
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:416
+#: Step1.class:415
msgid "WARNING:"
msgstr ""
-#: Step1.class:416
+#: Step1.class:415
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:468
+#: Step1.class:467
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:486
+#: Step1.class:485
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:507
+#: Step1.class:506
msgid "Search Again"
msgstr ""
-#: Step1.class:531
+#: Step1.class:530
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Wed Feb 18 14:35:09 2009
@@ -58,51 +58,51 @@
msgid "menu"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "SYSTEM RESTART SUGGESTED"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended "
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "that you reboot your system at this time. "
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "Click the"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "button to restart your computer now, or click"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "to continue without restarting."
msgstr ""
-#: Step5.class:174
+#: Step5.class:166
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:174
+#: Step5.class:166
msgid "Click"
msgstr ""
-#: Step5.class:174
+#: Step5.class:166
msgid "to continue"
msgstr ""
-#: Step5.class:190
+#: Step5.class:182
msgid "Your computer will restart in 10 seconds"
msgstr ""
-#: Step5.class:247
+#: Step5.class:239
msgid "Loading partitioning utility ... Please Wait"
msgstr ""
-#: Step5.class:256
+#: Step5.class:248
msgid "Restart Now"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Wed Feb 18 14:35:09 2009
@@ -14,55 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step6.class:58
+#: Step6.class:59
msgid "Partition"
msgstr ""
-#: Step6.class:59
+#: Step6.class:60
msgid "Size"
msgstr ""
-#: Step6.class:60
+#: Step6.class:61
msgid "Mount Point"
msgstr ""
-#: Step6.class:61
+#: Step6.class:62
msgid "File System"
msgstr ""
-#: Step6.class:133
+#: Step6.class:134
msgid "Not Used"
msgstr ""
-#: Step6.class:154
+#: Step6.class:155
msgid "Do not format"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "You have already selected"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "as your"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "partition."
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:280
+#: Step6.class:281
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:385
+#: Step6.class:386
msgid "Yes"
msgstr ""
-#: Step6.class:385
+#: Step6.class:386
msgid "No"
msgstr ""
Added: branches/speedy/.lang/Step7.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step7.pot Wed Feb 18 14:35:09 2009
@@ -0,0 +1,44 @@
+# /home/vluser/devel/speedy/Step7.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"
+
+#: Step7.class:19
+msgid "Select Installation Mode"
+msgstr ""
+
+#: Step7.class:107
+msgid "Full Install"
+msgstr ""
+
+#: Step7.class:117
+msgid "Install everthing in the image (Fully Automated)"
+msgstr ""
+
+#: Step7.class:125
+msgid "Customized"
+msgstr ""
+
+#: Step7.class:135
+msgid "Select the components you wish to install (Advanced)"
+msgstr ""
+
+#: Step7.class:143
+msgid "Minimal"
+msgstr ""
+
+#: Step7.class:153
+msgid "Install the most minimal working confuguration (For older hardware)"
+msgstr ""
+
Added: branches/speedy/.lang/Step7a.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step7a.pot Wed Feb 18 14:35:09 2009
@@ -0,0 +1,32 @@
+# /home/vluser/devel/speedy/Step7a.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"
+
+#: Step7a.class:26
+msgid "Customize Your VectorLinux Installation"
+msgstr ""
+
+#: Step7a.class:33
+msgid "Component"
+msgstr ""
+
+#: Step7a.class:48
+msgid "Description"
+msgstr ""
+
+#: Step7a.class:196
+msgid "Major optional components available for installation. Please select
which of these you want to install"
+msgstr ""
+
Modified: branches/speedy/.lang/en_US.po
==============================================================================
--- branches/speedy/.lang/en_US.po (original)
+++ branches/speedy/.lang/en_US.po Wed Feb 18 14:35:09 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr "VectorLinux Installer"
-#: FMain.class:245 FMain0.class:233
+#: FMain.class:245 FMain0.class:246 FMain0Old.class:233
msgid "Process Overview"
msgstr "Process Overview"
-#: FMain.class:287 FMain0.class:271
+#: FMain.class:287 FMain0.class:288 FMain0Old.class:271
msgid "Back"
msgstr "Back"
-#: FMain.class:298 FMain0.class:282
+#: FMain.class:298 FMain0.class:299 FMain0Old.class:282
msgid "Next"
msgstr "Next"
-#: FMain.class:309 FMain0.class:293
+#: FMain.class:309 FMain0.class:310 FMain0Old.class:293
msgid "Quit"
msgstr "Quit"
@@ -110,19 +110,19 @@
msgid "English (US)"
msgstr "English (US)"
-#: Step0.class:253
+#: Step0.class:254
msgid "Select your language"
msgstr "Select your language"
-#: Step0.class:284
+#: Step0.class:285
msgid "Select your keyboard layout"
msgstr "Select your keyboard layout"
-#: Step0.class:303
+#: Step0.class:304
msgid "Select your keyboard model"
msgstr "Select your keyboard model"
-#: Step0.class:325
+#: Step0.class:326
msgid "Use this box to test your keyboard settings"
msgstr "Use this box to test your keyboard settings"
@@ -130,67 +130,67 @@
msgid "on"
msgstr "on"
-#: Step1.class:132
+#: Step1.class:131
msgid "Scanning system partitions for installation files"
msgstr "Scanning system partitions for installation files"
-#: Step1.class:151
+#: Step1.class:150
msgid "Found"
msgstr "Found"
-#: Step1.class:151
+#: Step1.class:150
msgid "in partition"
msgstr "in partition"
-#: Step1.class:192
+#: Step1.class:191
msgid "Scanning for CD Media ... Please wait"
msgstr "Scanning for CD Media ... Please wait"
-#: Step1.class:205
+#: Step1.class:204
msgid "Scanning"
msgstr "Scanning"
-#: Step1.class:215
+#: Step1.class:214
msgid "in"
msgstr "in"
-#: Step1.class:243
+#: Step1.class:242
msgid "Scanning system for installable ISO images"
msgstr "Scanning system for installable ISO images"
-#: Step1.class:336
+#: Step1.class:335
msgid "DISTRIBUTION"
msgstr "DISTRIBUTION"
-#: Step1.class:339
+#: Step1.class:338
msgid "VERSION"
msgstr "VERSION"
-#: Step1.class:416
+#: Step1.class:415
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
+#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step1.class:416
+#: Step1.class:415
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:468
+#: Step1.class:467
msgid "Select Installation Source"
msgstr "Select Installation Source"
-#: Step1.class:486
+#: Step1.class:485
msgid "Select Installation source from the list below"
msgstr "Select Installation source from the list below"
-#: Step1.class:507
+#: Step1.class:506
msgid "Search Again"
msgstr "Search Again"
-#: Step1.class:531
+#: Step1.class:530
msgid "Check Installation media before installing"
msgstr "Check Installation media before installing"
@@ -288,7 +288,7 @@
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr "Keep in mind however, that this process can take a while to
complete."
-#: Step2.class:198 Step5.class:174
+#: Step2.class:198 Step5.class:166
msgid "Click"
msgstr ""
@@ -437,7 +437,7 @@
msgid "Partitioning stage complete. Click"
msgstr ""
-#: Step3a1a.class:160 Step3a2.class:322 Step5.class:174
+#: Step3a1a.class:160 Step3a2.class:322 Step5.class:166
msgid "to continue"
msgstr ""
@@ -453,11 +453,11 @@
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:169 Step6.class:385
+#: Step3a1a.class:169 Step6.class:386
msgid "Yes"
msgstr ""
-#: Step3a1a.class:169 Step6.class:385
+#: Step3a1a.class:169 Step6.class:386
msgid "No"
msgstr ""
@@ -595,88 +595,117 @@
msgid "menu"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "SYSTEM RESTART SUGGESTED"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid ""
"Your system still contains some non-linux partitions. If you still have
a "
"Windows operating system installed, it is recomended "
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "that you reboot your system at this time. "
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "Click the"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "button to restart your computer now, or click"
msgstr ""
-#: Step5.class:169
+#: Step5.class:161
msgid "to continue without restarting."
msgstr ""
-#: Step5.class:174
+#: Step5.class:166
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:190
+#: Step5.class:182
msgid "Your computer will restart in 10 seconds"
msgstr ""
-#: Step5.class:247
+#: Step5.class:239
msgid "Loading partitioning utility ... Please Wait"
msgstr ""
-#: Step5.class:256
+#: Step5.class:248
msgid "Restart Now"
msgstr ""
-#: Step6.class:58
+#: Step6.class:59
msgid "Partition"
msgstr ""
-#: Step6.class:59
+#: Step6.class:60
msgid "Size"
msgstr ""
-#: Step6.class:60
+#: Step6.class:61
msgid "Mount Point"
msgstr ""
-#: Step6.class:61
+#: Step6.class:62
msgid "File System"
msgstr ""
-#: Step6.class:133
+#: Step6.class:134
msgid "Not Used"
msgstr ""
-#: Step6.class:154
+#: Step6.class:155
msgid "Do not format"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "You have already selected"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "as your"
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "partition."
msgstr ""
-#: Step6.class:199
+#: Step6.class:200
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:280
+#: Step6.class:281
msgid "Select which partitions to use for installation"
+msgstr ""
+
+#: Step7.class:19
+#, fuzzy
+msgid "Select Installation Mode"
+msgstr "Select Installation Source"
+
+#: Step7.class:98
+msgid "Full Install"
+msgstr ""
+
+#: Step7.class:108
+msgid "Install everthing in the image (Fully Automated)"
+msgstr ""
+
+#: Step7.class:116
+msgid "Customized"
+msgstr ""
+
+#: Step7.class:126
+msgid "Select the components you wish to install (Advanced)"
+msgstr ""
+
+#: Step7.class:134
+msgid "Minimal"
+msgstr ""
+
+#: Step7.class:144
+msgid "Install the most minimal working confuguration (For older hardware)"
msgstr ""
Modified: branches/speedy/.lang/es.mo
==============================================================================
Binary files. No diff available.
Modified: branches/speedy/.lang/es.po
==============================================================================
--- branches/speedy/.lang/es.po (original)
+++ branches/speedy/.lang/es.po Wed Feb 18 14:35:09 2009
@@ -10,639 +10,754 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step3a2.class:92
-msgid "(Recomended)"
-msgstr "(Sugerido)"
-
-#: Step3a1a.class:169
-msgid "All existing data in"
-msgstr "Toda la información en"
-
-#: Step3a1.class:22
-msgid "All existing data in the device you select here will be destroyed."
-msgstr "Toda la información que reside en el disco que seleccione será
eliminada."
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "Instalador de VectorLinux"
-#: Step2.class:181
-msgid "All test passed. It is safe to continue with the installation
process."
-msgstr "Todos los archivos pasaron la prueba de integridad. Ya puede
continuar con la instalación"
+#: FMain.class:245 FMain0.class:246 FMain0Old.class:233
+msgid "Process Overview"
+msgstr "Resumen del Proceso"
-#: Step3a.class:22
-msgid "Allow VectorLinux to use an entire hard disk in your system."
-msgstr "Quiero que VectorLinux utilize el disco completo."
+#: FMain.class:287 FMain0.class:288 FMain0Old.class:271
+msgid "Back"
+msgstr "Regreso"
-#: Step3a2.class:65
-msgid "Another partitioning option"
-msgstr "Otra opción para particionar."
+#: FMain.class:298 FMain0.class:299 FMain0Old.class:282
+msgid "Next"
+msgstr "Siguiente"
-#: Step3.class:153
-msgid "Automatic"
-msgstr "Automático"
+#: FMain.class:309 FMain0.class:310 FMain0Old.class:293
+msgid "Quit"
+msgstr "Cancelar"
-#: Step4.class:23
-msgid "Automatic Disc Partitioning"
-msgstr "Crear las particiones necesarias automáticamente"
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr "No se pudo formatear"
-#: Step3a.class:19
-msgid "Automatic Partitioning Options"
-msgstr "Opciones de particionado automático"
+#: MdlMain.module:33
+msgid "to"
+msgstr "a"
-#: Step3.class:163
-msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
-msgstr "Automáticamente encoger particiones existentes al tamaño adecuado
para dejar espacio para VectorLinux"
+#: MdlStartUp.module:42
+msgid "Preparation"
+msgstr "Preparación"
-#: FMain.class:287 FMain0.class:271
-msgid "Back"
-msgstr "Regreso"
+#: MdlStartUp.module:44
+msgid "Select Language"
+msgstr "Selección de Lenguage"
-#: Step2.class:154
-msgid "Burn the image at a lower speed rate"
-msgstr "Quemar la imagen ISO a un ritmo de velocidad mas lento"
+#: MdlStartUp.module:45
+msgid "Select Media"
+msgstr "Medio de Instalación"
-#: Step2.class:101
-msgid "Canceling data integrity tests per user request"
-msgstr "Proceso de verificacion de integridad cancelado a instancias del
usuario"
+#: MdlStartUp.module:46
+msgid "Disk Partitioning"
+msgstr "Particiones"
-#: Step1.class:531
-msgid "Check Installation media before installing"
-msgstr "Verificar archivos de instalacion"
+#: MdlStartUp.module:47
+msgid "Software Selection"
+msgstr "Selección de Software"
-#: Step3a3.class:22
-msgid "Claim free space from existing partitions"
-msgstr "Utilizar espacio libre en las particiones que ya existen"
+#: MdlStartUp.module:48
+msgid "Installation"
+msgstr "Instalación"
-#: Step2.class:198 Step5.class:174
-msgid "Click"
-msgstr "Haz click en"
+#: MdlStartUp.module:49
+msgid "Installation Summary"
+msgstr "Resumen de la instalación"
-#: Step5.class:169
-msgid "Click the"
-msgstr "Haz click en"
+#: MdlStartUp.module:50
+msgid "Install VectorLinux"
+msgstr "Instalar VectorLinux"
-#: Step3a1a.class:21
-msgid "Create Linux Partition Scheme in"
-msgstr "Crear nueva estructura de particiones en"
+#: MdlStartUp.module:51
+msgid "System Configuration"
+msgstr "Configuración del Sistema"
-#: Step3a1a.class:82
-msgid "Create New"
-msgstr "Crear Nueva"
+#: MdlStartUp.module:52
+msgid "System Boot Manager"
+msgstr "Gestor de Arranque"
-#: Step1.class:336
-msgid "DISTRIBUTION"
-msgstr "DISTRIBUCION"
+#: MdlStartUp.module:53
+msgid "Regional Settings"
+msgstr "Valores Regionales"
-#: Step2.class:102
-msgid "Data integrity test canceled by user."
-msgstr "Prueba de integridad de archivos cancelado por el usuario"
+#: MdlStartUp.module:54
+msgid "User Accounts"
+msgstr "Usuarios"
-#: Step2.class:174
-msgid "Data integrity test complete... all tests passed"
-msgstr "Prueba de integridad de los archivos completa . . . Todos los
archivos pasaron."
+#: MdlStartUp.module:55
+msgid "Network Settings"
+msgstr "Valores de Red"
-#: Step3.class:28
-msgid "Disc Partitioning Options"
-msgstr "Opciones de particionado"
+#: MdlStartUp.module:56
+msgid "Startup Options"
+msgstr "Opciones de Arranque"
-#: MdlStartUp.module:46
-msgid "Disk Partitioning"
-msgstr "Particiones"
+#: MdlStartUp.module:57
+msgid "Final Configuration"
+msgstr "Configuración Final"
-#: Step6.class:154
-msgid "Do not format"
-msgstr "Sin formatear"
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Valores locales"
-#: Step2.class:154
-msgid "Download a new installation image from www.vectorlinux.com"
-msgstr "Adquiera una nueva imagen de instalación en www.vectorlinux.com"
+#: Step0.class:122
+msgid "Spanish"
+msgstr "Español (España)"
#: Step0.class:125
msgid "English (US)"
msgstr "Inglés (EE.UU)"
-#: Step3a1a.class:56
-msgid "Error deleting existing partitions... Please try another
partitioning method"
-msgstr "Ha ocurrido un error mientras borraba las particiones existentes.
Por favor seleccione otra manera de particionado."
+#: Step0.class:254
+msgid "Select your language"
+msgstr "Seleccione su idioma"
-#: Step2.class:115
-msgid "FAILED"
-msgstr "ERROR"
+#: Step0.class:285
+msgid "Select your keyboard layout"
+msgstr "Seleccione el diseño de su teclado"
-#: Step3a1a.class:148
-msgid "Failed to format partitions, please try another partitioning method"
-msgstr "El intento a formatear las particiones ha fallado, intente con
otra manera de particionado"
+#: Step0.class:304
+msgid "Select your keyboard model"
+msgstr "Seleccione el model de su teclado"
-#: Step6.class:61
-msgid "File System"
-msgstr "Systema de Archivos"
+#: Step0.class:326
+msgid "Use this box to test your keyboard settings"
+msgstr "Area de prueba"
-#: MdlStartUp.module:57
-msgid "Final Configuration"
-msgstr "Configuración Final"
+#: Step1.class:33
+msgid "on"
+msgstr "en"
+
+#: Step1.class:131
+msgid "Scanning system partitions for installation files"
+msgstr "Buscando medios de instalación en particiones del sistema"
-#: Step1.class:151
+#: Step1.class:150
msgid "Found"
msgstr "Encontre"
-#: Step5.class:114
-msgid "GParted"
-msgstr "GParted"
+#: Step1.class:150
+msgid "in partition"
+msgstr "en particion"
-#: Step5.class:64
-msgid "Gparted was not found on this system. Please install gparted and
try again"
-msgstr "No se pudo encontrar GParted en este sistema. Por favor instale
gparted e intente otra vez."
+#: Step1.class:191
+msgid "Scanning for CD Media ... Please wait"
+msgstr "Buscando medios de instalación en CDROM. Por favor espere"
-#: MdlStartUp.module:50
-msgid "Install VectorLinux"
-msgstr "Instalar VectorLinux"
+#: Step1.class:204
+msgid "Scanning"
+msgstr "Buscando en"
-#: Step3.class:197
-msgid "Install VectorLinux to existing partitions on my hard drive"
-msgstr "Instalar VectorLinux en particiones ya existentes en mi disco duro"
+#: Step1.class:214
+msgid "in"
+msgstr "en"
-#: Step3a2.class:25
-msgid "Install VectorLinux to free space on disk"
-msgstr "Instalar VectorLinux en el espacio vacío de mi disco duro"
+#: Step1.class:242
+msgid "Scanning system for installable ISO images"
+msgstr "Buscando medios de instalación en imagenes ISO."
-#: MdlStartUp.module:48
-msgid "Installation"
-msgstr "Instalación"
+#: Step1.class:335
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUCION"
-#: MdlStartUp.module:49
-msgid "Installation Summary"
-msgstr "Resumen de la instalación"
+#: Step1.class:338
+msgid "VERSION"
+msgstr "VERSION"
-#: Step2.class:118
-msgid "Integrity test"
-msgstr "Prueba de integridad"
+#: Step1.class:415
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr "Esta función puede ayudarle a evitar una instalacion inservible."
-#: Step2.class:198
-msgid "Keep in mind however, that this process can take a while to
complete."
-msgstr "Tenga presente que este proceso podria tomar varios minutos para
terminar"
+#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169
+msgid "WARNING:"
+msgstr "ADVERTENCIA:"
-#: Step5.class:247
-msgid "Loading partitioning utility ... Please Wait"
-msgstr "Cargando herramienta de particionar (gparted) ... Por favor
espere."
+#: Step1.class:415
+msgid "This process can take a long time to complete."
+msgstr "Este proceso puede ser lento y tomar varios minutos para terminar."
-#: Step5.class:69
-msgid "Loading partitioning utility...Please Wait"
-msgstr "Cargando herramienta de particionar (gparted) ... Por favor
espere."
+#: Step1.class:467
+msgid "Select Installation Source"
+msgstr "Seleccione el medio de instalación"
-#: Step0.class:20
-msgid "Localization Settings"
-msgstr "Valores locales"
+#: Step1.class:485
+msgid "Select Installation source from the list below"
+msgstr "Seleccione la fuente instalacion de esta lista"
-#: Step3a.class:24
-msgid "Locate free (unpartitioned) space on hard disk and install
VectorLinux there."
-msgstr "Utilizar espacio vacío en mi disco duro para intalar VectorLinux
allí"
+#: Step1.class:506
+msgid "Search Again"
+msgstr "Buscar Nuevamente"
-#: Step3.class:170
-msgid "Manually resize my partitions "
-msgstr "Encoger mis particiones manualmente"
+#: Step1.class:530
+msgid "Check Installation media before installing"
+msgstr "Verificar archivos de instalacion"
-#: Step6.class:60
-msgid "Mount Point"
-msgstr "Punto de Montage"
+#: Step2.class:27
+msgid "Verify Installation Files"
+msgstr "Verificar archivos de instalacion antes de instalar"
-#: Step3.class:187
-msgid "My hard drive is already partitioned"
-msgstr "Mi disco duro ya esta particionado"
+#: Step2.class:46
+msgid ""
+"This installation media has already been checked. Would you like to check
it "
+"again?"
+msgstr ""
+"Este medio de instalación ya fué analizado. ¿Le gustaría hacer la prueba "
+"otra vez?"
-#: MdlStartUp.module:55
-msgid "Network Settings"
-msgstr "Valores de Red"
+#: Step2.class:78
+msgid "Verifying data on compressed package"
+msgstr "Verificando la informacion en el paquete comprimido"
-#: FMain.class:298 FMain0.class:282
-msgid "Next"
-msgstr "Siguiente"
+#: Step2.class:82
+msgid "Testing file"
+msgstr "Probando fichero"
-#: Step3a1a.class:169 Step6.class:385
-msgid "No"
-msgstr "No"
+#: Step2.class:82
+msgid "of"
+msgstr "de"
-#: Step3a2.class:65
-msgid "No hard disks found on your system. Please select"
-msgstr "No se pudo encontrar ningún disco duro en este sistema. Por favor
seleccione"
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+"Proceso de verificacion de integridad cancelado a instancias del usuario"
-#: Step6.class:133
-msgid "Not Used"
-msgstr "Sin Utilizar"
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr "Prueba de integridad de archivos cancelado por el usuario"
-#: Step3a1a.class:193
-msgid "Operation cancelled by user. No changes have been made to the
system"
-msgstr "Operación cancelada por el usuario. No se han hecho cambios al
sistema."
+#: Step2.class:115
+msgid "FAILED"
+msgstr "ERROR"
-#: Step5.class:174
-msgid "PARTITIONING DONE"
-msgstr "Particionado ha terminado."
+#: Step2.class:117
+msgid "The following"
+msgstr "Lo siguiente"
+
+#: Step2.class:117
+msgid "required"
+msgstr "requerido"
+
+#: Step2.class:117
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+"falló la prueba de integridad. El futuro de esta instalacion no está "
+"asegurado"
+
+#: Step2.class:118
+msgid "Integrity test"
+msgstr "Prueba de integridad"
#: Step2.class:124
msgid "PASSED"
msgstr "PASÓ"
-#: Step6.class:58
-msgid "Partition"
-msgstr "Partición"
+#: Step2.class:154
+msgid ""
+"has failed the data integrity test. All required packages have passed
this "
+"test"
+msgstr ""
+"falló la prueba de integridad. Todos los paquetes requeridos (vitales)
lo "
+"han pasado"
-#: Step3a1a.class:160
-msgid "Partitioning stage complete. Click"
-msgstr "Proceso de particionado completo. Haz click en "
+#: Step2.class:154
+msgid ""
+"Possible causes for this are a corrupted download or a badly burnt cd.
You "
+"can try the following options"
+msgstr ""
+"Posibles causas de este problema son: una imágen ISO corrupta or no
grabado "
+"en CD correctamente. Intente las siguientes sugerencias."
-#: Step3a2.class:322
-msgid "Partitioning stage complete... Click"
-msgstr "Proceso de particionado completo. Haz click en "
+#: Step2.class:154
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr "Adquiera una nueva imagen de instalación en www.vectorlinux.com"
-#: Step3a2.class:204
-msgid "Please consider using a different partitioning option."
-msgstr "Por favor seleccione otra opción de particionado"
+#: Step2.class:154
+msgid "Burn the image at a lower speed rate"
+msgstr "Quemar la imagen ISO a un ritmo de velocidad mas lento"
-#: Step3a2.class:352
-msgid "Please consider using another partitioning method."
-msgstr "Por favor seleccione otra opción de particionado"
+#: Step2.class:174
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+"Prueba de integridad de los archivos completa . . . Todos los archivos "
+"pasaron."
-#: Step5.class:92
-msgid "Please consider using the automatic partition option, or use other
means of"
-msgstr "Le sugerimos que utilize la opción de particionado automático, ó
cualquiera de las otras opciones disponibles."
+#: Step2.class:181
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+"Todos los archivos pasaron la prueba de integridad. Ya puede continuar
con "
+"la instalación"
-#: Step3a1a.class:53
-msgid "Please make sure the drive or partition is not being used by some
other program"
-msgstr "Por favor asegúrese que el disco ó la partición seleccionada no
esté siendo utilizado por otro programa."
+#: Step2.class:198
+msgid ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
+msgstr "Este proceso puede ayudar a asegurar que la instalacion sea
exitosa."
-#: Step6.class:199
-msgid "Please select only one partition for this purpose"
-msgstr "Por favor seleccione solo una partición para este propósito"
+#: Step2.class:198
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr ""
+"Tenga presente que este proceso podria tomar varios minutos para terminar"
-#: Step3a2.class:191
-msgid "Please wait while your hard drive is being partitioned"
-msgstr "Por favor espere mientras particionamos el disco duro"
+#: Step2.class:198 Step5.class:166
+msgid "Click"
+msgstr "Haz click en"
-#: Step2.class:154
-msgid "Possible causes for this are a corrupted download or a badly burnt
cd. You can try the following options"
-msgstr "Posibles causas de este problema son: una imágen ISO corrupta or
no grabado en CD correctamente. Intente las siguientes sugerencias."
+#: Step2.class:198
+msgid "to abort this process at any time"
+msgstr "Para detener este proceso"
-#: MdlStartUp.module:42
-msgid "Preparation"
-msgstr "Preparación"
+#: Step2.class:366
+msgid "Stop"
+msgstr "Alto"
-#: Step3a1a.class:173
-msgid "Preparing hard disk for new partitioning structure. Please wait"
-msgstr "Preparando su disco duro para la nueva estructura de
particiones... Por favor espere un momento."
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr "Opciones de particionado"
-#: FMain.class:245 FMain0.class:233
-msgid "Process Overview"
-msgstr "Resumen del Proceso"
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr "Seleccione el método de particionado que desea utilizar"
-#: FMain.class:309 FMain0.class:293
-msgid "Quit"
-msgstr "Cancelar"
+#: Step3.class:153
+msgid "Automatic"
+msgstr "Automático"
-#: MdlStartUp.module:53
-msgid "Regional Settings"
-msgstr "Valores Regionales"
+#: Step3.class:163
+msgid ""
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
+msgstr ""
+"Automáticamente encoger particiones existentes al tamaño adecuado para
dejar "
+"espacio para VectorLinux"
-#: Step5.class:19
-msgid "Resize partitions using Gparted"
-msgstr "Ajustar particiones utilizando GParted"
+#: Step3.class:170
+msgid "Manually resize my partitions "
+msgstr "Encoger mis particiones manualmente"
-#: Step3a.class:26
-msgid "Resize your existing partitions to make room for a VectorLinux
partition scheme"
-msgstr "Encoger sus particiones existentes para crear el espacio requerido
por VectorLinux"
+#: Step3.class:180
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+"Utilizar la herramienta de particionado (gparted) para prepara mi
sistema."
-#: Step5.class:256
-msgid "Restart Now"
-msgstr "Reiniciar Ahora"
+#: Step3.class:187
+msgid "My hard drive is already partitioned"
+msgstr "Mi disco duro ya esta particionado"
-#: Step5.class:169
-msgid "SYSTEM RESTART SUGGESTED"
-msgstr "SUGERENCIA: RE-INICIE SU SYSTEMA"
+#: Step3.class:197
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr "Instalar VectorLinux en particiones ya existentes en mi disco duro"
-#: Step1.class:205
-msgid "Scanning"
-msgstr "Buscando en"
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr "Opciones de particionado automático"
-#: Step1.class:192
-msgid "Scanning for CD Media ... Please wait"
-msgstr "Buscando medios de instalacion en CDROM. Por favor espere"
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr "Elija una de las siguentes opciones"
-#: Step1.class:243
-msgid "Scanning system for installable ISO images"
-msgstr "Buscando medios de instalacion en imagenes ISO."
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr "Quiero que VectorLinux utilize el disco completo."
-#: Step1.class:132
-msgid "Scanning system partitions for installation files"
-msgstr "Buscando medios de instalacion en particiones del sistema"
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+"Esta opción eliminará toda la información contenida en el disco que
usted "
+"seleccione."
-#: Step1.class:507
-msgid "Search Again"
-msgstr "Buscar Nuevamente"
+#: Step3a.class:24
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgstr "Utilizar espacio vacío en mi disco duro para intalar VectorLinux
allí"
-#: Step3a2.class:45
-msgid "Searching for unused space on your hard drive... please wait"
-msgstr "Buscando espacio libre en su disco duro ... Por favor espere un
momento."
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr "Esta opción no dañará la información contenida en su disco duro"
-#: Step1.class:468
-msgid "Select Installation Source"
-msgstr "Seleccione el medio de instalacion"
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+"Encoger sus particiones existentes para crear el espacio requerido por "
+"VectorLinux"
-#: Step1.class:486
-msgid "Select Installation source from the list below"
-msgstr "Seleccione la fuente instalacion de esta lista"
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr "Esta opción no dañará la información contenida en su disco duro"
-#: MdlStartUp.module:44
-msgid "Select Language"
-msgstr "Selección de Lenguage"
+#: Step3a.class:122
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+"Utilizar espacio vacío en mi disco para instalar VectorLinux (Crear "
+"particiones nuevas)"
-#: MdlStartUp.module:45
-msgid "Select Media"
-msgstr "Medio de Instalación"
+#: Step3a.class:144
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr "Instalar VectorLinux en el espacio libre de mis partitiones
actuales"
-#: Step3a.class:20
-msgid "Select one of the following options"
-msgstr "Elija una de las siguentes opciones"
+#: Step3a.class:168
+msgid "Use entire disk"
+msgstr "Disco Completo"
-#: Step3a2.class:143
-msgid "Select the location on your hard drive where you would like to
install VectorLinux"
-msgstr "Seleccione el blanco de su installación en el disco duro."
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr "Utilizar el disco completo"
-#: Step3.class:31
-msgid "Select the partitioning method you would like to use"
-msgstr "Seleccione el método de particionado que desea utilizar"
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+"Toda la información que reside en el disco que seleccione será eliminada."
-#: Step6.class:280
-msgid "Select which partitions to use for installation"
-msgstr "Elija las partiiones que se utilizarán en la instalación"
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr "Tamaño del Disco"
-#: Step0.class:284
-msgid "Select your keyboard layout"
-msgstr "Seleccione el diseño de su teclado"
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr "Crear nueva estructura de particiones en"
-#: Step0.class:303
-msgid "Select your keyboard model"
-msgstr "Seleccione el model de su teclado"
+#: Step3a1a.class:53
+msgid "There has been an error deleting"
+msgstr "Ha ocurrido un error borrando"
-#: Step0.class:253
-msgid "Select your language"
-msgstr "Seleccione su idioma"
+#: Step3a1a.class:53
+msgid ""
+"Please make sure the drive or partition is not being used by some other "
+"program"
+msgstr ""
+"Por favor asegúrese que el disco ó la partición seleccionada no esté
siendo "
+"utilizado por otro programa."
-#: Step6.class:59
-msgid "Size"
-msgstr "Tamaño"
+#: Step3a1a.class:56
+msgid ""
+"Error deleting existing partitions... Please try another partitioning
method"
+msgstr ""
+"Ha ocurrido un error mientras borraba las particiones existentes. Por
favor "
+"seleccione otra manera de particionado."
-#: MdlStartUp.module:47
-msgid "Software Selection"
-msgstr "Selección de Software"
+#: Step3a1a.class:82
+msgid "Vectorlinux has detected an existing swap partition in your system."
+msgstr ""
+"VectorLinux ha detectado una particion de intercambio (swap) en sy
sistema."
-#: Step0.class:122
-msgid "Spanish"
-msgstr "Español (España)"
+#: Step3a1a.class:82
+msgid ""
+"Would you like to let VectorLinux use this partition or create a new one?"
+msgstr "¿Desea que VectorLinux utilize esta partición, ó crear una nueva?"
-#: MdlStartUp.module:56
-msgid "Startup Options"
-msgstr "Opciones de Arranque"
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr "Utilizar Existente"
-#: Step2.class:366
-msgid "Stop"
-msgstr "Alto"
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr "Crear Nueva"
-#: MdlStartUp.module:52
-msgid "System Boot Manager"
-msgstr "Gestor de Arranque"
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr ""
+"El intento a formatear las particiones ha fallado, intente con otra
manera "
+"de particionado"
-#: MdlStartUp.module:51
-msgid "System Configuration"
-msgstr "Configuración del Sistema"
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr "Proceso de particionado completo. Haz click en "
-#: Step2.class:82
-msgid "Testing file"
-msgstr "Probando fichero"
+#: Step3a1a.class:160 Step3a2.class:322 Step5.class:166
+msgid "to continue"
+msgstr "para continuar"
-#: Step5.class:92
-msgid "The VectorLinux installer is unable to embed the gparted
partitioning utility."
-msgstr "No se pudo incorporar la herramienta de particionado (gparted)."
+#: Step3a1a.class:169
+msgid "All existing data in"
+msgstr "Toda la información en"
-#: Step2.class:117
-msgid "The following"
-msgstr "Lo siguiente"
+#: Step3a1a.class:169
+msgid "is about to be deleted."
+msgstr "será borrado completamente"
-#: Step3a1a.class:53
-msgid "There has been an error deleting"
-msgstr "Ha ocurrido un error borrando"
+#: Step3a1a.class:169
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr ""
+"Este paso de la instalación no se puede deshacer. ¿Esta seguro de que
quiere "
+"continuar?"
-#: Step1.class:416
-msgid "This feature can help you avoid an unsuccesful installation."
-msgstr "Esta función puede ayudarle a evitar una instalacion inservible."
+#: Step3a1a.class:169 Step6.class:386
+msgid "Yes"
+msgstr "Sí"
-#: Step2.class:46
-msgid "This installation media has already been checked. Would you like to
check it again?"
-msgstr "Este medio de instalación ya fué analizado. ¿Le gustaría hacer la
prueba otra vez?"
+#: Step3a1a.class:169 Step6.class:386
+msgid "No"
+msgstr "No"
-#: Step3a.class:24
-msgid "This option will not harm any data on your hard drive"
-msgstr "Esta opción no dañará la información contenida en su disco duro"
+#: Step3a1a.class:173
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr ""
+"Preparando su disco duro para la nueva estructura de particiones... Por "
+"favor espere un momento."
-#: Step3a.class:26
-msgid "This option will not harm any existing data on your hard drive"
-msgstr "Esta opción no dañará la información contenida en su disco duro"
+#: Step3a1a.class:193
+msgid "Operation cancelled by user. No changes have been made to the
system"
+msgstr ""
+"Operación cancelada por el usuario. No se han hecho cambios al sistema."
-#: Step3a.class:22
-msgid "This option will wipe out any data on the disk you select."
-msgstr "Esta opción eliminará toda la información contenida en el disco
que usted seleccione."
+#: Step3a2.class:25
+msgid "Install VectorLinux to free space on disk"
+msgstr "Instalar VectorLinux en el espacio vacío de mi disco duro"
-#: Step1.class:416
-msgid "This process can take a long time to complete."
-msgstr "Este proceso puede ser lento y tomar varios minutos para terminar."
+#: Step3a2.class:45
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+"Buscando espacio libre en su disco duro ... Por favor espere un momento."
-#: Step3a1a.class:169
-msgid "This step cannot be undone. Are you sure you want to continue?"
-msgstr "Este paso de la instalación no se puede deshacer. ¿Esta seguro de
que quiere continuar?"
+#: Step3a2.class:65
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+"No se pudo encontrar ningún disco duro en este sistema. Por favor
seleccione"
-#: Step3a1.class:68
-msgid "Total Disc Size"
-msgstr "Tamaño del Disco"
+#: Step3a2.class:65
+msgid "Another partitioning option"
+msgstr "Otra opción para particionar."
-#: Step3a2.class:354
-msgid "Unable to find any hard drives with enough unpartitioned space.
Please go back and select another partitioning method"
-msgstr "No se ha encontrado ningún disco que contenga suficiento espacio
libre para continuar. Por favor regrese y elija otro método de particionado"
+#: Step3a2.class:92
+msgid "(Recomended)"
+msgstr "(Sugerido)"
-#: Step3a2.class:204
-msgid "Unable to find enough un-used space to perform auto-partition."
-msgstr "No hay suficiente espacio vacío en su sistema para particionar
automáticamente"
+#: Step3a2.class:102
+msgid "of free space"
+msgstr "de espacio libre"
-#: Step3a2.class:206
-msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
-msgstr "No se encontró suficiente espacio libre para particionar el
sistema automáticamente. Por favor utilize otro modo de particionado."
+#: Step3a2.class:143
+msgid ""
+"Select the location on your hard drive where you would like to install "
+"VectorLinux"
+msgstr "Seleccione el blanco de su installación en el disco duro."
-#: MdlMain.module:33
-msgid "Unable to format"
-msgstr "No se pudo formatear"
+#: Step3a2.class:191
+msgid "Please wait while your hard drive is being partitioned"
+msgstr "Por favor espere mientras particionamos el disco duro"
-#: Step3a1.class:20
-msgid "Use Entire Hard Disk for VectorLinux"
-msgstr "Utilizar el disco completo"
+#: Step3a2.class:204
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+"No hay suficiente espacio vacío en su sistema para particionar "
+"automáticamente"
-#: Step3a1a.class:82
-msgid "Use Existing"
-msgstr "Utilizar Existente"
+#: Step3a2.class:204
+msgid "Please consider using a different partitioning option."
+msgstr "Por favor seleccione otra opción de particionado"
-#: Step3a.class:168
-msgid "Use entire disk"
-msgstr "Disco Completo"
+#: Step3a2.class:206
+msgid ""
+"Unable to find enough un-used space to perform auto-partition. Please "
+"consider using a different partitioning option."
+msgstr ""
+"No se encontró suficiente espacio libre para particionar el sistema "
+"automáticamente. Por favor utilize otro modo de particionado."
-#: Step3a.class:144
-msgid "Use free space on existing partitions for VectorLinux"
-msgstr "Instalar VectorLinux en el espacio libre de mis partitiones
actuales"
+#: Step3a2.class:322
+msgid "Partitioning stage complete... Click"
+msgstr "Proceso de particionado completo. Haz click en "
-#: Step3.class:180
-msgid "Use the partitioning tool to prepare your system partitions."
-msgstr "Utilizar la herramienta de particionado (gparted) para prepara mi
sistema."
+#: Step3a2.class:352
+msgid ""
+"We are unable to find any hard disks with enough unpartitioned space for "
+"this operation."
+msgstr ""
+"No se ha encontrado ningún disco con suficiente espacio vacío para
utilizar "
+"esta función"
-#: Step0.class:325
-msgid "Use this box to test your keyboard settings"
-msgstr "Area de prueba"
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr "Por favor seleccione otra opción de particionado"
-#: Step3a.class:122
-msgid "Use unpartitioned space on my hard disk (creates new partitions)"
-msgstr "Utilizar espacio vacío en mi disco para instalar VectorLinux
(Crear particiones nuevas)"
+#: Step3a2.class:354
+msgid ""
+"Unable to find any hard drives with enough unpartitioned space. Please
go "
+"back and select another partitioning method"
+msgstr ""
+"No se ha encontrado ningún disco que contenga suficiento espacio libre
para "
+"continuar. Por favor regrese y elija otro método de particionado"
-#: MdlStartUp.module:54
-msgid "User Accounts"
-msgstr "Usuarios"
+#: Step3a3.class:22
+msgid "Claim free space from existing partitions"
+msgstr "Utilizar espacio libre en las particiones que ya existen"
-#: Step1.class:339
-msgid "VERSION"
-msgstr "VERSION"
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr "Crear las particiones necesarias automáticamente"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr "Ajustar particiones utilizando GParted"
-#: Step5.class:114
-msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
-msgstr "VectorLinux ha integrado la herramienta de particionado (gparted).
Use esta para"
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+"No se pudo encontrar GParted en este sistema. Por favor instale gparted
e "
+"intente otra vez."
-#: Step3a1a.class:82
-msgid "Vectorlinux has detected an existing swap partition in your system."
-msgstr "VectorLinux ha detectado una particion de intercambio (swap) en sy
sistema."
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr "Cargando herramienta de particionar (gparted) ... Por favor
espere."
-#: Step2.class:27
-msgid "Verify Installation Files"
-msgstr "Verificar archivos de instalacion antes de instalar"
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr "No se pudo incorporar la herramienta de particionado (gparted)."
-#: Step2.class:78
-msgid "Verifying data on compressed package"
-msgstr "Verificando la informacion en el paquete comprimido"
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+"Le sugerimos que utilize la opción de particionado automático, ó
cualquiera "
+"de las otras opciones disponibles."
-#: Step2.class:198
-msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
-msgstr "Este proceso puede ayudar a asegurar que la instalacion sea
exitosa."
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr "particionar sus discos duros"
-#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
-msgid "WARNING:"
-msgstr "ADVERTENCIA:"
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+"VectorLinux ha integrado la herramienta de particionado (gparted). Use
esta "
+"para"
-#: Step3a2.class:352
-msgid "We are unable to find any hard disks with enough unpartitioned
space for this operation."
-msgstr "No se ha encontrado ningún disco con suficiente espacio vacío para
utilizar esta función"
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr "mover, reajustar, borrar o crear nuevas particiones."
#: Step5.class:114
msgid "When you are finished, you will need to exit the utility from the"
msgstr "Cuando haya terminado, necesitará cerrar la aplicacion del menú"
-#: Step3a1a.class:82
-msgid "Would you like to let VectorLinux use this partition or create a
new one?"
-msgstr "¿Desea que VectorLinux utilize esta partición, ó crear una nueva?"
+#: Step5.class:114
+msgid "GParted"
+msgstr "GParted"
-#: Step3a1a.class:169 Step6.class:385
-msgid "Yes"
-msgstr "Sí"
+#: Step5.class:114
+msgid "menu"
+msgstr "menú"
-#: Step6.class:199
-msgid "You have already selected"
-msgstr "Ya se ha seleccionado"
+#: Step5.class:161
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr "SUGERENCIA: RE-INICIE SU SYSTEMA"
-#: Step5.class:190
-msgid "Your computer will restart in 10 seconds"
-msgstr "Su sistema re-iniciará en 10 segundos"
+#: Step5.class:161
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+"Su sistema aún contiene particiones propias de otros sistemas operativos.
Si "
+"alguna de estas aún tiene una instalacion de Windows, le recomendamos"
-#: Step5.class:169
-msgid "Your system still contains some non-linux partitions. If you still
have a Windows operating system in...
[truncated message content] |
|
From: <cod...@go...> - 2009-02-16 22:25:25
|
Author: M0...@gm...
Date: Mon Feb 16 13:55:19 2009
New Revision: 495
Modified:
branches/speedy/Step5.class
Log:
Implemented new bullett set by Blurymind
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Mon Feb 16 13:55:19 2009
@@ -138,15 +138,7 @@
sWinPartList = Trim(sWinPartList)
IF sWinPartList THEN RETURN TRUE
RETURN FALSE
-
- ' IF sFAT32List <> "" THEN
- ' RETURN TRUE ' reboot needed
- ' ELSE IF sFATList <> "" THEN
- ' RETURN TRUE ' reboot needed
- ' ELSE
- ' RETURN FALSE ' no reboot needed
- ' END IF
-
+
END
|
|
From: <cod...@go...> - 2009-02-16 22:15:34
|
Author: M0...@gm...
Date: Mon Feb 16 13:53:24 2009
New Revision: 494
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlStartUp.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step5.pot
branches/speedy/.lang/en_US.po
branches/speedy/.lang/es.mo
branches/speedy/.lang/es.po
branches/speedy/.project
branches/speedy/MdlStartUp.module
branches/speedy/Step2.form
branches/speedy/Step3.form
branches/speedy/Step3a.form
branches/speedy/Step3a1.form
branches/speedy/Step3a2.class
branches/speedy/Step3a2.form
branches/speedy/Step5.class
branches/speedy/images/category.png
branches/speedy/images/done.png
branches/speedy/images/now.png
branches/speedy/images/square.png
Log:
Updated es_ES translation
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Feb 16 13:53:24 2009
@@ -38,6 +38,66 @@
msgid "to"
msgstr ""
+#: MdlStartUp.module:42
+msgid "Preparation"
+msgstr ""
+
+#: MdlStartUp.module:44
+msgid "Select Language"
+msgstr ""
+
+#: MdlStartUp.module:45
+msgid "Select Media"
+msgstr ""
+
+#: MdlStartUp.module:46
+msgid "Disk Partitioning"
+msgstr ""
+
+#: MdlStartUp.module:47
+msgid "Software Selection"
+msgstr ""
+
+#: MdlStartUp.module:48
+msgid "Installation"
+msgstr ""
+
+#: MdlStartUp.module:49
+msgid "Installation Summary"
+msgstr ""
+
+#: MdlStartUp.module:50
+msgid "Install VectorLinux"
+msgstr ""
+
+#: MdlStartUp.module:51
+msgid "System Configuration"
+msgstr ""
+
+#: MdlStartUp.module:52
+msgid "System Boot Manager"
+msgstr ""
+
+#: MdlStartUp.module:53
+msgid "Regional Settings"
+msgstr ""
+
+#: MdlStartUp.module:54
+msgid "User Accounts"
+msgstr ""
+
+#: MdlStartUp.module:55
+msgid "Network Settings"
+msgstr ""
+
+#: MdlStartUp.module:56
+msgid "Startup Options"
+msgstr ""
+
+#: MdlStartUp.module:57
+msgid "Final Configuration"
+msgstr ""
+
#: Step0.class:20
msgid "Localization Settings"
msgstr ""
@@ -226,7 +286,7 @@
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:198
+#: Step2.class:198 Step5.class:174
msgid "Click"
msgstr ""
@@ -234,10 +294,6 @@
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:352
-msgid "TextLabel2"
-msgstr ""
-
#: Step2.class:366
msgid "Stop"
msgstr ""
@@ -250,10 +306,6 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:135 Step3a.class:111 Step3a1.class:157
-msgid "TextLabel1"
-msgstr ""
-
#: Step3.class:153
msgid "Automatic"
msgstr ""
@@ -339,10 +391,6 @@
msgid "Total Disc Size"
msgstr ""
-#: Step3a1.class:179 Step3a2.class:455
-msgid "RadioButton1"
-msgstr ""
-
#: Step3a1a.class:21
msgid "Create Linux Partition Scheme in"
msgstr ""
@@ -387,7 +435,7 @@
msgid "Partitioning stage complete. Click"
msgstr ""
-#: Step3a1a.class:160
+#: Step3a1a.class:160 Step3a2.class:322 Step5.class:174
msgid "to continue"
msgstr ""
@@ -468,7 +516,7 @@
msgstr ""
#: Step3a2.class:322
-msgid "Partitioning stage complete... Click next to continue"
+msgid "Partitioning stage complete... Click"
msgstr ""
#: Step3a2.class:352
@@ -573,10 +621,6 @@
#: Step5.class:174
msgid "PARTITIONING DONE"
-msgstr ""
-
-#: Step5.class:174
-msgid "CLick next to continue"
msgstr ""
#: Step5.class:190
Modified: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- branches/speedy/.lang/MdlStartUp.pot (original)
+++ branches/speedy/.lang/MdlStartUp.pot Mon Feb 16 13:53:24 2009
@@ -14,3 +14,63 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: MdlStartUp.module:42
+msgid "Preparation"
+msgstr ""
+
+#: MdlStartUp.module:44
+msgid "Select Language"
+msgstr ""
+
+#: MdlStartUp.module:45
+msgid "Select Media"
+msgstr ""
+
+#: MdlStartUp.module:46
+msgid "Disk Partitioning"
+msgstr ""
+
+#: MdlStartUp.module:47
+msgid "Software Selection"
+msgstr ""
+
+#: MdlStartUp.module:48
+msgid "Installation"
+msgstr ""
+
+#: MdlStartUp.module:49
+msgid "Installation Summary"
+msgstr ""
+
+#: MdlStartUp.module:50
+msgid "Install VectorLinux"
+msgstr ""
+
+#: MdlStartUp.module:51
+msgid "System Configuration"
+msgstr ""
+
+#: MdlStartUp.module:52
+msgid "System Boot Manager"
+msgstr ""
+
+#: MdlStartUp.module:53
+msgid "Regional Settings"
+msgstr ""
+
+#: MdlStartUp.module:54
+msgid "User Accounts"
+msgstr ""
+
+#: MdlStartUp.module:55
+msgid "Network Settings"
+msgstr ""
+
+#: MdlStartUp.module:56
+msgid "Startup Options"
+msgstr ""
+
+#: MdlStartUp.module:57
+msgid "Final Configuration"
+msgstr ""
+
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Mon Feb 16 13:53:24 2009
@@ -106,10 +106,6 @@
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:352
-msgid "TextLabel2"
-msgstr ""
-
#: Step2.class:366
msgid "Stop"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Mon Feb 16 13:53:24 2009
@@ -22,10 +22,6 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:135
-msgid "TextLabel1"
-msgstr ""
-
#: Step3.class:153
msgid "Automatic"
msgstr ""
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Mon Feb 16 13:53:24 2009
@@ -46,10 +46,6 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:111
-msgid "TextLabel1"
-msgstr ""
-
#: Step3a.class:122
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Mon Feb 16 13:53:24 2009
@@ -30,11 +30,3 @@
msgid "Total Disc Size"
msgstr ""
-#: Step3a1.class:157
-msgid "TextLabel1"
-msgstr ""
-
-#: Step3a1.class:179
-msgid "RadioButton1"
-msgstr ""
-
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Mon Feb 16 13:53:24 2009
@@ -59,7 +59,11 @@
msgstr ""
#: Step3a2.class:322
-msgid "Partitioning stage complete... Click next to continue"
+msgid "Partitioning stage complete... Click"
+msgstr ""
+
+#: Step3a2.class:322
+msgid "to continue"
msgstr ""
#: Step3a2.class:352
@@ -72,9 +76,5 @@
#: Step3a2.class:354
msgid "Unable to find any hard drives with enough unpartitioned space.
Please go back and select another partitioning method"
-msgstr ""
-
-#: Step3a2.class:455
-msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Mon Feb 16 13:53:24 2009
@@ -87,7 +87,11 @@
msgstr ""
#: Step5.class:174
-msgid "CLick next to continue"
+msgid "Click"
+msgstr ""
+
+#: Step5.class:174
+msgid "to continue"
msgstr ""
#: Step5.class:190
Modified: branches/speedy/.lang/en_US.po
==============================================================================
--- branches/speedy/.lang/en_US.po (original)
+++ branches/speedy/.lang/en_US.po Mon Feb 16 13:53:24 2009
@@ -30,6 +30,74 @@
msgid "Quit"
msgstr "Quit"
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr ""
+
+#: MdlMain.module:33
+msgid "to"
+msgstr ""
+
+#: MdlStartUp.module:42
+msgid "Preparation"
+msgstr ""
+
+#: MdlStartUp.module:44
+msgid "Select Language"
+msgstr ""
+
+#: MdlStartUp.module:45
+msgid "Select Media"
+msgstr ""
+
+#: MdlStartUp.module:46
+msgid "Disk Partitioning"
+msgstr ""
+
+#: MdlStartUp.module:47
+msgid "Software Selection"
+msgstr ""
+
+#: MdlStartUp.module:48
+msgid "Installation"
+msgstr ""
+
+#: MdlStartUp.module:49
+msgid "Installation Summary"
+msgstr ""
+
+#: MdlStartUp.module:50
+msgid "Install VectorLinux"
+msgstr ""
+
+#: MdlStartUp.module:51
+msgid "System Configuration"
+msgstr ""
+
+#: MdlStartUp.module:52
+msgid "System Boot Manager"
+msgstr ""
+
+#: MdlStartUp.module:53
+msgid "Regional Settings"
+msgstr ""
+
+#: MdlStartUp.module:54
+msgid "User Accounts"
+msgstr ""
+
+#: MdlStartUp.module:55
+msgid "Network Settings"
+msgstr ""
+
+#: MdlStartUp.module:56
+msgid "Startup Options"
+msgstr ""
+
+#: MdlStartUp.module:57
+msgid "Final Configuration"
+msgstr ""
+
#: Step0.class:20
msgid "Localization Settings"
msgstr "Localization Settings"
@@ -62,68 +130,67 @@
msgid "on"
msgstr "on"
-#: Step1.class:130
+#: Step1.class:132
msgid "Scanning system partitions for installation files"
msgstr "Scanning system partitions for installation files"
-#: Step1.class:149
+#: Step1.class:151
msgid "Found"
msgstr "Found"
-#: Step1.class:149
+#: Step1.class:151
msgid "in partition"
msgstr "in partition"
-#: Step1.class:190
+#: Step1.class:192
msgid "Scanning for CD Media ... Please wait"
msgstr "Scanning for CD Media ... Please wait"
-#: Step1.class:203
+#: Step1.class:205
msgid "Scanning"
msgstr "Scanning"
-#: Step1.class:213
+#: Step1.class:215
msgid "in"
msgstr "in"
-#: Step1.class:241
+#: Step1.class:243
msgid "Scanning system for installable ISO images"
msgstr "Scanning system for installable ISO images"
-#: Step1.class:334
+#: Step1.class:336
msgid "DISTRIBUTION"
msgstr "DISTRIBUTION"
-#: Step1.class:337
+#: Step1.class:339
msgid "VERSION"
msgstr "VERSION"
-#: Step1.class:414
+#: Step1.class:416
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414
+#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step1.class:414
-#, fuzzy
+#: Step1.class:416
msgid "This process can take a long time to complete."
-msgstr "Keep in mind however, that this process can take a while to
complete."
+msgstr ""
-#: Step1.class:466
+#: Step1.class:468
msgid "Select Installation Source"
msgstr "Select Installation Source"
-#: Step1.class:484
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr "Select Installation source from the list below"
-#: Step1.class:505
+#: Step1.class:507
msgid "Search Again"
msgstr "Search Again"
-#: Step1.class:529
+#: Step1.class:531
msgid "Check Installation media before installing"
msgstr "Check Installation media before installing"
@@ -221,7 +288,7 @@
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr "Keep in mind however, that this process can take a while to
complete."
-#: Step2.class:198
+#: Step2.class:198 Step5.class:174
msgid "Click"
msgstr ""
@@ -229,10 +296,6 @@
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:352
-msgid "TextLabel2"
-msgstr ""
-
#: Step2.class:366
msgid "Stop"
msgstr ""
@@ -245,33 +308,29 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:110
-msgid "TextLabel1"
-msgstr ""
-
-#: Step3.class:150
+#: Step3.class:153
msgid "Automatic"
msgstr ""
-#: Step3.class:160
+#: Step3.class:163
msgid ""
"Automatically resize your partitions and / or create the correct disk
space "
"for VectorLinux."
msgstr ""
-#: Step3.class:167
+#: Step3.class:170
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:177
+#: Step3.class:180
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:184
+#: Step3.class:187
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:194
+#: Step3.class:197
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
@@ -310,20 +369,104 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:121
+#: Step3a.class:122
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:142
+#: Step3a.class:144
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:163
+#: Step3a.class:168
msgid "Use entire disk"
msgstr ""
-#: Step3a1.class:19
-msgid "Use Entire Hard Disk"
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr ""
+
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr ""
+
+#: Step3a1a.class:53
+msgid "There has been an error deleting"
+msgstr ""
+
+#: Step3a1a.class:53
+msgid ""
+"Please make sure the drive or partition is not being used by some other "
+"program"
+msgstr ""
+
+#: Step3a1a.class:56
+msgid ""
+"Error deleting existing partitions... Please try another partitioning
method"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Vectorlinux 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?"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr ""
+
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr ""
+
+#: Step3a1a.class:160 Step3a2.class:322 Step5.class:174
+msgid "to continue"
+msgstr ""
+
+#: Step3a1a.class:169
+msgid "All existing data in"
+msgstr ""
+
+#: Step3a1a.class:169
+msgid "is about to be deleted."
+msgstr ""
+
+#: Step3a1a.class:169
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr ""
+
+#: Step3a1a.class:169 Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step3a1a.class:169 Step6.class:385
+msgid "No"
+msgstr ""
+
+#: Step3a1a.class:173
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr ""
+
+#: Step3a1a.class:193
+msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
#: Step3a2.class:25
@@ -356,33 +499,45 @@
"VectorLinux"
msgstr ""
-#: Step3a2.class:189
+#: Step3a2.class:191
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:206
msgid ""
"Unable to find enough un-used space to perform auto-partition. Please "
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:309
-msgid "Partitioning stage complete... Click next to continue"
+#: Step3a2.class:322
+msgid "Partitioning stage complete... Click"
+msgstr ""
+
+#: Step3a2.class:352
+msgid ""
+"We are unable to find any hard disks with enough unpartitioned space for "
+"this operation."
msgstr ""
-#: Step3a2.class:422
-msgid "RadioButton1"
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr ""
+
+#: Step3a2.class:354
+msgid ""
+"Unable to find any hard drives with enough unpartitioned space. Please
go "
+"back and select another partitioning method"
msgstr ""
-#: Step3a3.class:6
+#: Step3a3.class:22
msgid "Claim free space from existing partitions"
msgstr ""
@@ -470,10 +625,6 @@
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:174
-msgid "CLick next to continue"
-msgstr ""
-
#: Step5.class:190
msgid "Your computer will restart in 10 seconds"
msgstr ""
@@ -487,9 +638,8 @@
msgstr ""
#: Step6.class:58
-#, fuzzy
msgid "Partition"
-msgstr "in partition"
+msgstr ""
#: Step6.class:59
msgid "Size"
@@ -520,23 +670,13 @@
msgstr ""
#: Step6.class:199
-#, fuzzy
msgid "partition."
-msgstr "in partition"
+msgstr ""
#: Step6.class:199
msgid "Please select only one partition for this purpose"
msgstr ""
#: Step6.class:280
-#, fuzzy
msgid "Select which partitions to use for installation"
-msgstr "Scanning system partitions for installation files"
-
-#: Step6.class:385
-msgid "Yes"
-msgstr ""
-
-#: Step6.class:385
-msgid "No"
msgstr ""
Modified: branches/speedy/.lang/es.mo
==============================================================================
Binary files. No diff available.
Modified: branches/speedy/.lang/es.po
==============================================================================
--- branches/speedy/.lang/es.po (original)
+++ branches/speedy/.lang/es.po Mon Feb 16 13:53:24 2009
@@ -10,533 +10,639 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
+#: Step3a2.class:92
+msgid "(Recomended)"
+msgstr "(Sugerido)"
-#: FMain.class:245 FMain0.class:233
-msgid "Process Overview"
-msgstr "Resumen del Proceso"
+#: Step3a1a.class:169
+msgid "All existing data in"
+msgstr "Toda la información en"
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr "Toda la información que reside en el disco que seleccione será
eliminada."
+
+#: Step2.class:181
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr "Todos los archivos pasaron la prueba de integridad. Ya puede
continuar con la instalación"
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr "Quiero que VectorLinux utilize el disco completo."
+
+#: Step3a2.class:65
+msgid "Another partitioning option"
+msgstr "Otra opción para particionar."
+
+#: Step3.class:153
+msgid "Automatic"
+msgstr "Automático"
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr "Crear las particiones necesarias automáticamente"
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr "Opciones de particionado automático"
+
+#: Step3.class:163
+msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
+msgstr "Automáticamente encoger particiones existentes al tamaño adecuado
para dejar espacio para VectorLinux"
#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr "Regreso"
-#: FMain.class:298 FMain0.class:282
-msgid "Next"
-msgstr "Siguiente"
+#: Step2.class:154
+msgid "Burn the image at a lower speed rate"
+msgstr "Quemar la imagen ISO a un ritmo de velocidad mas lento"
-#: FMain.class:309 FMain0.class:293
-msgid "Quit"
-msgstr "Cancelar"
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr "Proceso de verificacion de integridad cancelado a instancias del
usuario"
-#: Step0.class:20
-msgid "Localization Settings"
-msgstr "Valores locales"
+#: Step1.class:531
+msgid "Check Installation media before installing"
+msgstr "Verificar archivos de instalacion"
-#: Step0.class:122
-msgid "Spanish"
-msgstr ""
+#: Step3a3.class:22
+msgid "Claim free space from existing partitions"
+msgstr "Utilizar espacio libre en las particiones que ya existen"
+
+#: Step2.class:198 Step5.class:174
+msgid "Click"
+msgstr "Haz click en"
+
+#: Step5.class:169
+msgid "Click the"
+msgstr "Haz click en"
+
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr "Crear nueva estructura de particiones en"
+
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr "Crear Nueva"
+
+#: Step1.class:336
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUCION"
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr "Prueba de integridad de archivos cancelado por el usuario"
+
+#: Step2.class:174
+msgid "Data integrity test complete... all tests passed"
+msgstr "Prueba de integridad de los archivos completa . . . Todos los
archivos pasaron."
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr "Opciones de particionado"
+
+#: MdlStartUp.module:46
+msgid "Disk Partitioning"
+msgstr "Particiones"
+
+#: Step6.class:154
+msgid "Do not format"
+msgstr "Sin formatear"
+
+#: Step2.class:154
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr "Adquiera una nueva imagen de instalación en www.vectorlinux.com"
#: Step0.class:125
msgid "English (US)"
-msgstr ""
+msgstr "Inglés (EE.UU)"
-#: Step0.class:253
-msgid "Select your language"
-msgstr "Seleccione su idioma"
+#: Step3a1a.class:56
+msgid "Error deleting existing partitions... Please try another
partitioning method"
+msgstr "Ha ocurrido un error mientras borraba las particiones existentes.
Por favor seleccione otra manera de particionado."
-#: Step0.class:284
-msgid "Select your keyboard layout"
-msgstr "Seleccione el diseño de su teclado"
+#: Step2.class:115
+msgid "FAILED"
+msgstr "ERROR"
-#: Step0.class:303
-msgid "Select your keyboard model"
-msgstr "Seleccione el model de su teclado"
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr "El intento a formatear las particiones ha fallado, intente con
otra manera de particionado"
-#: Step0.class:325
-msgid "Use this box to test your keyboard settings"
-msgstr "Area de prueba"
-
-#: Step1.class:33
-msgid "on"
-msgstr "en"
+#: Step6.class:61
+msgid "File System"
+msgstr "Systema de Archivos"
-#: Step1.class:130
-msgid "Scanning system partitions for installation files"
-msgstr "Buscando medios de instalacion en particiones del sistema"
+#: MdlStartUp.module:57
+msgid "Final Configuration"
+msgstr "Configuración Final"
-#: Step1.class:149
+#: Step1.class:151
msgid "Found"
msgstr "Encontre"
-#: Step1.class:149
-msgid "in partition"
-msgstr "en particion"
+#: Step5.class:114
+msgid "GParted"
+msgstr "GParted"
-#: Step1.class:190
-msgid "Scanning for CD Media ... Please wait"
-msgstr "Buscando medios de instalacion en CDROM. Por favor espere"
+#: Step5.class:64
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr "No se pudo encontrar GParted en este sistema. Por favor instale
gparted e intente otra vez."
-#: Step1.class:203
-msgid "Scanning"
-msgstr "Buscando en"
+#: MdlStartUp.module:50
+msgid "Install VectorLinux"
+msgstr "Instalar VectorLinux"
-#: Step1.class:213
-msgid "in"
-msgstr "en"
+#: Step3.class:197
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr "Instalar VectorLinux en particiones ya existentes en mi disco duro"
-#: Step1.class:241
-msgid "Scanning system for installable ISO images"
-msgstr "Buscando medios de instalacion en imagenes ISO."
+#: Step3a2.class:25
+msgid "Install VectorLinux to free space on disk"
+msgstr "Instalar VectorLinux en el espacio vacío de mi disco duro"
-#: Step1.class:334
-msgid "DISTRIBUTION"
-msgstr "DISTRIBUCION"
+#: MdlStartUp.module:48
+msgid "Installation"
+msgstr "Instalación"
+
+#: MdlStartUp.module:49
+msgid "Installation Summary"
+msgstr "Resumen de la instalación"
-#: Step1.class:337
-msgid "VERSION"
-msgstr "VERSION"
+#: Step2.class:118
+msgid "Integrity test"
+msgstr "Prueba de integridad"
-#: Step1.class:414
-msgid "This feature can help you avoid an unsuccesful installation."
-msgstr ""
+#: Step2.class:198
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr "Tenga presente que este proceso podria tomar varios minutos para
terminar"
-#: Step1.class:414
-msgid "WARNING:"
-msgstr ""
+#: Step5.class:247
+msgid "Loading partitioning utility ... Please Wait"
+msgstr "Cargando herramienta de particionar (gparted) ... Por favor
espere."
-#: Step1.class:414
-#, fuzzy
-msgid "This process can take a long time to complete."
-msgstr ""
-"Tenga presente que este proceso podria tomar varios minutos para terminar"
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr "Cargando herramienta de particionar (gparted) ... Por favor
espere."
-#: Step1.class:466
-msgid "Select Installation Source"
-msgstr "Seleccione el medio de instalacion"
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Valores locales"
-#: Step1.class:484
-msgid "Select Installation source from the list below"
-msgstr "Seleccione la fuente instalacion de esta lista"
+#: Step3a.class:24
+msgid "Locate free (unpartitioned) space on hard disk and install
VectorLinux there."
+msgstr "Utilizar espacio vacío en mi disco duro para intalar VectorLinux
allí"
-#: Step1.class:505
-msgid "Search Again"
-msgstr "Buscar Nuevamente"
+#: Step3.class:170
+msgid "Manually resize my partitions "
+msgstr "Encoger mis particiones manualmente"
-#: Step1.class:529
-msgid "Check Installation media before installing"
-msgstr "Verificar archivos de instalacion"
+#: Step6.class:60
+msgid "Mount Point"
+msgstr "Punto de Montage"
-#: Step2.class:27
-msgid "Verify Installation Files"
-msgstr "Verificar archivos de instalacion antes de instalar"
+#: Step3.class:187
+msgid "My hard drive is already partitioned"
+msgstr "Mi disco duro ya esta particionado"
-#: Step2.class:46
-msgid ""
-"This installation media has already been checked. Would you like to check
it "
-"again?"
-msgstr ""
+#: MdlStartUp.module:55
+msgid "Network Settings"
+msgstr "Valores de Red"
-#: Step2.class:78
-msgid "Verifying data on compressed package"
-msgstr ""
+#: FMain.class:298 FMain0.class:282
+msgid "Next"
+msgstr "Siguiente"
-#: Step2.class:82
-msgid "Testing file"
-msgstr ""
+#: Step3a1a.class:169 Step6.class:385
+msgid "No"
+msgstr "No"
-#: Step2.class:82
-msgid "of"
-msgstr ""
+#: Step3a2.class:65
+msgid "No hard disks found on your system. Please select"
+msgstr "No se pudo encontrar ningún disco duro en este sistema. Por favor
seleccione"
-#: Step2.class:101
-msgid "Canceling data integrity tests per user request"
-msgstr ""
+#: Step6.class:133
+msgid "Not Used"
+msgstr "Sin Utilizar"
-#: Step2.class:102
-msgid "Data integrity test canceled by user."
-msgstr ""
+#: Step3a1a.class:193
+msgid "Operation cancelled by user. No changes have been made to the
system"
+msgstr "Operación cancelada por el usuario. No se han hecho cambios al
sistema."
-#: Step2.class:115
-msgid "FAILED"
-msgstr ""
+#: Step5.class:174
+msgid "PARTITIONING DONE"
+msgstr "Particionado ha terminado."
-#: Step2.class:117
-msgid "The following"
-msgstr ""
+#: Step2.class:124
+msgid "PASSED"
+msgstr "PASÓ"
-#: Step2.class:117
-msgid "required"
-msgstr ""
+#: Step6.class:58
+msgid "Partition"
+msgstr "Partición"
-#: Step2.class:117
-msgid "has failed the integrity test. It is not safe to continue"
-msgstr ""
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr "Proceso de particionado completo. Haz click en "
+
+#: Step3a2.class:322
+msgid "Partitioning stage complete... Click"
+msgstr "Proceso de particionado completo. Haz click en "
-#: Step2.class:118
-msgid "Integrity test"
-msgstr ""
+#: Step3a2.class:204
+msgid "Please consider using a different partitioning option."
+msgstr "Por favor seleccione otra opción de particionado"
-#: Step2.class:124
-msgid "PASSED"
-msgstr ""
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr "Por favor seleccione otra opción de particionado"
-#: Step2.class:154
-msgid ""
-"has failed the data integrity test. All required packages have passed
this "
-"test"
-msgstr ""
+#: Step5.class:92
+msgid "Please consider using the automatic partition option, or use other
means of"
+msgstr "Le sugerimos que utilize la opción de particionado automático, ó
cualquiera de las otras opciones disponibles."
-#: Step2.class:154
-msgid ""
-"Possible causes for this are a corrupted download or a badly burnt cd.
You "
-"can try the following options"
-msgstr ""
+#: Step3a1a.class:53
+msgid "Please make sure the drive or partition is not being used by some
other program"
+msgstr "Por favor asegúrese que el disco ó la partición seleccionada no
esté siendo utilizado por otro programa."
-#: Step2.class:154
-msgid "Download a new installation image from www.vectorlinux.com"
-msgstr ""
+#: Step6.class:199
+msgid "Please select only one partition for this purpose"
+msgstr "Por favor seleccione solo una partición para este propósito"
+
+#: Step3a2.class:191
+msgid "Please wait while your hard drive is being partitioned"
+msgstr "Por favor espere mientras particionamos el disco duro"
#: Step2.class:154
-msgid "Burn the image at a lower speed rate"
-msgstr ""
+msgid "Possible causes for this are a corrupted download or a badly burnt
cd. You can try the following options"
+msgstr "Posibles causas de este problema son: una imágen ISO corrupta or
no grabado en CD correctamente. Intente las siguientes sugerencias."
-#: Step2.class:174
-msgid "Data integrity test complete... all tests passed"
-msgstr ""
+#: MdlStartUp.module:42
+msgid "Preparation"
+msgstr "Preparación"
+
+#: Step3a1a.class:173
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr "Preparando su disco duro para la nueva estructura de
particiones... Por favor espere un momento."
-#: Step2.class:181
-msgid "All test passed. It is safe to continue with the installation
process."
-msgstr ""
-
-#: Step2.class:198
-msgid ""
-"Verifying installation files can prevent you from performing an
unsuccessful "
-"install"
-msgstr "Este proceso puede ayudar a asegurar que la instalacion sea
exitosa."
+#: FMain.class:245 FMain0.class:233
+msgid "Process Overview"
+msgstr "Resumen del Proceso"
-#: Step2.class:198
-msgid "Keep in mind however, that this process can take a while to
complete."
-msgstr ""
-"Tenga presente que este proceso podria tomar varios minutos para terminar"
+#: FMain.class:309 FMain0.class:293
+msgid "Quit"
+msgstr "Cancelar"
-#: Step2.class:198
-msgid "Click"
-msgstr ""
+#: MdlStartUp.module:53
+msgid "Regional Settings"
+msgstr "Valores Regionales"
-#: Step2.class:198
-msgid "to abort this process at any time"
-msgstr ""
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr "Ajustar particiones utilizando GParted"
-#: Step2.class:352
-msgid "TextLabel2"
-msgstr ""
+#: Step3a.class:26
+msgid "Resize your existing partitions to make room for a VectorLinux
partition scheme"
+msgstr "Encoger sus particiones existentes para crear el espacio requerido
por VectorLinux"
-#: Step2.class:366
-msgid "Stop"
-msgstr ""
+#: Step5.class:256
+msgid "Restart Now"
+msgstr "Reiniciar Ahora"
-#: Step3.class:28
-msgid "Disc Partitioning Options"
-msgstr ""
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr "SUGERENCIA: RE-INICIE SU SYSTEMA"
-#: Step3.class:31
-msgid "Select the partitioning method you would like to use"
-msgstr ""
+#: Step1.class:205
+msgid "Scanning"
+msgstr "Buscando en"
-#: Step3.class:132 Step3a.class:110
-msgid "TextLabel1"
-msgstr ""
+#: Step1.class:192
+msgid "Scanning for CD Media ... Please wait"
+msgstr "Buscando medios de instalacion en CDROM. Por favor espere"
-#: Step3.class:150
-msgid "Automatic"
-msgstr ""
+#: Step1.class:243
+msgid "Scanning system for installable ISO images"
+msgstr "Buscando medios de instalacion en imagenes ISO."
-#: Step3.class:160
-msgid ""
-"Automatically resize your partitions and / or create the correct disk
space "
-"for VectorLinux."
-msgstr ""
+#: Step1.class:132
+msgid "Scanning system partitions for installation files"
+msgstr "Buscando medios de instalacion en particiones del sistema"
-#: Step3.class:167
-msgid "Manually resize my partitions "
-msgstr ""
+#: Step1.class:507
+msgid "Search Again"
+msgstr "Buscar Nuevamente"
-#: Step3.class:177
-msgid "Use the partitioning tool to prepare your system partitions."
-msgstr ""
+#: Step3a2.class:45
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr "Buscando espacio libre en su disco duro ... Por favor espere un
momento."
-#: Step3.class:184
-msgid "My hard drive is already partitioned"
-msgstr ""
+#: Step1.class:468
+msgid "Select Installation Source"
+msgstr "Seleccione el medio de instalacion"
-#: Step3.class:194
-msgid "Install VectorLinux to existing partitions on my hard drive"
-msgstr ""
+#: Step1.class:486
+msgid "Select Installation source from the list below"
+msgstr "Seleccione la fuente instalacion de esta lista"
-#: Step3a.class:19
-msgid "Automatic Partitioning Options"
-msgstr ""
+#: MdlStartUp.module:44
+msgid "Select Language"
+msgstr "Selección de Lenguage"
+
+#: MdlStartUp.module:45
+msgid "Select Media"
+msgstr "Medio de Instalación"
#: Step3a.class:20
msgid "Select one of the following options"
-msgstr ""
+msgstr "Elija una de las siguentes opciones"
-#: Step3a.class:22
-msgid "Allow VectorLinux to use an entire hard disk in your system."
-msgstr ""
+#: Step3a2.class:143
+msgid "Select the location on your hard drive where you would like to
install VectorLinux"
+msgstr "Seleccione el blanco de su installación en el disco duro."
-#: Step3a.class:22
-msgid "This option will wipe out any data on the disk you select."
-msgstr ""
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr "Seleccione el método de particionado que desea utilizar"
-#: Step3a.class:24
-msgid ""
-"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
-msgstr ""
+#: Step6.class:280
+msgid "Select which partitions to use for installation"
+msgstr "Elija las partiiones que se utilizarán en la instalación"
-#: Step3a.class:24
-msgid "This option will not harm any data on your hard drive"
-msgstr ""
+#: Step0.class:284
+msgid "Select your keyboard layout"
+msgstr "Seleccione el diseño de su teclado"
-#: Step3a.class:26
-msgid ""
-"Resize your existing partitions to make room for a VectorLinux partition "
-"scheme"
-msgstr ""
+#: Step0.class:303
+msgid "Select your keyboard model"
+msgstr "Seleccione el model de su teclado"
-#: Step3a.class:26
-msgid "This option will not harm any existing data on your hard drive"
-msgstr ""
+#: Step0.class:253
+msgid "Select your language"
+msgstr "Seleccione su idioma"
-#: Step3a.class:121
-msgid "Use unpartitioned space on my hard disk (creates new partitions)"
-msgstr ""
+#: Step6.class:59
+msgid "Size"
+msgstr "Tamaño"
-#: Step3a.class:142
-msgid "Use free space on existing partitions for VectorLinux"
-msgstr ""
+#: MdlStartUp.module:47
+msgid "Software Selection"
+msgstr "Selección de Software"
-#: Step3a.class:163
-msgid "Use entire disk"
-msgstr ""
+#: Step0.class:122
+msgid "Spanish"
+msgstr "Español (España)"
-#: Step3a1.class:19
-msgid "Use Entire Hard Disk"
-msgstr ""
+#: MdlStartUp.module:56
+msgid "Startup Options"
+msgstr "Opciones de Arranque"
-#: Step3a2.class:25
-msgid "Install VectorLinux to free space on disk"
-msgstr ""
+#: Step2.class:366
+msgid "Stop"
+msgstr "Alto"
-#: Step3a2.class:45
-msgid "Searching for unused space on your hard drive... please wait"
-msgstr ""
+#: MdlStartUp.module:52
+msgid "System Boot Manager"
+msgstr "Gestor de Arranque"
+
+#: MdlStartUp.module:51
+msgid "System Configuration"
+msgstr "Configuración del Sistema"
-#: Step3a2.class:65
-msgid "No hard disks found on your system. Please select"
-msgstr ""
+#: Step2.class:82
+msgid "Testing file"
+msgstr "Probando fichero"
-#: Step3a2.class:65
-msgid "Another partitioning option"
-msgstr ""
+#: Step5.class:92
+msgid "The VectorLinux installer is unable to embed the gparted
partitioning utility."
+msgstr "No se pudo incorporar la herramienta de particionado (gparted)."
-#: Step3a2.class:92
-msgid "(Recomended)"
-msgstr ""
+#: Step2.class:117
+msgid "The following"
+msgstr "Lo siguiente"
-#: Step3a2.class:102
-msgid "of free space"
-msgstr ""
+#: Step3a1a.class:53
+msgid "There has been an error deleting"
+msgstr "Ha ocurrido un error borrando"
-#: Step3a2.class:143
-msgid ""
-"Select the location on your hard drive where you would like to install "
-"VectorLinux"
-msgstr ""
+#: Step1.class:416
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr "Esta función puede ayudarle a evitar una instalacion inservible."
-#: Step3a2.class:189
-msgid "Please wait while your hard drive is being partitioned"
-msgstr ""
+#: Step2.class:46
+msgid "This installation media has already been checked. Would you like to
check it again?"
+msgstr "Este medio de instalación ya fué analizado. ¿Le gustaría hacer la
prueba otra vez?"
-#: Step3a2.class:202
-msgid "Unable to find enough un-used space to perform auto-partition."
-msgstr ""
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr "Esta opción no dañará la información contenida en su disco duro"
-#: Step3a2.class:202
-msgid "Please consider using a different partitioning option."
-msgstr ""
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr "Esta opción no dañará la información contenida en su disco duro"
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr "Esta opción eliminará toda la información contenida en el disco
que usted seleccione."
+
+#: Step1.class:416
+msgid "This process can take a long time to complete."
+msgstr "Este proceso puede ser lento y tomar varios minutos para terminar."
+
+#: Step3a1a.class:169
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr "Este paso de la instalación no se puede deshacer. ¿Esta seguro de
que quiere continuar?"
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr "Tamaño del Disco"
+
+#: Step3a2.class:354
+msgid "Unable to find any hard drives with enough unpartitioned space.
Please go back and select another partitioning method"
+msgstr "No se ha encontrado ningún disco que contenga suficiento espacio
libre para continuar. Por favor regrese y elija otro método de particionado"
#: Step3a2.class:204
-msgid ""
-"Unable to find enough un-used space to perform auto-partition. Please "
-"consider using a different partitioning option."
-msgstr ""
-
-#: Step3a2.class:309
-msgid "Partitioning stage complete... Click next to continue"
-msgstr ""
-
-#: Step3a2.class:422
-msgid "RadioButton1"
-msgstr ""
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr "No hay suficiente espacio vacío en su sistema para particionar
automáticamente"
-#: Step3a3.class:6
-msgid "Claim free space from existing partitions"
-msgstr ""
+#: Step3a2.class:206
+msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
+msgstr "No se encontró suficiente espacio libre para particionar el
sistema automáticamente. Por favor utilize otro modo de particionado."
-#: Step4.class:23
-msgid "Automatic Disc Partitioning"
-msgstr ""
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr "No se pudo formatear"
-#: Step5.class:19
-msgid "Resize partitions using Gparted"
-msgstr ""
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr "Utilizar el disco completo"
-#: Step5.class:64
-msgid ""
-"Gparted was not found on this system. Please install gparted and try
again"
-msgstr ""
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr "Utilizar Existente"
-#: Step5.class:69
-msgid "Loading partitioning utility...Please Wait"
-msgstr ""
+#: Step3a.class:168
+msgid "Use entire disk"
+msgstr "Disco Completo"
-#: Step5.class:92
-msgid ""
-"The VectorLinux installer is unable to embed the gparted partitioning "
-"utility."
-msgstr ""
+#: Step3a.class:144
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr "Instalar VectorLinux en el espacio libre de mis partitiones
actuales"
-#: Step5.class:92
-msgid ""
-"Please consider using the automatic partition option, or use other means
of"
-msgstr ""
+#: Step3.class:180
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr "Utilizar la herramienta de particionado (gparted) para prepara mi
sistema."
-#: Step5.class:92
-msgid "partitioning your hard drives."
-msgstr ""
+#: Step0.class:325
+msgid "Use this box to test your keyboard settings"
+msgstr "Area de prueba"
-#: Step5.class:114
-msgid ""
-"VectorLinux is about to launch the GParted partitioning tool. Use this "
-"utility to"
-msgstr ""
+#: Step3a.class:122
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr "Utilizar espacio vacío en mi disco para instalar VectorLinux
(Crear particiones nuevas)"
+
+#: MdlStartUp.module:54
+msgid "User Accounts"
+msgstr "Usuarios"
+
+#: Step1.class:339
+msgid "VERSION"
+msgstr "VERSION"
+
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "Instalador de VectorLinux"
#: Step5.class:114
-msgid "move, resize, delete or create partitions."
-msgstr ""
+msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
+msgstr "VectorLinux ha integrado la herramienta de particionado (gparted).
Use esta para"
+
+#: Step3a1a.class:82
+msgid "Vectorlinux has detected an existing swap partition in your system."
+msgstr "VectorLinux ha detectado una particion de intercambio (swap) en sy
sistema."
+
+#: Step2.class:27
+msgid "Verify Installation Files"
+msgstr "Verificar archivos de instalacion antes de instalar"
+
+#: Step2.class:78
+msgid "Verifying data on compressed package"
+msgstr "Verificando la informacion en el paquete comprimido"
+
+#: Step2.class:198
+msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
+msgstr "Este proceso puede ayudar a asegurar que la instalacion sea
exitosa."
+
+#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
+msgid "WARNING:"
+msgstr "ADVERTENCIA:"
+
+#: Step3a2.class:352
+msgid "We are unable to find any hard disks with enough unpartitioned
space for this operation."
+msgstr "No se ha encontrado ningún disco con suficiente espacio vacío para
utilizar esta función"
#: Step5.class:114
msgid "When you are finished, you will need to exit the utility from the"
-msgstr ""
+msgstr "Cuando haya terminado, necesitará cerrar la aplicacion del menú"
-#: Step5.class:114
-msgid "GParted"
-msgstr ""
+#: Step3a1a.class:82
+msgid "Would you like to let VectorLinux use this partition or create a
new one?"
+msgstr "¿Desea que VectorLinux utilize esta partición, ó crear una nueva?"
-#: Step5.class:114
-msgid "menu"
-msgstr ""
+#: Step3a1a.class:169 Step6.class:385
+msgid "Yes"
+msgstr "Sí"
-#: Step5.class:169
-msgid "SYSTEM RESTART SUGGESTED"
-msgstr ""
+#: Step6.class:199
+msgid "You have already selected"
+msgstr "Ya se ha seleccionado"
-#: Step5.class:169
-msgid ""
-"Your system still contains some non-linux partitions. If you still have
a "
-"Windows operating system installed, it is recomended "
-msgstr ""
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr "Su sistema re-iniciará en 10 segundos"
#: Step5.class:169
-msgid "that you reboot your system at this time. "
-msgstr ""
+msgid "Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended "
+msgstr "Su sistema aún contiene particiones propias de otros sistemas
operativos. Si alguna de estas aún tiene una instalacion de Windows, le
recomendamos"
-#: Step5.class:169
-msgid "Click the"
-msgstr ""
+#: Step6.class:199
+msgid "as your"
+msgstr "como su"
#: Step5.class:169
msgid "button to restart your computer now, or click"
-msgstr ""
+msgstr "para re-iniciar su sistema, ó haz click en"
-#: Step5.class:169
-msgid "to continue without restarting."
-msgstr ""
+#: Step2.class:154
+msgid "has failed the data integrity test. All required packages have
passed this test"
+msgstr "falló la prueba de integridad. Todos los paquetes requeridos
(vitales) lo han pasado"
-#: Step5.class:174
-msgid "PARTITIONING DONE"
-msgstr ""
+#: Step2.class:117
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr "falló la prueba de integridad. El futuro de esta instalacion no
está asegurado"
-#: Step5.class:174
-msgid "CLick next to continue"
-msgstr ""
+#: Step1.class:215
+msgid "in"
+msgstr "en"
-#: Step5.class:190
-msgid "Your computer will restart in 10 seconds"
-msgstr ""
+#: Step1.class:151
+msgid "in partition"
+msgstr "en particion"
-#: Step5.class:247
-msgid "Loading partitioning utility ... Please Wait"
-msgstr ""
+#: Step3a1a.class:169
+msgid "is about to be deleted."
+msgstr "será borrado completamente"
-#: Step5.class:256
-msgid "Restart Now"
-msgstr ""
+#: Step5.class:114
+msgid "menu"
+msgstr "menú"
-#: Step6.class:58
-#, fuzzy
-msgid "Partition"
-msgstr "en particion"
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr "mover, reajustar, borrar o crear nuevas particiones."
-#: Step6.class:59
-msgid "Size"
-msgstr ""
+#: Step2.class:82
+msgid "of"
+msgstr "de"
-#: Step6.class:60
-msgid "Mount Point"
-msgstr ""
+#: Step3a2.class:102
+msgid "of free space"
+msgstr "de espacio libre"
-#: Step6.class:61
-msgid "File System"
-msgstr ""
+#: Step1.class:33
+msgid "on"
+msgstr "en"
-#: Step6.class:133
-msgid "Not Used"
-msgstr ""
+#: Step6.class:199
+msgid "partition."
+msgstr "particion."
-#: Step6.class:154
-msgid "Do not format"
-msgstr ""
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr "particionar sus discos duros"
-#: Step6.class:199
-msgid "You have already selected"
-msgstr ""
+#: Step2.class:117
+msgid "required"
+msgstr "requerido"
-#: Step6.class:199
-msgid "as your"
-msgstr ""
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr "que re-inicie su sistema ahora"
-#: Step6.class:199
-#, fuzzy
-msgid "partition."
-msgstr "en particion"
+#: MdlMain.module:33
+msgid "to"
+msgstr "a"
-#: Step6.class:199
-msgid "Please select only one partition for this purpose"
-msgstr ""
+#: Step2.class:198
+msgid "to abort this process at any time"
+msgstr "Para detener este proceso"
-#: Step6.class:280
-#, fuzzy
-msgid "Select which partitions to use for installation"
-msgstr "Buscando medios de instalacion en particiones del sistema"
+#: Step3a1a.class:160 Step3a2.class:322 Step5.class:174
+msgid "to continue"
+msgstr "para continuar"
-#: Step6.class:385
-msgid "Yes"
-msgstr ""
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr "para continue sin re-iniciar."
-#: Step6.class:385
-msgid "No"
-msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Mon Feb 16 13:53:24 2009
@@ -7,7 +7,7 @@
Library=gb.form
Library=gb.desktop
Library=gb.gtk.ext
-Arguments="en_US"
+Arguments="es_ES"
TabSize=2
Translate=1
Language=en_US
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Mon Feb 16 13:53:24 2009
@@ -18,6 +18,7 @@
PUBLIC pDone AS Picture
PUBLIC pNow AS Picture
PUBLIC pToDo AS Picture
+PUBLIC pCategory AS Picture
PUBLIC SUB MAIN()
@@ -36,23 +37,24 @@
pDone = Picture.Load("images/done.png")
pNow = Picture.Load("images/now.png")
pToDo = Picture.Load("images/square.png")
+ pCategory = Picture.Load("images/category.png")
- ClsGlobal.fRunningMainForm.listview1.add("Cat0", Space(5)
& "Preparation")
+ ClsGlobal.fRunningMainForm.listview1.add("Cat0", Space(3) &
("Preparation"), pCategory)
' ClsGlobal.fRunningMainForm.listview1["Cat0"].Font.bold = TRUE
- ClsGlobal.fRunningMainForm.listview1.add("Step0", "Select Language",
pNow)
- ClsGlobal.fRunningMainForm.listview1.add("Step1", "Select Media", pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step2", "Disk Partitioning",
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step3", "Software Selection",
pTodo)
- ClsGlobal.fRunningMainForm.listview1.add("Cat1", Space(5)
& "Installation")
- ClsGlobal.fRunningMainForm.listview1.add("Step4", "Installation
Summary", pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step5", "Install VectorLinux",
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Cat2", Space(5) & "System
Configuration")
- 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("Step9", "Network Settings",
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step10", "Startup Options",
pToDo)
- ClsGlobal.fRunningMainForm.listview1.add("Step11", "Final
Configuration", pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step0", ("Select Language"),
pNow)
+ ClsGlobal.fRunningMainForm.listview1.add("Step1", ("Select Media"),
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step2", ("Disk Partitioning"),
pToDo)
+ 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("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("Step9", ("Network Settings"),
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step10", ("Startup Options"),
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step11", ("Final
Configuration"), pToDo)
'fmain.ListView1.Add(
Modified: branches/speedy/Step2.form
==============================================================================
--- branches/speedy/Step2.form (original)
+++ branches/speedy/Step2.form Mon Feb 16 13:53:24 2009
@@ -67,7 +67,7 @@
{ tlTestingLbl TextLabel
MoveScaled(1,0,40,2)
Expand = True
- Text = ("TextLabel2")
+ Text = ("")
}
}
{ HBox7 HBox
Modified: branches/speedy/Step3.form
==============================================================================
--- branches/speedy/Step3.form (original)
+++ branches/speedy/Step3.form Mon Feb 16 13:53:24 2009
@@ -27,7 +27,7 @@
{ tlPartHelp TextLabel
MoveScaled(0,0,62,3)
Expand = True
- Text = ("TextLabel1")
+ Text = ("")
Alignment = Align.TopLeft
}
}
Modified: branches/speedy/Step3a.form
==============================================================================
--- branches/speedy/Step3a.form (original)
+++ branches/speedy/Step3a.form Mon Feb 16 13:53:24 2009
@@ -23,7 +23,7 @@
{ tlActionExp TextLabel
MoveScaled(2,1,4,3)
Expand = True
- Text = ("TextLabel1")
+ Text = ("")
}
}
{ HPanel2 HPanel
Modified: branches/speedy/Step3a1.form
==============================================================================
--- branches/speedy/Step3a1.form (original)
+++ branches/speedy/Step3a1.form Mon Feb 16 13:53:24 2009
@@ -24,7 +24,7 @@
{ TLwARNING TextLabel
MoveScaled(1,8,35,4)
Expand = True
- Text = ("TextLabel1")
+ Text = ("")
Alignment = Align.Normal
}
{ HBox2 HBox
@@ -42,7 +42,7 @@
{ rb RadioButton
MoveScaled(4,39,12,2)
Visible = False
- Text = ("RadioButton1")
+ Text = ("")
}
{ hb HBox
MoveScaled(18,40,7,2)
@@ -55,6 +55,6 @@
{ tl TextLabel
MoveScaled(38,41,9,2)
Visible = False
- Text = ("TextLabel1")
+ Text = ("")
}
}
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Mon Feb 16 13:53:24 2009
@@ -319,7 +319,7 @@
END IF
- ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
+ ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click") &
Space(1) & ClsGlobal.fRunningMainForm.btnext.text & Space(1) & ("to
continue")
ME.MovieBox1.Playing = FALSE
' set the flag for partition reading
Modified: branches/speedy/Step3a2.form
==============================================================================
--- branches/speedy/Step3a2.form (original)
+++ branches/speedy/Step3a2.form Mon Feb 16 13:53:24 2009
@@ -46,7 +46,7 @@
{ RadioButton1 RadioButton
MoveScaled(3,37,13,2)
Visible = False
- Text = ("RadioButton1")
+ Text = ("")
}
{ HBox2 HBox
MoveScaled(5,40,8,1)
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Mon Feb 16 13:53:24 2009
@@ -171,7 +171,7 @@
ELSE
ME.tlEmbDone.Text = "<h3>" & ("PARTITIONING DONE") & "</h3>" &
gb.NewLine & gb.NewLine &
- ("CLick next to continue")
+ ("Click") & Space(1) & ClsGlobal.fRunningMainForm.btnext.text &
Space(1) & ("to continue")
END IF
Modified: branches/speedy/images/category.png
==============================================================================
Binary files. No diff available.
Modified: branches/speedy/images/done.png
==============================================================================
Binary files. No diff available.
Modified: branches/speedy/images/now.png
==============================================================================
Binary files. No diff available.
Modified: branches/speedy/images/square.png
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2009-02-14 05:52:51
|
Author: uelsk8s
Date: Fri Feb 13 21:25:43 2009
New Revision: 493
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/MdlConfLilo.module
branches/iVL/installer.gambas
Log:
added post install firestarter line - updated binary
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/uel/gui-installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/uel/gui-installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/uel/gui-installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/uel/gui-installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/uel/gui-installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/uel/gui-installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/uel/gui-installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/uel/gui-installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/uel/gui-installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/uel/gui-installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/uel/gui-installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/uel/gui-installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/uel/gui-installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/uel/gui-installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/uel/gui-installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/uel/gui-installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/uel/gui-installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/uel/gui-installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/uel/gui-installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Fri Feb 13 21:25:43 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/uel/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Fri Feb 13 21:25:43 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.22
+Version=0.1.23
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,6 +17,7 @@
Language=en_US
ControlPublic=1
ModulePublic=1
+ExecPath=/home/uel/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Fri Feb 13 21:25:43 2009
@@ -330,6 +330,7 @@
"/sbin/valsaconf-quiet" & gb.NewLine &
"cd / && for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &
gb.NewLine &
"rm -r /root/.mc 2>/dev/null" & gb.NewLine &
+"gconftool-2 --install-schema-file /etc/gconf/schemas/firestarter.schemas
> /dev/null 2>&1" & gb.NewLine &
"cd / && sh /var/log/scripts/gsb-desktop* 2>/dev/null" & gb.NewLine &
"update-mime-database /usr/share/mime/" & gb.NewLine &
"#sleep 20"
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2009-02-12 19:57:04
|
Author: M0...@gm...
Date: Thu Feb 12 11:44:33 2009
New Revision: 492
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1a.pot
branches/speedy/MdlMain.module
branches/speedy/Step1.class
branches/speedy/Step3.class
branches/speedy/Step3a.class
branches/speedy/Step3a1a.class
branches/speedy/Step3a1a.form
branches/speedy/Step3a2.class
branches/speedy/Step6.class
Log:
Autopartitioning ready for testing
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Thu Feb 12 11:44:33 2009
@@ -30,6 +30,14 @@
msgid "Quit"
msgstr ""
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr ""
+
+#: MdlMain.module:33
+msgid "to"
+msgstr ""
+
#: Step0.class:20
msgid "Localization Settings"
msgstr ""
@@ -62,67 +70,67 @@
msgid "on"
msgstr ""
-#: Step1.class:130
+#: Step1.class:132
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "Found"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "in partition"
msgstr ""
-#: Step1.class:190
+#: Step1.class:192
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:203
+#: Step1.class:205
msgid "Scanning"
msgstr ""
-#: Step1.class:213
+#: Step1.class:215
msgid "in"
msgstr ""
-#: Step1.class:241
+#: Step1.class:243
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:334
+#: Step1.class:336
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:337
+#: Step1.class:339
msgid "VERSION"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414 Step3a1.class:22 Step3a1a.class:81
+#: Step1.class:416 Step3a1.class:22 Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:466
+#: Step1.class:468
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:484
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:505
+#: Step1.class:507
msgid "Search Again"
msgstr ""
-#: Step1.class:529
+#: Step1.class:531
msgid "Check Installation media before installing"
msgstr ""
@@ -242,33 +250,33 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:110 Step3a1.class:157
+#: Step3.class:135 Step3a.class:111 Step3a1.class:157
msgid "TextLabel1"
msgstr ""
-#: Step3.class:150
+#: Step3.class:153
msgid "Automatic"
msgstr ""
-#: Step3.class:160
+#: Step3.class:163
msgid ""
"Automatically resize your partitions and / or create the correct disk
space "
"for VectorLinux."
msgstr ""
-#: Step3.class:167
+#: Step3.class:170
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:177
+#: Step3.class:180
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:184
+#: Step3.class:187
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:194
+#: Step3.class:197
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
@@ -307,15 +315,15 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:121
+#: Step3a.class:122
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:143
+#: Step3a.class:144
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:167
+#: Step3a.class:168
msgid "Use entire disk"
msgstr ""
@@ -339,41 +347,75 @@
msgid "Create Linux Partition Scheme in"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid "There has been an error deleting"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid ""
"Please make sure the drive or partition is not being used by some other "
"program"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:56
+msgid ""
+"Error deleting existing partitions... Please try another partitioning
method"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Vectorlinux 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?"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr ""
+
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "to continue"
+msgstr ""
+
+#: Step3a1a.class:169
msgid "All existing data in"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "is about to be deleted."
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:81 Step6.class:385
+#: Step3a1a.class:169 Step6.class:385
msgid "Yes"
msgstr ""
-#: Step3a1a.class:81 Step6.class:385
+#: Step3a1a.class:169 Step6.class:385
msgid "No"
msgstr ""
-#: Step3a1a.class:84
+#: Step3a1a.class:173
msgid "Preparing hard disk for new partitioning structure. Please wait"
msgstr ""
-#: Step3a1a.class:89
+#: Step3a1a.class:193
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Thu Feb 12 11:44:33 2009
@@ -14,3 +14,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: MdlMain.module:33
+msgid "Unable to format"
+msgstr ""
+
+#: MdlMain.module:33
+msgid "to"
+msgstr ""
+
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Thu Feb 12 11:44:33 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:130
+#: Step1.class:132
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "Found"
msgstr ""
-#: Step1.class:149
+#: Step1.class:151
msgid "in partition"
msgstr ""
-#: Step1.class:190
+#: Step1.class:192
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:203
+#: Step1.class:205
msgid "Scanning"
msgstr ""
-#: Step1.class:213
+#: Step1.class:215
msgid "in"
msgstr ""
-#: Step1.class:241
+#: Step1.class:243
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:334
+#: Step1.class:336
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:337
+#: Step1.class:339
msgid "VERSION"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "WARNING:"
msgstr ""
-#: Step1.class:414
+#: Step1.class:416
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:466
+#: Step1.class:468
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:484
+#: Step1.class:486
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:505
+#: Step1.class:507
msgid "Search Again"
msgstr ""
-#: Step1.class:529
+#: Step1.class:531
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Thu Feb 12 11:44:33 2009
@@ -22,31 +22,31 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132
+#: Step3.class:135
msgid "TextLabel1"
msgstr ""
-#: Step3.class:150
+#: Step3.class:153
msgid "Automatic"
msgstr ""
-#: Step3.class:160
+#: Step3.class:163
msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
msgstr ""
-#: Step3.class:167
+#: Step3.class:170
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:177
+#: Step3.class:180
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:184
+#: Step3.class:187
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:194
+#: Step3.class:197
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 Feb 12 11:44:33 2009
@@ -46,19 +46,19 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:110
+#: Step3a.class:111
msgid "TextLabel1"
msgstr ""
-#: Step3a.class:121
+#: Step3a.class:122
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:143
+#: Step3a.class:144
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:167
+#: Step3a.class:168
msgid "Use entire disk"
msgstr ""
Modified: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- branches/speedy/.lang/Step3a1a.pot (original)
+++ branches/speedy/.lang/Step3a1a.pot Thu Feb 12 11:44:33 2009
@@ -18,43 +18,75 @@
msgid "Create Linux Partition Scheme in"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid "There has been an error deleting"
msgstr ""
-#: Step3a1a.class:51
+#: Step3a1a.class:53
msgid "Please make sure the drive or partition is not being used by some
other program"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:56
+msgid "Error deleting existing partitions... Please try another
partitioning method"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Vectorlinux 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?"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Use Existing"
+msgstr ""
+
+#: Step3a1a.class:82
+msgid "Create New"
+msgstr ""
+
+#: Step3a1a.class:148
+msgid "Failed to format partitions, please try another partitioning method"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "Partitioning stage complete. Click"
+msgstr ""
+
+#: Step3a1a.class:160
+msgid "to continue"
+msgstr ""
+
+#: Step3a1a.class:169
msgid "WARNING:"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "All existing data in"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "is about to be deleted."
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "This step cannot be undone. Are you sure you want to continue?"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "Yes"
msgstr ""
-#: Step3a1a.class:81
+#: Step3a1a.class:169
msgid "No"
msgstr ""
-#: Step3a1a.class:84
+#: Step3a1a.class:173
msgid "Preparing hard disk for new partitioning structure. Please wait"
msgstr ""
-#: Step3a1a.class:89
+#: Step3a1a.class:193
msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Thu Feb 12 11:44:33 2009
@@ -15,6 +15,29 @@
' 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 FORMAT_THIS_PARTITION(sPartition AS String, sFilesystem AS
String) AS Integer
+
+ DIM hproc AS Process
+ DIM sFlags AS String
+
+ SELECT CASE sFilesystem
+ CASE "reiserfs"
+ sFlags = "-f"
+ END SELECT
+
+ WAIT 1
+ PRINT " --+ Formatting " & sPartition & " to " & sFilesystem
+ SHELL "umount -f " & sPartition
+ hproc = SHELL "mkfs." & LCase(sFilesystem) & Space(1) & sFlags &
Space(1) & sPartition WAIT
+ IF hproc.Value > 0 THEN Message.Error(("Unable to format") & Space(1)
& sPartition & Space(1) & ("to") & Space(1) & sFilesystem)
+ RETURN hproc.Value
+
+END
+
+
+
+
PUBLIC SUB NAVIGATION_LOCKDOWN()
WITH FMain
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Thu Feb 12 11:44:33 2009
@@ -44,6 +44,8 @@
' Store this information to make it available to the whole installer
program
ClsGlobal.sSourceName = Trim(sname)
ClsGlobal.sSourceAddr = Trim(sadd)
+
+ PRINT " --- Use " & ClsGlobal.sSourceName & Space(1) & "from " &
ClsGlobal.sSourceAddr & " for installation source"
TRY MKDIR "/mnt/source"
' mount the media and get ready for testing
IF Right(sname, Len(".iso")) LIKE ".iso" THEN ' this is an iso image...
doing hosted install i'm afraid
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Thu Feb 12 11:44:33 2009
@@ -41,17 +41,20 @@
ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone
ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
IF ME.rbAutoPart.Value = TRUE THEN
- 'no module for auto partition written yet
- 'Message("Not ready yet")
+ ClsGlobal.bAutoPartition = TRUE
+ PRINT " ---> Use built-in auto partition tools for partitioning"
RETURN "Step3a"
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
- 'Message("Gparted module not present yet")
+ PRINT " ---> Embed GParted for partitioning"
+ ClsGlobal.bAutoPartition = FALSE
RETURN "Step5"
END IF
IF ME.rbPrePartitioned.Value = TRUE THEN
' Use existing partitions
+ PRINT " ---> Install to pre-partitioned hard drive"
+ ClsGlobal.bAutoPartition = FALSE
RETURN "Step6"
END IF
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Thu Feb 12 11:44:33 2009
@@ -43,6 +43,7 @@
PUBLIC FUNCTION GetNext() AS String
IF ME.rbEntireDisk.Value = TRUE THEN
+
RETURN "Step3a1"
ELSE IF ME.rbunpartitioned.Value = TRUE THEN
RETURN "Step3a2"
Modified: branches/speedy/Step3a1a.class
==============================================================================
--- branches/speedy/Step3a1a.class (original)
+++ branches/speedy/Step3a1a.class Thu Feb 12 11:44:33 2009
@@ -14,11 +14,13 @@
' 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 sStatus AS String
PRIVATE hproc AS Process
-
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & ("Create Linux Partition Scheme in") &
Space(1) & ClsGlobal.sFullDiscToWipe & "</h2>"
+ ME.MovieBox1.Path = "images/throbber.gif"
+ ME.MovieBox1.Playing = FALSE
@@ -51,6 +53,7 @@
("Please make sure the drive or partition is not being
used by some other program"))
'BREAK
PRINT " \\- FAILED!"
+ sStatus = ("Error deleting existing partitions...
Please try another partitioning method")
RETURN
END IF
@@ -62,14 +65,99 @@
PUBLIC SUB CREATE_NEW_PARTITIONS()
- DIM lRunningSwap, lNeededSwap, lTotalRAM AS Long
- DIM sDump AS String
+ DIM lRunningSwap, lNeededSwap, lTotalRAM, lTotalFreekb AS Long
+ DIM sDump, sSwapList, sSwapPart, sRootpart, sDrive AS String
+ DIM sResults, sPartedDetails AS String[]
+ DIM sPartedOutput AS String
+ DIM sFreeStart, sFreeEnd, sFreeTotal AS String
+
+ sDrive = Trim(ClsGlobal.sFullDiscToWipe)
' First determine how much swap we need
SHELL "free | grep \"^Swap\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
- sDump = Trim(sDump)
- Message("Total RAM " & sDump)
+ 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"))
+ CASE 1
+ ' use existing partition
+ SHELL "probepart | grep \"^/dev\" | grep -i \"linux
swap\" | tr -s \' \',\"\" | cut -f 1 -d \' \'" TO sSwapList
+ sSwapList = Trim(sSwapList)
+ sResults = Split(sSwapList, "\n")
+ sSwapPart = sResults[0]
+ PRINT " --- Use existing swap partition " & sSwapPart
+ ClsGlobal.sTargetSwap = sSwapPart ' set the address to the
swap partition.
+ 'Message("Using swap " & sSwapPart)
+ END SELECT
+ ELSE ' no swap found
+ ' we take care of this outside this if
+ END IF
+
+
+
+ IF NOT sSwapPart THEN
+ 'detect ram
+ PRINT " - Calculating system ram"
+ SHELL "free | grep \"^Mem\" |tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
+ sDump = Trim(sDump)
+ lTotalRAM = sDump
+ PRINT " -\\- " & lTotalRAM & " KB found"
+ PRINT " - Determining amount of swap space needed "
+ IF lTotalRAM <= 524288 THEN
+ lNeededSwap = lTotalRAM * 2
+ ELSE
+ lNeededSwap = lTotalRAM
+ END IF
+ PRINT " -\\- " & lNeededSwap & " KB needed for swap"
+
+ ' now create partitions for swap and /
+ SHELL "parted " & sDrive & " unit kb print free | grep -i \"free
space\"" TO sPartedOutput
+ sPartedOutput = Trim(sPartedOutput)
+ 'Number Start End Size Type File system Flags
+ sPartedDetails = Split(sPartedOutput, Space(1))
+ lTotalFreekb = Left(sPartedDetails[2], Len(sPartedDetails[2])
- 2)
+ 'Message.Info("Total free space size on " & sDrive & " = " &
lTotalFreekb)
+ ' create primary partition for /
+ PRINT " --- Creating / partition at " & sDrive & "1 ... Size
= " & (lTotalFreekb - lNeededSwap) & " Kb as reiserfs"
+ SHELL "parted " & sDrive & " unit kb mkpart primary reiserfs " &
sPartedDetails[0] & Space(1) & (lTotalFreekb - lNeededSwap) & "kb 1 >
/dev/null" WAIT
+ ' get the free space again to create the right size swap
partition with the remainder of the free space
+ SHELL "parted " & sDrive & " unit kb print free | grep -i \"free
space\"" TO sPartedOutput
+ sPartedOutput = Trim(sPartedOutput)
+ 'Message(sPartedOutput)
+ 'Number Start End Size Type File system Flags
+ sPartedDetails = Split(sPartedOutput, Space(1))
+ 'Message("Start " & Trim(sPartedDetails[0]) & " End " &
Trim(sPartedDetails[2]))
+ PRINT " --- Creating swap partition at " & sDrive & "2 ... Size
= " & lNeededSwap & " Kb"
+ SHELL "parted " & sDrive & " mkpartfs primary linux-swap " &
Trim(sPartedDetails[0]) & " " & Trim(sPartedDetails[2]) & " 1 > /dev/null "
WAIT
+
+ ClsGlobal.sTargetRoot = sDrive & "1"
+ ClsGlobal.sTargetSwap = sDrive & "2"
+
+
+ ELSE
+ ' only create a / partition... we'll be using a shared swap area
+ SHELL "parted " & sDrive & " unit gb print free | grep -i \"free
space\"" TO sPartedOutput
+ sPartedOutput = Trim(sPartedOutput)
+ 'Number Start End Size Type File system Flags
+ sPartedDetails = Split(sPartedOutput, Space(1))
+ PRINT " --- Create / partition " & sDrive & "1 Size = " &
Trim(sPartedDetails[4]) & " preformatted to reiserfs"
+ SHELL "parted " & sDrive & " mkpart primary reiserfs " &
Trim(sPartedDetails[0]) & Space(1) & Trim(sPartedDetails[2]) WAIT
+ IF MdlMain.FORMAT_THIS_PARTITION(sDrive & "1", "reiserfs") > 0
THEN
+ sStatus = ("Failed to format partitions, please try another
partitioning method")
+ RETURN
+ END IF
+
+ ClsGlobal.sTargetRoot = sDrive & "1"
+ 'SHELL "mkfs.reiserfs -q " & sDrive & "1" WAIT
+ 'Message(sPartedDetails[0])
+ 'Message(sPartedDetails[1])
+ 'Message(sPartedDetails[2])
+
+ END IF
+
+ sStatus = ("Partitioning stage complete. Click") & Space(1) & "\"" &
ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue")
END
@@ -81,9 +169,25 @@
("This step cannot be undone. Are you sure you want to continue?"),
("Yes"), ("No"))
CASE 1
'Message("Yes")
+
ME.tlWarning.Text = ("Preparing hard disk for new partitioning
structure. Please wait")
+ ME.MovieBox1.Playing = TRUE
+ WITH ClsGlobal.fRunningMainForm
+ .btnext.enabled = FALSE
+ .btback.enabled = FALSE
+ .btquit.enabled = FALSE
+ END WITH
ME.DESTROY_CURRENT_DATA()
ME.CREATE_NEW_PARTITIONS()
+ ME.tlWarning.Text = sStatus '("Hard drive partitioned
successfully. Click") & Space(1) & ClsGlobal.fRunningMainForm.btnext.text &
Space(1) & ("to continue.")
+ ME.MovieBox1.Playing = FALSE
+ ME.MovieBox1.Enabled = FALSE
+ WITH ClsGlobal.fRunningMainForm
+ .btnext.enabled = TRUE
+ .btback.enabled = TRUE
+ .btquit.enabled = TRUE
+ END WITH
+
CASE 2
'Message("No")
ME.tlWarning.Text = ("Operation cancelled by user. No changes have
been made to the system")
@@ -101,6 +205,6 @@
PUBLIC FUNCTION GetNext() AS String
-
+ RETURN "Step7"
END
Modified: branches/speedy/Step3a1a.form
==============================================================================
--- branches/speedy/Step3a1a.form (original)
+++ branches/speedy/Step3a1a.form Thu Feb 12 11:44:33 2009
@@ -23,13 +23,18 @@
}
{ HPanel2 HPanel
MoveScaled(1,6,69,36)
+ Expand = True
{ tlWarning TextLabel
MoveScaled(1,1,12,3)
Expand = True
Text = ("")
}
+ { HBox2 HBox
+ MoveScaled(2,6,6,3)
+ Expand = True
+ }
{ MovieBox1 MovieBox
- MoveScaled(19,7,25,19)
+ MoveScaled(20,8,25,25)
Expand = True
}
}
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Thu Feb 12 11:44:33 2009
@@ -322,7 +322,7 @@
ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
ME.MovieBox1.Playing = FALSE
- ' set the flaf for partition reading
+ ' set the flag for partition reading
ClsGlobal.bAutoPartition = TRUE
ClsGlobal.sTargetRoot = sRootPart
ClsGlobal.sTargetSwap = sSwapPart
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Thu Feb 12 11:44:33 2009
@@ -38,7 +38,7 @@
sFmtAs = gvPartListing[n, 5].Text
END IF
END IF
- Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
+ 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
NEXT
|
|
From: <cod...@go...> - 2009-02-11 22:39:33
|
Author: M0...@gm...
Date: Wed Feb 11 14:32:23 2009
New Revision: 491
Added:
branches/speedy/.lang/Step3a1a.pot
branches/speedy/.lang/Step3a3.pot
branches/speedy/Step3a1a.class
branches/speedy/Step3a1a.form
branches/speedy/Step3a3.class
branches/speedy/Step3a3.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/en_US.po
branches/speedy/.lang/es.po
branches/speedy/ClsGlobal.class
branches/speedy/Step3a.class
branches/speedy/Step3a.form
branches/speedy/Step3a1.class
branches/speedy/Step3a1.form
branches/speedy/Step3a2.class
Log:
More work in auto-partitioning dept
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 11 14:32:23 2009
@@ -102,7 +102,7 @@
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:414
+#: Step1.class:414 Step3a1.class:22 Step3a1a.class:81
msgid "WARNING:"
msgstr ""
@@ -242,7 +242,7 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:108
+#: Step3.class:132 Step3a.class:110 Step3a1.class:157
msgid "TextLabel1"
msgstr ""
@@ -307,20 +307,74 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:119
+#: Step3a.class:121
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:140
+#: Step3a.class:143
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:161
+#: Step3a.class:167
msgid "Use entire disk"
msgstr ""
-#: Step3a1.class:19
-msgid "Use Entire Hard Disk"
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr ""
+
+#: Step3a1.class:179 Step3a2.class:455
+msgid "RadioButton1"
+msgstr ""
+
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid "There has been an error deleting"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid ""
+"Please make sure the drive or partition is not being used by some other "
+"program"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "All existing data in"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "is about to be deleted."
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr ""
+
+#: Step3a1a.class:81 Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step3a1a.class:81 Step6.class:385
+msgid "No"
+msgstr ""
+
+#: Step3a1a.class:84
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr ""
+
+#: Step3a1a.class:89
+msgid "Operation cancelled by user. No changes have been made to the
system"
msgstr ""
#: Step3a2.class:25
@@ -353,30 +407,46 @@
"VectorLinux"
msgstr ""
-#: Step3a2.class:189
+#: Step3a2.class:191
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:206
msgid ""
"Unable to find enough un-used space to perform auto-partition. Please "
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:309
+#: Step3a2.class:322
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:422
-msgid "RadioButton1"
+#: Step3a2.class:352
+msgid ""
+"We are unable to find any hard disks with enough unpartitioned space for "
+"this operation."
+msgstr ""
+
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr ""
+
+#: Step3a2.class:354
+msgid ""
+"Unable to find any hard drives with enough unpartitioned space. Please
go "
+"back and select another partitioning method"
+msgstr ""
+
+#: Step3a3.class:22
+msgid "Claim free space from existing partitions"
msgstr ""
#: Step4.class:23
@@ -521,12 +591,4 @@
#: Step6.class:280
msgid "Select which partitions to use for installation"
-msgstr ""
-
-#: Step6.class:385
-msgid "Yes"
-msgstr ""
-
-#: Step6.class:385
-msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Wed Feb 11 14:32:23 2009
@@ -46,19 +46,19 @@
msgid "This option will not harm any existing data on your hard drive"
msgstr ""
-#: Step3a.class:108
+#: Step3a.class:110
msgid "TextLabel1"
msgstr ""
-#: Step3a.class:119
+#: Step3a.class:121
msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:140
+#: Step3a.class:143
msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:161
+#: Step3a.class:167
msgid "Use entire disk"
msgstr ""
Modified: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- branches/speedy/.lang/Step3a1.pot (original)
+++ branches/speedy/.lang/Step3a1.pot Wed Feb 11 14:32:23 2009
@@ -14,7 +14,27 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step3a1.class:19
-msgid "Use Entire Hard Disk"
+#: Step3a1.class:20
+msgid "Use Entire Hard Disk for VectorLinux"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "WARNING:"
+msgstr ""
+
+#: Step3a1.class:22
+msgid "All existing data in the device you select here will be destroyed."
+msgstr ""
+
+#: Step3a1.class:68
+msgid "Total Disc Size"
+msgstr ""
+
+#: Step3a1.class:157
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3a1.class:179
+msgid "RadioButton1"
msgstr ""
Added: branches/speedy/.lang/Step3a1a.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a1a.pot Wed Feb 11 14:32:23 2009
@@ -0,0 +1,60 @@
+# /home/vluser/devel/speedy/Step3a1a.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"
+
+#: Step3a1a.class:21
+msgid "Create Linux Partition Scheme in"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid "There has been an error deleting"
+msgstr ""
+
+#: Step3a1a.class:51
+msgid "Please make sure the drive or partition is not being used by some
other program"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "WARNING:"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "All existing data in"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "is about to be deleted."
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "This step cannot be undone. Are you sure you want to continue?"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "Yes"
+msgstr ""
+
+#: Step3a1a.class:81
+msgid "No"
+msgstr ""
+
+#: Step3a1a.class:84
+msgid "Preparing hard disk for new partitioning structure. Please wait"
+msgstr ""
+
+#: Step3a1a.class:89
+msgid "Operation cancelled by user. No changes have been made to the
system"
+msgstr ""
+
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Wed Feb 11 14:32:23 2009
@@ -42,27 +42,39 @@
msgid "Select the location on your hard drive where you would like to
install VectorLinux"
msgstr ""
-#: Step3a2.class:189
+#: Step3a2.class:191
msgid "Please wait while your hard drive is being partitioned"
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Unable to find enough un-used space to perform auto-partition."
msgstr ""
-#: Step3a2.class:202
+#: Step3a2.class:204
msgid "Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:204
+#: Step3a2.class:206
msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:309
+#: Step3a2.class:322
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:422
+#: Step3a2.class:352
+msgid "We are unable to find any hard disks with enough unpartitioned
space for this operation."
+msgstr ""
+
+#: Step3a2.class:352
+msgid "Please consider using another partitioning method."
+msgstr ""
+
+#: Step3a2.class:354
+msgid "Unable to find any hard drives with enough unpartitioned space.
Please go back and select another partitioning method"
+msgstr ""
+
+#: Step3a2.class:455
msgid "RadioButton1"
msgstr ""
Added: branches/speedy/.lang/Step3a3.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a3.pot Wed Feb 11 14:32:23 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/Step3a3.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"
+
+#: Step3a3.class:22
+msgid "Claim free space from existing partitions"
+msgstr ""
+
Modified: branches/speedy/.lang/en_US.po
==============================================================================
--- branches/speedy/.lang/en_US.po (original)
+++ branches/speedy/.lang/en_US.po Wed Feb 11 14:32:23 2009
@@ -10,119 +10,533 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:258 FMain0.class:251
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "VectorLinux Installer"
+
+#: FMain.class:245 FMain0.class:233
+msgid "Process Overview"
+msgstr "Process Overview"
+
+#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr "Back"
-#: Step1.class:412
-msgid "Check Installation media before installing"
-msgstr "Check Installation media before installing"
+#: FMain.class:298 FMain0.class:282
+msgid "Next"
+msgstr "Next"
-#: Step1.class:234
-msgid "DISTRIBUTION"
-msgstr "DISTRIBUTION"
+#: FMain.class:309 FMain0.class:293
+msgid "Quit"
+msgstr "Quit"
-#: Step0.class:116
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Localization Settings"
+
+#: Step0.class:122
+msgid "Spanish"
+msgstr "Spanish"
+
+#: Step0.class:125
msgid "English (US)"
msgstr "English (US)"
-#: Step1.class:81
-msgid "Found"
-msgstr "Found"
+#: Step0.class:253
+msgid "Select your language"
+msgstr "Select your language"
-#: Step2.class:37
-msgid "Keep in mind however, that this process can take a while to
complete."
-msgstr "Keep in mind however, that this process can take a while to
complete."
+#: Step0.class:284
+msgid "Select your keyboard layout"
+msgstr "Select your keyboard layout"
-#: Step0.class:20
-msgid "Localization Settings"
-msgstr "Localization Settings"
+#: Step0.class:303
+msgid "Select your keyboard model"
+msgstr "Select your keyboard model"
-#: FMain.class:269 FMain0.class:262
-msgid "Next"
-msgstr "Next"
+#: Step0.class:325
+msgid "Use this box to test your keyboard settings"
+msgstr "Use this box to test your keyboard settings"
-#: FMain.class:221 FMain0.class:214
-msgid "Process Overview"
-msgstr "Process Overview"
+#: Step1.class:33
+msgid "on"
+msgstr "on"
-#: FMain.class:280 FMain0.class:273
-msgid "Quit"
-msgstr "Quit"
+#: Step1.class:130
+msgid "Scanning system partitions for installation files"
+msgstr "Scanning system partitions for installation files"
-#: Step1.class:122
-msgid "Scanning"
-msgstr "Scanning"
+#: Step1.class:149
+msgid "Found"
+msgstr "Found"
+
+#: Step1.class:149
+msgid "in partition"
+msgstr "in partition"
-#: Step1.class:109
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr "Scanning for CD Media ... Please wait"
-#: Step1.class:156
+#: Step1.class:203
+msgid "Scanning"
+msgstr "Scanning"
+
+#: Step1.class:213
+msgid "in"
+msgstr "in"
+
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr "Scanning system for installable ISO images"
-#: Step1.class:62
-msgid "Scanning system partitions for installation files"
-msgstr "Scanning system partitions for installation files"
+#: Step1.class:334
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUTION"
-#: Step1.class:388
-msgid "Search Again"
-msgstr "Search Again"
+#: Step1.class:337
+msgid "VERSION"
+msgstr "VERSION"
-#: Step1.class:349
+#: Step1.class:414
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr ""
+
+#: Step1.class:414
+msgid "WARNING:"
+msgstr ""
+
+#: Step1.class:414
+#, fuzzy
+msgid "This process can take a long time to complete."
+msgstr "Keep in mind however, that this process can take a while to
complete."
+
+#: Step1.class:466
msgid "Select Installation Source"
msgstr "Select Installation Source"
-#: Step1.class:367
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr "Select Installation source from the list below"
-#: Step0.class:272
-msgid "Select your keyboard layout"
-msgstr "Select your keyboard layout"
-
-#: Step0.class:291
-msgid "Select your keyboard model"
-msgstr "Select your keyboard model"
-
-#: Step0.class:241
-msgid "Select your language"
-msgstr "Select your language"
-
-#: Step0.class:113
-msgid "Spanish"
-msgstr "Spanish"
-
-#: Step0.class:317
-msgid "Use this box to test your keyboard settings"
-msgstr "Use this box to test your keyboard settings"
-
-#: Step1.class:237
-msgid "VERSION"
-msgstr "VERSION"
+#: Step1.class:505
+msgid "Search Again"
+msgstr "Search Again"
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "VectorLinux Installer"
+#: Step1.class:529
+msgid "Check Installation media before installing"
+msgstr "Check Installation media before installing"
-#: Step2.class:22
+#: Step2.class:27
msgid "Verify Installation Files"
msgstr "Verify Installation Files"
-#: Step2.class:37
-msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
-msgstr "Verifying installation files can prevent you from performing an
unsuccessful install"
+#: Step2.class:46
+msgid ""
+"This installation media has already been checked. Would you like to check
it "
+"again?"
+msgstr ""
+
+#: Step2.class:78
+msgid "Verifying data on compressed package"
+msgstr ""
+
+#: Step2.class:82
+msgid "Testing file"
+msgstr ""
+
+#: Step2.class:82
+msgid "of"
+msgstr ""
+
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
+msgid "FAILED"
+msgstr ""
+
+#: Step2.class:117
+msgid "The following"
+msgstr ""
+
+#: Step2.class:117
+msgid "required"
+msgstr ""
+
+#: Step2.class:117
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+
+#: Step2.class:118
+msgid "Integrity test"
+msgstr ""
+
+#: Step2.class:124
+msgid "PASSED"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"has failed the data integrity test. All required packages have passed
this "
+"test"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"Possible causes for this are a corrupted download or a badly burnt cd.
You "
+"can try the following options"
+msgstr ""
+
+#: Step2.class:154
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr ""
+
+#: Step2.class:154
+msgid "Burn the image at a lower speed rate"
+msgstr ""
+
+#: Step2.class:174
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+
+#: Step2.class:181
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+
+#: Step2.class:198
+msgid ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
+msgstr ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
-#: Step1.class:132
-msgid "in"
-msgstr "in"
+#: Step2.class:198
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr "Keep in mind however, that this process can take a while to
complete."
-#: Step1.class:81
-msgid "in partition"
+#: Step2.class:198
+msgid "Click"
+msgstr ""
+
+#: Step2.class:198
+msgid "to abort this process at any time"
+msgstr ""
+
+#: Step2.class:352
+msgid "TextLabel2"
+msgstr ""
+
+#: Step2.class:366
+msgid "Stop"
+msgstr ""
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:132 Step3a.class:110
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3.class:150
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:160
+msgid ""
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
+msgstr ""
+
+#: Step3.class:167
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:177
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:184
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:194
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr ""
+
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:121
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:142
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr ""
+
+#: Step3a.class:163
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
+#: Step3a2.class:25
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:45
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "Another partitioning option"
+msgstr ""
+
+#: Step3a2.class:92
+msgid "(Recomended)"
+msgstr ""
+
+#: Step3a2.class:102
+msgid "of free space"
+msgstr ""
+
+#: Step3a2.class:143
+msgid ""
+"Select the location on your hard drive where you would like to install "
+"VectorLinux"
+msgstr ""
+
+#: Step3a2.class:189
+msgid "Please wait while your hard drive is being partitioned"
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:204
+msgid ""
+"Unable to find enough un-used space to perform auto-partition. Please "
+"consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:309
+msgid "Partitioning stage complete... Click next to continue"
+msgstr ""
+
+#: Step3a2.class:422
+msgid "RadioButton1"
+msgstr ""
+
+#: Step3a3.class:6
+msgid "Claim free space from existing partitions"
+msgstr ""
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:174
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
+msgstr ""
+
+#: Step6.class:58
+#, fuzzy
+msgid "Partition"
msgstr "in partition"
-#: Step1.class:80
-msgid "on"
-msgstr "on"
+#: Step6.class:59
+msgid "Size"
+msgstr ""
+
+#: Step6.class:60
+msgid "Mount Point"
+msgstr ""
+
+#: Step6.class:61
+msgid "File System"
+msgstr ""
+
+#: Step6.class:133
+msgid "Not Used"
+msgstr ""
+
+#: Step6.class:154
+msgid "Do not format"
+msgstr ""
+
+#: Step6.class:199
+msgid "You have already selected"
+msgstr ""
+
+#: Step6.class:199
+msgid "as your"
+msgstr ""
+
+#: Step6.class:199
+#, fuzzy
+msgid "partition."
+msgstr "in partition"
+
+#: Step6.class:199
+msgid "Please select only one partition for this purpose"
+msgstr ""
+
+#: Step6.class:280
+#, fuzzy
+msgid "Select which partitions to use for installation"
+msgstr "Scanning system partitions for installation files"
+#: Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step6.class:385
+msgid "No"
+msgstr ""
Modified: branches/speedy/.lang/es.po
==============================================================================
--- branches/speedy/.lang/es.po (original)
+++ branches/speedy/.lang/es.po Wed Feb 11 14:32:23 2009
@@ -10,119 +10,533 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:258 FMain0.class:251
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "Instalador de VectorLinux"
+
+#: FMain.class:245 FMain0.class:233
+msgid "Process Overview"
+msgstr "Resumen del Proceso"
+
+#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr "Regreso"
-#: Step1.class:412
-msgid "Check Installation media before installing"
-msgstr "Verificar archivos de instalacion"
+#: FMain.class:298 FMain0.class:282
+msgid "Next"
+msgstr "Siguiente"
-#: Step1.class:234
-msgid "DISTRIBUTION"
-msgstr "DISTRIBUCION"
+#: FMain.class:309 FMain0.class:293
+msgid "Quit"
+msgstr "Cancelar"
-#: Step0.class:116
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Valores locales"
+
+#: Step0.class:122
+msgid "Spanish"
+msgstr ""
+
+#: Step0.class:125
msgid "English (US)"
msgstr ""
-#: Step1.class:81
-msgid "Found"
-msgstr "Encontre"
+#: Step0.class:253
+msgid "Select your language"
+msgstr "Seleccione su idioma"
-#: Step2.class:37
-msgid "Keep in mind however, that this process can take a while to
complete."
-msgstr "Tenga presente que este proceso podria tomar varios minutos para
terminar"
+#: Step0.class:284
+msgid "Select your keyboard layout"
+msgstr "Seleccione el diseño de su teclado"
-#: Step0.class:20
-msgid "Localization Settings"
-msgstr "Valores locales"
+#: Step0.class:303
+msgid "Select your keyboard model"
+msgstr "Seleccione el model de su teclado"
-#: FMain.class:269 FMain0.class:262
-msgid "Next"
-msgstr "Siguiente"
+#: Step0.class:325
+msgid "Use this box to test your keyboard settings"
+msgstr "Area de prueba"
-#: FMain.class:221 FMain0.class:220
-msgid "Process Overview"
-msgstr "Resumen del Proceso"
+#: Step1.class:33
+msgid "on"
+msgstr "en"
-#: FMain.class:280 FMain0.class:273
-msgid "Quit"
-msgstr "Cancelar"
+#: Step1.class:130
+msgid "Scanning system partitions for installation files"
+msgstr "Buscando medios de instalacion en particiones del sistema"
-#: Step1.class:122
-msgid "Scanning"
-msgstr "Buscando en"
+#: Step1.class:149
+msgid "Found"
+msgstr "Encontre"
+
+#: Step1.class:149
+msgid "in partition"
+msgstr "en particion"
-#: Step1.class:109
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr "Buscando medios de instalacion en CDROM. Por favor espere"
-#: Step1.class:156
+#: Step1.class:203
+msgid "Scanning"
+msgstr "Buscando en"
+
+#: Step1.class:213
+msgid "in"
+msgstr "en"
+
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr "Buscando medios de instalacion en imagenes ISO."
-#: Step1.class:62
-msgid "Scanning system partitions for installation files"
-msgstr "Buscando medios de instalacion en particiones del sistema"
+#: Step1.class:334
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUCION"
-#: Step1.class:388
-msgid "Search Again"
-msgstr "Buscar Nuevamente"
+#: Step1.class:337
+msgid "VERSION"
+msgstr "VERSION"
+
+#: Step1.class:414
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr ""
-#: Step1.class:349
+#: Step1.class:414
+msgid "WARNING:"
+msgstr ""
+
+#: Step1.class:414
+#, fuzzy
+msgid "This process can take a long time to complete."
+msgstr ""
+"Tenga presente que este proceso podria tomar varios minutos para terminar"
+
+#: Step1.class:466
msgid "Select Installation Source"
msgstr "Seleccione el medio de instalacion"
-#: Step1.class:367
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr "Seleccione la fuente instalacion de esta lista"
-#: Step0.class:272
-msgid "Select your keyboard layout"
-msgstr "Seleccione el diseño de su teclado"
+#: Step1.class:505
+msgid "Search Again"
+msgstr "Buscar Nuevamente"
-#: Step0.class:291
-msgid "Select your keyboard model"
-msgstr "Seleccione el model de su teclado"
+#: Step1.class:529
+msgid "Check Installation media before installing"
+msgstr "Verificar archivos de instalacion"
-#: Step0.class:241
-msgid "Select your language"
-msgstr "Seleccione su idioma"
+#: Step2.class:27
+msgid "Verify Installation Files"
+msgstr "Verificar archivos de instalacion antes de instalar"
-#: Step0.class:113
-msgid "Spanish"
+#: Step2.class:46
+msgid ""
+"This installation media has already been checked. Would you like to check
it "
+"again?"
msgstr ""
-#: Step0.class:317
-msgid "Use this box to test your keyboard settings"
-msgstr "Area de prueba"
+#: Step2.class:78
+msgid "Verifying data on compressed package"
+msgstr ""
-#: Step1.class:237
-msgid "VERSION"
-msgstr "VERSION"
+#: Step2.class:82
+msgid "Testing file"
+msgstr ""
-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
+#: Step2.class:82
+msgid "of"
+msgstr ""
-#: Step2.class:22
-msgid "Verify Installation Files"
-msgstr "Verificar archivos de instalacion antes de instalar"
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
+msgid "FAILED"
+msgstr ""
+
+#: Step2.class:117
+msgid "The following"
+msgstr ""
-#: Step2.class:37
-msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
+#: Step2.class:117
+msgid "required"
+msgstr ""
+
+#: Step2.class:117
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+
+#: Step2.class:118
+msgid "Integrity test"
+msgstr ""
+
+#: Step2.class:124
+msgid "PASSED"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"has failed the data integrity test. All required packages have passed
this "
+"test"
+msgstr ""
+
+#: Step2.class:154
+msgid ""
+"Possible causes for this are a corrupted download or a badly burnt cd.
You "
+"can try the following options"
+msgstr ""
+
+#: Step2.class:154
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr ""
+
+#: Step2.class:154
+msgid "Burn the image at a lower speed rate"
+msgstr ""
+
+#: Step2.class:174
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+
+#: Step2.class:181
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+
+#: Step2.class:198
+msgid ""
+"Verifying installation files can prevent you from performing an
unsuccessful "
+"install"
msgstr "Este proceso puede ayudar a asegurar que la instalacion sea
exitosa."
-#: Step1.class:132
-msgid "in"
-msgstr "en"
+#: Step2.class:198
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr ""
+"Tenga presente que este proceso podria tomar varios minutos para terminar"
-#: Step1.class:81
-msgid "in partition"
+#: Step2.class:198
+msgid "Click"
+msgstr ""
+
+#: Step2.class:198
+msgid "to abort this process at any time"
+msgstr ""
+
+#: Step2.class:352
+msgid "TextLabel2"
+msgstr ""
+
+#: Step2.class:366
+msgid "Stop"
+msgstr ""
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:132 Step3a.class:110
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3.class:150
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:160
+msgid ""
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
+msgstr ""
+
+#: Step3.class:167
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:177
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:184
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:194
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not harm any data on your hard drive"
+msgstr ""
+
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:121
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:142
+msgid "Use free space on existing partitions for VectorLinux"
+msgstr ""
+
+#: Step3a.class:163
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
+#: Step3a2.class:25
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:45
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:65
+msgid "Another partitioning option"
+msgstr ""
+
+#: Step3a2.class:92
+msgid "(Recomended)"
+msgstr ""
+
+#: Step3a2.class:102
+msgid "of free space"
+msgstr ""
+
+#: Step3a2.class:143
+msgid ""
+"Select the location on your hard drive where you would like to install "
+"VectorLinux"
+msgstr ""
+
+#: Step3a2.class:189
+msgid "Please wait while your hard drive is being partitioned"
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:204
+msgid ""
+"Unable to find enough un-used space to perform auto-partition. Please "
+"consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:309
+msgid "Partitioning stage complete... Click next to continue"
+msgstr ""
+
+#: Step3a2.class:422
+msgid "RadioButton1"
+msgstr ""
+
+#: Step3a3.class:6
+msgid "Claim free space from existing partitions"
+msgstr ""
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:174
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
+msgstr ""
+
+#: Step6.class:58
+#, fuzzy
+msgid "Partition"
msgstr "en particion"
-#: Step1.class:80
-msgid "on"
-msgstr "en"
+#: Step6.class:59
+msgid "Size"
+msgstr ""
+
+#: Step6.class:60
+msgid "Mount Point"
+msgstr ""
+
+#: Step6.class:61
+msgid "File System"
+msgstr ""
+#: Step6.class:133
+msgid "Not Used"
+msgstr ""
+
+#: Step6.class:154
+msgid "Do not format"
+msgstr ""
+
+#: Step6.class:199
+msgid "You have already selected"
+msgstr ""
+
+#: Step6.class:199
+msgid "as your"
+msgstr ""
+
+#: Step6.class:199
+#, fuzzy
+msgid "partition."
+msgstr "en particion"
+
+#: Step6.class:199
+msgid "Please select only one partition for this purpose"
+msgstr ""
+
+#: Step6.class:280
+#, fuzzy
+msgid "Select which partitions to use for installation"
+msgstr "Buscando medios de instalacion en particiones del sistema"
+
+#: Step6.class:385
+msgid "Yes"
+msgstr ""
+
+#: Step6.class:385
+msgid "No"
+msgstr ""
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Wed Feb 11 14:32:23 2009
@@ -28,3 +28,12 @@
STATIC PUBLIC sToScan AS String
STATIC PUBLIC sLastScanned AS String
+
+' Partition method used
+
+STATIC PUBLIC bAutoPartition AS Boolean
+STATIC PUBLIC sTargetRoot AS String ' we know by default this is a
reiserfs partition
+STATIC PUBLIC sTargetSwap AS String
+
+STATIC PUBLIC sFullDiscToWipe AS String
+
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Wed Feb 11 14:32:23 2009
@@ -44,8 +44,10 @@
IF ME.rbEntireDisk.Value = TRUE THEN
RETURN "Step3a1"
- ELSE IF ME.rbunpartitioned THEN
+ ELSE IF ME.rbunpartitioned.Value = TRUE THEN
RETURN "Step3a2"
+ ELSE IF ME.rbResizeParts.Value = TRUE THEN
+ RETURN "Step3a3"
END IF
Modified: branches/speedy/Step3a.form
==============================================================================
--- branches/speedy/Step3a.form (original)
+++ branches/speedy/Step3a.form Wed Feb 11 14:32:23 2009
@@ -48,19 +48,23 @@
}
{ rbResizeParts RadioButton
MoveScaled(1,8,56,3)
+ Visible = False
Expand = True
Text = ("Use free space on existing partitions for VectorLinux")
}
{ Panel3 Panel
MoveScaled(2,11,3,3)
+ Visible = False
}
{ tlFreeSpace2 TextLabel
MoveScaled(5,11,19,4)
+ Visible = False
Expand = True
Text = ("")
}
{ HBox3 HBox
MoveScaled(1,14,6,2)
+ Visible = False
Expand = True
}
{ rbEntireDisk RadioButton
Modified: branches/speedy/Step3a1.class
==============================================================================
--- branches/speedy/Step3a1.class (original)
+++ branches/speedy/Step3a1.class Wed Feb 11 14:32:23 2009
@@ -14,19 +14,90 @@
' 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 objPosTargets AS Object[]
PUBLIC SUB Form_Open()
- ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk") & "</H2>"
+ ME.tlbanner.Text = "<h2>" & ("Use Entire Hard Disk for VectorLinux")
& "</H2>"
+ ME.TLwARNING.Text = "<b><u>" & ("WARNING:") & "</u></b><br>" &
+ "<i>" & ("All existing data in the device you select here will be
destroyed.") & "</i>"
+
+ objPosTargets = NEW Object[]
+
+ ME.DISPLAY_POSSIBLE_DISK_TARGETS
+END
+PUBLIC SUB DISPLAY_POSSIBLE_DISK_TARGETS()
+
+ DIM sDiskList AS String[]
+ DIM sDisks, sDisk, sSizeDump AS String
+ DIM i AS Integer
+
+ PRINT " --\\__ Auto partition using full disk"
+ PRINT " --\\- Possible Targets: "
+ SHELL "probedisk | grep -v -i \"cdrom\" | cut -f 1 -d \"|\" " TO sDisks
+
+ sDiskList = Split(Trim(sDisks), "\n")
+ FOR i = 0 TO sDiskList.Max
+ sDisk = Trim(sDiskList[i])
+ IF InStr(ClsGlobal.sSourceAddr, sDisk) = FALSE THEN
+ 'Message(sDisk)
+ ' root:# parted /dev/hda print | grep "^Disk" | tr -s ' ',""
| cut -f 2 -d ':'
+ SHELL "parted " & sDisk & " print | grep \"^Disk\" | tr -s
\' \',\"\" | cut -f 2 -d \':\'" TO sSizeDump
+ sSizeDump = Trim(sSizeDump)
+
+ PRINT " --\\+ " & sDisk & " ( " & sSizeDump & " )"
+ ' do the gui representation
+ rb = NEW RadioButton(hpanel2) AS "PossTargets"
+
+ WITH rb
+ .Height = 21
+ .Expand = TRUE
+ .Text = sDisk
+ .Tag = sDisk
+ END WITH
+ IF objPosTargets.Find(rb) = -1 THEN objPosTargets.Add(rb)
+
+ pn = NEW Panel(hpanel2)
+ WITH pn
+ .Expand = FALSE
+ .Width = 30
+ .Height = 30
+ END WITH
+ tl = NEW TextLabel(hpanel2) ' Hard disk information
+ WITH tl
+ .Text = "<b>" & ("Total Disc Size") & "</b>" &
Space(1) & sSizeDump
+ .Expand = TRUE
+ .Height = 21
+ .Alignment = Align.Left
+ END WITH
+ hb = NEW HBox(hpanel2)
+ WITH hb
+ .Height = 10
+ .Expand = TRUE
+ END WITH
+
+
+ END IF
+ NEXT
+
END
+
+
+
+
PUBLIC FUNCTION GETNEXT() AS String
-
+ RETURN "Step3a1a"
END
PUBLIC SUB ONEXIT()
-
+ DIM rb AS RadioButton
+ FOR EACH rb IN objPosTargets
+ IF rb.Value = TRUE THEN
+ ClsGlobal.sFullDiscToWipe = rb.Tag
+ END IF
+ NEXT
END
PUBLIC SUB STARTUP()
Modified: branches/speedy/Step3a1.form
==============================================================================
--- branches/speedy/Step3a1.form (original)
+++ branches/speedy/Step3a1.form Wed Feb 11 14:32:23 2009
@@ -17,4 +17,44 @@
Expand = True
}
}
+ { HBox1 HBox
+ MoveScaled(1,5,6,1)
+ Expand = True
+ }
+ { TLwARNING TextLabel
+ MoveScaled(1,8,35,4)
+ Expand = True
+ Text = ("TextLabel1")
+ Alignment = Align.Normal
+ }
+ { HBox2 HBox
+ MoveScaled(1,12,6,3)
+ Expand = True
+ { Separator2 Separator
+ MoveScaled(1,1,3,1)
+ Expand = True
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,15,65,23)
+ Expand = True
+ }
+ { rb RadioButton
+ MoveScaled(4,39,12,2)
+ Visible = False
+ Text = ("RadioButton1")
+ }
+ { hb HBox
+ MoveScaled(18,40,7,2)
+ Visible = False
+ }
+ { pn Panel
+ MoveScaled(28,41,5,2)
+ Visible = False
+ }
+ { tl TextLabel
+ MoveScaled(38,41,9,2)
+ Visible = False
+ Text = ("TextLabel1")
+ }
}
Added: branches/speedy/Step3a1a.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1a.class Wed Feb 11 14:32:23 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/>.
+
+PRIVATE hproc AS Process
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Create Linux Partition Scheme in") &
Space(1) & ClsGlobal.sFullDiscToWipe & "</h2>"
+
+
+
+END
+
+PUBLIC SUB DESTROY_CURRENT_DATA()
+
+ DIM sDrive AS String = Trim(ClsGlobal.sFullDiscToWipe)
+ DIM sPartitions, sPart AS String
+ DIM sPartList AS String[]
+ DIM i AS Integer
+
+ PRINT " --\\\\-- Selected target : " & sDrive
+ 'SHELL "parted " & sDrive & " print | grep \"^ [0-9]\" | tr -s \'
\',\"\" | cut -f 1-2 -d \"\"" TO sPartitions
+ SHELL "parted " & sDrive & " print | grep \"^ [0-9]\" | tr -s \'
\',\"\" | cut -f 1-2 -d \' \'" TO sPartitions
+ sPartitions = Trim(sPartitions)
+
+ IF NOT sPartitions THEN
+ PRINT " --\\__ Target device is empty (no partitions found) "
+ RETURN
+ END IF
+ sPartList = Split(sPartitions, "\n")
+ FOR i = 0 TO sPartList.Max
+ sPart = Trim(sPartList[i])
+ ' remove this partition
+ PRINT " \\__- Deleting partition " & sPart
+ hproc = SHELL "parted " & sDrive & " rm " & sPart & "
1>/dev/null " WAIT
+ IF hproc.Value > 0 THEN
+ Message.Error(("There has been an error deleting") &
Space(1) & sDrive & sPart & "." & "<br>" &
+ ("Please make sure the drive or partition is not being
used by some other program"))
+ 'BREAK
+ PRINT " \\- FAILED!"
+ RETURN
+ END IF
+
+ PRINT " \\- Done"
+ NEXT
+
+END
+
+
+PUBLIC SUB CREATE_NEW_PARTITIONS()
+
+ DIM lRunningSwap, lNeededSwap, lTotalRAM AS Long
+ DIM sDump AS String
+
+ ' First determine how much swap we need
+ SHELL "free | grep \"^Swap\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
+ sDump = Trim(sDump)
+ Message("Total RAM " & sDump)
+
+
+END
+
+
+
+PUBLIC SUB StartUp()
+
+ SELECT CASE Message.Warning("<b>" & ("WARNING:") & "</b>" & Space(1) &
("All existing data in") & Space(1) & ClsGlobal.sFullDiscToWipe & Space(1)
& ("is about to be deleted.") & "<br>" &
+ ("This step cannot be undone. Are you sure you want to continue?"),
("Yes"), ("No"))
+ CASE 1
+ 'Message("Yes")
+ ME.tlWarning.Text = ("Preparing hard disk for new partitioning
structure. Please wait")
+ ME.DESTROY_CURRENT_DATA()
+ ME.CREATE_NEW_PARTITIONS()
+ CASE 2
+ 'Message("No")
+ ME.tlWarning.Text = ("Operation cancelled by user. No changes have
been made to the system")
+ END SELECT
+
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+
+
+END
Added: branches/speedy/Step3a1a.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1a.form Wed Feb 11 14:32:23 2009
@@ -0,0 +1,36 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,72,45)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(2,5,5,1)
+ Expand = True
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,6,69,36)
+ { tlWarning TextLabel
+ MoveScaled(1,1,12,3)
+ Expand = True
+ Text = ("")
+ }
+ { MovieBox1 MovieBox
+ MoveScaled(19,7,25,19)
+ Expand = True
+ }
+ }
+}
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Wed Feb 11 14:32:23 2009
@@ -182,7 +182,9 @@
DIM sDrive, sPartedRes, sFreeStart, sFreeEnd, sFreeSize, sDump AS String
DIM sOutLine, sDumparr AS String[]
DIM lFreeKB, lFreeStart, lFreeEnd AS Long
-
+ DIM sRootPart, sSwapPart AS String
+
+
ME.HPanel3.Visible = FALSE
ME.HPanel4.Visible = TRUE
ME.MovieBox1.Playing = TRUE
@@ -224,15 +226,18 @@
'Message(sDump)
sDump = Trim(sDump)
IF NOT sDump THEN 'The entire disc IS not
partitioned. 'Message("No partitions found ont his disk")
+ iLastPartNo = 0
' create new partitions on raw space.
' root:# parted /dev/hda --script "mkpartfs primary
linux-swap -512kb -1kb" ' SAMPLE PARTED LINE
SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
reiserfs 0kb -" & lNeededSwap & "kb\"" WAIT ' partition 1
'WAIT 1
SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
linux-swap -" & lNeededSwap & "kb -1kb\"" WAIT ' partition 2
- SHELL "mkswap " & Trim(sDrive) & 2 WAIT ' make the swap
partition
- EXEC ["swapon", Trim(sDrive) & 2] WAIT
+ SHELL "mkswap " & Trim(sDrive) & (iLastPartNo + 2) WAIT '
make the swap partition
+ EXEC ["swapon", Trim(sDrive) & (iLastPartNo + 2)] WAIT
+ sRootPart = Trim(sdrive) & (iLastPartNo + 1)
+ sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
' Ready to start setting defined target partitions.
'###################################################################################################################
@@ -261,6 +266,10 @@
PRINT " --- Created swap partition " &
Trim(sdrive) & (iLastPartNo + 2)
SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +
2) WAIT
SHELL "swapon " & Trim(sdrive) & (iLastPartNo +
2) WAIT
+
+ sRootPart = Trim(sdrive) & (iLastPartNo + 1)
+ sSwapPart = Trim(sdrive) & (iLastPartNo + 2)
+
ELSE ' this method skips one number I think
' BEGIN BY CREATING AN EXTENDED PARTITION TO HOLD
LOGICAL PARTITIONS IN IT
' THIS WILL ADD 1 TO THE iLastPartition number
@@ -292,6 +301,8 @@
sFreeEnd = sOutLine[1]
sFreeSize = sOutLine[2]
SHELL "parted " & Trim(sdrive) & " mkpart
logical linux-swap " & sFreeStart & " " & sFreeEnd WAIT
+
+
' ^^^^^^^^ IN CASE THE ABOVE LINE DOESN'T
WORK, THE FOLLOWING CODE MAY BE USED TO PERFORM THE SAME OPERATION
^^^^^^^^^^
' ' ' ' ' sDump = "#!/bin/bash \n" &
@@ -301,6 +312,8 @@
' ' ' ' ' "EOF"
' ' ' ' ' File.Save("/tmp/swapmaker", sDump)
' ' ' ' ' SHELL "sh /tmp/swapmaker" WAIT
+ sRootPart = Trim(sdrive) & (iLastPartNo + 2)
+ sRootPart = Trim(sdrive) & (iLastPartNo + 3)
END IF
END IF
@@ -308,6 +321,14 @@
ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
ME.MovieBox1.Playing = FALSE
+
+ ' set the flaf for partition reading
+ ClsGlobal.bAutoPartition = TRUE
+ ClsGlobal.sTargetRoot = sRootPart
+ ClsGlobal.sTargetSwap = sSwapPart
+
+
+
END
@@ -321,6 +342,18 @@
PUBLIC SUB STARTUP()
'ME.LIST_FREE_SPACE()
+ DIM i AS Integer
+ FOR EACH RadioButton1 IN objTargetOptions
+ IF RadioButton1.Enabled = TRUE THEN INC i
+ NEXT
+
+ IF i < 1 THEN
+ Message.Error(("We are unable to find any hard disks with enough
unpartitioned space for this operation.") & "<br>" &
+ ("Please consider using another partitioning method."))
+
+ ME.tlSelAutoTarget.Text = ("Unable to find any hard drives with enough
unpartitioned space. Please go back and select another partitioning
method")
+ END IF
+
END
Added: branches/speedy/Step3a3.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a3.class Wed Feb 11 14:32:23 2009
@@ -0,0 +1,93 @@
+' 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 sMountedList AS String
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Claim free space from existing
partitions") & "</h2>"
+ ME.DISPLAY_RESIZABLE_PARTITIONS()
+
+END
+
+PUBLIC SUB DISPLAY_RESIZABLE_PARTITIONS()
+
+ DIM sDump, sPreMountList, sDfDump, sDrives, sPartition, sPartShort AS
String
+ DIM sResults, sDumparr AS String[]
+ DIM i, n AS Integer
+
+ SHELL "df -Th | grep \"/dev\" | tr -s \' \',\"\"" TO sPreMountList
+ 'Message(sPreMountList)
+ SHELL "probepart | grep \"^/dev\" | tr -s \' \',\"\" | cut -f 1 -d \'
\'" TO sDump
+ sDump = Trim(sDump)
+ sDumparr = Split(sDump, "\n")
+ FOR i = 0 TO sDumparr.Max
+ sPartition = Trim(sDumparr[i])
+ sPartShort = Right(sPartition, Len(sPartition) -
RInStr(sPartition, "/"))
+ 'Message(sPartShort)
+ sMountedList = sMountedList & sPartition & " "
+ IF InStr(sMountedList, sPartition) = FALSE THEN
+ SHELL "mkdir -p /mnt" &/ sPartShort & " 2> /dev/null" WAIT
+ SHELL "mount -o ro " & sPartition & Space(1) & "/mnt" &/
sPartShort & " 2> /dev/null" WAIT
+ END IF
+
+ NEXT
+
+ ' now that they're all mounted, get the free space on each one of
them
+ SHELL "df -Th | grep \"^/dev\" | tr -s \' \',\"\"" TO sDfDump
+ 'Message(sMountedList)
+ sDfDump = Trim(sDfDump)
+ Message(sDfDump)
+
+ FOR i = 0 TO sDumparr.Max
+ sPartition = Trim(sDumparr[i])
+ sPartShort = Right(sPartition, Len(sPartition) -
RInStr(sPartition, "/"))
+ IF sPartition <> ClsGlobal.sSourceAddr THEN
+ SHELL "umount -f /mnt" &/ sPartShort & " 2> /dev/null" WAIT
+ END IF
+ NEXT
+
+
+
+
+ ' Filesystem Type Size Used Avail Use% Mounted on
+
+
+
+
+
+END
+
+
+
+
+
+PUBLIC FUNCTION GetNExt() AS String
+
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
Added: branches/speedy/Step3a3.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a3.form Wed Feb 11 14:32:23 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,75,51)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
|
|
From: <cod...@go...> - 2009-02-11 16:57:09
|
Author: M0...@gm...
Date: Wed Feb 11 08:56:22 2009
New Revision: 490
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/Step3.form
branches/speedy/Step3a.class
branches/speedy/Step3a.form
Log:
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 11 08:56:22 2009
@@ -242,7 +242,7 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:132 Step3a.class:102
+#: Step3.class:132 Step3a.class:108
msgid "TextLabel1"
msgstr ""
@@ -252,8 +252,8 @@
#: Step3.class:160
msgid ""
-"Automatically resize your partitions to make size for your VectorLinux "
-"installation"
+"Automatically resize your partitions and / or create the correct disk
space "
+"for VectorLinux."
msgstr ""
#: Step3.class:167
@@ -289,18 +289,33 @@
msgstr ""
#: Step3a.class:24
-msgid "Locate free space on hard disk and install VectorLinux there."
+msgid ""
+"Locate free (unpartitioned) space on hard disk and install VectorLinux
there."
msgstr ""
#: Step3a.class:24
-msgid "This option will not erase any data off your hard drive"
+msgid "This option will not harm any data on your hard drive"
+msgstr ""
+
+#: Step3a.class:26
+msgid ""
+"Resize your existing partitions to make room for a VectorLinux partition "
+"scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:119
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
msgstr ""
-#: Step3a.class:113
-msgid "Use Free space on my hard disk"
+#: Step3a.class:140
+msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:134
+#: Step3a.class:161
msgid "Use entire disk"
msgstr ""
@@ -356,11 +371,11 @@
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:361
+#: Step3a2.class:309
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:474
+#: Step3a2.class:422
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Wed Feb 11 08:56:22 2009
@@ -31,7 +31,7 @@
msgstr ""
#: Step3.class:160
-msgid "Automatically resize your partitions to make size for your
VectorLinux installation"
+msgid "Automatically resize your partitions and / or create the correct
disk space for VectorLinux."
msgstr ""
#: Step3.class:167
Modified: branches/speedy/.lang/Step3a.pot
==============================================================================
--- branches/speedy/.lang/Step3a.pot (original)
+++ branches/speedy/.lang/Step3a.pot Wed Feb 11 08:56:22 2009
@@ -31,22 +31,34 @@
msgstr ""
#: Step3a.class:24
-msgid "Locate free space on hard disk and install VectorLinux there."
+msgid "Locate free (unpartitioned) space on hard disk and install
VectorLinux there."
msgstr ""
#: Step3a.class:24
-msgid "This option will not erase any data off your hard drive"
+msgid "This option will not harm any data on your hard drive"
msgstr ""
-#: Step3a.class:102
+#: Step3a.class:26
+msgid "Resize your existing partitions to make room for a VectorLinux
partition scheme"
+msgstr ""
+
+#: Step3a.class:26
+msgid "This option will not harm any existing data on your hard drive"
+msgstr ""
+
+#: Step3a.class:108
msgid "TextLabel1"
msgstr ""
-#: Step3a.class:113
-msgid "Use Free space on my hard disk"
+#: Step3a.class:119
+msgid "Use unpartitioned space on my hard disk (creates new partitions)"
+msgstr ""
+
+#: Step3a.class:140
+msgid "Use free space on existing partitions for VectorLinux"
msgstr ""
-#: Step3a.class:134
+#: Step3a.class:161
msgid "Use entire disk"
msgstr ""
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Wed Feb 11 08:56:22 2009
@@ -58,11 +58,11 @@
msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:361
+#: Step3a2.class:309
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:474
+#: Step3a2.class:422
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/Step3.form
==============================================================================
--- branches/speedy/Step3.form (original)
+++ branches/speedy/Step3.form Wed Feb 11 08:56:22 2009
@@ -50,7 +50,7 @@
{ tlautopart TextLabel
MoveScaled(4,6,55,4)
Expand = True
- Text = ("Automatically resize your partitions to make size for your
VectorLinux installation")
+ Text = ("Automatically resize your partitions and / or create the
correct disk space for VectorLinux.")
}
{ rbCustomPart RadioButton rbGroup
Name = "rbCustomPart"
Modified: branches/speedy/Step3a.class
==============================================================================
--- branches/speedy/Step3a.class (original)
+++ branches/speedy/Step3a.class Wed Feb 11 08:56:22 2009
@@ -20,8 +20,10 @@
ME.tlActionExp.Text = ("Select one of the following options")
ME.tlEntireDisc.Text = ("Allow VectorLinux 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 space on hard disk and install
VectorLinux there.") & "<br>" &
- "<i>" & ("This option will not erase any data off your hard drive")
& "</i>"
+ ME.tlFreeSpace.Text = ("Locate free (unpartitioned) space on hard disk
and install VectorLinux 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>" &
+ "<i>" & ("This option will not harm any existing data on your hard
drive") & "</i>"
END
@@ -41,8 +43,8 @@
PUBLIC FUNCTION GetNext() AS String
IF ME.rbEntireDisk.Value = TRUE THEN
- RETURN "Step3a1"
- ELSE
+ RETURN "Step3a1"
+ ELSE IF ME.rbunpartitioned THEN
RETURN "Step3a2"
END IF
Modified: branches/speedy/Step3a.form
==============================================================================
--- branches/speedy/Step3a.form (original)
+++ branches/speedy/Step3a.form Wed Feb 11 08:56:22 2009
@@ -27,12 +27,12 @@
}
}
{ HPanel2 HPanel
- MoveScaled(1,13,79,20)
+ MoveScaled(1,13,79,32)
Expand = True
- { rbFreeSpace RadioButton
+ { rbunpartitioned RadioButton
MoveScaled(1,1,22,3)
Expand = True
- Text = ("Use Free space on my hard disk")
+ Text = ("Use unpartitioned space on my hard disk (creates new
partitions)")
}
{ Panel2 Panel
MoveScaled(2,4,3,3)
@@ -46,16 +46,33 @@
MoveScaled(1,6,6,2)
Expand = True
}
+ { rbResizeParts RadioButton
+ MoveScaled(1,8,56,3)
+ Expand = True
+ Text = ("Use free space on existing partitions for VectorLinux")
+ }
+ { Panel3 Panel
+ MoveScaled(2,11,3,3)
+ }
+ { tlFreeSpace2 TextLabel
+ MoveScaled(5,11,19,4)
+ Expand = True
+ Text = ("")
+ }
+ { HBox3 HBox
+ MoveScaled(1,14,6,2)
+ Expand = True
+ }
{ rbEntireDisk RadioButton
- MoveScaled(2,9,34,3)
+ MoveScaled(2,17,34,3)
Expand = True
Text = ("Use entire disk")
}
{ Panel1 Panel
- MoveScaled(2,12,3,3)
+ MoveScaled(2,20,3,3)
}
{ tlEntireDisc TextLabel
- MoveScaled(6,12,32,4)
+ MoveScaled(6,20,32,4)
Expand = True
Text = ("")
}
|
|
From: <cod...@go...> - 2009-02-11 16:21:46
|
Author: M0...@gm...
Date: Wed Feb 11 08:02:05 2009
New Revision: 489
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/Step3a2.class
Log:
Auto partition creation complete
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 11 08:02:05 2009
@@ -356,11 +356,11 @@
"consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:320
+#: Step3a2.class:361
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:433
+#: Step3a2.class:474
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Wed Feb 11 08:02:05 2009
@@ -58,11 +58,11 @@
msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
msgstr ""
-#: Step3a2.class:320
+#: Step3a2.class:361
msgid "Partitioning stage complete... Click next to continue"
msgstr ""
-#: Step3a2.class:433
+#: Step3a2.class:474
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Wed Feb 11 08:02:05 2009
@@ -280,41 +280,30 @@
' PROCEED TO CREATE PARTITIONS IN NEWLY
CALCULATED FREE SPACE
SHELL "parted " & Trim(sDrive) & " -s \"mkpart
logical reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\""
WAIT
- 'SHELL "parted " & Trim(sdrive) & " mkfs
reiserfs " & (iLastPartNo + 2) WAIT
- 'SHELL "mkfs.reiserfs -fq " & sDrive &
(iLastPartNo + 2) WAIT
- 'EXEC ["mkfs.reiserfs", "-fq", sDrive &
(iLastPartNo + 2)] WAIT
- 'SHELL "parted " & Trim(sdrive) & " -s \"mkpart
logical linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb
yes\"" WAIT
- SHELL "parted " & Trim(sdrive) & " mkpart
logical linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb >
echo \"Yes\"" WAIT
- SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +
3) WAIT
-
+ 'SHELL "echo yes | parted " & Trim(sdrive) & "
mkfs reiserfs " & (iLastPartNo + 2) WAIT
+ SHELL "mkfs.reiserfs -fq " & sDrive &
(iLastPartNo + 2) WAIT
-
- 'SHELL "parted " & Trim(sdrive) & " -s \"mkpart
logical linux-swap " & (lFreeEnd - (lNeededSwap - 1)) & "kb " & (lFreeEnd -
1) & "kb\" " WAIT
- 'EXEC ["mkswap", Trim(sdrive) & (iLastPartNo +
3)] WAIT
- 'EXEC ["swapon", Trim(sdrive) & (iLastPartNo +
3)] WAIT
-
-
-
-
-
+ ' ####################### RECALCULATE FREE SPACE
########################################
+ SHELL "parted " & Trim(sDrive) & " unit gb
print free | grep -i \"free space\" | tr -s \' \',\"\" | cut -f 2-4 -d \'
\'" TO sPartedRes
+ 'Message(sPartedRes)
+ sPartedRes = Trim(sPartedRes) ' |
START | | END | | SIZE |
+ sOutLine = Split(sPartedRes,
Space(1))
+ sFreeStart = sOutLine[0]
+ sFreeEnd = sOutLine[1]
+ sFreeSize = sOutLine[2]
+ SHELL "parted " & Trim(sdrive) & " mkpart
logical linux-swap " & sFreeStart & " " & sFreeEnd WAIT
+ ' ^^^^^^^^ IN CASE THE ABOVE LINE DOESN'T
WORK, THE FOLLOWING CODE MAY BE USED TO PERFORM THE SAME OPERATION
^^^^^^^^^^
+
+ ' ' ' ' ' sDump = "#!/bin/bash \n" &
+ ' ' ' ' ' "parted " & Trim(sdrive) & " mkpart
logical linux-swap " & sFreeStart & " " & sFreeEnd & " \n" &
+ ' ' ' ' ' "<<EOF \n" &
+ ' ' ' ' ' "yes \n" &
+ ' ' ' ' ' "EOF"
+ ' ' ' ' ' File.Save("/tmp/swapmaker", sDump)
+ ' ' ' ' ' SHELL "sh /tmp/swapmaker" WAIT
END IF
END IF
-
-
- 'parted /dev/hda print free | grep -i "Free space" |tr -s ' ',"" |
cut -f 2-4 -d ' '
-
-
- ' root:# parted /dev/hda --script "mkpartfs primary linux-swap -512kb
-1kb" ' SAMPLE PARTED LINE
-
-
-
- ' FOR i = 0 TO 20
- ' WAIT 2
- ' NEXT
- '
- ' ME.MovieBox1.Playing = FALSE
- ' Message("Finished")
ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
|
|
From: <cod...@go...> - 2009-02-10 23:47:08
|
Author: M0...@gm...
Date: Tue Feb 10 14:31:22 2009
New Revision: 488
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/Step3a2.class
branches/speedy/Step3a2.form
Log:
More work in the auto-partition department
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Feb 10 14:31:22 2009
@@ -308,37 +308,59 @@
msgid "Use Entire Hard Disk"
msgstr ""
-#: Step3a2.class:23
+#: Step3a2.class:25
msgid "Install VectorLinux to free space on disk"
msgstr ""
-#: Step3a2.class:40
+#: Step3a2.class:45
msgid "Searching for unused space on your hard drive... please wait"
msgstr ""
-#: Step3a2.class:60
+#: Step3a2.class:65
msgid "No hard disks found on your system. Please select"
msgstr ""
-#: Step3a2.class:60
+#: Step3a2.class:65
msgid "Another partitioning option"
msgstr ""
-#: Step3a2.class:87
+#: Step3a2.class:92
msgid "(Recomended)"
msgstr ""
-#: Step3a2.class:97
+#: Step3a2.class:102
msgid "of free space"
msgstr ""
-#: Step3a2.class:153
+#: Step3a2.class:143
msgid ""
"Select the location on your hard drive where you would like to install "
"VectorLinux"
msgstr ""
-#: Step3a2.class:265
+#: Step3a2.class:189
+msgid "Please wait while your hard drive is being partitioned"
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:204
+msgid ""
+"Unable to find enough un-used space to perform auto-partition. Please "
+"consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:320
+msgid "Partitioning stage complete... Click next to continue"
+msgstr ""
+
+#: Step3a2.class:433
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Tue Feb 10 14:31:22 2009
@@ -14,35 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step3a2.class:23
+#: Step3a2.class:25
msgid "Install VectorLinux to free space on disk"
msgstr ""
-#: Step3a2.class:40
+#: Step3a2.class:45
msgid "Searching for unused space on your hard drive... please wait"
msgstr ""
-#: Step3a2.class:60
+#: Step3a2.class:65
msgid "No hard disks found on your system. Please select"
msgstr ""
-#: Step3a2.class:60
+#: Step3a2.class:65
msgid "Another partitioning option"
msgstr ""
-#: Step3a2.class:87
+#: Step3a2.class:92
msgid "(Recomended)"
msgstr ""
-#: Step3a2.class:97
+#: Step3a2.class:102
msgid "of free space"
msgstr ""
-#: Step3a2.class:153
+#: Step3a2.class:143
msgid "Select the location on your hard drive where you would like to
install VectorLinux"
msgstr ""
-#: Step3a2.class:265
+#: Step3a2.class:189
+msgid "Please wait while your hard drive is being partitioned"
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Unable to find enough un-used space to perform auto-partition."
+msgstr ""
+
+#: Step3a2.class:202
+msgid "Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:204
+msgid "Unable to find enough un-used space to perform auto-partition.
Please consider using a different partitioning option."
+msgstr ""
+
+#: Step3a2.class:320
+msgid "Partitioning stage complete... Click next to continue"
+msgstr ""
+
+#: Step3a2.class:433
msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Tue Feb 10 14:31:22 2009
@@ -15,13 +15,18 @@
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
PRIVATE lLargest AS Long
+PRIVATE lTotalRam AS Long
+PRIVATE lNeededSwap AS Long
PRIVATE sLargestDev AS String
PRIVATE objTargetOptions AS Object[]
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & ("Install VectorLinux to free space on
disk") & "</H2>"
+ ME.MovieBox1.Path = "images/throbber.gif"
+ ME.MovieBox1.Playing = FALSE
objTargetOptions = NEW Object[]
+
ME.LIST_FREE_SPACE()
END
@@ -31,10 +36,10 @@
DIM sDiscs, sLine AS String[]
DIM sDisc, sDump, sFreeDump AS String
DIM lFreeSpace AS Float ' free space in KB
- DIM lTotalFreeKb, lFreeBegin, lFreeEnd, lNeededSwap AS Long
+ DIM lTotalFreeKb, lFreeBegin, lFreeEnd AS Long
DIM sFreeBeinRaw, sFreeEndRaw AS String
DIM i AS Integer
- DIM lTotalRam AS Long
+ 'DIM lTotalRam AS Long
DIM rb AS RadioButton
ME.tlSelAutoTarget.Text = ("Searching for unused space on your hard
drive... please wait")
@@ -49,7 +54,7 @@
ELSE
lNeededSwap = lTotalRam
END IF
-
+ 'Message(lNeededSwap)
PRINT " -+- Total RAM Available : " & lTotalRam & " KB"
PRINT " -*- Calculating available free space"
@@ -119,21 +124,6 @@
.Expand = TRUE
.Tag = sDisc
END WITH
- '
- ' FOR EACH RadioButton1 IN objTargetOptions
- ' IF RadioButton1.Tag = sLargestDev THEN
- ' RadioButton1.Text = RadioButton1.Text & Space(1) & ("(Recomended)")
- ' RadioButton1.Value = TRUE
- ' END IF
- ' NEXT
- 'ME.GridView1[irow, 0].Text = sDisc
- 'ME.GridView1[irow, 1].Text = lTotalFreeKb
-' ME.GridView1[GridView1.Rows.Count - 1 + i, 0].Text = sDisc
-' ME.GridView1[GridView1.Rows.Count - 1 + i, 1].Text = lFreeSpace
-
-
- 'INC ME.GridView1.Rows.Count
-
'NOTES
@@ -155,18 +145,27 @@
END
+
+
+
PUBLIC SUB ConvertToKb(sRawString AS String) AS Long
DIM fSize AS Float
DIM sTrimmed AS Float = Left(sRawString, Len(sRawString) - 2)
DIM sTotal AS Long
- IF sRawString LIKE "*mb*" THEN
+ IF Right(sRawString, 2) = "MB" THEN
fSize = sTrimmed
sTotal = fSize * 1024
- ELSE IF sRawString LIKE "*gb*" THEN
+ ELSE IF Right(sRawString, 2) = "GB" THEN
fSize = sTrimmed
sTotal = (fSize * 1024) * 1024
+ ELSE IF Right(sRawString, 2) = "KB" OR Right(sRawString, 2) = "kB" THEN
+ fSize = sTrimmed
+ sTotal = fSize
+ ELSE IF Right(sRawString, 1) = "B"
+ fSize = sTrimmed
+ sTotal = fSize
END IF
RETURN sTotal
@@ -177,6 +176,152 @@
END
+PUBLIC SUB PERFORM_PARTITIONING()
+
+ DIM i, iLastPartNo AS Integer
+ DIM sDrive, sPartedRes, sFreeStart, sFreeEnd, sFreeSize, sDump AS String
+ DIM sOutLine, sDumparr AS String[]
+ DIM lFreeKB, lFreeStart, lFreeEnd AS Long
+
+ ME.HPanel3.Visible = FALSE
+ ME.HPanel4.Visible = TRUE
+ ME.MovieBox1.Playing = TRUE
+ ME.tlSelAutoTarget.Text = ("Please wait while your hard drive is being
partitioned")
+
+ FOR EACH RadioButton1 IN objTargetOptions
+ IF RadioButton1.Value = TRUE THEN
+ IF RadioButton1.Enabled = TRUE THEN
+ sDrive = RadioButton1.Tag
+ END IF
+ END IF
+ NEXT
+ 'Message(sDrive)
+ WAIT 1
+ IF NOT sdrive THEN
+ Message.Error(("Unable to find enough un-used space to perform
auto-partition.") & gb.NewLine &
+ ("Please consider using a different partitioning option."))
+ ME.MovieBox1.Playing = FALSE
+ ME.tlSelAutoTarget.Text = ("Unable to find enough un-used space
to perform auto-partition. Please consider using a different partitioning
option.")
+ ME.MovieBox1.Enabled = FALSE
+ RETURN
+ END IF
+ ' read from parted again
+ SHELL "parted " & Trim(sDrive) & " unit kb print free | grep -i \"free
space\" | tr -s \' \',\"\" | cut -f 2-4 -d \' \'" TO sPartedRes
+ 'Message(sPartedRes)
+ sPartedRes = Trim(sPartedRes) ' | START | | END | | SIZE |
+ sOutLine = Split(sPartedRes, Space(1))
+ sFreeStart = sOutLine[0]
+ sFreeEnd = sOutLine[1]
+ sFreeSize = sOutLine[2]
+ ' I need to know where the free space stars and ends to do this.
+ lFreeKB = ME.ConvertToKb(sFreeSize)
+ lFreeStart = ME.ConvertToKb(sFreeStart)
+ lFreeEnd = ME.ConvertToKb(sFreeEnd)
+ ' keep in mind that only partitions 1-4 can be primary... everything
else must be extended
+ ' I need to use probepart to see the number of the last partition
present in the drive
+ ' And figure out the partition numbers for the future partitions.
+ SHELL "probepart | grep \"^" & Trim(sDrive) & "\" | tr -s \' \',\"\"
| cut -f 1 -d \' \'" TO sDump
+ 'Message(sDump)
+ sDump = Trim(sDump)
+ IF NOT sDump THEN 'The entire disc IS not
partitioned. 'Message("No partitions found ont his disk")
+ ' create new partitions on raw space.
+ ' root:# parted /dev/hda --script "mkpartfs primary
linux-swap -512kb -1kb" ' SAMPLE PARTED LINE
+
+ SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
reiserfs 0kb -" & lNeededSwap & "kb\"" WAIT ' partition 1
+ 'WAIT 1
+ SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary
linux-swap -" & lNeededSwap & "kb -1kb\"" WAIT ' partition 2
+ SHELL "mkswap " & Trim(sDrive) & 2 WAIT ' make the swap
partition
+ EXEC ["swapon", Trim(sDrive) & 2] WAIT
+
+ ' Ready to start setting defined target partitions.
+ '###################################################################################################################
+
+ ELSE ' There is already some partitions in the disc.... I need
to know which numbers to use.
+ sDump = Replace(sDump, sDrive, "")
+ sDumparr = Split(sDump, "\n")
+ FOR i = 0 TO sDumparr.Max
+ 'Message(sDumparr[i])
+ iLastPartNo = Trim(sDumparr[i])
+ NEXT
+ ' now that we got the last partition number, we can
start creating our partitions.
+ ' if there is room for primary partitions, make
them
+ IF iLastPartNo <= 2 THEN
+ 'Message(lFreeEnd - lNeededSwap)
+ 'Message(lFreeStart)
+ PRINT "start -> " & lFreeStart
+ PRINT "end -> " & lFreeEnd
+ PRINT "Needed swap -> " & lNeededSwap
+ PRINT "Beginning of swap area -> " & (lFreeEnd -
lNeededSwap)
+
+ 'PRINT "Debug: " & "parted " & Trim(sDrive)
& " -s \"mkpart primary reiserfs " & lFreeStart & "kb " & (lFreeEnd -
lNeededSwap) & "kb\""
+ SHELL "parted " & Trim(sDrive) & " -s \"mkpart
primary reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\""
WAIT 'iLastpart + 1 partition
+ EXEC ["mkfs.reiserfs", "-fq", sDrive &
(iLastPartNo + 1)] WAIT
+ PRINT " --- Created / partition preformatted
to reiserfs " & Trim(sdrive) & (iLastPartNo + 1)
+ SHELL "parted " & Trim(sdrive) & " -s \"mkpart
primary linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb\""
WAIT ' ilastpart + 2 partitiong
+ PRINT " --- Created swap partition " &
Trim(sdrive) & (iLastPartNo + 2)
+ SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +
2) WAIT
+ SHELL "swapon " & Trim(sdrive) & (iLastPartNo +
2) WAIT
+ ELSE ' this method skips one number I think
+ ' BEGIN BY CREATING AN EXTENDED PARTITION TO HOLD
LOGICAL PARTITIONS IN IT
+ ' THIS WILL ADD 1 TO THE iLastPartition number
+ SHELL "parted " & Trim(sdrive) & " -s \"mkpart
extended " & lFreeStart & "kb " & lFreeEnd & "kb\"" WAIT
+ ' I need to re-calculate the free space after
this... the extended partition shaves a hair off the free space, so that
can throw the whole thing off
+ SHELL "parted " & Trim(sDrive) & " unit kb
print free | grep -i \"free space\" | tr -s \' \',\"\" | cut -f 2-4 -d \'
\'" TO sPartedRes
+ 'Message(sPartedRes)
+ sPartedRes = Trim(sPartedRes) ' |
START | | END | | SIZE |
+ sOutLine = Split(sPartedRes,
Space(1))
+ sFreeStart = sOutLine[0]
+ sFreeEnd = sOutLine[1]
+ sFreeSize = sOutLine[2]
+ ' I need to know where the free space
stars and ends to do this.
+ lFreeKB = ME.ConvertToKb(sFreeSize)
+ lFreeStart = ME.ConvertToKb(sFreeStart)
+ lFreeEnd = ME.ConvertToKb(sFreeEnd)
+
+ ' PROCEED TO CREATE PARTITIONS IN NEWLY
CALCULATED FREE SPACE
+ SHELL "parted " & Trim(sDrive) & " -s \"mkpart
logical reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\""
WAIT
+ 'SHELL "parted " & Trim(sdrive) & " mkfs
reiserfs " & (iLastPartNo + 2) WAIT
+ 'SHELL "mkfs.reiserfs -fq " & sDrive &
(iLastPartNo + 2) WAIT
+ 'EXEC ["mkfs.reiserfs", "-fq", sDrive &
(iLastPartNo + 2)] WAIT
+ 'SHELL "parted " & Trim(sdrive) & " -s \"mkpart
logical linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb
yes\"" WAIT
+ SHELL "parted " & Trim(sdrive) & " mkpart
logical linux-swap " & (lFreeEnd - lNeededSwap) & "kb " & lFreeEnd & "kb >
echo \"Yes\"" WAIT
+ SHELL "mkswap " & Trim(sdrive) & (iLastPartNo +
3) WAIT
+
+
+
+ 'SHELL "parted " & Trim(sdrive) & " -s \"mkpart
logical linux-swap " & (lFreeEnd - (lNeededSwap - 1)) & "kb " & (lFreeEnd -
1) & "kb\" " WAIT
+ 'EXEC ["mkswap", Trim(sdrive) & (iLastPartNo +
3)] WAIT
+ 'EXEC ["swapon", Trim(sdrive) & (iLastPartNo +
3)] WAIT
+
+
+
+
+
+ END IF
+
+ END IF
+
+
+ 'parted /dev/hda print free | grep -i "Free space" |tr -s ' ',"" |
cut -f 2-4 -d ' '
+
+
+ ' root:# parted /dev/hda --script "mkpartfs primary linux-swap -512kb
-1kb" ' SAMPLE PARTED LINE
+
+
+
+ ' FOR i = 0 TO 20
+ ' WAIT 2
+ ' NEXT
+ '
+ ' ME.MovieBox1.Playing = FALSE
+ ' Message("Finished")
+
+
+ ME.tlSelAutoTarget.Text = ("Partitioning stage complete... Click next
to continue")
+ ME.MovieBox1.Playing = FALSE
+END
+
+
PUBLIC FUNCTION GETNEXT() AS String
@@ -190,14 +335,23 @@
END
+
+
PUBLIC SUB ONEXIT()
-
+ ' CREATE THE PARTITIONS NOW
END
PUBLIC SUB Form_Resize()
-' ME.hpanel3.Height = ME.ClientH - ME.HPanel3.Top - 12
+ ME.hpanel3.Height = ME.ClientH - ME.HPanel3.Top - 12
+ ME.HPanel4.Height = ME.HPanel3.Height
+
+END
+
+PUBLIC SUB Form_Menu()
+
+ ME.PERFORM_PARTITIONING()
END
Modified: branches/speedy/Step3a2.form
==============================================================================
--- branches/speedy/Step3a2.form (original)
+++ branches/speedy/Step3a2.form Tue Feb 10 14:31:22 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,67,46)
+ MoveScaled(0,0,67,56)
Text = ("")
Arrangement = Arrange.Row
{ HPanel1 HPanel
@@ -32,14 +32,24 @@
}
{ HPanel3 HPanel
MoveScaled(1,15,65,20)
+ Expand = True
+ }
+ { HPanel4 HPanel
+ MoveScaled(24,22,34,32)
+ Visible = False
+ Expand = True
+ { MovieBox1 MovieBox
+ MoveScaled(-1,3,34,26)
+ Expand = True
+ }
}
{ RadioButton1 RadioButton
- MoveScaled(14,38,13,2)
+ MoveScaled(3,37,13,2)
Visible = False
Text = ("RadioButton1")
}
{ HBox2 HBox
- MoveScaled(34,39,8,1)
+ MoveScaled(5,40,8,1)
Visible = False
}
}
|
|
From: <cod...@go...> - 2009-02-09 22:53:04
|
Author: M0...@gm...
Date: Mon Feb 9 14:25:05 2009
New Revision: 487
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/Step3a2.class
branches/speedy/Step3a2.form
Log:
Added listing and recomendations for target partitions on auto-partition
mode
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon Feb 9 14:25:05 2009
@@ -308,16 +308,38 @@
msgid "Use Entire Hard Disk"
msgstr ""
-#: Step3a2.class:22
+#: Step3a2.class:23
msgid "Install VectorLinux to free space on disk"
msgstr ""
-#: Step3a2.class:49
+#: Step3a2.class:40
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+
+#: Step3a2.class:60
msgid "No hard disks found on your system. Please select"
msgstr ""
-#: Step3a2.class:49
+#: Step3a2.class:60
msgid "Another partitioning option"
+msgstr ""
+
+#: Step3a2.class:87
+msgid "(Recomended)"
+msgstr ""
+
+#: Step3a2.class:97
+msgid "of free space"
+msgstr ""
+
+#: Step3a2.class:153
+msgid ""
+"Select the location on your hard drive where you would like to install "
+"VectorLinux"
+msgstr ""
+
+#: Step3a2.class:265
+msgid "RadioButton1"
msgstr ""
#: Step4.class:23
Modified: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- branches/speedy/.lang/Step3a2.pot (original)
+++ branches/speedy/.lang/Step3a2.pot Mon Feb 9 14:25:05 2009
@@ -14,15 +14,35 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step3a2.class:22
+#: Step3a2.class:23
msgid "Install VectorLinux to free space on disk"
msgstr ""
-#: Step3a2.class:49
+#: Step3a2.class:40
+msgid "Searching for unused space on your hard drive... please wait"
+msgstr ""
+
+#: Step3a2.class:60
msgid "No hard disks found on your system. Please select"
msgstr ""
-#: Step3a2.class:49
+#: Step3a2.class:60
msgid "Another partitioning option"
+msgstr ""
+
+#: Step3a2.class:87
+msgid "(Recomended)"
+msgstr ""
+
+#: Step3a2.class:97
+msgid "of free space"
+msgstr ""
+
+#: Step3a2.class:153
+msgid "Select the location on your hard drive where you would like to
install VectorLinux"
+msgstr ""
+
+#: Step3a2.class:265
+msgid "RadioButton1"
msgstr ""
Modified: branches/speedy/Step3a2.class
==============================================================================
--- branches/speedy/Step3a2.class (original)
+++ branches/speedy/Step3a2.class Mon Feb 9 14:25:05 2009
@@ -16,11 +16,13 @@
PRIVATE lLargest AS Long
PRIVATE sLargestDev AS String
+PRIVATE objTargetOptions AS Object[]
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & ("Install VectorLinux to free space on
disk") & "</H2>"
-
+ objTargetOptions = NEW Object[]
+ ME.LIST_FREE_SPACE()
END
@@ -29,15 +31,24 @@
DIM sDiscs, sLine AS String[]
DIM sDisc, sDump, sFreeDump AS String
DIM lFreeSpace AS Float ' free space in KB
- DIM lTotalFreeKb, lFreeBegin, lFreeEnd AS Long
+ DIM lTotalFreeKb, lFreeBegin, lFreeEnd, lNeededSwap AS Long
DIM sFreeBeinRaw, sFreeEndRaw AS String
DIM i AS Integer
DIM lTotalRam AS Long
+ DIM rb AS RadioButton
-
+ ME.tlSelAutoTarget.Text = ("Searching for unused space on your hard
drive... please wait")
+
+ 'objTargetOptions = NEW Object[]
+
PRINT " -*- Determing total RAM available ..."
SHELL "free | grep -i \"^Mem\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
lTotalRam = Trim(sDump)
+ IF lTotalRam < 512000 THEN
+ lNeededSwap = lTotalRam * 2
+ ELSE
+ lNeededSwap = lTotalRam
+ END IF
PRINT " -+- Total RAM Available : " & lTotalRam & " KB"
PRINT " -*- Calculating available free space"
@@ -52,6 +63,7 @@
sDiscs = Split(sDump, "\n")
FOR i = 0 TO sDiscs.Max
+
sDisc = Trim(sDiscs[i])
' get the free space from parted
SHELL "parted " & Trim(sDisc) & " print free | grep -i \"free
space\" | tr -s \' \',\"\"" TO sDump
@@ -62,20 +74,68 @@
sFreeDump = Trim(sLine[2])
sFreeBeinRaw = Trim(sLine[0]) ' Beginning of free space
sFreeEndRaw = Trim(sLine[1]) ' End of free space
- Message("Free space on " & sDisc & " begins at " &
ME.ConvertToKb(sFreeBeinRaw) & "kb and ends at " &
ME.ConvertToKb(sFreeEndRaw) & " kb")
-
- 'Message(sFreeDump)
lFreeSpace = Left(sFreeDump, Len(sFreeDump) - 2) ' take away
the KB,MB,GB,TB off the result
' fix the units by converting everything to kb
lTotalFreeKb = ME.ConvertToKb(sFreeDump)
+' Message("Free space on " & sDisc & " begins at " &
ME.ConvertToKb(sFreeBeinRaw) & "kb and ends at " &
ME.ConvertToKb(sFreeEndRaw) & " kb")
+
+ 'Message(sFreeDump)
IF lTotalFreeKb > lLargest THEN
lLargest = lTotalFreeKb
- sLargestDev = sDisc
+ sLargestDev = Trim(sDisc)
+ FOR EACH RadioButton1 IN objTargetOptions
+ RadioButton1.Text = Replace(RadioButton1.Text,
("(Recomended)"), "")
+ NEXT
END IF
-
PRINT " -+- Found " & lTotalFreeKb & " KB in " & sDisc
+
+ ME.RadioButton1 = NEW RadioButton(ME.hpanel3)
AS "TargetOptions"
+ IF (lTotalFreeKb - lNeededSwap) > 4194304 THEN
+ WITH ME.RadioButton1
+ .Enabled = TRUE
+ IF sLargestDev = sDisc THEN
+ .Text = sDisc & Space(1) & "-" & Space(1) &
lTotalFreeKb & Space(1) & "Kb" & Space(1) & ("of free space") & Space(1) &
("(Recomended)")
+ .Value = TRUE
+ ELSE
+ .Text = sDisc & Space(1) & "-" & Space(1) &
lTotalFreeKb & Space(1) & "Kb" & Space(1) & ("of free space")
+ END IF
+ .Expand = TRUE
+ .Height = 21
+ .Tag = sDisc
+ END WITH
+ ELSE
+ WITH ME.RadioButton1
+ .Enabled = FALSE
+ .Text = sDisc & Space(1) & "-" & Space(1) &
lTotalFreeKb & Space(1) & "Kb" & Space(1) & ("of free space")
+ .Expand = TRUE
+ .Height = 21
+ .Tag = sDisc
+ END WITH
+ END IF
+ IF objTargetOptions.Find(ME.RadioButton1) = -1 THEN
objTargetOptions.Add(ME.RadioButton1)
+ ME.HBox2 = NEW HBox(ME.HPanel3) AS "spacers"
+ WITH ME.HBox2
+ .Height = 12
+ .Expand = TRUE
+ .Tag = sDisc
+ END WITH
+ '
+ ' FOR EACH RadioButton1 IN objTargetOptions
+ ' IF RadioButton1.Tag = sLargestDev THEN
+ ' RadioButton1.Text = RadioButton1.Text & Space(1) & ("(Recomended)")
+ ' RadioButton1.Value = TRUE
+ ' END IF
+ ' NEXT
+ 'ME.GridView1[irow, 0].Text = sDisc
+ 'ME.GridView1[irow, 1].Text = lTotalFreeKb
+' ME.GridView1[GridView1.Rows.Count - 1 + i, 0].Text = sDisc
+' ME.GridView1[GridView1.Rows.Count - 1 + i, 1].Text = lFreeSpace
+
+
+ 'INC ME.GridView1.Rows.Count
+
-
+
'NOTES
' root:# parted /dev/hda --script "mkpartfs primary linux-swap -512kb
-1kb" ' SAMPLE PARTED LINE
' if ram < 512MB then swap = ram*2
@@ -87,9 +147,10 @@
NEXT
- Message("Largest unused area found: " & sLargestDev & " with " &
lLargest & " kb of unused space")
-
+ '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")
END
@@ -125,7 +186,7 @@
END
PUBLIC SUB STARTUP()
- ME.LIST_FREE_SPACE()
+ 'ME.LIST_FREE_SPACE()
END
@@ -133,4 +194,10 @@
+END
+
+PUBLIC SUB Form_Resize()
+
+' ME.hpanel3.Height = ME.ClientH - ME.HPanel3.Top - 12
+
END
Modified: branches/speedy/Step3a2.form
==============================================================================
--- branches/speedy/Step3a2.form (original)
+++ branches/speedy/Step3a2.form Mon Feb 9 14:25:05 2009
@@ -17,4 +17,29 @@
Expand = True
}
}
+ { HBox1 HBox
+ MoveScaled(0,5,7,2)
+ Expand = True
+ }
+ { HPanel2 HPanel
+ MoveScaled(0,7,65,7)
+ Expand = True
+ { tlSelAutoTarget TextLabel
+ MoveScaled(1,1,15,6)
+ Expand = True
+ Text = ("")
+ }
+ }
+ { HPanel3 HPanel
+ MoveScaled(1,15,65,20)
+ }
+ { RadioButton1 RadioButton
+ MoveScaled(14,38,13,2)
+ Visible = False
+ Text = ("RadioButton1")
+ }
+ { HBox2 HBox
+ MoveScaled(34,39,8,1)
+ Visible = False
+ }
}
|
|
From: <cod...@go...> - 2009-02-06 23:12:35
|
Author: M0...@gm...
Date: Fri Feb 6 14:00:07 2009
New Revision: 486
Added:
branches/speedy/.lang/ClsFstab.pot
branches/speedy/.lang/Step3a.pot
branches/speedy/.lang/Step3a1.pot
branches/speedy/.lang/Step3a2.pot
branches/speedy/.lang/Step4.pot
branches/speedy/ClsFstab.class
branches/speedy/Step3a.class
branches/speedy/Step3a.form
branches/speedy/Step3a1.class
branches/speedy/Step3a1.form
branches/speedy/Step3a2.class
branches/speedy/Step3a2.form
branches/speedy/Step4.class
branches/speedy/Step4.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.project
branches/speedy/FMain.class
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/MdlStartUp.module
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step2.class
branches/speedy/Step3.class
branches/speedy/Step3.form
branches/speedy/Step5.class
branches/speedy/Step6.class
Log:
Began working on autopartition scheme
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Feb 6 14:00:07 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:242 FMain0.class:232
+#: FMain.class:245 FMain0.class:233
msgid "Process Overview"
msgstr ""
-#: FMain.class:284 FMain0.class:270
+#: FMain.class:287 FMain0.class:271
msgid "Back"
msgstr ""
-#: FMain.class:295 FMain0.class:281
+#: FMain.class:298 FMain0.class:282
msgid "Next"
msgstr ""
-#: FMain.class:306 FMain0.class:292
+#: FMain.class:309 FMain0.class:293
msgid "Quit"
msgstr ""
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:133
+#: Step1.class:130
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "Found"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "in partition"
msgstr ""
-#: Step1.class:193
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:206
+#: Step1.class:203
msgid "Scanning"
msgstr ""
-#: Step1.class:216
+#: Step1.class:213
msgid "in"
msgstr ""
-#: Step1.class:244
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:337
+#: Step1.class:334
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:340
+#: Step1.class:337
msgid "VERSION"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "WARNING:"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:469
+#: Step1.class:466
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:487
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:508
+#: Step1.class:505
msgid "Search Again"
msgstr ""
-#: Step1.class:532
+#: Step1.class:529
msgid "Check Installation media before installing"
msgstr ""
@@ -242,36 +242,88 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:129
+#: Step3.class:132 Step3a.class:102
msgid "TextLabel1"
msgstr ""
-#: Step3.class:147
+#: Step3.class:150
msgid "Automatic"
msgstr ""
-#: Step3.class:157
+#: Step3.class:160
msgid ""
"Automatically resize your partitions to make size for your VectorLinux "
"installation"
msgstr ""
-#: Step3.class:164
+#: Step3.class:167
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:174
+#: Step3.class:177
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:181
+#: Step3.class:184
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:191
+#: Step3.class:194
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid "Locate free space on hard disk and install VectorLinux there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not erase any data off your hard drive"
+msgstr ""
+
+#: Step3a.class:113
+msgid "Use Free space on my hard disk"
+msgstr ""
+
+#: Step3a.class:134
+msgid "Use entire disk"
+msgstr ""
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
+#: Step3a2.class:22
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "Another partitioning option"
+msgstr ""
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
#: Step5.class:19
msgid "Resize partitions using Gparted"
msgstr ""
@@ -368,54 +420,54 @@
msgid "Restart Now"
msgstr ""
-#: Step6.class:46
+#: Step6.class:58
msgid "Partition"
msgstr ""
-#: Step6.class:47
+#: Step6.class:59
msgid "Size"
msgstr ""
-#: Step6.class:48
+#: Step6.class:60
msgid "Mount Point"
msgstr ""
-#: Step6.class:49
+#: Step6.class:61
msgid "File System"
msgstr ""
-#: Step6.class:106
+#: Step6.class:133
msgid "Not Used"
msgstr ""
-#: Step6.class:118
+#: Step6.class:154
msgid "Do not format"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "You have already selected"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "as your"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "partition."
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:214
+#: Step6.class:280
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "Yes"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "No"
msgstr ""
Added: branches/speedy/.lang/ClsFstab.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/ClsFstab.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,16 @@
+# /home/vluser/devel/speedy/ClsFstab.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"
+
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Fri Feb 6 14:00:07 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:242
+#: FMain.class:245
msgid "Process Overview"
msgstr ""
-#: FMain.class:284
+#: FMain.class:287
msgid "Back"
msgstr ""
-#: FMain.class:295
+#: FMain.class:298
msgid "Next"
msgstr ""
-#: FMain.class:306
+#: FMain.class:309
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Fri Feb 6 14:00:07 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:232
+#: FMain0.class:233
msgid "Process Overview"
msgstr ""
-#: FMain0.class:270
+#: FMain0.class:271
msgid "Back"
msgstr ""
-#: FMain0.class:281
+#: FMain0.class:282
msgid "Next"
msgstr ""
-#: FMain0.class:292
+#: FMain0.class:293
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Feb 6 14:00:07 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:133
+#: Step1.class:130
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "Found"
msgstr ""
-#: Step1.class:152
+#: Step1.class:149
msgid "in partition"
msgstr ""
-#: Step1.class:193
+#: Step1.class:190
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:206
+#: Step1.class:203
msgid "Scanning"
msgstr ""
-#: Step1.class:216
+#: Step1.class:213
msgid "in"
msgstr ""
-#: Step1.class:244
+#: Step1.class:241
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:337
+#: Step1.class:334
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:340
+#: Step1.class:337
msgid "VERSION"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "WARNING:"
msgstr ""
-#: Step1.class:417
+#: Step1.class:414
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:469
+#: Step1.class:466
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:487
+#: Step1.class:484
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:508
+#: Step1.class:505
msgid "Search Again"
msgstr ""
-#: Step1.class:532
+#: Step1.class:529
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step3.pot
==============================================================================
--- branches/speedy/.lang/Step3.pot (original)
+++ branches/speedy/.lang/Step3.pot Fri Feb 6 14:00:07 2009
@@ -22,31 +22,31 @@
msgid "Select the partitioning method you would like to use"
msgstr ""
-#: Step3.class:129
+#: Step3.class:132
msgid "TextLabel1"
msgstr ""
-#: Step3.class:147
+#: Step3.class:150
msgid "Automatic"
msgstr ""
-#: Step3.class:157
+#: Step3.class:160
msgid "Automatically resize your partitions to make size for your
VectorLinux installation"
msgstr ""
-#: Step3.class:164
+#: Step3.class:167
msgid "Manually resize my partitions "
msgstr ""
-#: Step3.class:174
+#: Step3.class:177
msgid "Use the partitioning tool to prepare your system partitions."
msgstr ""
-#: Step3.class:181
+#: Step3.class:184
msgid "My hard drive is already partitioned"
msgstr ""
-#: Step3.class:191
+#: Step3.class:194
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
Added: branches/speedy/.lang/Step3a.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,52 @@
+# /home/vluser/devel/speedy/Step3a.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"
+
+#: Step3a.class:19
+msgid "Automatic Partitioning Options"
+msgstr ""
+
+#: Step3a.class:20
+msgid "Select one of the following options"
+msgstr ""
+
+#: Step3a.class:22
+msgid "Allow VectorLinux to use an entire hard disk in your system."
+msgstr ""
+
+#: Step3a.class:22
+msgid "This option will wipe out any data on the disk you select."
+msgstr ""
+
+#: Step3a.class:24
+msgid "Locate free space on hard disk and install VectorLinux there."
+msgstr ""
+
+#: Step3a.class:24
+msgid "This option will not erase any data off your hard drive"
+msgstr ""
+
+#: Step3a.class:102
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3a.class:113
+msgid "Use Free space on my hard disk"
+msgstr ""
+
+#: Step3a.class:134
+msgid "Use entire disk"
+msgstr ""
+
Added: branches/speedy/.lang/Step3a1.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a1.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/Step3a1.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"
+
+#: Step3a1.class:19
+msgid "Use Entire Hard Disk"
+msgstr ""
+
Added: branches/speedy/.lang/Step3a2.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3a2.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,28 @@
+# /home/vluser/devel/speedy/Step3a2.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"
+
+#: Step3a2.class:22
+msgid "Install VectorLinux to free space on disk"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "No hard disks found on your system. Please select"
+msgstr ""
+
+#: Step3a2.class:49
+msgid "Another partitioning option"
+msgstr ""
+
Added: branches/speedy/.lang/Step4.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step4.pot Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/Step4.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"
+
+#: Step4.class:23
+msgid "Automatic Disc Partitioning"
+msgstr ""
+
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Fri Feb 6 14:00:07 2009
@@ -14,55 +14,55 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step6.class:46
+#: Step6.class:58
msgid "Partition"
msgstr ""
-#: Step6.class:47
+#: Step6.class:59
msgid "Size"
msgstr ""
-#: Step6.class:48
+#: Step6.class:60
msgid "Mount Point"
msgstr ""
-#: Step6.class:49
+#: Step6.class:61
msgid "File System"
msgstr ""
-#: Step6.class:106
+#: Step6.class:133
msgid "Not Used"
msgstr ""
-#: Step6.class:118
+#: Step6.class:154
msgid "Do not format"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "You have already selected"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "as your"
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "partition."
msgstr ""
-#: Step6.class:160
+#: Step6.class:199
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:214
+#: Step6.class:280
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "Yes"
msgstr ""
-#: Step6.class:350
+#: Step6.class:385
msgid "No"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Fri Feb 6 14:00:07 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlStartUp
-Version=0.0.1
+Version=0.0.2
Library=gb.gtk
Library=gb.form
Library=gb.desktop
Added: branches/speedy/ClsFstab.class
==============================================================================
--- (empty file)
+++ branches/speedy/ClsFstab.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,19 @@
+' 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/>.
+
+STATIC PUBLIC sLinuxPartitionsSection AS String
+
Modified: branches/speedy/FMain.class
==============================================================================
--- branches/speedy/FMain.class (original)
+++ branches/speedy/FMain.class Fri Feb 6 14:00:07 2009
@@ -112,6 +112,8 @@
IF NOT bExist THEN
$oCurrent = Object.New(sTmp, [pnlStack])
$oCurrent.Visible = TRUE
+ $oCurrent.width = pnlStack.Width
+ $oCurrent.Height = pnlStack.Height
ELSE
$OCurrent = o
@@ -120,9 +122,9 @@
IF IsNull($oCurrent.GetNext()) THEN btNext.Enabled = FALSE
'Push to the foreground
+
$oCurrent.Raise()
- $oCurrent.width = pnlStack.Width
- $oCurrent.Height = pnlStack.Height
+
$oCurrent.Startup() ' Call each form's startup sub
ME.ListView1.Refresh
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Fri Feb 6 14:00:07 2009
@@ -73,7 +73,7 @@
MoveScaled(29,0,11,2)
Expand = True
Text = ("Back")
- Picture = Picture["icon:/small/previous"]
+ Picture = Picture["icon:/16/previous"]
}
{ Panel5 Panel
MoveScaled(41,1,1,1)
@@ -82,7 +82,7 @@
MoveScaled(43,0,11,2)
Expand = True
Text = ("Next")
- Picture = Picture["icon:/small/next"]
+ Picture = Picture["icon:/16/next"]
}
{ Panel7 Panel
MoveScaled(55,1,1,1)
@@ -91,7 +91,10 @@
MoveScaled(56,0,10,2)
Expand = True
Text = ("Quit")
- Picture = Picture["icon:/small/quit"]
+ Picture = Picture["icon:/16/quit"]
}
+ }
+ { HBox7 HBox
+ MoveScaled(58,55,7,1)
}
}
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Fri Feb 6 14:00:07 2009
@@ -60,7 +60,7 @@
}
}
{ HBox3 HBox
- MoveScaled(2,51,72,3)
+ MoveScaled(2,51,72,2.25)
{ Panel4 Panel
MoveScaled(0,0,17,3)
Expand = True
@@ -73,7 +73,7 @@
MoveScaled(29,0,11,2)
Expand = True
Text = ("Back")
- Picture = Picture["icon:/small/previous"]
+ Picture = Picture["icon:/16/previous"]
}
{ Panel5 Panel
MoveScaled(41,1,1,1)
@@ -82,7 +82,7 @@
MoveScaled(43,0,11,2)
Expand = True
Text = ("Next")
- Picture = Picture["icon:/small/next"]
+ Picture = Picture["icon:/16/next"]
}
{ Panel7 Panel
MoveScaled(55,1,1,1)
@@ -91,7 +91,10 @@
MoveScaled(56,0,10,2)
Expand = True
Text = ("Quit")
- Picture = Picture["icon:/small/quit"]
+ Picture = Picture["icon:/16/quit"]
}
+ }
+ { HBox7 HBox
+ MoveScaled(64,54,7,1)
}
}
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Fri Feb 6 14:00:07 2009
@@ -37,12 +37,16 @@
pNow = Picture.Load("images/now.png")
pToDo = Picture.Load("images/square.png")
+ ClsGlobal.fRunningMainForm.listview1.add("Cat0", Space(5)
& "Preparation")
+' ClsGlobal.fRunningMainForm.listview1["Cat0"].Font.bold = TRUE
ClsGlobal.fRunningMainForm.listview1.add("Step0", "Select Language",
pNow)
ClsGlobal.fRunningMainForm.listview1.add("Step1", "Select Media", pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step2", "Disk Partitioning",
pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step3", "Software Selection",
pTodo)
+ ClsGlobal.fRunningMainForm.listview1.add("Cat1", Space(5)
& "Installation")
ClsGlobal.fRunningMainForm.listview1.add("Step4", "Installation
Summary", pToDo)
ClsGlobal.fRunningMainForm.listview1.add("Step5", "Install VectorLinux",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Cat2", Space(5) & "System
Configuration")
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)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Fri Feb 6 14:00:07 2009
@@ -53,7 +53,7 @@
SHELL "mount /dev" &/ Trim(spart) & " /mnt" &/ Trim(spart) & "
2>/dev/null" WAIT
' now mount the iso
'EXEC ["mount -o loop", "/mnt" &/ Trim(spart) &/
Trim(sname), "/mnt/source"] WAIT
- SHELL "mount -o loop /mnt" &/ Trim(spart) &/ Trim(sname) & "
/mnt/source" WAIT
+ SHELL "mount -o loop /mnt" &/ Trim(spart) &/ Trim(sname) & "
/mnt/source 2>/dev/null" WAIT
ELSE
PRINT "Mounting cd media"
@@ -64,11 +64,7 @@
IF ME.GetNext() = "Step2" THEN ClsGlobal.sToScan =
Trim(ME.ComboBox1.Text)
'Message("Image to scan = " & ClsGlobal.sToScan)
-
-
-
-
-
+
END
@@ -91,8 +87,8 @@
PUBLIC FUNCTION GetNext() AS String
- ClsGlobal.fRunningMainForm.listview1["Step1"].picture =
MdlStartUp.pDone
- ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
+ ClsGlobal.fRunningMainForm.listview1["Step0"].picture =
MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pNow
IF bcheckmedia.Value = TRUE THEN
RETURN "Step2"
@@ -116,6 +112,7 @@
PUBLIC SUB StartUp() ' Executed every time the Next button is pressed
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
' IF Step2.sLastChecked <> ClsGlobal.sSourceName THEN
' Step2.Close ' try this
' END IF
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Fri Feb 6 14:00:07 2009
@@ -42,7 +42,7 @@
{ btRescan Button
MoveScaled(30,0,19,3)
Text = ("Search Again")
- Picture = Picture["icon:/small/refresh"]
+ Picture = Picture["icon:/16/refresh"]
}
}
{ HBox2 HBox
Modified: branches/speedy/Step2.class
==============================================================================
--- branches/speedy/Step2.class (original)
+++ branches/speedy/Step2.class Fri Feb 6 14:00:07 2009
@@ -205,7 +205,7 @@
PUBLIC SUB StartUp()
-
+ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
ME.mbThrobbler.Path = "images/throbber.gif"
'Message("Last scanned image = " & ClsGlobal.sLastScanned)
IF ClsGlobal.sToScan <> ClsGlobal.sLastScanned THEN
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Fri Feb 6 14:00:07 2009
@@ -32,16 +32,18 @@
FMain.btNext.Enabled = TRUE
FMain0.btNext.Enabled = TRUE
+
END
PUBLIC FUNCTION GetNext() AS String
-
+ ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
IF ME.rbAutoPart.Value = TRUE THEN
'no module for auto partition written yet
'Message("Not ready yet")
- RETURN
+ RETURN "Step3a"
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
@@ -56,8 +58,9 @@
END
PUBLIC SUB StartUp()
- FMain.btNext.Enabled = TRUE
- FMain0.btNext.Enabled = TRUE
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
+ ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
+
END
PUBLIC SUB OnExit()
Modified: branches/speedy/Step3.form
==============================================================================
--- branches/speedy/Step3.form (original)
+++ branches/speedy/Step3.form Fri Feb 6 14:00:07 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,64,64)
+ MoveScaled(0,0,66,51)
Text = ("")
Arrangement = Arrange.Row
{ HPanel1 HPanel
Added: branches/speedy/Step3a.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,52 @@
+' 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 = "<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>" &
+ "<b>" & ("This option will wipe out any data on the disk you select.")
& "</b>"
+ ME.tlFreeSpace.Text = ("Locate free space on hard disk and install
VectorLinux there.") & "<br>" &
+ "<i>" & ("This option will not erase any data off your hard drive")
& "</i>"
+
+
+END
+PUBLIC SUB StartUp()
+
+
+
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ IF ME.rbEntireDisk.Value = TRUE THEN
+ RETURN "Step3a1"
+ ELSE
+ RETURN "Step3a2"
+ END IF
+
+
+
+END
+
Added: branches/speedy/Step3a.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,63 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,84,47)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(1,6,74,6)
+ Expand = True
+ { tlActionExp TextLabel
+ MoveScaled(2,1,4,3)
+ Expand = True
+ Text = ("TextLabel1")
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,13,79,20)
+ Expand = True
+ { rbFreeSpace RadioButton
+ MoveScaled(1,1,22,3)
+ Expand = True
+ Text = ("Use Free space on my hard disk")
+ }
+ { Panel2 Panel
+ MoveScaled(2,4,3,3)
+ }
+ { tlFreeSpace TextLabel
+ MoveScaled(5,4,19,4)
+ Expand = True
+ Text = ("")
+ }
+ { HBox2 HBox
+ MoveScaled(1,6,6,2)
+ Expand = True
+ }
+ { rbEntireDisk RadioButton
+ MoveScaled(2,9,34,3)
+ Expand = True
+ Text = ("Use entire disk")
+ }
+ { Panel1 Panel
+ MoveScaled(2,12,3,3)
+ }
+ { tlEntireDisc TextLabel
+ MoveScaled(6,12,32,4)
+ Expand = True
+ Text = ("")
+ }
+ }
+}
Added: branches/speedy/Step3a1.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,36 @@
+' 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 = "<h2>" & ("Use Entire Hard Disk") & "</H2>"
+
+END
+PUBLIC FUNCTION GETNEXT() AS String
+
+
+
+END
+PUBLIC SUB ONEXIT()
+
+
+
+END
+PUBLIC SUB STARTUP()
+
+
+
+END
Added: branches/speedy/Step3a1.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a1.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,67,45)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
Added: branches/speedy/Step3a2.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a2.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,136 @@
+' 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 lLargest AS Long
+PRIVATE sLargestDev AS String
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Install VectorLinux to free space on
disk") & "</H2>"
+
+
+END
+
+PUBLIC SUB LIST_FREE_SPACE()
+
+ DIM sDiscs, sLine AS String[]
+ DIM sDisc, sDump, sFreeDump AS String
+ DIM lFreeSpace AS Float ' free space in KB
+ DIM lTotalFreeKb, lFreeBegin, lFreeEnd AS Long
+ DIM sFreeBeinRaw, sFreeEndRaw AS String
+ DIM i AS Integer
+ DIM lTotalRam AS Long
+
+
+ PRINT " -*- Determing total RAM available ..."
+ SHELL "free | grep -i \"^Mem\" | tr -s \' \',\"\" | cut -f 2 -d \' \'"
TO sDump
+ lTotalRam = Trim(sDump)
+
+ PRINT " -+- Total RAM Available : " & lTotalRam & " KB"
+ PRINT " -*- Calculating available free space"
+
+ SHELL "probedisk | grep -v cdrom | cut -f 1 -d \'|\'" TO sDump
+ sDump = Trim(sDump)
+ IF NOT sDump THEN ' EXIT IF NO HARD DRIVES ARE FOUND
+ Message.Error(("No hard disks found on your system. Please
select") & "<br>" &
+ ("Another partitioning option"))
+ RETURN
+ END IF
+
+ sDiscs = Split(sDump, "\n")
+ FOR i = 0 TO sDiscs.Max
+ sDisc = Trim(sDiscs[i])
+ ' get the free space from parted
+ SHELL "parted " & Trim(sDisc) & " print free | grep -i \"free
space\" | tr -s \' \',\"\"" TO sDump
+ sDump = Trim(sDump)
+ IF NOT sDump THEN CONTINUE
+ ' free space should be on the 3rd column, but it start with a
blank space, so it will be 4th
+ sLine = Split(sDump, Space(1))
+ sFreeDump = Trim(sLine[2])
+ sFreeBeinRaw = Trim(sLine[0]) ' Beginning of free space
+ sFreeEndRaw = Trim(sLine[1]) ' End of free space
+ Message("Free space on " & sDisc & " begins at " &
ME.ConvertToKb(sFreeBeinRaw) & "kb and ends at " &
ME.ConvertToKb(sFreeEndRaw) & " kb")
+
+ 'Message(sFreeDump)
+ lFreeSpace = Left(sFreeDump, Len(sFreeDump) - 2) ' take away
the KB,MB,GB,TB off the result
+ ' fix the units by converting everything to kb
+ lTotalFreeKb = ME.ConvertToKb(sFreeDump)
+ IF lTotalFreeKb > lLargest THEN
+ lLargest = lTotalFreeKb
+ sLargestDev = sDisc
+ END IF
+
+ PRINT " -+- Found " & lTotalFreeKb & " KB in " & sDisc
+
+
+'NOTES
+' root:# parted /dev/hda --script "mkpartfs primary linux-swap -512kb
-1kb" ' SAMPLE PARTED LINE
+' if ram < 512MB then swap = ram*2
+' default / fs = reiserfs
+
+
+
+
+
+ NEXT
+
+ Message("Largest unused area found: " & sLargestDev & " with " &
lLargest & " kb of unused space")
+
+
+
+END
+
+
+PUBLIC SUB ConvertToKb(sRawString AS String) AS Long
+
+ DIM fSize AS Float
+ DIM sTrimmed AS Float = Left(sRawString, Len(sRawString) - 2)
+ DIM sTotal AS Long
+
+ IF sRawString LIKE "*mb*" THEN
+ fSize = sTrimmed
+ sTotal = fSize * 1024
+ ELSE IF sRawString LIKE "*gb*" THEN
+ fSize = sTrimmed
+ sTotal = (fSize * 1024) * 1024
+ END IF
+
+ RETURN sTotal
+
+
+
+
+END
+
+
+
+
+PUBLIC FUNCTION GETNEXT() AS String
+
+
+
+END
+PUBLIC SUB STARTUP()
+
+ ME.LIST_FREE_SPACE()
+
+END
+
+PUBLIC SUB ONEXIT()
+
+
+
+END
Added: branches/speedy/Step3a2.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3a2.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,20 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,67,46)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+}
Added: branches/speedy/Step4.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step4.class Fri Feb 6 14:00:07 2009
@@ -0,0 +1,177 @@
+' 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 PartLabels AS Object[]
+PUBLIC PartUseages AS Object[]
+
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Automatic Disc Partitioning") & "</h2>"
+ 'WAIT 1
+
+ 'ME.GET_PARTITION_SIZES()
+ 'ME.StartUp()
+END
+
+
+PUBLIC SUB GET_PARTITION_SIZES()
+
+ DIM sMounted, sToMount, sAdd, sDfResults, sPartType AS String
+ DIM sSize, sUsed, sFree AS Long
+ DIM sProgShade AS Variant
+ DIM sList, sLine AS String[]
+ DIM i, y, n, c AS Integer
+
+ ME.PartUseages = NEW Object[]
+ SHELL "mount | grep \"^/dev\" | cut -f 1 -d \' \'" TO sMounted
+ SHELL "probepart | grep \"^/dev\" | grep -v swap | tr -s \' \',\"\" |
cut -f 1 -d \' \'" TO sToMount
+ sMounted = Trim(sMounted)
+ sToMount = Trim(sToMount)
+ sList = Split(sToMount, "\n")
+ y = 4
+ FOR i = 0 TO sList.Max ' new trick here.. ;)
+ n = 0
+ c = 0
+ sAdd = Right(Trim(sList[i]), Len(Trim(sList[i])) -
RInStr(Trim(sList[i]), "/"))
+ IF InStr(sMounted, sAdd) = FALSE THEN
+ 'mount it
+
+ 'Message("To mount " & sAdd)
+ 'TRY MKDIR "/mnt" &/ Trim(sadd) & " 2>/dev/null"
+ 'EXEC ["mkdir", "/mnt" &/ Trim(sadd), "2>/dev/null"] WAIT
+ SHELL "mkdir -p /mnt" &/ Trim(sadd) & " 2>/dev/null" WAIT
+ SHELL "mount " & Trim(sList[i]) & " /mnt" &/ Trim(sadd) & "
2>/dev/null" WAIT
+
+ ' get the status from df
+ SHELL "df -T | grep \"^" & Trim(sList[i]) & "\" | tr -s \'
\',\"\"" TO sDfResults
+ sDfResults = Trim(sDfResults)
+ SHELL "umount /mnt" &/ Trim(sadd) & " 2>/dev/null" WAIT
+ 'Message(sDfResults)
+ 'This will RETURN something LIKE
+ ' Device FS Type Size USED AVAILA % MountPoint
+ '/dev/hdb1 reiserfs 7863500 4865520 2997980 62% /
+ ' calculate useage by this formula
+ ' Used / Size
+ sLine = Split(sDfResults, Space(1))
+ sSize = sLine[2]
+ sUsed = sLine[3]
+ sFree = sLine[4]
+ sPartType = sLine[1]
+ sProgShade = (sUsed / sSize) * 100
+ ' Graphical display of partition useage
+ sProgShade = Round(CFloat(sProgShade), 0)
+ 'Message(Round(CFloat(sProgShade), 0))
+
+
+ tlPart = NEW TextLabel(ME.panel1)
+ WITH tlPart
+ .Text = Trim(sList[i])
+ .tag = Trim(sList[i])
+ .Width = 100
+ .Expand = FALSE
+ .ToolTip = sPartType
+ .Alignment = Align.Normal
+ .Height = 21
+ .Move(4, y)
+ END WITH
+
+ gvuseage = NEW GridView(ME.Panel1)
+ WITH gvuseage
+ .Height = 21
+ .Expand = TRUE
+ .ScrollBar = FALSE
+ .Columns.Count = 100
+ .Rows.Count = 1
+ .Tag = Trim(sList[i])
+ .Move(tlPart.Left + tlPart.Width + 8, y)
+
+ 'Message(CInt(sProgShade))
+ REPEAT
+ gvuseage.Columns[c].Width = gvuseage.Width /
100
+ INC c
+ UNTIL c = gvuseage.Columns.Count - 1
+
+ IF CInt(sProgShade) > 0 THEN
+ REPEAT
+ 'gvuseage[0, n].BackColor =
Color.LightBackground
+ gvuseage[0, n].BackColor = Color.DarkGreen
+
+ INC n
+ UNTIL n = CInt(sProgShade)
+ END IF
+ 'n = 0
+ END WITH
+ ME.PartUseages.Add(gvuseage)
+ 'gvuseage[0, 0].Text = sPartType
+
+ ' pbUseage = NEW ProgressBar(ME.Panel1)
+ ' WITH pbUseage
+ ' .Height = 21
+ ' .Expand = TRUE
+ ' .Width = 300
+ ' .Tag = Trim(sList[i])
+ ' .Move(tlPart.left + tlPart.Width + 8, y)
+ ' .Value = sUsed / sSize
+ ' END WITH
+ y = y + tlPart.Height + 8
+ END IF
+ NEXT
+
+END
+
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step6"
+
+
+END
+PUBLIC SUB StartUp()
+
+ ME.PartUseages = NEW Object[]
+ ME.GET_PARTITION_SIZES()
+ ME.Resize(ClsGlobal.fRunningMainForm.PnlStack.width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
+
+PUBLIC SUB Form_Resize()
+
+ DIM gv AS GridView
+ DIM n AS Integer
+
+ IF NOT ME.PartUseages THEN RETURN
+ FOR EACH gv IN ME.PartUseages
+ n = 0
+ gv.Grid = FALSE
+ REPEAT
+ gv.Columns[n].Width = gv.Width / 100
+ INC n
+ UNTIL n = gv.Columns.Count - 1
+ NEXT
+
+
+
+END
Added: branches/speedy/Step4.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step4.form Fri Feb 6 14:00:07 2009
@@ -0,0 +1,38 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,49)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { Panel1 Panel
+ MoveScaled(1,6,62,10)
+ Expand = True
+ Arrangement = Arrange.Row
+ }
+ { tlPart TextLabel
+ MoveScaled(1,25,6,3)
+ Visible = False
+ Text = ("")
+ }
+ { pbUseage ProgressBar
+ MoveScaled(8,25,7,3)
+ Visible = False
+ }
+ { gvuseage GridView
+ MoveScaled(11,29,46,13)
+ Visible = False
+ }
+}
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Fri Feb 6 14:00:07 2009
@@ -28,7 +28,7 @@
PUBLIC SUB StartUp()
-
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
ME.EMBED_GPARTED()
END
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Fri Feb 6 14:00:07 2009
@@ -28,19 +28,31 @@
PUBLIC SUB OnExit()
-
+ DIM n AS Integer
+ DIM sFmtAs AS String
+ FOR n = 1 TO gvPartListing.Rows.Count - 1
+ IF gvPartListing[n, 2].Text THEN
+ IF gvPartListing[n, 4].Text THEN
+ sFmtAs = gvPartListing[n, 4].Text
+ ELSE
+ sFmtAs = gvPartListing[n, 5].Text
+ END IF
+ END IF
+ Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n,
2].Text & gb.NewLine & sFmtAs)
+
+ NEXT
END
PUBLIC SUB StartUp()
-
+ ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width,
ClsGlobal.fRunningMainForm.PnlStack.Height)
END
PUBLIC SUB PREPARE_PARTITION_LISTING()
WITH ME.gvPartListing
- .Columns.Count = 6
+ .Columns.Count = 7
.Rows.count = 1
END WITH
gvPartListing[0, 0].text = ("Partition")
@@ -50,19 +62,22 @@
'gvPartListing[0, 4].text = ("File System")
gvPartListing[0, 0].BackColor = Color.LightBackground
gvPartListing[0, 0].Font.Bold = TRUE
+ gvPartListing.Columns[0].Width = 120
gvPartListing[0, 1].BackColor = Color.LightBackground
gvPartListing[0, 1].Font.Bold = TRUE
+ gvPartListing.Columns[1].Width = 120
gvPartListing[0, 2].BackColor = Color.LightBackground
gvPartListing[0, 2].Font.Bold = TRUE
- gvPartListing.Columns[2].Width = 120
+ gvPartListing.Columns[2].Width = 150
gvPartListing[0, 3].BackColor = Color.LightBackground
gvPartListing[0, 3].Font.Bold = TRUE
- gvPartListing.Columns[3].Width = 8
+ gvPartListing.Columns[3].Width = 12
gvPartListing[0, 4].BackColor = Color.LightBackground
- gvPartListing.Columns[4].Width = 120
+ gvPartListing.Columns[4].Width = 150
gvPartListing[0, 4].Font.Bold = TRUE
- gvPartListing[0, 5].BackColor = Color.LightBackground
- gvPartListing[0, 5].Font.Bold = TRUE
+ 'gvPartListing[0, 5].BackColor = Color.LightBackground
+ 'gvPartListing[0, 5].Font.Bold = TRUE
+ 'gvPartListing[0, 5]
END
@@ -96,17 +111,31 @@
ME.gvPartListing[irow, 1].Text = Trim(sSize)
IF sFs LIKE "linux-swap" THEN
gvPartListing[irow, 4].Text = Trim(sfs)
+ gvPartListing[irow, 0].BackColor = Color.LightGray
+ gvPartListing[irow, 1].BackColor = Color.LightGray
+ gvPartListing[irow, 2].BackColor = Color.LightGray
+ gvPartListing[irow, 3].BackColor = Color.LightGray
+ gvPartListing[irow, 4].BackColor = Color.LightGray
+
ELSE
+ gvPartListing[irow, 5].Text = Trim(SFS)
+ gvPartListing[irow, 5].ForeColor = Color.White
+
cbMntPoint = NEW ComboBox(gvPartListing.Parent)
AS "MountPointSel"
WITH cbMntPoint
.Move(gvPartListing[irow, 2].left, gvPartListing[irow,
2].top)
.Width = gvPartListing[irow, 2].Width
.Height = gvPartListing[irow, 2].Height
.ReadOnly = TRUE
- .list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
- .Text = ("Not Used")
.tag = gvPartListing[irow, 0].Text
- '.ReadOnly = TRUE
+ IF ClsGlobal.sSourceAddr LIKE .Tag THEN
+ '.Enabled = FALSE
+ .List = [("Not Used"), "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ ELSE
+ .list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ '.Enabled = TRUE
+ END IF
+ .Text = ("Not Used")
END WITH
objMntPoints.Add(cbMntPoint)
cbfs = NEW ComboBox(gvPartListing.Parent) AS "FsSel"
@@ -115,9 +144,15 @@
.Width = gvPartListing[irow, 4].Width
.Height = gvPartListing[irow, 4].Height
.ReadOnly = TRUE
+ .tag = gvPartListing[irow, 0].Text
+ 'Message(ClsGlobal.sSourceAddr)
+ IF ClsGlobal.sSourceAddr LIKE .Tag THEN
+ .Enabled = FALSE
+ ELSE
+ .Enabled = TRUE
+ END IF
.list = [("Do not
format"), "ext2", "ext3", "jfs", "xfs", "reiserfs"]
.Text = ("Do not format")
- .tag = gvPartListing[irow, 0].Text
.Enabled = FALSE
END WITH
objFS.Add(cbFS)
@@ -138,14 +173,18 @@
x = LAST.x
y = LAST.y
+
+
IF LAST.text <> ("Do not format") THEN
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
+ ME.OnExit()
ELSE
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = ""
END IF
'IF ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text THEN
Message(ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text)
+ ME.MOUNT_TARGET_PARTITIONS()
END
@@ -186,7 +225,14 @@
IF LAST.text <> ("Not Used") THEN
FOR EACH cb IN objFS
- IF cb.tag = LAST.tag THEN cb.Enabled = TRUE
+
+ IF cb.tag = LAST.tag THEN
+ IF ClsGlobal.sSourceAddr LIKE LAST.tag THEN
+ cb.Enabled = FALSE
+ ELSE
+ cb.Enabled = TRUE
+ END IF
+ END IF
NEXT
' save the text in the background to the gridview
@@ -201,14 +247,34 @@
+
+END
+
+
+PUBLIC SUB MOUNT_TARGET_PARTITIONS()
+
+ DIM n AS Integer
+ DIM sPartAddr, sMntPoint, sFs AS String
+ FOR n = 2 TO gvPartListing.Rows.count - 1 ' rows 0 and 1 are
meaningless to this sub
+ IF gvPartListing[n, 2].Text THEN ' Partition address in in column 0,
mountpoint is in column 2
+ sMntPoint = Trim(gvPartListing[n, 2].Text)
+ sPartAddr = Trim(gvPartListing[n, 0].Text)
+ sfs = Trim(gvPartListing[n, 4].Text)
+ IF NOT sfs THEN sfs = Trim(gvPartListing[n, 5].Text) ' use the
current filesystem.
+ ' maybe this is a good time to store these values to the future
fstab file ??
+ ' use ClsFstab class to store these things until we need them in
configure.
+
+ 'Message(sPartAddr & "\n" & sMntPoint & "\n" & sFs)
-
+ END IF
+ NEXT
END
+
PUBLIC SUB Form_Open()
ME.tlbanner.Text = "<h2>" & ("Select which partitions to use for
installation") & "</h2>"
@@ -231,7 +297,6 @@
PUBLIC SUB gvPartListing_Click()
-'DIM x, y AS Integer
IF LAST.row < 2 THEN RETURN
x = LAST.column
@@ -245,28 +310,8 @@
ME.cbMntPoint.Visible = TRUE
END IF
-
-
-'
END
-
-PUBLIC SUB cbMntPoint_Change()
-
- 'DIM x, y AS Integer
-
- 'x = gvPartListing.ColumnAt(LAST.x)
- 'y = gvPartListing.RowAt(LAST.y)
- '
- ' IF y < 2 THEN RETURN
- ' IF LAST.text = ("Not Used") THEN LAST.text = ""
- ' gvPartListing[y, x].Text = Trim(LAST.text)
- ' LAST.visible = FALSE
-
-
-END
-
-
PUBLIC SUB cbYN_Click()
gvPartListing[y, x].Text = cbYN.Text
@@ -276,13 +321,3 @@
END
-
-
-
-PUBLIC SUB cbYN_Leave()
-
- ' 'Message("leave")
- ' gvPartListing[y, x].Text = cbYN.Text
- ' cbYN.Visible = FALSE
-
-END
|
|
From: <cod...@go...> - 2009-02-04 22:45:10
|
Author: M0...@gm...
Date: Wed Feb 4 14:32:46 2009
New Revision: 485
Added:
branches/speedy/images/done.png (contents, props changed)
branches/speedy/images/now.png (contents, props changed)
branches/speedy/images/square.png (contents, props changed)
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step5.pot
branches/speedy/ClsGlobal.class
branches/speedy/FMain.class
branches/speedy/FMain.form
branches/speedy/FMain0.class
branches/speedy/FMain0.form
branches/speedy/MdlStartUp.module
branches/speedy/Step0.class
branches/speedy/Step1.class
branches/speedy/Step5.class
branches/speedy/Step5.form
Log:
Added visual navigation
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 4 14:32:46 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:234 FMain0.class:230
+#: FMain.class:242 FMain0.class:232
msgid "Process Overview"
msgstr ""
-#: FMain.class:275 FMain0.class:267
+#: FMain.class:284 FMain0.class:270
msgid "Back"
msgstr ""
-#: FMain.class:286 FMain0.class:278
+#: FMain.class:295 FMain0.class:281
msgid "Next"
msgstr ""
-#: FMain.class:297 FMain0.class:289
+#: FMain.class:306 FMain0.class:292
msgid "Quit"
msgstr ""
@@ -42,19 +42,19 @@
msgid "English (US)"
msgstr ""
-#: Step0.class:249
+#: Step0.class:253
msgid "Select your language"
msgstr ""
-#: Step0.class:280
+#: Step0.class:284
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:299
+#: Step0.class:303
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:321
+#: Step0.class:325
msgid "Use this box to test your keyboard settings"
msgstr ""
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:128
+#: Step1.class:133
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "Found"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "in partition"
msgstr ""
-#: Step1.class:188
+#: Step1.class:193
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:201
+#: Step1.class:206
msgid "Scanning"
msgstr ""
-#: Step1.class:211
+#: Step1.class:216
msgid "in"
msgstr ""
-#: Step1.class:239
+#: Step1.class:244
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:332
+#: Step1.class:337
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:335
+#: Step1.class:340
msgid "VERSION"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "WARNING:"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:464
+#: Step1.class:469
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:482
+#: Step1.class:487
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:503
+#: Step1.class:508
msgid "Search Again"
msgstr ""
-#: Step1.class:527
+#: Step1.class:532
msgid "Check Installation media before installing"
msgstr ""
@@ -322,16 +322,50 @@
msgid "menu"
msgstr ""
-#: Step5.class:130
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid ""
+"Your system still contains some non-linux partitions. If you still have
a "
+"Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:130
+#: Step5.class:174
msgid "CLick next to continue"
msgstr ""
-#: Step5.class:194
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
msgstr ""
#: Step6.class:46
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Wed Feb 4 14:32:46 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:234
+#: FMain.class:242
msgid "Process Overview"
msgstr ""
-#: FMain.class:275
+#: FMain.class:284
msgid "Back"
msgstr ""
-#: FMain.class:286
+#: FMain.class:295
msgid "Next"
msgstr ""
-#: FMain.class:297
+#: FMain.class:306
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Wed Feb 4 14:32:46 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:230
+#: FMain0.class:232
msgid "Process Overview"
msgstr ""
-#: FMain0.class:267
+#: FMain0.class:270
msgid "Back"
msgstr ""
-#: FMain0.class:278
+#: FMain0.class:281
msgid "Next"
msgstr ""
-#: FMain0.class:289
+#: FMain0.class:292
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step0.pot
==============================================================================
--- branches/speedy/.lang/Step0.pot (original)
+++ branches/speedy/.lang/Step0.pot Wed Feb 4 14:32:46 2009
@@ -26,19 +26,19 @@
msgid "English (US)"
msgstr ""
-#: Step0.class:249
+#: Step0.class:253
msgid "Select your language"
msgstr ""
-#: Step0.class:280
+#: Step0.class:284
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:299
+#: Step0.class:303
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:321
+#: Step0.class:325
msgid "Use this box to test your keyboard settings"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Wed Feb 4 14:32:46 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:128
+#: Step1.class:133
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "Found"
msgstr ""
-#: Step1.class:147
+#: Step1.class:152
msgid "in partition"
msgstr ""
-#: Step1.class:188
+#: Step1.class:193
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:201
+#: Step1.class:206
msgid "Scanning"
msgstr ""
-#: Step1.class:211
+#: Step1.class:216
msgid "in"
msgstr ""
-#: Step1.class:239
+#: Step1.class:244
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:332
+#: Step1.class:337
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:335
+#: Step1.class:340
msgid "VERSION"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "WARNING:"
msgstr ""
-#: Step1.class:412
+#: Step1.class:417
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:464
+#: Step1.class:469
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:482
+#: Step1.class:487
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:503
+#: Step1.class:508
msgid "Search Again"
msgstr ""
-#: Step1.class:527
+#: Step1.class:532
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step5.pot
==============================================================================
--- branches/speedy/.lang/Step5.pot (original)
+++ branches/speedy/.lang/Step5.pot Wed Feb 4 14:32:46 2009
@@ -58,15 +58,47 @@
msgid "menu"
msgstr ""
-#: Step5.class:130
+#: Step5.class:169
+msgid "SYSTEM RESTART SUGGESTED"
+msgstr ""
+
+#: Step5.class:169
+msgid "Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended "
+msgstr ""
+
+#: Step5.class:169
+msgid "that you reboot your system at this time. "
+msgstr ""
+
+#: Step5.class:169
+msgid "Click the"
+msgstr ""
+
+#: Step5.class:169
+msgid "button to restart your computer now, or click"
+msgstr ""
+
+#: Step5.class:169
+msgid "to continue without restarting."
+msgstr ""
+
+#: Step5.class:174
msgid "PARTITIONING DONE"
msgstr ""
-#: Step5.class:130
+#: Step5.class:174
msgid "CLick next to continue"
msgstr ""
-#: Step5.class:194
+#: Step5.class:190
+msgid "Your computer will restart in 10 seconds"
+msgstr ""
+
+#: Step5.class:247
msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
+#: Step5.class:256
+msgid "Restart Now"
msgstr ""
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Wed Feb 4 14:32:46 2009
@@ -15,6 +15,8 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+STATIC PUBLIC fRunningMainForm AS Object
+
STATIC PUBLIC sDistroName AS String
STATIC PUBLIC sDistroVer AS String
Modified: branches/speedy/FMain.class
==============================================================================
--- branches/speedy/FMain.class (original)
+++ branches/speedy/FMain.class Wed Feb 4 14:32:46 2009
@@ -24,6 +24,7 @@
PUBLIC SUB Form_Open()
+ClsGlobal.fRunningMainForm = ME
IF Application.Args[1] THEN
'System.Language = Trim(Application.Args[1])
$oCurrent = NEW Step1(pnlStack)
@@ -33,6 +34,12 @@
btBack.Enabled = FALSE
ME.auto_setup_for_resolution()
ME.Resize(1024, 600)
+MdlStartUp.LAYOUT_NAVIGATION_VISUALS()
+ IF Application.Args[1] THEN
+ ClsGlobal.fRunningMainForm.ListView1["Step0"].picture =
MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.ListView1["Step1"].picture = MdlStartUp.pNow
+ END IF
+
END
PUBLIC SUB auto_setup_for_resolution()
@@ -117,7 +124,8 @@
$oCurrent.width = pnlStack.Width
$oCurrent.Height = pnlStack.Height
$oCurrent.Startup() ' Call each form's startup sub
-
+
+ME.ListView1.Refresh
END
@@ -127,7 +135,7 @@
$oCurrent.height = pnlStack.Height
ME.SidePanel1.Height = pnlStack.Height
'hpanel1.Width = SidePanel1.Width
- PRINT ME.ClientWidth & "X" & ME.ClientHeight
+ 'PRINT ME.ClientWidth & "X" & ME.ClientHeight
END
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Wed Feb 4 14:32:46 2009
@@ -42,8 +42,9 @@
}
}
{ ListView1 ListView
- MoveScaled(2,3,16,21)
+ MoveScaled(2,3,20,28)
Expand = True
+ Mode = Select.None
}
{ HBox6 HBox
MoveScaled(3,34,13,1)
Modified: branches/speedy/FMain0.class
==============================================================================
--- branches/speedy/FMain0.class (original)
+++ branches/speedy/FMain0.class Wed Feb 4 14:32:46 2009
@@ -28,6 +28,8 @@
' 'System.Language = Trim(Application.Args[1])
' $oCurrent = NEW Step1(pnlStack)
' ELSE
+ClsGlobal.fRunningMainForm = ME
+
$oCurrent = NEW Step1(pnlStack)
'END IF
btBack.Enabled = FALSE
@@ -110,7 +112,7 @@
$oCurrent.Height = pnlStack.Height
$oCurrent.Startup() ' Call each form's startup sub
-
+ME.ListView1.Refresh
END
PUBLIC SUB Form_Resize()
@@ -119,7 +121,7 @@
$oCurrent.height = pnlStack.Height
ME.SidePanel1.Height = pnlStack.Height
'hpanel1.Width = SidePanel1.Width
- PRINT ME.ClientWidth & "X" & ME.ClientHeight
+ 'PRINT ME.ClientWidth & "X" & ME.ClientHeight
END
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Wed Feb 4 14:32:46 2009
@@ -47,6 +47,7 @@
{ ListView1 ListView
MoveScaled(4,4,16,8)
Expand = True
+ Mode = Select.None
}
{ HBox6 HBox
MoveScaled(2,34,13,1)
Modified: branches/speedy/MdlStartUp.module
==============================================================================
--- branches/speedy/MdlStartUp.module (original)
+++ branches/speedy/MdlStartUp.module Wed Feb 4 14:32:46 2009
@@ -15,6 +15,10 @@
' 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 pDone AS Picture
+PUBLIC pNow AS Picture
+PUBLIC pToDo AS Picture
+
PUBLIC SUB MAIN()
IF Application.Args[1] THEN
@@ -24,4 +28,30 @@
fmain.Show
+
+END
+
+PUBLIC SUB LAYOUT_NAVIGATION_VISUALS()
+
+ pDone = Picture.Load("images/done.png")
+ pNow = Picture.Load("images/now.png")
+ pToDo = Picture.Load("images/square.png")
+
+ ClsGlobal.fRunningMainForm.listview1.add("Step0", "Select Language",
pNow)
+ ClsGlobal.fRunningMainForm.listview1.add("Step1", "Select Media", pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step2", "Disk Partitioning",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step3", "Software Selection",
pTodo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step4", "Installation
Summary", pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step5", "Install VectorLinux",
pToDo)
+ 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("Step9", "Network Settings",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step10", "Startup Options",
pToDo)
+ ClsGlobal.fRunningMainForm.listview1.add("Step11", "Final
Configuration", pToDo)
+
+ 'fmain.ListView1.Add(
+
END
+
+
Modified: branches/speedy/Step0.class
==============================================================================
--- branches/speedy/Step0.class (original)
+++ branches/speedy/Step0.class Wed Feb 4 14:32:46 2009
@@ -141,6 +141,10 @@
PUBLIC FUNCTION GetNext() AS String
'Step1.Resize(FMain.pnlStack.Width, FMain.pnlStack.Height)
+
+ ClsGlobal.fRunningMainForm.Listview1["Step0"].picture = MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.Listview1["Step1"].picture = MdlStartUp.pNow
+
IF System.Language = "en_US" THEN
RETURN "Step1"
ELSE
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Wed Feb 4 14:32:46 2009
@@ -91,6 +91,9 @@
PUBLIC FUNCTION GetNext() AS String
+ ClsGlobal.fRunningMainForm.listview1["Step1"].picture =
MdlStartUp.pDone
+ ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow
+
IF bcheckmedia.Value = TRUE THEN
RETURN "Step2"
'IF Step2.sLastChecked <> Trim(ME.ComboBox1.Text) THEN
@@ -104,6 +107,8 @@
RETURN "Step3"
END IF
+
+ 'FMain.ListView1["step0"].pi
Modified: branches/speedy/Step5.class
==============================================================================
--- branches/speedy/Step5.class (original)
+++ branches/speedy/Step5.class Wed Feb 4 14:32:46 2009
@@ -121,14 +121,58 @@
END
+PUBLIC FUNCTION CHECK_IF_REBOOT_NEEDED() AS Boolean
+
+ ' KNOWN BUG:
+ ' This will make the user restart if there are FAT* partitions anywhere
on the box
+ ' even if that drive was not modified
+ ' END OF BUG -- FIX SOON
+
+ DIM sWinPartList AS String
+
+ 'SHELL "probepart | grep -e \"^/dev.*FAT32$\" | sed \'s/\\*/ /\' | grep
-e \"/dev\"" TO sFAT32List
+ 'SHELL "probepart | grep -e \"^/dev.*FAT$\" | sed \'s/\\*/ /\'|grep -e \"
/dev\"" TO sFATList
+
+ SHELL "probepart | grep \"^/dev\" | grep -i \"FAT*\" | tr -s \' \',\"\""
TO sWinPartList
+
+ sWinPartList = Trim(sWinPartList)
+ IF sWinPartList THEN RETURN TRUE
+ RETURN FALSE
+
+ ' IF sFAT32List <> "" THEN
+ ' RETURN TRUE ' reboot needed
+ ' ELSE IF sFATList <> "" THEN
+ ' RETURN TRUE ' reboot needed
+ ' ELSE
+ ' RETURN FALSE ' no reboot needed
+ ' END IF
+
+
+END
+
+
+
PUBLIC SUB Embedder1_Close()
+ ME.Panel1.Arrangement = Arrange.Row
ME.HBox1.Visible = TRUE
'ME.HBox2.Visible = TRUE
ME.tlEmbDone.Visible = TRUE
- ME.tlEmbDone.Text = "<h3>" & ("PARTITIONING DONE") & "</h3>" &
gb.NewLine & gb.NewLine &
- ("CLick next to continue")
+ IF ME.CHECK_IF_REBOOT_NEEDED() = TRUE THEN
+ ME.HBox2.Visible = TRUE
+ ME.tlEmbDone.Text = "<h3>" & ("SYSTEM RESTART SUGGESTED") & "</H3>"
& GB.NewLine &
+ "\n" &
+ ("Your system still contains some non-linux partitions. If you still
have a Windows operating system installed, it is recomended ")&
+ ("that you reboot your system at this time. ") & "<br><br>" &
+ ("Click the") & Space(1) & "\"" & "<b>" & ME.btRestart.Text & "</b>"
& "\"" & Space(1) & ("button to restart your computer now, or click") &
Space(1) & "\n" &
+ "\"" & "<b>" & ClsGlobal.fRunningMainForm.btNext.text & "</b>"
& "\"" & Space(1) & ("to continue without restarting.")
+
+
+ ELSE
+ ME.tlEmbDone.Text = "<h3>" & ("PARTITIONING DONE") & "</h3>" &
gb.NewLine & gb.NewLine &
+ ("CLick next to continue")
+ END IF
FMain.btNext.Enabled = TRUE
@@ -137,5 +181,12 @@
FMain0.btBack.Enabled = TRUE
FMain.btQuit.Enabled = TRUE
FMain0.btQuit.Enabled = TRUE
+
+END
+
+PUBLIC SUB btRestart_Click()
+
+ SHELL "shutdown -r -t 10 &"
+ Message.Warning(("Your computer will restart in 10 seconds"))
END
Modified: branches/speedy/Step5.form
==============================================================================
--- branches/speedy/Step5.form (original)
+++ branches/speedy/Step5.form Wed Feb 4 14:32:46 2009
@@ -33,8 +33,17 @@
Expand = True
Text = ("Loading partitioning utility ... Please Wait")
}
+ { HBox2 HBox
+ MoveScaled(2,6,36,3)
+ Visible = False
+ { btRestart Button
+ MoveScaled(0,0,34,3)
+ Text = ("Restart Now")
+ Picture = Picture["icon:/small/quit"]
+ }
+ }
{ Embedder1 Embedder
- MoveScaled(3,6,52,18)
+ MoveScaled(3,8,52,18)
Expand = True
}
}
Added: branches/speedy/images/done.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/now.png
==============================================================================
Binary file. No diff available.
Added: branches/speedy/images/square.png
==============================================================================
Binary file. No diff available.
|
|
From: <cod...@go...> - 2009-02-04 19:27:06
|
Author: M0...@gm...
Date: Wed Feb 4 07:54:06 2009
New Revision: 483
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FrmDiskPart.class
branches/iVL/installer.gambas
Log:
Moved embedding warning to the embedders_embed() event, updated binary
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# 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"
-#: FrmDiskPart.class:30
+#: FrmDiskPart.class:59
msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
msgstr ""
-#: FrmDiskPart.class:30
+#: FrmDiskPart.class:59
msgid "move, resize, delete or create partitions."
msgstr ""
-#: FrmDiskPart.class:30
+#: FrmDiskPart.class:59
msgid "When you are finished, you will need to exit the utility from the"
msgstr ""
-#: FrmDiskPart.class:30
+#: FrmDiskPart.class:59
msgid "GParted"
msgstr ""
-#: FrmDiskPart.class:30
+#: FrmDiskPart.class:59
msgid "menu"
msgstr ""
-#: FrmDiskPart.class:60
+#: FrmDiskPart.class:61
msgid "When finished making changes, exit the partitioning application to
continue ..."
msgstr ""
-#: FrmDiskPart.class:122
+#: FrmDiskPart.class:123
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Feb 4 07:54:06 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Feb 4 07:54:06 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.21
+Version=0.1.22
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Wed Feb 4 07:54:06 2009
@@ -25,9 +25,6 @@
MdlDiskPart.EMBED_GPARTED()
- Message.Warning(("VectorLinux 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) & "<i>" & ("GParted") & "</i>" & Space(1) & ("menu") & "</b>")
WITH ME
.tlBanner.Text = "<b>Disk Partitioning:</b><br>" &
"This portion of the setup process allows you to define an
installation target for your new operating system." &
@@ -57,6 +54,10 @@
FMain.btback.ForeColor = Color.Gray
FMain.btQuit.Enabled = FALSE
FMain.btQuit.ForeColor = Color.Gray
+ Message.Warning(("VectorLinux 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) & "<i>" & ("GParted") & "</i>" & Space(1) & ("menu") & "</b>")
+
MdlCore.WARN_STATUS(("When finished making changes, exit the
partitioning application to continue ..."))
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2009-02-04 18:46:19
|
Author: M0...@gm...
Date: Wed Feb 4 09:08:46 2009
New Revision: 484
Added:
branches/speedy/.lang/MdlMain.pot
branches/speedy/.lang/Step5.pot
branches/speedy/MdlMain.module
branches/speedy/Step5.class
branches/speedy/Step5.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.project
branches/speedy/Step1.class
branches/speedy/Step3.class
branches/speedy/Step6.class
Log:
Added gparted window
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Wed Feb 4 09:08:46 2009
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:127
+#: Step1.class:128
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "Found"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "in partition"
msgstr ""
-#: Step1.class:177
+#: Step1.class:188
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:190
+#: Step1.class:201
msgid "Scanning"
msgstr ""
-#: Step1.class:200
+#: Step1.class:211
msgid "in"
msgstr ""
-#: Step1.class:228
+#: Step1.class:239
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:321
+#: Step1.class:332
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:324
+#: Step1.class:335
msgid "VERSION"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "WARNING:"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:453
+#: Step1.class:464
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:471
+#: Step1.class:482
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:492
+#: Step1.class:503
msgid "Search Again"
msgstr ""
-#: Step1.class:516
+#: Step1.class:527
msgid "Check Installation media before installing"
msgstr ""
@@ -272,6 +272,68 @@
msgid "Install VectorLinux to existing partitions on my hard drive"
msgstr ""
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid ""
+"Gparted was not found on this system. Please install gparted and try
again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"The VectorLinux installer is unable to embed the gparted partitioning "
+"utility."
+msgstr ""
+
+#: Step5.class:92
+msgid ""
+"Please consider using the automatic partition option, or use other means
of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid ""
+"VectorLinux is about to launch the GParted partitioning tool. Use this "
+"utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:130
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:130
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:194
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
#: Step6.class:46
msgid "Partition"
msgstr ""
@@ -296,19 +358,19 @@
msgid "Do not format"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "You have already selected"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "as your"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "partition."
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "Please select only one partition for this purpose"
msgstr ""
Added: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/MdlMain.pot Wed Feb 4 09:08:46 2009
@@ -0,0 +1,16 @@
+# /home/vluser/devel/speedy/MdlMain.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/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Wed Feb 4 09:08:46 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:127
+#: Step1.class:128
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "Found"
msgstr ""
-#: Step1.class:146
+#: Step1.class:147
msgid "in partition"
msgstr ""
-#: Step1.class:177
+#: Step1.class:188
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:190
+#: Step1.class:201
msgid "Scanning"
msgstr ""
-#: Step1.class:200
+#: Step1.class:211
msgid "in"
msgstr ""
-#: Step1.class:228
+#: Step1.class:239
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:321
+#: Step1.class:332
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:324
+#: Step1.class:335
msgid "VERSION"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "WARNING:"
msgstr ""
-#: Step1.class:401
+#: Step1.class:412
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:453
+#: Step1.class:464
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:471
+#: Step1.class:482
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:492
+#: Step1.class:503
msgid "Search Again"
msgstr ""
-#: Step1.class:516
+#: Step1.class:527
msgid "Check Installation media before installing"
msgstr ""
Added: branches/speedy/.lang/Step5.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step5.pot Wed Feb 4 09:08:46 2009
@@ -0,0 +1,72 @@
+# /home/vluser/devel/speedy/Step5.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"
+
+#: Step5.class:19
+msgid "Resize partitions using Gparted"
+msgstr ""
+
+#: Step5.class:64
+msgid "Gparted was not found on this system. Please install gparted and
try again"
+msgstr ""
+
+#: Step5.class:69
+msgid "Loading partitioning utility...Please Wait"
+msgstr ""
+
+#: Step5.class:92
+msgid "The VectorLinux installer is unable to embed the gparted
partitioning utility."
+msgstr ""
+
+#: Step5.class:92
+msgid "Please consider using the automatic partition option, or use other
means of"
+msgstr ""
+
+#: Step5.class:92
+msgid "partitioning your hard drives."
+msgstr ""
+
+#: Step5.class:114
+msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
+msgstr ""
+
+#: Step5.class:114
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: Step5.class:114
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: Step5.class:114
+msgid "GParted"
+msgstr ""
+
+#: Step5.class:114
+msgid "menu"
+msgstr ""
+
+#: Step5.class:130
+msgid "PARTITIONING DONE"
+msgstr ""
+
+#: Step5.class:130
+msgid "CLick next to continue"
+msgstr ""
+
+#: Step5.class:194
+msgid "Loading partitioning utility ... Please Wait"
+msgstr ""
+
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Wed Feb 4 09:08:46 2009
@@ -38,19 +38,19 @@
msgid "Do not format"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "You have already selected"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "as your"
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "partition."
msgstr ""
-#: Step6.class:161
+#: Step6.class:160
msgid "Please select only one partition for this purpose"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Wed Feb 4 09:08:46 2009
@@ -5,6 +5,7 @@
Version=0.0.1
Library=gb.gtk
Library=gb.form
+Library=gb.desktop
Library=gb.gtk.ext
Arguments="en_US"
TabSize=2
Added: branches/speedy/MdlMain.module
==============================================================================
--- (empty file)
+++ branches/speedy/MdlMain.module Wed Feb 4 09:08:46 2009
@@ -0,0 +1,48 @@
+' 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 SUB NAVIGATION_LOCKDOWN()
+
+ WITH FMain
+ .btNext.Enabled = FALSE
+ .btBack.Enabled = FALSE
+ .btQuit.Enabled = FALSE
+ END WITH
+ WITH FMain0
+ .btNext.Enabled = FALSE
+ .btBack.Enabled = FALSE
+ .btQuit.Enabled = FALSE
+ END WITH
+
+
+END
+
+PUBLIC SUB NAVIGATION_RESTORE()
+
+ WITH FMain
+ .btNext.Enabled = TRUE
+ .btBack.Enabled = TRUE
+ .btQuit.Enabled = TRUE
+ END WITH
+ WITH FMain0
+ .btNext.Enabled = TRUE
+ .btBack.Enabled = TRUE
+ .btQuit.Enabled = TRUE
+ END WITH
+
+END
+
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Wed Feb 4 09:08:46 2009
@@ -77,6 +77,7 @@
ME.TextLabel1.Text = "<h2>" & TextLabel1.text & "</h2>"
ME.mvLooking.path = "images/throbber.gif"
ME.mvLooking.Playing = TRUE
+
WAIT 0.25 ' a small wait time to avoid a solid blank form
ME.FIND_CD_INSTALL_MEDIA()
ME.FIND_ISO_INSTALL_MEDIA()
@@ -157,7 +158,12 @@
tlStatus.Text = ""
ME.ComboBox1.Enabled = TRUE
-
+ FMain.btNext.Enabled = TRUE
+ 'FMain.btBack.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+ 'FMain0.btBack.Enabled = TRUE
+ FMain0.btQuit.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
@@ -174,6 +180,11 @@
ME.mvLooking.Playing = TRUE
WAIT 1
+
+ FMain0.btNext.Enabled = FALSE
+ FMain.btNext.Enabled = FALSE
+ FMain.btQuit.Enabled = FALSE
+ FMain0.btQuit.Enabled = FALSE
Step1.tlStatus.Text = ("Scanning for CD Media ... Please wait")
SHELL "/sbin/probedisk | grep \"cdrom\" | cut -f 1 -d \"|\"" TO sOutput
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Wed Feb 4 09:08:46 2009
@@ -45,8 +45,8 @@
END IF
IF ME.rbCustomPart.Value = TRUE THEN
'embed gparted
- Message("Gparted module not present yet")
- RETURN
+ 'Message("Gparted module not present yet")
+ RETURN "Step5"
END IF
IF ME.rbPrePartitioned.Value = TRUE THEN
' Use existing partitions
Added: branches/speedy/Step5.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step5.class Wed Feb 4 09:08:46 2009
@@ -0,0 +1,141 @@
+' 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 = "<h2>" & ("Resize partitions using Gparted") & "</h2>"
+ 'ME.EMBED_GPARTED()
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+PUBLIC SUB StartUp()
+
+ ME.EMBED_GPARTED()
+
+END
+
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step6"
+
+END
+
+
+
+PUBLIC SUB EMBED_GPARTED()
+
+
+ DIM sTitle AS String
+ DIM sTitle1, sTitle2 AS String
+ DIM aHandle AS NEW Pointer[]
+ DIM iHandle AS Integer
+ DIM i AS Integer = 0
+ DIM sDump AS String
+ DIM sWins AS String = "gpartedbin,Gpartedbin" '" GParted, / dev / sda -
GParted, / dev / hda - GParted ""
+ DIM sWons AS String[] = Split(sWins, ",")
+ DIM sType AS String
+ DIM sTypes AS String[]
+
+ ' The window can be found on the Desktop WM_CLASS property which can be
seen via the xprop application
+ ' We may need to implement this method here instead of the win window
title method.
+
+
+ IF Exist("/usr/sbin/gparted") = FALSE THEN
+ Message.Error(("Gparted was not found on this system. Please install
gparted and try again"))
+ RETURN
+ END IF
+
+' FrmDiskPart.tlBanner.Text = "<h3>" & ("Loading gparted ... Please
wait") & "</h3>"
+ ME.tlEmbDone.Text = "<h3><i>" & ("Loading partitioning utility...Please
Wait") & "</h3></i>"
+ ME.tlEmbDone.Visible = TRUE
+ SHELL "/usr/sbin/gparted"
+ WAIT 1
+
+ REPEAT
+ WAIT 1
+ INC i
+ aHandle = Desktop.Find("", "*parted*", "")
+ UNTIL aHandle.Count = 1 OR i = 5
+
+ IF aHandle.Count > 0 THEN iHandle = aHandle[0]
+
+
+ IF iHandle THEN
+ ME.tlEmbDone.Text = ""
+ ME.tlEmbDone.Visible = FALSE
+ TRY Embedder1.Embed(iHandle)
+ 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 &
+ ("Please consider using the automatic partition option, or use other
means of") & gb.NewLine &
+ ("partitioning your hard drives."))
+ END IF
+
+
+
+
+END
+
+
+PUBLIC SUB Form_Resize()
+
+ ME.Panel1.Height = ME.ClientH - ME.HPanel1.Top - ME.HPanel1.Height - 12
+
+END
+
+PUBLIC SUB Embedder1_Embed()
+
+ 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 &
+ ("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) & "<i>" & ("GParted") & "</i>" & Space(1) & ("menu") & "</b>")
+ FMain.btNext.Enabled = FALSE
+ FMain0.btNext.Enabled = FALSE
+ FMain.btBack.Enabled = FALSE
+ FMain0.btBack.Enabled = FALSE
+ FMain.btQuit.Enabled = FALSE
+ FMain0.btQuit.Enabled = FALSE
+
+END
+
+PUBLIC SUB Embedder1_Close()
+
+ ME.HBox1.Visible = TRUE
+ 'ME.HBox2.Visible = TRUE
+ ME.tlEmbDone.Visible = TRUE
+ ME.tlEmbDone.Text = "<h3>" & ("PARTITIONING DONE") & "</h3>" &
gb.NewLine & gb.NewLine &
+ ("CLick next to continue")
+
+
+
+ FMain.btNext.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+ FMain.btBack.Enabled = TRUE
+ FMain0.btBack.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
+ FMain0.btQuit.Enabled = TRUE
+
+END
Added: branches/speedy/Step5.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step5.form Wed Feb 4 09:08:46 2009
@@ -0,0 +1,41 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,46)
+ Expand = True
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { Panel1 Panel
+ MoveScaled(0,6,61,32)
+ Expand = True
+ Arrangement = Arrange.Vertical
+ { HBox1 HBox
+ MoveScaled(1,0,8,1)
+ Visible = False
+ Expand = True
+ }
+ { tlEmbDone TextLabel
+ MoveScaled(2,2,46,9)
+ Visible = False
+ Expand = True
+ Text = ("Loading partitioning utility ... Please Wait")
+ }
+ { Embedder1 Embedder
+ MoveScaled(3,6,52,18)
+ Expand = True
+ }
+ }
+}
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Wed Feb 4 09:08:46 2009
@@ -152,21 +152,19 @@
PUBLIC FUNCTION CheckEntry(sEntry AS String, iCurrRow AS Integer) AS
Integer
DIM irow AS Integer '= 2
- FOR irow = 0 TO ME.gvPartListing.Rows.count - 1
-
- IF irow <> iCurrRow THEN
- 'PRINT irow & "-" & iCurrRow
- IF gvPartListing[irow, 2].Text AND IF gvPartListing[irow, 2].Text
= sEntry THEN
- Message.Error(("You have already selected") & Space(1) &
gvPartListing[irow, 0].Text & Space(1) & ("as your") & Space(1) &
Trim(sEntry) & Space(1) & ("partition.") & gb.NewLine &
- ("Please select only one partition for this purpose"))
-
- RETURN 1
+ irow = 0
+ REPEAT
+ IF irow <> iCurrRow THEN
+ IF gvPartListing[irow, 2].Text AND gvPartListing[irow, 2].Text =
sEntry THEN
+ Message.Error(("You have already selected") & Space(1) &
gvPartListing[irow, 0].Text & Space(1) & ("as your") & Space(1) &
Trim(sEntry) & Space(1) & ("partition.") & gb.NewLine &
+ ("Please select only one partition for this purpose"))
+ RETURN 1
+ END IF
END IF
- END IF
- INC irow
-
- NEXT
- RETURN 0
+ INC irow
+ UNTIL irow = gvPartListing.Rows.count - 1
+ RETURN 0
+
END
@@ -178,11 +176,13 @@
x = LAST.x
y = LAST.y
- IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ IF LAST.text <> ("Not Used") THEN
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
LAST.text = ("Not Used")
STOP EVENT
RETURN
END IF
+ END IF
IF LAST.text <> ("Not Used") THEN
FOR EACH cb IN objFS
@@ -257,11 +257,11 @@
'x = gvPartListing.ColumnAt(LAST.x)
'y = gvPartListing.RowAt(LAST.y)
-
- IF y < 2 THEN RETURN
- IF LAST.text = ("Not Used") THEN LAST.text = ""
- gvPartListing[y, x].Text = Trim(LAST.text)
- LAST.visible = FALSE
+ '
+ ' IF y < 2 THEN RETURN
+ ' IF LAST.text = ("Not Used") THEN LAST.text = ""
+ ' gvPartListing[y, x].Text = Trim(LAST.text)
+ ' LAST.visible = FALSE
END
|
|
From: <cod...@go...> - 2009-02-04 16:01:29
|
Author: uelsk8s
Date: Wed Feb 4 07:48:28 2009
New Revision: 482
Modified:
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FrmDiskPart.class
Log:
added warning to let user know how to exit gparted
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/uel/gui-installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/uel/gui-installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/uel/gui-installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/uel/gui-installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/uel/gui-installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,11 +14,31 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FrmDiskPart.class:58
+#: FrmDiskPart.class:30
+msgid "VectorLinux is about to launch the GParted partitioning tool. Use
this utility to"
+msgstr ""
+
+#: FrmDiskPart.class:30
+msgid "move, resize, delete or create partitions."
+msgstr ""
+
+#: FrmDiskPart.class:30
+msgid "When you are finished, you will need to exit the utility from the"
+msgstr ""
+
+#: FrmDiskPart.class:30
+msgid "GParted"
+msgstr ""
+
+#: FrmDiskPart.class:30
+msgid "menu"
+msgstr ""
+
+#: FrmDiskPart.class:60
msgid "When finished making changes, exit the partitioning application to
continue ..."
msgstr ""
-#: FrmDiskPart.class:120
+#: FrmDiskPart.class:122
msgid "Disk Partitioning:"
msgstr ""
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/uel/gui-installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/uel/gui-installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/uel/gui-installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/uel/gui-installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/uel/gui-installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/uel/gui-installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/uel/gui-installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/uel/gui-installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/uel/gui-installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/uel/gui-installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/uel/gui-installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/uel/gui-installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/uel/gui-installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Feb 4 07:48:28 2009
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/uel/gui-installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FrmDiskPart.class
==============================================================================
--- branches/iVL/FrmDiskPart.class (original)
+++ branches/iVL/FrmDiskPart.class Wed Feb 4 07:48:28 2009
@@ -25,7 +25,9 @@
MdlDiskPart.EMBED_GPARTED()
-
+ Message.Warning(("VectorLinux 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) & "<i>" & ("GParted") & "</i>" & Space(1) & ("menu") & "</b>")
WITH ME
.tlBanner.Text = "<b>Disk Partitioning:</b><br>" &
"This portion of the setup process allows you to define an
installation target for your new operating system." &
|
|
From: <cod...@go...> - 2009-02-03 23:53:39
|
Author: M0...@gm...
Date: Tue Feb 3 14:31:16 2009
New Revision: 481
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/Step6.pot
branches/speedy/.project
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step2.class
branches/speedy/Step2.form
branches/speedy/Step3.class
branches/speedy/Step6.class
branches/speedy/Step6.form
Log:
Implemented rescan feature, visual changes to partition selector
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Feb 3 14:31:16 2009
@@ -14,19 +14,19 @@
msgid "VectorLinux Installer"
msgstr ""
-#: FMain.class:233 FMain0.class:225
+#: FMain.class:234 FMain0.class:230
msgid "Process Overview"
msgstr ""
-#: FMain.class:270 FMain0.class:262
+#: FMain.class:275 FMain0.class:267
msgid "Back"
msgstr ""
-#: FMain.class:281 FMain0.class:273
+#: FMain.class:286 FMain0.class:278
msgid "Next"
msgstr ""
-#: FMain.class:292 FMain0.class:284
+#: FMain.class:297 FMain0.class:289
msgid "Quit"
msgstr ""
@@ -62,67 +62,67 @@
msgid "on"
msgstr ""
-#: Step1.class:122
+#: Step1.class:127
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "Found"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "in partition"
msgstr ""
-#: Step1.class:169
+#: Step1.class:177
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:182
+#: Step1.class:190
msgid "Scanning"
msgstr ""
-#: Step1.class:192
+#: Step1.class:200
msgid "in"
msgstr ""
-#: Step1.class:216
+#: Step1.class:228
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:307
+#: Step1.class:321
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:310
+#: Step1.class:324
msgid "VERSION"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "WARNING:"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:425
+#: Step1.class:453
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:443
+#: Step1.class:471
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:464
+#: Step1.class:492
msgid "Search Again"
msgstr ""
-#: Step1.class:488
+#: Step1.class:516
msgid "Check Installation media before installing"
msgstr ""
@@ -140,89 +140,97 @@
msgid "Verifying data on compressed package"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "Testing file"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "of"
msgstr ""
-#: Step2.class:97
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
msgid "FAILED"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "The following"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "required"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "has failed the integrity test. It is not safe to continue"
msgstr ""
-#: Step2.class:100
+#: Step2.class:118
msgid "Integrity test"
msgstr ""
-#: Step2.class:106
+#: Step2.class:124
msgid "PASSED"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid ""
"has failed the data integrity test. All required packages have passed
this "
"test"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid ""
"Possible causes for this are a corrupted download or a badly burnt cd.
You "
"can try the following options"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Download a new installation image from www.vectorlinux.com"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Burn the image at a lower speed rate"
msgstr ""
-#: Step2.class:156
+#: Step2.class:174
msgid "Data integrity test complete... all tests passed"
msgstr ""
-#: Step2.class:163
+#: Step2.class:181
msgid "All test passed. It is safe to continue with the installation
process."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid ""
"Verifying installation files can prevent you from performing an
unsuccessful "
"install"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Click"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:333
+#: Step2.class:352
msgid "TextLabel2"
msgstr ""
-#: Step2.class:347
+#: Step2.class:366
msgid "Stop"
msgstr ""
@@ -280,38 +288,38 @@
msgid "File System"
msgstr ""
-#: Step6.class:104
+#: Step6.class:106
msgid "Not Used"
msgstr ""
-#: Step6.class:115
+#: Step6.class:118
msgid "Do not format"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "You have already selected"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "as your"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "partition."
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:232
+#: Step6.class:214
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "Yes"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "No"
msgstr ""
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Tue Feb 3 14:31:16 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:233
+#: FMain.class:234
msgid "Process Overview"
msgstr ""
-#: FMain.class:270
+#: FMain.class:275
msgid "Back"
msgstr ""
-#: FMain.class:281
+#: FMain.class:286
msgid "Next"
msgstr ""
-#: FMain.class:292
+#: FMain.class:297
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/FMain0.pot
==============================================================================
--- branches/speedy/.lang/FMain0.pot (original)
+++ branches/speedy/.lang/FMain0.pot Tue Feb 3 14:31:16 2009
@@ -14,19 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain0.class:225
+#: FMain0.class:230
msgid "Process Overview"
msgstr ""
-#: FMain0.class:262
+#: FMain0.class:267
msgid "Back"
msgstr ""
-#: FMain0.class:273
+#: FMain0.class:278
msgid "Next"
msgstr ""
-#: FMain0.class:284
+#: FMain0.class:289
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Tue Feb 3 14:31:16 2009
@@ -18,67 +18,67 @@
msgid "on"
msgstr ""
-#: Step1.class:122
+#: Step1.class:127
msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "Found"
msgstr ""
-#: Step1.class:141
+#: Step1.class:146
msgid "in partition"
msgstr ""
-#: Step1.class:169
+#: Step1.class:177
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:182
+#: Step1.class:190
msgid "Scanning"
msgstr ""
-#: Step1.class:192
+#: Step1.class:200
msgid "in"
msgstr ""
-#: Step1.class:216
+#: Step1.class:228
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:307
+#: Step1.class:321
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:310
+#: Step1.class:324
msgid "VERSION"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This feature can help you avoid an unsuccesful installation."
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "WARNING:"
msgstr ""
-#: Step1.class:387
+#: Step1.class:401
msgid "This process can take a long time to complete."
msgstr ""
-#: Step1.class:425
+#: Step1.class:453
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:443
+#: Step1.class:471
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:464
+#: Step1.class:492
msgid "Search Again"
msgstr ""
-#: Step1.class:488
+#: Step1.class:516
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Tue Feb 3 14:31:16 2009
@@ -26,83 +26,91 @@
msgid "Verifying data on compressed package"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "Testing file"
msgstr ""
-#: Step2.class:81
+#: Step2.class:82
msgid "of"
msgstr ""
-#: Step2.class:97
+#: Step2.class:101
+msgid "Canceling data integrity tests per user request"
+msgstr ""
+
+#: Step2.class:102
+msgid "Data integrity test canceled by user."
+msgstr ""
+
+#: Step2.class:115
msgid "FAILED"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "The following"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "required"
msgstr ""
-#: Step2.class:99
+#: Step2.class:117
msgid "has failed the integrity test. It is not safe to continue"
msgstr ""
-#: Step2.class:100
+#: Step2.class:118
msgid "Integrity test"
msgstr ""
-#: Step2.class:106
+#: Step2.class:124
msgid "PASSED"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "has failed the data integrity test. All required packages have
passed this test"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Possible causes for this are a corrupted download or a badly burnt
cd. You can try the following options"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Download a new installation image from www.vectorlinux.com"
msgstr ""
-#: Step2.class:136
+#: Step2.class:154
msgid "Burn the image at a lower speed rate"
msgstr ""
-#: Step2.class:156
+#: Step2.class:174
msgid "Data integrity test complete... all tests passed"
msgstr ""
-#: Step2.class:163
+#: Step2.class:181
msgid "All test passed. It is safe to continue with the installation
process."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "Click"
msgstr ""
-#: Step2.class:180
+#: Step2.class:198
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:333
+#: Step2.class:352
msgid "TextLabel2"
msgstr ""
-#: Step2.class:347
+#: Step2.class:366
msgid "Stop"
msgstr ""
Modified: branches/speedy/.lang/Step6.pot
==============================================================================
--- branches/speedy/.lang/Step6.pot (original)
+++ branches/speedy/.lang/Step6.pot Tue Feb 3 14:31:16 2009
@@ -30,39 +30,39 @@
msgid "File System"
msgstr ""
-#: Step6.class:104
+#: Step6.class:106
msgid "Not Used"
msgstr ""
-#: Step6.class:115
+#: Step6.class:118
msgid "Do not format"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "You have already selected"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "as your"
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "partition."
msgstr ""
-#: Step6.class:158
+#: Step6.class:161
msgid "Please select only one partition for this purpose"
msgstr ""
-#: Step6.class:232
+#: Step6.class:214
msgid "Select which partitions to use for installation"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "Yes"
msgstr ""
-#: Step6.class:367
+#: Step6.class:350
msgid "No"
msgstr ""
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Feb 3 14:31:16 2009
@@ -1,11 +1,12 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
-Startup=Step6
+Startup=MdlStartUp
Version=0.0.1
Library=gb.gtk
Library=gb.form
Library=gb.gtk.ext
+Arguments="en_US"
TabSize=2
Translate=1
Language=en_US
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Tue Feb 3 14:31:16 2009
@@ -5,7 +5,7 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HBox2 HBox
- MoveScaled(12,1,63,7)
+ MoveScaled(12,1,63,8)
Background = Color.SelectedBackground
{ Panel2 Panel
MoveScaled(1,3,4,2)
@@ -22,10 +22,10 @@
}
}
{ HBox4 HBox
- MoveScaled(3,8,72,1)
+ MoveScaled(3,9,72,1)
}
{ Panel1 Panel
- MoveScaled(1,10,80,40)
+ MoveScaled(1,11,80,40)
Expand = True
Arrangement = Arrange.Horizontal
{ SidePanel1 SidePanel
@@ -45,6 +45,9 @@
MoveScaled(2,3,16,21)
Expand = True
}
+ { HBox6 HBox
+ MoveScaled(3,34,13,1)
+ }
}
{ pnlStack Panel
MoveScaled(28,2,50,37)
@@ -53,10 +56,10 @@
}
}
{ HBox1 HBox
- MoveScaled(2,49,72,1)
+ MoveScaled(2,50,72,1)
}
{ HBox3 HBox
- MoveScaled(2,51,72,3)
+ MoveScaled(2,52,72,3)
{ Panel4 Panel
MoveScaled(0,0,17,3)
Expand = True
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Tue Feb 3 14:31:16 2009
@@ -28,6 +28,9 @@
MoveScaled(1,10,80,40)
Expand = True
Arrangement = Arrange.Horizontal
+ { HBox1 HBox
+ MoveScaled(0,39,72,1)
+ }
{ SidePanel1 SidePanel
MoveScaled(1,2,26,35)
Arrangement = Arrange.Vertical
@@ -45,15 +48,15 @@
MoveScaled(4,4,16,8)
Expand = True
}
+ { HBox6 HBox
+ MoveScaled(2,34,13,1)
+ }
}
{ pnlStack Panel
MoveScaled(28,2,50,37)
Expand = True
Border = Border.Plain
}
- }
- { HBox1 HBox
- MoveScaled(2,49,72,1)
}
{ HBox3 HBox
MoveScaled(2,51,72,3)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Tue Feb 3 14:31:16 2009
@@ -75,10 +75,15 @@
PUBLIC SUB Form_Open()
ME.TextLabel1.Text = "<h2>" & TextLabel1.text & "</h2>"
+ ME.mvLooking.path = "images/throbber.gif"
+ ME.mvLooking.Playing = TRUE
+ WAIT 0.25 ' a small wait time to avoid a solid blank form
ME.FIND_CD_INSTALL_MEDIA()
ME.FIND_ISO_INSTALL_MEDIA()
ME.FIND_PARTITION_INSTALL_MEDIA()
FMain.btNext.Enabled = ComboBox1.Count > 0
+ ME.mvLooking.Playing = FALSE
+ ME.mvLooking.Visible = FALSE
END
@@ -150,6 +155,7 @@
NEXT
tlStatus.Text = ""
+
ME.ComboBox1.Enabled = TRUE
@@ -166,6 +172,8 @@
DIM i AS Integer
DIM sDriveList AS String[]
+ ME.mvLooking.Playing = TRUE
+ WAIT 1
Step1.tlStatus.Text = ("Scanning for CD Media ... Please wait")
SHELL "/sbin/probedisk | grep \"cdrom\" | cut -f 1 -d \"|\"" TO sOutput
@@ -213,6 +221,10 @@
DIM sPartList AS String[]
ME.ComboBox1.Enabled = FALSE
+
+ ME.mvLooking.Playing = TRUE
+ WAIT 1
+
tlStatus.Text = ("Scanning system for installable ISO images")
PRINT tlStatus.Text
SHELL "/sbin/probepart | grep \"^/dev\" | grep -v -i \"linux swap\" | tr
-s \' \'\"\" | cut -f 1 -d \' \'" TO sOutput
@@ -293,6 +305,8 @@
sTempFileName = Replace(sTempFileName, "/dev/", "")
sTempFileName = Replace(sTempFileName, Space(1) & ("on") &
Space(1), "-")
+ ME.mvLooking.Playing = TRUE
+ WAIT 1
sDump = Split(File.Load(Temp(sTempFileName)), "\n")
FOR i = 0 TO sDump.Count - 1
sLine = Trim(sDump[i])
@@ -388,5 +402,18 @@
INC iCheckWarn
END IF
END IF
+
+END
+
+PUBLIC SUB btRescan_Click()
+ ME.mvLooking.Visible = TRUE
+ ME.ComboBox1.Clear()
+ ME.FIND_CD_INSTALL_MEDIA()
+ ME.FIND_ISO_INSTALL_MEDIA()
+ ME.FIND_PARTITION_INSTALL_MEDIA()
+ ME.mvLooking.Playing = FALSE
+ ME.mvLooking.Visible = FALSE
+ FMain.btNext.Enabled = ComboBox1.Count > 0
+
END
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Tue Feb 3 14:31:16 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,65,45)
+ MoveScaled(0,0,67,59)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -18,7 +18,7 @@
}
}
{ Panel1 Panel
- MoveScaled(1,8,60,34)
+ MoveScaled(1,8,60,45)
Expand = True
Arrangement = Arrange.Row
{ TextLabel2 TextLabel
@@ -62,6 +62,10 @@
MoveScaled(1,21,41,3)
Expand = True
Text = ("Check Installation media before installing")
+ }
+ { mvLooking MovieBox
+ MoveScaled(5,24,11,25)
+ Expand = True
}
}
}
Modified: branches/speedy/Step2.class
==============================================================================
--- branches/speedy/Step2.class (original)
+++ branches/speedy/Step2.class Tue Feb 3 14:31:16 2009
@@ -76,6 +76,7 @@
FOR EACH sfile IN Dir(sRequired, "*.tlz")
PRINT ("Verifying data on compressed package") & Space(1) &
Trim(sfile) & " .... "
+ IF iProcSig <> 225 THEN
hproc = SHELL "lzmadec < " & sRequired &/ Trim(sfile) & " >
/dev/null" ' wait
INC i
ME.tlTestingLbl.Text = ("Testing file") & Space(1) & i & Space(1)
& ("of") & Space(1) & iTotalBulks & " ... " & sfile
@@ -91,6 +92,23 @@
iProcSig = 225 OR hproc.State = Process.Stopped
IF ProgressBar1.Value < iInc * i THEN
ME.ProgressBar1.Value = i / iTotalBulks
END IF
+ END IF
+
+ IF iProcSig = 225 THEN 'canceled by user
+ 'shell
+ 'hproc.Kill
+ 'SHELL "kill -9 " & hproc.Id WAIT
+ PRINT ("Canceling data integrity tests per user request")
+ Message.Info(("Data integrity test canceled by user."))
+ ME.mbThrobbler.Playing = FALSE
+ ME.btStop.Enabled = FALSE
+ FMain.btNext.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+ FMain.btBack.Enabled = TRUE
+ FMain0.btBack.Enabled = TRUE
+ RETURN
+ END IF
+
iretval = hproc.Value
IF hproc.Value > 0 THEN
' Error in bulk
@@ -209,9 +227,15 @@
PUBLIC SUB btStop_Click()
-
- mbThrobbler.Playing = FALSE
- IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
- IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
+
+ iProcSig = 225
+ 'hproc.Kill
+ EXEC ["kill", "-9", hproc.Id] WAIT
+ EXEC ["killall", "lzmadec"] WAIT
+
+
+ ' mbThrobbler.Playing = FALSE
+ ' IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
+ ' IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
END
Modified: branches/speedy/Step2.form
==============================================================================
--- branches/speedy/Step2.form (original)
+++ branches/speedy/Step2.form Tue Feb 3 14:31:16 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,78,51)
+ MoveScaled(0,0,78,66)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -17,7 +17,7 @@
}
}
{ Panel1 Panel
- MoveScaled(1,7,76,43)
+ MoveScaled(2,8,76,55)
Expand = True
Arrangement = Arrange.Row
{ HPanel2 HPanel
@@ -30,30 +30,27 @@
}
}
{ HBox2 HBox
- MoveScaled(16,14,35,14)
+ MoveScaled(8,14,60,27)
Expand = True
{ Panel2 Panel
MoveScaled(1,3,7,8)
Expand = True
}
- { Panel4 Panel
- MoveScaled(8,1,24,24)
+ { mbThrobbler MovieBox
+ MoveScaled(21,2,21,22)
Expand = True
- { mbThrobbler MovieBox
- MoveScaled(4,2,14,9)
- }
}
{ Panel3 Panel
- MoveScaled(26,0,24,24)
+ MoveScaled(33,2,24,20)
Expand = True
}
}
{ HBox4 HBox
- MoveScaled(33,29,18,1)
+ MoveScaled(33,42,18,1)
Expand = True
}
{ HBox3 HBox
- MoveScaled(16,30,36,2)
+ MoveScaled(16,43,36,2)
Expand = True
{ ProgressBar1 ProgressBar
MoveScaled(0,0,30,2)
@@ -61,11 +58,11 @@
}
}
{ HBox6 HBox
- MoveScaled(34,32,14,1)
+ MoveScaled(34,45,14,1)
Expand = True
}
{ HBox5 HBox
- MoveScaled(2,34,43,3)
+ MoveScaled(2,46,43,3)
Expand = True
{ tlTestingLbl TextLabel
MoveScaled(1,0,40,2)
@@ -74,11 +71,11 @@
}
}
{ HBox7 HBox
- MoveScaled(33,38,12,1)
+ MoveScaled(33,50,12,1)
Expand = True
}
{ HBox1 HBox
- MoveScaled(2,39,57,3)
+ MoveScaled(0,51,57,3)
{ btStop Button
MoveScaled(0,0,16,3)
Text = ("Stop")
Modified: branches/speedy/Step3.class
==============================================================================
--- branches/speedy/Step3.class (original)
+++ branches/speedy/Step3.class Tue Feb 3 14:31:16 2009
@@ -40,7 +40,7 @@
IF ME.rbAutoPart.Value = TRUE THEN
'no module for auto partition written yet
- Message("Not ready yet")
+ 'Message("Not ready yet")
RETURN
END IF
IF ME.rbCustomPart.Value = TRUE THEN
Modified: branches/speedy/Step6.class
==============================================================================
--- branches/speedy/Step6.class (original)
+++ branches/speedy/Step6.class Tue Feb 3 14:31:16 2009
@@ -46,7 +46,7 @@
gvPartListing[0, 0].text = ("Partition")
gvPartListing[0, 1].text = ("Size")
gvPartListing[0, 2].text = ("Mount Point")
- gvPartListing[0, 3].text = ("File System")
+ gvPartListing[0, 4].text = ("File System")
'gvPartListing[0, 4].text = ("File System")
gvPartListing[0, 0].BackColor = Color.LightBackground
gvPartListing[0, 0].Font.Bold = TRUE
@@ -57,8 +57,9 @@
gvPartListing.Columns[2].Width = 120
gvPartListing[0, 3].BackColor = Color.LightBackground
gvPartListing[0, 3].Font.Bold = TRUE
- gvPartListing.Columns[3].Width = 120
+ gvPartListing.Columns[3].Width = 8
gvPartListing[0, 4].BackColor = Color.LightBackground
+ gvPartListing.Columns[4].Width = 120
gvPartListing[0, 4].Font.Bold = TRUE
gvPartListing[0, 5].BackColor = Color.LightBackground
gvPartListing[0, 5].Font.Bold = TRUE
@@ -94,24 +95,26 @@
ME.gvPartListing[irow, 0].text = Trim(sDisks[i]) &
Trim(sPartNo)
ME.gvPartListing[irow, 1].Text = Trim(sSize)
IF sFs LIKE "linux-swap" THEN
- gvPartListing[irow, 3].Text = Trim(sfs)
+ gvPartListing[irow, 4].Text = Trim(sfs)
ELSE
cbMntPoint = NEW ComboBox(gvPartListing.Parent)
AS "MountPointSel"
WITH cbMntPoint
.Move(gvPartListing[irow, 2].left, gvPartListing[irow,
2].top)
.Width = gvPartListing[irow, 2].Width
.Height = gvPartListing[irow, 2].Height
+ .ReadOnly = TRUE
.list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
.Text = ("Not Used")
.tag = gvPartListing[irow, 0].Text
+ '.ReadOnly = TRUE
END WITH
objMntPoints.Add(cbMntPoint)
cbfs = NEW ComboBox(gvPartListing.Parent) AS "FsSel"
WITH cbfs
- .Move(gvPartListing[irow, 3].left, gvPartListing[irow,
3].top)
- .Width = gvPartListing[irow, 3].Width
- .Height = gvPartListing[irow, 3].Height
- '.list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ .Move(gvPartListing[irow, 4].left, gvPartListing[irow,
3].top)
+ .Width = gvPartListing[irow, 4].Width
+ .Height = gvPartListing[irow, 4].Height
+ .ReadOnly = TRUE
.list = [("Do not
format"), "ext2", "ext3", "jfs", "xfs", "reiserfs"]
.Text = ("Do not format")
.tag = gvPartListing[irow, 0].Text
@@ -148,12 +151,12 @@
PUBLIC FUNCTION CheckEntry(sEntry AS String, iCurrRow AS Integer) AS
Integer
- DIM irow AS Integer = 2
- FOR irow = 2 TO ME.gvPartListing.Rows.count - 2
+ DIM irow AS Integer '= 2
+ FOR irow = 0 TO ME.gvPartListing.Rows.count - 1
IF irow <> iCurrRow THEN
- PRINT irow & "-" & iCurrRow
- IF gvPartListing[irow, 2].Text = sEntry THEN
+ 'PRINT irow & "-" & iCurrRow
+ IF gvPartListing[irow, 2].Text AND IF gvPartListing[irow, 2].Text
= sEntry THEN
Message.Error(("You have already selected") & Space(1) &
gvPartListing[irow, 0].Text & Space(1) & ("as your") & Space(1) &
Trim(sEntry) & Space(1) & ("partition.") & gb.NewLine &
("Please select only one partition for this purpose"))
@@ -186,12 +189,9 @@
IF cb.tag = LAST.tag THEN cb.Enabled = TRUE
NEXT
' save the text in the background to the gridview
- 'GOTO CHECK_ENTRY
ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
-
-
- 'Message(gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text)
+
ELSE
FOR EACH cb IN objFS
IF cb.tag = LAST.tag THEN cb.Enabled = FALSE
@@ -199,25 +199,7 @@
NEXT
END IF
-
- ' CHECK_ENTRY:
- ' irow = 2 ' we start at row 2, because 0 and 1 are meaningless for
this
- ' REPEAT
- ' 'Message(irow & "," & gvPartListing.RowAt(LAST.y))
- ' IF irow <> gvPartListing.RowAt(y) THEN
- ' 'Message(irow, gvPartListing.RowAt(y))
- ' IF Trim(gvPartListing[irow, 2].Text) = Trim(LAST.text) THEN
- ' 'problem here... there is already an entry for this
- ' Message.Error("Duplicate entry found")
- ' RETURN
- ' END IF
- ' 'ELSE
- ' END IF
- '
- '
- ' INC irow
- ' UNTIL
- ' irow = gvPartListing.Rows.Count - 2 ' the 2 rows we skipped to
start with
+
Modified: branches/speedy/Step6.form
==============================================================================
--- branches/speedy/Step6.form (original)
+++ branches/speedy/Step6.form Tue Feb 3 14:31:16 2009
@@ -31,6 +31,7 @@
MoveScaled(12,27,7,2)
Visible = False
Text = ("")
+ ReadOnly = True
}
{ cbYN ComboBox
MoveScaled(22,28,7,1)
@@ -43,6 +44,7 @@
MoveScaled(3,27,8,1)
Visible = False
Text = ("")
+ ReadOnly = True
}
}
}
|
|
From: <cod...@go...> - 2009-02-03 20:43:30
|
Author: M0...@gm...
Date: Tue Feb 3 12:18:50 2009
New Revision: 480
Added:
branches/speedy/.lang/#project.pot
branches/speedy/.lang/Step3.pot
branches/speedy/.lang/Step6.pot
branches/speedy/Step3.class
branches/speedy/Step3.form
branches/speedy/Step6.class
branches/speedy/Step6.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.project
branches/speedy/Step0.class
branches/speedy/Step2.class
branches/speedy/images/throbber.gif
Log:
Begin working on partition selector window
Added: branches/speedy/.lang/#project.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/#project.pot Tue Feb 3 12:18:50 2009
@@ -0,0 +1,20 @@
+# /home/vluser/devel/speedy/.project
+# 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"
+
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr ""
+
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Tue Feb 3 12:18:50 2009
@@ -10,6 +10,10 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr ""
+
#: FMain.class:233 FMain0.class:225
msgid "Process Overview"
msgstr ""
@@ -126,92 +130,188 @@
msgid "Verify Installation Files"
msgstr ""
-#: Step2.class:68
+#: Step2.class:46
+msgid ""
+"This installation media has already been checked. Would you like to check
it "
+"again?"
+msgstr ""
+
+#: Step2.class:78
msgid "Verifying data on compressed package"
msgstr ""
-#: Step2.class:71
+#: Step2.class:81
msgid "Testing file"
msgstr ""
-#: Step2.class:71
+#: Step2.class:81
msgid "of"
msgstr ""
-#: Step2.class:87
+#: Step2.class:97
msgid "FAILED"
msgstr ""
-#: Step2.class:89
+#: Step2.class:99
msgid "The following"
msgstr ""
-#: Step2.class:89
+#: Step2.class:99
msgid "required"
msgstr ""
-#: Step2.class:89
+#: Step2.class:99
msgid "has failed the integrity test. It is not safe to continue"
msgstr ""
-#: Step2.class:90
+#: Step2.class:100
msgid "Integrity test"
msgstr ""
-#: Step2.class:96
+#: Step2.class:106
msgid "PASSED"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid ""
"has failed the data integrity test. All required packages have passed
this "
"test"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid ""
"Possible causes for this are a corrupted download or a badly burnt cd.
You "
"can try the following options"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid "Download a new installation image from www.vectorlinux.com"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid "Burn the image at a lower speed rate"
msgstr ""
-#: Step2.class:146
+#: Step2.class:156
msgid "Data integrity test complete... all tests passed"
msgstr ""
-#: Step2.class:153
+#: Step2.class:163
msgid "All test passed. It is safe to continue with the installation
process."
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid ""
"Verifying installation files can prevent you from performing an
unsuccessful "
"install"
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "Click"
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:322
+#: Step2.class:333
msgid "TextLabel2"
msgstr ""
-#: Step2.class:336
+#: Step2.class:347
msgid "Stop"
+msgstr ""
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:129
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3.class:147
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:157
+msgid ""
+"Automatically resize your partitions to make size for your VectorLinux "
+"installation"
+msgstr ""
+
+#: Step3.class:164
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:174
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:181
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:191
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
+#: Step6.class:46
+msgid "Partition"
+msgstr ""
+
+#: Step6.class:47
+msgid "Size"
+msgstr ""
+
+#: Step6.class:48
+msgid "Mount Point"
+msgstr ""
+
+#: Step6.class:49
+msgid "File System"
+msgstr ""
+
+#: Step6.class:104
+msgid "Not Used"
+msgstr ""
+
+#: Step6.class:115
+msgid "Do not format"
+msgstr ""
+
+#: Step6.class:158
+msgid "You have already selected"
+msgstr ""
+
+#: Step6.class:158
+msgid "as your"
+msgstr ""
+
+#: Step6.class:158
+msgid "partition."
+msgstr ""
+
+#: Step6.class:158
+msgid "Please select only one partition for this purpose"
+msgstr ""
+
+#: Step6.class:232
+msgid "Select which partitions to use for installation"
+msgstr ""
+
+#: Step6.class:367
+msgid "Yes"
+msgstr ""
+
+#: Step6.class:367
+msgid "No"
msgstr ""
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Tue Feb 3 12:18:50 2009
@@ -18,87 +18,91 @@
msgid "Verify Installation Files"
msgstr ""
-#: Step2.class:68
+#: Step2.class:46
+msgid "This installation media has already been checked. Would you like to
check it again?"
+msgstr ""
+
+#: Step2.class:78
msgid "Verifying data on compressed package"
msgstr ""
-#: Step2.class:71
+#: Step2.class:81
msgid "Testing file"
msgstr ""
-#: Step2.class:71
+#: Step2.class:81
msgid "of"
msgstr ""
-#: Step2.class:87
+#: Step2.class:97
msgid "FAILED"
msgstr ""
-#: Step2.class:89
+#: Step2.class:99
msgid "The following"
msgstr ""
-#: Step2.class:89
+#: Step2.class:99
msgid "required"
msgstr ""
-#: Step2.class:89
+#: Step2.class:99
msgid "has failed the integrity test. It is not safe to continue"
msgstr ""
-#: Step2.class:90
+#: Step2.class:100
msgid "Integrity test"
msgstr ""
-#: Step2.class:96
+#: Step2.class:106
msgid "PASSED"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid "has failed the data integrity test. All required packages have
passed this test"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid "Possible causes for this are a corrupted download or a badly burnt
cd. You can try the following options"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid "Download a new installation image from www.vectorlinux.com"
msgstr ""
-#: Step2.class:126
+#: Step2.class:136
msgid "Burn the image at a lower speed rate"
msgstr ""
-#: Step2.class:146
+#: Step2.class:156
msgid "Data integrity test complete... all tests passed"
msgstr ""
-#: Step2.class:153
+#: Step2.class:163
msgid "All test passed. It is safe to continue with the installation
process."
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "Keep in mind however, that this process can take a while to
complete."
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "Click"
msgstr ""
-#: Step2.class:170
+#: Step2.class:180
msgid "to abort this process at any time"
msgstr ""
-#: Step2.class:322
+#: Step2.class:333
msgid "TextLabel2"
msgstr ""
-#: Step2.class:336
+#: Step2.class:347
msgid "Stop"
msgstr ""
Added: branches/speedy/.lang/Step3.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step3.pot Tue Feb 3 12:18:50 2009
@@ -0,0 +1,52 @@
+# /home/vluser/devel/speedy/Step3.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"
+
+#: Step3.class:28
+msgid "Disc Partitioning Options"
+msgstr ""
+
+#: Step3.class:31
+msgid "Select the partitioning method you would like to use"
+msgstr ""
+
+#: Step3.class:129
+msgid "TextLabel1"
+msgstr ""
+
+#: Step3.class:147
+msgid "Automatic"
+msgstr ""
+
+#: Step3.class:157
+msgid "Automatically resize your partitions to make size for your
VectorLinux installation"
+msgstr ""
+
+#: Step3.class:164
+msgid "Manually resize my partitions "
+msgstr ""
+
+#: Step3.class:174
+msgid "Use the partitioning tool to prepare your system partitions."
+msgstr ""
+
+#: Step3.class:181
+msgid "My hard drive is already partitioned"
+msgstr ""
+
+#: Step3.class:191
+msgid "Install VectorLinux to existing partitions on my hard drive"
+msgstr ""
+
Added: branches/speedy/.lang/Step6.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step6.pot Tue Feb 3 12:18:50 2009
@@ -0,0 +1,68 @@
+# /home/vluser/devel/speedy/Step6.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"
+
+#: Step6.class:46
+msgid "Partition"
+msgstr ""
+
+#: Step6.class:47
+msgid "Size"
+msgstr ""
+
+#: Step6.class:48
+msgid "Mount Point"
+msgstr ""
+
+#: Step6.class:49
+msgid "File System"
+msgstr ""
+
+#: Step6.class:104
+msgid "Not Used"
+msgstr ""
+
+#: Step6.class:115
+msgid "Do not format"
+msgstr ""
+
+#: Step6.class:158
+msgid "You have already selected"
+msgstr ""
+
+#: Step6.class:158
+msgid "as your"
+msgstr ""
+
+#: Step6.class:158
+msgid "partition."
+msgstr ""
+
+#: Step6.class:158
+msgid "Please select only one partition for this purpose"
+msgstr ""
+
+#: Step6.class:232
+msgid "Select which partitions to use for installation"
+msgstr ""
+
+#: Step6.class:367
+msgid "Yes"
+msgstr ""
+
+#: Step6.class:367
+msgid "No"
+msgstr ""
+
Modified: branches/speedy/.project
==============================================================================
--- branches/speedy/.project (original)
+++ branches/speedy/.project Tue Feb 3 12:18:50 2009
@@ -1,7 +1,7 @@
# Gambas Project File 2.0
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
-Startup=MdlStartUp
+Startup=Step6
Version=0.0.1
Library=gb.gtk
Library=gb.form
Modified: branches/speedy/Step0.class
==============================================================================
--- branches/speedy/Step0.class (original)
+++ branches/speedy/Step0.class Tue Feb 3 12:18:50 2009
@@ -115,7 +115,7 @@
PUBLIC SUB LIST_LANG_CHOICES()
DIM sLang, sKey, sFile AS String
- FOR EACH sFile IN Dir(Application.Dir &/ ".lang", "*.mo")
+ FOR EACH sFile IN Dir(".lang", "*.mo")
SELECT CASE File.BaseName(Application.dir &/ ".lang" &/ sfile)
CASE "es"
sKey = "es_ES.utf8"
Modified: branches/speedy/Step2.class
==============================================================================
--- branches/speedy/Step2.class (original)
+++ branches/speedy/Step2.class Tue Feb 3 12:18:50 2009
@@ -202,7 +202,8 @@
PUBLIC SUB OnExit()
-
+ IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
+ IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
END
Added: branches/speedy/Step3.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step3.class Tue Feb 3 12:18:50 2009
@@ -0,0 +1,70 @@
+' 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 rbGroup_Click()
+
+ ' FMain.btNext.Enabled = TRUE
+ ' FMain0.btNext.Enabled = TRUE
+
+END
+
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Disc Partitioning Options") & "</h2>"
+ ME.tlbanner.Alignment = Align.Center
+ ME.tlbanner.Alignment = Align.Normal
+ ME.tlPartHelp.Text = ("Select the partitioning method you would like to
use")
+ FMain.btNext.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+
+
+END
+
+PUBLIC FUNCTION GetNext() AS String
+
+
+ IF ME.rbAutoPart.Value = TRUE THEN
+ 'no module for auto partition written yet
+ Message("Not ready yet")
+ RETURN
+ END IF
+ IF ME.rbCustomPart.Value = TRUE THEN
+ 'embed gparted
+ Message("Gparted module not present yet")
+ RETURN
+ END IF
+ IF ME.rbPrePartitioned.Value = TRUE THEN
+ ' Use existing partitions
+ RETURN "Step6"
+ END IF
+
+END
+PUBLIC SUB StartUp()
+
+ FMain.btNext.Enabled = TRUE
+ FMain0.btNext.Enabled = TRUE
+
+END
+PUBLIC SUB OnExit()
+
+
+
+END
+
+
+
Added: branches/speedy/Step3.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step3.form Tue Feb 3 12:18:50 2009
@@ -0,0 +1,84 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,64,64)
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { HBox2 HBox
+ MoveScaled(49,5,9,1)
+ Expand = True
+ }
+ { HBox1 HBox
+ MoveScaled(0,7,63,4)
+ Expand = True
+ { tlPartHelp TextLabel
+ MoveScaled(0,0,62,3)
+ Expand = True
+ Text = ("TextLabel1")
+ Alignment = Align.TopLeft
+ }
+ }
+ { HPanel2 HPanel
+ MoveScaled(1,12,61,34)
+ Expand = True
+ { HBox3 HBox
+ MoveScaled(1,1,10,1)
+ Expand = True
+ }
+ { rbAutoPart RadioButton rbGroup
+ Name = "rbAutoPart"
+ MoveScaled(0,3,38,3)
+ Expand = True
+ Text = ("Automatic")
+ }
+ { Panel1 Panel
+ MoveScaled(0,6,3,3)
+ }
+ { tlautopart TextLabel
+ MoveScaled(4,6,55,4)
+ Expand = True
+ Text = ("Automatically resize your partitions to make size for your
VectorLinux installation")
+ }
+ { rbCustomPart RadioButton rbGroup
+ Name = "rbCustomPart"
+ MoveScaled(0,9,28,3)
+ Expand = True
+ Text = ("Manually resize my partitions ")
+ }
+ { Panel2 Panel
+ MoveScaled(0,12,3,3)
+ }
+ { tlGparted TextLabel
+ MoveScaled(4,12,46,3)
+ Expand = True
+ Text = ("Use the partitioning tool to prepare your system
partitions.")
+ }
+ { rbPrePartitioned RadioButton rbGroup
+ Name = "rbPrePartitioned"
+ MoveScaled(0,15,41,3)
+ Expand = True
+ Text = ("My hard drive is already partitioned")
+ }
+ { Panel3 Panel
+ MoveScaled(0,18,3,3)
+ }
+ { TextLabel1 TextLabel
+ MoveScaled(4,18,54,3)
+ Expand = True
+ Text = ("Install VectorLinux to existing partitions on my hard
drive")
+ }
+ }
+}
Added: branches/speedy/Step6.class
==============================================================================
--- (empty file)
+++ branches/speedy/Step6.class Tue Feb 3 12:18:50 2009
@@ -0,0 +1,306 @@
+' 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 cb AS ComboBox
+PRIVATE x AS Integer
+PRIVATE y AS Integer
+PUBLIC objMntPoints AS Object[]
+PUBLIC objFS AS Object[]
+
+PUBLIC FUNCTION GetNext() AS String
+
+ RETURN "Step7"
+
+END
+
+PUBLIC SUB OnExit()
+
+
+
+END
+
+PUBLIC SUB StartUp()
+
+
+
+END
+
+PUBLIC SUB PREPARE_PARTITION_LISTING()
+ WITH ME.gvPartListing
+ .Columns.Count = 6
+ .Rows.count = 1
+ END WITH
+ gvPartListing[0, 0].text = ("Partition")
+ gvPartListing[0, 1].text = ("Size")
+ gvPartListing[0, 2].text = ("Mount Point")
+ gvPartListing[0, 3].text = ("File System")
+ 'gvPartListing[0, 4].text = ("File System")
+ gvPartListing[0, 0].BackColor = Color.LightBackground
+ gvPartListing[0, 0].Font.Bold = TRUE
+ gvPartListing[0, 1].BackColor = Color.LightBackground
+ gvPartListing[0, 1].Font.Bold = TRUE
+ gvPartListing[0, 2].BackColor = Color.LightBackground
+ gvPartListing[0, 2].Font.Bold = TRUE
+ gvPartListing.Columns[2].Width = 120
+ gvPartListing[0, 3].BackColor = Color.LightBackground
+ gvPartListing[0, 3].Font.Bold = TRUE
+ gvPartListing.Columns[3].Width = 120
+ gvPartListing[0, 4].BackColor = Color.LightBackground
+ gvPartListing[0, 4].Font.Bold = TRUE
+ gvPartListing[0, 5].BackColor = Color.LightBackground
+ gvPartListing[0, 5].Font.Bold = TRUE
+
+ END
+
+
+PUBLIC SUB LIST_PARTITIONS()
+
+ DIM sDump AS String
+ DIM sDisks, sPartitions, sPartLine AS String[]
+ DIM sDisk, sPartNo, sSize, sFs AS String
+ DIM i, ii, irow AS Integer
+
+ 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
+ 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
+ spartitions = Split(Trim(sdump), "\n")
+ FOR ii = 0 TO spartitions.count - 1
+ sPartLine = Split(Trim(spartitions[ii]), " ")
+ sPartNo = sPartLine[0]
+ sSize = sPartLine[3]
+ sFs = sPartLine[5]
+ 'NEXT
+ ' add partition to the gridview
+ INC ME.gvPartListing.Rows.Count
+ ME.gvPartListing[irow, 0].text = Trim(sDisks[i]) &
Trim(sPartNo)
+ ME.gvPartListing[irow, 1].Text = Trim(sSize)
+ IF sFs LIKE "linux-swap" THEN
+ gvPartListing[irow, 3].Text = Trim(sfs)
+ ELSE
+ cbMntPoint = NEW ComboBox(gvPartListing.Parent)
AS "MountPointSel"
+ WITH cbMntPoint
+ .Move(gvPartListing[irow, 2].left, gvPartListing[irow,
2].top)
+ .Width = gvPartListing[irow, 2].Width
+ .Height = gvPartListing[irow, 2].Height
+ .list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ .Text = ("Not Used")
+ .tag = gvPartListing[irow, 0].Text
+ END WITH
+ objMntPoints.Add(cbMntPoint)
+ cbfs = NEW ComboBox(gvPartListing.Parent) AS "FsSel"
+ WITH cbfs
+ .Move(gvPartListing[irow, 3].left, gvPartListing[irow,
3].top)
+ .Width = gvPartListing[irow, 3].Width
+ .Height = gvPartListing[irow, 3].Height
+ '.list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot", "/mnt" &/
Right(gvPartListing[irow, 0].text, Len(gvPartListing[irow, 0].text) -
RInStr(gvPartListing[irow, 0].text, "/"))]
+ .list = [("Do not
format"), "ext2", "ext3", "jfs", "xfs", "reiserfs"]
+ .Text = ("Do not format")
+ .tag = gvPartListing[irow, 0].Text
+ .Enabled = FALSE
+ END WITH
+ objFS.Add(cbFS)
+ END IF
+ 'ME.gvPartListing[irow, 2].Text = Trim(sFs)
+ INC irow
+ NEXT
+ NEXT
+
+
+
+
+END
+
+PUBLIC SUB FsSel_Click()
+
+ 'Message(LAST.tag)
+ x = LAST.x
+ y = LAST.y
+
+ IF LAST.text <> ("Do not format") THEN
+ ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
+ ELSE
+ ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = ""
+ END IF
+
+ 'IF ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text THEN
Message(ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text)
+
+
+END
+
+PUBLIC FUNCTION CheckEntry(sEntry AS String, iCurrRow AS Integer) AS
Integer
+
+ DIM irow AS Integer = 2
+ FOR irow = 2 TO ME.gvPartListing.Rows.count - 2
+
+ IF irow <> iCurrRow THEN
+ PRINT irow & "-" & iCurrRow
+ IF gvPartListing[irow, 2].Text = sEntry THEN
+ Message.Error(("You have already selected") & Space(1) &
gvPartListing[irow, 0].Text & Space(1) & ("as your") & Space(1) &
Trim(sEntry) & Space(1) & ("partition.") & gb.NewLine &
+ ("Please select only one partition for this purpose"))
+
+ RETURN 1
+ END IF
+ END IF
+ INC irow
+
+ NEXT
+ RETURN 0
+END
+
+
+PUBLIC SUB MountPointSel_Click()
+ DIM cb AS ComboBox
+ DIM irow AS Integer
+ 'Message(LAST.tag)
+
+ x = LAST.x
+ y = LAST.y
+
+ IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN
+ LAST.text = ("Not Used")
+ STOP EVENT
+ RETURN
+ END IF
+
+ IF LAST.text <> ("Not Used") THEN
+ FOR EACH cb IN objFS
+ IF cb.tag = LAST.tag THEN cb.Enabled = TRUE
+ NEXT
+ ' save the text in the background to the gridview
+ 'GOTO CHECK_ENTRY
+
+ ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = LAST.text
+
+
+ 'Message(gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text)
+ ELSE
+ FOR EACH cb IN objFS
+ IF cb.tag = LAST.tag THEN cb.Enabled = FALSE
+ ME.gvPartListing[gvPartListing.RowAt(y),
gvPartListing.ColumnAt(x)].Text = ""
+ NEXT
+ END IF
+
+
+ ' CHECK_ENTRY:
+ ' irow = 2 ' we start at row 2, because 0 and 1 are meaningless for
this
+ ' REPEAT
+ ' 'Message(irow & "," & gvPartListing.RowAt(LAST.y))
+ ' IF irow <> gvPartListing.RowAt(y) THEN
+ ' 'Message(irow, gvPartListing.RowAt(y))
+ ' IF Trim(gvPartListing[irow, 2].Text) = Trim(LAST.text) THEN
+ ' 'problem here... there is already an entry for this
+ ' Message.Error("Duplicate entry found")
+ ' RETURN
+ ' END IF
+ ' 'ELSE
+ ' END IF
+ '
+ '
+ ' INC irow
+ ' UNTIL
+ ' irow = gvPartListing.Rows.Count - 2 ' the 2 rows we skipped to
start with
+
+
+
+
+END
+
+
+
+
+PUBLIC SUB Form_Open()
+
+ ME.tlbanner.Text = "<h2>" & ("Select which partitions to use for
installation") & "</h2>"
+ ME.PREPARE_PARTITION_LISTING()
+ ME.LIST_PARTITIONS()
+ 'ME.cbMntPoint.list = [("Not
Used"), "/", "/home", "/usr", "/opt", "/tmp", "/var", "/boot"]
+ 'ME.cbMntPoint.ReadOnly = TRUE
+END
+
+PUBLIC SUB Form_Resize()
+
+ 'ME.gvPartListing.Height = gvPartListing.Parent.Height
+ ME.Panel1.Height = ME.ClientH - (ME.HPanel1.Top + ME.HPanel1.Height + 8)
+ ME.gvPartListing.Resize(gvPartListing.Parent.Width,
gvPartListing.Parent.Height)
+
+END
+
+
+
+
+PUBLIC SUB gvPartListing_Click()
+
+'DIM x, y AS Integer
+
+ IF LAST.row < 2 THEN RETURN
+x = LAST.column
+y = LAST.row
+
+IF X = 2 THEN
+ ME.cbMntPoint.Move(gvPartListing[y, x].left, gvPartListing[y, x].top)
+ ME.cbMntPoint.Width = gvPartListing[y, x].Width
+ ME.cbMntPoint.Height = gvPartListing[y, x].Height
+
+ ME.cbMntPoint.Visible = TRUE
+END IF
+
+
+
+'
+ END
+
+
+PUBLIC SUB cbMntPoint_Change()
+
+ 'DIM x, y AS Integer
+
+ 'x = gvPartListing.ColumnAt(LAST.x)
+ 'y = gvPartListing.RowAt(LAST.y)
+
+ IF y < 2 THEN RETURN
+ IF LAST.text = ("Not Used") THEN LAST.text = ""
+ gvPartListing[y, x].Text = Trim(LAST.text)
+ LAST.visible = FALSE
+
+
+END
+
+
+PUBLIC SUB cbYN_Click()
+
+gvPartListing[y, x].Text = cbYN.Text
+
+WAIT 0.25
+cbYN.Visible = FALSE
+
+END
+
+
+
+
+PUBLIC SUB cbYN_Leave()
+
+ ' 'Message("leave")
+ ' gvPartListing[y, x].Text = cbYN.Text
+ ' cbYN.Visible = FALSE
+
+END
Added: branches/speedy/Step6.form
==============================================================================
--- (empty file)
+++ branches/speedy/Step6.form Tue Feb 3 12:18:50 2009
@@ -0,0 +1,48 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,72,43)
+ Expand = True
+ Text = ("")
+ Arrangement = Arrange.Row
+ { HPanel1 HPanel
+ MoveScaled(0,0,60,5)
+ Expand = True
+ { tlbanner TextLabel
+ MoveScaled(12,0,19,3)
+ Expand = True
+ Text = ("")
+ }
+ { Separator1 Separator
+ MoveScaled(13,4,25,1)
+ Expand = True
+ }
+ }
+ { Panel1 Panel
+ MoveScaled(1,6,64,33)
+ Expand = True
+ Border = Border.Plain
+ { gvPartListing GridView
+ MoveScaled(0,0,61,25)
+ Expand = True
+ Grid = False
+ }
+ { cbMntPoint ComboBox
+ MoveScaled(12,27,7,2)
+ Visible = False
+ Text = ("")
+ }
+ { cbYN ComboBox
+ MoveScaled(22,28,7,1)
+ Visible = False
+ Text = ("")
+ ReadOnly = True
+ List = [("Yes"), ("No")]
+ }
+ { cbFs ComboBox
+ MoveScaled(3,27,8,1)
+ Visible = False
+ Text = ("")
+ }
+ }
+}
Modified: branches/speedy/images/throbber.gif
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2009-02-03 15:54:33
|
Author: M0...@gm...
Date: Tue Feb 3 07:52:46 2009
New Revision: 479
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/.project
branches/iVL/FrmSelISO.class
branches/iVL/installer.gambas
Log:
hid media check button, updated binary
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/.project
+# /home/vluser/devel/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsGlobal.class
+# /home/vluser/devel/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsPartSel.class
+# /home/vluser/devel/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsWinDrives.class
+# /home/vluser/devel/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmDiskPart.class
+# /home/vluser/devel/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartScheme.class
+# /home/vluser/devel/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartSel.class
+# /home/vluser/devel/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPkgSel.class
+# /home/vluser/devel/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmWinDrives.class
+# /home/vluser/devel/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlDiskPart.module
+# /home/vluser/devel/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlObjSizer.module
+# /home/vluser/devel/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPartSel.module
+# /home/vluser/devel/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPkgSel.module
+# /home/vluser/devel/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSetup.module
+# /home/vluser/devel/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSummarize.module
+# /home/vluser/devel/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Tue Feb 3 07:52:46 2009
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Tue Feb 3 07:52:46 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.39
+Version=0.1.21
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/home/uel/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Feb 3 07:52:46 2009
@@ -50,7 +50,7 @@
PUBLIC SUB Form_Open()
-
+ ME.btVerifyInstall.Visible = FALSE
ME.tlBanner.text = "<h3>" & tlBanner.text & "</h3>"
FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
@@ -96,12 +96,12 @@
.btnext.Enabled = TRUE
.btnext.ForeColor = Color.Black
END WITH
- FrmSelISO.btVerifyInstall.Enabled = TRUE
- FrmSelISO.btVerifyInstall.ForeColor = Color.Black
+ 'FrmSelISO.btVerifyInstall.Enabled = TRUE
+ 'FrmSelISO.btVerifyInstall.ForeColor = Color.Black
END IF
FMain.btnext.Enabled = TRUE
-
+FrmSelISO.btVerifyInstall.Visible = FALSE
END
PUBLIC SUB DESCRIBE_DISTRO(sLoc AS String)
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2009-02-03 15:46:31
|
Author: uelsk8s
Date: Tue Feb 3 07:45:07 2009
New Revision: 478
Added:
branches/iVL/images/ChBltB.gif (contents, props changed)
Modified:
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/FrmDone.class
branches/iVL/FrmSelISO.class
branches/iVL/FrmSelISO.form
Log:
Added new throbber
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Tue Feb 3 07:45:07 2009
@@ -26,39 +26,39 @@
msgid "to begin installating"
msgstr ""
-#: FrmSelISO.class:83
+#: FrmSelISO.class:84
msgid "Unable to locate any installable media."
msgstr ""
-#: FrmSelISO.class:91
+#: FrmSelISO.class:92
msgid "Select installation media from the list below"
msgstr ""
-#: FrmSelISO.class:122
+#: FrmSelISO.class:123
msgid "Unable to identify distro."
msgstr ""
-#: FrmSelISO.class:157
+#: FrmSelISO.class:158
msgid "Minimum Disk Space Requirements"
msgstr ""
-#: FrmSelISO.class:270
+#: FrmSelISO.class:271
msgid "No installable images found."
msgstr ""
-#: FrmSelISO.class:276
+#: FrmSelISO.class:277
msgid "Select which VectorLinux version you wish to install from the list
below"
msgstr ""
-#: FrmSelISO.class:281
+#: FrmSelISO.class:282
msgid "TextLabel1"
msgstr ""
-#: FrmSelISO.class:286
+#: FrmSelISO.class:287
msgid "Search Again"
msgstr ""
-#: FrmSelISO.class:297
+#: FrmSelISO.class:299
msgid "Verify Installation Files"
msgstr ""
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Tue Feb 3 07:45:07 2009
@@ -20,8 +20,8 @@
PUBLIC SUB Form_Open()
DIM sText AS String
-ME.MovieBox1.Path = "images/throbber.gif"
-ME.icon = picture["images/throbber.gif"]
+ME.MovieBox1.Path = "images/ChBltB.gif"
+ME.icon = picture["images/ChBltB.gif"]
FMain.FrmCurr = ME
Fmain.tvPlan["Conf4"].Picture = MdlCore.sDonePic
Fmain.tvPlan["Conf5"].Picture = MdlCore.sNowPic
Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class (original)
+++ branches/iVL/FrmSelISO.class Tue Feb 3 07:45:07 2009
@@ -77,6 +77,7 @@
IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No
Installable Media Found")) = -1 THEN
tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'"
& Space(1) & ("to begin installating") & Space(1)&
Left(FrmSelISO.lstInstallableImg.text,
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
+ FrmSelISO.btVerifyInstall.Visible = FALSE
FrmSelISO.btVerifyInstall.Enabled = TRUE
FrmSelISO.btVerifyInstall.ForeColor = Color.Black
ELSE IF lstInstallableImg.Find(("No Installable Media Found")) <> -1 THEN
Modified: branches/iVL/FrmSelISO.form
==============================================================================
--- branches/iVL/FrmSelISO.form (original)
+++ branches/iVL/FrmSelISO.form Tue Feb 3 07:45:07 2009
@@ -27,6 +27,7 @@
}
{ btVerifyInstall Button
MoveScaled(1,43,26,3)
+ Visible = False
Enabled = False
Text = ("Verify Installation Files")
Picture = Picture["icon:/small/apply"]
Added: branches/iVL/images/ChBltB.gif
==============================================================================
Binary file. No diff available.
|
|
From: <cod...@go...> - 2009-02-01 08:33:43
|
Author: uelsk8s
Date: Sun Feb 1 00:22:32 2009
New Revision: 477
Modified:
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.project
branches/iVL/FrmDone.class
branches/iVL/FrmDone.form
branches/iVL/FrmPkgSel.class
branches/iVL/FrmPkgSel.form
branches/iVL/installer.gambas
Log:
added throbber to final config form updated binary
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Sun Feb 1 00:22:32 2009
@@ -30,23 +30,23 @@
msgid "Size"
msgstr ""
-#: FrmPkgSel.class:81
+#: FrmPkgSel.class:83
msgid "Installs all optional components in your VectorLinux media to your
system"
msgstr ""
-#: FrmPkgSel.class:91
+#: FrmPkgSel.class:93
msgid "Choose your optional components to install."
msgstr ""
-#: FrmPkgSel.class:203
+#: FrmPkgSel.class:201
msgid "TextLabel1"
msgstr ""
-#: FrmPkgSel.class:213
+#: FrmPkgSel.class:211
msgid "Full Install"
msgstr ""
-#: FrmPkgSel.class:218
+#: FrmPkgSel.class:216
msgid "Custom Install"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Sun Feb 1 00:22:32 2009
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.10.2
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.35
+Version=0.1.39
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Sun Feb 1 00:22:32 2009
@@ -20,7 +20,8 @@
PUBLIC SUB Form_Open()
DIM sText AS String
-
+ME.MovieBox1.Path = "images/throbber.gif"
+ME.icon = picture["images/throbber.gif"]
FMain.FrmCurr = ME
Fmain.tvPlan["Conf4"].Picture = MdlCore.sDonePic
Fmain.tvPlan["Conf5"].Picture = MdlCore.sNowPic
@@ -50,8 +51,11 @@
sText = "<br><br><br>" & ClsGlobal.DISTRO & Space(1) & ("is
performing final system configuration. Please wait a moment.")
FMain.btnext.Enabled = FALSE
FMain.btQuit.Enabled = FALSE
+ ME.MovieBox1.Playing = TRUE
ELSE
'Message.Info("Found /tmp/status")
+ ME.MovieBox1.Playing = FALSE
+ ME.MovieBox1.Visible = FALSE
FMain.btnext.Text = ("Restart")
FMain.btnext.Width =
MdlObjSizer.get_object_width(FMain.btnext.Text) + 36
ME.tlBanner.Text = "<b>" & ("Installation is complete") & "</b>"
Modified: branches/iVL/FrmDone.form
==============================================================================
--- branches/iVL/FrmDone.form (original)
+++ branches/iVL/FrmDone.form Sun Feb 1 00:22:32 2009
@@ -22,6 +22,9 @@
Text = ("")
}
}
+ { MovieBox1 MovieBox
+ MoveScaled(4,18,17,19)
+ }
{ tmBgMon #Timer
#X = 203
#Y = 231
Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class (original)
+++ branches/iVL/FrmPkgSel.class Sun Feb 1 00:22:32 2009
@@ -17,7 +17,7 @@
PUBLIC pYes AS picture = Picture.load("images/16px-check.png")
PUBLIC pNo AS Picture = picture.load("images/16px-Nocheck.png")
-
+PRIVATE bWarninigShown AS Boolean = FALSE
PUBLIC SUB Form_Open()
@@ -58,6 +58,8 @@
MdlCore.warn_status_off()
+'PRINT Message("Welcom to the Software selection. \n This consists of 2
parts: \n 1)Bulk packages selection. \n If you do not select all bulks
you may have some dependancy problems. \n They can be resolved with
gslapt or slapt-get. \n You will need the X11 bulk for any GUI program.
\n The kernel-src Bulk is needed for the ATI or Nvidia drivers. \n
2)Optional package selection. \n choose only the apropriate video drivers
for your system.")
+
END
PUBLIC SUB Form_Resize()
@@ -131,12 +133,6 @@
'Message.Info(sBulk)
END IF
NEXT
-
-
-
-
-
-
END
@@ -165,7 +161,10 @@
END
PUBLIC SUB scrlInstallOpts_Click()
-
+ IF bWarninigShown = FALSE THEN
+ PRINT Message("If you dont install all Bulks you may have dependancy
problems. \n \n The X11 bulk is needed for any GUI program. \n The
kernel-src Bulk is needed to compile kernel drivers.")
+ bWarninigShown = TRUE
+ ENDIF
IF LAST.column = 0 THEN
IF scrlInstallOpts[LAST.row, LAST.column].Picture = pyes THEN
scrlInstallOpts[LAST.row, LAST.column].Picture = pNo
@@ -177,6 +176,5 @@
'Message(GridView1[LAST.row, 4].Text)
scrlInstallOpts.Refresh()
-
END
Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form (original)
+++ branches/iVL/FrmPkgSel.form Sun Feb 1 00:22:32 2009
@@ -25,7 +25,7 @@
Text = ("")
}
{ scrlInstallOpts GridView
- MoveScaled(1,27,56,23)
+ MoveScaled(1,25,56,28)
Expand = True
}
}
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
|
From: <cod...@go...> - 2009-01-30 20:00:33
|
Author: M0...@gm...
Date: Fri Jan 30 08:39:51 2009
New Revision: 476
Added:
branches/speedy/.lang/FMain0.pot
branches/speedy/.lang/MdlStartUp.pot
branches/speedy/.lang/Step0.pot
Log:
Add .pot files
Added: branches/speedy/.lang/FMain0.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/FMain0.pot Fri Jan 30 08:39:51 2009
@@ -0,0 +1,32 @@
+# /home/vluser/devel/speedy/FMain0.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"
+
+#: FMain0.class:225
+msgid "Process Overview"
+msgstr ""
+
+#: FMain0.class:262
+msgid "Back"
+msgstr ""
+
+#: FMain0.class:273
+msgid "Next"
+msgstr ""
+
+#: FMain0.class:284
+msgid "Quit"
+msgstr ""
+
Added: branches/speedy/.lang/MdlStartUp.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/MdlStartUp.pot Fri Jan 30 08:39:51 2009
@@ -0,0 +1,16 @@
+# /home/vluser/devel/speedy/MdlStartUp.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"
+
Added: branches/speedy/.lang/Step0.pot
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/Step0.pot Fri Jan 30 08:39:51 2009
@@ -0,0 +1,44 @@
+# /home/vluser/devel/speedy/Step0.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"
+
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr ""
+
+#: Step0.class:122
+msgid "Spanish"
+msgstr ""
+
+#: Step0.class:125
+msgid "English (US)"
+msgstr ""
+
+#: Step0.class:249
+msgid "Select your language"
+msgstr ""
+
+#: Step0.class:280
+msgid "Select your keyboard layout"
+msgstr ""
+
+#: Step0.class:299
+msgid "Select your keyboard model"
+msgstr ""
+
+#: Step0.class:321
+msgid "Use this box to test your keyboard settings"
+msgstr ""
+
|
14 messages has been excluded from this view by a project administrator.
