You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
(40) |
Apr
(76) |
May
(31) |
Jun
(39) |
Jul
(44) |
Aug
(87) |
Sep
(32) |
Oct
(23) |
Nov
(36) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(49) |
Sep
(14) |
Oct
|
Nov
|
Dec
(1) |
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(63) |
Aug
(95) |
Sep
(39) |
Oct
(61) |
Nov
(75) |
Dec
(118) |
2009 |
Jan
(25) |
Feb
(37) |
Mar
(20) |
Apr
(15) |
May
(14) |
Jun
(48) |
Jul
(82) |
Aug
(160) |
Sep
(94) |
Oct
(55) |
Nov
(59) |
Dec
(4) |
2010 |
Jan
(5) |
Feb
(17) |
Mar
(6) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
From: <cod...@go...> - 2009-03-20 18:36:09
|
Author: M0...@gm... Date: Fri Mar 20 10:37:26 2009 New Revision: 517 Added: branches/speedy/.lang/Conf0.pot Removed: branches/speedy/.lang/FMain0Old.pot Log: Cleaned up and updated svn tree Added: branches/speedy/.lang/Conf0.pot ============================================================================== --- (empty file) +++ branches/speedy/.lang/Conf0.pot Fri Mar 20 10:37:26 2009 @@ -0,0 +1,56 @@ +# /home/vluser/devel/speedy/Conf0.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" + +#: Conf0.class:58 +msgid "WARNING:" +msgstr "" + +#: Conf0.class:58 +msgid "Selecting this option will bypass your boot manager configuration." +msgstr "" + +#: Conf0.class:58 +msgid "You may not be able to start your VectorLinux installation. Do not choose this option" +msgstr "" + +#: Conf0.class:58 +msgid "unless you are fully aware of what you are doing." +msgstr "" + +#: Conf0.class:92 +msgid "System Bootloader Configuration" +msgstr "" + +#: Conf0.class:110 +msgid "Select bootloader to be used" +msgstr "" + +#: Conf0.class:119 +msgid "LILO" +msgstr "" + +#: Conf0.class:125 +msgid "Grub" +msgstr "" + +#: Conf0.class:130 +msgid "Select this option if you want to configure your system boot manager manually at a later time" +msgstr "" + +#: Conf0.class:132 +msgid "None (Experts Only)" +msgstr "" + |
From: <cod...@go...> - 2009-03-20 18:17:04
|
Author: M0...@gm... Date: Fri Mar 20 10:33:33 2009 New Revision: 516 Added: branches/speedy/Conf0.class branches/speedy/Conf0.form Removed: branches/speedy/FMain0Old.class branches/speedy/FMain0Old.form Modified: branches/speedy/.lang/.pot branches/speedy/.lang/FMain.pot branches/speedy/.lang/FMain0.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step8.pot branches/speedy/.project branches/speedy/FMain.form branches/speedy/FMain0.form branches/speedy/Step6.class branches/speedy/Step8.class Log: Fixed bug in installation summary (partition listing) Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Fri Mar 20 10:33:33 2009 @@ -14,23 +14,68 @@ msgid "VectorLinux Installer" msgstr "" -#: FMain.class:253 FMain0.class:253 FMain0Old.class:233 +#: Conf0.class:58 Step1.class:433 Step3a1.class:22 Step3a1a.class:186 +#: Step7a.class:143 +msgid "WARNING:" +msgstr "" + +#: Conf0.class:58 +msgid "Selecting this option will bypass your boot manager configuration." +msgstr "" + +#: Conf0.class:58 +msgid "" +"You may not be able to start your VectorLinux installation. Do not choose " +"this option" +msgstr "" + +#: Conf0.class:58 +msgid "unless you are fully aware of what you are doing." +msgstr "" + +#: Conf0.class:92 +msgid "System Bootloader Configuration" +msgstr "" + +#: Conf0.class:110 +msgid "Select bootloader to be used" +msgstr "" + +#: Conf0.class:119 +msgid "LILO" +msgstr "" + +#: Conf0.class:125 +msgid "Grub" +msgstr "" + +#: Conf0.class:130 +msgid "" +"Select this option if you want to configure your system boot manager " +"manually at a later time" +msgstr "" + +#: Conf0.class:132 +msgid "None (Experts Only)" +msgstr "" + +#: FMain.class:254 FMain0.class:254 msgid "Process Overview" msgstr "" -#: FMain.class:294 FMain0.class:294 +#: FMain.class:295 FMain0.class:295 msgid "Help" msgstr "" -#: FMain.class:307 FMain0.class:307 FMain0Old.class:271 +#: FMain.class:308 FMain0.class:308 msgid "Back" msgstr "" -#: FMain.class:318 FMain0.class:318 FMain0Old.class:282 +#: FMain.class:319 FMain0.class:319 msgid "Next" msgstr "" -#: FMain.class:329 FMain0.class:329 FMain0Old.class:293 +#: FMain.class:330 FMain0.class:330 msgid "Quit" msgstr "" @@ -102,7 +147,7 @@ msgid "Disk Partitioning" msgstr "" -#: MdlStartUp.module:47 Step8.class:135 +#: MdlStartUp.module:47 Step8.class:139 msgid "Software Selection" msgstr "" @@ -110,7 +155,7 @@ msgid "Installation" msgstr "" -#: MdlStartUp.module:49 Step8.class:218 +#: MdlStartUp.module:49 Step8.class:222 msgid "Installation Summary" msgstr "" @@ -264,10 +309,6 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:433 Step3a1.class:22 Step3a1a.class:186 Step7a.class:143 -msgid "WARNING:" -msgstr "" - #: Step1.class:433 msgid "This process can take a long time to complete." msgstr "" @@ -541,11 +582,11 @@ msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 +#: Step3a1a.class:186 Step6.class:503 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 +#: Step3a1a.class:186 Step6.class:503 Step7a.class:143 msgid "No" msgstr "" @@ -794,51 +835,51 @@ msgid "Restart Now" msgstr "" -#: Step6.class:66 +#: Step6.class:68 msgid "Partition" msgstr "" -#: Step6.class:67 +#: Step6.class:69 msgid "Size" msgstr "" -#: Step6.class:68 +#: Step6.class:70 msgid "Mount Point" msgstr "" -#: Step6.class:69 +#: Step6.class:71 msgid "File System" msgstr "" -#: Step6.class:142 +#: Step6.class:144 msgid "Swap" msgstr "" -#: Step6.class:142 +#: Step6.class:144 msgid "Not Used" msgstr "" -#: Step6.class:183 Step8.class:73 +#: Step6.class:185 Step8.class:74 msgid "Do not format" msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "You have already selected" msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "as your" msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "partition." msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:362 +#: Step6.class:398 msgid "Select which partitions to use for installation" msgstr "" @@ -854,7 +895,7 @@ msgid "Install everthing in the image (Fully Automated)" msgstr "" -#: Step7.class:126 Step8.class:125 +#: Step7.class:126 Step8.class:129 msgid "Customized" msgstr "" @@ -862,7 +903,7 @@ msgid "Select the components you wish to install (Advanced)" msgstr "" -#: Step7.class:144 Step8.class:127 +#: Step7.class:144 Step8.class:131 msgid "Minimal" msgstr "" @@ -926,19 +967,19 @@ "include in your installation." msgstr "" -#: Step8.class:44 +#: Step8.class:45 msgid "Distribution" msgstr "" -#: Step8.class:62 +#: Step8.class:63 msgid "Partitions to be used" msgstr "" -#: Step8.class:74 +#: Step8.class:75 msgid "Not Formatted" msgstr "" -#: Step8.class:74 +#: Step8.class:75 msgid "Mount to" msgstr "" @@ -950,35 +991,35 @@ msgid "and mount to" msgstr "" -#: Step8.class:88 +#: Step8.class:92 msgid "NO SWAP SPACE SELECTED" msgstr "" -#: Step8.class:93 +#: Step8.class:97 msgid "Swap Space" msgstr "" -#: Step8.class:106 +#: Step8.class:110 msgid "Pre-formatted to reiserfs, and used for /" msgstr "" -#: Step8.class:123 +#: Step8.class:127 msgid "Full" msgstr "" -#: Step8.class:130 +#: Step8.class:134 msgid "Installation Method" msgstr "" -#: Step8.class:136 +#: Step8.class:140 msgid "Major Components" msgstr "" -#: Step8.class:146 +#: Step8.class:150 msgid "Additional Software" msgstr "" -#: Step8.class:237 +#: Step8.class:241 msgid "" "Your VectorLinux installation is about to be performed as follows. If you " "need to make any changes, this is your last chance." Modified: branches/speedy/.lang/FMain.pot ============================================================================== --- branches/speedy/.lang/FMain.pot (original) +++ branches/speedy/.lang/FMain.pot Fri Mar 20 10:33:33 2009 @@ -14,23 +14,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:253 +#: FMain.class:254 msgid "Process Overview" msgstr "" -#: FMain.class:294 +#: FMain.class:295 msgid "Help" msgstr "" -#: FMain.class:307 +#: FMain.class:308 msgid "Back" msgstr "" -#: FMain.class:318 +#: FMain.class:319 msgid "Next" msgstr "" -#: FMain.class:329 +#: FMain.class:330 msgid "Quit" msgstr "" Modified: branches/speedy/.lang/FMain0.pot ============================================================================== --- branches/speedy/.lang/FMain0.pot (original) +++ branches/speedy/.lang/FMain0.pot Fri Mar 20 10:33:33 2009 @@ -14,23 +14,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain0.class:253 +#: FMain0.class:254 msgid "Process Overview" msgstr "" -#: FMain0.class:294 +#: FMain0.class:295 msgid "Help" msgstr "" -#: FMain0.class:307 +#: FMain0.class:308 msgid "Back" msgstr "" -#: FMain0.class:318 +#: FMain0.class:319 msgid "Next" msgstr "" -#: FMain0.class:329 +#: FMain0.class:330 msgid "Quit" msgstr "" Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Fri Mar 20 10:33:33 2009 @@ -14,59 +14,59 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step6.class:66 +#: Step6.class:68 msgid "Partition" msgstr "" -#: Step6.class:67 +#: Step6.class:69 msgid "Size" msgstr "" -#: Step6.class:68 +#: Step6.class:70 msgid "Mount Point" msgstr "" -#: Step6.class:69 +#: Step6.class:71 msgid "File System" msgstr "" -#: Step6.class:142 +#: Step6.class:144 msgid "Swap" msgstr "" -#: Step6.class:142 +#: Step6.class:144 msgid "Not Used" msgstr "" -#: Step6.class:183 +#: Step6.class:185 msgid "Do not format" msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "You have already selected" msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "as your" msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "partition." msgstr "" -#: Step6.class:228 +#: Step6.class:230 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:362 +#: Step6.class:398 msgid "Select which partitions to use for installation" msgstr "" -#: Step6.class:467 +#: Step6.class:503 msgid "Yes" msgstr "" -#: Step6.class:467 +#: Step6.class:503 msgid "No" msgstr "" Modified: branches/speedy/.lang/Step8.pot ============================================================================== --- branches/speedy/.lang/Step8.pot (original) +++ branches/speedy/.lang/Step8.pot Fri Mar 20 10:33:33 2009 @@ -14,23 +14,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step8.class:44 +#: Step8.class:45 msgid "Distribution" msgstr "" -#: Step8.class:62 +#: Step8.class:63 msgid "Partitions to be used" msgstr "" -#: Step8.class:73 +#: Step8.class:74 msgid "Do not format" msgstr "" -#: Step8.class:74 +#: Step8.class:75 msgid "Not Formatted" msgstr "" -#: Step8.class:74 +#: Step8.class:75 msgid "Mount to" msgstr "" @@ -42,51 +42,51 @@ msgid "and mount to" msgstr "" -#: Step8.class:88 +#: Step8.class:92 msgid "NO SWAP SPACE SELECTED" msgstr "" -#: Step8.class:93 +#: Step8.class:97 msgid "Swap Space" msgstr "" -#: Step8.class:106 +#: Step8.class:110 msgid "Pre-formatted to reiserfs, and used for /" msgstr "" -#: Step8.class:123 +#: Step8.class:127 msgid "Full" msgstr "" -#: Step8.class:125 +#: Step8.class:129 msgid "Customized" msgstr "" -#: Step8.class:127 +#: Step8.class:131 msgid "Minimal" msgstr "" -#: Step8.class:130 +#: Step8.class:134 msgid "Installation Method" msgstr "" -#: Step8.class:135 +#: Step8.class:139 msgid "Software Selection" msgstr "" -#: Step8.class:136 +#: Step8.class:140 msgid "Major Components" msgstr "" -#: Step8.class:146 +#: Step8.class:150 msgid "Additional Software" msgstr "" -#: Step8.class:218 +#: Step8.class:222 msgid "Installation Summary" msgstr "" -#: Step8.class:237 +#: Step8.class:241 msgid "Your VectorLinux installation is about to be performed as follows. If you need to make any changes, this is your last chance." msgstr "" Modified: branches/speedy/.project ============================================================================== --- branches/speedy/.project (original) +++ branches/speedy/.project Fri Mar 20 10:33:33 2009 @@ -7,7 +7,7 @@ Library=gb.form Library=gb.desktop Library=gb.gtk.ext -Arguments="es_ES.utf8" +Arguments="en_US" TabSize=2 Translate=1 Language=en_US Added: branches/speedy/Conf0.class ============================================================================== --- (empty file) +++ branches/speedy/Conf0.class Fri Mar 20 10:33:33 2009 @@ -0,0 +1,61 @@ +' Gambas class file + +' This file is part of vinstall-ng + +' vinstall-ng is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 2 of the License, or +' (at your option) any later version. + +' vinstall-ng is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. + +' You should have received a copy of the GNU General Public License +' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>. +'===================================================================================== + +PUBLIC FUNCTION GetNext() AS String + + RETURN "Conf1" + + +END +PUBLIC SUB StartUp() + + + +END +PUBLIC SUB OnExit() + + + +END + + + +PUBLIC SUB Form_Open() + + WITH ME + .tlbanner.Text = "<h2>" & tlbanner.text & "</h2>" + END WITH + +END + +PUBLIC SUB Form_Resize() + + ME.HBox2.Width = ME.Frame1.Width - (ME.HBox2.Left * 2) + +END + +PUBLIC SUB rbNone_Click() + + IF LAST.value = TRUE THEN + Message.Warning("<b>" & ("WARNING:") & "</b><br>" & + ("Selecting this option will bypass your boot manager configuration.") & "<br>" & + ("You may not be able to start your VectorLinux installation. Do not choose this option") & "<br>" & + ("unless you are fully aware of what you are doing.")) +END IF + +END Added: branches/speedy/Conf0.form ============================================================================== --- (empty file) +++ branches/speedy/Conf0.form Fri Mar 20 10:33:33 2009 @@ -0,0 +1,51 @@ +# Gambas Form File 2.0 + +{ Form Form + MoveScaled(0,0,72,44) + Text = ("") + Arrangement = Arrange.Row + Padding = 2 + { HPanel1 HPanel + MoveScaled(0,0,60,5) + Expand = True + { tlbanner TextLabel + MoveScaled(12,0,33,3) + Expand = True + Text = ("System Bootloader Configuration") + } + { Separator1 Separator + MoveScaled(13,4,25,1) + Expand = True + } + } + { HBox1 HBox + MoveScaled(0,5,34,1) + Visible = False + Expand = True + } + { Frame1 Frame + MoveScaled(0,6,55,7) + Expand = True + Text = ("Select bootloader to be used") + { HBox2 HBox + MoveScaled(1,3,52,3) + Expand = True + { rbLilo RadioButton + MoveScaled(1,0,11,3) + Expand = True + Text = ("LILO") + } + { rbGrub RadioButton + MoveScaled(14,0,10,3) + Expand = True + Text = ("Grub") + } + { rbNone RadioButton + MoveScaled(26,0,16,3) + ToolTip = ("Select this option if you want to configure your system boot manager manually at a later time") + Expand = True + Text = ("None (Experts Only)") + } + } + } +} Modified: branches/speedy/FMain.form ============================================================================== --- branches/speedy/FMain.form (original) +++ branches/speedy/FMain.form Fri Mar 20 10:33:33 2009 @@ -4,6 +4,7 @@ MoveScaled(0,0,146.25,85.625) Text = ("") Arrangement = Arrange.Vertical + Padding = 2 { HBox2 HBox MoveScaled(12,1,63,7.25) Background = Color.SelectedBackground Modified: branches/speedy/FMain0.form ============================================================================== --- branches/speedy/FMain0.form (original) +++ branches/speedy/FMain0.form Fri Mar 20 10:33:33 2009 @@ -4,6 +4,7 @@ MoveScaled(0,0,146.25,85.625) Text = ("") Arrangement = Arrange.Vertical + Padding = 2 { HBox2 HBox MoveScaled(12,1,63,7.25) Background = Color.SelectedBackground Modified: branches/speedy/Step6.class ============================================================================== --- branches/speedy/Step6.class (original) +++ branches/speedy/Step6.class Fri Mar 20 10:33:33 2009 @@ -29,23 +29,25 @@ PUBLIC SUB OnExit() - DIM n AS Integer - DIM sFmtAs, sList, sPartAddr AS String + ' DIM n AS Integer + ' DIM sFmtAs, sList, sPartAddr AS String ClsGlobal.sVitalPartList = "" - FOR n = 1 TO gvPartListing.Rows.Count - 1 - IF gvPartListing[n, 2].Text THEN - sPartAddr = gvPartListing[n, 2].Text - IF gvPartListing[n, 4].Text THEN - sFmtAs = gvPartListing[n, 4].Text - ELSE - sFmtAs = gvPartListing[n, 5].Text - END IF - END IF - sList = sList & sPartAddr & "," & sFmtAs & ";" - 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n, 2].Text & gb.NewLine & sFmtAs) - - NEXT - ME.read_partition_selection + ClsGlobal.sWapPartList = "" + read_partition_selection() + ' FOR n = 1 TO gvPartListing.Rows.Count - 1 + ' IF gvPartListing[n, 2].Text THEN + ' sPartAddr = gvPartListing[n, 2].Text + ' IF gvPartListing[n, 4].Text THEN + ' sFmtAs = gvPartListing[n, 4].Text + ' ELSE + ' sFmtAs = gvPartListing[n, 5].Text + ' END IF + ' END IF + ' sList = sList & sPartAddr & "," & sFmtAs & ";" + ' 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n, 2].Text & gb.NewLine & sFmtAs) + ' + ' NEXT + ' ME.read_partition_selection 'Message(ClsGlobal.sVitalPartList) ' sList = Trim(Left(sList, Len(sList) - 1)) 'ClsGlobal.sVitalPartList = Trim(sList) @@ -316,46 +318,80 @@ DIM cbox, cb AS ComboBox - DIM sFormat, sSize AS String - DIM i AS Integer - FOR EACH cbox IN objMntPoints - IF cbox.Text <> ("Not Used") THEN - i = 2 - REPEAT - IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN - sSize = Trim(gvPartListing[i, 1].Text) - END IF - INC i - UNTIL sSize OR i = gvPartListing.Rows.Count + DIM sPart, sFormat, sSize, sMntPoint AS String + DIM i, irow AS Integer + + + ' ================= get the list of vital partitions ===================== + FOR irow = 2 TO gvPartListing.Rows.count - 1 + IF Trim(gvPartListing[irow, 2].Text) THEN + IF Trim(gvPartListing[irow, 2].Text) <> ("Not Used") AND Trim(gvPartListing[irow, 2].Text) <> ("Swap") THEN + sPart = Trim(gvPartListing[irow, 0].Text) + sSize = Trim(gvPartListing[irow, 1].Text) + sMntPoint = Trim(gvPartListing[irow, 2].Text) + sFormat = Trim(gvPartListing[irow, 4].Text) - FOR EACH cb IN objFS - IF cbox.tag = cb.Tag THEN - sFormat = Trim(cb.Text) - BREAK - ELSE - sFormat = "" - END IF - NEXT - ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & "," - END IF - NEXT + ' Message(gvPartListing[irow, 0].Text & " - (" & gvPartListing[irow, 1].Text & ") - " & gvPartListing[irow, 2].Text) + ' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & "," + ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & sPart & "-" & sSize & "-" & sMntPoint & "-" & sFormat & "|" -FOR i = 2 TO gvPartListing.Rows.count - 1 - IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN - FOR EACH cbox IN objMntPoints - IF cbox.tag = gvPartListing[i, 0].Text THEN - IF cbox.text <> ("Not Used") THEN - ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & "," - END IF - END IF - NEXT END IF - NEXT - - -END - - + END IF + + NEXT + + ' =========== get list of swap partitions selected .(if any) ===================== + + FOR irow = 2 TO gvPartListing.Rows.count - 1 + IF Trim(gvPartListing[irow, 2].Text) = ("Swap") THEN + sPart = Trim(gvPartListing[irow, 0].Text) + sSize = Trim(gvPartListing[irow, 1].Text) + ' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & "," + ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & spart & "-" & sSize & "|" + END IF + NEXT + + + 'Message(ClsGlobal.sVitalPartList) +' +' FOR EACH cbox IN objMntPoints +' IF cbox.Text <> ("Not Used") THEN +' i = 2 +' REPEAT +' IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN +' sSize = Trim(gvPartListing[i, 1].Text) +' END IF +' INC i +' UNTIL sSize OR i = gvPartListing.Rows.Count +' +' FOR EACH cb IN objFS +' IF cbox.tag = cb.Tag THEN +' sFormat = Trim(cb.Text) +' BREAK +' ELSE +' sFormat = "" +' END IF +' NEXT +' ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & "," +' END IF +' NEXT +' +' FOR i = 2 TO gvPartListing.Rows.count - 1 +' IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN +' FOR EACH cbox IN objMntPoints +' IF cbox.tag = gvPartListing[i, 0].Text THEN +' IF cbox.text <> ("Not Used") THEN +' ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & "," +' END IF +' END IF +' NEXT +' END IF +' NEXT +' +' + END +' +' PUBLIC SUB Form_Open() Modified: branches/speedy/Step8.class ============================================================================== --- branches/speedy/Step8.class (original) +++ branches/speedy/Step8.class Fri Mar 20 10:33:33 2009 @@ -34,7 +34,8 @@ END PUBLIC FUNCTION GetNext() AS String - RETURN "Step9" + 'RETURN "Step9" + RETURN "Conf0" END @@ -61,7 +62,7 @@ WITH ME.TreeView1 .Add("Part", ("Partitions to be used"), MdlStartUp.pCategory) IF ClsGlobal.bAutoPartition = FALSE THEN - sArr = Split(ClsGlobal.sVitalPartList, ",") + sArr = Split(ClsGlobal.sVitalPartList, "|") FOR i = 0 TO sArr.Max sList = Trim(sArr[i]) IF sList THEN @@ -72,8 +73,11 @@ sFs = Trim(sEntry[3]) IF sfs LIKE ("Do not format") THEN sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) & ("Mount to") & Space(1) + ELSE IF sfs = ("Format to") & Space(1) & sFs & Space(1) & ("and mount to") & Space(1) + ELSE IF Len(sFS) <= 0 THEN + sFs = "(" & ("Not Formatted") & ")" & Space(1) & ("Mount to") & Space(1) ELSE - sfs = ("Format to") & Space(1) & sFs & Space(1) & ("and mount to") & Space(1) + sFs = ("Format to") & Space(1) & sFs & Space(1) & ("and mount to") & Space(1) END IF .Add("Part." & i, sPart & " -- " & sSize, PicDisk, "Part") .add("Part." & i & "." & i, sFs & sMntPnt, PicTask, "Part." & i) @@ -83,7 +87,7 @@ NEXT ' summarize swap partitions - sSwaps = Split(Trim(ClsGlobal.sWapPartList), ",") + sSwaps = Split(Trim(ClsGlobal.sWapPartList), "|") IF sSwaps.Count <= 0 THEN .Add("Swaps", ("NO SWAP SPACE SELECTED"),, "Part") PRINT "No swap space selected for installation.!" |
From: <cod...@go...> - 2009-03-19 20:05:11
|
Author: M0...@gm... Date: Thu Mar 19 12:43:10 2009 New Revision: 515 Removed: branches/speedy/.lang/MdlObjSizer.pot Log: Fixed svn tree |
From: <cod...@go...> - 2009-03-19 19:55:34
|
Author: M0...@gm... Date: Thu Mar 19 12:41:36 2009 New Revision: 514 Added: branches/speedy/.lang/MdlAutoPartition.pot branches/speedy/.lang/MdlHelpSystem.pot branches/speedy/.lang/Step3a3a.pot branches/speedy/MdlHelpSystem.module Modified: branches/speedy/.lang/.pot branches/speedy/.lang/FMain.pot branches/speedy/.lang/FMain0.pot branches/speedy/.lang/en_US.po branches/speedy/.lang/es.mo branches/speedy/.lang/es.po branches/speedy/.project branches/speedy/FMain.class branches/speedy/FMain.form branches/speedy/FMain0.class branches/speedy/FMain0.form Log: Added help system provision Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Thu Mar 19 12:41:36 2009 @@ -10,19 +10,27 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:245 FMain0.class:245 FMain0Old.class:233 +#: .project:1 +msgid "VectorLinux Installer" +msgstr "" + +#: FMain.class:253 FMain0.class:253 FMain0Old.class:233 msgid "Process Overview" msgstr "" -#: FMain.class:287 FMain0.class:287 FMain0Old.class:271 +#: FMain.class:294 FMain0.class:294 +msgid "Help" +msgstr "" + +#: FMain.class:307 FMain0.class:307 FMain0Old.class:271 msgid "Back" msgstr "" -#: FMain.class:298 FMain0.class:298 FMain0Old.class:282 +#: FMain.class:318 FMain0.class:318 FMain0Old.class:282 msgid "Next" msgstr "" -#: FMain.class:309 FMain0.class:309 FMain0Old.class:293 +#: FMain.class:329 FMain0.class:329 FMain0Old.class:293 msgid "Quit" msgstr "" Modified: branches/speedy/.lang/FMain.pot ============================================================================== --- branches/speedy/.lang/FMain.pot (original) +++ branches/speedy/.lang/FMain.pot Thu Mar 19 12:41:36 2009 @@ -14,19 +14,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:245 +#: FMain.class:253 msgid "Process Overview" msgstr "" -#: FMain.class:287 +#: FMain.class:294 +msgid "Help" +msgstr "" + +#: FMain.class:307 msgid "Back" msgstr "" -#: FMain.class:298 +#: FMain.class:318 msgid "Next" msgstr "" -#: FMain.class:309 +#: FMain.class:329 msgid "Quit" msgstr "" Modified: branches/speedy/.lang/FMain0.pot ============================================================================== --- branches/speedy/.lang/FMain0.pot (original) +++ branches/speedy/.lang/FMain0.pot Thu Mar 19 12:41:36 2009 @@ -14,19 +14,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain0.class:245 +#: FMain0.class:253 msgid "Process Overview" msgstr "" -#: FMain0.class:287 +#: FMain0.class:294 +msgid "Help" +msgstr "" + +#: FMain0.class:307 msgid "Back" msgstr "" -#: FMain0.class:298 +#: FMain0.class:318 msgid "Next" msgstr "" -#: FMain0.class:309 +#: FMain0.class:329 msgid "Quit" msgstr "" Added: branches/speedy/.lang/MdlAutoPartition.pot ============================================================================== --- (empty file) +++ branches/speedy/.lang/MdlAutoPartition.pot Thu Mar 19 12:41:36 2009 @@ -0,0 +1,56 @@ +# /home/vluser/devel/speedy/MdlAutoPartition.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" + +#: MdlAutoPartition.module:132 +msgid "Try another partitioning method" +msgstr "" + +#: MdlAutoPartition.module:143 +msgid "Simulated resize of your ntfs partition" +msgstr "" + +#: MdlAutoPartition.module:143 +msgid "It is not safe to perform this operation... Please use another partitioning method" +msgstr "" + +#: MdlAutoPartition.module:175 +msgid "Error deleting the ntfs filesytem" +msgstr "" + +#: MdlAutoPartition.module:180 +msgid "Error creating the ntfs filesystem after shrinking it" +msgstr "" + +#: MdlAutoPartition.module:497 +msgid "MB of free space" +msgstr "" + +#: MdlAutoPartition.module:538 +msgid "Existing Data" +msgstr "" + +#: MdlAutoPartition.module:560 +msgid "Total space for VectorLinux" +msgstr "" + +#: MdlAutoPartition.module:617 +msgid "No resizable partitions found on your system. Please use the manual partitioning method" +msgstr "" + +#: MdlAutoPartition.module:661 +msgid "Select the location to which we will resize" +msgstr "" + Added: branches/speedy/.lang/MdlHelpSystem.pot ============================================================================== --- (empty file) +++ branches/speedy/.lang/MdlHelpSystem.pot Thu Mar 19 12:41:36 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/speedy/MdlHelpSystem.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/Step3a3a.pot ============================================================================== --- (empty file) +++ branches/speedy/.lang/Step3a3a.pot Thu Mar 19 12:41:36 2009 @@ -0,0 +1,60 @@ +# /home/vluser/devel/speedy/Step3a3a.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" + +#: Step3a3a.class:26 +msgid "You are about to shink" +msgstr "" + +#: Step3a3a.class:26 +msgid "to make room for your vectorlinux installation." +msgstr "" + +#: Step3a3a.class:26 +msgid "This is generally a safe procedure, however, you should always consider making copies of your valuable data before making changes such as this one to your system" +msgstr "" + +#: Step3a3a.class:26 +msgid "When you are ready to continue, click the" +msgstr "" + +#: Step3a3a.class:26 +msgid "button." +msgstr "" + +#: Step3a3a.class:67 +msgid "Shrinking partitions and creating new environment for VectorLinux ... Please Wait" +msgstr "" + +#: Step3a3a.class:72 +msgid "Partitions are ready for VectorLinux. Click" +msgstr "" + +#: Step3a3a.class:72 +msgid "to continue" +msgstr "" + +#: Step3a3a.class:116 +msgid "Claim free space from existing partitions" +msgstr "" + +#: Step3a3a.class:133 +msgid "Warning" +msgstr "" + +#: Step3a3a.class:163 +msgid "Shrink partitions now" +msgstr "" + Modified: branches/speedy/.lang/en_US.po ============================================================================== --- branches/speedy/.lang/en_US.po (original) +++ branches/speedy/.lang/en_US.po Thu Mar 19 12:41:36 2009 @@ -14,22 +14,70 @@ msgid "VectorLinux Installer" msgstr "VectorLinux Installer" -#: FMain.class:245 FMain0.class:246 FMain0Old.class:233 +#: FMain.class:247 FMain0.class:247 FMain0Old.class:233 msgid "Process Overview" msgstr "Process Overview" -#: FMain.class:287 FMain0.class:288 FMain0Old.class:271 +#: FMain.class:288 FMain0.class:288 +msgid "Help" +msgstr "" + +#: FMain.class:301 FMain0.class:301 FMain0Old.class:271 msgid "Back" msgstr "Back" -#: FMain.class:298 FMain0.class:299 FMain0Old.class:282 +#: FMain.class:312 FMain0.class:312 FMain0Old.class:282 msgid "Next" msgstr "Next" -#: FMain.class:309 FMain0.class:310 FMain0Old.class:293 +#: FMain.class:323 FMain0.class:323 FMain0Old.class:293 msgid "Quit" msgstr "Quit" +#: MdlAutoPartition.module:132 +msgid "Try another partitioning method" +msgstr "" + +#: MdlAutoPartition.module:143 +msgid "Simulated resize of your ntfs partition" +msgstr "" + +#: MdlAutoPartition.module:143 +msgid "" +"It is not safe to perform this operation... Please use another partitioning " +"method" +msgstr "" + +#: MdlAutoPartition.module:175 +msgid "Error deleting the ntfs filesytem" +msgstr "" + +#: MdlAutoPartition.module:180 +msgid "Error creating the ntfs filesystem after shrinking it" +msgstr "" + +#: MdlAutoPartition.module:497 +msgid "MB of free space" +msgstr "" + +#: MdlAutoPartition.module:538 +msgid "Existing Data" +msgstr "" + +#: MdlAutoPartition.module:560 +msgid "Total space for VectorLinux" +msgstr "" + +#: MdlAutoPartition.module:617 +msgid "" +"No resizable partitions found on your system. Please use the manual " +"partitioning method" +msgstr "" + +#: MdlAutoPartition.module:661 +msgid "Select the location to which we will resize" +msgstr "" + #: MdlMain.module:33 msgid "Unable to format" msgstr "" @@ -54,7 +102,7 @@ msgid "Disk Partitioning" msgstr "" -#: MdlStartUp.module:47 +#: MdlStartUp.module:47 Step8.class:135 msgid "Software Selection" msgstr "" @@ -62,7 +110,7 @@ msgid "Installation" msgstr "" -#: MdlStartUp.module:49 +#: MdlStartUp.module:49 Step8.class:218 msgid "Installation Summary" msgstr "" @@ -130,67 +178,115 @@ msgid "on" msgstr "on" -#: Step1.class:131 +#: Step1.class:91 +msgid "" +"No installable media was found on your system. Please insert an installation " +"CD" +msgstr "" + +#: Step1.class:91 +msgid "" +"or move your installation images (ISO) to the top of your partitions. Then " +"click" +msgstr "" + +#: Step1.class:92 +msgid "No installable media found on your system." +msgstr "" + +#: Step1.class:93 +msgid "" +"Insert installation CD or move Installable (iso) images to the top directory " +"on your partitions and click" +msgstr "" + +#: Step1.class:93 +msgid "to search for media again" +msgstr "" + +#: Step1.class:98 Step2.class:198 Step5.class:177 +msgid "Click" +msgstr "" + +#: Step1.class:98 +msgid "to begin installing" +msgstr "" + +#: Step1.class:101 +msgid "Select Installation source from the list below" +msgstr "Select Installation source from the list below" + +#: Step1.class:103 +msgid "to continue or click" +msgstr "" + +#: Step1.class:103 +#, fuzzy +msgid "to search for installation media again" +msgstr "Check Installation media before installing" + +#: Step1.class:149 msgid "Scanning system partitions for installation files" msgstr "Scanning system partitions for installation files" -#: Step1.class:150 +#: Step1.class:168 msgid "Found" msgstr "Found" -#: Step1.class:150 +#: Step1.class:168 msgid "in partition" msgstr "in partition" -#: Step1.class:191 +#: Step1.class:209 msgid "Scanning for CD Media ... Please wait" msgstr "Scanning for CD Media ... Please wait" -#: Step1.class:204 +#: Step1.class:222 msgid "Scanning" msgstr "Scanning" -#: Step1.class:214 +#: Step1.class:232 msgid "in" msgstr "in" -#: Step1.class:242 +#: Step1.class:260 msgid "Scanning system for installable ISO images" msgstr "Scanning system for installable ISO images" -#: Step1.class:335 +#: Step1.class:353 msgid "DISTRIBUTION" msgstr "DISTRIBUTION" -#: Step1.class:338 +#: Step1.class:356 msgid "VERSION" msgstr "VERSION" -#: Step1.class:415 +#: Step1.class:433 msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 +#: Step1.class:433 Step3a1.class:22 Step3a1a.class:186 Step7a.class:143 msgid "WARNING:" msgstr "" -#: Step1.class:415 +#: Step1.class:433 msgid "This process can take a long time to complete." msgstr "" -#: Step1.class:467 +#: Step1.class:443 +#, fuzzy +msgid "Searching your system for installable media" +msgstr "Scanning system for installable ISO images" + +#: Step1.class:511 msgid "Select Installation Source" msgstr "Select Installation Source" -#: Step1.class:485 -msgid "Select Installation source from the list below" -msgstr "Select Installation source from the list below" - -#: Step1.class:506 +#: Step1.class:550 msgid "Search Again" msgstr "Search Again" -#: Step1.class:530 +#: Step1.class:580 msgid "Check Installation media before installing" msgstr "Check Installation media before installing" @@ -288,10 +384,6 @@ 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:166 -msgid "Click" -msgstr "" - #: Step2.class:198 msgid "to abort this process at any time" msgstr "" @@ -308,29 +400,29 @@ msgid "Select the partitioning method you would like to use" msgstr "" -#: Step3.class:153 +#: Step3.class:175 msgid "Automatic" msgstr "" -#: Step3.class:163 +#: Step3.class:185 msgid "" "Automatically resize your partitions and / or create the correct disk space " "for VectorLinux." msgstr "" -#: Step3.class:170 +#: Step3.class:192 msgid "Manually resize my partitions " msgstr "" -#: Step3.class:180 +#: Step3.class:202 msgid "Use the partitioning tool to prepare your system partitions." msgstr "" -#: Step3.class:187 +#: Step3.class:209 msgid "My hard drive is already partitioned" msgstr "" -#: Step3.class:197 +#: Step3.class:219 msgid "Install VectorLinux to existing partitions on my hard drive" msgstr "" @@ -373,11 +465,11 @@ msgid "Use unpartitioned space on my hard disk (creates new partitions)" msgstr "" -#: Step3a.class:144 +#: Step3a.class:143 msgid "Use free space on existing partitions for VectorLinux" msgstr "" -#: Step3a.class:168 +#: Step3a.class:164 msgid "Use entire disk" msgstr "" @@ -389,7 +481,7 @@ msgid "All existing data in the device you select here will be destroyed." msgstr "" -#: Step3a1.class:68 +#: Step3a1.class:74 msgid "Total Disc Size" msgstr "" @@ -429,43 +521,43 @@ msgid "Create New" msgstr "" -#: Step3a1a.class:148 +#: Step3a1a.class:160 msgid "Failed to format partitions, please try another partitioning method" msgstr "" -#: Step3a1a.class:160 +#: Step3a1a.class:177 msgid "Partitioning stage complete. Click" msgstr "" -#: Step3a1a.class:160 Step3a2.class:322 Step5.class:166 +#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72 Step5.class:177 msgid "to continue" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "All existing data in" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "is about to be deleted." msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:169 Step6.class:386 +#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:386 +#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 msgid "No" msgstr "" -#: Step3a1a.class:173 +#: Step3a1a.class:190 msgid "Preparing hard disk for new partitioning structure. Please wait" msgstr "" -#: Step3a1a.class:193 +#: Step3a1a.class:210 msgid "Operation cancelled by user. No changes have been made to the system" msgstr "" @@ -499,48 +591,109 @@ "VectorLinux" msgstr "" -#: Step3a2.class:191 +#: Step3a2.class:192 msgid "Please wait while your hard drive is being partitioned" msgstr "" -#: Step3a2.class:204 +#: Step3a2.class:205 msgid "Unable to find enough un-used space to perform auto-partition." msgstr "" -#: Step3a2.class:204 +#: Step3a2.class:205 msgid "Please consider using a different partitioning option." msgstr "" -#: Step3a2.class:206 +#: Step3a2.class:207 msgid "" "Unable to find enough un-used space to perform auto-partition. Please " "consider using a different partitioning option." msgstr "" -#: Step3a2.class:322 +#: Step3a2.class:359 msgid "Partitioning stage complete... Click" msgstr "" -#: Step3a2.class:352 +#: Step3a2.class:407 msgid "" "We are unable to find any hard disks with enough unpartitioned space for " "this operation." msgstr "" -#: Step3a2.class:352 +#: Step3a2.class:407 msgid "Please consider using another partitioning method." msgstr "" -#: Step3a2.class:354 +#: Step3a2.class:409 msgid "" "Unable to find any hard drives with enough unpartitioned space. Please go " "back and select another partitioning method" msgstr "" -#: Step3a3.class:22 +#: Step3a3.class:23 Step3a3a.class:116 msgid "Claim free space from existing partitions" msgstr "" +#: Step3a3.class:39 +msgid "" +"No resizable partitions found on your system. Please use the manual " +"partitioning method." +msgstr "" + +#: Step3a3.class:39 +msgid "" +"This will allow you to use a partitioning tool to handle your partitioning " +"needs." +msgstr "" + +#: Step3a3.class:107 +msgid "" +"Select which partition to resize and use the slider below it to adjust the " +"ammount of space to be used by VectorLinux" +msgstr "" + +#: Step3a3a.class:26 +msgid "You are about to shink" +msgstr "" + +#: Step3a3a.class:26 +msgid "to make room for your vectorlinux installation." +msgstr "" + +#: Step3a3a.class:26 +msgid "" +"This is generally a safe procedure, however, you should always consider " +"making copies of your valuable data before making changes such as this one " +"to your system" +msgstr "" + +#: Step3a3a.class:26 +msgid "When you are ready to continue, click the" +msgstr "" + +#: Step3a3a.class:26 +msgid "button." +msgstr "" + +#: Step3a3a.class:67 +msgid "" +"Shrinking partitions and creating new environment for VectorLinux ... Please " +"Wait" +msgstr "" + +#: Step3a3a.class:72 +msgid "Partitions are ready for VectorLinux. Click" +msgstr "" + +#: Step3a3a.class:133 +#, fuzzy +msgid "Warning" +msgstr "Scanning" + +#: Step3a3a.class:163 +#, fuzzy +msgid "Shrink partitions now" +msgstr "in partition" + #: Step4.class:23 msgid "Automatic Disc Partitioning" msgstr "" @@ -549,135 +702,149 @@ msgid "Resize partitions using Gparted" msgstr "" -#: Step5.class:64 +#: Step5.class:67 msgid "" "Gparted was not found on this system. Please install gparted and try again" msgstr "" #: Step5.class:69 +msgid "Unable to launch partitioning tool." +msgstr "" + +#: Step5.class:69 +msgid "" +"The gparted program was not found on this system. Please install gparted or " +"choose another partitioning method." +msgstr "" + +#: Step5.class:80 msgid "Loading partitioning utility...Please Wait" msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "" "The VectorLinux installer is unable to embed the gparted partitioning " "utility." msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "" "Please consider using the automatic partition option, or use other means of" msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "partitioning your hard drives." msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "" "VectorLinux is about to launch the GParted partitioning tool. Use this " "utility to" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "move, resize, delete or create partitions." msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "When you are finished, you will need to exit the utility from the" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "GParted" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "menu" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "SYSTEM RESTART SUGGESTED" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "" "Your system still contains some non-linux partitions. If you still have a " "Windows operating system installed, it is recomended " msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "that you reboot your system at this time. " msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "Click the" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "button to restart your computer now, or click" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "to continue without restarting." msgstr "" -#: Step5.class:166 +#: Step5.class:177 msgid "PARTITIONING DONE" msgstr "" -#: Step5.class:182 +#: Step5.class:193 msgid "Your computer will restart in 10 seconds" msgstr "" -#: Step5.class:239 +#: Step5.class:250 msgid "Loading partitioning utility ... Please Wait" msgstr "" -#: Step5.class:248 +#: Step5.class:259 msgid "Restart Now" msgstr "" -#: Step6.class:59 +#: Step6.class:66 msgid "Partition" msgstr "" -#: Step6.class:60 +#: Step6.class:67 msgid "Size" msgstr "" -#: Step6.class:61 +#: Step6.class:68 msgid "Mount Point" msgstr "" -#: Step6.class:62 +#: Step6.class:69 msgid "File System" msgstr "" -#: Step6.class:134 +#: Step6.class:142 +msgid "Swap" +msgstr "" + +#: Step6.class:142 msgid "Not Used" msgstr "" -#: Step6.class:155 +#: Step6.class:183 Step8.class:73 msgid "Do not format" msgstr "" -#: Step6.class:200 +#: Step6.class:228 msgid "You have already selected" msgstr "" -#: Step6.class:200 +#: Step6.class:228 msgid "as your" msgstr "" -#: Step6.class:200 +#: Step6.class:228 msgid "partition." msgstr "" -#: Step6.class:200 +#: Step6.class:228 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:281 +#: Step6.class:362 msgid "Select which partitions to use for installation" msgstr "" @@ -686,26 +853,142 @@ msgid "Select Installation Mode" msgstr "Select Installation Source" -#: Step7.class:98 +#: Step7.class:108 msgid "Full Install" msgstr "" -#: Step7.class:108 +#: Step7.class:118 msgid "Install everthing in the image (Fully Automated)" msgstr "" -#: Step7.class:116 +#: Step7.class:126 Step8.class:125 msgid "Customized" msgstr "" -#: Step7.class:126 +#: Step7.class:136 msgid "Select the components you wish to install (Advanced)" msgstr "" -#: Step7.class:134 +#: Step7.class:144 Step8.class:127 msgid "Minimal" msgstr "" -#: Step7.class:144 +#: Step7.class:154 msgid "Install the most minimal working confuguration (For older hardware)" +msgstr "" + +#: Step7a.class:27 Step7b.class:23 +#, fuzzy +msgid "Customize Your VectorLinux Installation" +msgstr "VectorLinux Installer" + +#: Step7a.class:34 +msgid "Component" +msgstr "" + +#: Step7a.class:49 Step7b.class:28 +msgid "Description" +msgstr "" + +#: Step7a.class:143 +msgid "" +"This component is a dependancy to any graphical user interface progam on the " +"system" +msgstr "" + +#: Step7a.class:143 +msgid "" +"Choosing not to install this may result in a command-line (text mode) " +"installation only" +msgstr "" + +#: Step7a.class:143 +msgid "Are you sure you want to disable this conponent anyway?" +msgstr "" + +#: Step7a.class:169 Step7b.class:183 +msgid "Select All" +msgstr "" + +#: Step7a.class:175 Step7b.class:181 +msgid "Un-Select All" +msgstr "" + +#: Step7a.class:235 +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:27 +msgid "Package Name" +msgstr "" + +#: Step7b.class:58 +msgid "Reading software catalog... Please wait a moment" +msgstr "" + +#: Step7b.class:107 +msgid "" +"Additional optional software available. Select which software packages to " +"include in your installation." +msgstr "" + +#: Step8.class:44 +msgid "Distribution" +msgstr "" + +#: Step8.class:62 +msgid "Partitions to be used" +msgstr "" + +#: Step8.class:74 +msgid "Not Formatted" +msgstr "" + +#: Step8.class:74 +msgid "Mount to" +msgstr "" + +#: Step8.class:76 +msgid "Format to" +msgstr "" + +#: Step8.class:76 +msgid "and mount to" +msgstr "" + +#: Step8.class:88 +msgid "NO SWAP SPACE SELECTED" +msgstr "" + +#: Step8.class:93 +msgid "Swap Space" +msgstr "" + +#: Step8.class:106 +msgid "Pre-formatted to reiserfs, and used for /" +msgstr "" + +#: Step8.class:123 +msgid "Full" +msgstr "" + +#: Step8.class:130 +#, fuzzy +msgid "Installation Method" +msgstr "Select Installation Source" + +#: Step8.class:136 +msgid "Major Components" +msgstr "" + +#: Step8.class:146 +msgid "Additional Software" +msgstr "" + +#: Step8.class:237 +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/es.mo ============================================================================== Binary files. No diff available. Modified: branches/speedy/.lang/es.po ============================================================================== --- branches/speedy/.lang/es.po (original) +++ branches/speedy/.lang/es.po Thu Mar 19 12:41:36 2009 @@ -10,754 +10,911 @@ "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:246 FMain0Old.class:233 -msgid "Process Overview" -msgstr "Resumen del Proceso" +#: Step8.class:146 +msgid "Additional Software" +msgstr "" + +#: Step7b.class:107 +msgid "Additional optional software available. Select which software packages to include in your installation." +msgstr "" + +#: Step3a1a.class:186 +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." + +#: Step7a.class:143 +msgid "Are you sure you want to disable this conponent anyway?" +msgstr "" + +#: Step3.class:175 +msgid "Automatic" +msgstr "Automático" + +#: Step4.class:23 +msgid "Automatic Disc Partitioning" +msgstr "Crear las particiones necesarias automáticamente" -#: FMain.class:287 FMain0.class:288 FMain0Old.class:271 +#: Step3a.class:19 +msgid "Automatic Partitioning Options" +msgstr "Opciones de particionado automático" + +#: Step3.class:185 +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:301 FMain0.class:301 FMain0Old.class:271 msgid "Back" msgstr "Regreso" -#: FMain.class:298 FMain0.class:299 FMain0Old.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:310 FMain0Old.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" -#: MdlMain.module:33 -msgid "Unable to format" -msgstr "No se pudo formatear" +#: Step1.class:580 +msgid "Check Installation media before installing" +msgstr "Verificar archivos de instalacion" -#: MdlMain.module:33 -msgid "to" -msgstr "a" +#: Step7a.class:143 +msgid "Choosing not to install this may result in a command-line (text mode) installation only" +msgstr "" -#: MdlStartUp.module:42 -msgid "Preparation" -msgstr "Preparación" +#: Step3a3.class:23 Step3a3a.class:116 +msgid "Claim free space from existing partitions" +msgstr "Utilizar espacio libre en las particiones que ya existen" -#: MdlStartUp.module:44 -msgid "Select Language" -msgstr "Selección de Lenguage" +#: Step1.class:98 Step2.class:198 Step5.class:177 +msgid "Click" +msgstr "Haz click en" -#: MdlStartUp.module:45 -msgid "Select Media" -msgstr "Medio de Instalación" +#: Step5.class:172 +msgid "Click the" +msgstr "Haz click en" + +#: Step7a.class:34 +msgid "Component" +msgstr "" + +#: 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" + +#: Step7a.class:27 Step7b.class:23 +msgid "Customize Your VectorLinux Installation" +msgstr "" + +#: Step7.class:126 Step8.class:125 +msgid "Customized" +msgstr "" + +#: Step1.class:353 +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." + +#: Step7a.class:49 Step7b.class:28 +msgid "Description" +msgstr "" + +#: Step3.class:28 +msgid "Disc Partitioning Options" +msgstr "Opciones de particionado" #: MdlStartUp.module:46 msgid "Disk Partitioning" msgstr "Particiones" -#: MdlStartUp.module:47 -msgid "Software Selection" -msgstr "Selección de Software" +#: Step8.class:44 +msgid "Distribution" +msgstr "" + +#: Step6.class:183 Step8.class:73 +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 "Inglés (EE.UU)" + +#: MdlAutoPartition.module:180 +msgid "Error creating the ntfs filesystem after shrinking it" +msgstr "" + +#: 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." + +#: MdlAutoPartition.module:175 +msgid "Error deleting the ntfs filesytem" +msgstr "" + +#: MdlAutoPartition.module:538 +msgid "Existing Data" +msgstr "" + +#: Step2.class:115 +msgid "FAILED" +msgstr "ERROR" + +#: Step3a1a.class:160 +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" + +#: Step6.class:69 +msgid "File System" +msgstr "Systema de Archivos" + +#: MdlStartUp.module:57 +msgid "Final Configuration" +msgstr "Configuración Final" + +#: Step8.class:76 +msgid "Format to" +msgstr "" + +#: Step1.class:168 +msgid "Found" +msgstr "Encontre" + +#: Step8.class:123 +msgid "Full" +msgstr "" + +#: Step7.class:108 +msgid "Full Install" +msgstr "" + +#: Step5.class:125 +msgid "GParted" +msgstr "GParted" + +#: Step5.class:67 +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." + +#: FMain.class:288 FMain0.class:288 +msgid "Help" +msgstr "Ayuda" + +#: Step1.class:93 +msgid "Insert installation CD or move Installable (iso) images to the top directory on your partitions and click" +msgstr "" + +#: MdlStartUp.module:50 +msgid "Install VectorLinux" +msgstr "Instalar VectorLinux" + +#: Step3.class:219 +msgid "Install VectorLinux to existing partitions on my hard drive" +msgstr "Instalar VectorLinux en particiones ya existentes en mi disco duro" + +#: Step3a2.class:25 +msgid "Install VectorLinux to free space on disk" +msgstr "Instalar VectorLinux en el espacio vacío de mi disco duro" + +#: Step7.class:118 +msgid "Install everthing in the image (Fully Automated)" +msgstr "" + +#: Step7.class:154 +msgid "Install the most minimal working confuguration (For older hardware)" +msgstr "" #: MdlStartUp.module:48 msgid "Installation" msgstr "Instalación" -#: MdlStartUp.module:49 +#: Step8.class:130 +msgid "Installation Method" +msgstr "" + +#: MdlStartUp.module:49 Step8.class:218 msgid "Installation Summary" msgstr "Resumen de la instalación" -#: MdlStartUp.module:50 -msgid "Install VectorLinux" -msgstr "Instalar VectorLinux" +#: Step2.class:118 +msgid "Integrity test" +msgstr "Prueba de integridad" -#: MdlStartUp.module:51 -msgid "System Configuration" -msgstr "Configuración del Sistema" +#: MdlAutoPartition.module:143 +msgid "It is not safe to perform this operation... Please use another partitioning method" +msgstr "" -#: MdlStartUp.module:52 -msgid "System Boot Manager" -msgstr "Gestor de Arranque" +#: 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" -#: MdlStartUp.module:53 -msgid "Regional Settings" -msgstr "Valores Regionales" +#: Step5.class:250 +msgid "Loading partitioning utility ... Please Wait" +msgstr "Cargando herramienta de particionar (gparted) ... Por favor espere." -#: MdlStartUp.module:54 -msgid "User Accounts" -msgstr "Usuarios" +#: Step5.class:80 +msgid "Loading partitioning utility...Please Wait" +msgstr "Cargando herramienta de particionar (gparted) ... Por favor espere." + +#: Step0.class:20 +msgid "Localization Settings" +msgstr "Valores locales" + +#: 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í" + +#: MdlAutoPartition.module:497 +msgid "MB of free space" +msgstr "" + +#: Step8.class:136 +msgid "Major Components" +msgstr "" + +#: Step7a.class:235 +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 "" + +#: Step3.class:192 +msgid "Manually resize my partitions " +msgstr "Encoger mis particiones manualmente" + +#: Step7.class:144 Step8.class:127 +msgid "Minimal" +msgstr "" + +#: Step6.class:68 +msgid "Mount Point" +msgstr "Punto de Montage" + +#: Step8.class:74 +msgid "Mount to" +msgstr "" + +#: Step3.class:209 +msgid "My hard drive is already partitioned" +msgstr "Mi disco duro ya esta particionado" + +#: Step8.class:88 +msgid "NO SWAP SPACE SELECTED" +msgstr "" #: MdlStartUp.module:55 msgid "Network Settings" msgstr "Valores de Red" -#: MdlStartUp.module:56 -msgid "Startup Options" -msgstr "Opciones de Arranque" +#: FMain.class:312 FMain0.class:312 FMain0Old.class:282 +msgid "Next" +msgstr "Siguiente" -#: MdlStartUp.module:57 -msgid "Final Configuration" -msgstr "Configuración Final" +#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 +msgid "No" +msgstr "No" -#: Step0.class:20 -msgid "Localization Settings" -msgstr "Valores locales" +#: 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" -#: Step0.class:122 -msgid "Spanish" -msgstr "Español (España)" +#: Step1.class:92 +msgid "No installable media found on your system." +msgstr "" -#: Step0.class:125 -msgid "English (US)" -msgstr "Inglés (EE.UU)" +#: Step1.class:91 +msgid "No installable media was found on your system. Please insert an installation CD" +msgstr "" -#: Step0.class:254 -msgid "Select your language" -msgstr "Seleccione su idioma" +#: MdlAutoPartition.module:617 +msgid "No resizable partitions found on your system. Please use the manual partitioning method" +msgstr "" -#: Step0.class:285 -msgid "Select your keyboard layout" -msgstr "Seleccione el diseño de su teclado" +#: Step3a3.class:39 +msgid "No resizable partitions found on your system. Please use the manual partitioning method." +msgstr "" -#: Step0.class:304 -msgid "Select your keyboard model" -msgstr "Seleccione el model de su teclado" +#: Step8.class:74 +msgid "Not Formatted" +msgstr "" -#: Step0.class:326 -msgid "Use this box to test your keyboard settings" -msgstr "Area de prueba" +#: Step6.class:142 +msgid "Not Used" +msgstr "Sin Utilizar" -#: Step1.class:33 -msgid "on" -msgstr "en" +#: Step3a1a.class:210 +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." -#: Step1.class:131 -msgid "Scanning system partitions for installation files" -msgstr "Buscando medios de instalación en particiones del sistema" +#: Step5.class:177 +msgid "PARTITIONING DONE" +msgstr "Particionado ha terminado." -#: Step1.class:150 -msgid "Found" -msgstr "Encontre" +#: Step2.class:124 +msgid "PASSED" +msgstr "PASÓ" -#: Step1.class:150 -msgid "in partition" -msgstr "en particion" +#: Step7b.class:27 +msgid "Package Name" +msgstr "" + +#: Step6.class:66 +msgid "Partition" +msgstr "Partición" + +#: Step3a1a.class:177 +msgid "Partitioning stage complete. Click" +msgstr "Proceso de particionado completo. Haz click en " + +#: Step3a2.class:359 +msgid "Partitioning stage complete... Click" +msgstr "Proceso de particionado completo. Haz click en " -#: Step1.class:191 -msgid "Scanning for CD Media ... Please wait" -msgstr "Buscando medios de instalación en CDROM. Por favor espere" +#: Step3a3a.class:72 +msgid "Partitions are ready for VectorLinux. Click" +msgstr "" -#: Step1.class:204 -msgid "Scanning" -msgstr "Buscando en" +#: Step8.class:62 +msgid "Partitions to be used" +msgstr "" -#: Step1.class:214 -msgid "in" -msgstr "en" +#: Step3a2.class:205 +msgid "Please consider using a different partitioning option." +msgstr "Por favor seleccione otra opción de particionado" -#: Step1.class:242 -msgid "Scanning system for installable ISO images" -msgstr "Buscando medios de instalación en imagenes ISO." +#: Step3a2.class:407 +msgid "Please consider using another partitioning method." +msgstr "Por favor seleccione otra opción de particionado" -#: Step1.class:335 -msgid "DISTRIBUTION" -msgstr "DISTRIBUCION" +#: Step5.class:103 +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." -#: Step1.class:338 -msgid "VERSION" -msgstr "VERSION" +#: 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." -#: Step1.class:415 -msgid "This feature can help you avoid an unsuccesful installation." -msgstr "Esta función puede ayudarle a evitar una instalacion inservible." +#: Step6.class:228 +msgid "Please select only one partition for this purpose" +msgstr "Por favor seleccione solo una partición para este propósito" -#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 -msgid "WARNING:" -msgstr "ADVERTENCIA:" +#: Step3a2.class:192 +msgid "Please wait while your hard drive is being partitioned" +msgstr "Por favor espere mientras particionamos el disco duro" -#: 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." +#: 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." -#: Step1.class:467 -msgid "Select Installation Source" -msgstr "Seleccione el medio de instalación" +#: Step8.class:106 +msgid "Pre-formatted to reiserfs, and used for /" +msgstr "" -#: Step1.class:485 -msgid "Select Installation source from the list below" -msgstr "Seleccione la fuente instalacion de esta lista" +#: MdlStartUp.module:42 +msgid "Preparation" +msgstr "Preparación" -#: Step1.class:506 -msgid "Search Again" -msgstr "Buscar Nuevamente" +#: Step3a1a.class:190 +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." -#: Step1.class:530 -msgid "Check Installation media before installing" -msgstr "Verificar archivos de instalacion" +#: FMain.class:247 FMain0.class:247 FMain0Old.class:233 +msgid "Process Overview" +msgstr "Resumen del Proceso" -#: Step2.class:27 -msgid "Verify Installation Files" -msgstr "Verificar archivos de instalacion antes de instalar" +#: FMain.class:323 FMain0.class:323 FMain0Old.class:293 +msgid "Quit" +msgstr "Cancelar" -#: Step2.class:46 -msgid "" -"This installation media has already been checked. Would you like to check it " -"again?" +#: Step7b.class:58 +msgid "Reading software catalog... Please wait a moment" msgstr "" -"Este medio de instalación ya fué analizado. ¿Le gustaría hacer la prueba " -"otra vez?" -#: Step2.class:78 -msgid "Verifying data on compressed package" -msgstr "Verificando la informacion en el paquete comprimido" +#: MdlStartUp.module:53 +msgid "Regional Settings" +msgstr "Valores Regionales" -#: Step2.class:82 -msgid "Testing file" -msgstr "Probando fichero" +#: Step5.class:19 +msgid "Resize partitions using Gparted" +msgstr "Ajustar particiones utilizando GParted" -#: Step2.class:82 -msgid "of" -msgstr "de" +#: 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:101 -msgid "Canceling data integrity tests per user request" -msgstr "" -"Proceso de verificacion de integridad cancelado a instancias del usuario" +#: Step5.class:259 +msgid "Restart Now" +msgstr "Reiniciar Ahora" -#: Step2.class:102 -msgid "Data integrity test canceled by user." -msgstr "Prueba de integridad de archivos cancelado por el usuario" +#: Step5.class:172 +msgid "SYSTEM RESTART SUGGESTED" +msgstr "SUGERENCIA: RE-INICIE SU SYSTEMA" -#: Step2.class:115 -msgid "FAILED" -msgstr "ERROR" +#: Step1.class:222 +msgid "Scanning" +msgstr "Buscando en" -#: Step2.class:117 -msgid "The following" -msgstr "Lo siguiente" +#: Step1.class:209 +msgid "Scanning for CD Media ... Please wait" +msgstr "Buscando medios de instalación en CDROM. Por favor espere" -#: Step2.class:117 -msgid "required" -msgstr "requerido" +#: Step1.class:260 +msgid "Scanning system for installable ISO images" +msgstr "Buscando medios de instalación en imagenes ISO." -#: 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" +#: Step1.class:149 +msgid "Scanning system partitions for installation files" +msgstr "Buscando medios de instalación en particiones del sistema" -#: Step2.class:118 -msgid "Integrity test" -msgstr "Prueba de integridad" +#: Step1.class:550 +msgid "Search Again" +msgstr "Buscar Nuevamente" -#: Step2.class:124 -msgid "PASSED" -msgstr "PASÓ" +#: 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." -#: Step2.class:154 -msgid "" -"has failed the data integrity test. All required packages have passed this " -"test" +#: Step1.class:443 +msgid "Searching your system for installable media" msgstr "" -"falló la prueba de integridad. Todos los paquetes requeridos (vitales) lo " -"han pasado" -#: Step2.class:154 -msgid "" -"Possible causes for this are a corrupted download or a badly burnt cd. You " -"can try the following options" +#: Step7.class:136 +msgid "Select the components you wish to install (Advanced)" msgstr "" -"Posibles causas de este problema son: una imágen ISO corrupta or no grabado " -"en CD correctamente. Intente las siguientes sugerencias." -#: 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" - -#: Step2.class:154 -msgid "Burn the image at a lower speed rate" -msgstr "Quemar la imagen ISO a un ritmo de velocidad mas lento" - -#: Step2.class:174 -msgid "Data integrity test complete... all tests passed" +#: Step7a.class:169 Step7b.class:183 +msgid "Select All" msgstr "" -"Prueba de integridad de los archivos completa . . . Todos los archivos " -"pasaron." -#: Step2.class:181 -msgid "All test passed. It is safe to continue with the installation process." +#: Step7.class:19 +msgid "Select Installation Mode" msgstr "" -"Todos los archivos pasaron la prueba de integridad. Ya puede continuar con " -"la instalación" -#: 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:511 +msgid "Select Installation Source" +msgstr "Seleccione el medio de instalación" -#: 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:101 +msgid "Select Installation source from the list below" +msgstr "Seleccione la fuente instalacion de esta lista" -#: Step2.class:198 Step5.class:166 -msgid "Click" -msgstr "Haz click en" +#: MdlStartUp.module:44 +msgid "Select Language" +msgstr "Selección de Lenguage" -#: Step2.class:198 -msgid "to abort this process at any time" -msgstr "Para detener este proceso" +#: MdlStartUp.module:45 +msgid "Select Media" +msgstr "Medio de Instalación" -#: Step2.class:366 -msgid "Stop" -msgstr "Alto" +#: Step3a.class:20 +msgid "Select one of the following options" +msgstr "Elija una de las siguentes opciones" -#: Step3.class:28 -msgid "Disc Partitioning Options" -msgstr "Opciones 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." + +#: MdlAutoPartition.module:661 +msgid "Select the location to which we will resize" +msgstr "" #: Step3.class:31 msgid "Select the partitioning method you would like to use" msgstr "Seleccione el método de particionado que desea utilizar" -#: Step3.class:153 -msgid "Automatic" -msgstr "Automático" - -#: Step3.class:163 -msgid "" -"Automatically resize your partitions and / or create the correct disk space " -"for VectorLinux." +#: Step3a3.class:107 +msgid "Select which partition to resize and use the slider below it to adjust the ammount of space to be used by VectorLinux" msgstr "" -"Automáticamente encoger particiones existentes al tamaño adecuado para dejar " -"espacio para VectorLinux" - -#: Step3.class:170 -msgid "Manually resize my partitions " -msgstr "Encoger mis particiones manualmente" -#: Step3.class:180 -msgid "Use the partitioning tool to prepare your system partitions." -msgstr "" -"Utilizar la herramienta de particionado (gparted) para prepara mi sistema." +#: Step6.class:362 +msgid "Select which partitions to use for installation" +msgstr "Elija las partiiones que se utilizarán en la instalación" -#: Step3.class:187 -msgid "My hard drive is already partitioned" -msgstr "Mi disco duro ya esta particionado" +#: Step0.class:285 +msgid "Select your keyboard layout" +msgstr "Seleccione el diseño de su teclado" -#: Step3.class:197 -msgid "Install VectorLinux to existing partitions on my hard drive" -msgstr "Instalar VectorLinux en particiones ya existentes en mi disco duro" +#: Step0.class:304 +msgid "Select your keyboard model" +msgstr "Seleccione el model de su teclado" -#: Step3a.class:19 -msgid "Automatic Partitioning Options" -msgstr "Opciones de particionado automático" +#: Step0.class:254 +msgid "Select your language" +msgstr "Seleccione su idioma" -#: Step3a.class:20 -msgid "Select one of the following options" -msgstr "Elija una de las siguentes opciones" +#: Step3a3a.class:163 +msgid "Shrink partitions now" +msgstr "" -#: Step3a.class:22 -msgid "Allow VectorLinux to use an entire hard disk in your system." -msgstr "Quiero que VectorLinux utilize el disco completo." +#: Step3a3a.class:67 +msgid "Shrinking partitions and creating new environment for VectorLinux ... Please Wait" +msgstr "" -#: Step3a.class:22 -msgid "This option will wipe out any data on the disk you select." +#: MdlAutoPartition.module:143 +msgid "Simulated resize of your ntfs partition" msgstr "" -"Esta opción eliminará toda la información contenida en el disco que usted " -"seleccione." -#: 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í" +#: Step6.class:67 +msgid "Size" +msgstr "Tamaño" -#: 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" +#: MdlStartUp.module:47 Step8.class:135 +msgid "Software Selection" +msgstr "Selección de Software" -#: 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" +#: Step0.class:122 +msgid "Spanish" +msgstr "Español (España)" -#: 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:56 +msgid "Startup Options" +msgstr "Opciones de Arranque" -#: 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)" +#: Step2.class:366 +msgid "Stop" +msgstr "Alto" -#: Step3a.class:144 -msgid "Use free space on existing partitions for VectorLinux" -msgstr "Instalar VectorLinux en el espacio libre de mis partitiones actuales" +#: Step6.class:142 +msgid "Swap" +msgstr "" -#: Step3a.class:168 -msgid "Use entire disk" -msgstr "Disco Completo" +#: Step8.class:93 +msgid "Swap Space" +msgstr "" -#: Step3a1.class:20 -msgid "Use Entire Hard Disk for VectorLinux" -msgstr "Utilizar el disco completo" +#: MdlStartUp.module:52 +msgid "System Boot Manager" +msgstr "Gestor de Arranque" -#: 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." +#: MdlStartUp.module:51 +msgid "System Configuration" +msgstr "Configuración del Sistema" -#: Step3a1.class:68 -msgid "Total Disc Size" -msgstr "Tamaño del Disco" +#: Step2.class:82 +msgid "Testing file" +msgstr "Probando fichero" -#: Step3a1a.class:21 -msgid "Create Linux Partition Scheme in" -msgstr "Crear nueva estructura de particiones en" +#: Step5.class:103 +msgid "The VectorLinux installer is unable to embed the gparted partitioning utility." +msgstr "No se pudo incorporar la herramienta de particionado (gparted)." -#: Step3a1a.class:53 -msgid "There has been an error deleting" -msgstr "Ha ocurrido un error borrando" +#: Step2.class:117 +msgid "The following" +msgstr "Lo siguiente" -#: Step3a1a.class:53 -msgid "" -"Please make sure the drive or partition is not being used by some other " -"program" +#: Step5.class:69 +msgid "The gparted program was not found on this system. Please install gparted or choose another partitioning method." msgstr "" -"Por favor asegúrese que el disco ó la partición seleccionada no esté siendo " -"utilizado por otro programa." -#: 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." +#: Step3a1a.class:53 +msgid "There has been an error deleting" +msgstr "Ha ocurrido un error borrando" -#: Step3a1a.class:82 -msgid "Vectorlinux has detected an existing swap partition in your system." +#: Step7a.class:143 +msgid "This component is a dependancy to any graphical user interface progam on the system" msgstr "" -"VectorLinux ha detectado una particion de intercambio (swap) en sy sistema." - -#: 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?" -#: Step3a1a.class:82 -msgid "Use Existing" -msgstr "Utilizar Existente" +#: Step1.class:433 +msgid "This feature can help you avoid an unsuccesful installation." +msgstr "Esta función puede ayudarle a evitar una instalacion inservible." -#: Step3a1a.class:82 -msgid "Create New" -msgstr "Crear Nueva" +#: 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:148 -msgid "Failed to format partitions, please try another partitioning method" +#: Step3a3a.class:26 +msgid "This is generally a safe procedure, however, you should always consider making copies of your valuable data before making changes such as this one to your system" msgstr "" -"El intento a formatear las particiones ha fallado, intente con otra manera " -"de particionado" -#: Step3a1a.class:160 -msgid "Partitioning stage complete. Click" -msgstr "Proceso de particionado completo. Haz click en " +#: 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:160 Step3a2.class:322 Step5.class:166 -msgid "to continue" -msgstr "para continuar" +#: 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:169 -msgid "All existing data in" -msgstr "Toda la información en" +#: 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." -#: Step3a1a.class:169 -msgid "is about to be deleted." -msgstr "será borrado completamente" +#: Step1.class:433 +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 +#: Step3a1a.class:186 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?" +msgstr "Este paso de la instalación no se puede deshacer. ¿Esta seguro de que quiere continuar?" -#: Step3a1a.class:169 Step6.class:386 -msgid "Yes" -msgstr "Sí" +#: Step3a3.class:39 +msgid "This will allow you to use a partitioning tool to handle your partitioning needs." +msgstr "" -#: Step3a1a.class:169 Step6.class:386 -msgid "No" -msgstr "No" +#: Step3a1.class:74 +msgid "Total Disc Size" +msgstr "Tamaño del Disco" -#: Step3a1a.class:173 -msgid "Preparing hard disk for new partitioning structure. Please wait" +#: MdlAutoPartition.module:560 +msgid "Total space for VectorLinux" msgstr "" -"Preparando su disco duro para la nueva estructura de particiones... Por " -"favor espere un momento." -#: Step3a1a.class:193 -msgid "Operation cancelled by user. No changes have been made to the system" +#: MdlAutoPartition.module:132 +msgid "Try another partitioning method" msgstr "" -"Operación cancelada por el usuario. No se han hecho cambios al sistema." - -#: Step3a2.class:25 -msgid "Install VectorLinux to free space on disk" -msgstr "Instalar VectorLinux en el espacio vacío de mi disco duro" -#: Step3a2.class:45 -msgid "Searching for unused space on your hard drive... please wait" +#: Step7a.class:175 Step7b.class:181 +msgid "Un-Select All" msgstr "" -"Buscando espacio libre en su disco duro ... Por favor espere un momento." -#: 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" +#: Step3a2.class:409 +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:65 -msgid "Another partitioning option" -msgstr "Otra opción para particionar." +#: Step3a2.class:205 +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:92 -msgid "(Recomended)" -msgstr "(Sugerido)" +#: Step3a2.class:207 +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:102 -msgid "of free space" -msgstr "de espacio libre" +#: MdlMain.module:33 +msgid "Unable to format" +msgstr "No se pudo formatear" -#: 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." +#: Step5.class:69 +msgid "Unable to launch partitioning tool." +msgstr "" -#: 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 Exi... [truncated message content] |
From: <cod...@go...> - 2009-03-19 15:05:29
|
Author: M0...@gm... Date: Thu Mar 19 07:58:45 2009 New Revision: 513 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/FMain0.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step8.pot branches/speedy/FMain.form branches/speedy/FMain0.form branches/speedy/Step6.class branches/speedy/Step8.class branches/speedy/Step8.form Log: Finished up to installation summary. Fixed minor problems in partition selection and swap listing. Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Thu Mar 19 07:58:45 2009 @@ -10,19 +10,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain.class:245 FMain0.class:246 FMain0Old.class:233 +#: FMain.class:245 FMain0.class:245 FMain0Old.class:233 msgid "Process Overview" msgstr "" -#: FMain.class:287 FMain0.class:288 FMain0Old.class:271 +#: FMain.class:287 FMain0.class:287 FMain0Old.class:271 msgid "Back" msgstr "" -#: FMain.class:298 FMain0.class:299 FMain0Old.class:282 +#: FMain.class:298 FMain0.class:298 FMain0Old.class:282 msgid "Next" msgstr "" -#: FMain.class:309 FMain0.class:310 FMain0Old.class:293 +#: FMain.class:309 FMain0.class:309 FMain0Old.class:293 msgid "Quit" msgstr "" @@ -94,7 +94,7 @@ msgid "Disk Partitioning" msgstr "" -#: MdlStartUp.module:47 Step8.class:130 +#: MdlStartUp.module:47 Step8.class:135 msgid "Software Selection" msgstr "" @@ -102,7 +102,7 @@ msgid "Installation" msgstr "" -#: MdlStartUp.module:49 Step8.class:213 +#: MdlStartUp.module:49 Step8.class:218 msgid "Installation Summary" msgstr "" @@ -533,11 +533,11 @@ msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:186 Step6.class:434 Step7a.class:143 +#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:186 Step6.class:434 Step7a.class:143 +#: Step3a1a.class:186 Step6.class:467 Step7a.class:143 msgid "No" msgstr "" @@ -802,31 +802,35 @@ msgid "File System" msgstr "" -#: Step6.class:146 +#: Step6.class:142 +msgid "Swap" +msgstr "" + +#: Step6.class:142 msgid "Not Used" msgstr "" -#: Step6.class:167 Step8.class:73 +#: Step6.class:183 Step8.class:73 msgid "Do not format" msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "You have already selected" msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "as your" msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "partition." msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:329 +#: Step6.class:362 msgid "Select which partitions to use for installation" msgstr "" @@ -842,7 +846,7 @@ msgid "Install everthing in the image (Fully Automated)" msgstr "" -#: Step7.class:126 Step8.class:120 +#: Step7.class:126 Step8.class:125 msgid "Customized" msgstr "" @@ -850,7 +854,7 @@ msgid "Select the components you wish to install (Advanced)" msgstr "" -#: Step7.class:144 Step8.class:122 +#: Step7.class:144 Step8.class:127 msgid "Minimal" msgstr "" @@ -939,30 +943,34 @@ msgstr "" #: Step8.class:88 +msgid "NO SWAP SPACE SELECTED" +msgstr "" + +#: Step8.class:93 msgid "Swap Space" msgstr "" -#: Step8.class:101 +#: Step8.class:106 msgid "Pre-formatted to reiserfs, and used for /" msgstr "" -#: Step8.class:118 +#: Step8.class:123 msgid "Full" msgstr "" -#: Step8.class:125 +#: Step8.class:130 msgid "Installation Method" msgstr "" -#: Step8.class:131 +#: Step8.class:136 msgid "Major Components" msgstr "" -#: Step8.class:141 +#: Step8.class:146 msgid "Additional Software" msgstr "" -#: Step8.class:232 +#: Step8.class:237 msgid "" "Your VectorLinux installation is about to be performed as follows. If you " "need to make any changes, this is your last chance." Modified: branches/speedy/.lang/FMain0.pot ============================================================================== --- branches/speedy/.lang/FMain0.pot (original) +++ branches/speedy/.lang/FMain0.pot Thu Mar 19 07:58:45 2009 @@ -14,19 +14,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain0.class:246 +#: FMain0.class:245 msgid "Process Overview" msgstr "" -#: FMain0.class:288 +#: FMain0.class:287 msgid "Back" msgstr "" -#: FMain0.class:299 +#: FMain0.class:298 msgid "Next" msgstr "" -#: FMain0.class:310 +#: FMain0.class:309 msgid "Quit" msgstr "" Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Thu Mar 19 07:58:45 2009 @@ -30,39 +30,43 @@ msgid "File System" msgstr "" -#: Step6.class:146 +#: Step6.class:142 +msgid "Swap" +msgstr "" + +#: Step6.class:142 msgid "Not Used" msgstr "" -#: Step6.class:167 +#: Step6.class:183 msgid "Do not format" msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "You have already selected" msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "as your" msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "partition." msgstr "" -#: Step6.class:212 +#: Step6.class:228 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:329 +#: Step6.class:362 msgid "Select which partitions to use for installation" msgstr "" -#: Step6.class:434 +#: Step6.class:467 msgid "Yes" msgstr "" -#: Step6.class:434 +#: Step6.class:467 msgid "No" msgstr "" Modified: branches/speedy/.lang/Step8.pot ============================================================================== --- branches/speedy/.lang/Step8.pot (original) +++ branches/speedy/.lang/Step8.pot Thu Mar 19 07:58:45 2009 @@ -43,46 +43,50 @@ msgstr "" #: Step8.class:88 +msgid "NO SWAP SPACE SELECTED" +msgstr "" + +#: Step8.class:93 msgid "Swap Space" msgstr "" -#: Step8.class:101 +#: Step8.class:106 msgid "Pre-formatted to reiserfs, and used for /" msgstr "" -#: Step8.class:118 +#: Step8.class:123 msgid "Full" msgstr "" -#: Step8.class:120 +#: Step8.class:125 msgid "Customized" msgstr "" -#: Step8.class:122 +#: Step8.class:127 msgid "Minimal" msgstr "" -#: Step8.class:125 +#: Step8.class:130 msgid "Installation Method" msgstr "" -#: Step8.class:130 +#: Step8.class:135 msgid "Software Selection" msgstr "" -#: Step8.class:131 +#: Step8.class:136 msgid "Major Components" msgstr "" -#: Step8.class:141 +#: Step8.class:146 msgid "Additional Software" msgstr "" -#: Step8.class:213 +#: Step8.class:218 msgid "Installation Summary" msgstr "" -#: Step8.class:232 +#: Step8.class:237 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/FMain.form ============================================================================== --- branches/speedy/FMain.form (original) +++ branches/speedy/FMain.form Thu Mar 19 07:58:45 2009 @@ -5,7 +5,7 @@ Text = ("") Arrangement = Arrange.Vertical { HBox2 HBox - MoveScaled(12,1,63,8) + MoveScaled(12,1,63,7.25) Background = Color.SelectedBackground { Panel2 Panel MoveScaled(1,3,4,2) Modified: branches/speedy/FMain0.form ============================================================================== --- branches/speedy/FMain0.form (original) +++ branches/speedy/FMain0.form Thu Mar 19 07:58:45 2009 @@ -5,7 +5,7 @@ Text = ("") Arrangement = Arrange.Vertical { HBox2 HBox - MoveScaled(12,1,63,8) + MoveScaled(12,1,63,7.25) Background = Color.SelectedBackground { Panel2 Panel MoveScaled(1,3,4,2) @@ -13,7 +13,6 @@ } { PictureBox1 PictureBox MoveScaled(7,1,46,5) - Picture = Picture["import/FMain1/installer.png"] Stretch = True } { Panel3 Panel Modified: branches/speedy/Step6.class ============================================================================== --- branches/speedy/Step6.class (original) +++ branches/speedy/Step6.class Thu Mar 19 07:58:45 2009 @@ -130,6 +130,22 @@ gvPartListing[irow, 5].BackColor = Color.LightGray gvPartListing[irow, 6].BackColor = Color.LightGray + ' ---------------------- make distinction from swap partitions to regular mountable ones ------------------ + + 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 + .tag = gvPartListing[irow, 0].Text + .List = [("Swap"), ("Not Used")] + END WITH + objMntPoints.Add(cbMntPoint) + + ' ---- continue---- + + ELSE gvPartListing[irow, 5].Text = Trim(SFS) gvPartListing[irow, 5].ForeColor = Color.White @@ -228,6 +244,8 @@ x = LAST.x y = LAST.y + + IF LAST.text <> ("Not Used") THEN IF ME.CheckEntry(LAST.text, gvPartListing.RowAt(LAST.y)) > 0 THEN LAST.text = ("Not Used") @@ -258,6 +276,15 @@ NEXT END IF + ' find out if are good to go yet + FOR EACH cb IN objMntPoints + IF cb.Text = "/" THEN + ClsGlobal.fRunningMainForm.btnext.enabled = TRUE + RETURN + END IF + ClsGlobal.fRunningMainForm.btnext.enabled = FALSE + NEXT + @@ -315,7 +342,13 @@ FOR i = 2 TO gvPartListing.Rows.count - 1 IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN - ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & "," + FOR EACH cbox IN objMntPoints + IF cbox.tag = gvPartListing[i, 0].Text THEN + IF cbox.text <> ("Not Used") THEN + ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & "," + END IF + END IF + NEXT END IF NEXT Modified: branches/speedy/Step8.class ============================================================================== --- branches/speedy/Step8.class (original) +++ branches/speedy/Step8.class Thu Mar 19 07:58:45 2009 @@ -84,7 +84,12 @@ ' summarize swap partitions sSwaps = Split(Trim(ClsGlobal.sWapPartList), ",") - IF sSwaps THEN + IF sSwaps.Count <= 0 THEN + .Add("Swaps", ("NO SWAP SPACE SELECTED"),, "Part") + PRINT "No swap space selected for installation.!" + + + ELSE 'IF sSwaps THEN .Add("Swaps", ("Swap Space"),, "Part") END IF FOR i = 0 TO sSwaps.Max Modified: branches/speedy/Step8.form ============================================================================== --- branches/speedy/Step8.form (original) +++ branches/speedy/Step8.form Thu Mar 19 07:58:45 2009 @@ -1,7 +1,7 @@ # Gambas Form File 2.0 { Form Form - MoveScaled(0,0,64,64) + MoveScaled(0,0,64,51) Text = ("") Arrangement = Arrange.Vertical { HPanel1 HPanel |
From: <cod...@go...> - 2009-03-18 21:24:37
|
Author: M0...@gm... Date: Wed Mar 18 14:23:29 2009 New Revision: 512 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step3a3.pot branches/speedy/MdlAutoPartition.module branches/speedy/Step3a3.class branches/speedy/Step3a3a.class branches/speedy/Step3a3a.form branches/speedy/Step5.class Log: Ommitted reiserfs from automatic partition options. Not doable yet Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Wed Mar 18 14:23:29 2009 @@ -10,10 +10,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: .project:1 -msgid "VectorLinux Installer" -msgstr "" - #: FMain.class:245 FMain0.class:246 FMain0Old.class:233 msgid "Process Overview" msgstr "" @@ -30,41 +26,47 @@ msgid "Quit" msgstr "" -#: MdlAutoPartition.module:129 +#: MdlAutoPartition.module:132 msgid "Try another partitioning method" msgstr "" -#: MdlAutoPartition.module:140 +#: MdlAutoPartition.module:143 msgid "Simulated resize of your ntfs partition" msgstr "" -#: MdlAutoPartition.module:140 +#: MdlAutoPartition.module:143 msgid "" "It is not safe to perform this operation... Please use another partitioning " "method" msgstr "" -#: MdlAutoPartition.module:165 +#: MdlAutoPartition.module:175 msgid "Error deleting the ntfs filesytem" msgstr "" -#: MdlAutoPartition.module:170 +#: MdlAutoPartition.module:180 msgid "Error creating the ntfs filesystem after shrinking it" msgstr "" -#: MdlAutoPartition.module:468 +#: MdlAutoPartition.module:497 msgid "MB of free space" msgstr "" -#: MdlAutoPartition.module:508 +#: MdlAutoPartition.module:538 msgid "Existing Data" msgstr "" -#: MdlAutoPartition.module:530 +#: MdlAutoPartition.module:560 msgid "Total space for VectorLinux" msgstr "" -#: MdlAutoPartition.module:624 +#: MdlAutoPartition.module:617 +msgid "" +"No resizable partitions found on your system. Please use the manual " +"partitioning method" +msgstr "" + +#: MdlAutoPartition.module:661 msgid "Select the location to which we will resize" msgstr "" @@ -515,7 +517,7 @@ msgid "Partitioning stage complete. Click" msgstr "" -#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:69 Step5.class:177 +#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72 Step5.class:177 msgid "to continue" msgstr "" @@ -615,11 +617,23 @@ "back and select another partitioning method" msgstr "" -#: Step3a3.class:23 Step3a3a.class:113 +#: Step3a3.class:23 Step3a3a.class:116 msgid "Claim free space from existing partitions" msgstr "" -#: Step3a3.class:100 +#: Step3a3.class:39 +msgid "" +"No resizable partitions found on your system. Please use the manual " +"partitioning method." +msgstr "" + +#: Step3a3.class:39 +msgid "" +"This will allow you to use a partitioning tool to handle your partitioning " +"needs." +msgstr "" + +#: Step3a3.class:107 msgid "" "Select which partition to resize and use the slider below it to adjust the " "ammount of space to be used by VectorLinux" @@ -648,21 +662,21 @@ msgid "button." msgstr "" -#: Step3a3a.class:64 +#: Step3a3a.class:67 msgid "" "Shrinking partitions and creating new environment for VectorLinux ... Please " "Wait" msgstr "" -#: Step3a3a.class:69 +#: Step3a3a.class:72 msgid "Partitions are ready for VectorLinux. Click" msgstr "" -#: Step3a3a.class:130 +#: Step3a3a.class:133 msgid "Warning" msgstr "" -#: Step3a3a.class:160 +#: Step3a3a.class:163 msgid "Shrink partitions now" msgstr "" Modified: branches/speedy/.lang/Step3a3.pot ============================================================================== --- branches/speedy/.lang/Step3a3.pot (original) +++ branches/speedy/.lang/Step3a3.pot Wed Mar 18 14:23:29 2009 @@ -18,7 +18,15 @@ msgid "Claim free space from existing partitions" msgstr "" -#: Step3a3.class:100 +#: Step3a3.class:39 +msgid "No resizable partitions found on your system. Please use the manual partitioning method." +msgstr "" + +#: Step3a3.class:39 +msgid "This will allow you to use a partitioning tool to handle your partitioning needs." +msgstr "" + +#: Step3a3.class:107 msgid "Select which partition to resize and use the slider below it to adjust the ammount of space to be used by VectorLinux" msgstr "" Modified: branches/speedy/MdlAutoPartition.module ============================================================================== --- branches/speedy/MdlAutoPartition.module (original) +++ branches/speedy/MdlAutoPartition.module Wed Mar 18 14:23:29 2009 @@ -94,21 +94,24 @@ - CASE "ext2", "ext3", "*fat*", "hfsx", "hfs+", "hfs", "linux-swap" + CASE "ext2", "ext3", "*fat*", "hfsx", "hfs+", "hfs", "linux-swap", "vfat", "VFAT" SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print | tr -s \' \',\"\" | grep \"^" & sPartPrefx & iPart & "\"" TO sDump sDump = Trim(sDump) 'Number Start End Size Type File system Flags '1 0.03MB 12256MB 12256MB primary reiserfs partedDump = Split(sDump, " ") - lEndMark = Trim(partedDump[2]) - sResizeCommand = "parted " & sPartition & " unit mb resize " & iPart & Space(1) & Trim(partedDump[1]) & "m" & Space(1) & lEndMark - lMBAmmountToUseForVL & "m" + + 'RETURN 1 + lEndMark = Left(partedDump[2], Len(partedDump[2]) - 2) + sResizeCommand = "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb -s \"resize " & iPart & Space(1) & Trim(partedDump[1]) & Space(1) & (lEndMark - lMBAmmountToUseForVL) & "m\"" CASE "reiserfs" 'r resize_reiserfs -s -1G /dev/hda8 ( see man resize_reiserfs ) sResizeCommand = "echo \"y\" | resize_reiserfs -fq -s -" & lMBAmmountToUseForVL & "M" & Space(1) & sPartition PRINT "DEBUG: " & sResizeCommand CASE ELSE - Message.Error("I dont know how to resize a pertition type " & sFs) + Message.Error("I dont know how to resize a partition type " & sFs) + RETURN 1 END SELECT @@ -149,6 +152,9 @@ ' run the actual command + 'DEBUG sResizeCommand + 'RETURN 1 + DEBUG sResizeCommand hproc = SHELL sResizeCommand WAIT PRINT " ---\\--> Shinking partition " & spartition IF hproc.Value > 0 THEN @@ -157,6 +163,10 @@ END IF PRINT "Done" + 'DEBUG "done resizing" + ' + 'RETURN 1 + IF sFs LIKE "ntfs" THEN PRINT " ----|=- Re-creating ntfs filesystem" @@ -242,8 +252,8 @@ ' determine where the free space is at SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" | tr -s \' \',\"\"" TO sDump sDump = Trim(Replace(sDump, "MB", "")) - 'Message(sDump) - + Message(sDump) + IF Len(sDump) <= 0 THEN RETURN 1 sDumparr = Split(sDump, " ") lMbStart = sDumparr[0] lMbEnd = sDumparr[1] @@ -391,6 +401,8 @@ DIM hr AS Separator DIM picb AS PictureBox DIM hobox AS Panel + DIM sFs AS String + DIM bgc AS Integer objProgs = NEW Object[] objSliders = NEW Object[] @@ -455,17 +467,34 @@ FOR i = 0 TO sResults.Max ' Message(Trim(sResults[i])) sLineArr = Split(Trim(sResults[i]), " ") + sFs = Trim(sLineArr[1]) lTotalMB = Trim(sLineArr[2]) lUsedMB = Trim(sLineArr[3]) lFreeMB = Trim(sLineArr[4]) 'Message(sLineArr[0] & Space(1) & "fREE SPACE " & sLineArr[4] & " Mb") IF lFreeMB >= 10240 THEN ' only if free space is equal to or greater than 10GB - IF Trim(sLineArr[1]) <> "*xfs*" OR Trim(sLineArr[1]) <> "*jfs*" THEN 'only if fs is not xfs or jfs + 'Message(sLineArr[1]) + 'IF Trim(sLineArr[1]) <> "*xfs*" OR Trim(sLineArr[1]) <> "reiserfs" OR Trim(sLineArr[1]) <> "*jfs*" THEN 'only if fs is not xfs or jfs + SELECT CASE sFs ' set the background color for the existing data label + CASE "ntfs", "NTFS" + bgc = &h66FF66 + CASE "fat32", "FAT32", "vfat", "VFAT" + bgc = &h33FF33 + CASE "fat16", "FAT", "FAT16" + bgc = &h009900 + CASE "ext2", "EXT2" + bgc = &h99CCFF + CASE "ext3", "EXT3" + bgc = &h336699 + CASE ELSE + bgc = Color.LightBackground + END SELECT + IF sFS <> "reiserfs" THEN sResizableList.Add(Trim(sResults[i])) rb = NEW RadioButton(hostContainer) AS "PartitionOptions" WITH rb - .Text = Trim(sLineArr[0]) & Space(1) & "-" & Space(1) & Trim(sLineArr[4]) & Space(1) & ("MB of free space") + .Text = Trim(sLineArr[0]) & Space(1) & "-" & Space(1) & Trim(sLineArr[4]) & Space(1) & ("MB of free space") & " [ " & sFs & " ]" .tag = Trim(sLineArr[0]) .Height = 21 .Expand = TRUE @@ -503,7 +532,8 @@ 'panels.Add(hobox) tl = NEW TextLabel(hobox) WITH tl - .BackColor = Color.SelectedBackground + '.BackColor = Color.SelectedBackground + .BackColor = bgc .Expand = FALSE .Text = ("Existing Data") .Width = .Parent.Width / 2 @@ -520,7 +550,7 @@ .Height = .Parent.Height '.Width = .Parent.Width * 0.5 .Expand = TRUE - .BackColor = Color.LightBackground + '.BackColor = Color.LightBackground .Alignment = Align.Center .Tag = .Parent.Tag & "R" END WITH @@ -581,7 +611,14 @@ NEXT NEXT - + + IF objRbs.Count <= 0 THEN ' no partitions found + 'Message.Error("No resizable partitions found") + Step3a3.tlExp.Text = ("No resizable partitions found on your system. Please use the manual partitioning method") + Step3a3.Refresh() + ClsGlobal.fRunningMainForm.btnext.enabled = objRbs.count >= 1 + + END IF END Modified: branches/speedy/Step3a3.class ============================================================================== --- branches/speedy/Step3a3.class (original) +++ branches/speedy/Step3a3.class Wed Mar 18 14:23:29 2009 @@ -34,6 +34,13 @@ WAIT MdlAutoPartition.DISPLAY_PARTITIONS_WITH_FREE_SPACE(ME.ScrollView1) '(ME.ListContainer1) '(ME.ScrollView1) '(ME.HpnlChoices) + IF MdlAutoPartition.objRbs.Count <= 0 THEN + ME.tlExp.Text = ("No resizable partitions found on your system. Please use the manual partitioning method.") & Space(1)& + ("This will allow you to use a partitioning tool to handle your partitioning needs.") + 'ClsGlobal.fRunningMainForm.btnext.enabled = FALSE + END IF + ClsGlobal.fRunningMainForm.btnext.enabled = MdlAutoPartition.objRbs.Count >= 1 + END PUBLIC SUB OnExit() Modified: branches/speedy/Step3a3a.class ============================================================================== --- branches/speedy/Step3a3a.class (original) +++ branches/speedy/Step3a3a.class Wed Mar 18 14:23:29 2009 @@ -51,7 +51,10 @@ ME.HBox2.Visible = FALSE ME.tlWarning.Visible = TRUE ME.MovieBox1.Enabled = TRUE + ClsGlobal.fRunningMainForm.btnext.enabled = FALSE + + END Modified: branches/speedy/Step3a3a.form ============================================================================== --- branches/speedy/Step3a3a.form (original) +++ branches/speedy/Step3a3a.form Wed Mar 18 14:23:29 2009 @@ -34,21 +34,21 @@ Border = Border.Etched } { HBox2 HBox - MoveScaled(7,22,56,38) + MoveScaled(7,22,56,36) Visible = False Expand = True { MovieBox1 MovieBox - MoveScaled(9,3,40,34) + MoveScaled(9,2,40,32) Expand = True Path = "/home/vluser/devel/speedy/images/throbber.gif" } } { HBox3 HBox - MoveScaled(1,60,6,2) + MoveScaled(1,58,6,2) Expand = True } { btStart Button - MoveScaled(1,62,20,3) + MoveScaled(1,60,20,3) Text = ("Shrink partitions now") } } Modified: branches/speedy/Step5.class ============================================================================== --- branches/speedy/Step5.class (original) +++ branches/speedy/Step5.class Wed Mar 18 14:23:29 2009 @@ -77,7 +77,7 @@ 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.Text = "<h3><i>" & ("Loading partitioning utility...Please Wait") & "</i></h3>" ME.tlEmbDone.Visible = TRUE SHELL "/usr/sbin/gparted" WAIT 1 @@ -122,14 +122,14 @@ 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 - + ("When you are finished, you will need to exit the utility from the") & Space(1) & ("GParted") & Space(1) & ("menu") & "</b>") + WITH ClsGlobal.fRunningMainForm + .btnext.Enabled = FALSE + .btBack.Enabled = FALSE + .btQuit.enabled = FALSE + END WITH + Embedder1.Raise + Embedder1.Visible = TRUE END PUBLIC FUNCTION CHECK_IF_REBOOT_NEEDED() AS Boolean |
From: <cod...@go...> - 2009-03-06 21:55:26
|
Author: M0...@gm... Date: Fri Mar 6 13:54:35 2009 New Revision: 511 Removed: branches/speedy/import/ Modified: branches/speedy/.lang/.pot branches/speedy/MdlAutoPartition.module branches/speedy/Step3a3a.class Log: Autopartition by shrinking ntfs partition complete Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Fri Mar 6 13:54:35 2009 @@ -30,19 +30,41 @@ msgid "Quit" msgstr "" -#: MdlAutoPartition.module:190 +#: MdlAutoPartition.module:129 +msgid "Try another partitioning method" +msgstr "" + +#: MdlAutoPartition.module:140 +msgid "Simulated resize of your ntfs partition" +msgstr "" + +#: MdlAutoPartition.module:140 +msgid "" +"It is not safe to perform this operation... Please use another partitioning " +"method" +msgstr "" + +#: MdlAutoPartition.module:165 +msgid "Error deleting the ntfs filesytem" +msgstr "" + +#: MdlAutoPartition.module:170 +msgid "Error creating the ntfs filesystem after shrinking it" +msgstr "" + +#: MdlAutoPartition.module:468 msgid "MB of free space" msgstr "" -#: MdlAutoPartition.module:230 +#: MdlAutoPartition.module:508 msgid "Existing Data" msgstr "" -#: MdlAutoPartition.module:252 +#: MdlAutoPartition.module:530 msgid "Total space for VectorLinux" msgstr "" -#: MdlAutoPartition.module:346 +#: MdlAutoPartition.module:624 msgid "Select the location to which we will resize" msgstr "" Modified: branches/speedy/MdlAutoPartition.module ============================================================================== --- branches/speedy/MdlAutoPartition.module (original) +++ branches/speedy/MdlAutoPartition.module Fri Mar 6 13:54:35 2009 @@ -33,12 +33,14 @@ ' trigger the automatic partitioning process. DIM hproc AS Process DIM sPartitionString, sFs, sResizeCommand, sDump, sPartPrefx AS String - DIM sLine, partedDump, sMountDumpArr AS String[] + DIM sLine, partedDump, sMountDumpArr, sDumparr AS String[] DIM lCurrentSize AS Long - DIM i, iPart AS Integer + DIM i, iPart, iPartCnt AS Integer DIM lEndMark AS Long DIM bSwapNeeded AS Boolean - DIM sSwapPart, sRootPart AS String + DIM sSwapPart, sRootPart, sSimulatedCommand AS String + DIM lMbStart, lMbEnd, lMbSize, lTotalRam, lTotalSwapNeeded AS Long + DIM bSetBoot AS Boolean lMBAmmountToUseForVL = ClsGlobal.lTotalMBforVL @@ -72,8 +74,26 @@ END IF SELECT CASE sFs - CASE "ntfs", "NTFS" - sResizeCommand = "ntfsresize -s " & (lCurrentSize - lMBAmmountToUseForVL) & "m" & Space(1) & sPartition + CASE "ntfs", "NTFS", "HPFS/NTFS" + 'sResizeCommand = "ntfsresize -s " & (lCurrentSize - lMBAmmountToUseForVL) & "m" & Space(1) & sPartition + sResizeCommand = "ntfsresize -P --force --force " & spartition & Space(1) & "-s " & (lCurrentSize - lMBAmmountToUseForVL) & "M" + sSimulatedCommand = "ntfsresize -P --force --force " & spartition & Space(1) & "-s " & (lCurrentSize - lMBAmmountToUseForVL) & "M --no-action" + + SHELL "parted " & Left(spartition, Len("/dev/hda")) & " print | grep \"^ " & Right(spartition, Len(spartition) - Len("/dev/hda")) & "\"| tr -s \' \',\"\"" TO sDump + sDump = Trim(sDump) + 'Message(sDump) + 'sDumparr = Split(sDump, " ") + + + IF InStr(sDump, " boot") THEN + + bSetBoot = TRUE + PRINT " ----- Boot flag detected on " & spartition + + END IF + + + CASE "ext2", "ext3", "*fat*", "hfsx", "hfs+", "hfs", "linux-swap" SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print | tr -s \' \',\"\" | grep \"^" & sPartPrefx & iPart & "\"" TO sDump sDump = Trim(sDump) @@ -84,7 +104,8 @@ sResizeCommand = "parted " & sPartition & " unit mb resize " & iPart & Space(1) & Trim(partedDump[1]) & "m" & Space(1) & lEndMark - lMBAmmountToUseForVL & "m" CASE "reiserfs" 'r resize_reiserfs -s -1G /dev/hda8 ( see man resize_reiserfs ) - sResizeCommand = "resize_reiserfs -s -" & lMBAmmountToUseForVL & "M" & Space(1) & sPartition + sResizeCommand = "echo \"y\" | resize_reiserfs -fq -s -" & lMBAmmountToUseForVL & "M" & Space(1) & sPartition + PRINT "DEBUG: " & sResizeCommand CASE ELSE Message.Error("I dont know how to resize a pertition type " & sFs) @@ -102,7 +123,7 @@ ' Just to make sure SHELL "mount | grep ^" & sPartition TO sDump - sDump = Trim(sDump + sDump = Trim(sDump) IF Len(sDump) > 0 THEN Message.Error(sPartition & Space(1)("is currently being used. Unable to umount it.") & "<br>" & ("Try another partitioning method")) @@ -110,32 +131,244 @@ END IF + 'if ntfs... then run a simulation + IF sfs LIKE "ntfs" THEN + PRINT " ---\\-> Running ntfs resize simulation " + hproc = SHELL sSimulatedCommand WAIT + IF hproc.Value > 0 THEN + Message.Error(("Simulated resize of your ntfs partition") & Space(1) & "(" & spartition & ")" & "<br>" & + ("It is not safe to perform this operation... Please use another partitioning method")) + RETURN hproc.Value + END IF + + ' we need to use sectors as the units for this to work... otherwise we may lose some data + + + PRINT " ---\\__ Running real resize operation" + END IF + + ' run the actual command hproc = SHELL sResizeCommand WAIT + PRINT " ---\\--> Shinking partition " & spartition IF hproc.Value > 0 THEN RETURN hproc.Value + END IF + PRINT "Done" + + + IF sFs LIKE "ntfs" THEN + PRINT " ----|=- Re-creating ntfs filesystem" + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " rm " & Right(sPartition, Len(spartition) - Len("/dev/hda")) WAIT ' remove the filesystem + IF hproc.Value > 0 THEN + Message.Error(("Error deleting the ntfs filesytem")) + RETURN hproc.Value + END IF + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart primary ntfs 0M " & (lEndMark - lMBAmmountToUseForVL) & "M\"" WAIT ' re-create the shrunken fs + IF hproc.Value > 0 THEN + Message.Error(("Error creating the ntfs filesystem after shrinking it")) + RETURN hproc.Value + END IF + PRINT " ---- Restoring boot flag" + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \" set " & Right(spartition, Len(spartition) - Len("/dev/hda")) & " boot on\"" WAIT ' set the boot flag again + IF hproc.Value > 0 THEN + Message("Error setting the boot flag on " & spartition) + END IF + ELSE IF sfs LIKE "reiserfs" THEN + + ' determine where the free space is at + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" | tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + IF sDump THEN + 'Message(sDump) + + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + ELSE + DEBUG "Cant find free space" + RETURN + END IF + + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " rm " & Right(spartition, Len(spartition) - Len("/dev/hda")) WAIT ' remove the old filesystem + IF hproc.Value > 0 THEN + PRINT "Error deleting old reiserfs filesystem" + RETURN hproc.Value + END IF + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart primary reiserfs " & lMbStart & "M " & (lMbEnd - lMBAmmountToUseForVL) & "M\"" WAIT ' re-create the new fs" + DEBUG "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart primary reiserfs " & lMbStart & "M " & (lMbEnd - lMBAmmountToUseForVL) & "M\"" ' re-create the new fs" + IF hproc.Value > 0 THEN + PRINT "Error restoring reiserfs filesystem." + RETURN hproc.Value + END IF + + + + END IF + + ' create new partitions now that we're here ============================================================================================ ' do we need to create a swap partition? + ' the global partitions must be set as "/dev/hda1-SIZE_IN_GB" + + SHELL "probepart | grep -i \"linux swap\"" TO sDump sDump = Trim(sDump) IF sDump THEN - bSwapNeeded = FALSE + bSwapNeeded = FALSE ' found a swap partition sDumparr = Split(sDump, "\n") sLine = Split(sDumparr[0], " ") sSwapPart = Trim(sLine[0]) + 'SHELL "parted " & lef & " unit GB print | grep \"^ " & sNum & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + SHELL "parted " & Left(sSwapPart, Len("/dev/hda")) & " unit GB print | grep \"^ " & Right(sSwapPart, Len(sSwapPart) - Len("/dev/hda")) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sDump = Trim(sDump) + PRINT " --- . Use existing swap partition at " & sSwapPart + sSwapPart = sSwapPart & "-" & sDump + ELSE bSwapNeeded = TRUE + + END IF + + ' determine how many partitions are present in the drive + SHELL "probepart | grep \"^" & Left(sPartition, Len("/dev/hda")) & "\" |wc -l" TO sDump + sDump = Trim(sDump) + iPartCnt = sDump + + ' determine where the free space is at + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" | tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + 'Message(sDump) + + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + + ' determine ammount of ram available + SHELL "free -m | grep \"^Mem:\" | tr -s \' \',\"\" | cut -f2 -d \' \'" TO sDump + lTotalRam = sDump + IF lTotalRam <= 512 THEN + lTotalSwapNeeded = (lTotalRam * 2) + ELSE + lTotalSwapNeeded = lTotalRam + END IF + + + IF iPartCnt <= 2 THEN + IF bSwapNeeded = FALSE THEN + ' only create the / partition + PRINT " ---\\__ Create / partition @ " & Left(sPartition, Len("/dev/hda")) & (iPartCnt + 1) & " size = " & lMbSize & " MB with reiserfs as filesytem" + PRINT "DEBUG: " & "parted " & Left(sPartition, Len("/dev/hda")) & " -s \"mkpart primary reiserfs " & lMbStart & "mb " & lMbEnd & "mb\"" + hproc = SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " -s \"mkpart primary reiserfs " & lMbStart & "mb " & lMbEnd & "mb\"" WAIT + IF hproc.Value > 0 THEN + RETURN hproc.Value + END IF + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit GB print | grep \"^ " & (iPartCnt + 1) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + hproc = SHELL "mkfs.reiserfs -q " & Left(spartition, Len("/dev/hda")) & (iPartCnt + 1) WAIT + + sRootPart = Left(sPartition, Len("/dev/hda")) & (iPartCnt + 1) & "-" & sDump + ELSE + ' create root and swap + SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart extended " & lMbSize & "mb " & lMbEnd & "mb\"" WAIT + ' ^ creates a wrapper around the unpartitioned space to give us room for new partitions (logical type) + ' ********** need to read new space location and dimensions *************** + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + ' swap partition will be iPartcnt + 2 here (because the extended is iPartcnt +1) + ' / partition (if needed) will be iPartcnt + 3 + + + ' SHELL "parted " & Trim(sdrive) & " mkpart logical linux-swap " & sFreeStart & " " & sFreeEnd WAIT + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " mkpart logical linux-swap " & lMbStart & "MB " & (lMbStart + lTotalSwapNeeded) & "MB" WAIT + IF hproc.Value > 0 THEN RETURN hproc.Value + PRINT " ---\\___ Created swap partition " & Left(spartition, Len("/dev/hda")) & (iPartCnt + 2) & " size = " & lTotalSwapNeeded & "MB" + ' register the new swap partition to the global class + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit GB print | grep \"^ " & (iPartCnt + 2) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sSwapPart = Left(spartition, Len("/dev/hda")) & (iPartCnt + 2) & "-" & sDump + + ' YET AGAIN + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart logical reiserfs " & lMbStart & "MB " & lMbEnd & "MB\"" WAIT + IF hproc.Value > 0 THEN RETURN hproc.Value + PRINT " ---\\___ Created / partition " & Left(spartition, Len("/dev/hda")) & (iPartCnt + 3) & " size = " & lMbSize & "MB" + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit GB print | grep \"^ " & (iPartCnt + 3) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sRootPart = Left(spartition, Len("/dev/hda")) & (iPartCnt + 3) & "-" & sDump + + END IF + + - - - - - - + ELSE + ' we will create an extended partition wich will be number iPartCnt +1 + SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart extended " & lMbStart & "mb " & lMbEnd & "mb\"" WAIT + ' ^ creates a wrapper around the unpartitioned space to give us room for new partitions (logical type) + ' ********** need to read new space location and dimensions *************** + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + ' swap partition will be iPartcnt + 2 here (because the extended is iPartcnt +1) + ' / partition (if needed) will be iPartcnt + 3 + IF bSwapNeeded = TRUE THEN + + ' SHELL "parted " & Trim(sdrive) & " mkpart logical linux-swap " & sFreeStart & " " & sFreeEnd WAIT + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " mkpart logical linux-swap " & lMbStart & "MB " & (lMbStart + lTotalSwapNeeded) & "MB" WAIT + IF hproc.Value > 0 THEN RETURN hproc.Value + PRINT " ---\\___ Created swap partition " & Left(spartition, Len("/dev/hda")) & (iPartCnt + 2) & " size = " & lTotalSwapNeeded & "MB" + ' register the new swap partition to the global class + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit GB print | grep \"^ " & (iPartCnt + 2) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sSwapPart = Left(spartition, Len("/dev/hda")) & (iPartCnt + 2) & "-" & sDump + + ' YET AGAIN + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart logical reiserfs " & lMbStart & "MB " & lMbEnd & "MB\"" WAIT + IF hproc.Value > 0 THEN RETURN hproc.Value + PRINT " ---\\___ Created / partition " & Left(spartition, Len("/dev/hda")) & (iPartCnt + 3) & " size = " & lMbSize & "MB" + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit GB print | grep \"^ " & (iPartCnt + 3) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sRootPart = Left(spartition, Len("/dev/hda")) & (iPartCnt + 3) & "-" & sDump + ELSE ' no swap needed + + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print free | grep -i \"free space\" tr -s \' \',\"\"" TO sDump + sDump = Trim(Replace(sDump, "MB", "")) + sDumparr = Split(sDump, " ") + lMbStart = sDumparr[0] + lMbEnd = sDumparr[1] + lMbSize = sDumparr[2] + hproc = SHELL "parted " & Left(spartition, Len("/dev/hda")) & " -s \"mkpart logical reiserfs " & lMbStart & "MB " & lMbEnd & "MB\"" WAIT + IF hproc.Value > 0 THEN RETURN hproc.Value + PRINT " ---\\___ Created / partition " & Left(spartition, Len("/dev/hda")) & (iPartCnt + 2) & " size = " & lMbSize & "MB" + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit GB print | grep \"^ " & (iPartCnt + 2) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sRootPart = Left(spartition, Len("/dev/hda")) & (iPartCnt + 2) & "-" & sDump + + + END IF + END IF + + + ClsGlobal.sTargetRoot = Trim(sRootPart) + ClsGlobal.sTargetSwap = Trim(sSwapPart) END Modified: branches/speedy/Step3a3a.class ============================================================================== --- branches/speedy/Step3a3a.class (original) +++ branches/speedy/Step3a3a.class Fri Mar 6 13:54:35 2009 @@ -41,7 +41,7 @@ PUBLIC FUNCTION GetNext() AS String - + RETURN "Step7" END |
From: <cod...@go...> - 2009-03-05 22:35:21
|
Author: M0...@gm... Date: Thu Mar 5 14:29:53 2009 New Revision: 510 Added: branches/speedy/Step3a3a.class branches/speedy/Step3a3a.form Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step3a3.pot branches/speedy/ClsGlobal.class branches/speedy/MdlAutoPartition.module branches/speedy/Step3a3.class branches/speedy/Step3a3.form Log: Began autopartition process based on user input and partition selection Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Thu Mar 5 14:29:53 2009 @@ -30,19 +30,19 @@ msgid "Quit" msgstr "" -#: MdlAutoPartition.module:112 +#: MdlAutoPartition.module:190 msgid "MB of free space" msgstr "" -#: MdlAutoPartition.module:182 +#: MdlAutoPartition.module:230 msgid "Existing Data" msgstr "" -#: MdlAutoPartition.module:203 +#: MdlAutoPartition.module:252 msgid "Total space for VectorLinux" msgstr "" -#: MdlAutoPartition.module:294 +#: MdlAutoPartition.module:346 msgid "Select the location to which we will resize" msgstr "" @@ -493,7 +493,7 @@ msgid "Partitioning stage complete. Click" msgstr "" -#: Step3a1a.class:177 Step3a2.class:359 Step5.class:177 +#: Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:69 Step5.class:177 msgid "to continue" msgstr "" @@ -593,12 +593,55 @@ "back and select another partitioning method" msgstr "" -#: Step3a3.class:22 +#: Step3a3.class:23 Step3a3a.class:113 msgid "Claim free space from existing partitions" msgstr "" -#: Step3a3.class:144 -msgid "Select which partition to resize in order to make room for VectorLinux" +#: Step3a3.class:100 +msgid "" +"Select which partition to resize and use the slider below it to adjust the " +"ammount of space to be used by VectorLinux" +msgstr "" + +#: Step3a3a.class:26 +msgid "You are about to shink" +msgstr "" + +#: Step3a3a.class:26 +msgid "to make room for your vectorlinux installation." +msgstr "" + +#: Step3a3a.class:26 +msgid "" +"This is generally a safe procedure, however, you should always consider " +"making copies of your valuable data before making changes such as this one " +"to your system" +msgstr "" + +#: Step3a3a.class:26 +msgid "When you are ready to continue, click the" +msgstr "" + +#: Step3a3a.class:26 +msgid "button." +msgstr "" + +#: Step3a3a.class:64 +msgid "" +"Shrinking partitions and creating new environment for VectorLinux ... Please " +"Wait" +msgstr "" + +#: Step3a3a.class:69 +msgid "Partitions are ready for VectorLinux. Click" +msgstr "" + +#: Step3a3a.class:130 +msgid "Warning" +msgstr "" + +#: Step3a3a.class:160 +msgid "Shrink partitions now" msgstr "" #: Step4.class:23 Modified: branches/speedy/.lang/Step3a3.pot ============================================================================== --- branches/speedy/.lang/Step3a3.pot (original) +++ branches/speedy/.lang/Step3a3.pot Thu Mar 5 14:29:53 2009 @@ -14,11 +14,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step3a3.class:22 +#: Step3a3.class:23 msgid "Claim free space from existing partitions" msgstr "" -#: Step3a3.class:144 -msgid "Select which partition to resize in order to make room for VectorLinux" +#: Step3a3.class:100 +msgid "Select which partition to resize and use the slider below it to adjust the ammount of space to be used by VectorLinux" msgstr "" Modified: branches/speedy/ClsGlobal.class ============================================================================== --- branches/speedy/ClsGlobal.class (original) +++ branches/speedy/ClsGlobal.class Thu Mar 5 14:29:53 2009 @@ -68,3 +68,7 @@ STATIC PUBLIC sBulkListToInstall AS String STATIC PUBLIC sPkgListToInstall AS String +' auto partition by shinking existing partitions +STATIC PUBLIC lTotalMBforVL AS Long + + Modified: branches/speedy/MdlAutoPartition.module ============================================================================== --- branches/speedy/MdlAutoPartition.module (original) +++ branches/speedy/MdlAutoPartition.module Thu Mar 5 14:29:53 2009 @@ -24,6 +24,124 @@ PRIVATE picDrive AS Picture PRIVATE myProgs AS Object[] +PUBLIC sPartitionToShrink AS String +PUBLIC lMBAmmountToUseForVL AS Long + + +PUBLIC FUNCTION PERFORM_AUTO_PARTITION_FROM_FREE_SPACE(sPartition AS String) AS Integer + + ' trigger the automatic partitioning process. + DIM hproc AS Process + DIM sPartitionString, sFs, sResizeCommand, sDump, sPartPrefx AS String + DIM sLine, partedDump, sMountDumpArr AS String[] + DIM lCurrentSize AS Long + DIM i, iPart AS Integer + DIM lEndMark AS Long + DIM bSwapNeeded AS Boolean + DIM sSwapPart, sRootPart AS String + + lMBAmmountToUseForVL = ClsGlobal.lTotalMBforVL + + PRINT " --- -> Preparing to allocate " & lMBAmmountToUseForVL & " MB of space for VectorLinux from " & sPartition & " <- ---" + WAIT 1 + iPart = Right(sPartition, Len(sPartition) - Len("/dev/hda")) + IF iPart < 10 THEN + sPartPrefx = " " + ELSE + sPartPrefx = "" + END IF + + ' search for the partition information + FOR i = 0 TO sResizableList.Max + IF Left(Trim(sResizableList[i]), Len("/dev/hda1")) = Trim(sPartition) THEN + sPartitionString = Trim(sResizableList[i]) + END IF + NEXT ' we got the partition string now + + ' Ths string is formatted like this + ' Filesystem Type 1M-blocks Used Available Use% Mounted on + + ' split it in spaces + sLine = Split(sPartitionString, " ") + sFs = Trim(sLine[1]) + lCurrentSize = sLine[2] + + IF lMBAmmountToUseForVL <= 0 THEN + Message.Error("I dont know how much space to use for VL") + RETURN + END IF + + SELECT CASE sFs + CASE "ntfs", "NTFS" + sResizeCommand = "ntfsresize -s " & (lCurrentSize - lMBAmmountToUseForVL) & "m" & Space(1) & sPartition + CASE "ext2", "ext3", "*fat*", "hfsx", "hfs+", "hfs", "linux-swap" + SHELL "parted " & Left(sPartition, Len("/dev/hda")) & " unit mb print | tr -s \' \',\"\" | grep \"^" & sPartPrefx & iPart & "\"" TO sDump + sDump = Trim(sDump) + 'Number Start End Size Type File system Flags + '1 0.03MB 12256MB 12256MB primary reiserfs + partedDump = Split(sDump, " ") + lEndMark = Trim(partedDump[2]) + sResizeCommand = "parted " & sPartition & " unit mb resize " & iPart & Space(1) & Trim(partedDump[1]) & "m" & Space(1) & lEndMark - lMBAmmountToUseForVL & "m" + CASE "reiserfs" + 'r resize_reiserfs -s -1G /dev/hda8 ( see man resize_reiserfs ) + sResizeCommand = "resize_reiserfs -s -" & lMBAmmountToUseForVL & "M" & Space(1) & sPartition + + CASE ELSE + Message.Error("I dont know how to resize a pertition type " & sFs) + END SELECT + + + 'Message(sResizeCommand) + ' MAKE SURE THE PARTITION IS NOT MOUNTED BEFORE PROCEEDING + SHELL "mount | grep ^" & sPartition TO sDump + sDump = Trim(sDump) + sMountDumpArr = Split(sDump, "\n") + FOR i = 0 TO sMountDumpArr.Max + SHELL "umount -f " & sPartition + NEXT + + ' Just to make sure + SHELL "mount | grep ^" & sPartition TO sDump + sDump = Trim(sDump + IF Len(sDump) > 0 THEN + Message.Error(sPartition & Space(1)("is currently being used. Unable to umount it.") & "<br>" & + ("Try another partitioning method")) + RETURN 1 + END IF + + + ' run the actual command + hproc = SHELL sResizeCommand WAIT + IF hproc.Value > 0 THEN + RETURN hproc.Value + END IF + + ' create new partitions now that we're here ============================================================================================ + ' do we need to create a swap partition? + SHELL "probepart | grep -i \"linux swap\"" TO sDump + sDump = Trim(sDump) + IF sDump THEN + bSwapNeeded = FALSE + sDumparr = Split(sDump, "\n") + sLine = Split(sDumparr[0], " ") + sSwapPart = Trim(sLine[0]) + ELSE + bSwapNeeded = TRUE + END IF + + + + + + + + + + +END + + + PUBLIC SUB DISPLAY_PARTITIONS_WITH_FREE_SPACE(hostContainer AS Container) @@ -51,7 +169,10 @@ picDrive = Picture.Load("images/hdd.png") - + PRINT " ---\\_ Shrink existing partitions to make room for VL" + + WAIT + SHELL "df -Th | grep \"^/dev/\" | cut -f 1 -d \' \'" TO sPreMountList '| tr -s \' \',\"\"" TO sPreMountList 'Message(sPreMountList) sDumparr = Split(sPreMountList, "\n") @@ -105,7 +226,9 @@ lUsedMB = Trim(sLineArr[3]) lFreeMB = Trim(sLineArr[4]) 'Message(sLineArr[0] & Space(1) & "fREE SPACE " & sLineArr[4] & " Mb") + IF lFreeMB >= 10240 THEN ' only if free space is equal to or greater than 10GB + IF Trim(sLineArr[1]) <> "*xfs*" OR Trim(sLineArr[1]) <> "*jfs*" THEN 'only if fs is not xfs or jfs sResizableList.Add(Trim(sResults[i])) rb = NEW RadioButton(hostContainer) AS "PartitionOptions" WITH rb @@ -150,10 +273,11 @@ .BackColor = Color.SelectedBackground .Expand = FALSE .Text = ("Existing Data") - '.Width = .Parent.Width / 2 + .Width = .Parent.Width / 2 '.Width = .Parent.Width - (((lUsedMB + (4 * 1024)) + (lFreeMB / 2) / lFreeMB) / 100) * 100 .Height = .Parent.Height .Alignment = Align.Center + '.Visible = TRUE .tag = .Parent.Tag END WITH myProgs.Add(tl) @@ -161,7 +285,7 @@ WITH tl .Text = ClsGlobal.sDistroName .Height = .Parent.Height - .Width = .Parent.Width * 0.5 + '.Width = .Parent.Width * 0.5 .Expand = TRUE .BackColor = Color.LightBackground .Alignment = Align.Center @@ -211,21 +335,24 @@ ' END WITH END IF + END IF NEXT IF objContainters.count > 0 THEN objContainters[0].visible = TRUE - IF objSliders.Count > 0 THEN - objSliders[0].setfocus - END IF + FOR EACH tl IN myProgs + FOR EACH sl IN objSliders + IF tl.Tag = sl.tag THEN + 'Message(sl.value) + tl.Width = tl.Parent.Width / 2 + END IF + NEXT + NEXT + END -PUBLIC SUB Slider_click() - - - -END + PUBLIC SUB Slider_change() @@ -264,8 +391,10 @@ LAST.tooltip = ("Select the location to which we will resize") & Space(1) & LAST.tag FOR EACH tl IN objTls IF tl.Tag = LAST.tag THEN + tl.Text = ("Total space for VectorLinux") & ":" & Space(1) & (100 - LAST.Value) & "%" & Space(1) & "-" & " ( " & sAllocated & " MB )" - + 'lMBAmmountToUseForVL = sAllocated + ClsGlobal.lTotalMBforVL = sAllocated END IF NEXT Modified: branches/speedy/Step3a3.class ============================================================================== --- branches/speedy/Step3a3.class (original) +++ branches/speedy/Step3a3.class Thu Mar 5 14:29:53 2009 @@ -19,76 +19,32 @@ 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 - - - + ME.tlbanner.Text = "<h2>" & ("Claim free space from existing partitions") & "</h2>" END - - - PUBLIC FUNCTION GetNExt() AS String - + RETURN "Step3a3a" END PUBLIC SUB StartUp() + WAIT MdlAutoPartition.DISPLAY_PARTITIONS_WITH_FREE_SPACE(ME.ScrollView1) '(ME.ListContainer1) '(ME.ScrollView1) '(ME.HpnlChoices) END PUBLIC SUB OnExit() - + DIM rb AS RadioButton + FOR EACH rb IN MdlAutoPartition.objRbs + IF rb.Value = TRUE THEN + MdlAutoPartition.sPartitionToShrink = rb.Tag + 'MdlAutoPartition.lMBAmmountToUseForVL = + END IF + NEXT END Modified: branches/speedy/Step3a3.form ============================================================================== --- branches/speedy/Step3a3.form (original) +++ branches/speedy/Step3a3.form Thu Mar 5 14:29:53 2009 @@ -22,12 +22,12 @@ Expand = True } { tlExp TextLabel - MoveScaled(1,8,67,4) + MoveScaled(1,8,67,6) Expand = True - Text = ("Select which partition to resize in order to make room for VectorLinux") + Text = ("Select which partition to resize and use the slider below it to adjust the ammount of space to be used by VectorLinux") } { ScrollView1 ScrollView - MoveScaled(1,13,68,33) + MoveScaled(1,16,73,33) Expand = True Arrangement = Arrange.Row Spacing = 2 Added: branches/speedy/Step3a3a.class ============================================================================== --- (empty file) +++ branches/speedy/Step3a3a.class Thu Mar 5 14:29:53 2009 @@ -0,0 +1,82 @@ +' Gambas class file + +' This file is part of vinstall-ng + +' vinstall-ng is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 2 of the License, or +' (at your option) any later version. + +' vinstall-ng is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. + +' You should have received a copy of the GNU General Public License +' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>. + +PUBLIC SUB Form_Open() + + DIM sText AS String + + ME.tlExp.Text = "<h2>" & ME.tlExp.text & "</h2>" + + sText = ("You are about to shink") & Space(1) & MdlAutoPartition.sPartitionToShrink & Space(1) & ("to make room for your vectorlinux installation.") & Space(1)& + ("This is generally a safe procedure, however, you should always consider making copies of your valuable data before making changes such as this one to your system")& + "<br><br>" & ("When you are ready to continue, click the") & Space(1) & "\"<b>" & btstart.Text & "\" </b>" & Space(1) & ("button.") + ClsGlobal.fRunningMainForm.btnext.enabled = FALSE + ME.tlWarning.Text = sText + ME.tlbanner.Text = "<h2>" & ME.tlbanner.Text & "</h2>" + ME.hbox2.Visible = FALSE + + +END + +PUBLIC SUB OnExit() + + + +END + + +PUBLIC FUNCTION GetNext() AS String + + + +END + +PUBLIC SUB StartUP() + +ME.btStart.Enabled = TRUE +ME.HBox2.Visible = FALSE +ME.tlWarning.Visible = TRUE +ME.MovieBox1.Enabled = TRUE +ClsGlobal.fRunningMainForm.btnext.enabled = FALSE + +END + + +PUBLIC SUB btStart_Click() + + ME.tlWarning.Visible = FALSE + ME.HBox2.Visible = TRUE + ME.MovieBox1.path = "images/throbber.gif" + ME.tlExp.Text = ("Shrinking partitions and creating new environment for VectorLinux ... Please Wait") + ME.MovieBox1.Playing = TRUE + LAST.enabled = FALSE + MdlAutoPartition.PERFORM_AUTO_PARTITION_FROM_FREE_SPACE(MdlAutoPartition.sPartitionToShrink) + + ME.tlExp.Text = ("Partitions are ready for VectorLinux. Click") & Space(1) & "\"" & ClsGlobal.fRunningMainForm.btnext.text & "\"" & Space(1) & ("to continue") + MovieBox1.Playing = FALSE + ME.MovieBox1.Enabled = FALSE + ClsGlobal.fRunningMainForm.btnext.enabled = TRUE + + 'WAIT 10 + + 'ME.MovieBox1.Playing = FALSE + 'ClsGlobal.fRunningMainForm.btnext.enabled = TRUE + + + + +END Added: branches/speedy/Step3a3a.form ============================================================================== --- (empty file) +++ branches/speedy/Step3a3a.form Thu Mar 5 14:29:53 2009 @@ -0,0 +1,54 @@ +# Gambas Form File 2.0 + +{ Form Form + MoveScaled(0,0,80,67) + Text = ("") + Arrangement = Arrange.Row + { HPanel1 HPanel + MoveScaled(0,0,60,5) + Expand = True + { tlbanner TextLabel + MoveScaled(12,0,45,3) + Expand = True + Text = ("Claim free space from existing partitions") + } + { Separator1 Separator + MoveScaled(13,4,25,1) + Expand = True + } + } + { HBox1 HBox + MoveScaled(0,5,10,2) + Expand = True + } + { tlExp TextLabel + MoveScaled(1,8,67,4) + Expand = True + Text = ("Warning") + } + { tlWarning TextLabel + MoveScaled(1,12,62,10) + Expand = True + Padding = 2 + Text = ("") + Border = Border.Etched + } + { HBox2 HBox + MoveScaled(7,22,56,38) + Visible = False + Expand = True + { MovieBox1 MovieBox + MoveScaled(9,3,40,34) + Expand = True + Path = "/home/vluser/devel/speedy/images/throbber.gif" + } + } + { HBox3 HBox + MoveScaled(1,60,6,2) + Expand = True + } + { btStart Button + MoveScaled(1,62,20,3) + Text = ("Shrink partitions now") + } +} |
From: <cod...@go...> - 2009-03-04 22:28:39
|
Author: M0...@gm... Date: Wed Mar 4 14:27:37 2009 New Revision: 509 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step3a3.pot branches/speedy/MdlAutoPartition.module branches/speedy/Step3a3.class branches/speedy/Step3a3.form Log: Finished autopartition section for resizing existing partitions Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Wed Mar 4 14:27:37 2009 @@ -30,16 +30,20 @@ msgid "Quit" msgstr "" -#: MdlAutoPartition.module:114 -msgid "Percentage of free space to use for VectorLinux" +#: MdlAutoPartition.module:112 +msgid "MB of free space" msgstr "" -#: MdlAutoPartition.module:179 -msgid "Select the location to which we will resize" +#: MdlAutoPartition.module:182 +msgid "Existing Data" msgstr "" -#: MdlAutoPartition.module:182 -msgid "Percentage of free space used for VectorLinux" +#: MdlAutoPartition.module:203 +msgid "Total space for VectorLinux" +msgstr "" + +#: MdlAutoPartition.module:294 +msgid "Select the location to which we will resize" msgstr "" #: MdlMain.module:33 @@ -591,6 +595,10 @@ #: Step3a3.class:22 msgid "Claim free space from existing partitions" +msgstr "" + +#: Step3a3.class:144 +msgid "Select which partition to resize in order to make room for VectorLinux" msgstr "" #: Step4.class:23 Modified: branches/speedy/.lang/Step3a3.pot ============================================================================== --- branches/speedy/.lang/Step3a3.pot (original) +++ branches/speedy/.lang/Step3a3.pot Wed Mar 4 14:27:37 2009 @@ -18,3 +18,7 @@ msgid "Claim free space from existing partitions" msgstr "" +#: Step3a3.class:144 +msgid "Select which partition to resize in order to make room for VectorLinux" +msgstr "" + Modified: branches/speedy/MdlAutoPartition.module ============================================================================== --- branches/speedy/MdlAutoPartition.module (original) +++ branches/speedy/MdlAutoPartition.module Wed Mar 4 14:27:37 2009 @@ -15,10 +15,15 @@ ' 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 -PRIVATE objProgs AS Object[] -PRIVATE objSliders AS Object[] -PRIVATE objTls AS Object[] -PRIVATE sResizableList AS String[] +PUBLIC objProgs AS Object[] +PUBLIC objSliders AS Object[] +PUBLIC objTls AS Object[] +PUBLIC sResizableList AS String[] +PUBLIC objContainters AS Object[] +PUBLIC objRbs AS Object[] +PRIVATE picDrive AS Picture +PRIVATE myProgs AS Object[] + PUBLIC SUB DISPLAY_PARTITIONS_WITH_FREE_SPACE(hostContainer AS Container) @@ -30,13 +35,22 @@ DIM rb AS RadioButton DIM pb AS ProgressBar DIM sl AS Slider - DIM hb AS HBox + DIM hb AS hpanel DIM tl AS TextLabel + DIM hr AS Separator + DIM picb AS PictureBox + DIM hobox AS Panel + objProgs = NEW Object[] objSliders = NEW Object[] sResizableList = NEW String[] objTls = NEW Object[] + objRbs = NEW Object[] + objContainters = NEW Object[] + myProgs = NEW Object[] + + picDrive = Picture.Load("images/hdd.png") SHELL "df -Th | grep \"^/dev/\" | cut -f 1 -d \' \'" TO sPreMountList '| tr -s \' \',\"\"" TO sPreMountList 'Message(sPreMountList) @@ -93,33 +107,82 @@ 'Message(sLineArr[0] & Space(1) & "fREE SPACE " & sLineArr[4] & " Mb") IF lFreeMB >= 10240 THEN ' only if free space is equal to or greater than 10GB sResizableList.Add(Trim(sResults[i])) - rb = NEW RadioButton(hostContainer) + rb = NEW RadioButton(hostContainer) AS "PartitionOptions" WITH rb - .Text = Trim(sLineArr[0]) & Space(1) & "-" & Trim(sLineArr[4]) + .Text = Trim(sLineArr[0]) & Space(1) & "-" & Space(1) & Trim(sLineArr[4]) & Space(1) & ("MB of free space") .tag = Trim(sLineArr[0]) .Height = 21 .Expand = TRUE END WITH - pb = NEW ProgressBar(hostContainer) AS "UseageBar" - WITH pb - .Tag = Trim(sLineArr[0]) + objRbs.Add(rb) + + + hb = NEW hpanel(hostContainer) + WITH hb + .Expand = TRUE + .Height = 72 + .Tag = Trim(sLineArr[0]) + .Visible = FALSE + END WITH + objContainters.Add(hb) + + + + hr = NEW Separator(hb) + WITH hr + .Expand = TRUE + .Height = 8 + .tag = Trim(sLineArr[0]) + END WITH + hobox = NEW Panel(hb) + WITH hobox .Height = 21 + '.Width = .Parent.Width / 2 + .Tag = Trim(sLineArr[0]) + .Expand = TRUE + .Arrangement = Arrange.Row + '.Padding = 4 + .BackColor = Color.LightBackground + END WITH + 'panels.Add(hobox) + tl = NEW TextLabel(hobox) + WITH tl + .BackColor = Color.SelectedBackground + .Expand = FALSE + .Text = ("Existing Data") + '.Width = .Parent.Width / 2 + '.Width = .Parent.Width - (((lUsedMB + (4 * 1024)) + (lFreeMB / 2) / lFreeMB) / 100) * 100 + .Height = .Parent.Height + .Alignment = Align.Center + .tag = .Parent.Tag + END WITH + myProgs.Add(tl) + tl = NEW TextLabel(hobox) + WITH tl + .Text = ClsGlobal.sDistroName + .Height = .Parent.Height + .Width = .Parent.Width * 0.5 .Expand = TRUE - .Value = lUsedMB / lTotalMB - .Label = TRUE + .BackColor = Color.LightBackground + .Alignment = Align.Center + .Tag = .Parent.Tag & "R" END WITH - objProgs.Add(pb) - tl = NEW TextLabel(hostContainer) + + tl = NEW TextLabel(hb) WITH tl - .Text = ("Percentage of free space to use for VectorLinux") + .Text = ("Total space for VectorLinux") & ":" & Space(1) .Height = 21 + '.Width = .Parent.Width * 0.5 .Alignment = Align.Left + .BackColor = Color.Transparent .Expand = TRUE .tag = Trim(sLineArr[0]) END WITH objTls.Add(tl) + + - sl = NEW Slider(hostContainer) AS "Slider" + sl = NEW Slider(hb) AS "Slider" WITH sl .Tag = Trim(sLineArr[0]) .Height = 21 @@ -133,6 +196,13 @@ '.Value = 50 END WITH objSliders.Add(sl) + hr = NEW Separator(hb) + WITH hr + .Expand = TRUE + .Height = 4 + .Tag = Trim(sLineArr[0]) + END WITH + ' hb = NEW HBox(hostContainer) ' WITH hb @@ -142,47 +212,77 @@ END IF NEXT - + + IF objContainters.count > 0 THEN objContainters[0].visible = TRUE + IF objSliders.Count > 0 THEN + objSliders[0].setfocus + END IF + + +END + +PUBLIC SUB Slider_click() + + + END PUBLIC SUB Slider_change() DIM pb AS ProgressBar - DIM fMin AS Long + DIM hb AS Panel + DIM fMin AS Float DIM fVal AS Float DIM i AS Integer DIM sMatch AS String DIM sLine AS String[] DIM lFree, lMin, ltotal, lval AS Long - DIM tl AS TextLabel + DIM tl, tlr AS TextLabel + DIM sAllocated AS Long - - FOR EACH pb IN objProgs - - IF pb.tag = LAST.tag THEN fMin = pb.Value * 100 + ' FOR EACH pb IN objProgs + ' + ' IF pb.tag = LAST.tag THEN fMin = pb.Value * 100 FOR i = 0 TO sResizableList.Max IF Left(Trim(sResizableList[i]), Len("/dev/hda1")) = LAST.tag THEN 'Message("fount match") sMatch = Trim(sResizableList[i]) sLine = Split(sMatch, " ") - lFree = Trim(sLine[4]) + lFree = sLine[4] lTotal = Trim(sLine[2]) lMin = lFree + (4 * 1024) lval = (lMin / lTotal) * 10 END IF NEXT - NEXT - + 'NEXT + fmin = (LAST.value / 100) + 'Message(fmin) + sAllocated = ltotal - (lTotal * fMin) LAST.tooltip = ("Select the location to which we will resize") & Space(1) & LAST.tag FOR EACH tl IN objTls IF tl.Tag = LAST.tag THEN - tl.Text = ("Percentage of free space used for VectorLinux") & Space(1) & (LAST.Value) & "%" + tl.Text = ("Total space for VectorLinux") & ":" & Space(1) & (100 - LAST.Value) & "%" & Space(1) & "-" & " ( " & sAllocated & " MB )" + END IF NEXT + FOR EACH tl IN myProgs + IF tl.tag = LAST.tag THEN + tl.Width = tl.Parent.Width * (LAST.value / 100) + + END IF + + NEXT + +IF sAllocated <= (4 * 1024) THEN + Message("We need at least 4GB for vectorlinux") + STOP EVENT + RETURN +END IF + IF LAST.Value < lval THEN LAST.Value = lval Message("This is the minimum we can resize this partition to.") @@ -190,6 +290,18 @@ RETURN END IF +END + +PUBLIC SUB PartitionOptions_Click() + + DIM hb AS HPanel + FOR EACH hb IN objContainters + IF hb.tag = LAST.tag THEN + hb.visible = TRUE + ELSE + hb.visible = FALSE + END IF + NEXT END Modified: branches/speedy/Step3a3.class ============================================================================== --- branches/speedy/Step3a3.class (original) +++ branches/speedy/Step3a3.class Wed Mar 4 14:27:37 2009 @@ -83,11 +83,18 @@ END PUBLIC SUB StartUp() - MdlAutoPartition.DISPLAY_PARTITIONS_WITH_FREE_SPACE(ME.HpnlChoices) + MdlAutoPartition.DISPLAY_PARTITIONS_WITH_FREE_SPACE(ME.ScrollView1) '(ME.ListContainer1) '(ME.ScrollView1) '(ME.HpnlChoices) END PUBLIC SUB OnExit() +END + +PUBLIC SUB Form_Resize() + + 'ME.HpnlChoices.Height = ME.ClientH - (ME.tlExp.top + ME.tlExp.Height + 12) + ME.ScrollView1.Height = ME.ClientH - (ME.tlExp.Top + ME.tlExp.Height + 12) + END Modified: branches/speedy/Step3a3.form ============================================================================== --- branches/speedy/Step3a3.form (original) +++ branches/speedy/Step3a3.form Wed Mar 4 14:27:37 2009 @@ -4,7 +4,6 @@ MoveScaled(0,0,75,51) Text = ("") Arrangement = Arrange.Row - Padding = 4 { HPanel1 HPanel MoveScaled(0,0,60,5) Expand = True @@ -19,11 +18,21 @@ } } { HBox1 HBox - MoveScaled(0,5,10,3) + MoveScaled(0,5,10,2) Expand = True } - { HpnlChoices HPanel - MoveScaled(0,8,72,25) + { tlExp TextLabel + MoveScaled(1,8,67,4) Expand = True + Text = ("Select which partition to resize in order to make room for VectorLinux") + } + { ScrollView1 ScrollView + MoveScaled(1,13,68,33) + Expand = True + Arrangement = Arrange.Row + Spacing = 2 + Padding = 4 + Border = False + ScrollBar = Scroll.Vertical } } |
From: <cod...@go...> - 2009-03-03 22:33:44
|
Author: M0...@gm... Date: Tue Mar 3 14:32:17 2009 New Revision: 508 Modified: branches/speedy/.lang/.pot branches/speedy/MdlAutoPartition.module branches/speedy/Step3a3.form Log: More progress in the auto partiton section for resizing existing partition Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Tue Mar 3 14:32:17 2009 @@ -30,6 +30,18 @@ msgid "Quit" msgstr "" +#: MdlAutoPartition.module:114 +msgid "Percentage of free space to use for VectorLinux" +msgstr "" + +#: MdlAutoPartition.module:179 +msgid "Select the location to which we will resize" +msgstr "" + +#: MdlAutoPartition.module:182 +msgid "Percentage of free space used for VectorLinux" +msgstr "" + #: MdlMain.module:33 msgid "Unable to format" msgstr "" Modified: branches/speedy/MdlAutoPartition.module ============================================================================== --- branches/speedy/MdlAutoPartition.module (original) +++ branches/speedy/MdlAutoPartition.module Tue Mar 3 14:32:17 2009 @@ -15,14 +15,28 @@ ' 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 +PRIVATE objProgs AS Object[] +PRIVATE objSliders AS Object[] +PRIVATE objTls AS Object[] +PRIVATE sResizableList AS String[] + PUBLIC SUB DISPLAY_PARTITIONS_WITH_FREE_SPACE(hostContainer AS Container) DIM sDump, sPreMountList, sDfDump, sDrives, sPartition, sPartShort AS String DIM sResults, sDumparr, sLineArr AS String[] DIM sPost, sFinalList AS String + DIM lFreeMB, lTotalMB, lUsedMB AS Long DIM i, n AS Integer DIM rb AS RadioButton + DIM pb AS ProgressBar + DIM sl AS Slider DIM hb AS HBox + DIM tl AS TextLabel + objProgs = NEW Object[] + objSliders = NEW Object[] + sResizableList = NEW String[] + objTls = NEW Object[] + SHELL "df -Th | grep \"^/dev/\" | cut -f 1 -d \' \'" TO sPreMountList '| tr -s \' \',\"\"" TO sPreMountList 'Message(sPreMountList) @@ -60,7 +74,7 @@ sFinalList = sFinalList & sDump END IF END IF - SHELL "umount /mnt" & sPartShort & " 2>/dev/null" WAIT + SHELL "umount -f /mnt" &/ sPartShort & " 2> /dev/null" WAIT END IF @@ -73,7 +87,12 @@ FOR i = 0 TO sResults.Max ' Message(Trim(sResults[i])) sLineArr = Split(Trim(sResults[i]), " ") + lTotalMB = Trim(sLineArr[2]) + lUsedMB = Trim(sLineArr[3]) + lFreeMB = Trim(sLineArr[4]) 'Message(sLineArr[0] & Space(1) & "fREE SPACE " & sLineArr[4] & " Mb") + IF lFreeMB >= 10240 THEN ' only if free space is equal to or greater than 10GB + sResizableList.Add(Trim(sResults[i])) rb = NEW RadioButton(hostContainer) WITH rb .Text = Trim(sLineArr[0]) & Space(1) & "-" & Trim(sLineArr[4]) @@ -81,15 +100,96 @@ .Height = 21 .Expand = TRUE END WITH - hb = NEW HBox(hostContainer) - WITH hb - .Height = 12 - .Expand = TRUE - END WITH - - - + pb = NEW ProgressBar(hostContainer) AS "UseageBar" + WITH pb + .Tag = Trim(sLineArr[0]) + .Height = 21 + .Expand = TRUE + .Value = lUsedMB / lTotalMB + .Label = TRUE + END WITH + objProgs.Add(pb) + tl = NEW TextLabel(hostContainer) + WITH tl + .Text = ("Percentage of free space to use for VectorLinux") + .Height = 21 + .Alignment = Align.Left + .Expand = TRUE + .tag = Trim(sLineArr[0]) + END WITH + objTls.Add(tl) + + sl = NEW Slider(hostContainer) AS "Slider" + WITH sl + .Tag = Trim(sLineArr[0]) + .Height = 21 + .Expand = TRUE + .Value = ((lUsedMB + (4 * 1024)) + (lFreeMB / 2) / lFreeMB) / 100 + ' IF pb.Value < 0.5 THEN + ' .Value = 50 + ' ELSE + ' .Value = (pb.Value * 100) + ((pb.Value * 100) / 2) '/ 2 + ' END IF + '.Value = 50 + END WITH + objSliders.Add(sl) + + ' hb = NEW HBox(hostContainer) + ' WITH hb + ' .Height = 12 + ' .Expand = TRUE + ' END WITH + + END IF NEXT END + + +PUBLIC SUB Slider_change() + + DIM pb AS ProgressBar + DIM fMin AS Long + DIM fVal AS Float + DIM i AS Integer + DIM sMatch AS String + DIM sLine AS String[] + DIM lFree, lMin, ltotal, lval AS Long + DIM tl AS TextLabel + + + FOR EACH pb IN objProgs + + IF pb.tag = LAST.tag THEN fMin = pb.Value * 100 + FOR i = 0 TO sResizableList.Max + IF Left(Trim(sResizableList[i]), Len("/dev/hda1")) = LAST.tag THEN + + 'Message("fount match") + sMatch = Trim(sResizableList[i]) + sLine = Split(sMatch, " ") + lFree = Trim(sLine[4]) + lTotal = Trim(sLine[2]) + lMin = lFree + (4 * 1024) + lval = (lMin / lTotal) * 10 + + END IF + NEXT + NEXT + + LAST.tooltip = ("Select the location to which we will resize") & Space(1) & LAST.tag + FOR EACH tl IN objTls + IF tl.Tag = LAST.tag THEN + tl.Text = ("Percentage of free space used for VectorLinux") & Space(1) & (LAST.Value) & "%" + END IF + NEXT + + IF LAST.Value < lval THEN + LAST.Value = lval + Message("This is the minimum we can resize this partition to.") + STOP EVENT + RETURN + END IF + +END + Modified: branches/speedy/Step3a3.form ============================================================================== --- branches/speedy/Step3a3.form (original) +++ branches/speedy/Step3a3.form Tue Mar 3 14:32:17 2009 @@ -4,6 +4,7 @@ MoveScaled(0,0,75,51) Text = ("") Arrangement = Arrange.Row + Padding = 4 { HPanel1 HPanel MoveScaled(0,0,60,5) Expand = True |
From: <cod...@go...> - 2009-03-02 22:40:51
|
Author: M0...@gm... Date: Mon Mar 2 14:27:59 2009 New Revision: 507 Added: branches/speedy/MdlAutoPartition.module Removed: branches/speedy/MdlObjSizer.module Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step3a.pot branches/speedy/.lang/Step3a1.pot branches/speedy/Step3a.form branches/speedy/Step3a1.class branches/speedy/Step3a1.form branches/speedy/Step3a3.class branches/speedy/Step3a3.form Log: Finished free space detection and listing of partitions with free space Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Mon Mar 2 14:27:59 2009 @@ -10,19 +10,23 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: FMain0Old.class:233 FMain0.class:246 FMain.class:245 +#: .project:1 +msgid "VectorLinux Installer" +msgstr "" + +#: FMain.class:245 FMain0.class:246 FMain0Old.class:233 msgid "Process Overview" msgstr "" -#: FMain0Old.class:271 FMain0.class:288 FMain.class:287 +#: FMain.class:287 FMain0.class:288 FMain0Old.class:271 msgid "Back" msgstr "" -#: FMain0Old.class:282 FMain0.class:299 FMain.class:298 +#: FMain.class:298 FMain0.class:299 FMain0Old.class:282 msgid "Next" msgstr "" -#: FMain0Old.class:293 FMain0.class:310 FMain.class:309 +#: FMain.class:309 FMain0.class:310 FMain0Old.class:293 msgid "Quit" msgstr "" @@ -94,10 +98,6 @@ msgid "Final Configuration" msgstr "" -#: .project:1 -msgid "VectorLinux Installer" -msgstr "" - #: Step0.class:20 msgid "Localization Settings" msgstr "" @@ -216,7 +216,7 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:433 Step3a1a.class:186 Step3a1.class:22 Step7a.class:143 +#: Step1.class:433 Step3a1.class:22 Step3a1a.class:186 Step7a.class:143 msgid "WARNING:" msgstr "" @@ -340,6 +340,99 @@ 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:175 +msgid "Automatic" +msgstr "" + +#: Step3.class:185 +msgid "" +"Automatically resize your partitions and / or create the correct disk space " +"for VectorLinux." +msgstr "" + +#: Step3.class:192 +msgid "Manually resize my partitions " +msgstr "" + +#: Step3.class:202 +msgid "Use the partitioning tool to prepare your system partitions." +msgstr "" + +#: Step3.class:209 +msgid "My hard drive is already partitioned" +msgstr "" + +#: Step3.class:219 +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:122 +msgid "Use unpartitioned space on my hard disk (creates new partitions)" +msgstr "" + +#: Step3a.class:143 +msgid "Use free space on existing partitions for VectorLinux" +msgstr "" + +#: Step3a.class:164 +msgid "Use entire disk" +msgstr "" + +#: 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:74 +msgid "Total Disc Size" +msgstr "" + #: Step3a1a.class:21 msgid "Create Linux Partition Scheme in" msgstr "" @@ -416,18 +509,6 @@ msgid "Operation cancelled by user. No changes have been made to the system" msgstr "" -#: 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 "" - #: Step3a2.class:25 msgid "Install VectorLinux to free space on disk" msgstr "" @@ -500,87 +581,6 @@ msgid "Claim free space from existing partitions" 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:122 -msgid "Use unpartitioned space on my hard disk (creates new partitions)" -msgstr "" - -#: Step3a.class:144 -msgid "Use free space on existing partitions for VectorLinux" -msgstr "" - -#: Step3a.class:168 -msgid "Use entire disk" -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:175 -msgid "Automatic" -msgstr "" - -#: Step3.class:185 -msgid "" -"Automatically resize your partitions and / or create the correct disk space " -"for VectorLinux." -msgstr "" - -#: Step3.class:192 -msgid "Manually resize my partitions " -msgstr "" - -#: Step3.class:202 -msgid "Use the partitioning tool to prepare your system partitions." -msgstr "" - -#: Step3.class:209 -msgid "My hard drive is already partitioned" -msgstr "" - -#: Step3.class:219 -msgid "Install VectorLinux to existing partitions on my hard drive" -msgstr "" - #: Step4.class:23 msgid "Automatic Disc Partitioning" msgstr "" @@ -731,6 +731,34 @@ msgid "Select which partitions to use for installation" msgstr "" +#: Step7.class:19 +msgid "Select Installation Mode" +msgstr "" + +#: Step7.class:108 +msgid "Full Install" +msgstr "" + +#: Step7.class:118 +msgid "Install everthing in the image (Fully Automated)" +msgstr "" + +#: Step7.class:126 Step8.class:120 +msgid "Customized" +msgstr "" + +#: Step7.class:136 +msgid "Select the components you wish to install (Advanced)" +msgstr "" + +#: Step7.class:144 Step8.class:122 +msgid "Minimal" +msgstr "" + +#: Step7.class:154 +msgid "Install the most minimal working confuguration (For older hardware)" +msgstr "" + #: Step7a.class:27 Step7b.class:23 msgid "Customize Your VectorLinux Installation" msgstr "" @@ -785,34 +813,6 @@ msgid "" "Additional optional software available. Select which software packages to " "include in your installation." -msgstr "" - -#: Step7.class:19 -msgid "Select Installation Mode" -msgstr "" - -#: Step7.class:108 -msgid "Full Install" -msgstr "" - -#: Step7.class:118 -msgid "Install everthing in the image (Fully Automated)" -msgstr "" - -#: Step7.class:126 Step8.class:120 -msgid "Customized" -msgstr "" - -#: Step7.class:136 -msgid "Select the components you wish to install (Advanced)" -msgstr "" - -#: Step7.class:144 Step8.class:122 -msgid "Minimal" -msgstr "" - -#: Step7.class:154 -msgid "Install the most minimal working confuguration (For older hardware)" msgstr "" #: Step8.class:44 Modified: branches/speedy/.lang/Step3a.pot ============================================================================== --- branches/speedy/.lang/Step3a.pot (original) +++ branches/speedy/.lang/Step3a.pot Mon Mar 2 14:27:59 2009 @@ -50,11 +50,11 @@ msgid "Use unpartitioned space on my hard disk (creates new partitions)" msgstr "" -#: Step3a.class:144 +#: Step3a.class:143 msgid "Use free space on existing partitions for VectorLinux" msgstr "" -#: Step3a.class:168 +#: Step3a.class:164 msgid "Use entire disk" msgstr "" Modified: branches/speedy/.lang/Step3a1.pot ============================================================================== --- branches/speedy/.lang/Step3a1.pot (original) +++ branches/speedy/.lang/Step3a1.pot Mon Mar 2 14:27:59 2009 @@ -26,7 +26,7 @@ msgid "All existing data in the device you select here will be destroyed." msgstr "" -#: Step3a1.class:68 +#: Step3a1.class:74 msgid "Total Disc Size" msgstr "" Added: branches/speedy/MdlAutoPartition.module ============================================================================== --- (empty file) +++ branches/speedy/MdlAutoPartition.module Mon Mar 2 14:27:59 2009 @@ -0,0 +1,95 @@ +' 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/>. +PRIVATE sMountedList AS String +PUBLIC SUB DISPLAY_PARTITIONS_WITH_FREE_SPACE(hostContainer AS Container) + + DIM sDump, sPreMountList, sDfDump, sDrives, sPartition, sPartShort AS String + DIM sResults, sDumparr, sLineArr AS String[] + DIM sPost, sFinalList AS String + DIM i, n AS Integer + DIM rb AS RadioButton + DIM hb AS HBox + + SHELL "df -Th | grep \"^/dev/\" | cut -f 1 -d \' \'" TO sPreMountList '| tr -s \' \',\"\"" TO sPreMountList + 'Message(sPreMountList) + sDumparr = Split(sPreMountList, "\n") + FOR i = 0 TO sDumparr.Max + IF InStr(sFinalList, Trim(sDumparr[i])) = FALSE THEN + SHELL "df -Tm | grep \"" & Trim(sDumparr[i]) & "\" | tr -s \' \', \"\"" TO sDump + sFinalList = sFinalList & sDump + END IF + NEXT + + + SHELL "probepart | grep \"^/dev/\" | tr -s \' \',\"\" | cut -f 1 -d \' \'" TO sDump + 'Message(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 + 'IF NOT InStr(Trim(sPreMountList), Trim(sPartition)) THEN + 'IF InStr(Trim(sPreMountList), Trim(sPartition)) = FALSE THEN + IF InStr(sFinalList, Trim(sPartition)) = FALSE THEN + 'Message(sPartition & " is not in the pre-mounted list") + SHELL "mkdir -p /mnt" &/ sPartShort & " 2> /dev/null" WAIT + SHELL "mount -o ro " & sPartition & Space(1) & "/mnt" &/ sPartShort & " 2> /dev/null" WAIT + 'SHELL "df -Th | grep \"^" & sPartition & "\" | head -n 1 | tr -s \' \',\"\"" TO sDump + SHELL "df -Tm /mnt" &/ sPartShort & " | grep \"^/dev/\"| tr -s \' \',\"\"" TO sDump + 'Message(sDump) + 'sPost = sPost & sDump + IF InStr(sFinalList, sDump) = FALSE THEN + IF InStr(sDump, ClsGlobal.sSourceAddr) = FALSE THEN + sFinalList = sFinalList & sDump + END IF + END IF + SHELL "umount /mnt" & sPartShort & " 2>/dev/null" WAIT + + END IF + + NEXT + + + 'Message(sFinalList) + sFinalList = Trim(sFinalList) + sResults = Split(sFinalList, "\n") + FOR i = 0 TO sResults.Max + ' Message(Trim(sResults[i])) + sLineArr = Split(Trim(sResults[i]), " ") + 'Message(sLineArr[0] & Space(1) & "fREE SPACE " & sLineArr[4] & " Mb") + rb = NEW RadioButton(hostContainer) + WITH rb + .Text = Trim(sLineArr[0]) & Space(1) & "-" & Trim(sLineArr[4]) + .tag = Trim(sLineArr[0]) + .Height = 21 + .Expand = TRUE + END WITH + hb = NEW HBox(hostContainer) + WITH hb + .Height = 12 + .Expand = TRUE + END WITH + + + + NEXT + +END + Modified: branches/speedy/Step3a.form ============================================================================== --- branches/speedy/Step3a.form (original) +++ branches/speedy/Step3a.form Mon Mar 2 14:27:59 2009 @@ -48,27 +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 + MoveScaled(5,11,40,4) Expand = True Text = ("") } { HBox3 HBox MoveScaled(1,14,6,2) - Visible = False Expand = True } { rbEntireDisk RadioButton - MoveScaled(2,18,34,3) + MoveScaled(2,19,34,3) Expand = True Text = ("Use entire disk") } @@ -76,7 +72,7 @@ MoveScaled(2,20,3,3) } { tlEntireDisc TextLabel - MoveScaled(6,20,32,4) + MoveScaled(6,21,32,4) Expand = True Text = ("") } Modified: branches/speedy/Step3a1.class ============================================================================== --- branches/speedy/Step3a1.class (original) +++ branches/speedy/Step3a1.class Mon Mar 2 14:27:59 2009 @@ -20,10 +20,9 @@ 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 + +ME.objPosTargets = NEW Object[] + ME.DISPLAY_POSSIBLE_DISK_TARGETS() END PUBLIC SUB DISPLAY_POSSIBLE_DISK_TARGETS() @@ -62,6 +61,13 @@ .Expand = FALSE .Width = 30 .Height = 30 + END WITH + pb = NEW PictureBox(pn) + WITH pb + .Picture = Picture.Load("images/hdd.png") + .Expand = TRUE + .Height = 22 + .Width = 22 END WITH tl = NEW TextLabel(hpanel2) ' Hard disk information WITH tl Modified: branches/speedy/Step3a1.form ============================================================================== --- branches/speedy/Step3a1.form (original) +++ branches/speedy/Step3a1.form Mon Mar 2 14:27:59 2009 @@ -49,8 +49,11 @@ Visible = False } { pn Panel - MoveScaled(28,41,5,2) + MoveScaled(28,40,5,3) Visible = False + { pb PictureBox + MoveScaled(1,0,3,3) + } } { tl TextLabel MoveScaled(38,41,9,2) Modified: branches/speedy/Step3a3.class ============================================================================== --- branches/speedy/Step3a3.class (original) +++ branches/speedy/Step3a3.class Mon Mar 2 14:27:59 2009 @@ -20,47 +20,47 @@ PUBLIC SUB Form_Open() ME.tlbanner.Text = "<h2>" & ("Claim free space from existing partitions") & "</h2>" - ME.DISPLAY_RESIZABLE_PARTITIONS() + '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 - + ' ' + ' ' 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 + ' ' @@ -83,7 +83,7 @@ END PUBLIC SUB StartUp() - + MdlAutoPartition.DISPLAY_PARTITIONS_WITH_FREE_SPACE(ME.HpnlChoices) END PUBLIC SUB OnExit() Modified: branches/speedy/Step3a3.form ============================================================================== --- branches/speedy/Step3a3.form (original) +++ branches/speedy/Step3a3.form Mon Mar 2 14:27:59 2009 @@ -8,13 +8,21 @@ MoveScaled(0,0,60,5) Expand = True { tlbanner TextLabel - MoveScaled(12,0,19,3) + MoveScaled(12,0,45,3) Expand = True - Text = ("") + Text = ("Claim free space from existing partitions") } { Separator1 Separator MoveScaled(13,4,25,1) Expand = True } + } + { HBox1 HBox + MoveScaled(0,5,10,3) + Expand = True + } + { HpnlChoices HPanel + MoveScaled(0,8,72,25) + Expand = True } } |
From: Kocil <k0...@ya...> - 2009-03-01 15:29:11
|
Hi Ram. I'm at Osaka, Japan now. I left SD at 25/2, and have been stayed at LA since 25/2 until 27/2. I and my friend were renting a car. We took the beach side road, sight seeing the beautiful beach on 25/2. It was a little bit cold (at least for me, a tropical creature ;) ) So I did not touch the wet nor taste the saltiness of the sea water. But my eyes were really satisfied, looking at the sand, ocean, and sunset. On 26/2, we enjoyed universal studio for a day long. Then all of my sense were tickling, especially by the Simpson ride. On 27/3, the last day, we were hunting for cheap taking home gift. Lucky us, there is the CircuitCity business closing down sale. I got Sony DVD Camcorder and Nikon Camera for 40% off. What a pity, I could not buy any mobile phone, because they are locked to AT&T or Veryzone :( Anyway, I felt sorry for the owner and employee of the CircuitCity. They must be some of the recent victims, hit by the US rececion. I saw on the TV, there are so many lay off, and so long job seeker queue. However, I also watched the Obama's address to congress speech. It was brilliant, giving back the spirit just needed by the American. Hopefully you are going well guys. Your country, as well as the rest of the world, depends on it. Don't quit, because for us, we can't quit to anywhere else (American may escape to the space I guess, just kidding ;-) ). Bye Ram, bye USA. Eko --- On Fri, 2/27/09, Sriram Durbha <sri...@gm...> wrote: > From: Sriram Durbha <sri...@gm...> > Subject: Re: [Vectorlinux-devel] I'm going to LA > To: "Vector Linux developer's list" <vec...@li...> > Date: Friday, February 27, 2009, 6:05 AM > Hey Kocil, > Looks like i cant make it to SD before tomorrow either :( > . > Is there a phone number that i can call you at while you > are here? > [ I Hope its not too late.. but make sure you visit Point > Loma and Sea World > before you leave!! ] > > Cheers > Ram > > 2009/2/21 uel archuletta <ue...@gm...> > > > I wish i could be there Kocil, > > But unfortunately I wont be able to make it. > > > > > > On 2/21/09, Kocil <k0...@ya...> wrote: > >> > >> Hi all. > >> > >> I'll stay at Estansia La Jolla Hotel from Feb > 21 - 24, > >> attending the HP Technology for Teaching Award > Conference. > >> In fact, I'm sending this from the Hotel room > :D > >> > >> After that, I will have 2 days for traveling > around. > >> My return ticket is from LA at Feb 27 night. > >> > >> Cheers. > >> Eko. > >> > >> > >> --- On Fri, 2/20/09, Sriram Durbha > <sri...@gm...> wrote: > >> > >> > From: Sriram Durbha > <sri...@gm...> > >> > Subject: Re: [Vectorlinux-devel] I'm > going to LA > >> > To: "Vector Linux developer's > list" < > >> vec...@li...> > >> > Date: Friday, February 20, 2009, 10:46 AM > >> > >> > 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 > >> > > > >> > > > >> > > >> > ------------------------------------------------------------------------------ > >> > 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 > >> > > > > > > > > > ------------------------------------------------------------------------------ > > 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: <cod...@go...> - 2009-02-26 20:30:53
|
Author: M0E.lnx Date: Thu Feb 26 12:27:03 2009 New Revision: 506 Modified: wiki/screenshots.wiki Log: Added screenshots for final configuration steps Editied via the WWW interface Modified: wiki/screenshots.wiki ============================================================================== --- wiki/screenshots.wiki (original) +++ wiki/screenshots.wiki Thu Feb 26 12:27:03 2009 @@ -16,4 +16,8 @@ = System configuration (post install) = http://upload.snelhest.org/images/08121310.png -http://upload.snelhest.org/images/08121311.png \ No newline at end of file +http://upload.snelhest.org/images/08121311.png +http://upload.snelhest.org/images/090226Screenshot.png +http://upload.snelhest.org/images/090226Screenshot1.png +http://upload.snelhest.org/images/090226Screenshot2.png +http://upload.snelhest.org/images/090226Screenshot3.png \ No newline at end of file |
From: Sriram D. <sri...@gm...> - 2009-02-26 19:05:21
|
Hey Kocil, Looks like i cant make it to SD before tomorrow either :( . Is there a phone number that i can call you at while you are here? [ I Hope its not too late.. but make sure you visit Point Loma and Sea World before you leave!! ] Cheers Ram 2009/2/21 uel archuletta <ue...@gm...> > I wish i could be there Kocil, > But unfortunately I wont be able to make it. > > > On 2/21/09, Kocil <k0...@ya...> wrote: >> >> Hi all. >> >> I'll stay at Estansia La Jolla Hotel from Feb 21 - 24, >> attending the HP Technology for Teaching Award Conference. >> In fact, I'm sending this from the Hotel room :D >> >> After that, I will have 2 days for traveling around. >> My return ticket is from LA at Feb 27 night. >> >> Cheers. >> Eko. >> >> >> --- On Fri, 2/20/09, Sriram Durbha <sri...@gm...> wrote: >> >> > From: Sriram Durbha <sri...@gm...> >> > Subject: Re: [Vectorlinux-devel] I'm going to LA >> > To: "Vector Linux developer's list" < >> vec...@li...> >> > Date: Friday, February 20, 2009, 10:46 AM >> >> > 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 >> > > >> > > >> > >> ------------------------------------------------------------------------------ >> > 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 >> > > > > ------------------------------------------------------------------------------ > 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-25 23:33:15
|
Author: M0...@gm... Date: Wed Feb 25 14:08:32 2009 New Revision: 505 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step3.pot branches/speedy/.lang/Step3a1a.pot branches/speedy/.lang/Step3a2.pot branches/speedy/.lang/Step5.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step8.pot branches/speedy/Step3.class branches/speedy/Step3a1a.class branches/speedy/Step3a2.class branches/speedy/Step5.class branches/speedy/Step8.class Log: Debugged automatic partition. Ready for testing. Finished summary on automatic partitioning and for customized installations Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Wed Feb 25 14:08:32 2009 @@ -50,7 +50,7 @@ msgid "Disk Partitioning" msgstr "" -#: MdlStartUp.module:47 Step8.class:121 +#: MdlStartUp.module:47 Step8.class:130 msgid "Software Selection" msgstr "" @@ -58,7 +58,7 @@ msgid "Installation" msgstr "" -#: MdlStartUp.module:49 Step8.class:190 +#: MdlStartUp.module:49 Step8.class:213 msgid "Installation Summary" msgstr "" @@ -156,7 +156,7 @@ msgid "to search for media again" msgstr "" -#: Step1.class:98 Step2.class:198 Step5.class:166 +#: Step1.class:98 Step2.class:198 Step5.class:177 msgid "Click" msgstr "" @@ -216,7 +216,7 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:433 Step3a1a.class:169 Step3a1.class:22 Step7a.class:143 +#: Step1.class:433 Step3a1a.class:186 Step3a1.class:22 Step7a.class:143 msgid "WARNING:" msgstr "" @@ -376,43 +376,43 @@ msgid "Create New" msgstr "" -#: Step3a1a.class:148 +#: Step3a1a.class:160 msgid "Failed to format partitions, please try another partitioning method" msgstr "" -#: Step3a1a.class:160 +#: Step3a1a.class:177 msgid "Partitioning stage complete. Click" msgstr "" -#: Step3a1a.class:160 Step3a2.class:322 Step5.class:166 +#: Step3a1a.class:177 Step3a2.class:359 Step5.class:177 msgid "to continue" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "All existing data in" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "is about to be deleted." msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:169 Step6.class:499 Step7a.class:143 +#: Step3a1a.class:186 Step6.class:434 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:499 Step7a.class:143 +#: Step3a1a.class:186 Step6.class:434 Step7a.class:143 msgid "No" msgstr "" -#: Step3a1a.class:173 +#: Step3a1a.class:190 msgid "Preparing hard disk for new partitioning structure. Please wait" msgstr "" -#: Step3a1a.class:193 +#: Step3a1a.class:210 msgid "Operation cancelled by user. No changes have been made to the system" msgstr "" @@ -458,39 +458,39 @@ "VectorLinux" msgstr "" -#: Step3a2.class:191 +#: Step3a2.class:192 msgid "Please wait while your hard drive is being partitioned" msgstr "" -#: Step3a2.class:204 +#: Step3a2.class:205 msgid "Unable to find enough un-used space to perform auto-partition." msgstr "" -#: Step3a2.class:204 +#: Step3a2.class:205 msgid "Please consider using a different partitioning option." msgstr "" -#: Step3a2.class:206 +#: Step3a2.class:207 msgid "" "Unable to find enough un-used space to perform auto-partition. Please " "consider using a different partitioning option." msgstr "" -#: Step3a2.class:322 +#: Step3a2.class:359 msgid "Partitioning stage complete... Click" msgstr "" -#: Step3a2.class:352 +#: Step3a2.class:407 msgid "" "We are unable to find any hard disks with enough unpartitioned space for " "this operation." msgstr "" -#: Step3a2.class:352 +#: Step3a2.class:407 msgid "Please consider using another partitioning method." msgstr "" -#: Step3a2.class:354 +#: Step3a2.class:409 msgid "" "Unable to find any hard drives with enough unpartitioned space. Please go " "back and select another partitioning method" @@ -555,29 +555,29 @@ msgid "Select the partitioning method you would like to use" msgstr "" -#: Step3.class:153 +#: Step3.class:175 msgid "Automatic" msgstr "" -#: Step3.class:163 +#: Step3.class:185 msgid "" "Automatically resize your partitions and / or create the correct disk space " "for VectorLinux." msgstr "" -#: Step3.class:170 +#: Step3.class:192 msgid "Manually resize my partitions " msgstr "" -#: Step3.class:180 +#: Step3.class:202 msgid "Use the partitioning tool to prepare your system partitions." msgstr "" -#: Step3.class:187 +#: Step3.class:209 msgid "My hard drive is already partitioned" msgstr "" -#: Step3.class:197 +#: Step3.class:219 msgid "Install VectorLinux to existing partitions on my hard drive" msgstr "" @@ -589,91 +589,101 @@ msgid "Resize partitions using Gparted" msgstr "" -#: Step5.class:64 +#: Step5.class:67 msgid "" "Gparted was not found on this system. Please install gparted and try again" msgstr "" #: Step5.class:69 +msgid "Unable to launch partitioning tool." +msgstr "" + +#: Step5.class:69 +msgid "" +"The gparted program was not found on this system. Please install gparted or " +"choose another partitioning method." +msgstr "" + +#: Step5.class:80 msgid "Loading partitioning utility...Please Wait" msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "" "The VectorLinux installer is unable to embed the gparted partitioning " "utility." msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "" "Please consider using the automatic partition option, or use other means of" msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "partitioning your hard drives." msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "" "VectorLinux is about to launch the GParted partitioning tool. Use this " "utility to" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "move, resize, delete or create partitions." msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "When you are finished, you will need to exit the utility from the" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "GParted" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "menu" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "SYSTEM RESTART SUGGESTED" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "" "Your system still contains some non-linux partitions. If you still have a " "Windows operating system installed, it is recomended " msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "that you reboot your system at this time. " msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "Click the" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "button to restart your computer now, or click" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "to continue without restarting." msgstr "" -#: Step5.class:166 +#: Step5.class:177 msgid "PARTITIONING DONE" msgstr "" -#: Step5.class:182 +#: Step5.class:193 msgid "Your computer will restart in 10 seconds" msgstr "" -#: Step5.class:239 +#: Step5.class:250 msgid "Loading partitioning utility ... Please Wait" msgstr "" -#: Step5.class:248 +#: Step5.class:259 msgid "Restart Now" msgstr "" @@ -697,7 +707,7 @@ msgid "Not Used" msgstr "" -#: Step6.class:167 Step8.class:71 +#: Step6.class:167 Step8.class:73 msgid "Do not format" msgstr "" @@ -717,7 +727,7 @@ msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:394 +#: Step6.class:329 msgid "Select which partitions to use for installation" msgstr "" @@ -789,7 +799,7 @@ msgid "Install everthing in the image (Fully Automated)" msgstr "" -#: Step7.class:126 Step8.class:111 +#: Step7.class:126 Step8.class:120 msgid "Customized" msgstr "" @@ -797,7 +807,7 @@ msgid "Select the components you wish to install (Advanced)" msgstr "" -#: Step7.class:144 Step8.class:113 +#: Step7.class:144 Step8.class:122 msgid "Minimal" msgstr "" @@ -805,43 +815,55 @@ msgid "Install the most minimal working confuguration (For older hardware)" msgstr "" -#: Step8.class:72 +#: Step8.class:44 +msgid "Distribution" +msgstr "" + +#: Step8.class:62 +msgid "Partitions to be used" +msgstr "" + +#: Step8.class:74 msgid "Not Formatted" msgstr "" -#: Step8.class:72 +#: Step8.class:74 msgid "Mount to" msgstr "" -#: Step8.class:74 +#: Step8.class:76 msgid "Format to" msgstr "" -#: Step8.class:74 +#: Step8.class:76 msgid "and mount to" msgstr "" -#: Step8.class:86 +#: Step8.class:88 msgid "Swap Space" msgstr "" -#: Step8.class:109 +#: Step8.class:101 +msgid "Pre-formatted to reiserfs, and used for /" +msgstr "" + +#: Step8.class:118 msgid "Full" msgstr "" -#: Step8.class:116 +#: Step8.class:125 msgid "Installation Method" msgstr "" -#: Step8.class:122 +#: Step8.class:131 msgid "Major Components" msgstr "" -#: Step8.class:132 +#: Step8.class:141 msgid "Additional Software" msgstr "" -#: Step8.class:209 +#: Step8.class:232 msgid "" "Your VectorLinux installation is about to be performed as follows. If you " "need to make any changes, this is your last chance." Modified: branches/speedy/.lang/Step3.pot ============================================================================== --- branches/speedy/.lang/Step3.pot (original) +++ branches/speedy/.lang/Step3.pot Wed Feb 25 14:08:32 2009 @@ -22,27 +22,27 @@ msgid "Select the partitioning method you would like to use" msgstr "" -#: Step3.class:153 +#: Step3.class:175 msgid "Automatic" msgstr "" -#: Step3.class:163 +#: Step3.class:185 msgid "Automatically resize your partitions and / or create the correct disk space for VectorLinux." msgstr "" -#: Step3.class:170 +#: Step3.class:192 msgid "Manually resize my partitions " msgstr "" -#: Step3.class:180 +#: Step3.class:202 msgid "Use the partitioning tool to prepare your system partitions." msgstr "" -#: Step3.class:187 +#: Step3.class:209 msgid "My hard drive is already partitioned" msgstr "" -#: Step3.class:197 +#: Step3.class:219 msgid "Install VectorLinux to existing partitions on my hard drive" msgstr "" Modified: branches/speedy/.lang/Step3a1a.pot ============================================================================== --- branches/speedy/.lang/Step3a1a.pot (original) +++ branches/speedy/.lang/Step3a1a.pot Wed Feb 25 14:08:32 2009 @@ -46,47 +46,47 @@ msgid "Create New" msgstr "" -#: Step3a1a.class:148 +#: Step3a1a.class:160 msgid "Failed to format partitions, please try another partitioning method" msgstr "" -#: Step3a1a.class:160 +#: Step3a1a.class:177 msgid "Partitioning stage complete. Click" msgstr "" -#: Step3a1a.class:160 +#: Step3a1a.class:177 msgid "to continue" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "WARNING:" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "All existing data in" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "is about to be deleted." msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "Yes" msgstr "" -#: Step3a1a.class:169 +#: Step3a1a.class:186 msgid "No" msgstr "" -#: Step3a1a.class:173 +#: Step3a1a.class:190 msgid "Preparing hard disk for new partitioning structure. Please wait" msgstr "" -#: Step3a1a.class:193 +#: Step3a1a.class:210 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 25 14:08:32 2009 @@ -42,39 +42,39 @@ msgid "Select the location on your hard drive where you would like to install VectorLinux" msgstr "" -#: Step3a2.class:191 +#: Step3a2.class:192 msgid "Please wait while your hard drive is being partitioned" msgstr "" -#: Step3a2.class:204 +#: Step3a2.class:205 msgid "Unable to find enough un-used space to perform auto-partition." msgstr "" -#: Step3a2.class:204 +#: Step3a2.class:205 msgid "Please consider using a different partitioning option." msgstr "" -#: Step3a2.class:206 +#: Step3a2.class:207 msgid "Unable to find enough un-used space to perform auto-partition. Please consider using a different partitioning option." msgstr "" -#: Step3a2.class:322 +#: Step3a2.class:359 msgid "Partitioning stage complete... Click" msgstr "" -#: Step3a2.class:322 +#: Step3a2.class:359 msgid "to continue" msgstr "" -#: Step3a2.class:352 +#: Step3a2.class:407 msgid "We are unable to find any hard disks with enough unpartitioned space for this operation." msgstr "" -#: Step3a2.class:352 +#: Step3a2.class:407 msgid "Please consider using another partitioning method." msgstr "" -#: Step3a2.class:354 +#: Step3a2.class:409 msgid "Unable to find any hard drives with enough unpartitioned space. Please go back and select another partitioning method" msgstr "" Modified: branches/speedy/.lang/Step5.pot ============================================================================== --- branches/speedy/.lang/Step5.pot (original) +++ branches/speedy/.lang/Step5.pot Wed Feb 25 14:08:32 2009 @@ -18,91 +18,99 @@ msgid "Resize partitions using Gparted" msgstr "" -#: Step5.class:64 +#: Step5.class:67 msgid "Gparted was not found on this system. Please install gparted and try again" msgstr "" #: Step5.class:69 +msgid "Unable to launch partitioning tool." +msgstr "" + +#: Step5.class:69 +msgid "The gparted program was not found on this system. Please install gparted or choose another partitioning method." +msgstr "" + +#: Step5.class:80 msgid "Loading partitioning utility...Please Wait" msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "The VectorLinux installer is unable to embed the gparted partitioning utility." msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "Please consider using the automatic partition option, or use other means of" msgstr "" -#: Step5.class:92 +#: Step5.class:103 msgid "partitioning your hard drives." msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "VectorLinux is about to launch the GParted partitioning tool. Use this utility to" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "move, resize, delete or create partitions." msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "When you are finished, you will need to exit the utility from the" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "GParted" msgstr "" -#: Step5.class:114 +#: Step5.class:125 msgid "menu" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "SYSTEM RESTART SUGGESTED" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "Your system still contains some non-linux partitions. If you still have a Windows operating system installed, it is recomended " msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "that you reboot your system at this time. " msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "Click the" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "button to restart your computer now, or click" msgstr "" -#: Step5.class:161 +#: Step5.class:172 msgid "to continue without restarting." msgstr "" -#: Step5.class:166 +#: Step5.class:177 msgid "PARTITIONING DONE" msgstr "" -#: Step5.class:166 +#: Step5.class:177 msgid "Click" msgstr "" -#: Step5.class:166 +#: Step5.class:177 msgid "to continue" msgstr "" -#: Step5.class:182 +#: Step5.class:193 msgid "Your computer will restart in 10 seconds" msgstr "" -#: Step5.class:239 +#: Step5.class:250 msgid "Loading partitioning utility ... Please Wait" msgstr "" -#: Step5.class:248 +#: Step5.class:259 msgid "Restart Now" msgstr "" Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Wed Feb 25 14:08:32 2009 @@ -54,15 +54,15 @@ msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:394 +#: Step6.class:329 msgid "Select which partitions to use for installation" msgstr "" -#: Step6.class:499 +#: Step6.class:434 msgid "Yes" msgstr "" -#: Step6.class:499 +#: Step6.class:434 msgid "No" msgstr "" Modified: branches/speedy/.lang/Step8.pot ============================================================================== --- branches/speedy/.lang/Step8.pot (original) +++ branches/speedy/.lang/Step8.pot Wed Feb 25 14:08:32 2009 @@ -14,63 +14,75 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step8.class:71 +#: Step8.class:44 +msgid "Distribution" +msgstr "" + +#: Step8.class:62 +msgid "Partitions to be used" +msgstr "" + +#: Step8.class:73 msgid "Do not format" msgstr "" -#: Step8.class:72 +#: Step8.class:74 msgid "Not Formatted" msgstr "" -#: Step8.class:72 +#: Step8.class:74 msgid "Mount to" msgstr "" -#: Step8.class:74 +#: Step8.class:76 msgid "Format to" msgstr "" -#: Step8.class:74 +#: Step8.class:76 msgid "and mount to" msgstr "" -#: Step8.class:86 +#: Step8.class:88 msgid "Swap Space" msgstr "" -#: Step8.class:109 +#: Step8.class:101 +msgid "Pre-formatted to reiserfs, and used for /" +msgstr "" + +#: Step8.class:118 msgid "Full" msgstr "" -#: Step8.class:111 +#: Step8.class:120 msgid "Customized" msgstr "" -#: Step8.class:113 +#: Step8.class:122 msgid "Minimal" msgstr "" -#: Step8.class:116 +#: Step8.class:125 msgid "Installation Method" msgstr "" -#: Step8.class:121 +#: Step8.class:130 msgid "Software Selection" msgstr "" -#: Step8.class:122 +#: Step8.class:131 msgid "Major Components" msgstr "" -#: Step8.class:132 +#: Step8.class:141 msgid "Additional Software" msgstr "" -#: Step8.class:190 +#: Step8.class:213 msgid "Installation Summary" msgstr "" -#: Step8.class:209 +#: Step8.class:232 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/Step3.class ============================================================================== --- branches/speedy/Step3.class (original) +++ branches/speedy/Step3.class Wed Feb 25 14:08:32 2009 @@ -41,24 +41,44 @@ ClsGlobal.fRunningMainForm.listview1["Step1"].picture = MdlStartUp.pDone ClsGlobal.fRunningMainForm.listview1["Step2"].picture = MdlStartUp.pNow IF ME.rbAutoPart.Value = TRUE THEN + + RETURN "Step3a" + END IF + IF ME.rbCustomPart.Value = TRUE THEN + + RETURN "Step5" + END IF + IF ME.rbPrePartitioned.Value = TRUE THEN + + RETURN "Step6" + END IF + +END + +PUBLIC SUB SET_PARTITIONING_METHOD() + + IF ME.rbAutoPart.Value = TRUE THEN ClsGlobal.bAutoPartition = TRUE PRINT " ---> Use built-in auto partition tools for partitioning" - RETURN "Step3a" + 'RETURN "Step3a" END IF IF ME.rbCustomPart.Value = TRUE THEN 'embed gparted PRINT " ---> Embed GParted for partitioning" ClsGlobal.bAutoPartition = FALSE - RETURN "Step5" + '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" + 'RETURN "Step6" END IF END + + + PUBLIC SUB StartUp() ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width, ClsGlobal.fRunningMainForm.PnlStack.Height) @@ -68,6 +88,8 @@ END PUBLIC SUB OnExit() + + ME.SET_PARTITIONING_METHOD() END Modified: branches/speedy/Step3a1a.class ============================================================================== --- branches/speedy/Step3a1a.class (original) +++ branches/speedy/Step3a1a.class Wed Feb 25 14:08:32 2009 @@ -87,7 +87,13 @@ sResults = Split(sSwapList, "\n") sSwapPart = sResults[0] PRINT " --- Use existing swap partition " & sSwapPart - ClsGlobal.sTargetSwap = sSwapPart ' set the address to the swap partition. + + ' detect size of swap partition + SHELL "parted " & Left(sSwapPart, Len("/dev/hda")) & " unit GB print | grep \"^ " & Right(sSwapPart, Len(sSwapPart) - Len("/dev/hda")) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + 'Message("Size dump for swap " & sDump) + 'SHELL "echo \"" & Trim(sDump) & "\" cut -f 3 -d \' \'" TO sDump + + ClsGlobal.sTargetSwap = Trim(sSwapPart & "-" & Trim(sDump)) ' set the address to the swap partition. 'Message("Using swap " & sSwapPart) END SELECT ELSE ' no swap found @@ -132,8 +138,14 @@ 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" + ' get partition sizes now + SHELL "parted " & sDrive & " unit GB print | grep \"^ 1\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + 'SHELL "parted " & Left(sSwapPart, Len("/dev/hda")) & " unit GB print | grep \"^ " & Right(sSwapPart, Len(sSwapPart) - Len("/dev/hda")) & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump +' SHELL "echo \"" & Trim(sDump) & " cut -f 3 -d \' \'" TO sDump + ClsGlobal.sTargetRoot = Trim(sDrive & "1" & "-" & Trim(sDump)) + SHELL "parted " & sDrive & " unit GB print | grep \"^ 2\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + 'SHELL "echo \"" & Trim(sDump) & " cut -f 3 -d \' \'" TO sDump + ClsGlobal.sTargetSwap = Trim(sDrive & "2" & "-" & Trim(sDump)) ELSE @@ -148,8 +160,13 @@ sStatus = ("Failed to format partitions, please try another partitioning method") RETURN END IF + + SHELL "parted " & sDrive & " unit GB print | grep \"^ 1\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + 'SHELL "echo \"" & Trim(sDump) & " cut -f 3 -d \' \'" TO sDump + ClsGlobal.sTargetRoot = Trim(sDrive & "1" & "-" & Trim(sDump)) - ClsGlobal.sTargetRoot = sDrive & "1" + ' + 'ClsGlobal.sTargetRoot = sDrive & "1" 'SHELL "mkfs.reiserfs -q " & sDrive & "1" WAIT 'Message(sPartedDetails[0]) 'Message(sPartedDetails[1]) Modified: branches/speedy/Step3a2.class ============================================================================== --- branches/speedy/Step3a2.class (original) +++ branches/speedy/Step3a2.class Wed Feb 25 14:08:32 2009 @@ -25,9 +25,9 @@ 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[] + 'objTargetOptions = NEW Object[] - ME.LIST_FREE_SPACE() + 'ME.LIST_FREE_SPACE() END @@ -183,6 +183,7 @@ DIM sOutLine, sDumparr AS String[] DIM lFreeKB, lFreeStart, lFreeEnd AS Long DIM sRootPart, sSwapPart AS String + DIM sPart, sNum AS String ME.HPanel3.Visible = FALSE @@ -232,12 +233,22 @@ 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) & (iLastPartNo + 2) WAIT ' make the swap partition - EXEC ["swapon", Trim(sDrive) & (iLastPartNo + 2)] WAIT - + SHELL "probepart | grep -i \"linux swap\"| cut -f 1 -d \' \'" TO sDump + sDump = Trim(sDump) ' this is possibly an array + IF sDump THEN + sDumparr = Split(sDump, "\n") + PRINT " ---+ Use existing swap partition -> " & sDumparr[0] + sSwapPart = Trim(sDumparr[0]) + + + ELSE + SHELL "parted " & Trim(sDrive) & " -s \"mkpart primary linux-swap -" & lNeededSwap & "kb -1kb\"" WAIT ' partition 2 + SHELL "mkswap " & Trim(sDrive) & (iLastPartNo + 2) WAIT ' make the swap partition + EXEC ["swapon", Trim(sDrive) & (iLastPartNo + 2)] WAIT + sSwapPart = Trim(sdrive) & (iLastPartNo + 2) + END IF sRootPart = Trim(sdrive) & (iLastPartNo + 1) - sSwapPart = Trim(sdrive) & (iLastPartNo + 2) + ' Ready to start setting defined target partitions. '################################################################################################################### @@ -262,13 +273,26 @@ 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 "probepart | grep -i \"linux swap\"| cut -f 1 -d \' \'" TO sDump + sDump = Trim(sDump) ' this is possibly an array + IF sDump THEN + sDumparr = Split(sDump, "\n") + PRINT " ---+ Use existing swap partition -> " & sDumparr[0] + sSwapPart = Trim(sDumparr[0]) + + + ELSE + + 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 - - sRootPart = Trim(sdrive) & (iLastPartNo + 1) sSwapPart = Trim(sdrive) & (iLastPartNo + 2) + END IF + sRootPart = Trim(sdrive) & (iLastPartNo + 1) + ELSE ' this method skips one number I think ' BEGIN BY CREATING AN EXTENDED PARTITION TO HOLD LOGICAL PARTITIONS IN IT @@ -291,7 +315,18 @@ SHELL "parted " & Trim(sDrive) & " -s \"mkpart logical reiserfs " & lFreeStart & "kb " & (lFreeEnd - lNeededSwap) & "kb\"" WAIT 'SHELL "echo yes | parted " & Trim(sdrive) & " mkfs reiserfs " & (iLastPartNo + 2) WAIT SHELL "mkfs.reiserfs -fq " & sDrive & (iLastPartNo + 2) WAIT - + + ' search for existing swap partitions + SHELL "probepart | grep -i \"linux swap\"| cut -f 1 -d \' \'" TO sDump + sDump = Trim(sDump) ' this is possibly an array + IF sDump THEN + sDumparr = Split(sDump, "\n") + PRINT " ---+ Use existing swap partition -> " & sDumparr[0] + sSwapPart = Trim(sDumparr[0]) + + + ELSE + ' ####################### 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) @@ -312,8 +347,10 @@ ' ' ' ' ' "EOF" ' ' ' ' ' File.Save("/tmp/swapmaker", sDump) ' ' ' ' ' SHELL "sh /tmp/swapmaker" WAIT + sSwapPart = Trim(sdrive) & (iLastPartNo + 3) + END IF sRootPart = Trim(sdrive) & (iLastPartNo + 2) - sRootPart = Trim(sdrive) & (iLastPartNo + 3) + END IF END IF @@ -324,8 +361,22 @@ ' set the flag for partition reading ClsGlobal.bAutoPartition = TRUE - ClsGlobal.sTargetRoot = sRootPart - ClsGlobal.sTargetSwap = sSwapPart + + sPart = Left(sRootPart, Len("/dev/hda")) + sNum = Right(sRootPart, Len(sRootPart) - Len(sPart)) + + ' get the size of the / partition that was just created. + SHELL "parted " & sPart & " unit GB print | grep \"^ " & sNum & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + + sDump = Trim(sDump) + ClsGlobal.sTargetRoot = sRootPart & "-" & Trim(sDump) + + ' get the size of the swap partition that was just created. + sPart = Left(sSwapPart, Len("/dev/hda")) + sNum = Right(sSwapPart, Len(sSwapPart) - Len(sPart)) + SHELL "parted " & sPart & " unit GB print | grep \"^ " & sNum & "\" | tr -s \' \',\"\" | cut -f 5 -d \' \'" TO sDump + sDump = Trim(sDump) + ClsGlobal.sTargetSwap = sSwapPart & "-" & Trim(sDump) @@ -336,13 +387,17 @@ PUBLIC FUNCTION GETNEXT() AS String - + RETURN "Step7" END PUBLIC SUB STARTUP() - 'ME.LIST_FREE_SPACE() + DIM i AS Integer + + objTargetOptions = NEW Object[] + ME.LIST_FREE_SPACE() + FOR EACH RadioButton1 IN objTargetOptions IF RadioButton1.Enabled = TRUE THEN INC i NEXT @@ -362,6 +417,7 @@ PUBLIC SUB ONEXIT() ' CREATE THE PARTITIONS NOW + ME.PERFORM_PARTITIONING() END @@ -374,6 +430,6 @@ PUBLIC SUB Form_Menu() - ME.PERFORM_PARTITIONING() + 'ME.PERFORM_PARTITIONING() END Modified: branches/speedy/Step5.class ============================================================================== --- branches/speedy/Step5.class (original) +++ branches/speedy/Step5.class Wed Feb 25 14:08:32 2009 @@ -29,6 +29,9 @@ PUBLIC SUB StartUp() ME.Resize(ClsGlobal.fRunningMainForm.Pnlstack.Width, ClsGlobal.fRunningMainForm.PnlStack.Height) + ME.tlEmbDone.Visible = FALSE + ME.tlEmbDone.Parent.Visible = FALSE + ME.Embedder1.Visible = TRUE ME.EMBED_GPARTED() END @@ -62,6 +65,14 @@ IF Exist("/usr/sbin/gparted") = FALSE THEN Message.Error(("Gparted was not found on this system. Please install gparted and try again")) + ME.tlEmbDone.Text = "<b>" & ("Unable to launch partitioning tool.") & "</b>" & "<br><br>" & + ("The gparted program was not found on this system. Please install gparted or choose another partitioning method.") + ClsGlobal.fRunningMainForm.btnext.Enabled = FALSE + Embedder1.Visible = FALSE + tlEmbDone.Parent.Visible = TRUE + tlEmbDone.Visible = TRUE + + RETURN END IF Modified: branches/speedy/Step8.class ============================================================================== --- branches/speedy/Step8.class (original) +++ branches/speedy/Step8.class Wed Feb 25 14:08:32 2009 @@ -42,10 +42,11 @@ WITH ME.TreeView1 .Add("DistroInfo", ("Distribution"), MdlStartUp.pCategory) - .Add("Distro0", ("Name"), PicInfo, "DistroInfo") - .Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0") - .Add("Distro1", ("Version"), PicInfo, "DistroInfo") - .Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1") + .Add("Distro0", ClsGlobal.sDistroName & Space(1) & ClsGlobal.sDistroVer, PicInfo, "DistroInfo") + '.Add("Distro0", ("Name"), PicInfo, "DistroInfo") + '.Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0") + '.Add("Distro1", ("Version"), PicInfo, "DistroInfo") + '.'Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1") END WITH END @@ -59,6 +60,7 @@ WITH ME.TreeView1 .Add("Part", ("Partitions to be used"), MdlStartUp.pCategory) + IF ClsGlobal.bAutoPartition = FALSE THEN sArr = Split(ClsGlobal.sVitalPartList, ",") FOR i = 0 TO sArr.Max sList = Trim(sArr[i]) @@ -93,7 +95,14 @@ .Add("Swaps" & i, Left(sSwap, InStr(sSwap, "-") - 1) & Space(1) & " -- " & Right(sSwap, Len(sSwap) - InStr(sSwap, "-")), PicDisk, "Swaps") END IF NEXT - + ELSE ' AUTOMATIC PARTITIONING SELECTED + 'Message("Automatic partition selection") + .Add("Part1", Replace(ClsGlobal.sTargetRoot, "-", " -- "), PicDisk, "Part") + .Add("Part1.1", ("Pre-formatted to reiserfs, and used for /"), PicTask, "Part1") + .Add("Swaps", ("Swap Space"),, "Part") + .Add("Swaps1", Replace(ClsGlobal.sTargetSwap, "-", " -- "), PicDisk, "Swaps") + '.Add("Swaps1.1", + END IF END WITH END @@ -152,11 +161,25 @@ END + +PUBLIC SUB Expand_Tree() + + ME.TreeView1["DistroInfo"].Expanded = TRUE + ME.TreeView1["Part"].Expanded = TRUE + ME.TreeView1["Install Type"].Expanded = TRUE + IF ME.TreeView1.Exist("Software") THEN + ME.TreeView1["Software"].Expanded = TRUE + END IF + +END + + PUBLIC SUB StartUp() ME.TreeView1.Clear() ME.SUMMARIZE_DISTRO_INFO() ME.SUMMARIZE_PARTITION_SELECTION() ME.SUMMARIZE_INSTALL_TYPE() + ME.Expand_Tree() END |
From: <cod...@go...> - 2009-02-25 16:24:25
|
Author: M0...@gm... Date: Wed Feb 25 08:17:55 2009 New Revision: 504 Added: branches/speedy/images/hdd.png (contents, props changed) branches/speedy/images/info.png (contents, props changed) branches/speedy/images/package.png (contents, props changed) branches/speedy/images/task-due.png (contents, props changed) branches/speedy/images/tlz.png (contents, props changed) Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step8.pot branches/speedy/.project branches/speedy/ClsGlobal.class branches/speedy/Step6.class branches/speedy/Step8.class Log: Finished installation summary for full installation Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Wed Feb 25 08:17:55 2009 @@ -10,23 +10,19 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: .project:1 -msgid "VectorLinux Installer" -msgstr "" - -#: FMain.class:245 FMain0.class:246 FMain0Old.class:233 +#: FMain0Old.class:233 FMain0.class:246 FMain.class:245 msgid "Process Overview" msgstr "" -#: FMain.class:287 FMain0.class:288 FMain0Old.class:271 +#: FMain0Old.class:271 FMain0.class:288 FMain.class:287 msgid "Back" msgstr "" -#: FMain.class:298 FMain0.class:299 FMain0Old.class:282 +#: FMain0Old.class:282 FMain0.class:299 FMain.class:298 msgid "Next" msgstr "" -#: FMain.class:309 FMain0.class:310 FMain0Old.class:293 +#: FMain0Old.class:293 FMain0.class:310 FMain.class:309 msgid "Quit" msgstr "" @@ -54,7 +50,7 @@ msgid "Disk Partitioning" msgstr "" -#: MdlStartUp.module:47 +#: MdlStartUp.module:47 Step8.class:121 msgid "Software Selection" msgstr "" @@ -62,7 +58,7 @@ msgid "Installation" msgstr "" -#: MdlStartUp.module:49 Step8.class:116 +#: MdlStartUp.module:49 Step8.class:190 msgid "Installation Summary" msgstr "" @@ -98,6 +94,10 @@ msgid "Final Configuration" msgstr "" +#: .project:1 +msgid "VectorLinux Installer" +msgstr "" + #: Step0.class:20 msgid "Localization Settings" msgstr "" @@ -216,7 +216,7 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:433 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143 +#: Step1.class:433 Step3a1a.class:169 Step3a1.class:22 Step7a.class:143 msgid "WARNING:" msgstr "" @@ -340,99 +340,6 @@ 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:153 -msgid "Automatic" -msgstr "" - -#: Step3.class:163 -msgid "" -"Automatically resize your partitions and / or create the correct disk space " -"for VectorLinux." -msgstr "" - -#: Step3.class:170 -msgid "Manually resize my partitions " -msgstr "" - -#: Step3.class:180 -msgid "Use the partitioning tool to prepare your system partitions." -msgstr "" - -#: Step3.class:187 -msgid "My hard drive is already partitioned" -msgstr "" - -#: Step3.class:197 -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:122 -msgid "Use unpartitioned space on my hard disk (creates new partitions)" -msgstr "" - -#: Step3a.class:144 -msgid "Use free space on existing partitions for VectorLinux" -msgstr "" - -#: Step3a.class:168 -msgid "Use entire disk" -msgstr "" - -#: 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 "" @@ -493,11 +400,11 @@ msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:169 Step6.class:446 Step7a.class:143 +#: Step3a1a.class:169 Step6.class:499 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:446 Step7a.class:143 +#: Step3a1a.class:169 Step6.class:499 Step7a.class:143 msgid "No" msgstr "" @@ -509,6 +416,18 @@ msgid "Operation cancelled by user. No changes have been made to the system" msgstr "" +#: 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 "" + #: Step3a2.class:25 msgid "Install VectorLinux to free space on disk" msgstr "" @@ -581,6 +500,87 @@ msgid "Claim free space from existing partitions" 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:122 +msgid "Use unpartitioned space on my hard disk (creates new partitions)" +msgstr "" + +#: Step3a.class:144 +msgid "Use free space on existing partitions for VectorLinux" +msgstr "" + +#: Step3a.class:168 +msgid "Use entire disk" +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:153 +msgid "Automatic" +msgstr "" + +#: Step3.class:163 +msgid "" +"Automatically resize your partitions and / or create the correct disk space " +"for VectorLinux." +msgstr "" + +#: Step3.class:170 +msgid "Manually resize my partitions " +msgstr "" + +#: Step3.class:180 +msgid "Use the partitioning tool to prepare your system partitions." +msgstr "" + +#: Step3.class:187 +msgid "My hard drive is already partitioned" +msgstr "" + +#: Step3.class:197 +msgid "Install VectorLinux to existing partitions on my hard drive" +msgstr "" + #: Step4.class:23 msgid "Automatic Disc Partitioning" msgstr "" @@ -697,7 +697,7 @@ msgid "Not Used" msgstr "" -#: Step6.class:167 Step8.class:58 +#: Step6.class:167 Step8.class:71 msgid "Do not format" msgstr "" @@ -717,38 +717,10 @@ msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:341 +#: Step6.class:394 msgid "Select which partitions to use for installation" msgstr "" -#: Step7.class:19 -msgid "Select Installation Mode" -msgstr "" - -#: Step7.class:108 -msgid "Full Install" -msgstr "" - -#: Step7.class:118 -msgid "Install everthing in the image (Fully Automated)" -msgstr "" - -#: Step7.class:126 -msgid "Customized" -msgstr "" - -#: Step7.class:136 -msgid "Select the components you wish to install (Advanced)" -msgstr "" - -#: Step7.class:144 -msgid "Minimal" -msgstr "" - -#: Step7.class:154 -msgid "Install the most minimal working confuguration (For older hardware)" -msgstr "" - #: Step7a.class:27 Step7b.class:23 msgid "Customize Your VectorLinux Installation" msgstr "" @@ -805,23 +777,71 @@ "include in your installation." msgstr "" -#: Step8.class:59 +#: Step7.class:19 +msgid "Select Installation Mode" +msgstr "" + +#: Step7.class:108 +msgid "Full Install" +msgstr "" + +#: Step7.class:118 +msgid "Install everthing in the image (Fully Automated)" +msgstr "" + +#: Step7.class:126 Step8.class:111 +msgid "Customized" +msgstr "" + +#: Step7.class:136 +msgid "Select the components you wish to install (Advanced)" +msgstr "" + +#: Step7.class:144 Step8.class:113 +msgid "Minimal" +msgstr "" + +#: Step7.class:154 +msgid "Install the most minimal working confuguration (For older hardware)" +msgstr "" + +#: Step8.class:72 msgid "Not Formatted" msgstr "" -#: Step8.class:59 +#: Step8.class:72 msgid "Mount to" msgstr "" -#: Step8.class:61 +#: Step8.class:74 msgid "Format to" msgstr "" -#: Step8.class:61 +#: Step8.class:74 msgid "and mount to" msgstr "" -#: Step8.class:135 +#: Step8.class:86 +msgid "Swap Space" +msgstr "" + +#: Step8.class:109 +msgid "Full" +msgstr "" + +#: Step8.class:116 +msgid "Installation Method" +msgstr "" + +#: Step8.class:122 +msgid "Major Components" +msgstr "" + +#: Step8.class:132 +msgid "Additional Software" +msgstr "" + +#: Step8.class:209 msgid "" "Your VectorLinux installation is about to be performed as follows. If you " "need to make any changes, this is your last chance." Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Wed Feb 25 08:17:55 2009 @@ -54,15 +54,15 @@ msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:341 +#: Step6.class:394 msgid "Select which partitions to use for installation" msgstr "" -#: Step6.class:446 +#: Step6.class:499 msgid "Yes" msgstr "" -#: Step6.class:446 +#: Step6.class:499 msgid "No" msgstr "" Modified: branches/speedy/.lang/Step8.pot ============================================================================== --- branches/speedy/.lang/Step8.pot (original) +++ branches/speedy/.lang/Step8.pot Wed Feb 25 08:17:55 2009 @@ -14,31 +14,63 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step8.class:58 +#: Step8.class:71 msgid "Do not format" msgstr "" -#: Step8.class:59 +#: Step8.class:72 msgid "Not Formatted" msgstr "" -#: Step8.class:59 +#: Step8.class:72 msgid "Mount to" msgstr "" -#: Step8.class:61 +#: Step8.class:74 msgid "Format to" msgstr "" -#: Step8.class:61 +#: Step8.class:74 msgid "and mount to" msgstr "" +#: Step8.class:86 +msgid "Swap Space" +msgstr "" + +#: Step8.class:109 +msgid "Full" +msgstr "" + +#: Step8.class:111 +msgid "Customized" +msgstr "" + +#: Step8.class:113 +msgid "Minimal" +msgstr "" + #: Step8.class:116 +msgid "Installation Method" +msgstr "" + +#: Step8.class:121 +msgid "Software Selection" +msgstr "" + +#: Step8.class:122 +msgid "Major Components" +msgstr "" + +#: Step8.class:132 +msgid "Additional Software" +msgstr "" + +#: Step8.class:190 msgid "Installation Summary" msgstr "" -#: Step8.class:135 +#: Step8.class:209 msgid "Your VectorLinux installation is about to be performed as follows. If you need to make any changes, this is your last chance." msgstr "" Modified: branches/speedy/.project ============================================================================== --- branches/speedy/.project (original) +++ branches/speedy/.project Wed Feb 25 08:17:55 2009 @@ -13,3 +13,7 @@ Language=en_US ControlPublic=1 ModulePublic=1 +Maintainer=root +Address=ro...@lo... +License=General Public Licence +UseRelease=1 Modified: branches/speedy/ClsGlobal.class ============================================================================== --- branches/speedy/ClsGlobal.class (original) +++ branches/speedy/ClsGlobal.class Wed Feb 25 08:17:55 2009 @@ -52,6 +52,7 @@ STATIC PUBLIC fboot AS String STATIC PUBLIC sVitalPartList AS String +STATIC PUBLIC sWapPartList AS String STATIC PUBLIC sMiscMountList AS String STATIC PUBLIC sFullDiscToWipe AS String Modified: branches/speedy/Step6.class ============================================================================== --- branches/speedy/Step6.class (original) +++ branches/speedy/Step6.class Wed Feb 25 08:17:55 2009 @@ -286,11 +286,21 @@ PUBLIC SUB read_partition_selection() - + + DIM cbox, cb AS ComboBox - DIM sFormat AS String + DIM sFormat, sSize AS String + DIM i AS Integer FOR EACH cbox IN objMntPoints IF cbox.Text <> ("Not Used") THEN + i = 2 + REPEAT + IF Trim(gvPartListing[i, 0].Text) = Trim(cbox.Tag) THEN + sSize = Trim(gvPartListing[i, 1].Text) + END IF + INC i + UNTIL sSize OR i = gvPartListing.Rows.Count + FOR EACH cb IN objFS IF cbox.tag = cb.Tag THEN sFormat = Trim(cb.Text) @@ -299,38 +309,16 @@ sFormat = "" END IF NEXT - ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag & "-" & cbox.Text & "-" & sFormat & "," - - ' SELECT CASE cbox.Text - ' CASE "/" - ' ClsGlobal.sRoot = cbox.Tag - ' ClsGlobal.froot = sFormat - ' CASE "/home" - ' ClsGlobal.shome = cbox.Tag - ' ClsGlobal.fhome = sFormat - ' CASE "/usr" - ' ClsGlobal.susr = cbox.Tag - ' ClsGlobal.fusr = sFormat - ' CASE "/opt" - ' ClsGlobal.sopt = cbox.Tag - ' ClsGlobal.fopt = sFormat - ' CASE "/var" - ' ClsGlobal.svar = cbox.Tag - ' ClsGlobal.fvar = sFormat - ' CASE "/tmp" - ' ClsGlobal.stmp = cbox.Tag - ' ClsGlobal.ftmp = sFormat - ' CASE "/boot" - ' ClsGlobal.sboot = cbox.Tag - ' ClsGlobal.fboot = sFormat - ' CASE ELSE - ' ClsGlobal.sMiscMountList = ClsGlobal.sMiscMountList & cbox.Tag & "," & Trim(cbox.Text) & ";" - ' END SELECT + ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag & "-" & sSize & "-" & cbox.Text & "-" & sFormat & "," END IF NEXT - - +FOR i = 2 TO gvPartListing.Rows.count - 1 + IF gvPartListing[i, 4].Text LIKE "linux-swap" THEN + ClsGlobal.sWapPartList = ClsGlobal.sWapPartList & gvPartListing[i, 0].Text & "-" & gvPartListing[i, 1].Text & "," + END IF + NEXT + END Modified: branches/speedy/Step8.class ============================================================================== --- branches/speedy/Step8.class (original) +++ branches/speedy/Step8.class Wed Feb 25 08:17:55 2009 @@ -14,9 +14,20 @@ ' 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 PicInfo AS Picture +PRIVATE PicTask AS Picture +PRIVATE PicDisk AS Picture +PRIVATE PicPackage AS Picture +PRIVATE PicTlz AS Picture + PUBLIC SUB Form_Open() ME.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>" + PicInfo = Picture.load("images/info.png") + PicTask = Picture.load("images/task-due.png") + PicDisk = Picture.load("images/hdd.png") + PicPackage = Picture.Load("images/package.png") + PicTlz = Picture.Load("images/tlz.png") 'ME.SUMMARIZE_DISTRO_INFO() 'ME.SUMMARIZE_PARTITION_SELECTION() @@ -30,10 +41,10 @@ PUBLIC SUB SUMMARIZE_DISTRO_INFO() WITH ME.TreeView1 - .Add("DistroInfo", "Distribution", MdlStartUp.pCategory) - .Add("Distro0", "Name",, "DistroInfo") + .Add("DistroInfo", ("Distribution"), MdlStartUp.pCategory) + .Add("Distro0", ("Name"), PicInfo, "DistroInfo") .Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0") - .Add("Distro1", "Version",, "DistroInfo") + .Add("Distro1", ("Version"), PicInfo, "DistroInfo") .Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1") END WITH @@ -42,36 +53,98 @@ PUBLIC SUB SUMMARIZE_PARTITION_SELECTION() DIM i AS Integer DIM sList AS String - DIM sArr, sEntry AS String[] - DIM sPart, sMntPnt, sFs AS String + DIM sArr, sEntry, sSwaps AS String[] + DIM sPart, sMntPnt, sFs, sSwap, sSize AS String + WITH ME.TreeView1 - .Add("Part", "Partitions to be used", MdlStartUp.pCategory) + .Add("Part", ("Partitions to be used"), MdlStartUp.pCategory) sArr = Split(ClsGlobal.sVitalPartList, ",") FOR i = 0 TO sArr.Max sList = Trim(sArr[i]) IF sList THEN sEntry = Split(sList, "-") sPart = Trim(sEntry[0]) - sMntPnt = Trim(sEntry[1]) - sFs = Trim(sEntry[2]) + sSize = Trim(sEntry[1]) + sMntPnt = Trim(sEntry[2]) + sFs = Trim(sEntry[3]) IF sfs LIKE ("Do not format") THEN sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) & ("Mount to") & Space(1) ELSE sfs = ("Format to") & Space(1) & sFs & Space(1) & ("and mount to") & Space(1) END IF - .Add("Part." & i, sPart,, "Part") - .add("Part." & i & "." & i, sFs & sMntPnt,, "Part." & i) + .Add("Part." & i, sPart & " -- " & sSize, PicDisk, "Part") + .add("Part." & i & "." & i, sFs & sMntPnt, PicTask, "Part." & i) '.Add("Part." & i & "." & i, sMntPnt,, "Part." & i) '.Add("Part." & i & "." & i & "." & i, sFs,, "Part." & i & "." & i) END IF NEXT + ' summarize swap partitions + sSwaps = Split(Trim(ClsGlobal.sWapPartList), ",") + IF sSwaps THEN + .Add("Swaps", ("Swap Space"),, "Part") + END IF + FOR i = 0 TO sSwaps.Max + sSwap = Trim(sSwaps[i]) + IF sSwap THEN + 'sSwap = Left(sSwap, InStr(sSwap,"-")) + + .Add("Swaps" & i, Left(sSwap, InStr(sSwap, "-") - 1) & Space(1) & " -- " & Right(sSwap, Len(sSwap) - InStr(sSwap, "-")), PicDisk, "Swaps") + END IF + NEXT END WITH END +PUBLIC SUB SUMMARIZE_INSTALL_TYPE() + + DIM sInsType, sList, sPkg, sBulkList, sBulk AS String + DIM sBulks, sPkgs AS String[] + DIM i AS Integer + + SELECT CASE ClsGlobal.iInstallMethod + CASE 0 + sInsType = ("Full") + CASE 1 + sInsType = ("Customized") + CASE 2 + sInsType = ("Minimal") + END SELECT + + ME.TreeView1.Add("Install Type", ("Installation Method"), MdlStartUp.pCategory) + ME.TreeView1.Add("Install Type.1", sInsType, PicInfo, "Install Type") + + ' if installation is customized... provide details + IF ClsGlobal.iInstallMethod = 1 THEN + ME.TreeView1.Add("Software", ("Software Selection"), MdlStartUp.pCategory) + ME.TreeView1.Add("Bulks", ("Major Components"),, "Software") + + sBulkList = ClsGlobal.sBulkListToInstall + sBulks = Split(sBulkList, ",") + FOR i = 0 TO sBulks.Max + sBulk = Trim(sBulks[i]) + IF sBulk THEN + ME.TreeView1.Add(sBulk, sBulk, PicTlz, "Bulks") + END IF + NEXT + ME.TreeView1.Add("Pkgs", ("Additional Software"),, "Software") + + sList = ClsGlobal.sPkgListToInstall + sPkgs = Split(sList, ",") + FOR i = 0 TO sPkgs.Max + sPkg = Trim(sPkgs[i]) + IF sPkg THEN + ME.TreeView1.Add(sPkg, sPkg, PicPackage, "Pkgs") + END IF + NEXT + + END IF + + +END + PUBLIC SUB OnExit() @@ -83,6 +156,7 @@ ME.TreeView1.Clear() ME.SUMMARIZE_DISTRO_INFO() ME.SUMMARIZE_PARTITION_SELECTION() + ME.SUMMARIZE_INSTALL_TYPE() END Added: branches/speedy/images/hdd.png ============================================================================== Binary file. No diff available. Added: branches/speedy/images/info.png ============================================================================== Binary file. No diff available. Added: branches/speedy/images/package.png ============================================================================== Binary file. No diff available. Added: branches/speedy/images/task-due.png ============================================================================== Binary file. No diff available. Added: branches/speedy/images/tlz.png ============================================================================== Binary file. No diff available. |
From: <cod...@go...> - 2009-02-24 23:09:35
|
Author: M0...@gm... Date: Tue Feb 24 14:20:56 2009 New Revision: 503 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step1.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step7.pot branches/speedy/.lang/Step7b.pot branches/speedy/.lang/Step8.pot branches/speedy/Step1.class branches/speedy/Step1.form branches/speedy/Step3a.form branches/speedy/Step6.class branches/speedy/Step7.form branches/speedy/Step7b.class branches/speedy/Step8.class branches/speedy/Step8.form Log: Started working on summary treeview Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Tue Feb 24 14:20:56 2009 @@ -62,7 +62,7 @@ msgid "Installation" msgstr "" -#: MdlStartUp.module:49 Step8.class:65 +#: MdlStartUp.module:49 Step8.class:116 msgid "Installation Summary" msgstr "" @@ -130,67 +130,113 @@ msgid "on" msgstr "" -#: Step1.class:131 +#: Step1.class:91 +msgid "" +"No installable media was found on your system. Please insert an installation " +"CD" +msgstr "" + +#: Step1.class:91 +msgid "" +"or move your installation images (ISO) to the top of your partitions. Then " +"click" +msgstr "" + +#: Step1.class:92 +msgid "No installable media found on your system." +msgstr "" + +#: Step1.class:93 +msgid "" +"Insert installation CD or move Installable (iso) images to the top directory " +"on your partitions and click" +msgstr "" + +#: Step1.class:93 +msgid "to search for media again" +msgstr "" + +#: Step1.class:98 Step2.class:198 Step5.class:166 +msgid "Click" +msgstr "" + +#: Step1.class:98 +msgid "to begin installing" +msgstr "" + +#: Step1.class:101 +msgid "Select Installation source from the list below" +msgstr "" + +#: Step1.class:103 +msgid "to continue or click" +msgstr "" + +#: Step1.class:103 +msgid "to search for installation media again" +msgstr "" + +#: Step1.class:149 msgid "Scanning system partitions for installation files" msgstr "" -#: Step1.class:150 +#: Step1.class:168 msgid "Found" msgstr "" -#: Step1.class:150 +#: Step1.class:168 msgid "in partition" msgstr "" -#: Step1.class:191 +#: Step1.class:209 msgid "Scanning for CD Media ... Please wait" msgstr "" -#: Step1.class:204 +#: Step1.class:222 msgid "Scanning" msgstr "" -#: Step1.class:214 +#: Step1.class:232 msgid "in" msgstr "" -#: Step1.class:242 +#: Step1.class:260 msgid "Scanning system for installable ISO images" msgstr "" -#: Step1.class:335 +#: Step1.class:353 msgid "DISTRIBUTION" msgstr "" -#: Step1.class:338 +#: Step1.class:356 msgid "VERSION" msgstr "" -#: Step1.class:415 +#: Step1.class:433 msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143 +#: Step1.class:433 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143 msgid "WARNING:" msgstr "" -#: Step1.class:415 +#: Step1.class:433 msgid "This process can take a long time to complete." msgstr "" -#: Step1.class:468 -msgid "Select Installation Source" +#: Step1.class:443 +msgid "Searching your system for installable media" msgstr "" -#: Step1.class:486 -msgid "Select Installation source from the list below" +#: Step1.class:511 +msgid "Select Installation Source" msgstr "" -#: Step1.class:507 +#: Step1.class:550 msgid "Search Again" msgstr "" -#: Step1.class:537 +#: Step1.class:580 msgid "Check Installation media before installing" msgstr "" @@ -286,10 +332,6 @@ msgid "Keep in mind however, that this process can take a while to complete." msgstr "" -#: Step2.class:198 Step5.class:166 -msgid "Click" -msgstr "" - #: Step2.class:198 msgid "to abort this process at any time" msgstr "" @@ -451,11 +493,11 @@ msgid "This step cannot be undone. Are you sure you want to continue?" msgstr "" -#: Step3a1a.class:169 Step6.class:441 Step7a.class:143 +#: Step3a1a.class:169 Step6.class:446 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:441 Step7a.class:143 +#: Step3a1a.class:169 Step6.class:446 Step7a.class:143 msgid "No" msgstr "" @@ -651,31 +693,31 @@ msgid "File System" msgstr "" -#: Step6.class:141 +#: Step6.class:146 msgid "Not Used" msgstr "" -#: Step6.class:162 +#: Step6.class:167 Step8.class:58 msgid "Do not format" msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "You have already selected" msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "as your" msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "partition." msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:336 +#: Step6.class:341 msgid "Select which partitions to use for installation" msgstr "" @@ -683,27 +725,27 @@ msgid "Select Installation Mode" msgstr "" -#: Step7.class:107 +#: Step7.class:108 msgid "Full Install" msgstr "" -#: Step7.class:117 +#: Step7.class:118 msgid "Install everthing in the image (Fully Automated)" msgstr "" -#: Step7.class:125 +#: Step7.class:126 msgid "Customized" msgstr "" -#: Step7.class:135 +#: Step7.class:136 msgid "Select the components you wish to install (Advanced)" msgstr "" -#: Step7.class:143 +#: Step7.class:144 msgid "Minimal" msgstr "" -#: Step7.class:153 +#: Step7.class:154 msgid "Install the most minimal working confuguration (For older hardware)" msgstr "" @@ -735,11 +777,11 @@ msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:169 Step7b.class:180 +#: Step7a.class:169 Step7b.class:183 msgid "Select All" msgstr "" -#: Step7a.class:175 Step7b.class:178 +#: Step7a.class:175 Step7b.class:181 msgid "Un-Select All" msgstr "" @@ -757,13 +799,29 @@ msgid "Reading software catalog... Please wait a moment" msgstr "" -#: Step7b.class:104 +#: Step7b.class:107 msgid "" "Additional optional software available. Select which software packages to " "include in your installation." msgstr "" -#: Step8.class:84 +#: Step8.class:59 +msgid "Not Formatted" +msgstr "" + +#: Step8.class:59 +msgid "Mount to" +msgstr "" + +#: Step8.class:61 +msgid "Format to" +msgstr "" + +#: Step8.class:61 +msgid "and mount to" +msgstr "" + +#: Step8.class:135 msgid "" "Your VectorLinux installation is about to be performed as follows. If you " "need to make any changes, this is your last chance." Modified: branches/speedy/.lang/Step1.pot ============================================================================== --- branches/speedy/.lang/Step1.pot (original) +++ branches/speedy/.lang/Step1.pot Tue Feb 24 14:20:56 2009 @@ -18,67 +18,107 @@ msgid "on" msgstr "" -#: Step1.class:131 +#: Step1.class:91 +msgid "No installable media was found on your system. Please insert an installation CD" +msgstr "" + +#: Step1.class:91 +msgid "or move your installation images (ISO) to the top of your partitions. Then click" +msgstr "" + +#: Step1.class:92 +msgid "No installable media found on your system." +msgstr "" + +#: Step1.class:93 +msgid "Insert installation CD or move Installable (iso) images to the top directory on your partitions and click" +msgstr "" + +#: Step1.class:93 +msgid "to search for media again" +msgstr "" + +#: Step1.class:98 +msgid "Click" +msgstr "" + +#: Step1.class:98 +msgid "to begin installing" +msgstr "" + +#: Step1.class:101 +msgid "Select Installation source from the list below" +msgstr "" + +#: Step1.class:103 +msgid "to continue or click" +msgstr "" + +#: Step1.class:103 +msgid "to search for installation media again" +msgstr "" + +#: Step1.class:149 msgid "Scanning system partitions for installation files" msgstr "" -#: Step1.class:150 +#: Step1.class:168 msgid "Found" msgstr "" -#: Step1.class:150 +#: Step1.class:168 msgid "in partition" msgstr "" -#: Step1.class:191 +#: Step1.class:209 msgid "Scanning for CD Media ... Please wait" msgstr "" -#: Step1.class:204 +#: Step1.class:222 msgid "Scanning" msgstr "" -#: Step1.class:214 +#: Step1.class:232 msgid "in" msgstr "" -#: Step1.class:242 +#: Step1.class:260 msgid "Scanning system for installable ISO images" msgstr "" -#: Step1.class:335 +#: Step1.class:353 msgid "DISTRIBUTION" msgstr "" -#: Step1.class:338 +#: Step1.class:356 msgid "VERSION" msgstr "" -#: Step1.class:415 +#: Step1.class:433 msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:415 +#: Step1.class:433 msgid "WARNING:" msgstr "" -#: Step1.class:415 +#: Step1.class:433 msgid "This process can take a long time to complete." msgstr "" -#: Step1.class:468 -msgid "Select Installation Source" +#: Step1.class:443 +msgid "Searching your system for installable media" msgstr "" -#: Step1.class:486 -msgid "Select Installation source from the list below" +#: Step1.class:511 +msgid "Select Installation Source" msgstr "" -#: Step1.class:507 +#: Step1.class:550 msgid "Search Again" msgstr "" -#: Step1.class:537 +#: Step1.class:580 msgid "Check Installation media before installing" msgstr "" Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Tue Feb 24 14:20:56 2009 @@ -30,39 +30,39 @@ msgid "File System" msgstr "" -#: Step6.class:141 +#: Step6.class:146 msgid "Not Used" msgstr "" -#: Step6.class:162 +#: Step6.class:167 msgid "Do not format" msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "You have already selected" msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "as your" msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "partition." msgstr "" -#: Step6.class:207 +#: Step6.class:212 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:336 +#: Step6.class:341 msgid "Select which partitions to use for installation" msgstr "" -#: Step6.class:441 +#: Step6.class:446 msgid "Yes" msgstr "" -#: Step6.class:441 +#: Step6.class:446 msgid "No" msgstr "" Modified: branches/speedy/.lang/Step7.pot ============================================================================== --- branches/speedy/.lang/Step7.pot (original) +++ branches/speedy/.lang/Step7.pot Tue Feb 24 14:20:56 2009 @@ -18,27 +18,27 @@ msgid "Select Installation Mode" msgstr "" -#: Step7.class:107 +#: Step7.class:108 msgid "Full Install" msgstr "" -#: Step7.class:117 +#: Step7.class:118 msgid "Install everthing in the image (Fully Automated)" msgstr "" -#: Step7.class:125 +#: Step7.class:126 msgid "Customized" msgstr "" -#: Step7.class:135 +#: Step7.class:136 msgid "Select the components you wish to install (Advanced)" msgstr "" -#: Step7.class:143 +#: Step7.class:144 msgid "Minimal" msgstr "" -#: Step7.class:153 +#: Step7.class:154 msgid "Install the most minimal working confuguration (For older hardware)" msgstr "" Modified: branches/speedy/.lang/Step7b.pot ============================================================================== --- branches/speedy/.lang/Step7b.pot (original) +++ branches/speedy/.lang/Step7b.pot Tue Feb 24 14:20:56 2009 @@ -30,15 +30,15 @@ msgid "Reading software catalog... Please wait a moment" msgstr "" -#: Step7b.class:104 +#: Step7b.class:107 msgid "Additional optional software available. Select which software packages to include in your installation." msgstr "" -#: Step7b.class:178 +#: Step7b.class:181 msgid "Un-Select All" msgstr "" -#: Step7b.class:180 +#: Step7b.class:183 msgid "Select All" msgstr "" Modified: branches/speedy/.lang/Step8.pot ============================================================================== --- branches/speedy/.lang/Step8.pot (original) +++ branches/speedy/.lang/Step8.pot Tue Feb 24 14:20:56 2009 @@ -14,11 +14,31 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step8.class:65 +#: Step8.class:58 +msgid "Do not format" +msgstr "" + +#: Step8.class:59 +msgid "Not Formatted" +msgstr "" + +#: Step8.class:59 +msgid "Mount to" +msgstr "" + +#: Step8.class:61 +msgid "Format to" +msgstr "" + +#: Step8.class:61 +msgid "and mount to" +msgstr "" + +#: Step8.class:116 msgid "Installation Summary" msgstr "" -#: Step8.class:84 +#: Step8.class:135 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.class ============================================================================== --- branches/speedy/Step1.class (original) +++ branches/speedy/Step1.class Tue Feb 24 14:20:56 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) + ClsGlobal.sDistroName = gvdistdetails[0, 1].Text + ClsGlobal.sDistroVer = gvdistdetails[1, 1].Text PRINT " --- Use " & ClsGlobal.sSourceName & Space(1) & "from " & ClsGlobal.sSourceAddr & " for installation source" TRY MKDIR "/mnt/source" @@ -84,6 +86,22 @@ ME.mvLooking.Playing = FALSE ME.mvLooking.Visible = FALSE + IF ComboBox1.Count = 0 THEN + Message.Error(("No installable media was found on your system. Please insert an installation CD") & gb.NewLine & + ("or move your installation images (ISO) to the top of your partitions. Then click") & Space(1) & "\"" & btrescan.text & "\"") + ME.TextLabel2.Text = ("No installable media found on your system.") + ME.tlNext.Text = "<i>" & ("Insert installation CD or move Installable (iso) images to the top directory on your partitions and click") & Space(1) & "\"" & ME.btrescan.text & "\"" & ("to search for media again") & "</i>" + ME.gvDistDetails.Visible = FALSE + ClsGlobal.fRunningMainForm.btNext.enabled = FALSE + ELSE IF ComboBox1.Count = 1 THEN + ME.TextLabel2.Text = ("Click") & Space(1) & "\"" & ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1) & ("to begin installing") & Space(1)& + gvdistdetails[0, 1].Text & Space(1) & gvdistdetails[1, 1].Text + ME.tlNext.Text = "" + ELSE + ME.TextLabel2.Text = ("Select Installation source from the list below") + ME.tlNext.Text = ("Click") & Space(1) & "\"" & ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1)& + ("to continue or click") & Space(1) & "\"" & ME.btRescan.Text & "\"" & Space(1) & ("to search for installation media again") + END IF END @@ -420,6 +438,10 @@ END PUBLIC SUB btRescan_Click() + + + ME.TextLabel2.Text = ("Searching your system for installable media") + ME.tlNext.Visible = FALSE ME.mvLooking.Visible = TRUE ME.ComboBox1.Clear() ME.FIND_CD_INSTALL_MEDIA() @@ -429,5 +451,25 @@ ME.mvLooking.Visible = FALSE FMain.btNext.Enabled = ComboBox1.Count > 0 + IF ComboBox1.Count = 0 THEN + Message.Error(("No installable media was found on your system. Please insert an installation CD") & gb.NewLine & + ("or move your installation images (ISO) to the top of your partitions. Then click") & Space(1) & "\"" & btrescan.text & "\"") + ME.TextLabel2.Text = ("No installable media found on your system.") + ME.tlNext.Text = "<i>" & ("Insert installation CD or move Installable (iso) images to the top directory on your partitions and click") & Space(1) & "\"" & ME.btrescan.text & "\"" & ("to search for media again") & "</i>" + ME.gvDistDetails.Visible = FALSE + ClsGlobal.fRunningMainForm.btNext.enabled = FALSE + ELSE IF ComboBox1.Count = 1 THEN + ME.TextLabel2.Text = ("Click") & Space(1) & "\"" & ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1) & ("to begin installing") & Space(1)& + gvdistdetails[0, 1].Text & Space(1) & gvdistdetails[1, 1].Text + ME.gvDistDetails.Visible = TRUE + ME.tlNext.Text = "" + ELSE + ME.TextLabel2.Text = ("Select Installation source from the list below") + ME.tlNext.Text = ("Click") & Space(1) & "\"" & ClsGlobal.fRunningMainForm.btNext.text & "\"" & Space(1)& + ("to continue or click") & Space(1) & "\"" & ME.btRescan.Text & "\"" & Space(1) & ("to search for installation media again") + ME.gvDistDetails.Visible = TRUE + END IF + + ME.tlNext.Visible = TRUE END Modified: branches/speedy/Step1.form ============================================================================== --- branches/speedy/Step1.form (original) +++ branches/speedy/Step1.form Tue Feb 24 14:20:56 2009 @@ -24,7 +24,7 @@ { TextLabel2 TextLabel MoveScaled(1,0,54,3) Expand = True - Text = ("Select Installation source from the list below") + Text = ("Searching your system for installable media") } { HBox1 HBox MoveScaled(1,3,54,3) @@ -71,6 +71,11 @@ { mvLooking MovieBox MoveScaled(5,24,11,25) Expand = True + } + { tlNext TextLabel + MoveScaled(2,26,45,6) + Expand = True + Text = ("") } } } Modified: branches/speedy/Step3a.form ============================================================================== --- branches/speedy/Step3a.form (original) +++ branches/speedy/Step3a.form Tue Feb 24 14:20:56 2009 @@ -68,7 +68,7 @@ Expand = True } { rbEntireDisk RadioButton - MoveScaled(2,17,34,3) + MoveScaled(2,18,34,3) Expand = True Text = ("Use entire disk") } Modified: branches/speedy/Step6.class ============================================================================== --- branches/speedy/Step6.class (original) +++ branches/speedy/Step6.class Tue Feb 24 14:20:56 2009 @@ -46,7 +46,7 @@ NEXT ME.read_partition_selection - Message(ClsGlobal.sVitalPartList) + 'Message(ClsGlobal.sVitalPartList) ' sList = Trim(Left(sList, Len(sList) - 1)) 'ClsGlobal.sVitalPartList = Trim(sList) 'Message(ClsGlobal.sVitalPartList) @@ -83,6 +83,9 @@ gvPartListing[0, 4].BackColor = Color.LightBackground gvPartListing.Columns[4].Width = 150 gvPartListing[0, 4].Font.Bold = TRUE + gvPartListing[0, 5].BackColor = Color.LightBackground + gvPartListing.Columns[5].Width = 1 + gvPartListing[0, 6].BackColor = Color.LightBackground 'gvPartListing[0, 5].BackColor = Color.LightBackground 'gvPartListing[0, 5].Font.Bold = TRUE 'gvPartListing[0, 5] @@ -124,6 +127,8 @@ gvPartListing[irow, 2].BackColor = Color.LightGray gvPartListing[irow, 3].BackColor = Color.LightGray gvPartListing[irow, 4].BackColor = Color.LightGray + gvPartListing[irow, 5].BackColor = Color.LightGray + gvPartListing[irow, 6].BackColor = Color.LightGray ELSE gvPartListing[irow, 5].Text = Trim(SFS) Modified: branches/speedy/Step7.form ============================================================================== --- branches/speedy/Step7.form (original) +++ branches/speedy/Step7.form Tue Feb 24 14:20:56 2009 @@ -23,6 +23,7 @@ } { HPanel2 HPanel MoveScaled(2,8,69,27) + Expand = True { rbFullInstall RadioButton MoveScaled(1,2,17,3) Tag = "0" Modified: branches/speedy/Step7b.class ============================================================================== --- branches/speedy/Step7b.class (original) +++ branches/speedy/Step7b.class Tue Feb 24 14:20:56 2009 @@ -61,7 +61,7 @@ ME.HBox3.Visible = FALSE ME.HBox5.Visible = TRUE ME.MovieBox1.Playing = TRUE - WAIT 1 + WAIT 0.1 irow = 2 IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN @@ -70,8 +70,9 @@ ME.MovieBox1.Playing = TRUE ME.MovieBox1.Refresh sLine = Trim(sArr[i]) - sPkg = sLine - SHELL "cat /mnt/source/PACKAGES.TXT | grep \"^" & sPkg & "\" | cut -f 2 -d \':\' " TO sDescDump + sPkg = Trim(sLine) + IF sPkg THEN + SHELL "cat /mnt/source/PACKAGES.TXT | grep -i \"^" & sPkg & "\" | cut -f 2 -d :" TO sDescDump sDescDump = Trim(sDescDump) IF sDescDump THEN sDescArr = Split(sDescDump, "\n") @@ -86,14 +87,16 @@ sShortDesc = "" sDesc = "" END IF - + WAIT 0.1 + 'Message(sPkg & "<br><br>" & sShortDesc) gvOptions[irow, 0].Picture = PicYes gvOptions[irow, 1].Text = sPkg gvOptions[irow, 2].Text = Trim(sShortDesc) gvOptions[irow, 3].Text = Trim(sDesc) gvOptions[irow, 4].Text = "yes" + INC irow INC gvOptions.Rows.Count - INC irow + END IF NEXT ME.MovieBox1.Playing = FALSE Modified: branches/speedy/Step8.class ============================================================================== --- branches/speedy/Step8.class (original) +++ branches/speedy/Step8.class Tue Feb 24 14:20:56 2009 @@ -17,6 +17,8 @@ PUBLIC SUB Form_Open() ME.tlbanner.Text = "<h2>" & tlbanner.text & "</h2>" + 'ME.SUMMARIZE_DISTRO_INFO() + 'ME.SUMMARIZE_PARTITION_SELECTION() END PUBLIC FUNCTION GetNext() AS String @@ -24,14 +26,63 @@ RETURN "Step9" END -PUBLIC SUB OnExit() + +PUBLIC SUB SUMMARIZE_DISTRO_INFO() + WITH ME.TreeView1 + .Add("DistroInfo", "Distribution", MdlStartUp.pCategory) + .Add("Distro0", "Name",, "DistroInfo") + .Add("Distro00", Trim(ClsGlobal.sDistroName),, "Distro0") + .Add("Distro1", "Version",, "DistroInfo") + .Add("Distro10", Trim(ClsGlobal.sDistroVer),, "Distro1") + END WITH +END + +PUBLIC SUB SUMMARIZE_PARTITION_SELECTION() + DIM i AS Integer + DIM sList AS String + DIM sArr, sEntry AS String[] + DIM sPart, sMntPnt, sFs AS String + + WITH ME.TreeView1 + .Add("Part", "Partitions to be used", MdlStartUp.pCategory) + sArr = Split(ClsGlobal.sVitalPartList, ",") + FOR i = 0 TO sArr.Max + sList = Trim(sArr[i]) + IF sList THEN + sEntry = Split(sList, "-") + sPart = Trim(sEntry[0]) + sMntPnt = Trim(sEntry[1]) + sFs = Trim(sEntry[2]) + IF sfs LIKE ("Do not format") THEN + sFs = "(" & ("Not Formatted") & ")" & "," & Space(1) & ("Mount to") & Space(1) + ELSE + sfs = ("Format to") & Space(1) & sFs & Space(1) & ("and mount to") & Space(1) + END IF + .Add("Part." & i, sPart,, "Part") + .add("Part." & i & "." & i, sFs & sMntPnt,, "Part." & i) + '.Add("Part." & i & "." & i, sMntPnt,, "Part." & i) + '.Add("Part." & i & "." & i & "." & i, sFs,, "Part." & i & "." & i) + END IF + NEXT + + + END WITH END -PUBLIC SUB StartUp() + + + +PUBLIC SUB OnExit() + +END +PUBLIC SUB StartUp() + ME.TreeView1.Clear() + ME.SUMMARIZE_DISTRO_INFO() + ME.SUMMARIZE_PARTITION_SELECTION() END Modified: branches/speedy/Step8.form ============================================================================== --- branches/speedy/Step8.form (original) +++ branches/speedy/Step8.form Tue Feb 24 14:20:56 2009 @@ -27,8 +27,8 @@ 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) + { TreeView1 TreeView + MoveScaled(3,15,52,20) Expand = True } } |
From: <cod...@go...> - 2009-02-23 23:04:05
|
Author: M0...@gm... Date: Mon Feb 23 14:30:56 2009 New Revision: 502 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step7a.pot branches/speedy/.lang/Step7b.pot branches/speedy/ClsGlobal.class branches/speedy/Step6.class branches/speedy/Step7a.class branches/speedy/Step7b.class branches/speedy/Step7b.form Log: Finished software selection... started collecting information from user Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Mon Feb 23 14:30:56 2009 @@ -170,7 +170,7 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:127 +#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:143 msgid "WARNING:" 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 Step7a.class:127 +#: Step3a1a.class:169 Step6.class:441 Step7a.class:143 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:386 Step7a.class:127 +#: Step3a1a.class:169 Step6.class:441 Step7a.class:143 msgid "No" msgstr "" @@ -635,47 +635,47 @@ msgid "Restart Now" msgstr "" -#: Step6.class:59 +#: Step6.class:66 msgid "Partition" msgstr "" -#: Step6.class:60 +#: Step6.class:67 msgid "Size" msgstr "" -#: Step6.class:61 +#: Step6.class:68 msgid "Mount Point" msgstr "" -#: Step6.class:62 +#: Step6.class:69 msgid "File System" msgstr "" -#: Step6.class:134 +#: Step6.class:141 msgid "Not Used" msgstr "" -#: Step6.class:155 +#: Step6.class:162 msgid "Do not format" msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "You have already selected" msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "as your" msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "partition." msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:281 +#: Step6.class:336 msgid "Select which partitions to use for installation" msgstr "" @@ -715,49 +715,49 @@ msgid "Component" msgstr "" -#: Step7a.class:49 Step7b.class:27 +#: Step7a.class:49 Step7b.class:28 msgid "Description" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "" "This component is a dependancy to any graphical user interface progam on the " "system" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "" "Choosing not to install this may result in a command-line (text mode) " "installation only" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:153 Step7b.class:164 +#: Step7a.class:169 Step7b.class:180 msgid "Select All" msgstr "" -#: Step7a.class:159 Step7b.class:162 +#: Step7a.class:175 Step7b.class:178 msgid "Un-Select All" msgstr "" -#: Step7a.class:219 +#: Step7a.class:235 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:26 +#: Step7b.class:27 msgid "Package Name" msgstr "" -#: Step7b.class:54 +#: Step7b.class:58 msgid "Reading software catalog... Please wait a moment" msgstr "" -#: Step7b.class:93 +#: Step7b.class:104 msgid "" "Additional optional software available. Select which software packages to " "include in your installation." Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Mon Feb 23 14:30:56 2009 @@ -14,55 +14,55 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step6.class:59 +#: Step6.class:66 msgid "Partition" msgstr "" -#: Step6.class:60 +#: Step6.class:67 msgid "Size" msgstr "" -#: Step6.class:61 +#: Step6.class:68 msgid "Mount Point" msgstr "" -#: Step6.class:62 +#: Step6.class:69 msgid "File System" msgstr "" -#: Step6.class:134 +#: Step6.class:141 msgid "Not Used" msgstr "" -#: Step6.class:155 +#: Step6.class:162 msgid "Do not format" msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "You have already selected" msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "as your" msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "partition." msgstr "" -#: Step6.class:200 +#: Step6.class:207 msgid "Please select only one partition for this purpose" msgstr "" -#: Step6.class:281 +#: Step6.class:336 msgid "Select which partitions to use for installation" msgstr "" -#: Step6.class:386 +#: Step6.class:441 msgid "Yes" msgstr "" -#: Step6.class:386 +#: Step6.class:441 msgid "No" msgstr "" Modified: branches/speedy/.lang/Step7a.pot ============================================================================== --- branches/speedy/.lang/Step7a.pot (original) +++ branches/speedy/.lang/Step7a.pot Mon Feb 23 14:30:56 2009 @@ -26,39 +26,39 @@ msgid "Description" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "WARNING:" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "This component is a dependancy to any graphical user interface progam on the system" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "Choosing not to install this may result in a command-line (text mode) installation only" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "Yes" msgstr "" -#: Step7a.class:127 +#: Step7a.class:143 msgid "No" msgstr "" -#: Step7a.class:153 +#: Step7a.class:169 msgid "Select All" msgstr "" -#: Step7a.class:159 +#: Step7a.class:175 msgid "Un-Select All" msgstr "" -#: Step7a.class:219 +#: Step7a.class:235 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 "" Modified: branches/speedy/.lang/Step7b.pot ============================================================================== --- branches/speedy/.lang/Step7b.pot (original) +++ branches/speedy/.lang/Step7b.pot Mon Feb 23 14:30:56 2009 @@ -18,27 +18,27 @@ msgid "Customize Your VectorLinux Installation" msgstr "" -#: Step7b.class:26 +#: Step7b.class:27 msgid "Package Name" msgstr "" -#: Step7b.class:27 +#: Step7b.class:28 msgid "Description" msgstr "" -#: Step7b.class:54 +#: Step7b.class:58 msgid "Reading software catalog... Please wait a moment" msgstr "" -#: Step7b.class:93 +#: Step7b.class:104 msgid "Additional optional software available. Select which software packages to include in your installation." msgstr "" -#: Step7b.class:162 +#: Step7b.class:178 msgid "Un-Select All" msgstr "" -#: Step7b.class:164 +#: Step7b.class:180 msgid "Select All" msgstr "" Modified: branches/speedy/ClsGlobal.class ============================================================================== --- branches/speedy/ClsGlobal.class (original) +++ branches/speedy/ClsGlobal.class Mon Feb 23 14:30:56 2009 @@ -35,6 +35,25 @@ STATIC PUBLIC sTargetRoot AS String ' we know by default this is a reiserfs partition STATIC PUBLIC sTargetSwap AS String +' PARTITIONS SELECTED +STATIC PUBLIC sRoot AS String +STATIC PUBLIC froot AS String +STATIC PUBLIC shome AS String +STATIC PUBLIC fhome AS String +STATIC PUBLIC sopt AS String +STATIC PUBLIC fopt AS String +STATIC PUBLIC susr AS String +STATIC PUBLIC fusr AS String +STATIC PUBLIC stmp AS String +STATIC PUBLIC ftmp AS String +STATIC PUBLIC svar AS String +STATIC PUBLIC fvar AS String +STATIC PUBLIC sboot AS String +STATIC PUBLIC fboot AS String + +STATIC PUBLIC sVitalPartList AS String +STATIC PUBLIC sMiscMountList AS String + STATIC PUBLIC sFullDiscToWipe AS String ' Installation method variable @@ -42,4 +61,9 @@ ' 1 = CUSTOMIZED INSTALL ' 2 = MINIMAL INSTALL STATIC PUBLIC iInstallMethod AS Integer + +' INSTALLATION DETAILS + +STATIC PUBLIC sBulkListToInstall AS String +STATIC PUBLIC sPkgListToInstall AS String Modified: branches/speedy/Step6.class ============================================================================== --- branches/speedy/Step6.class (original) +++ branches/speedy/Step6.class Mon Feb 23 14:30:56 2009 @@ -30,19 +30,26 @@ PUBLIC SUB OnExit() DIM n AS Integer - DIM sFmtAs AS String + DIM sFmtAs, sList, sPartAddr AS String + ClsGlobal.sVitalPartList = "" FOR n = 1 TO gvPartListing.Rows.Count - 1 IF gvPartListing[n, 2].Text THEN + sPartAddr = gvPartListing[n, 2].Text IF gvPartListing[n, 4].Text THEN sFmtAs = gvPartListing[n, 4].Text ELSE sFmtAs = gvPartListing[n, 5].Text END IF END IF + sList = sList & sPartAddr & "," & sFmtAs & ";" 'Message(gvPartListing[n, 0].Text & gb.NewLine & gvPartListing[n, 2].Text & gb.NewLine & sFmtAs) NEXT - + ME.read_partition_selection + Message(ClsGlobal.sVitalPartList) + ' sList = Trim(Left(sList, Len(sList) - 1)) + 'ClsGlobal.sVitalPartList = Trim(sList) + 'Message(ClsGlobal.sVitalPartList) END PUBLIC SUB StartUp() @@ -178,7 +185,7 @@ IF LAST.text <> ("Do not format") THEN ME.gvPartListing[gvPartListing.RowAt(y), gvPartListing.ColumnAt(x)].Text = LAST.text - ME.OnExit() + 'ME.OnExit() ELSE ME.gvPartListing[gvPartListing.RowAt(y), gvPartListing.ColumnAt(x)].Text = "" END IF @@ -273,6 +280,54 @@ END +PUBLIC SUB read_partition_selection() + + DIM cbox, cb AS ComboBox + DIM sFormat AS String + FOR EACH cbox IN objMntPoints + IF cbox.Text <> ("Not Used") THEN + FOR EACH cb IN objFS + IF cbox.tag = cb.Tag THEN + sFormat = Trim(cb.Text) + BREAK + ELSE + sFormat = "" + END IF + NEXT + ClsGlobal.sVitalPartList = ClsGlobal.sVitalPartList & cbox.Tag & "-" & cbox.Text & "-" & sFormat & "," + + ' SELECT CASE cbox.Text + ' CASE "/" + ' ClsGlobal.sRoot = cbox.Tag + ' ClsGlobal.froot = sFormat + ' CASE "/home" + ' ClsGlobal.shome = cbox.Tag + ' ClsGlobal.fhome = sFormat + ' CASE "/usr" + ' ClsGlobal.susr = cbox.Tag + ' ClsGlobal.fusr = sFormat + ' CASE "/opt" + ' ClsGlobal.sopt = cbox.Tag + ' ClsGlobal.fopt = sFormat + ' CASE "/var" + ' ClsGlobal.svar = cbox.Tag + ' ClsGlobal.fvar = sFormat + ' CASE "/tmp" + ' ClsGlobal.stmp = cbox.Tag + ' ClsGlobal.ftmp = sFormat + ' CASE "/boot" + ' ClsGlobal.sboot = cbox.Tag + ' ClsGlobal.fboot = sFormat + ' CASE ELSE + ' ClsGlobal.sMiscMountList = ClsGlobal.sMiscMountList & cbox.Tag & "," & Trim(cbox.Text) & ";" + ' END SELECT + END IF + NEXT + + + + +END Modified: branches/speedy/Step7a.class ============================================================================== --- branches/speedy/Step7a.class (original) +++ branches/speedy/Step7a.class Mon Feb 23 14:30:56 2009 @@ -83,6 +83,7 @@ gvBulkSel[irow, 1].Text = Trim(sname) gvBulkSel[irow, 0].Picture = picYes gvBulkSel[irow, 2].Text = Trim(sDesc) + gvBulkSel[irow, 3].Text = "yes" INC irow END IF NEXT @@ -101,10 +102,25 @@ END +PUBLIC SUB Get_Bulk_Selection() + + DIM irow AS Integer + DIM sList AS String + FOR irow = 2 TO gvBulkSel.Rows.count - 1 + IF gvBulkSel[irow, 3].Text LIKE "yes" THEN + sList = sList & Trim(gvBulkSel[irow, 1].Text) & "," + END IF + NEXT + ClsGlobal.sBulkListToInstall = Trim(slist) + 'Message(ClsGlobal.sBulkListToInstall) + + +END + PUBLIC SUB OnExit() - + ME.Get_Bulk_Selection() END Modified: branches/speedy/Step7b.class ============================================================================== --- branches/speedy/Step7b.class (original) +++ branches/speedy/Step7b.class Mon Feb 23 14:30:56 2009 @@ -21,8 +21,9 @@ PUBLIC SUB Form_Open() ME.tlbanner.Text = "<h2>" & ("Customize Your VectorLinux Installation") & "</h2>" + ME.gvOptions.Rows.count = 3 - ME.gvOptions.Columns.count = 4 + ME.gvOptions.Columns.count = 5 ME.gvOptions[0, 1].Text = ("Package Name") ME.gvOptions[0, 2].Text = ("Description") ME.gvOptions[0, 1].Font.Bold = TRUE @@ -34,7 +35,10 @@ ME.gvOptions.Columns[0].Width = 24 ME.gvOptions.Columns[1].Width = 150 ME.gvOptions.Columns[2].Width = 300 + ME.gvOptions.Columns[3].Width = 0 + ME.gvOptions.Columns[4].Width = 0 + ME.Resize(ClsGlobal.fRunningMainForm.pnlstack.Width, ClsGlobal.fRunningMainForm.pnlstack.height) picYes = Picture.Load("images/16px-check.png") picNo = Picture.Load("images/16px-Nocheck.png") ME.MovieBox1.Path = "images/throbber.gif" @@ -54,6 +58,8 @@ ME.tlWinExp.Text = ("Reading software catalog... Please wait a moment") ME.Panel1.Visible = FALSE ME.HPanel2.Visible = TRUE + ME.HBox3.Visible = FALSE + ME.HBox5.Visible = TRUE ME.MovieBox1.Playing = TRUE WAIT 1 irow = 2 @@ -61,6 +67,8 @@ IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN sArr = Split(File.Load("/mnt/source/veclinux/OPTIONAL"), "\n") FOR i = 0 TO sArr.Max + ME.MovieBox1.Playing = TRUE + ME.MovieBox1.Refresh sLine = Trim(sArr[i]) sPkg = sLine SHELL "cat /mnt/source/PACKAGES.TXT | grep \"^" & sPkg & "\" | cut -f 2 -d \':\' " TO sDescDump @@ -83,6 +91,7 @@ gvOptions[irow, 1].Text = sPkg gvOptions[irow, 2].Text = Trim(sShortDesc) gvOptions[irow, 3].Text = Trim(sDesc) + gvOptions[irow, 4].Text = "yes" INC gvOptions.Rows.Count INC irow NEXT @@ -90,6 +99,8 @@ ME.MovieBox1.Playing = FALSE ME.HPanel2.Visible = FALSE ME.Panel1.Visible = TRUE + ME.HBox3.Visible = TRUE + ME.HBox5.Visible = FALSE ME.tlWinExp.Text = ("Additional optional software available. Select which software packages to include in your installation.") END @@ -97,12 +108,13 @@ PUBLIC SUB OnExit() - + ME.Read_Optional_Pkg_Selection() + 'Message(ClsGlobal.sPkgListToInstall) END PUBLIC SUB StartUp() - + ME.Resize(ClsGlobal.fRunningMainForm.pnlstack.Width, ClsGlobal.fRunningMainForm.pnlstack.height) END PUBLIC FUNCTION GetNext() AS String @@ -125,10 +137,12 @@ IF BsELECTaLL = TRUE THEN FOR irow = 2 TO gvOptions.Rows.Count - 1 gvOptions[irow, 0].Picture = PicYes + gvOptions[irow, 4].Text = "yes" NEXT ELSE FOR irow = 2 TO gvOptions.Rows.Count - 1 gvOptions[irow, 0].Picture = PicNo + gvOptions[irow, 4].Text = "no" NEXT END IF @@ -142,8 +156,10 @@ IF LAST.column = 0 OR LAST.column = 1 THEN IF gvOptions[LAST.row, 0].Picture = PicYes THEN gvOptions[LAST.row, 0].Picture = PicNo + gvOptions[LAST.row, 4].Text = "no" ELSE gvOptions[LAST.row, 0].Picture = PicYes + gvOptions[LAST.row, 4].Text = "yes" END IF ELSE IF LAST.column = 2 THEN IF gvOptions[LAST.row, 3].Text THEN @@ -168,6 +184,21 @@ END IF gvOptions.Refresh +END + +PUBLIC SUB Read_Optional_Pkg_Selection() + + DIM IROW AS Integer + DIM sList AS String + + FOR irow = 2 TO gvOptions.Rows.count - 1 + IF gvOptions[irow, 4].Text LIKE "yes" THEN + sList = sList & Trim(gvOptions[irow, 1].Text) & "," + END IF + NEXT + ClsGlobal.sPkgListToInstall = Trim(sList) + + END Modified: branches/speedy/Step7b.form ============================================================================== --- branches/speedy/Step7b.form (original) +++ branches/speedy/Step7b.form Mon Feb 23 14:30:56 2009 @@ -20,11 +20,11 @@ MoveScaled(0,5,10,1) } { HBox2 HBox - MoveScaled(0,7,70,8) + MoveScaled(0,7,70,6) { tlWinExp TextLabel - MoveScaled(1,0,64,7) + MoveScaled(1,0,64,5) Expand = True - Text = ("Additional optional software available. Select which software packages to include in your installation.") + Text = ("Reading software catalog... Please wait a moment") } } { Panel1 Panel @@ -38,8 +38,12 @@ Border = False } } + { HBox5 HBox + MoveScaled(1,24,11,3) + Visible = False + } { HPanel2 HPanel - MoveScaled(1,24,57,28) + MoveScaled(1,27,57,28) Expand = True { MovieBox1 MovieBox MoveScaled(11,1,37,24) @@ -50,7 +54,7 @@ MoveScaled(1,52,7,1) } { HBox3 HBox - MoveScaled(1,54,37,3) + MoveScaled(1,57,37,3) { btTglSel ToggleButton MoveScaled(0,0,24,3) Text = ("Un-Select All") |
From: <cod...@go...> - 2009-02-23 21:04:49
|
Author: M0...@gm... Date: Mon Feb 23 12:22:27 2009 New Revision: 501 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step7a.pot branches/speedy/.lang/Step7b.pot branches/speedy/Step7a.class branches/speedy/Step7a.form branches/speedy/Step7b.class branches/speedy/Step7b.form Log: Throbber action added while reading optional package list Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Mon Feb 23 12:22:27 2009 @@ -170,7 +170,7 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:125 +#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:127 msgid "WARNING:" 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 Step7a.class:125 +#: Step3a1a.class:169 Step6.class:386 Step7a.class:127 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:386 Step7a.class:125 +#: Step3a1a.class:169 Step6.class:386 Step7a.class:127 msgid "No" msgstr "" @@ -719,31 +719,31 @@ msgid "Description" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "" "This component is a dependancy to any graphical user interface progam on the " "system" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "" "Choosing not to install this may result in a command-line (text mode) " "installation only" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:151 Step7b.class:153 +#: Step7a.class:153 Step7b.class:164 msgid "Select All" msgstr "" -#: Step7a.class:157 Step7b.class:151 +#: Step7a.class:159 Step7b.class:162 msgid "Un-Select All" msgstr "" -#: Step7a.class:217 +#: Step7a.class:219 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." @@ -753,7 +753,11 @@ msgid "Package Name" msgstr "" -#: Step7b.class:210 +#: Step7b.class:54 +msgid "Reading software catalog... Please wait a moment" +msgstr "" + +#: Step7b.class:93 msgid "" "Additional optional software available. Select which software packages to " "include in your installation." Modified: branches/speedy/.lang/Step7a.pot ============================================================================== --- branches/speedy/.lang/Step7a.pot (original) +++ branches/speedy/.lang/Step7a.pot Mon Feb 23 12:22:27 2009 @@ -26,39 +26,39 @@ msgid "Description" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "WARNING:" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "This component is a dependancy to any graphical user interface progam on the system" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "Choosing not to install this may result in a command-line (text mode) installation only" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "Yes" msgstr "" -#: Step7a.class:125 +#: Step7a.class:127 msgid "No" msgstr "" -#: Step7a.class:151 +#: Step7a.class:153 msgid "Select All" msgstr "" -#: Step7a.class:157 +#: Step7a.class:159 msgid "Un-Select All" msgstr "" -#: Step7a.class:217 +#: Step7a.class:219 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 "" Modified: branches/speedy/.lang/Step7b.pot ============================================================================== --- branches/speedy/.lang/Step7b.pot (original) +++ branches/speedy/.lang/Step7b.pot Mon Feb 23 12:22:27 2009 @@ -26,15 +26,19 @@ msgid "Description" msgstr "" -#: Step7b.class:151 -msgid "Un-Select All" +#: Step7b.class:54 +msgid "Reading software catalog... Please wait a moment" msgstr "" -#: Step7b.class:153 -msgid "Select All" +#: Step7b.class:93 +msgid "Additional optional software available. Select which software packages to include in your installation." msgstr "" -#: Step7b.class:210 -msgid "Additional optional software available. Select which software packages to include in your installation." +#: Step7b.class:162 +msgid "Un-Select All" +msgstr "" + +#: Step7b.class:164 +msgid "Select All" msgstr "" Modified: branches/speedy/Step7a.class ============================================================================== --- branches/speedy/Step7a.class (original) +++ branches/speedy/Step7a.class Mon Feb 23 12:22:27 2009 @@ -48,7 +48,7 @@ 'gvBulkSel[0,3].ba gvBulkSel[0, 2].Text = ("Description") gvBulkSel[0, 2].Font.Bold = TRUE - + 'WAIT 1 ME.LIST_OPTIONAL_BULKS END @@ -64,6 +64,8 @@ DIM sArr, sLineArr AS String[] DIM i, irow AS Integer DIM sName, sDesc AS String + + irow = 2 IF Exist("/mnt/source/veclinux/VINSTALL.CONF") THEN Modified: branches/speedy/Step7a.form ============================================================================== --- branches/speedy/Step7a.form (original) +++ branches/speedy/Step7a.form Mon Feb 23 12:22:27 2009 @@ -38,10 +38,10 @@ } } { HBox4 HBox - MoveScaled(2,43,7,1) + MoveScaled(2,47,7,1) } { HBox3 HBox - MoveScaled(2,45,37,3) + MoveScaled(2,49,37,3) { btTglSel ToggleButton MoveScaled(0,0,24,3) Text = ("Un-Select All") Modified: branches/speedy/Step7b.class ============================================================================== --- branches/speedy/Step7b.class (original) +++ branches/speedy/Step7b.class Mon Feb 23 12:22:27 2009 @@ -37,7 +37,9 @@ picYes = Picture.Load("images/16px-check.png") picNo = Picture.Load("images/16px-Nocheck.png") + ME.MovieBox1.Path = "images/throbber.gif" + WAIT 1 ME.LIST_OPTIONAL_PACKAGES() END @@ -48,6 +50,12 @@ DIM sDescDump, sFile, sLine, sPkg, sDesc, sShortDesc AS String DIM sArr, sDescArr AS String[] + 'ME.Panel1.Visible = FALSE + ME.tlWinExp.Text = ("Reading software catalog... Please wait a moment") + ME.Panel1.Visible = FALSE + ME.HPanel2.Visible = TRUE + ME.MovieBox1.Playing = TRUE + WAIT 1 irow = 2 IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN @@ -79,7 +87,10 @@ INC irow NEXT - + ME.MovieBox1.Playing = FALSE + ME.HPanel2.Visible = FALSE + ME.Panel1.Visible = TRUE + ME.tlWinExp.Text = ("Additional optional software available. Select which software packages to include in your installation.") END @@ -158,3 +169,5 @@ gvOptions.Refresh END + + Modified: branches/speedy/Step7b.form ============================================================================== --- branches/speedy/Step7b.form (original) +++ branches/speedy/Step7b.form Mon Feb 23 12:22:27 2009 @@ -28,7 +28,8 @@ } } { Panel1 Panel - MoveScaled(1,16,59,28) + MoveScaled(1,16,59,7) + Visible = False Expand = True Arrangement = Arrange.Fill { gvOptions GridView @@ -37,11 +38,19 @@ Border = False } } + { HPanel2 HPanel + MoveScaled(1,24,57,28) + Expand = True + { MovieBox1 MovieBox + MoveScaled(11,1,37,24) + Expand = True + } + } { HBox4 HBox - MoveScaled(1,44,7,1) + MoveScaled(1,52,7,1) } { HBox3 HBox - MoveScaled(1,46,37,3) + MoveScaled(1,54,37,3) { btTglSel ToggleButton MoveScaled(0,0,24,3) Text = ("Un-Select All") |
From: <cod...@go...> - 2009-02-23 20:48:18
|
Author: M0...@gm... Date: Mon Feb 23 12:03:40 2009 New Revision: 500 Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step7b.pot branches/speedy/Step7b.class branches/speedy/Step7b.form Log: software selection complete Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Mon Feb 23 12:03:40 2009 @@ -707,7 +707,7 @@ msgid "Install the most minimal working confuguration (For older hardware)" msgstr "" -#: Step7a.class:27 Step7b.class:21 +#: Step7a.class:27 Step7b.class:23 msgid "Customize Your VectorLinux Installation" msgstr "" @@ -715,7 +715,7 @@ msgid "Component" msgstr "" -#: Step7a.class:49 +#: Step7a.class:49 Step7b.class:27 msgid "Description" msgstr "" @@ -735,11 +735,11 @@ msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:151 +#: Step7a.class:151 Step7b.class:153 msgid "Select All" msgstr "" -#: Step7a.class:157 +#: Step7a.class:157 Step7b.class:151 msgid "Un-Select All" msgstr "" @@ -749,7 +749,11 @@ "a component, click it's name or the box to the left of it's name." msgstr "" -#: Step7b.class:83 +#: Step7b.class:26 +msgid "Package Name" +msgstr "" + +#: Step7b.class:210 msgid "" "Additional optional software available. Select which software packages to " "include in your installation." Modified: branches/speedy/.lang/Step7b.pot ============================================================================== --- branches/speedy/.lang/Step7b.pot (original) +++ branches/speedy/.lang/Step7b.pot Mon Feb 23 12:03:40 2009 @@ -14,11 +14,27 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: Step7b.class:21 +#: Step7b.class:23 msgid "Customize Your VectorLinux Installation" msgstr "" -#: Step7b.class:83 +#: Step7b.class:26 +msgid "Package Name" +msgstr "" + +#: Step7b.class:27 +msgid "Description" +msgstr "" + +#: Step7b.class:151 +msgid "Un-Select All" +msgstr "" + +#: Step7b.class:153 +msgid "Select All" +msgstr "" + +#: Step7b.class:210 msgid "Additional optional software available. Select which software packages to include in your installation." msgstr "" Modified: branches/speedy/Step7b.class ============================================================================== --- branches/speedy/Step7b.class (original) +++ branches/speedy/Step7b.class Mon Feb 23 12:03:40 2009 @@ -15,12 +15,75 @@ ' 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 PicYes AS Picture +PRIVATE PicNo AS Picture PUBLIC SUB Form_Open() ME.tlbanner.Text = "<h2>" & ("Customize Your VectorLinux Installation") & "</h2>" + ME.gvOptions.Rows.count = 3 + ME.gvOptions.Columns.count = 4 + ME.gvOptions[0, 1].Text = ("Package Name") + ME.gvOptions[0, 2].Text = ("Description") + ME.gvOptions[0, 1].Font.Bold = TRUE + ME.gvOptions[0, 2].Font.Bold = TRUE + ME.gvOptions[0, 0].BackColor = Color.LightBackground + ME.gvOptions[0, 1].BackColor = Color.LightBackground + ME.gvOptions[0, 2].BackColor = Color.LightBackground + ME.gvOptions.Rows[1].Height = 5 + ME.gvOptions.Columns[0].Width = 24 + ME.gvOptions.Columns[1].Width = 150 + ME.gvOptions.Columns[2].Width = 300 + + picYes = Picture.Load("images/16px-check.png") + picNo = Picture.Load("images/16px-Nocheck.png") + + ME.LIST_OPTIONAL_PACKAGES() END + +PUBLIC SUB LIST_OPTIONAL_PACKAGES() + + DIM irow, i AS Integer + DIM sDescDump, sFile, sLine, sPkg, sDesc, sShortDesc AS String + DIM sArr, sDescArr AS String[] + + irow = 2 + + IF Exist("/mnt/source/veclinux/OPTIONAL") = FALSE THEN RETURN + sArr = Split(File.Load("/mnt/source/veclinux/OPTIONAL"), "\n") + FOR i = 0 TO sArr.Max + sLine = Trim(sArr[i]) + sPkg = sLine + SHELL "cat /mnt/source/PACKAGES.TXT | grep \"^" & sPkg & "\" | cut -f 2 -d \':\' " TO sDescDump + sDescDump = Trim(sDescDump) + IF sDescDump THEN + sDescArr = Split(sDescDump, "\n") + sShortDesc = Trim(sDescArr[0]) + sShortDesc = Replace(sShortDesc, sPkg, "") + sShortDesc = Replace(sShortDesc, "(", "") + sShortDesc = Replace(sShortDesc, ")", "") + sShortDesc = Trim(sShortDesc) + sShortDesc = UCase(Left(sShortDesc, 1)) & Right(sShortDesc, Len(sShortDesc) - 1) + sDesc = Trim(sDescDump) + ELSE + sShortDesc = "" + sDesc = "" + END IF + + gvOptions[irow, 0].Picture = PicYes + gvOptions[irow, 1].Text = sPkg + gvOptions[irow, 2].Text = Trim(sShortDesc) + gvOptions[irow, 3].Text = Trim(sDesc) + INC gvOptions.Rows.Count + INC irow + NEXT + + + +END + + PUBLIC SUB OnExit() @@ -35,4 +98,63 @@ RETURN "Step8" +END + +PUBLIC SUB Form_Resize() + + 'gvBulkSel.Columns[2].Width = gvBulkSel.Width - (gvBulkSel.ColumnAt(gvBulkSel[0, 2].Left) + gvBulkSel.Columns[1].Width + gvBulkSel.Columns[0].width + 4) + gvOptions.Columns[2].Width = gvOptions.Width - (gvOptions.ColumnAt(gvOptions[0, 3].Left) + (gvOptions.Columns[0].Width + gvOptions.Columns[1].Width)) - gvOptions.Columns[0].Width + 4 ' + gvOptions.Columns[1].Width + gvOptions.Columns[0].width) + gvOptions.Columns[3].Width = 0 + +END + +PUBLIC SUB TOGGLE_SELECTION(BsELECTaLL AS Boolean) + + DIM irow AS Integer + IF BsELECTaLL = TRUE THEN + FOR irow = 2 TO gvOptions.Rows.Count - 1 + gvOptions[irow, 0].Picture = PicYes + NEXT + ELSE + FOR irow = 2 TO gvOptions.Rows.Count - 1 + gvOptions[irow, 0].Picture = PicNo + NEXT + END IF + +END + + +PUBLIC SUB gvOptions_Click() + +IF LAST.row = 0 OR LAST.row = 1 THEN RETURN + +IF LAST.column = 0 OR LAST.column = 1 THEN + IF gvOptions[LAST.row, 0].Picture = PicYes THEN + gvOptions[LAST.row, 0].Picture = PicNo + ELSE + gvOptions[LAST.row, 0].Picture = PicYes + END IF +ELSE IF LAST.column = 2 THEN + IF gvOptions[LAST.row, 3].Text THEN + Balloon(gvOptions[LAST.row, 3].Text, gvOptions, gvOptions[LAST.row, 0].picture, gvOptions[LAST.row, LAST.column].left + 4, gvOptions[LAST.row, LAST.column].y + 12) + END IF +ELSE + RETURN + STOP EVENT +END IF + +gvOptions.Refresh +END + +PUBLIC SUB btTglSel_Click() + + IF LAST.text = ("Un-Select All") THEN + ME.TOGGLE_SELECTION(FALSE) + ME.btTglSel.Text = ("Select All") + ELSE + ME.TOGGLE_SELECTION(TRUE) + ME.btTglSel.Text = ("Un-Select All") + END IF + gvOptions.Refresh + END Modified: branches/speedy/Step7b.form ============================================================================== --- branches/speedy/Step7b.form (original) +++ branches/speedy/Step7b.form Mon Feb 23 12:03:40 2009 @@ -27,4 +27,25 @@ Text = ("Additional optional software available. Select which software packages to include in your installation.") } } + { Panel1 Panel + MoveScaled(1,16,59,28) + Expand = True + Arrangement = Arrange.Fill + { gvOptions GridView + MoveScaled(3,3,51,16) + Expand = True + Border = False + } + } + { HBox4 HBox + MoveScaled(1,44,7,1) + } + { HBox3 HBox + MoveScaled(1,46,37,3) + { btTglSel ToggleButton + MoveScaled(0,0,24,3) + Text = ("Un-Select All") + Picture = Picture["icon:/16/refresh"] + } + } } |
From: <cod...@go...> - 2009-02-23 16:13:33
|
Author: M0...@gm... Date: Mon Feb 23 07:40:01 2009 New Revision: 499 Removed: branches/speedy/images/arrow.png branches/speedy/images/arrow_old.png branches/speedy/images/check.png branches/speedy/images/check_old.png branches/speedy/images/circle.png branches/speedy/images/circle_old.png branches/speedy/images/throbber.gif_old branches/speedy/images/throbber.gif_simple Modified: branches/speedy/.lang/.pot branches/speedy/.lang/Step7a.pot branches/speedy/Step1.class branches/speedy/Step7a.class Log: Implemented change in Config file name/contents. Removed un-used icons Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Mon Feb 23 07:40:01 2009 @@ -170,7 +170,7 @@ msgid "This feature can help you avoid an unsuccesful installation." msgstr "" -#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:139 +#: Step1.class:415 Step3a1.class:22 Step3a1a.class:169 Step7a.class:125 msgid "WARNING:" 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 Step7a.class:139 +#: Step3a1a.class:169 Step6.class:386 Step7a.class:125 msgid "Yes" msgstr "" -#: Step3a1a.class:169 Step6.class:386 Step7a.class:139 +#: Step3a1a.class:169 Step6.class:386 Step7a.class:125 msgid "No" msgstr "" @@ -719,31 +719,31 @@ msgid "Description" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "" "This component is a dependancy to any graphical user interface progam on the " "system" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "" "Choosing not to install this may result in a command-line (text mode) " "installation only" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:165 +#: Step7a.class:151 msgid "Select All" msgstr "" -#: Step7a.class:171 +#: Step7a.class:157 msgid "Un-Select All" msgstr "" -#: Step7a.class:231 +#: Step7a.class:217 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." Modified: branches/speedy/.lang/Step7a.pot ============================================================================== --- branches/speedy/.lang/Step7a.pot (original) +++ branches/speedy/.lang/Step7a.pot Mon Feb 23 07:40:01 2009 @@ -26,39 +26,39 @@ msgid "Description" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "WARNING:" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "This component is a dependancy to any graphical user interface progam on the system" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "Choosing not to install this may result in a command-line (text mode) installation only" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "Are you sure you want to disable this conponent anyway?" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "Yes" msgstr "" -#: Step7a.class:139 +#: Step7a.class:125 msgid "No" msgstr "" -#: Step7a.class:165 +#: Step7a.class:151 msgid "Select All" msgstr "" -#: Step7a.class:171 +#: Step7a.class:157 msgid "Un-Select All" msgstr "" -#: Step7a.class:231 +#: Step7a.class:217 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 "" Modified: branches/speedy/Step1.class ============================================================================== --- branches/speedy/Step1.class (original) +++ branches/speedy/Step1.class Mon Feb 23 07:40:01 2009 @@ -139,13 +139,13 @@ sKeyPath = "/mnt" &/ Trim(sPart) TRY MKDIR sKeyPath SHELL "mount /dev" &/ Trim(sPart) & " /mnt" &/ Trim(sPart) & " 2>/dev/null" WAIT - IF Exist(sKeyPath &/ "veclinux" &/ "SETUP.CONF") THEN + IF Exist(sKeyPath &/ "veclinux" &/ "VINSTALL.CONF") THEN ' Must read file first before we have anything to list - SHELL "grep \"^DISTRO=\" " & sKeyPath &/ "veclinux" &/ "SETUP.CONF | cut -f 2 -d \"\'\"" TO sName - SHELL "grep \"^VERSION=\" " & sKeyPath &/ "veclinux" &/ "SETUP.CONF | cut -f 2 -d \"\'\"" TO sVersion + SHELL "grep \"^DISTRO=\" " & sKeyPath &/ "veclinux" &/ "VINSTALL.CONF | cut -f 2 -d \"\'\"" TO sName + SHELL "grep \"^VERSION=\" " & sKeyPath &/ "veclinux" &/ "VINSTALL.CONF | cut -f 2 -d \"\'\"" TO sVersion sName = Trim(sName) sVersion = Trim(sVersion) - File.Save(Temp(Trim(sName) & "-" & Trim(sVersion) & "-" & Trim(sPart)), File.Load(sKeyPath &/ "veclinux" &/ "SETUP.CONF")) + File.Save(Temp(Trim(sName) & "-" & Trim(sVersion) & "-" & Trim(sPart)), File.Load(sKeyPath &/ "veclinux" &/ "VINSTALL.CONF")) ComboBox1.Add(Trim(sname) & "-" & Trim(sVersion) & Space(1) & ("on") & Space(1) & Trim(sPart)) PRINT " \\__" & Space(1) & ("Found") & Space(1) & Trim(sname) & Space(1) & Trim(sVersion) & Space(1) & ("in partition") & Space(1) & Trim(sPart) @@ -202,12 +202,12 @@ 'EXEC ["mount", "-o", "ro", Trim(sDriveList[i]), "/mnt" &/ sShortDrive] WAIT SHELL "mount " & Trim(sDriveList[i]) & Space(1) & "/mnt" &/ sShortDrive & " 2>/dev/null" WAIT PRINT ("Scanning") & Space(1) & sDriveList[i] - IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "SETUP.CONF") THEN - SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux" &/ "SETUP.CONF | cut -f 2 -d \'=\'" TO sName - SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux" &/ "SETUP.CONF | cut -f 2 -d \'=\'" TO sVersion + IF Exist("/mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF") THEN + SHELL "grep \"^DISTRO=\" /mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sName + SHELL "grep \"^VERSION=\" /mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF | cut -f 2 -d \'=\'" TO sVersion sName = Trim(Replace(sName, "\'", "")) sVersion = Trim(Replace(sVersion, "\'", "")) - File.Save(Temp(sShortDrive), File.Load("/mnt" &/ sShortDrive &/ "veclinux" &/ "SETUP.CONF")) + File.Save(Temp(sShortDrive), File.Load("/mnt" &/ sShortDrive &/ "veclinux" &/ "VINSTALL.CONF")) IF ME.ComboBox1.Find(sName & Space(1) & sVersion & Space(1) & ("on") & Space(1) & Trim(sShortDrive)) = -1 THEN 'Trim(sDriveList[i])) = -1 THEN ME.ComboBox1.Add(sName & Space(1) & sVersion & Space(1) & ("on") & Space(1) & Trim(sShortDrive)) 'Trim(sDriveList[i])) END IF @@ -252,9 +252,9 @@ FOR EACH sFile IN Dir("/mnt" &/ Trim(sPart), "*.iso") TRY MKDIR "/mnt/loop" EXEC ["mount", "-o", "loop", "/mnt" &/ Trim(sPart) &/ Trim(sFile), "/mnt/loop"] WAIT - IF Exist("/mnt/loop/veclinux/SETUP.CONF") THEN + IF Exist("/mnt/loop/veclinux/VINSTALL.CONF") THEN 'PRINT "Adding temp file" & Space(1) & Temp(Trim(sFile) & "-" & Trim(sPart)) - File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)), File.Load("/mnt/loop/veclinux/SETUP.CONF")) + File.Save(Temp(Trim(sFile) & "-" & Trim(sPart)), File.Load("/mnt/loop/veclinux/VINSTALL.CONF")) ComboBox1.Add(sFile & Space(1) & ("on") & Space(1) & "/dev" &/ Trim(sPart)) 'Message(sFile & "-" & Trim(sPart)) PRINT " \\__" & Space(1) & ("Found") & Space(1) & Trim(sFile) & Space(1) & ("on") & Space(1) & Trim(sPart) Modified: branches/speedy/Step7a.class ============================================================================== --- branches/speedy/Step7a.class (original) +++ branches/speedy/Step7a.class Mon Feb 23 07:40:01 2009 @@ -61,48 +61,34 @@ PUBLIC SUB LIST_OPTIONAL_BULKS() DIM sLine, sFile AS String '= File.Load("/mnt/source/veclinux/SETUP.CONF") - DIM sArr AS String[] + DIM sArr, sLineArr AS String[] DIM i, irow AS Integer - DIM sDesc AS String + DIM sName, sDesc AS String - IF Exist("/mnt/source/veclinux/SETUP.CONF") THEN - sFile = File.Load("/mnt/source/veclinux/SETUP.CONF") + irow = 2 + IF Exist("/mnt/source/veclinux/VINSTALL.CONF") THEN + sFile = File.Load("/mnt/source/veclinux/VINSTALL.CONF") sArr = Split(sFile, "\n") + FOR i = 0 TO sArr.Max + sLine = Trim(sArr[i]) + sLine = Trim(Right(sLine, Len(sLine) - InStr(sLine, "="))) + sLine = Replace(sLine, "\'", "") + IF InStr(sLine, "OPT") THEN + INC gvBulkSel.Rows.Count + sLineArr = Split(sLine, ":") + sName = Trim(sLineArr[1]) + sDesc = Trim(sLineArr[3]) + gvBulkSel[irow, 1].Text = Trim(sname) + gvBulkSel[irow, 0].Picture = picYes + gvBulkSel[irow, 2].Text = Trim(sDesc) + INC irow + END IF + NEXT + + ELSE END IF - irow = 2 - FOR EACH sLine IN Dir("/mnt/source/veclinux/") - IF sLine LIKE "SETUP.CONF" THEN - ELSE - INC gvBulkSel.Rows.Count - gvBulkSel[irow, 1].Text = Trim(sLine) - - gvBulkSel[irow, 0].Picture = picYes ' enabled by default - SHELL "grep \"" & sLine & "\" /mnt/source/veclinux/SETUP.CONF | cut -f 3 -d \':\'" TO sDesc - 'Message(sDesc) - sDesc = Replace(sDesc, "\'", "") - sDesc = Replace(sDesc, "\"", "") - gvBulkSel[irow, 2].Text = Trim(sDesc) - ' cbBulk = NEW CheckBox(ME.Panel1) AS "cbBulkSel" - ' WITH cbBulk - ' .Move(gvBulkSel.RowAt(gvBulkSel[irow, 0].top), gvBulkSel.ColumnAt(gvBulkSel[irow, 0].Left)) - ' '.Move(gvBulkSel.ColumnAt(gvBulkSel[irow, 0].Left), gvBulkSel.RowAt(gvBulkSel[irow, 0].top)) - ' .Height = 21 - ' .tag = Trim(sLine) - ' .Visible = TRUE - ' .Value = TRUE - ' END WITH - INC irow - - END IF - NEXT - - - - 'FOR i = 0 TO sArr.Max - ' sLine = Trim(sArr[i]) - END |
From: uel a. <ue...@gm...> - 2009-02-22 06:57:18
|
I wish i could be there Kocil, But unfortunately I wont be able to make it. On 2/21/09, Kocil <k0...@ya...> wrote: > > Hi all. > > I'll stay at Estansia La Jolla Hotel from Feb 21 - 24, > attending the HP Technology for Teaching Award Conference. > In fact, I'm sending this from the Hotel room :D > > After that, I will have 2 days for traveling around. > My return ticket is from LA at Feb 27 night. > > Cheers. > Eko. > > > --- On Fri, 2/20/09, Sriram Durbha <sri...@gm...> wrote: > > > From: Sriram Durbha <sri...@gm...> > > Subject: Re: [Vectorlinux-devel] I'm going to LA > > To: "Vector Linux developer's list" < > vec...@li...> > > Date: Friday, February 20, 2009, 10:46 AM > > > 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 > > > > > > > > > ------------------------------------------------------------------------------ > > 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: Kocil <k0...@ya...> - 2009-02-22 05:50:06
|
Hi all. I'll stay at Estansia La Jolla Hotel from Feb 21 - 24, attending the HP Technology for Teaching Award Conference. In fact, I'm sending this from the Hotel room :D After that, I will have 2 days for traveling around. My return ticket is from LA at Feb 27 night. Cheers. Eko. --- On Fri, 2/20/09, Sriram Durbha <sri...@gm...> wrote: > From: Sriram Durbha <sri...@gm...> > Subject: Re: [Vectorlinux-devel] I'm going to LA > To: "Vector Linux developer's list" <vec...@li...> > Date: Friday, February 20, 2009, 10:46 AM > 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 > > > > > ------------------------------------------------------------------------------ > 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-20 21:25:36
|
Author: M0...@gm... Date: Fri Feb 20 12:58:30 2009 New Revision: 498 Added: branches/iVL/.lang/ClsInstall.pot branches/iVL/.lang/ClsLilo.pot branches/iVL/.lang/ClsNetConf.pot branches/iVL/.lang/ClsPkgSel.pot branches/iVL/.lang/FrmAlsaConf.pot branches/iVL/.lang/FrmCredits.pot branches/iVL/.lang/FrmDone.pot branches/iVL/.lang/FrmHalSwitch.pot branches/iVL/.lang/FrmHostPrep.pot branches/iVL/.lang/FrmImportAccts.pot branches/iVL/.lang/FrmInstallSys.pot branches/iVL/.lang/FrmLangSel.pot branches/iVL/.lang/FrmLilo.pot branches/iVL/.lang/FrmLiloSetup.pot branches/iVL/.lang/FrmMediaCheck.pot branches/iVL/.lang/FrmNetConf.pot branches/iVL/.lang/FrmPkgsel2.pot branches/iVL/.lang/FrmResetSettings.pot branches/iVL/.lang/FrmRootPass.pot branches/iVL/.lang/FrmSummaryOld.pot branches/iVL/.lang/FrmUserAdd.pot branches/iVL/.lang/FrmUsrPkgSel.pot branches/iVL/.lang/FrmXconf.pot branches/iVL/.lang/FrmZoneSet.pot branches/iVL/.lang/MdlAlsaConf.pot branches/iVL/.lang/MdlConfLilo.pot branches/iVL/.lang/MdlImportAccts.pot branches/iVL/.lang/MdlInstallCustom.pot branches/iVL/.lang/MdlInstallSys.pot branches/iVL/.lang/MdlLangSel.pot branches/iVL/.lang/MdlLilo.pot branches/iVL/.lang/MdlLiloOsList.pot branches/iVL/.lang/MdlNav.pot branches/iVL/.lang/MdlNetConf.pot branches/iVL/.lang/MdlPartFrmt.pot branches/iVL/.lang/MdlPkgSelNew.pot branches/iVL/.lang/MdlResetSettings.pot branches/iVL/.lang/MdlUsrAdd.pot branches/iVL/.lang/MdlVerifyMedia.pot branches/iVL/.lang/MdlXconf.pot branches/iVL/.lang/MdlZoneSet.pot branches/iVL/.lang/clsXconf.pot 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/installer.gambas Log: Ready for 6.0 release Modified: branches/iVL/.lang/#project.pot ============================================================================== --- branches/iVL/.lang/#project.pot (original) +++ branches/iVL/.lang/#project.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/.project +# /home/vluser/devel/vinstall-ng/.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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/ClsGlobal.class +# /home/vluser/devel/vinstall-ng/ClsGlobal.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/ClsInstall.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/ClsInstall.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/ClsInstall.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" + Added: branches/iVL/.lang/ClsLilo.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/ClsLilo.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/ClsLilo.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" + Added: branches/iVL/.lang/ClsNetConf.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/ClsNetConf.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/ClsNetConf.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/iVL/.lang/ClsPartSel.pot ============================================================================== --- branches/iVL/.lang/ClsPartSel.pot (original) +++ branches/iVL/.lang/ClsPartSel.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/ClsPartSel.class +# /home/vluser/devel/vinstall-ng/ClsPartSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/ClsPkgSel.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/ClsPkgSel.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/ClsPkgSel.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/iVL/.lang/ClsWinDrives.pot ============================================================================== --- branches/iVL/.lang/ClsWinDrives.pot (original) +++ branches/iVL/.lang/ClsWinDrives.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/ClsWinDrives.class +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FMain.class +# /home/vluser/devel/vinstall-ng/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/FrmAlsaConf.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmAlsaConf.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,24 @@ +# /home/vluser/devel/vinstall-ng/FrmAlsaConf.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" + +#: FrmAlsaConf.class:36 +msgid "This portion of the setup process allows you to sutup your soundcard for your new operating system." +msgstr "" + +#: FrmAlsaConf.class:36 +msgid "Please use the setup program below to setup the sound system." +msgstr "" + Added: branches/iVL/.lang/FrmCredits.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmCredits.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/FrmCredits.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/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmDiskPart.class +# /home/vluser/devel/vinstall-ng/FrmDiskPart.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/FrmDone.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmDone.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,60 @@ +# /home/vluser/devel/vinstall-ng/FrmDone.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" + +#: FrmDone.class:50 +msgid "Configuration in progress" +msgstr "" + +#: FrmDone.class:51 +msgid "is performing final system configuration. Please wait a moment." +msgstr "" + +#: FrmDone.class:59 +msgid "Restart" +msgstr "" + +#: FrmDone.class:61 +msgid "Installation is complete" +msgstr "" + +#: FrmDone.class:66 +msgid "has been installed to your system. Your new system has been configured with the default factory settings." +msgstr "" + +#: FrmDone.class:66 +msgid "After reboot you can use vasm or vasmCC to fine tune your installation." +msgstr "" + +#: FrmDone.class:66 +msgid "Your computer needs to be restarted so that you can use your new operating system. Click" +msgstr "" + +#: FrmDone.class:66 +msgid "to restart your computer now or click" +msgstr "" + +#: FrmDone.class:66 +msgid "to restart your computer at a later time" +msgstr "" + +#: FrmDone.class:66 +msgid "If you installed from CD-ROM/R/RW media, please remove de disk before restarting." +msgstr "" + +#: FrmDone.class:105 +msgid "Installation is finished" +msgstr "" + Added: branches/iVL/.lang/FrmHalSwitch.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmHalSwitch.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,28 @@ +# /home/vluser/devel/vinstall-ng/FrmHalSwitch.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" + +#: FrmHalSwitch.class:20 +msgid "Would you like to use Vl-Hot or HAL to manage your removable devices?" +msgstr "" + +#: FrmHalSwitch.class:25 +msgid "HAL" +msgstr "" + +#: FrmHalSwitch.class:30 +msgid "VL-Hot" +msgstr "" + Added: branches/iVL/.lang/FrmHostPrep.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmHostPrep.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,28 @@ +# /home/vluser/devel/vinstall-ng/FrmHostPrep.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" + +#: FrmHostPrep.class:130 +msgid "Vectorlinux is preparing your system for installation. Please wait." +msgstr "" + +#: FrmHostPrep.class:135 +msgid "Current Status" +msgstr "" + +#: FrmHostPrep.class:139 +msgid "TextLabel1" +msgstr "" + Added: branches/iVL/.lang/FrmImportAccts.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmImportAccts.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,100 @@ +# /home/vluser/devel/vinstall-ng/FrmImportAccts.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" + +#: FrmImportAccts.class:33 +msgid "Select picture for user Login" +msgstr "" + +#: FrmImportAccts.class:53 +msgid "Reset settings for" +msgstr "" + +#: FrmImportAccts.class:60 +msgid "Would you like to continue adding new user accounts now?" +msgstr "" + +#: FrmImportAccts.class:60 +msgid "Yes" +msgstr "" + +#: FrmImportAccts.class:60 +msgid "No" +msgstr "" + +#: FrmImportAccts.class:84 +msgid "Please select an account name from the dropdown list." +msgstr "" + +#: FrmImportAccts.class:89 +msgid "Password fields cannot be blank. Please enter a password for" +msgstr "" + +#: FrmImportAccts.class:93 +msgid "Selected passwords dont match. Please enter the same password twice" +msgstr "" + +#: FrmImportAccts.class:103 +msgid "Unable to restore user account for" +msgstr "" + +#: FrmImportAccts.class:108 +msgid "User account for" +msgstr "" + +#: FrmImportAccts.class:108 +msgid "successfully imported" +msgstr "" + +#: FrmImportAccts.class:313 +msgid "Account" +msgstr "" + +#: FrmImportAccts.class:325 +msgid "New Password" +msgstr "" + +#: FrmImportAccts.class:342 +msgid "Select login Image" +msgstr "" + +#: FrmImportAccts.class:352 +msgid "Select" +msgstr "" + +#: FrmImportAccts.class:362 +msgid "Verify Password" +msgstr "" + +#: FrmImportAccts.class:373 +msgid "User Rights Management" +msgstr "" + +#: FrmImportAccts.class:379 +msgid "Select Settings to reset" +msgstr "" + +#: FrmImportAccts.class:386 +msgid "Import Account" +msgstr "" + +#: FrmImportAccts.class:393 +msgid "Done" +msgstr "" + +#: FrmImportAccts.class:401 +msgid "Import Existing User Accounts" +msgstr "" + Added: branches/iVL/.lang/FrmInstallSys.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmInstallSys.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,36 @@ +# /home/vluser/devel/vinstall-ng/FrmInstallSys.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" + +#: FrmInstallSys.class:58 +msgid "Current Step" +msgstr "" + +#: FrmInstallSys.class:123 +msgid "Vectorlinux is currently being installed to your system... Please wait" +msgstr "" + +#: FrmInstallSys.class:138 +msgid "Installing ..." +msgstr "" + +#: FrmInstallSys.class:149 +msgid "Current Step " +msgstr "" + +#: FrmInstallSys.class:171 +msgid "Total progress" +msgstr "" + Added: branches/iVL/.lang/FrmLangSel.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmLangSel.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,20 @@ +# /home/vluser/devel/vinstall-ng/FrmLangSel.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" + +#: FrmLangSel.class:119 +msgid "Select your language" +msgstr "" + Added: branches/iVL/.lang/FrmLilo.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmLilo.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,76 @@ +# /home/vluser/devel/vinstall-ng/FrmLilo.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" + +#: FrmLilo.class:37 +msgid "The following Operating Systems have been detected on this computer. Choose your desired option" +msgstr "" + +#: FrmLilo.class:37 +msgid "for each one of them by clicking on each tab. To proceed with the default pre-set values, simply click" +msgstr "" + +#: FrmLilo.class:139 +msgid "Standard" +msgstr "" + +#: FrmLilo.class:219 +msgid "Configure and install lilo (Linux Boot Loader)" +msgstr "" + +#: FrmLilo.class:224 +msgid "Don't Install Lilo" +msgstr "" + +#: FrmLilo.class:230 +msgid "Tab 0" +msgstr "" + +#: FrmLilo.class:236 +msgid "TextLabel1" +msgstr "" + +#: FrmLilo.class:248 +msgid "Target" +msgstr "" + +#: FrmLilo.class:254 +msgid "Video Resolution" +msgstr "" + +#: FrmLilo.class:262 +msgid "Bootsplash Med" +msgstr "" + +#: FrmLilo.class:262 +msgid "Bootsplash High" +msgstr "" + +#: FrmLilo.class:262 +msgid "Bootsplash Extra high" +msgstr "" + +#: FrmLilo.class:267 +msgid "Prompt Timeout" +msgstr "" + +#: FrmLilo.class:278 +msgid "Seconds" +msgstr "" + +#: FrmLilo.class:284 +msgid "Boot Default" +msgstr "" + Added: branches/iVL/.lang/FrmLiloSetup.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmLiloSetup.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,64 @@ +# /home/vluser/devel/vinstall-ng/FrmLiloSetup.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" + +#: FrmLiloSetup.class:36 +msgid "Bootsplash High" +msgstr "" + +#: FrmLiloSetup.class:63 +msgid "Standard" +msgstr "" + +#: FrmLiloSetup.class:64 +msgid "Bootsplash Med" +msgstr "" + +#: FrmLiloSetup.class:66 +msgid "Bootsplash Extra High" +msgstr "" + +#: FrmLiloSetup.class:186 +msgid "Boot Manager Configuration" +msgstr "" + +#: FrmLiloSetup.class:202 +msgid "Do not install LILO" +msgstr "" + +#: FrmLiloSetup.class:213 +msgid "Video Resolution" +msgstr "" + +#: FrmLiloSetup.class:234 +msgid "Target" +msgstr "" + +#: FrmLiloSetup.class:252 +msgid "Boot Default" +msgstr "" + +#: FrmLiloSetup.class:273 +msgid "Prompt Timeout" +msgstr "" + +#: FrmLiloSetup.class:284 +msgid "Seconds" +msgstr "" + +#: FrmLiloSetup.class:302 +msgid "Tab 0" +msgstr "" + Added: branches/iVL/.lang/FrmMediaCheck.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmMediaCheck.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,48 @@ +# /home/vluser/devel/vinstall-ng/FrmMediaCheck.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" + +#: FrmMediaCheck.class:31 +msgid "Verifying the installation files can help you avoid an unsuccessful install." +msgstr "" + +#: FrmMediaCheck.class:31 +msgid "Keep in mind however, that this process can take a while (expect it to take just as Long as a real installation process)" +msgstr "" + +#: FrmMediaCheck.class:31 +msgid "Click" +msgstr "" + +#: FrmMediaCheck.class:31 +msgid "to begin. You may press" +msgstr "" + +#: FrmMediaCheck.class:123 +msgid "VERIFY INSTALLATION FILES" +msgstr "" + +#: FrmMediaCheck.class:155 +msgid "Close" +msgstr "" + +#: FrmMediaCheck.class:161 +msgid "Stop" +msgstr "" + +#: FrmMediaCheck.class:166 +msgid "Start" +msgstr "" + Added: branches/iVL/.lang/FrmNetConf.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmNetConf.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,52 @@ +# /home/vluser/devel/vinstall-ng/FrmNetConf.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" + +#: FrmNetConf.class:225 +msgid "Network Configuration" +msgstr "" + +#: FrmNetConf.class:240 +msgid "Computer Name" +msgstr "" + +#: FrmNetConf.class:252 +msgid "Domain" +msgstr "" + +#: FrmNetConf.class:268 +msgid "Manual DNS Server Specification" +msgstr "" + +#: FrmNetConf.class:274 +msgid "Start WICD at boot" +msgstr "" + +#: FrmNetConf.class:285 +msgid "192.168.1.254" +msgstr "" + +#: FrmNetConf.class:290 +msgid "Primary DNS Server" +msgstr "" + +#: FrmNetConf.class:303 +msgid "Secondary DNS Server" +msgstr "" + +#: FrmNetConf.class:326 +msgid "Tab 0" +msgstr "" + Modified: branches/iVL/.lang/FrmPartScheme.pot ============================================================================== --- branches/iVL/.lang/FrmPartScheme.pot (original) +++ branches/iVL/.lang/FrmPartScheme.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmPartScheme.class +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmPartSel.class +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmPkgSel.class +# /home/vluser/devel/vinstall-ng/FrmPkgSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/FrmPkgsel2.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmPkgsel2.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,28 @@ +# /home/vluser/devel/vinstall-ng/FrmPkgsel2.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" + +#: FrmPkgsel2.class:21 +msgid "Select your individual packages to install." +msgstr "" + +#: FrmPkgsel2.class:21 +msgid "To install them all, just click next" +msgstr "" + +#: FrmPkgsel2.class:86 +msgid "TextLabel1" +msgstr "" + Added: branches/iVL/.lang/FrmResetSettings.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmResetSettings.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,24 @@ +# /home/vluser/devel/vinstall-ng/FrmResetSettings.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" + +#: FrmResetSettings.class:112 +msgid "Select which settings to reset" +msgstr "" + +#: FrmResetSettings.class:122 +msgid "Done" +msgstr "" + Added: branches/iVL/.lang/FrmRootPass.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmRootPass.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,60 @@ +# /home/vluser/devel/vinstall-ng/FrmRootPass.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" + +#: FrmRootPass.class:12 +msgid "System Administrator Password" +msgstr "" + +#: FrmRootPass.class:19 +msgid "Most other every-day taks do not require administrative priviledges." +msgstr "" + +#: FrmRootPass.class:19 +msgid "For added security, use a password that is easy for you to remember, but hard for others to guess." +msgstr "" + +#: FrmRootPass.class:29 +msgid "About the root account" +msgstr "" + +#: FrmRootPass.class:38 +msgid "Enter a Password for root." +msgstr "" + +#: FrmRootPass.class:49 +msgid "Passwords do not match. Please enter the same password twice for accuracy." +msgstr "" + +#: FrmRootPass.class:124 +msgid "System Administrator" +msgstr "" + +#: FrmRootPass.class:137 +msgid "The linux root account is pre-assigned to be used as the system administrator's account. This account is used to perform system-wide changes such as software upgrades, managing user accounts etc. \n\nMost other operations do not require administrative priviledges.\nThe root password must be entered twice for ensured accuracy. When choosing a root password, think of something easy for you to remember, but hard for others to guess." +msgstr "" + +#: FrmRootPass.class:143 +msgid "Enter Password" +msgstr "" + +#: FrmRootPass.class:148 +msgid "Re-Enter Password" +msgstr "" + +#: FrmRootPass.class:165 +msgid "Set Password" +msgstr "" + Modified: branches/iVL/.lang/FrmSelISO.pot ============================================================================== --- branches/iVL/.lang/FrmSelISO.pot (original) +++ branches/iVL/.lang/FrmSelISO.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmSelISO.class +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmSummary.class +# /home/vluser/devel/vinstall-ng/FrmSummary.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/FrmSummaryOld.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmSummaryOld.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,20 @@ +# /home/vluser/devel/vinstall-ng/FrmSummaryOld.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" + +#: FrmSummaryOld.class:87 +msgid "TextLabel1" +msgstr "" + Added: branches/iVL/.lang/FrmUserAdd.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmUserAdd.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,144 @@ +# /home/vluser/devel/vinstall-ng/FrmUserAdd.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" + +#: FrmUserAdd.class:35 +msgid "Setup has detected existing user directories in your selected /home partition. Would you like to import these user accounts into your new installation?" +msgstr "" + +#: FrmUserAdd.class:35 +msgid "Yes" +msgstr "" + +#: FrmUserAdd.class:35 +msgid "No" +msgstr "" + +#: FrmUserAdd.class:60 +msgid "Create User Accounts" +msgstr "" + +#: FrmUserAdd.class:116 +msgid "Creating user account ... Please wait" +msgstr "" + +#: FrmUserAdd.class:124 +msgid "Enter the login name that this user will user to login to this system." +msgstr "" + +#: FrmUserAdd.class:132 +msgid "Login name field contains illegal characters. Please use only lowercase letters and numbers" +msgstr "" + +#: FrmUserAdd.class:146 +msgid "Username contains illegal characters" +msgstr "" + +#: FrmUserAdd.class:149 +msgid "User account for" +msgstr "" + +#: FrmUserAdd.class:149 +msgid "already exists" +msgstr "" + +#: FrmUserAdd.class:153 +msgid "Enter a password for" +msgstr "" + +#: FrmUserAdd.class:210 +msgid "Passwords do not match" +msgstr "" + +#: FrmUserAdd.class:211 +msgid "Enter the same password twice" +msgstr "" + +#: FrmUserAdd.class:368 +msgid "Select picture for user Login" +msgstr "" + +#: FrmUserAdd.class:408 +msgid "Your password selections do not match. Please enter the same password twice" +msgstr "" + +#: FrmUserAdd.class:433 +msgid "Groups are a way of administering permissions for your users. You grant the user" +msgstr "" + +#: FrmUserAdd.class:433 +msgid "permission to do certain things by adding them to certain groups." +msgstr "" + +#: FrmUserAdd.class:433 +msgid "Select which groups you want this user to be a part of here" +msgstr "" + +#: FrmUserAdd.class:434 +msgid "OK" +msgstr "" + +#: FrmUserAdd.class:505 +msgid "Choose a unique name for each user. Enter the password twice for accuracy. You can make as many users as you want, and when you are finished click next to continue." +msgstr "" + +#: FrmUserAdd.class:543 +msgid "Select" +msgstr "" + +#: FrmUserAdd.class:549 +msgid "Use Picture ID for Login greeting" +msgstr "" + +#: FrmUserAdd.class:554 +msgid "User Rights Management" +msgstr "" + +#: FrmUserAdd.class:558 +msgid "Help" +msgstr "" + +#: FrmUserAdd.class:571 +msgid "Create User" +msgstr "" + +#: FrmUserAdd.class:577 +msgid "Clear Form" +msgstr "" + +#: FrmUserAdd.class:584 +msgid "Login Name" +msgstr "" + +#: FrmUserAdd.class:591 +msgid "Enter Password" +msgstr "" + +#: FrmUserAdd.class:598 +msgid "ReEnter Password" +msgstr "" + +#: FrmUserAdd.class:614 +msgid "Real Name" +msgstr "" + +#: FrmUserAdd.class:620 +msgid "User Accounts" +msgstr "" + +#: FrmUserAdd.class:630 +msgid "Import Existing User Accounts" +msgstr "" + Added: branches/iVL/.lang/FrmUsrPkgSel.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmUsrPkgSel.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,44 @@ +# /home/vluser/devel/vinstall-ng/FrmUsrPkgSel.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" + +#: FrmUsrPkgSel.class:11 +msgid "Select your indivirual packages to install." +msgstr "" + +#: FrmUsrPkgSel.class:11 +msgid "To install them all, just click" +msgstr "" + +#: FrmUsrPkgSel.class:16 +msgid "Package Name" +msgstr "" + +#: FrmUsrPkgSel.class:17 +msgid "Description" +msgstr "" + +#: FrmUsrPkgSel.class:19 +msgid "Size" +msgstr "" + +#: FrmUsrPkgSel.class:40 +msgid "Reading available software selection ... Please wait" +msgstr "" + +#: FrmUsrPkgSel.class:147 +msgid "Software Selection" +msgstr "" + Modified: branches/iVL/.lang/FrmWinDrives.pot ============================================================================== --- branches/iVL/.lang/FrmWinDrives.pot (original) +++ branches/iVL/.lang/FrmWinDrives.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/FrmWinDrives.class +# /home/vluser/devel/vinstall-ng/FrmWinDrives.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/FrmXconf.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmXconf.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,104 @@ +# /home/vluser/devel/vinstall-ng/FrmXconf.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" + +#: FrmXconf.class:25 +msgid "Uses the default (failsafe) configuration." +msgstr "" + +#: FrmXconf.class:27 +msgid "Probe hardware to setup your Graphical Environment using your preffered settings" +msgstr "" + +#: FrmXconf.class:29 +msgid "Use the console framebuffer driver" +msgstr "" + +#: FrmXconf.class:301 +msgid "Graphical Interface Settings" +msgstr "" + +#: FrmXconf.class:311 +msgid "Video Driver" +msgstr "" + +#: FrmXconf.class:322 +msgid "Color Depth" +msgstr "" + +#: FrmXconf.class:328 +msgid "Screen Resolution" +msgstr "" + +#: FrmXconf.class:335 +msgid "24 bit True Color" +msgstr "" + +#: FrmXconf.class:335 +msgid "16 bit Pseudo Color" +msgstr "" + +#: FrmXconf.class:335 +msgid "8 bit 256 Color" +msgstr "" + +#: FrmXconf.class:335 +msgid "4 bit 16 Color" +msgstr "" + +#: FrmXconf.class:335 +msgid "1 bit Mono B/W" +msgstr "" + +#: FrmXconf.class:340 +msgid "Vesa" +msgstr "" + +#: FrmXconf.class:342 +msgid "Fbdev" +msgstr "" + +#: FrmXconf.class:348 +msgid "1920x1280" +msgstr "" + +#: FrmXconf.class:348 +msgid "1600x1200" +msgstr "" + +#: FrmXconf.class:348 +msgid "1440x900" +msgstr "" + +#: FrmXconf.class:348 +msgid "1280x1024" +msgstr "" + +#: FrmXconf.class:348 +msgid "1280x800" +msgstr "" + +#: FrmXconf.class:348 +msgid "1024x768" +msgstr "" + +#: FrmXconf.class:348 +msgid "800x600" +msgstr "" + +#: FrmXconf.class:348 +msgid "640x480" +msgstr "" + Added: branches/iVL/.lang/FrmZoneSet.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/FrmZoneSet.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,40 @@ +# /home/vluser/devel/vinstall-ng/FrmZoneSet.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" + +#: FrmZoneSet.class:21 +msgid "Timezone configuration" +msgstr "" + +#: FrmZoneSet.class:134 +msgid "Choose the correct timezone for the area in which you live." +msgstr "" + +#: FrmZoneSet.class:139 +msgid "ComboBox1" +msgstr "" + +#: FrmZoneSet.class:141 +msgid "LocalTime" +msgstr "" + +#: FrmZoneSet.class:141 +msgid "UTC" +msgstr "" + +#: FrmZoneSet.class:146 +msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT). Otherwise,\nChoose localtime since most PCs are setup this way." +msgstr "" + Added: branches/iVL/.lang/MdlAlsaConf.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlAlsaConf.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/MdlAlsaConf.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/iVL/.lang/MdlConfLilo.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlConfLilo.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,36 @@ +# /home/vluser/devel/vinstall-ng/MdlConfLilo.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" + +#: MdlConfLilo.module:95 +msgid "Lilo returned an error. Please see below" +msgstr "" + +#: MdlConfLilo.module:99 +msgid "Boot loader has been setup successfully" +msgstr "" + +#: MdlConfLilo.module:120 +msgid "MBR of" +msgstr "" + +#: MdlConfLilo.module:127 +msgid "Bootsector of " +msgstr "" + +#: MdlConfLilo.module:132 +msgid "Floppy" +msgstr "" + Modified: branches/iVL/.lang/MdlCore.pot ============================================================================== --- branches/iVL/.lang/MdlCore.pot (original) +++ branches/iVL/.lang/MdlCore.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlCore.module +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlDiskPart.module +# /home/vluser/devel/vinstall-ng/MdlDiskPart.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/MdlImportAccts.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlImportAccts.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/MdlImportAccts.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/iVL/.lang/MdlInstallCustom.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlInstallCustom.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,72 @@ +# /home/vluser/devel/vinstall-ng/MdlInstallCustom.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" + +#: MdlInstallCustom.module:48 +msgid "There as been an error while installing required system software. " +msgstr "" + +#: MdlInstallCustom.module:56 +msgid "There has been an error while installing optional software to your system. " +msgstr "" + +#: MdlInstallCustom.module:65 +msgid "There has been an error while installing optional software to your system." +msgstr "" + +#: MdlInstallCustom.module:73 +msgid "Error while installing required system software. " +msgstr "" + +#: MdlInstallCustom.module:82 +msgid "Error while installing system configuration. " +msgstr "" + +#: MdlInstallCustom.module:89 +msgid "Unable to install kernels. " +msgstr "" + +#: MdlInstallCustom.module:106 +msgid "Installation complete" +msgstr "" + +#: MdlInstallCustom.module:107 +msgid "Packages have been Installed. Please click next to move on to System Configuration." +msgstr "" + +#: MdlInstallCustom.module:108 +msgid "installation is complete. Click next to begin system configuration" +msgstr "" + +#: MdlInstallCustom.module:211 +msgid "Installing" +msgstr "" + +#: MdlInstallCustom.module:225 +msgid "Failed to install. Installation will stop" +msgstr "" + +#: MdlInstallCustom.module:271 +msgid "Installing user-selected package" +msgstr "" + +#: MdlInstallCustom.module:354 +msgid "Error while installing " +msgstr "" + +#: MdlInstallCustom.module:423 +msgid "failed to install. Installation will stop now" +msgstr "" + Added: branches/iVL/.lang/MdlInstallSys.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlInstallSys.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,92 @@ +# /home/vluser/devel/vinstall-ng/MdlInstallSys.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" + +#: MdlInstallSys.module:44 +msgid "Not Used" +msgstr "" + +#: MdlInstallSys.module:125 +msgid "Writing new /etc/fstab to system" +msgstr "" + +#: MdlInstallSys.module:164 +msgid "Do not format" +msgstr "" + +#: MdlInstallSys.module:170 +msgid "Setup is unable to detect for current filesystem for your / partition." +msgstr "" + +#: MdlInstallSys.module:170 +msgid "Please return to the partitioning stage and select a filesystem for your / partition." +msgstr "" + +#: MdlInstallSys.module:214 +msgid "Do not mount" +msgstr "" + +#: MdlInstallSys.module:402 +msgid "Vectorlinux is now installed in your system. Please click" +msgstr "" + +#: MdlInstallSys.module:402 +msgid "to configure it." +msgstr "" + +#: MdlInstallSys.module:403 +msgid "Packages have been installed in your system. Please click" +msgstr "" + +#: MdlInstallSys.module:404 +msgid "installation is complete. Click next to begin system configuration" +msgstr "" + +#: MdlInstallSys.module:516 +msgid "Installing" +msgstr "" + +#: MdlInstallSys.module:530 +msgid "Failed to install" +msgstr "" + +#: MdlInstallSys.module:558 +msgid "Error occurred while installing" +msgstr "" + +#: MdlInstallSys.module:623 +msgid "Vectorlinux is now being installed. Please wait..." +msgstr "" + +#: MdlInstallSys.module:667 +msgid "There has been an error extracting" +msgstr "" + +#: MdlInstallSys.module:679 +msgid "Finished intalling Bulks" +msgstr "" + +#: MdlInstallSys.module:794 +msgid "Installation phase complete. Ready for configuration" +msgstr "" + +#: MdlInstallSys.module:797 +msgid "Installing default system configuration and required software." +msgstr "" + +#: MdlInstallSys.module:839 +msgid "Installing Required Package ..." +msgstr "" + Added: branches/iVL/.lang/MdlLangSel.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlLangSel.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/MdlLangSel.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/iVL/.lang/MdlLilo.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlLilo.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,88 @@ +# /home/vluser/devel/vinstall-ng/MdlLilo.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" + +#: MdlLilo.module:35 +msgid "MBR of" +msgstr "" + +#: MdlLilo.module:79 +msgid "Standard" +msgstr "" + +#: MdlLilo.module:81 +msgid "Bootsplash Med" +msgstr "" + +#: MdlLilo.module:83 +msgid "Bootsplash High" +msgstr "" + +#: MdlLilo.module:85 +msgid "Bootsplash Extra High" +msgstr "" + +#: MdlLilo.module:127 +msgid "Bootsector of " +msgstr "" + +#: MdlLilo.module:129 +msgid "Floppy" +msgstr "" + +#: MdlLilo.module:203 +msgid "None" +msgstr "" + +#: MdlLilo.module:237 +msgid "Your option to boot" +msgstr "" + +#: MdlLilo.module:237 +msgid "is too long. it has been adjusted to \"Vector-cli\". You can run vasmCC after the first boot to modify your boot options" +msgstr "" + +#: MdlLilo.module:521 +msgid "installed on" +msgstr "" + +#: MdlLilo.module:539 +msgid "Include this installation in the boot menu" +msgstr "" + +#: MdlLilo.module:549 +msgid "Name" +msgstr "" + +#: MdlLilo.module:602 +msgid "installed in" +msgstr "" + +#: MdlLilo.module:623 +msgid "Include in boot menu" +msgstr "" + +#: MdlLilo.module:659 +msgid "Initrd" +msgstr "" + +#: MdlLilo.module:692 +msgid "Kernel boot options" +msgstr "" + +#: MdlLilo.module:715 +msgid "Add option to boot this operating system into text mode" +msgstr "" + Added: branches/iVL/.lang/MdlLiloOsList.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlLiloOsList.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,52 @@ +# /home/vluser/devel/vinstall-ng/MdlLiloOsList.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" + +#: MdlLiloOsList.module:139 +msgid "Windows installation found in" +msgstr "" + +#: MdlLiloOsList.module:149 +msgid "Include this installation in the boot menu" +msgstr "" + +#: MdlLiloOsList.module:158 +msgid "Label" +msgstr "" + +#: MdlLiloOsList.module:290 +msgid "Operating system installed in" +msgstr "" + +#: MdlLiloOsList.module:302 +msgid "Include this operating system in the boot menu" +msgstr "" + +#: MdlLiloOsList.module:313 +msgid "Name" +msgstr "" + +#: MdlLiloOsList.module:334 +msgid "Initial Ram Disk" +msgstr "" + +#: MdlLiloOsList.module:359 +msgid "Kernel boot options" +msgstr "" + +#: MdlLiloOsList.module:396 +msgid "Add option to boot this Operating system into Text mode." +msgstr "" + Added: branches/iVL/.lang/MdlNav.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlNav.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/MdlNav.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/iVL/.lang/MdlNetConf.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlNetConf.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,84 @@ +# /home/vluser/devel/vinstall-ng/MdlNetConf.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" + +#: MdlNetConf.module:81 +msgid "No ethernet neworking devices found" +msgstr "" + +#: MdlNetConf.module:100 +msgid "Wired" +msgstr "" + +#: MdlNetConf.module:107 +msgid "Plugged-in" +msgstr "" + +#: MdlNetConf.module:109 +msgid "Unplugged" +msgstr "" + +#: MdlNetConf.module:121 +msgid "Hardware Address" +msgstr "" + +#: MdlNetConf.module:142 +msgid "Automatically activate this interface at start-up" +msgstr "" + +#: MdlNetConf.module:153 +msgid "Setup Mode" +msgstr "" + +#: MdlNetConf.module:173 +msgid "Current Status:" +msgstr "" + +#: MdlNetConf.module:227 +msgid "Static IP Address Settings" +msgstr "" + +#: MdlNetConf.module:239 +msgid "IP Address" +msgstr "" + +#: MdlNetConf.module:262 +msgid "Subnet Mask" +msgstr "" + +#: MdlNetConf.module:284 +msgid "Gateway Address" +msgstr "" + +#: MdlNetConf.module:322 +msgid "Dynamic Host Control Protocol" +msgstr "" + +#: MdlNetConf.module:322 +msgid "Automatic settings via DHCP." +msgstr "" + +#: MdlNetConf.module:322 +msgid "This will work if you use a cable or DSL modem on a home network." +msgstr "" + +#: MdlNetConf.module:322 +msgid "If in doubt, choose this option." +msgstr "" + +#: MdlNetConf.module:480 +msgid "None" +msgstr "" + Modified: branches/iVL/.lang/MdlObjSizer.pot ============================================================================== --- branches/iVL/.lang/MdlObjSizer.pot (original) +++ branches/iVL/.lang/MdlObjSizer.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlObjSizer.module +# /home/vluser/devel/vinstall-ng/MdlObjSizer.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/MdlPartFrmt.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlPartFrmt.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,24 @@ +# /home/vluser/devel/vinstall-ng/MdlPartFrmt.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" + +#: MdlPartFrmt.module:33 +msgid "Do not format" +msgstr "" + +#: MdlPartFrmt.module:103 +msgid "There has been an error while trying to format " +msgstr "" + Modified: branches/iVL/.lang/MdlPartSel.pot ============================================================================== --- branches/iVL/.lang/MdlPartSel.pot (original) +++ branches/iVL/.lang/MdlPartSel.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlPartSel.module +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlPkgSel.module +# /home/vluser/devel/vinstall-ng/MdlPkgSel.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/MdlPkgSelNew.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlPkgSelNew.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,16 @@ +# /home/vluser/devel/vinstall-ng/MdlPkgSelNew.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/iVL/.lang/MdlResetSettings.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlResetSettings.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,64 @@ +# /home/vluser/devel/vinstall-ng/MdlResetSettings.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" + +#: MdlResetSettings.module:33 +msgid "KDE Settings (Menu, Window decorations, etc)" +msgstr "" + +#: MdlResetSettings.module:35 +msgid "QT Toolkit settings (KDE Visual Effects)" +msgstr "" + +#: MdlResetSettings.module:37 +msgid "GTK Tookit theme Settings" +msgstr "" + +#: MdlResetSettings.module:39 +msgid "X-window basic settings (includes xterm settings)" +msgstr "" + +#: MdlResetSettings.module:41 +msgid "Bash init script" +msgstr "" + +#: MdlResetSettings.module:43 +msgid "Sound system preferences" +msgstr "" + +#: MdlResetSettings.module:45 +msgid "Graphical inteface preferences" +msgstr "" + +#: MdlResetSettings.module:47 +msgid "Desktop icons, folders, launchers" +msgstr "" + +#: MdlResetSettings.module:49 +msgid "IceWM settings, preferences, menu" +msgstr "" + +#: MdlResetSettings.module:51 +msgid "XMMS Audio player preferences" +msgstr "" + +#: MdlResetSettings.module:53 +msgid "ROX Filer Desktop settings" +msgstr "" + +#: MdlResetSettings.module:55 +msgid "MPlayer Multimedia Player Settings" +msgstr "" + Modified: branches/iVL/.lang/MdlSetup.pot ============================================================================== --- branches/iVL/.lang/MdlSetup.pot (original) +++ branches/iVL/.lang/MdlSetup.pot Fri Feb 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlSetup.module +# /home/vluser/devel/vinstall-ng/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 20 12:58:30 2009 @@ -1,4 +1,4 @@ -# /home/uel/gui-installer/MdlSummarize.module +# /home/vluser/devel/vinstall-ng/MdlSummarize.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Added: branches/iVL/.lang/MdlUsrAdd.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlUsrAdd.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,68 @@ +# /home/vluser/devel/vinstall-ng/MdlUsrAdd.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" + +#: MdlUsrAdd.module:91 +msgid "This user can access CD/DVD devices" +msgstr "" + +#: MdlUsrAdd.module:94 +msgid "This user can access floppy disks" +msgstr "" + +#: MdlUsrAdd.module:97 +msgid "This user is allowed to print" +msgstr "" + +#: MdlUsrAdd.module:100 +msgid "This user can access scanner devices" +msgstr "" + +#: MdlUsrAdd.module:103 +msgid "This user is allowed to change audio settings" +msgstr "" + +#: MdlUsrAdd.module:106 +msgid "This user is allowed to change video settings" +msgstr "" + +#: MdlUsrAdd.module:109 +msgid "This user is allowed to play restricted games" +msgstr "" + +#: MdlUsrAdd.module:112 +msgid "This user can access the locate database" +msgstr "" + +#: MdlUsrAdd.module:115 +msgid "Restricted administrator (backup)" +msgstr "" + +#: MdlUsrAdd.module:118 +msgid "This user is a system administrator" +msgstr "" + +#: MdlUsrAdd.module:121 +msgid "Elite user" +msgstr "" + +#: MdlUsrAdd.module:124 +msgid "Allow user to mount / un-mount Pendrive (USB Sticks)" +msgstr "" + +#: MdlUsrAdd.module:127 +msgid "Allow user to mount / un-mount Removable HD Storage Devices" +msgstr "" + Added: branches/iVL/.lang/MdlVerifyMedia.pot ============================================================================== --- (empty file) +++ branches/iVL/.lang/MdlVerifyMedia.pot Fri Feb 20 12:58:30 2009 @@ -0,0 +1,24 @@ +# /home/vluser/devel/vinstall-ng/MdlVerifyMedia.module +# Generated by Gambas compiler + +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n""POT-Creation-Date: 2002... [truncated message content] |
From: M0E L. <m0...@gm...> - 2009-02-20 05:09:07
|
That would be kool, except I'm in TX On Thu, Feb 19, 2009 at 5:46 PM, Sriram Durbha <sri...@gm...> wrote: > 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 >> > > > ------------------------------------------------------------------------------ > 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 > > |