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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: M0E.lnx
Date: Fri Oct 31 07:52:04 2008
New Revision: 252

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/FrmSelISO.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
Fixed bug in FrmSelISO that locked up the image selection windows even when  
some images were found

Modified: branches/iVL/.lang/#project.pot
==============================================================================

--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/remote/devel/installer/.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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/remote/devel/installer/ClsGlobal.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot	(original)
+++ branches/iVL/.lang/ClsPartSel.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/remote/devel/installer/ClsPartSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot	(original)
+++ branches/iVL/.lang/ClsWinDrives.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/remote/devel/installer/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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/remote/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -30,11 +30,11 @@
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:271
+#: FMain.class:272
  msgid "Please select a default operating system to boot before proceeding"
  msgstr ""

-#: FMain.class:272
+#: FMain.class:273
  msgid "Select an entry from this list"
  msgstr ""

@@ -66,39 +66,39 @@
  msgid "No"
  msgstr ""

-#: FMain.class:379
+#: FMain.class:380
  msgid "has been installed on your computer. Additional system  
configuration"
  msgstr ""

-#: FMain.class:379
+#: FMain.class:380
  msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
  msgstr ""

-#: FMain.class:379
+#: FMain.class:380
  msgid "Would you like to reboot your computer now?"
  msgstr ""

-#: FMain.class:384
+#: FMain.class:385
  msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
  msgstr ""

-#: FMain.class:451
+#: FMain.class:452
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:471
+#: FMain.class:472
  msgid "Next"
  msgstr ""

-#: FMain.class:477
+#: FMain.class:478
  msgid "Back"
  msgstr ""

-#: FMain.class:483
+#: FMain.class:484
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:499
+#: FMain.class:500
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/remote/devel/installer/FrmDiskPart.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/remote/devel/installer/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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/remote/devel/installer/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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/remote/devel/installer/FrmPkgSel.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/remote/devel/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -14,43 +14,43 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FrmSelISO.class:29
+#: FrmSelISO.class:30
  msgid "No Installable Media Found"
  msgstr ""

-#: FrmSelISO.class:73
+#: FrmSelISO.class:74
  msgid "Click"
  msgstr ""

-#: FrmSelISO.class:73
+#: FrmSelISO.class:74
  msgid "to begin installating"
  msgstr ""

-#: FrmSelISO.class:75
+#: FrmSelISO.class:76
  msgid "Unable to locate any installable media."
  msgstr ""

-#: FrmSelISO.class:104
+#: FrmSelISO.class:112
  msgid "Unable to identify distro."
  msgstr ""

-#: FrmSelISO.class:139
+#: FrmSelISO.class:147
  msgid "Minimum Disk Space Requirements"
  msgstr ""

-#: FrmSelISO.class:242
+#: FrmSelISO.class:250
  msgid "No installable images found."
  msgstr ""

-#: FrmSelISO.class:248
+#: FrmSelISO.class:256
  msgid "Select which VectorLinux version you wish to install from the list  
below"
  msgstr ""

-#: FrmSelISO.class:253
+#: FrmSelISO.class:261
  msgid "TextLabel1"
  msgstr ""

-#: FrmSelISO.class:258
+#: FrmSelISO.class:266
  msgid "Search Again"
  msgstr ""


Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/remote/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/remote/devel/installer/FrmWinDrives.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/remote/devel/installer/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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/remote/devel/installer/MdlDiskPart.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot	(original)
+++ branches/iVL/.lang/MdlObjSizer.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/remote/devel/installer/MdlObjSizer.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot	(original)
+++ branches/iVL/.lang/MdlPartSel.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/remote/devel/installer/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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/remote/devel/installer/MdlPkgSel.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/remote/devel/installer/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 Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/remote/devel/installer/MdlSummarize.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot	(original)
+++ branches/iVL/.lang/MdlWinDrives.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/remote/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Oct 31 07:52:04 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.116
+Version=0.0.118
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Fri Oct 31 07:52:04 2008
@@ -26,7 +26,8 @@


    IF lstInstallableImg.Count > 0 THEN
-  IF lstInstallableImg.Text <> ("No Installable Media Found") THEN
+  'IF lstInstallableImg.Text <> ("No Installable Media Found") THEN
+  IF lstInstallableImg.Find(("No Installable Media Found")) = -1
      IF InStr(Trim(lstInstallableImg.Text), ".iso") OR  
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
      sLocation = Left(lstInstallableImg.Text,  
InStr(lstInstallableImg.Text, " ") - 1)

@@ -68,15 +69,22 @@
    ClsGlobal.sBackNav.Add(ME)
    END IF

-  IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) = -1 THEN
+  IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) <> -1 THEN
      tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'"  
& Space(1) & ("to begin installating") & Space(1)&
      Left(FrmSelISO.lstInstallableImg.text,  
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
-  ELSE
+  ELSE IF lstInstallableImg.Find(("No Installable Media Found")) <> -1 THEN
      tlBanner.Text = "<b>" & ("Unable to locate any installable media.")  
& "</b>"
      FMain.btnext.Enabled = FALSE
      FMain.btback.Enabled = FALSE
      FMain.btnext.ForeColor = Color.Gray
      FMain.btback.ForeColor = Color.Gray
+    ELSE
+      WITH FMain
+        .btback.Enabled = FALSE
+          .btback.ForeColor = Color.Gray
+          .btnext.Enabled = TRUE
+          .btnext.ForeColor = Color.Black
+      END WITH
    END IF
     FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
    FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Fri Oct 31 07:52:04 2008
@@ -316,21 +316,21 @@
  SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
  SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
  sOut = "#!/bin/bash \n" &
-"chmod +x /etc/rc.d/rc.udev" &
-"/etc/rc.d/rc.udev restart" &
-"/etc/rc.d/rc.modules" &
-"/sbin/vlsetup" &
-"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" &
-"rm -r /root/.mc 2>/dev/null" &
-"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" &
-"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &
-"update-mime-database /usr/share/mime/" &
-"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &
-"/sbin/vhwconf" &
+"chmod +x /etc/rc.d/rc.udev" & gb.NewLine &
+"/etc/rc.d/rc.udev restart" & gb.NewLine &
+"/etc/rc.d/rc.modules" & gb.NewLine &
+"/sbin/vlsetup" & gb.NewLine &
+"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
+"rm -r /root/.mc 2>/dev/null" & gb.NewLine &
+"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 &
+"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &  
gb.NewLine &
+"update-mime-database /usr/share/mime/" & gb.NewLine &
+"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &  
gb.NewLine &
+"/sbin/vhwconf" & gb.NewLine &
  "/sbin/valsaconf-quiet"
  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"
+'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
+SHELL "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 &"
@@ -340,7 +340,7 @@
  sOut = "#!/bin/bash \n" &
  "/sbin/config-stage1 gui-installer"
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut)
-SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
  'SHELL "chroot /mnt/target " WAIT


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


