[Vectorlinux-devel] [vinstall-ng commit] r366 - in branches/iVL: . .lang

[<cod...@go...>]

Author: M0...@gm...
Date: Thu Dec  4 11:36:42 2008
New Revision: 366

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmDone.class
    branches/iVL/FrmRootPass.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/MdlSetup.module
    branches/iVL/installer.gambas

Log:
Stopped scrolling credits after installation is finished changed background  
process monitoring

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Dec  4 11:36:42 2008
@@ -94,27 +94,27 @@
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:495
+#: FMain.class:498
  msgid "Setup has detected existing directories in the partition you  
selected for /home."
  msgstr ""

-#: FMain.class:495
+#: FMain.class:498
  msgid "Would you like to import these user accounts into your new  
Operating System"
  msgstr ""

-#: FMain.class:820
+#: FMain.class:823
  msgid "Back"
  msgstr ""

-#: FMain.class:831
+#: FMain.class:834
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:842
+#: FMain.class:845
  msgid "Next"
  msgstr ""

-#: FMain.class:856
+#: FMain.class:859
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Thu Dec  4 11:36:42 2008
@@ -38,35 +38,3 @@
  msgid "Preparing filesystems"
  msgstr ""

-#: MdlSetup.module:345
-msgid "is performing final system configuration. Please wait a moment."
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "has been installed to your system. Your new system has been  
configured with the default factory settings."
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "After reboot you can use vasm or vasmCC to fine tune your  
installation."
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "Your computer needs to be restarted so that you can use your new  
operating system. Click"
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "to restart your computer now or click"
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "to restart your computer at a later time"
-msgstr ""
-
-#: MdlSetup.module:353
-msgid "If you installed from  CD-ROM/R/RW media, please remove de disk  
before restarting."
-msgstr ""
-
-#: MdlSetup.module:356
-msgid "Restart"
-msgstr ""
-

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Dec  4 11:36:42 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.39
+Version=0.1.41
  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 11:36:42 2008
@@ -478,6 +478,9 @@
         frmNext = FrmRootPass

      CASE "FrmRootPass"
