Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r367 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-12-04 20:05:08
|
Author: M0...@gm...
Date: Thu Dec 4 12:04:03 2008
New Revision: 367
Modified:
branches/iVL/.lang/FMain.pot
branches/iVL/.project
branches/iVL/FMain.class
branches/iVL/FrmDone.class
branches/iVL/FrmDone.form
branches/iVL/MdlConfLilo.module
branches/iVL/installer.gambas
Log:
New attempt to fix background monitor
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Thu Dec 4 12:04:03 2008
@@ -94,27 +94,31 @@
msgid "Skipping lilo setup"
msgstr ""
-#: FMain.class:498
+#: FMain.class:483
+msgid "Please enter the root password. For your security purposes, do not
leave this blank"
+msgstr ""
+
+#: FMain.class:501
msgid "Setup has detected existing directories in the partition you
selected for /home."
msgstr ""
-#: FMain.class:498
+#: FMain.class:501
msgid "Would you like to import these user accounts into your new
Operating System"
msgstr ""
-#: FMain.class:823
+#: FMain.class:826
msgid "Back"
msgstr ""
-#: FMain.class:834
+#: FMain.class:837
msgid "Exit Installation"
msgstr ""
-#: FMain.class:845
+#: FMain.class:848
msgid "Next"
msgstr ""
-#: FMain.class:859
+#: FMain.class:862
msgid "Button1"
msgstr ""
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Thu Dec 4 12:04:03 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.41
+Version=0.1.43
Library=gb.gtk
Library=gb.form
Library=gb.debug
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Dec 4 12:04:03 2008
@@ -479,7 +479,10 @@
CASE "FrmRootPass"
- IF FrmRootPass.tbPasswd1.Text = "" THEN RETURN
+ IF FrmRootPass.tbPasswd1.Text = "" THEN
+ Message.Error(("Please enter the root password. For your
security purposes, do not leave this blank"))
+ RETURN
+ END IF
IF FrmRootPass.tbPasswd1.Text <> FrmRootPass.tbPasswd2.Text THEN
Balloon.Error(("Passwords do not match. Please enter the same
password twice"), FrmRootPass.tbPasswd2)
Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class (original)
+++ branches/iVL/FrmDone.class Thu Dec 4 12:04:03 2008
@@ -30,38 +30,57 @@
FMain.btback.Enabled = FALSE
FMain.btback.ForeColor = Color.Gray
- sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
+' sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system
configuration. Please wait a moment.")
FMain.btnext.Enabled = FALSE
FMain.btQuit.Enabled = FALSE
'REPEAT
- IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
- REPEAT
- WAIT
- 'IF ME.MONITOR_BACKGROUND() = 1 THEN
- ME.tlMsg.Text = sText
- UNTIL MdlConfLilo.hBgConfigProc.State = Process.Stopped
- END IF
+ ' ' IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
+ ' ' REPEAT
+ ' ' WAIT
+ ' ' 'IF ME.MONITOR_BACKGROUND() = 1 THEN
+ ' ' ME.tlMsg.Text = sText
+ ' ' UNTIL MdlConfLilo.hBgConfigProc.State = Process.Stopped
+ ' ' END IF
+ ' '
+ ' ' sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to
your system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
+ ' ' ("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
+ ' ' ("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+ ' ' ("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
+ ' ' ("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
+ ' '
+ ' ' ME.tlMsg.Text = sText
+ ' ' FMain.btnext.Enabled = TRUE
+ ' ' FMain.btQuit.Enabled = TRUE
+ 'MdlSetup.END_INSTALLER()
+
+
+END
+
+
+PUBLIC SUB tmBgMon_Timer()
+
+DIM sText AS String
+
+ IF MdlConfLilo.hBgConfigProc.State = Process.Running THEN
+ sText = ClsGlobal.DISTRO & Space(1) & ("is performing final
system configuration. Please wait a moment.")
+ FMain.btnext.Enabled = FALSE
+ FMain.btQuit.Enabled = FALSE
+ ELSE
sText = ClsGlobal.DISTRO & Space(1) & ("has been installed to your
system. Your new system has been configured with the default factory
settings.") & "<br><br>" &
("After reboot you can use vasm or vasmCC to fine tune your
installation.") & "<br><br>" &
("Your computer needs to be restarted so that you can use your new
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
("to restart your computer now or click") & Space(1) &
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
& "<br><br" &
("If you installed from CD-ROM/R/RW media, please remove de disk
before restarting.")
-
+ FMain.btnext.Enabled = TRUE
+ FMain.btQuit.Enabled = TRUE
+ ME.tlMsg.Text = sText
+ ME.tmBgMon.Enabled = FALSE
+
+ END IF
ME.tlMsg.Text = sText
- FMain.btnext.Enabled = TRUE
- FMain.btQuit.Enabled = TRUE
- 'MdlSetup.END_INSTALLER()
+ 'FMain.btnext.Enabled = TRUE
+ 'FMain.btQuit.Enabled = TRUE
-END
-
-PUBLIC FUNCTION MONITOR_BACKGROUND() AS Integer
-
- IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") THEN
- RETURN 0
- ELSE
- RETURN 1
- END IF
-
END
Modified: branches/iVL/FrmDone.form
==============================================================================
--- branches/iVL/FrmDone.form (original)
+++ branches/iVL/FrmDone.form Thu Dec 4 12:04:03 2008
@@ -22,4 +22,8 @@
Text = ("")
}
}
+ { tmBgMon #Timer
+ #X = 168
+ #Y = 217
+ }
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Dec 4 12:04:03 2008
@@ -349,6 +349,7 @@
EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"
&/ "config-vinstall-ng"] WAIT
SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
hBgConfigProc = SHELL "chroot /mnt/target
/var/log/setup/config-vinstall-ng"
+FrmDone.tmBgMon.Enabled = TRUE
SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
