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

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

Author: M0...@gm...
Date: Fri Dec 12 09:03:24 2008
New Revision: 400

Removed:
    branches/iVL/ClsNav.class
Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmCredits.class
    branches/iVL/FrmRootPass.class
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/installer.gambas

Log:
finetuned installation ... ready for testing

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Fri Dec 12 09:03:24 2008
@@ -106,19 +106,19 @@
  msgid "Please specify the domain this computer belongs to"
  msgstr ""

-#: FMain.class:830
+#: FMain.class:834
  msgid "Back"
  msgstr ""

-#: FMain.class:841
+#: FMain.class:845
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:852
+#: FMain.class:856
  msgid "Next"
  msgstr ""

-#: FMain.class:866
+#: FMain.class:870
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Dec 12 09:03:24 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.1.33
+Version=0.1.34
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Dec 12 09:03:24 2008
@@ -627,10 +627,14 @@
        WAIT 1
        FrmCredits.Reparent(FrmInstallSys.embCredits)
        FrmCredits.Show()
-      FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-      FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-      FMain.tvPlan["Inst1"].Selected = TRUE
+      ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+      ' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+      ' FMain.tvPlan["Inst1"].Selected = TRUE
+      fmain.Refresh
+      fmain.tvPlan.Refresh
+      MdlCore.warn_status_off()
        MdlSetup.BEGIN_INSTALLATION()
+
      END IF

    END IF

Modified: branches/iVL/FrmCredits.class
==============================================================================
--- branches/iVL/FrmCredits.class	(original)
+++ branches/iVL/FrmCredits.class	Fri Dec 12 09:03:24 2008
@@ -27,6 +27,10 @@
  END

  PUBLIC SUB Form_Open()
+   FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
+   FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
+   'FMain.tvPlan["Inst1"].Selected = TRUE
+
    ME.TextLabel1.Adjust
    ME.TextLabel1.Height = ME.ScrollView1.Height * 15
    ME.Timer1.Enabled = TRUE

Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class	(original)
+++ branches/iVL/FrmRootPass.class	Fri Dec 12 09:03:24 2008
@@ -64,7 +64,7 @@
      .tlbanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2))
      .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
      '.Frame1.Resize(.ClientWidth - (.Frame1.Left * 2), .tlBanner.Height *  
4)
-    .Frame1.Move(4, hrSep.top + .hrSep.Height + 24, .ClientW -  
(.Frame1.left * 2), .ClientH - .Frame1.Top - (.tbPasswd1.Height * 8))
+    .Frame1.Move(4, hrSep.top + .hrSep.Height + 24, .ClientW -  
(.Frame1.left * 2), .ClientH - .Frame1.Top - (.tbPasswd1.Height * 10))
      .tlAboutRoot.Move(4, 24, .Frame1.Width - (.tlAboutRoot.Left *  
2), .Frame1.Height - .tlAboutRoot.top - 8)
      .tlPass1.Move(.Frame1.left, .Frame1.top + .Frame1.Height + 24,  
MdlObjSizer.get_object_width(.tlPass1.text), 21)
      .tlPass2.Move(.tlPass1.Left, .tlPass1.top + .tlPass1.Height + 4,  
MdlObjSizer.get_object_width(.tlPass2.text), 21)

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Fri Dec 12 09:03:24 2008
@@ -106,6 +106,7 @@
    FrmInstallSys.tlBanner.Text = "<b>" & ("Installation complete") & "</b>"
    FrmInstallSys.tlCurrPkg.Text = ("Packages have been Installed. Please  
click next to move on to System Configuration.")
    Message.Info(ClsGlobal.DISTRO & Space(1) & ("installation is complete.  
Click next to begin system configuration"))
+  FrmCredits.TextLabel1.Text = ""
      FrmCredits.Timer1.Stop
      FrmCredits.ScrollView1.Scroll(0, 200)

@@ -132,7 +133,7 @@
    DIM sLabel AS String
    DIM sKernelPath AS String
    DIM i AS Integer
-  ClsGlobal.sSourceMnt = "/mnt/cdrom"
+  'ClsGlobal.sSourceMnt = "/mnt/cdrom"

    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep  
^ISO_KERNEL_" TO sKernames
    SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep  
^HD_KERNEL_" TO sKernVers

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Fri Dec 12 09:03:24 2008
@@ -26,7 +26,7 @@
   DIM cb AS ComboBox
    ' this is where we need to set the mount target
    ClsGlobal.sTargetMnt = "/mnt/target"
-
+  MdlCore.WARN_STATUS("")

      IF Exist(ClsGlobal.sTargetMnt) = FALSE THEN
        TRY MKDIR ClsGlobal.sTargetMnt
@@ -69,7 +69,7 @@
        FOR EACH cb IN MdlPartSel.oMountPoints
          IF Left(cb.Text, Len("/mnt")) = "/mnt" THEN EXEC ["mkdir", "-p",  
ClsGlobal.sTargetMnt &/ cb.Text] WAIT
        NEXT
-
+      MdlCore.warn_status_off
  END

  PUBLIC SUB WRITE_NEW_DISTRO_ID()
@@ -372,6 +372,7 @@
    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>"
    Message.Info(ClsGlobal.DISTRO & Space(1) & ("installation is complete.  
Click next to begin system configuration"))
+  FrmCredits.TextLabel1.Text = ""
    FrmCredits.Timer1.Stop
    FrmCredits.ScrollView1.Scroll(0, 200)
    WITH FMain

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