+
+        IF FrmRootPass.tbPasswd1.Text = "" THEN RETURN
+
        IF FrmRootPass.tbPasswd1.Text <> FrmRootPass.tbPasswd2.Text THEN
            Balloon.Error(("Passwords do not match. Please enter the same  
password twice"), FrmRootPass.tbPasswd2)
            FrmRootPass.tbPasswd2.SelectAll

Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class	(original)
+++ branches/iVL/FrmDone.class	Thu Dec  4 11:36:42 2008
@@ -19,6 +19,8 @@

  PUBLIC SUB Form_Open()

+DIM sText AS String
+
    FMain.FrmCurr = ME
    Fmain.tvPlan["Conf4"].Picture = MdlCore.sDonePic
    Fmain.tvPlan["Conf5"].Picture = MdlCore.sNowPic
@@ -28,7 +30,38 @@

    FMain.btback.Enabled = FALSE
    FMain.btback.ForeColor = Color.Gray
+  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
+
+      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()

-  MdlSetup.END_INSTALLER()

+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/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class	(original)
+++ branches/iVL/FrmRootPass.class	Thu Dec  4 11:36:42 2008
@@ -36,6 +36,8 @@
    MdlCore.WARN_STATUS("")
    IF ME.tbPasswd1.Text = "" THEN
      Message(("Enter a Password for root."))
+    RETURN
+    STOP EVENT
    ELSE
      IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN


Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Thu Dec  4 11:36:42 2008
@@ -15,10 +15,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/>.

-
-
-' PUBLIC Vmlinuz AS Object[]
-
+PUBLIC hBgConfigProc AS Process
  PRIVATE sDotConf AS String

  PUBLIC FUNCTION WRITE_LILO_DOT_CONF() AS Integer
@@ -343,14 +340,15 @@
  "for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh  
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
  "sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
  "update-mime-database /usr/share/mime/" & gb.NewLine &
-"sleep 20" & gb.NewLine &
-"echo done >/tmp/status" & gb.NewLine
+"sleep 20"
+'"echo done >/tmp/status" & gb.NewLine

  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
  'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
-SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng" WAIT
+'SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng" WAIT
+EXEC ["chmod", "+x", ClsGlobal.sTargetMnt &/ "var" &/ "log" &/ "setup"  
&/ "config-vinstall-ng"] WAIT
  SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
-SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &"
+hBgConfigProc = SHELL "chroot /mnt/target  
/var/log/setup/config-vinstall-ng"

   SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
   SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Dec  4 11:36:42 2008
@@ -109,7 +109,10 @@
    FrmInstallSys.pbInstallProg2.Value = 1
    'Message.Info("packages have been installed in your system. Please click  
next to configure it.")
    FrmInstallSys.tlBanner.Text = ("Vectorlinux is now installed in your  
system. Please click next to configure it.")
-  FrmInstallSys.tlCurrPkg.Text = ("packages have been Installed. Please  
click next to move on to System Configuration.")
+  FrmInstallSys.tlCurrPkg.Text = ("Packages have been Installed. Please  
click next to move on to System Configuration.")
+    FrmCredits.Timer1.Stop
+    FrmCredits.ScrollView1.Scroll(0, 0)
+
    WITH FMain
      .btQuit.Enabled = TRUE
      .btQuit.ForeColor = Color.Black
@@ -206,13 +209,7 @@
                  FrmInstallSys.pbInstallProg.Value = i / iStepTotal
            INC ClsGlobal.iPkgNum
            FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(ClsGlobal.iPkgTot, ClsGlobal.iPkgNum)
-
-              'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "  
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
-              'hproc = EXEC ["installpkg -R " & ClsGlobal.sTargetMnt &  
Space(1) & sBasePath &/ sLoc &/ sPkg & " || echo \'FAILED\' 2>  
/tmp/installdump"]
-              'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg & "  
-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump"]
-              'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/  
sPkg, "-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
-              'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
-              'hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo  
\'FAILED\' 2> /tmp/installdump" 'WAIT
+
                hproc = EXEC ["installpkg", "-R", ClsGlobal.sTargetMnt,  
sBasePath &/ sLoc &/ sPkg] ' WAIT
                    'if hpro
                      WAIT 1
@@ -486,20 +483,7 @@
  END


-' PUBLIC SUB Process_read()
-'
-'   DIM sLine AS String
-'   READ #LAST, sLine, -256
-'   sDump = sDump & gb.NewLine & sLine
-'   PRINT sLine
-' END
-' PUBLIC SUB Process_kill()
-'
-'   DIM sDump AS String = File.Load("/tmp/installdump")
-'     IF InStr(sDump, "FAILED") > 0 THEN
-'       Message.Error("The install process has returned an error.")
-'
-' END
+

  PUBLIC SUB process_error(msg AS String)


Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Dec  4 11:36:42 2008
@@ -384,6 +384,8 @@
    'Message.Info("Vectorlinux is now installed in your system. Please click  
next to configure it.")
    FrmInstallSys.tlBanner.Text = "<h3>" & ("Vectorlinux is now installed in  
your system. Please click") & Space(1) & FMain.btnext.text & Space(1) &  
("to configure it.") & "</h3>"
    FrmInstallSys.tlCurrPkg.Text = "<h3>" & ("Packages have been installed  
in your system. Please click") & Space(1) & FMain.btnext.text & Space(1) &  
("to configure it.") & "</h3>"
+  FrmCredits.Timer1.Stop
+  FrmCredits.ScrollView1.Scroll(0, 0)
    WITH FMain
      .btQuit.Enabled = TRUE
      .btQuit.ForeColor = Color.Black
@@ -900,13 +902,6 @@
  END


-' ' PUBLIC SUB Process_read()
-' '
-' '   DIM sLine AS String
-' '   READ #LAST, sLine, -256
-' '   sDump = sDump & gb.NewLine & sLine
-' '   PRINT sLine
-' ' END

  PUBLIC SUB process_error(msg AS String)


Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Thu Dec  4 11:36:42 2008
@@ -335,35 +335,35 @@
      RETURN sDump

  END
-
-PUBLIC SUB END_INSTALLER()
-DIM sText AS String
-    ' Check for /tmp/status in the target installation
-      IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
-        REPEAT
-          WAIT
-        sText = ClsGlobal.DISTRO & Space(1) & ("is performing final system  
configuration. Please wait a moment.")
-        FrmDone.tlMsg.Text = sText
-        'FrmDone.tlMsg.Adjust
-        UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
-        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.")
-    FrmDone.tlMsg.Text = sText
-    FMain.btnext.Enabled = TRUE
-    FMain.btnext.Text = ("Restart")
-    FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) +  
36
-
-    'FrmDone.tlBanner
-
-      ENDIF
-
-
-
-
-END
+'
+' PUBLIC SUB END_INSTALLER()
+' DIM sText AS String
+'     ' Check for /tmp/status in the target installation
+'       IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
+'         REPEAT
+'           WAIT
+'         sText = ClsGlobal.DISTRO & Space(1) & ("is performing final  
system configuration. Please wait a moment.")
+'         FrmDone.tlMsg.Text = sText
+'         'FrmDone.tlMsg.Adjust
+'         UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
+'         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.")
+'     FrmDone.tlMsg.Text = sText
+'     FMain.btnext.Enabled = TRUE
+'     FMain.btnext.Text = ("Restart")
+'     FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text)  
+ 36
+'
+'     'FrmDone.tlBanner
+'
+'       ENDIF
+'
+'
+'
+'
+' END




Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.