Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r546 - - Fixed bug that kept the install window from refreshing.
|
From: <cod...@go...> - 2009-05-11 21:27:39
|
Author: M0...@gm...
Date: Mon May 11 14:26:23 2009
New Revision: 546
Modified:
branches/speedy/.lang/.pot
branches/speedy/.lang/MdlMain.pot
branches/speedy/Conf0.class
branches/speedy/FMain.form
branches/speedy/FMain0.form
branches/speedy/MdlMain.module
branches/speedy/Step9.class
Log:
- Fixed bug that kept the install window from refreshing.
- Changed icon on the help button to a 16x16 to match the other buttons.
- Added status indicator while formatting partitions.
Modified: branches/speedy/.lang/.pot
==============================================================================
--- branches/speedy/.lang/.pot (original)
+++ branches/speedy/.lang/.pot Mon May 11 14:26:23 2009
@@ -244,8 +244,8 @@
msgid "When finished, Click"
msgstr ""
-#: Conf3.class:47 Step3a1a.class:177 Step3a2.class:359 Step3a3a.class:72
-#: Step5.class:177
+#: Conf3.class:47 MdlMain.module:405 Step3a1a.class:177 Step3a2.class:359
+#: Step3a3a.class:72 Step5.class:177
msgid "to continue"
msgstr ""
@@ -650,6 +650,30 @@
msgid "Failed to create user account. See error below."
msgstr ""
+#: MdlMain.module:254
+msgid "Formatting"
+msgstr ""
+
+#: MdlMain.module:254
+msgid "with"
+msgstr ""
+
+#: MdlMain.module:318
+msgid "Preparing system partitions"
+msgstr ""
+
+#: MdlMain.module:405
+msgid "Installation is complete. Click"
+msgstr ""
+
+#: MdlMain.module:407
+msgid "Installation complete... Click"
+msgstr ""
+
+#: MdlMain.module:407
+msgid "to continue."
+msgstr ""
+
#: MdlStartUp.module:42
msgid "Preparation"
msgstr ""
@@ -1532,6 +1556,6 @@
msgid "is being installed to your computer. Please wait."
msgstr ""
-#: Step9.class:80
+#: Step9.class:81
msgid "Installation in progress"
msgstr ""
Modified: branches/speedy/.lang/MdlMain.pot
==============================================================================
--- branches/speedy/.lang/MdlMain.pot (original)
+++ branches/speedy/.lang/MdlMain.pot Mon May 11 14:26:23 2009
@@ -26,3 +26,31 @@
msgid "Failed to create user account. See error below."
msgstr ""
+#: MdlMain.module:254
+msgid "Formatting"
+msgstr ""
+
+#: MdlMain.module:254
+msgid "with"
+msgstr ""
+
+#: MdlMain.module:318
+msgid "Preparing system partitions"
+msgstr ""
+
+#: MdlMain.module:405
+msgid "Installation is complete. Click"
+msgstr ""
+
+#: MdlMain.module:405
+msgid "to continue"
+msgstr ""
+
+#: MdlMain.module:407
+msgid "Installation complete... Click"
+msgstr ""
+
+#: MdlMain.module:407
+msgid "to continue."
+msgstr ""
+
Modified: branches/speedy/Conf0.class
==============================================================================
--- branches/speedy/Conf0.class (original)
+++ branches/speedy/Conf0.class Mon May 11 14:26:23 2009
@@ -452,7 +452,7 @@
END IF
NEXT
- DEC TsOsList.Count ' remove trailing empty tab
+TRY DEC TsOsList.Count ' remove trailing empty tab
END
PUBLIC SUB Populate_linux_tab($OsRoot AS String, $Title AS String, $kernel
AS String, $initrd AS String, $appendline AS String, sBootLoader AS String)
@@ -499,7 +499,7 @@
.Height = 28
.Text = ("Initial RAM Disk")
.Alignment = Align.Left
- .Width = 100
+ .Width = 150
.Expand = FALSE
END WITH
$cb = NEW ComboBox($cont) '-------------------------- initrd combobox
--------------
Modified: branches/speedy/FMain.form
==============================================================================
--- branches/speedy/FMain.form (original)
+++ branches/speedy/FMain.form Mon May 11 14:26:23 2009
@@ -61,7 +61,7 @@
{ HBox3 HBox
MoveScaled(2,52,72,3)
{ Panel4 Panel
- MoveScaled(0,0,19,3)
+ MoveScaled(0,0,22,3)
Expand = True
Arrangement = Arrange.Horizontal
{ HBox8 HBox
@@ -69,13 +69,13 @@
Expand = True
}
{ btHelp Button
- MoveScaled(6,0,12,3)
+ MoveScaled(5,0,12,3)
Text = ("Help")
- Picture = Picture["icon:/small/help"]
+ Picture = Picture["icon:/16/help"]
}
}
{ Panel6 Panel
- MoveScaled(21,1,6,2)
+ MoveScaled(23,0,6,2)
Expand = True
}
{ btBack Button
Modified: branches/speedy/FMain0.form
==============================================================================
--- branches/speedy/FMain0.form (original)
+++ branches/speedy/FMain0.form Mon May 11 14:26:23 2009
@@ -71,7 +71,7 @@
{ btHelp Button
MoveScaled(6,0,12,3)
Text = ("Help")
- Picture = Picture["icon:/small/help"]
+ Picture = Picture["icon:/16/help"]
}
}
{ Panel6 Panel
Modified: branches/speedy/MdlMain.module
==============================================================================
--- branches/speedy/MdlMain.module (original)
+++ branches/speedy/MdlMain.module Mon May 11 14:26:23 2009
@@ -251,6 +251,7 @@
sCommand = "mkswap -L swap-space " & sPart
END SELECT
DEBUG "Formatting " & sPart & " with " & sFmt
+ Step9.tlCurrPkg.Text = ("Formatting") & Space(1) & sPart &
Space(1) & ("with") & Space(1) & sFmt
$hproc = SHELL scommand WAIT
IF $hproc.Value > 1 THEN
DEBUG sPart & " failed to format to " & sFmt
@@ -313,12 +314,14 @@
File.Save(Temp("pkgpaths"), Trim(sDump))
ClsGlobal.fRunningMainForm.btNext.enabled = FALSE
+ ' perform partitioning as requested.
+ tlStatus.Text = ("Preparing system partitions")
+ IF ME.PERFORM_PARTITIONING() > 0 THEN RETURN
+
SELECT CASE iInstallType
CASE 0
GOTO FULL_INSTALL
CASE 1
- ' perform partitioning as requested.
- IF ME.PERFORM_PARTITIONING() > 0 THEN RETURN
GOTO CUSTOM_INSTALL
CASE 2
GOTO MINIMAL_INSTALL
@@ -355,11 +358,15 @@
FOR ii = 0 TO $filearr.Max ' read each line in the file.
INC iii
' install this package
- pbProg.Value = iii / $pkgcnt
+
$path = ME.GET_PACKAGE_FULL_PATH($filearr[ii])
IF $path THEN
+ 'PRINT $path
IF Exist("/mnt/source/packages" &/
Trim($path)) THEN
+ PRINT $path
tlStatus.Text = $path
+ pbProg.Value = iii / $pkgcnt ' supposed to
update the progressbar
+ WAIT 0.5
ires =
ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/ Trim($path))
IF ires > 0 THEN
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
@@ -368,7 +375,8 @@
END IF
END IF
END IF
- 'WAIT 1
+ 'WAIT 0.5
+ 'pbProg.Refresh
NEXT
END IF
NEXT
@@ -380,8 +388,9 @@
$path = ME.GET_PACKAGE_FULL_PATH(Trim($filearr[i]))
INC iii
pbProg.Value = iii / $pkgcnt
- IF Trim($path) THEN
+ IF $path THEN
IF Exist("/mnt/source/packages" &/ Trim($path)) THEN
+ WAIT 0.5
ires = ME.INSTALL_THIS_PACKAGE("/mnt/source/packages" &/
Trim($path))
IF ires > 0 THEN
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
@@ -389,12 +398,13 @@
END IF
END IF
END IF
-
- tlStatus.Text = "Optional package " & $path
+ IF $path THEN tlStatus.Text = "Optional package "
& $path
'WAIT 1
NEXT
+ Message.Info(("Installation is complete. Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue"))
ClsGlobal.fRunningMainForm.btNext.enabled = TRUE
+ tlStatus.Text = ("Installation complete... Click") & Space(1) &
ClsGlobal.fRunningMainForm.btNext.text & Space(1) & ("to continue.")
RETURN
FULL_INSTALL:
@@ -409,9 +419,10 @@
PUBLIC FUNCTION INSTALL_THIS_PACKAGE(sFullPkgPath AS String) AS Integer
DIM $hproc AS Process
+ DIM sBuff AS String
'$hproc = EXEC ["/sbin/installpkg ", "-R", ClsGlobal.sTargetPath,
sFullPkgPath] WAIT
- $hproc = SHELL "/sbin/installpkg -R " & ClsGlobal.sTargetPath &
Space(1) & sFullPkgPath WAIT
+ $hproc = SHELL "/sbin/installpkg -R " & ClsGlobal.sTargetPath &
Space(1) & sFullPkgPath WAIT 'TO sBuff
IF $hproc.Value > 0 THEN
DEBUG sFullPkgPath & Space(1) & "failed to install"
RETURN 1
Modified: branches/speedy/Step9.class
==============================================================================
--- branches/speedy/Step9.class (original)
+++ branches/speedy/Step9.class Mon May 11 14:26:23 2009
@@ -23,7 +23,8 @@
WAIT 1
ME.Refresh
- MdlMain.INSTALL_PACKAGES(ME.tlCurrPkg, ME.pbInstall,
ClsGlobal.iInstallMethod)
+ WAIT 0.1
+ MdlMain.INSTALL_PACKAGES(tlcurrpkg, pbinstall, ClsGlobal.iInstallMethod)
END
PUBLIC FUNCTION GetNExt() AS String
|
