Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r475 - in branches/speedy: . .lang
|
From: <cod...@go...> - 2009-01-30 17:24:57
|
Author: M0...@gm...
Date: Fri Jan 30 08:39:11 2009
New Revision: 475
Added:
branches/speedy/.lang/en_US.mo (contents, props changed)
branches/speedy/.lang/en_US.po
branches/speedy/FMain0.class
branches/speedy/FMain0.form
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/FMain.pot
branches/speedy/.lang/Step1.pot
branches/speedy/.lang/Step2.pot
branches/speedy/.lang/es.mo
branches/speedy/.lang/es.po
branches/speedy/ClsGlobal.class
branches/speedy/FMain.class
branches/speedy/FMain.form
branches/speedy/Step0.class
branches/speedy/Step0.form
branches/speedy/Step1.class
branches/speedy/Step1.form
branches/speedy/Step2.class
branches/speedy/Step2.form
Log:
Added locale functionality Added media checking step
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Fri Jan 30 08:39:11 2009
@@ -10,19 +10,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .project:1
-msgid "VectorLinux Installer"
+#: FMain.class:233 FMain0.class:225
+msgid "Process Overview"
msgstr ""
-#: FMain.class:221
+#: FMain.class:270 FMain0.class:262
msgid "Back"
msgstr ""
-#: FMain.class:226
+#: FMain.class:281 FMain0.class:273
msgid "Next"
msgstr ""
-#: FMain.class:231
+#: FMain.class:292 FMain0.class:284
msgid "Quit"
msgstr ""
@@ -30,96 +30,188 @@
msgid "Localization Settings"
msgstr ""
-#: Step0.class:103
+#: Step0.class:122
msgid "Spanish"
msgstr ""
-#: Step0.class:106
+#: Step0.class:125
msgid "English (US)"
msgstr ""
-#: Step0.class:212
+#: Step0.class:249
msgid "Select your language"
msgstr ""
-#: Step0.class:243
+#: Step0.class:280
msgid "Select your keyboard layout"
msgstr ""
-#: Step0.class:259
+#: Step0.class:299
msgid "Select your keyboard model"
msgstr ""
-#: Step0.class:280
+#: Step0.class:321
msgid "Use this box to test your keyboard settings"
msgstr ""
-#: Step1.class:62
-msgid "Scanning system partitions for installation files"
+#: Step1.class:33
+msgid "on"
msgstr ""
-#: Step1.class:80
-msgid "on"
+#: Step1.class:122
+msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:81
+#: Step1.class:141
msgid "Found"
msgstr ""
-#: Step1.class:81
+#: Step1.class:141
msgid "in partition"
msgstr ""
-#: Step1.class:109
+#: Step1.class:169
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:122
+#: Step1.class:182
msgid "Scanning"
msgstr ""
-#: Step1.class:132
+#: Step1.class:192
msgid "in"
msgstr ""
-#: Step1.class:156
+#: Step1.class:216
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:234
+#: Step1.class:307
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:237
+#: Step1.class:310
msgid "VERSION"
msgstr ""
-#: Step1.class:349
+#: Step1.class:387
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr ""
+
+#: Step1.class:387
+msgid "WARNING:"
+msgstr ""
+
+#: Step1.class:387
+msgid "This process can take a long time to complete."
+msgstr ""
+
+#: Step1.class:425
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:367
+#: Step1.class:443
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:388
+#: Step1.class:464
msgid "Search Again"
msgstr ""
-#: Step1.class:411
+#: Step1.class:488
msgid "Check Installation media before installing"
msgstr ""
-#: Step2.class:22
+#: Step2.class:27
msgid "Verify Installation Files"
msgstr ""
-#: Step2.class:37
+#: Step2.class:68
+msgid "Verifying data on compressed package"
+msgstr ""
+
+#: Step2.class:71
+msgid "Testing file"
+msgstr ""
+
+#: Step2.class:71
+msgid "of"
+msgstr ""
+
+#: Step2.class:87
+msgid "FAILED"
+msgstr ""
+
+#: Step2.class:89
+msgid "The following"
+msgstr ""
+
+#: Step2.class:89
+msgid "required"
+msgstr ""
+
+#: Step2.class:89
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+
+#: Step2.class:90
+msgid "Integrity test"
+msgstr ""
+
+#: Step2.class:96
+msgid "PASSED"
+msgstr ""
+
+#: Step2.class:126
+msgid ""
+"has failed the data integrity test. All required packages have passed
this "
+"test"
+msgstr ""
+
+#: Step2.class:126
+msgid ""
+"Possible causes for this are a corrupted download or a badly burnt cd.
You "
+"can try the following options"
+msgstr ""
+
+#: Step2.class:126
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr ""
+
+#: Step2.class:126
+msgid "Burn the image at a lower speed rate"
+msgstr ""
+
+#: Step2.class:146
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+
+#: Step2.class:153
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+
+#: Step2.class:170
msgid ""
"Verifying installation files can prevent you from performing an
unsuccessful "
"install"
msgstr ""
-#: Step2.class:37
+#: Step2.class:170
msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr ""
+
+#: Step2.class:170
+msgid "Click"
+msgstr ""
+
+#: Step2.class:170
+msgid "to abort this process at any time"
+msgstr ""
+
+#: Step2.class:322
+msgid "TextLabel2"
+msgstr ""
+
+#: Step2.class:336
+msgid "Stop"
msgstr ""
Modified: branches/speedy/.lang/FMain.pot
==============================================================================
--- branches/speedy/.lang/FMain.pot (original)
+++ branches/speedy/.lang/FMain.pot Fri Jan 30 08:39:11 2009
@@ -14,15 +14,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:221
+#: FMain.class:233
+msgid "Process Overview"
+msgstr ""
+
+#: FMain.class:270
msgid "Back"
msgstr ""
-#: FMain.class:226
+#: FMain.class:281
msgid "Next"
msgstr ""
-#: FMain.class:231
+#: FMain.class:292
msgid "Quit"
msgstr ""
Modified: branches/speedy/.lang/Step1.pot
==============================================================================
--- branches/speedy/.lang/Step1.pot (original)
+++ branches/speedy/.lang/Step1.pot Fri Jan 30 08:39:11 2009
@@ -14,59 +14,71 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step1.class:62
-msgid "Scanning system partitions for installation files"
+#: Step1.class:33
+msgid "on"
msgstr ""
-#: Step1.class:80
-msgid "on"
+#: Step1.class:122
+msgid "Scanning system partitions for installation files"
msgstr ""
-#: Step1.class:81
+#: Step1.class:141
msgid "Found"
msgstr ""
-#: Step1.class:81
+#: Step1.class:141
msgid "in partition"
msgstr ""
-#: Step1.class:109
+#: Step1.class:169
msgid "Scanning for CD Media ... Please wait"
msgstr ""
-#: Step1.class:122
+#: Step1.class:182
msgid "Scanning"
msgstr ""
-#: Step1.class:132
+#: Step1.class:192
msgid "in"
msgstr ""
-#: Step1.class:156
+#: Step1.class:216
msgid "Scanning system for installable ISO images"
msgstr ""
-#: Step1.class:234
+#: Step1.class:307
msgid "DISTRIBUTION"
msgstr ""
-#: Step1.class:237
+#: Step1.class:310
msgid "VERSION"
msgstr ""
-#: Step1.class:349
+#: Step1.class:387
+msgid "This feature can help you avoid an unsuccesful installation."
+msgstr ""
+
+#: Step1.class:387
+msgid "WARNING:"
+msgstr ""
+
+#: Step1.class:387
+msgid "This process can take a long time to complete."
+msgstr ""
+
+#: Step1.class:425
msgid "Select Installation Source"
msgstr ""
-#: Step1.class:367
+#: Step1.class:443
msgid "Select Installation source from the list below"
msgstr ""
-#: Step1.class:388
+#: Step1.class:464
msgid "Search Again"
msgstr ""
-#: Step1.class:411
+#: Step1.class:488
msgid "Check Installation media before installing"
msgstr ""
Modified: branches/speedy/.lang/Step2.pot
==============================================================================
--- branches/speedy/.lang/Step2.pot (original)
+++ branches/speedy/.lang/Step2.pot Fri Jan 30 08:39:11 2009
@@ -14,15 +14,91 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Step2.class:22
+#: Step2.class:27
msgid "Verify Installation Files"
msgstr ""
-#: Step2.class:37
+#: Step2.class:68
+msgid "Verifying data on compressed package"
+msgstr ""
+
+#: Step2.class:71
+msgid "Testing file"
+msgstr ""
+
+#: Step2.class:71
+msgid "of"
+msgstr ""
+
+#: Step2.class:87
+msgid "FAILED"
+msgstr ""
+
+#: Step2.class:89
+msgid "The following"
+msgstr ""
+
+#: Step2.class:89
+msgid "required"
+msgstr ""
+
+#: Step2.class:89
+msgid "has failed the integrity test. It is not safe to continue"
+msgstr ""
+
+#: Step2.class:90
+msgid "Integrity test"
+msgstr ""
+
+#: Step2.class:96
+msgid "PASSED"
+msgstr ""
+
+#: Step2.class:126
+msgid "has failed the data integrity test. All required packages have
passed this test"
+msgstr ""
+
+#: Step2.class:126
+msgid "Possible causes for this are a corrupted download or a badly burnt
cd. You can try the following options"
+msgstr ""
+
+#: Step2.class:126
+msgid "Download a new installation image from www.vectorlinux.com"
+msgstr ""
+
+#: Step2.class:126
+msgid "Burn the image at a lower speed rate"
+msgstr ""
+
+#: Step2.class:146
+msgid "Data integrity test complete... all tests passed"
+msgstr ""
+
+#: Step2.class:153
+msgid "All test passed. It is safe to continue with the installation
process."
+msgstr ""
+
+#: Step2.class:170
msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
msgstr ""
-#: Step2.class:37
+#: Step2.class:170
msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr ""
+
+#: Step2.class:170
+msgid "Click"
+msgstr ""
+
+#: Step2.class:170
+msgid "to abort this process at any time"
+msgstr ""
+
+#: Step2.class:322
+msgid "TextLabel2"
+msgstr ""
+
+#: Step2.class:336
+msgid "Stop"
msgstr ""
Added: branches/speedy/.lang/en_US.mo
==============================================================================
Binary file. No diff available.
Added: branches/speedy/.lang/en_US.po
==============================================================================
--- (empty file)
+++ branches/speedy/.lang/en_US.po Fri Jan 30 08:39:11 2009
@@ -0,0 +1,128 @@
+#, 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"
+
+#: FMain.class:258 FMain0.class:251
+msgid "Back"
+msgstr "Back"
+
+#: Step1.class:412
+msgid "Check Installation media before installing"
+msgstr "Check Installation media before installing"
+
+#: Step1.class:234
+msgid "DISTRIBUTION"
+msgstr "DISTRIBUTION"
+
+#: Step0.class:116
+msgid "English (US)"
+msgstr "English (US)"
+
+#: Step1.class:81
+msgid "Found"
+msgstr "Found"
+
+#: Step2.class:37
+msgid "Keep in mind however, that this process can take a while to
complete."
+msgstr "Keep in mind however, that this process can take a while to
complete."
+
+#: Step0.class:20
+msgid "Localization Settings"
+msgstr "Localization Settings"
+
+#: FMain.class:269 FMain0.class:262
+msgid "Next"
+msgstr "Next"
+
+#: FMain.class:221 FMain0.class:214
+msgid "Process Overview"
+msgstr "Process Overview"
+
+#: FMain.class:280 FMain0.class:273
+msgid "Quit"
+msgstr "Quit"
+
+#: Step1.class:122
+msgid "Scanning"
+msgstr "Scanning"
+
+#: Step1.class:109
+msgid "Scanning for CD Media ... Please wait"
+msgstr "Scanning for CD Media ... Please wait"
+
+#: Step1.class:156
+msgid "Scanning system for installable ISO images"
+msgstr "Scanning system for installable ISO images"
+
+#: Step1.class:62
+msgid "Scanning system partitions for installation files"
+msgstr "Scanning system partitions for installation files"
+
+#: Step1.class:388
+msgid "Search Again"
+msgstr "Search Again"
+
+#: Step1.class:349
+msgid "Select Installation Source"
+msgstr "Select Installation Source"
+
+#: Step1.class:367
+msgid "Select Installation source from the list below"
+msgstr "Select Installation source from the list below"
+
+#: Step0.class:272
+msgid "Select your keyboard layout"
+msgstr "Select your keyboard layout"
+
+#: Step0.class:291
+msgid "Select your keyboard model"
+msgstr "Select your keyboard model"
+
+#: Step0.class:241
+msgid "Select your language"
+msgstr "Select your language"
+
+#: Step0.class:113
+msgid "Spanish"
+msgstr "Spanish"
+
+#: Step0.class:317
+msgid "Use this box to test your keyboard settings"
+msgstr "Use this box to test your keyboard settings"
+
+#: Step1.class:237
+msgid "VERSION"
+msgstr "VERSION"
+
+#: .project:1
+msgid "VectorLinux Installer"
+msgstr "VectorLinux Installer"
+
+#: Step2.class:22
+msgid "Verify Installation Files"
+msgstr "Verify Installation Files"
+
+#: Step2.class:37
+msgid "Verifying installation files can prevent you from performing an
unsuccessful install"
+msgstr "Verifying installation files can prevent you from performing an
unsuccessful install"
+
+#: Step1.class:132
+msgid "in"
+msgstr "in"
+
+#: Step1.class:81
+msgid "in partition"
+msgstr "in partition"
+
+#: Step1.class:80
+msgid "on"
+msgstr "on"
+
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 Fri Jan 30 08:39:11 2009
@@ -10,11 +10,11 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: FMain.class:223
+#: FMain.class:258 FMain0.class:251
msgid "Back"
msgstr "Regreso"
-#: Step1.class:411
+#: Step1.class:412
msgid "Check Installation media before installing"
msgstr "Verificar archivos de instalacion"
@@ -22,7 +22,7 @@
msgid "DISTRIBUTION"
msgstr "DISTRIBUCION"
-#: Step0.class:106
+#: Step0.class:116
msgid "English (US)"
msgstr ""
@@ -38,11 +38,15 @@
msgid "Localization Settings"
msgstr "Valores locales"
-#: FMain.class:228
+#: FMain.class:269 FMain0.class:262
msgid "Next"
msgstr "Siguiente"
-#: FMain.class:233
+#: FMain.class:221 FMain0.class:220
+msgid "Process Overview"
+msgstr "Resumen del Proceso"
+
+#: FMain.class:280 FMain0.class:273
msgid "Quit"
msgstr "Cancelar"
@@ -74,23 +78,23 @@
msgid "Select Installation source from the list below"
msgstr "Seleccione la fuente instalacion de esta lista"
-#: Step0.class:243
+#: Step0.class:272
msgid "Select your keyboard layout"
msgstr "Seleccione el diseño de su teclado"
-#: Step0.class:259
+#: Step0.class:291
msgid "Select your keyboard model"
msgstr "Seleccione el model de su teclado"
-#: Step0.class:212
+#: Step0.class:241
msgid "Select your language"
msgstr "Seleccione su idioma"
-#: Step0.class:103
+#: Step0.class:113
msgid "Spanish"
msgstr ""
-#: Step0.class:280
+#: Step0.class:317
msgid "Use this box to test your keyboard settings"
msgstr "Area de prueba"
Modified: branches/speedy/ClsGlobal.class
==============================================================================
--- branches/speedy/ClsGlobal.class (original)
+++ branches/speedy/ClsGlobal.class Fri Jan 30 08:39:11 2009
@@ -17,3 +17,12 @@
STATIC PUBLIC sDistroName AS String
STATIC PUBLIC sDistroVer AS String
+
+' Installatio media information
+STATIC PUBLIC sSourceName AS String
+STATIC PUBLIC sSourceAddr AS String
+
+' Media scan
+STATIC PUBLIC sToScan AS String
+STATIC PUBLIC sLastScanned AS String
+
Modified: branches/speedy/FMain.class
==============================================================================
--- branches/speedy/FMain.class (original)
+++ branches/speedy/FMain.class Fri Jan 30 08:39:11 2009
@@ -66,12 +66,18 @@
DIM bExist AS Boolean
'Get the next One
-sTmp = $oCurrent.GetNext()
+
+sTmp = $oCurrent.GetNext()
+
'$oCurrent.Form_Open()
'$oCurrent.Startup()
'Is this form already opened ?
'if true it may have no been closed to preserve entries
+
+$oCurrent.OnExit() ' execute any code that needs to be ran before moving
to the next step
+
+
FOR EACH o IN pnlStack.Children
IF Object.Type(o) = sTmp THEN
@@ -86,6 +92,15 @@
$aPrev.Push($oCurrent)
btBack.Enabled = $aPrev.Count > 0
+IF $oCurrent.name = "Step0" THEN
+ IF System.Language <> "en_US" THEN
+ FMain0.Show
+ FMain.Close
+ RETURN
+ END IF
+
+END IF
+
IF NOT bExist THEN
$oCurrent = Object.New(sTmp, [pnlStack])
@@ -131,5 +146,12 @@
PUBLIC SUB SidePanel1_Resize()
$oCurrent.resize(pnlStack.Width, pnlStack.Height)
+
+END
+
+PUBLIC SUB Form_Close()
+
+ 'EXEC ["umount", "/mnt/source"] WAIT
+ SHELL "umount /mnt/source 2>/dev/null" WAIT
END
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Fri Jan 30 08:39:11 2009
@@ -5,14 +5,15 @@
Text = ("")
Arrangement = Arrange.Vertical
{ HBox2 HBox
- MoveScaled(12,1,63,11)
+ MoveScaled(12,1,63,7)
+ Background = Color.SelectedBackground
{ Panel2 Panel
MoveScaled(1,3,4,2)
Expand = True
}
{ PictureBox1 PictureBox
MoveScaled(7,1,46,5)
- Picture = Picture["images/vlocity.png"]
+ Picture = Picture["images/installer.png"]
Stretch = True
}
{ Panel3 Panel
@@ -20,17 +21,28 @@
Expand = True
}
}
+ { HBox4 HBox
+ MoveScaled(3,8,72,1)
+ }
{ Panel1 Panel
MoveScaled(1,10,80,40)
Expand = True
Arrangement = Arrange.Horizontal
{ SidePanel1 SidePanel
MoveScaled(1,2,26,35)
- Arrangement = Arrange.Fill
+ Arrangement = Arrange.Vertical
Orientation = Align.Left
Resizable = False
- { ListBox1 ListBox
- MoveScaled(2,2,21,31)
+ { HBox5 HBox
+ MoveScaled(2,-1,21,3)
+ { TextLabel1 TextLabel
+ MoveScaled(2,0,15,2)
+ Expand = True
+ Text = ("Process Overview")
+ }
+ }
+ { ListView1 ListView
+ MoveScaled(2,3,16,21)
Expand = True
}
}
@@ -49,17 +61,33 @@
MoveScaled(0,0,17,3)
Expand = True
}
+ { Panel6 Panel
+ MoveScaled(21,1,6,2)
+ Expand = True
+ }
{ btBack Button
- MoveScaled(40,1,11,2)
+ MoveScaled(29,0,11,2)
+ Expand = True
Text = ("Back")
+ Picture = Picture["icon:/small/previous"]
+ }
+ { Panel5 Panel
+ MoveScaled(41,1,1,1)
}
{ btNext Button
- MoveScaled(53,1,11,2)
+ MoveScaled(43,0,11,2)
+ Expand = True
Text = ("Next")
+ Picture = Picture["icon:/small/next"]
+ }
+ { Panel7 Panel
+ MoveScaled(55,1,1,1)
}
{ btQuit Button
- MoveScaled(66,1,10,2)
+ MoveScaled(56,0,10,2)
+ Expand = True
Text = ("Quit")
+ Picture = Picture["icon:/small/quit"]
}
}
}
Added: branches/speedy/FMain0.class
==============================================================================
--- (empty file)
+++ branches/speedy/FMain0.class Fri Jan 30 08:39:11 2009
@@ -0,0 +1,149 @@
+' Gambas class file
+
+' This file is part of vinstall-ng
+
+' vinstall-ng is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 2 of the License, or
+' (at your option) any later version.
+
+' vinstall-ng is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+' GNU General Public License for more details.
+
+' You should have received a copy of the GNU General Public License
+' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+
+PRIVATE $aPrev AS NEW Object[]
+PRIVATE $oCurrent AS Object
+
+PUBLIC SUB _new()
+
+END
+
+PUBLIC SUB Form_Open()
+
+' IF Application.Args[1] THEN
+' 'System.Language = Trim(Application.Args[1])
+' $oCurrent = NEW Step1(pnlStack)
+' ELSE
+$oCurrent = NEW Step1(pnlStack)
+'END IF
+btBack.Enabled = FALSE
+ME.auto_setup_for_resolution()
+ME.Resize(1024, 600)
+END
+
+PUBLIC SUB auto_setup_for_resolution()
+
+ SidePanel1.Visible = Desktop.Width >= 1024
+
+
+END
+
+
+
+PUBLIC SUB btQuit_Click()
+
+ 'FMain.Close
+ FMain0.Close
+
+END
+
+PUBLIC SUB btBack_Click()
+
+ $oCurrent = $aPrev.Pop()
+ btBack.Enabled = $aPrev.count > 0
+ btNext.Enabled = TRUE
+ $oCurrent.Raise()
+
+END
+
+PUBLIC SUB btNext_Click()
+
+ DIM o AS Object
+ DIM sTmp AS String
+ DIM bExist AS Boolean
+'Get the next One
+
+
+
+sTmp = $oCurrent.GetNext()
+
+'$oCurrent.Form_Open()
+'$oCurrent.Startup()
+'Is this form already opened ?
+'if true it may have no been closed to preserve entries
+
+$oCurrent.OnExit() ' execute some code when the window is hidden
+
+
+FOR EACH o IN pnlStack.Children
+
+ IF Object.Type(o) = sTmp THEN
+ bExist = TRUE
+ BREAK
+ ENDIF
+
+NEXT
+
+
+'strore the previous
+ $aPrev.Push($oCurrent)
+ btBack.Enabled = $aPrev.Count > 0
+
+
+IF NOT bExist THEN
+ $oCurrent = Object.New(sTmp, [pnlStack])
+ $oCurrent.Visible = TRUE
+
+ELSE
+ $OCurrent = o
+ENDIF
+
+
+ IF IsNull($oCurrent.GetNext()) THEN btNext.Enabled = FALSE
+'Push to the foreground
+ $oCurrent.Raise()
+ $oCurrent.width = pnlStack.Width
+ $oCurrent.Height = pnlStack.Height
+ $oCurrent.Startup() ' Call each form's startup sub
+
+
+END
+
+PUBLIC SUB Form_Resize()
+
+ $oCurrent.width = pnlStack.Width
+ $oCurrent.height = pnlStack.Height
+ ME.SidePanel1.Height = pnlStack.Height
+ 'hpanel1.Width = SidePanel1.Width
+ PRINT ME.ClientWidth & "X" & ME.ClientHeight
+END
+
+
+PUBLIC SUB pnlStack_Enter()
+
+ $oCurrent.resize(pnlStack.Width, pnlStack.Height)
+
+END
+
+PUBLIC SUB SidePanel1_Show()
+
+ $oCurrent.resize(pnlStack.Width, pnlStack.Height)
+
+END
+
+PUBLIC SUB SidePanel1_Resize()
+
+ $oCurrent.resize(pnlStack.Width, pnlStack.Height)
+
+END
+
+PUBLIC SUB Form_Close()
+
+ 'EXEC ["umount", "/mnt/source"] WAIT
+ SHELL "umount /mnt/source 2>/dev/null" WAIT
+
+END
Added: branches/speedy/FMain0.form
==============================================================================
--- (empty file)
+++ branches/speedy/FMain0.form Fri Jan 30 08:39:11 2009
@@ -0,0 +1,93 @@
+# Gambas Form File 2.0
+
+{ Form Form
+ MoveScaled(0,0,146.25,85.625)
+ Text = ("")
+ Arrangement = Arrange.Vertical
+ { HBox2 HBox
+ MoveScaled(12,1,63,7)
+ Background = Color.SelectedBackground
+ { Panel2 Panel
+ MoveScaled(1,3,4,2)
+ Expand = True
+ }
+ { PictureBox1 PictureBox
+ MoveScaled(1,1,46,5)
+ Picture = Picture["images/installer.png"]
+ Stretch = True
+ }
+ { Panel3 Panel
+ MoveScaled(49,2,7,3)
+ Expand = True
+ }
+ }
+ { HBox4 HBox
+ MoveScaled(3,8,72,1)
+ }
+ { Panel1 Panel
+ MoveScaled(1,10,80,40)
+ Expand = True
+ Arrangement = Arrange.Horizontal
+ { SidePanel1 SidePanel
+ MoveScaled(1,2,26,35)
+ Arrangement = Arrange.Vertical
+ Orientation = Align.Left
+ Resizable = False
+ { HBox5 HBox
+ MoveScaled(0,0,21,3)
+ { TextLabel1 TextLabel
+ MoveScaled(2,0,15,2)
+ Expand = True
+ Text = ("Process Overview")
+ }
+ }
+ { ListView1 ListView
+ MoveScaled(4,4,16,8)
+ Expand = True
+ }
+ }
+ { pnlStack Panel
+ MoveScaled(28,2,50,37)
+ Expand = True
+ Border = Border.Plain
+ }
+ }
+ { HBox1 HBox
+ MoveScaled(2,49,72,1)
+ }
+ { HBox3 HBox
+ MoveScaled(2,51,72,3)
+ { Panel4 Panel
+ MoveScaled(0,0,17,3)
+ Expand = True
+ }
+ { Panel6 Panel
+ MoveScaled(21,1,6,2)
+ Expand = True
+ }
+ { btBack Button
+ MoveScaled(29,0,11,2)
+ Expand = True
+ Text = ("Back")
+ Picture = Picture["icon:/small/previous"]
+ }
+ { Panel5 Panel
+ MoveScaled(41,1,1,1)
+ }
+ { btNext Button
+ MoveScaled(43,0,11,2)
+ Expand = True
+ Text = ("Next")
+ Picture = Picture["icon:/small/next"]
+ }
+ { Panel7 Panel
+ MoveScaled(55,1,1,1)
+ }
+ { btQuit Button
+ MoveScaled(56,0,10,2)
+ Expand = True
+ Text = ("Quit")
+ Picture = Picture["icon:/small/quit"]
+ }
+ }
+}
Modified: branches/speedy/Step0.class
==============================================================================
--- branches/speedy/Step0.class (original)
+++ branches/speedy/Step0.class Fri Jan 30 08:39:11 2009
@@ -22,8 +22,27 @@
ME.LIST_LANG_CHOICES()
ME.LIST_KEYBOARD_LAYOUTS()
ME.LIST_KEYBOARD_MODELS()
+ME.PRE_SELECT_US_SETTINGS()
END
+PUBLIC SUB onExit()
+
+ 'Message(ME.name & Space(1) & "parting")
+
+END
+
+
+
+PUBLIC SUB PRE_SELECT_US_SETTINGS()
+
+ ME.cvkbdlayout["us"].Selected = TRUE
+ ME.cvKbdMod["pc104"].Selected = TRUE
+ ME.cvLangList["en_US"].Selected = TRUE
+
+END
+
+
+
PUBLIC SUB LIST_KEYBOARD_LAYOUTS()
DIM sListFile AS String[]
@@ -53,7 +72,7 @@
sSymbol = Left(Trim(sListFile[i + iadd]),
InStr(Trim(sListFile[i + iadd]), " "))
'Message(sSymbol)
sDesc = Right(Trim(sListFile[i + iadd]), Len(Trim(sListFile[i
+ iadd])) - Len(sSymbol) + 1)
- TRY cvkbdlayout.Add(sSymbol, sDesc)
+ TRY cvkbdlayout.Add(Trim(sSymbol), sDesc)
'TRY FMain.ListView1.Add(sSymbol, sDesc)
' FMain.ListView1.Add(Left(sListFile[i + iAdd],
InStr(sListFile[i + iadd], " ")), sListFile[i + iadd])
INC iadd
@@ -84,7 +103,7 @@
skey = Left(sLine, InStr(sLine, " "))
sdesc = Right(sLine, Len(sLine) - Len(skey) + 1)
'TRY FMain.lvkbdmod.Add(skey, sdesc)
- TRY cvkbdmod.Add(skey, sDesc)
+ TRY cvkbdmod.Add(Trim(skey), sDesc)
INC iadd
UNTIL sFileIn[i + iadd] LIKE "" OR sFileIn[i + iadd] LIKE "!
layout"
END IF
@@ -122,8 +141,12 @@
PUBLIC FUNCTION GetNext() AS String
'Step1.Resize(FMain.pnlStack.Width, FMain.pnlStack.Height)
-
- RETURN "Step1"
+ IF System.Language = "en_US" THEN
+ RETURN "Step1"
+ ELSE
+ FMain.Close
+ FMain0.Show
+ END IF
'Application.Theme
'QUIT
@@ -140,6 +163,19 @@
PUBLIC SUB cvLangList_Click()
'Message(LAST.current.key)
- IF System.Language <> LAST.current.key THEN System.language =
LAST.current.Key
+ IF System.Language <> Trim(LAST.current.key) THEN System.language =
Trim(LAST.current.Key)
+
+END
+
+PUBLIC SUB cvKbdMod_Select()
+
+ 'Message(LAST.key)
+ EXEC ["setxkbmap", "-model", Trim(LAST.current.key)] WAIT
+
+END
+
+PUBLIC SUB cvkbdlayout_Select()
+
+ EXEC ["setxkbmap", Trim(LAST.current.key)] WAIT
END
Modified: branches/speedy/Step0.form
==============================================================================
--- branches/speedy/Step0.form (original)
+++ branches/speedy/Step0.form Fri Jan 30 08:39:11 2009
@@ -59,28 +59,31 @@
Alignment = Align.Normal
}
}
- { cvkbdlayout ColumnView
- MoveScaled(1,5,42,12)
- Expand = True
+ { cvkbdlayout ListView
+ MoveScaled(2,5,44,12)
+ }
+ { HBox4 HBox
+ MoveScaled(2,17,46,1)
}
{ HBox3 HBox
- MoveScaled(2,18,28,4)
+ MoveScaled(2,21,28,3)
{ tlkbdmod TextLabel
MoveScaled(0,0,24,3)
Expand = True
Text = ("Select your keyboard model")
}
}
- { cvKbdMod ColumnView
- MoveScaled(1,22,41,12)
+ { cvKbdMod ListView
+ MoveScaled(3,23,10,9)
Expand = True
}
{ HPanel2 HPanel
- MoveScaled(1,33,45,8)
+ MoveScaled(1,34,45,8)
{ TextLabel1 TextLabel
MoveScaled(25,0,9,2)
Expand = True
Text = ("")
+ Transparent = True
}
{ tlTestKbd TextLabel
MoveScaled(1,1,38,3)
Modified: branches/speedy/Step1.class
==============================================================================
--- branches/speedy/Step1.class (original)
+++ branches/speedy/Step1.class Fri Jan 30 08:39:11 2009
@@ -13,6 +13,7 @@
' You should have received a copy of the GNU General Public License
' along with vinstall-ng. If not, see <http://www.gnu.org/licenses/>.
+PRIVATE iCheckWarn AS Integer
PUBLIC SUB _new() ' executed every time the form is instanciated.
ME.StartUp()
@@ -21,6 +22,55 @@
END
+PUBLIC SUB OnExit()
+
+
+ ' this code is ran when the window is hidden before the next step
+ DIM sname, sadd, sPart AS String
+
+ 'Message("Step1 exit")
+
+ sname = Trim(Left(ComboBox1.Text, InStr(ComboBox1.Text, ("on")) - 1))
+ IF Right(sname, Len(".iso")) LIKE ".iso" THEN
+ sadd = Trim(Right(ComboBox1.Text, Len(ComboBox1.Text) -
InStr(ComboBox1.Text, "/") + 1))
+ ELSE
+ sadd = Trim(Right(ComboBox1.Text, Len(ComboBox1.Text) -
RInStr(ComboBox1.Text, " ") + 1))
+ END IF
+
+ 'make sure /mnt/source is not mounted
+ SHELL "umount /mnt/source 2>/dev/null" WAIT
+
+
+ ' Store this information to make it available to the whole installer
program
+ ClsGlobal.sSourceName = Trim(sname)
+ ClsGlobal.sSourceAddr = Trim(sadd)
+ TRY MKDIR "/mnt/source"
+ ' mount the media and get ready for testing
+ IF Right(sname, Len(".iso")) LIKE ".iso" THEN ' this is an iso image...
doing hosted install i'm afraid
+ spart = Trim(Right(sadd, Len(sadd) - RInStr(sadd, "/")))
+
+ EXEC ["mkdir", "-p", "/mnt" &/ Trim(sPart)] WAIT
+ SHELL "mount /dev" &/ Trim(spart) & " /mnt" &/ Trim(spart) & "
2>/dev/null" WAIT
+ ' now mount the iso
+ 'EXEC ["mount -o loop", "/mnt" &/ Trim(spart) &/
Trim(sname), "/mnt/source"] WAIT
+ SHELL "mount -o loop /mnt" &/ Trim(spart) &/ Trim(sname) & "
/mnt/source" WAIT
+
+ ELSE
+ PRINT "Mounting cd media"
+ SHELL "mount /dev" &/ Trim(sadd) & " /mnt/source 2>/dev/null" WAIT
+
+
+ END IF
+
+ IF ME.GetNext() = "Step2" THEN ClsGlobal.sToScan =
Trim(ME.ComboBox1.Text)
+ 'Message("Image to scan = " & ClsGlobal.sToScan)
+
+
+
+
+
+END
+
PUBLIC SUB Form_Open()
@@ -37,17 +87,27 @@
IF bcheckmedia.Value = TRUE THEN
RETURN "Step2"
+ 'IF Step2.sLastChecked <> Trim(ME.ComboBox1.Text) THEN
+ IF ClsGlobal.sLastScanned <> Trim(ME.ComboBox1.Text) THEN
+ Step2.bcheck = TRUE
+
+ ELSE
+ Step2.bcheck = FALSE
+ END IF
ELSE
RETURN "Step3"
END IF
+
+
END
PUBLIC SUB StartUp() ' Executed every time the Next button is pressed
-'FMain.btNext.Enabled = ME.ComboBox1.Count > 0
-
+ ' IF Step2.sLastChecked <> ClsGlobal.sSourceName THEN
+ ' Step2.Close ' try this
+ ' END IF
END
@@ -108,17 +168,17 @@
Step1.tlStatus.Text = ("Scanning for CD Media ... Please wait")
- SHELL "/sbin/probedisk | grep \"cdrom\" | cut -f 1 -d \'|\'" TO sOutput
-
+ SHELL "/sbin/probedisk | grep \"cdrom\" | cut -f 1 -d \"|\"" TO sOutput
+ 'Message(sOutput)
sOutput = Trim(sOutput)
IF Len(sOutput) < 1 THEN RETURN
-
+ 'Message("scanning cds")
sDriveList = Split(sOutput, "\n")
FOR i = 0 TO sDriveList.Count - 1
sShortDrive = Right(Trim(sDriveList[i]), Len(Trim(sDriveList[i])) -
RInStr(Trim(sDriveList[i]), "/"))
EXEC ["mkdir", "-p", "/mnt" &/ sShortDrive] WAIT
'EXEC ["mount", "-o", "ro", Trim(sDriveList[i]), "/mnt" &/
sShortDrive] WAIT
- SHELL "mount -o ro " & Trim(sDriveList[i]) & "/mnt" &/ sShortDrive
& " 2>/dev/null" 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
@@ -126,10 +186,10 @@
sName = Trim(Replace(sName, "\'", ""))
sVersion = Trim(Replace(sVersion, "\'", ""))
File.Save(Temp(sShortDrive), File.Load("/mnt" &/
sShortDrive &/ "veclinux" &/ "SETUP.CONF"))
- IF ME.ComboBox1.Find(sName & Space(1) & sVersion &
Space(1) & ("on") & Space(1) & Trim(sDriveList[i])) = -1 THEN
- ME.ComboBox1.Add(sName & Space(1) & sVersion &
Space(1) & ("on") & Space(1) & Trim(sDriveList[i]))
+ 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
- PRINT " \\__" & Space(1) & ("Found") & Space(1) & sName
& "-" & sVersion & Space(1) & ("in") & Space(1) & sDriveList[i]
+ PRINT " \\__" & Space(1) & ("Found") & Space(1) & sName
& "-" & sVersion & Space(1) & ("in") & Space(1) &
Trim(sShortDrive) 'sDriveList[i]
END IF
'EXEC ["umount", "/mnt" &/ sShortDrive, " 2>/dev/null"] WAIT
SHELL "umount /mnt" &/ Trim(sShortDrive) & " 2>/dev/null" WAIT
@@ -195,19 +255,32 @@
PUBLIC SUB ComboBox1_Click()
- DIM sAddr AS String = Right(Trim(ComboBox1.Text),
Len(Trim(ComboBox1.Text)) - RInStr(Trim(ComboBox1.Text), "/"))
- DIM sDigits AS String = sAddr LIKE "*[0-9]*"
-
- 'IF sDigits THEN
- IF InStr(Trim(ComboBox1.Text), ".iso") OR
InStr(Trim(ME.ComboBox1.Text), ".ISO") THEN
- ME.DESCRIBE_ISO_INSTALL_MEDIA(Replace(Trim(ME.ComboBox1.Text),
Space(1) & ("on") & Space(1), "-"))
- ELSE IF sDigits THEN
- ' Partition found with Vector Installation media
+
+ DIM sDigits AS String ' = sAddr LIKE "*[0-9]*"
+ DIM sDist, sLoc AS String
+ sDist = Trim(Left(LAST.text, InStr(LAST.text, " ") - 1))
+ sLoc = Trim(Right(LAST.text, Len(LAST.text) - RInStr(LAST.text, " ") +
1))
+ sDigits = sLoc LIKE "*[0-9]*"
+
+ IF Right(sDist, Len(".iso")) LIKE ".iso" THEN
+ ME.DESCRIBE_ISO_INSTALL_MEDIA(Replace(Trim(ME.ComboBox1.Text),
Space(1) & ("on") & Space(1), "-"))
+ ELSE IF sDigits THEN
ME.DESCRIBE_PARTITION_INSTALL_MEDIA(Trim(ME.ComboBox1.Text))
- ELSE
- ME.DESCRIBE_CD_INSTALL_MEDIA(sAddr)
+ ELSE
+ ME.DESCRIBE_CD_INSTALL_MEDIA(sLoc)
+ END IF
+
+ ' debugging
+ 'Message(Step2.sLastChecked)
+ 'Message(ClsGlobal.sLastScanned)
+ IF Trim(LAST.text) <> ClsGlobal.sLastScanned THEN
+ Step2.bcheck = TRUE
+ ELSE
+ Step2.bcheck = FALSE
END IF
+ 'ClsGlobal.sToScan = Trim(ME.ComboBox1.Text)
+
END
@@ -304,13 +377,16 @@
END
-PUBLIC SUB Form_Resize()
-END
+PUBLIC SUB bCheckMedia_Click()
-PUBLIC SUB Panel1_MouseDown()
-
-
+ IF iCheckWarn < 1 THEN
+ IF LAST.value = TRUE THEN
+ Message.Warning(("This feature can help you avoid an unsuccesful
installation.") & "<br>" &
+ "<b><br>" & ("WARNING:") & "</b><br>" & Space(1) & ("This process
can take a long time to complete."))
+ INC iCheckWarn
+ END IF
+ END IF
END
Modified: branches/speedy/Step1.form
==============================================================================
--- branches/speedy/Step1.form (original)
+++ branches/speedy/Step1.form Fri Jan 30 08:39:11 2009
@@ -42,6 +42,7 @@
{ btRescan Button
MoveScaled(30,0,19,3)
Text = ("Search Again")
+ Picture = Picture["icon:/small/refresh"]
}
}
{ HBox2 HBox
Modified: branches/speedy/Step2.class
==============================================================================
--- branches/speedy/Step2.class (original)
+++ branches/speedy/Step2.class Fri Jan 30 08:39:11 2009
@@ -14,6 +14,11 @@
' 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 sLastChecked AS String
+PUBLIC bcheck AS Boolean
+
+PRIVATE hproc AS Process
+PRIVATE iProcSig AS Integer ' 225 will send an kill signal to abor tthe
process
PUBLIC SUB Form_Open()
ME.Width = FMain.pnlstack.Width
@@ -22,11 +27,148 @@
ME.tlbanner.Text = "<h2>" & ("Verify Installation Files") & "</h2>"
ME.StartUp()
'FMain.btNext.Enabled = FALSE
+
+ 'ME.mbThrobbler.Playing = TRUE
+ 'ME.BEGIN_MEDIA_TESTING()
+END
+
+
+PUBLIC SUB BEGIN_MEDIA_TESTING()
+
+ ' media is aready mounted in /mnt/source
+ DIM iretval, iTotalBulks, iReq, iOpt, i AS Integer
+ DIM iInc, iMini AS Float
+ DIM sFile, sList AS String
+ DIM sOptional AS String = "/mnt/source/veclinux/optional"
+ DIM sRequired AS String = "/mnt/source/veclinux/required"
+
+ IF ClsGlobal.sToScan = ClsGlobal.sLastScanned THEN
+ SELECT CASE Message.Question(("This installation media has already
been checked. Would you like to check it again?"), "Yes", "No")
+ CASE 1
+ ' keep going
+ CASE 2
+ RETURN
+ STOP EVENT ' this should be unneccesary
+ END SELECT
+ END IF
+
+ ClsGlobal.sLastScanned = ClsGlobal.sToScan
+ 'Message("Setting last scanned value to " & ClsGlobal.sLastScanned)
+
+ ME.ProgressBar1.Value = 0
+ ME.mbThrobbler.Playing = TRUE
+
+ 'Message(sLastChecked)
+ IF FMain.btNext THEN FMain.btNext.Enabled = FALSE
+ IF FMain.btBack THEN FMain.btBack.Enabled = FALSE
+ IF FMain0.btNext THEN FMain0.btNext.Enabled = FALSE
+ IF FMain0.btBack THEN FMain0.btBack.Enabled = FALSE
+
+
+ ' get a count of the total packages
+ SHELL "ls /mnt/source/veclinux/required | wc -w" TO iReq
+ SHELL "ls /mnt/source/veclinux/optional | wc -w" TO iOpt
+ iTotalBulks = iReq + iOpt
+ iInc = 1 / iTotalBulks '= progressbar increments(snaps FOR EACH bulk)
+ 'Message(iTotalBulks)
+
+ ' begin by doing the required bulks
+ FOR EACH sfile IN Dir(sRequired, "*.tlz")
+
+ PRINT ("Verifying data on compressed package") & Space(1) &
Trim(sfile) & " .... "
+ hproc = SHELL "lzmadec < " & sRequired &/ Trim(sfile) & " >
/dev/null" ' wait
+ INC i
+ ME.tlTestingLbl.Text = ("Testing file") & Space(1) & i & Space(1)
& ("of") & Space(1) & iTotalBulks & " ... " & sfile
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT
+ ' do something while waiting here
+ ME.mbThrobbler.Playing = TRUE
+ WAIT 2
+ ME.ProgressBar1.Value = ME.ProgressBar1.Value + 0.005
+ UNTIL
+ iProcSig = 225 OR hproc.State = Process.Stopped
+ IF ProgressBar1.Value < iInc * i THEN
ME.ProgressBar1.Value = i / iTotalBulks
+ END IF
+ iretval = hproc.Value
+ IF hproc.Value > 0 THEN
+ ' Error in bulk
+ PRINT " \\__" & Space(1) & ("FAILED")
+ Message.Error(("The following") & Space(1) & "<b>" &
("required") & Space(1)&
+ "</b>" & ("has failed the integrity test. It is not safe to
continue"))
+ tlTestingLbl.Text = ("Integrity test") & "<b>" &
Space(1)("FAILED") & "</b>" & Space(1)("on") & Space(1) & sfile
+ BREAK
+ RETURN
+ ELSE
+
+ END IF
+ PRINT " \\__" & Space(1) & ("PASSED")
+ NEXT
+
+ ' now check optional packages
+
+ FOR EACH sfile IN Dir(sOptional, "*.tlz")
+
+ PRINT ("Verifying data on compressed package") & Space(1) &
Trim(sfile) & " .... "
+ hproc = SHELL "lzmadec < " & sOptional &/ Trim(sfile) & " >
/dev/null" ' wait
+ INC i
+ ME.tlTestingLbl.Text = ("Testing file") & Space(1) & i & Space(1)
& ("of") & Space(1) & iTotalBulks & " ... " & sfile
+ WAIT 1
+ IF hproc.State = Process.Running THEN
+ REPEAT
+ WAIT
+ ' do something while waiting here
+ ME.mbThrobbler.Playing = TRUE
+ WAIT 2
+ ME.ProgressBar1.Value = ME.ProgressBar1.Value + 0.005
+ UNTIL
+ iProcSig = 225 OR hproc.State = Process.Stopped
+ IF ProgressBar1.Value < iInc * i THEN
ME.ProgressBar1.Value = i / iTotalBulks
+ END IF
+ iretval = hproc.Value
+ IF hproc.Value > 0 THEN
+ ' Error in bulk
+ PRINT " \\__" & Space(1) & ("FAILED")
+ Message.Warning(sFile & Space(1) & ("has failed the data
integrity test. All required packages have passed this test") & "\n" &
+ ("Possible causes for this are a corrupted download or a
badly burnt cd. You can try the following options") & "\n" &
+ ("Download a new installation image from
www.vectorlinux.com") & "\n" &
+ ("Burn the image at a lower speed rate"))
+
+ 'Message.Error(("The following") & Space(1) & "<b>" &
("required") & Space(1)&
+ ' "</b>" & ("has failed the integrity test. It is not safe
to continue"))
+ ME.tlTestingLbl.Text = ("Integrity test") & "<b>" &
Space(1)("FAILED") & "</b>" & Space(1)("on") & Space(1) & sfile
+ btStop.Enabled = FALSE
+
+ BREAK
+ RETURN
+ ELSE
+
+ END IF
+ PRINT " \\__" & Space(1) & ("PASSED")
+ NEXT
+
+
+
+
+ ' if there was an error, this would have failed by now and the
following code would have not been executed
+
+ tlTestingLbl.Text = ("Data integrity test complete... all tests
passed")
+ mbThrobbler.Playing = FALSE
+ btStop.Enabled = FALSE
+ IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
+ IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
+ IF FMain.btBack THEN FMain.btBack.Enabled = TRUE
+ IF FMain0.btBack THEN FMain0.btBack.Enabled = TRUE
+ Message.Info(("All test passed. It is safe to continue with the
installation process."))
+
END
+
+
PUBLIC FUNCTION GetNext() AS String
- RETURN "Step1"
+ RETURN "Step3"
END
PUBLIC SUB set_label_text()
@@ -34,7 +176,8 @@
DIM sMsg AS String
sMsg = ("Verifying installation files can prevent you from performing an
unsuccessful install") & "<br>" &
- ("Keep in mind however, that this process can take a while to complete.")
+ ("Keep in mind however, that this process can take a while to
complete.") & "<br>" &
+ "<br>" & ("Click") & Space(1) & "\"" & ME.btStop.Text & "\"" & Space(1)
& ("to abort this process at any time")
ME.TextLabel1.Text = sMsg
ME.TextLabel1.Adjust
@@ -44,6 +187,30 @@
PUBLIC SUB StartUp()
- FMain.btNext.Enabled = FALSE
+
+ ME.mbThrobbler.Path = "images/throbber.gif"
+ 'Message("Last scanned image = " & ClsGlobal.sLastScanned)
+ IF ClsGlobal.sToScan <> ClsGlobal.sLastScanned THEN
+ ME.ProgressBar1.Value = 0
+ ME.BEGIN_MEDIA_TESTING()
+ END IF
+
+
+END
+
+
+
+PUBLIC SUB OnExit()
+
+
+END
+
+
+PUBLIC SUB btStop_Click()
+
+ mbThrobbler.Playing = FALSE
+ IF FMain.btNext THEN FMain.btNext.Enabled = TRUE
+ IF FMain0.btNext THEN FMain0.btNext.Enabled = TRUE
+
END
Modified: branches/speedy/Step2.form
==============================================================================
--- branches/speedy/Step2.form (original)
+++ branches/speedy/Step2.form Fri Jan 30 08:39:11 2009
@@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
- MoveScaled(0,0,78,40)
+ MoveScaled(0,0,78,51)
Text = ("")
Arrangement = Arrange.Vertical
{ HPanel1 HPanel
@@ -17,13 +17,73 @@
}
}
{ Panel1 Panel
- MoveScaled(1,7,76,32)
+ MoveScaled(1,7,76,43)
Expand = True
Arrangement = Arrange.Row
- { TextLabel1 TextLabel
- MoveScaled(1,1,72,7)
+ { HPanel2 HPanel
+ MoveScaled(1,0,67,14)
Expand = True
- Text = ("")
+ { TextLabel1 TextLabel
+ MoveScaled(5,2,65,9)
+ Expand = True
+ Text = ("")
+ }
+ }
+ { HBox2 HBox
+ MoveScaled(16,14,35,14)
+ Expand = True
+ { Panel2 Panel
+ MoveScaled(1,3,7,8)
+ Expand = True
+ }
+ { Panel4 Panel
+ MoveScaled(8,1,24,24)
+ Expand = True
+ { mbThrobbler MovieBox
+ MoveScaled(4,2,14,9)
+ }
+ }
+ { Panel3 Panel
+ MoveScaled(26,0,24,24)
+ Expand = True
+ }
+ }
+ { HBox4 HBox
+ MoveScaled(33,29,18,1)
+ Expand = True
+ }
+ { HBox3 HBox
+ MoveScaled(16,30,36,2)
+ Expand = True
+ { ProgressBar1 ProgressBar
+ MoveScaled(0,0,30,2)
+ Expand = True
+ }
+ }
+ { HBox6 HBox
+ MoveScaled(34,32,14,1)
+ Expand = True
+ }
+ { HBox5 HBox
+ MoveScaled(2,34,43,3)
+ Expand = True
+ { tlTestingLbl TextLabel
+ MoveScaled(1,0,40,2)
+ Expand = True
+ Text = ("TextLabel2")
+ }
+ }
+ { HBox7 HBox
+ MoveScaled(33,38,12,1)
+ Expand = True
+ }
+ { HBox1 HBox
+ MoveScaled(2,39,57,3)
+ { btStop Button
+ MoveScaled(0,0,16,3)
+ Text = ("Stop")
+ Picture = Picture["icon:/small/stop"]
+ }
}
}
}
|
