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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: m0e.lnx
Date: Fri Sep 26 15:53:29 2008
New Revision: 187

Modified:
    branches/iVL/.lang/FMain.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/MdlCore.pot
    branches/iVL/.lang/MdlDiskPart.pot
    branches/iVL/.lang/MdlPartSel.pot
    branches/iVL/.lang/MdlSummarize.pot
    branches/iVL/.lang/MdlWinDrives.pot
    branches/iVL/FMain.class
    branches/iVL/FrmLilo.class
    branches/iVL/MdlCore.module
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlPartFrmt.module

Log:
corrected minor navigation woes

Modified: branches/iVL/.lang/FMain.pot
==============================================================================

--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Fri Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FMain.class
+# /home/vluser/Area-51/projects/installer/FMain.class
  # Generated by Gambas compiler

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

-#: FMain.class:214
+#: FMain.class:231
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr ""

-#: FMain.class:216
+#: FMain.class:233
  msgid "Please wait while setup analyses your current partition setup."
  msgstr ""

-#: FMain.class:216
+#: FMain.class:233
  msgid "This may take a while ..."
  msgstr ""

-#: FMain.class:230
+#: FMain.class:247
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:388
+#: FMain.class:405
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:408
+#: FMain.class:425
  msgid "Next"
  msgstr ""

-#: FMain.class:414
+#: FMain.class:431
  msgid "Back"
  msgstr ""

-#: FMain.class:420
+#: FMain.class:437
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:436
+#: FMain.class:453
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Fri Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartScheme.class
+# /home/vluser/Area-51/projects/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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPartSel.class
+# /home/vluser/Area-51/projects/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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmPkgSel.class
+# /home/vluser/Area-51/projects/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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSelISO.class
+# /home/vluser/Area-51/projects/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Fri Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/FrmSummary.class
+# /home/vluser/Area-51/projects/installer/FrmSummary.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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlCore.module
+# /home/vluser/Area-51/projects/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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlDiskPart.module
+# /home/vluser/Area-51/projects/installer/MdlDiskPart.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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlPartSel.module
+# /home/vluser/Area-51/projects/installer/MdlPartSel.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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlSummarize.module
+# /home/vluser/Area-51/projects/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 Sep 26 15:53:29 2008
@@ -1,4 +1,4 @@
-# /home/remote/area-51/projects/installer/MdlWinDrives.module
+# /home/vluser/Area-51/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Sep 26 15:53:29 2008
@@ -28,6 +28,14 @@

  PUBLIC SUB Form_Open()
  DIM iImg AS Image
+DIM iWidth AS Integer
+
+
+
+
+
+
+

  IF NOT FrmCurr OR FrmCurr = "" THEN FrmCurr = FrmSelISO

@@ -60,9 +68,9 @@


  'STOP EVENT
-ME.Width = 800
-ME.Height = 600
-
+' ME.Width = 800
+' ME.Height = 600
+'


  WITH ME
@@ -71,10 +79,19 @@
    .Frame1.BackColor = Color.Transparent
    .tvPlan.BackColor = Color.transparent
    .tlBanner.Height = .PictureBox1.Height
+  '.tvPlan.Width = MdlCore.iLeftWidth

  END WITH

-
+iWidth = 0
+FMain.tvPlan.MoveFirst()
+ REPEAT
+ FMain.tvPlan.Item.Expanded = TRUE
+  IF MdlObjSizer.get_object_width(FMain.tvPlan.Item.Text) > iWidth THEN
+    iWidth = MdlObjSizer.get_object_width(FMain.tvPlan.Item.Text)
+  END IF
+ UNTIL FMain.tvPlan.MoveBelow()
+ 'Message(iWidth)

  END


Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Fri Sep 26 15:53:29 2008
@@ -25,13 +25,13 @@
   FMain.FrmCurr = ME
     FMain.tvPlan["Conf0"].Selected = TRUE
     FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
-   FMain.tvPlan["Inst2"].Picture = MdlCore.sDonePic
+   FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
    ME.sVidMode = "Standard"
  MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
  MdlLiloOsList.LIST_LILO_OS_CHOICES()
  MdlLiloOsList.LIST_WIN_INSTALL_CHOICES(ME.TabStrip1.Count)
-ME.tlList.text = "The following Operating Systems have been detected on  
this computer. Choose your desired option " &
-"for each one of them by clicking on each tab. To proceed with the default  
pre-set values, simply click \'" & FMain.btnext.text & "\'"
+ME.tlList.text = ("The following Operating Systems have been detected on  
this computer. Choose your desired option") & Space(1)&
+("for each one of them by clicking on each tab. To proceed with the  
default pre-set values, simply click") & Space(1) & "\'" &  
FMain.btnext.text & "\'"
  ME.tlList.Adjust
  ME.TabStrip1.Index = MdlLiloOsList.iVltag
  MdlLiloOsList.bVlCliOption = TRUE

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Fri Sep 26 15:53:29 2008
@@ -494,7 +494,7 @@


  PUBLIC SUB PREPARE_INSTALL_LAYOUT()
-DIM iWidth AS Integer
+DIM iWidth AS Integer = 0
  WITH FMain.tvPlan
    .Add("Prep", ("Preparation"), sCatPic)
    .Add("Prep0", ("Language Selection"), sNowPic, "Prep")
@@ -513,7 +513,8 @@
    .Add("Conf3", ("User Accounts"), sToDopic, "Conf")
    .Add("Conf4", ("Hardware Configuration"), sToDopic, "Conf")
  END WITH
-
+iLeftWidth = 0
+iWidth = 0
  'expand the treeview
   FMain.tvPlan.MoveFirst()
   REPEAT
@@ -524,8 +525,11 @@
   UNTIL FMain.tvPlan.MoveBelow()

   iLeftWidth = iWidth
- fmain.tvPlan.Width = iWidth + (iWidth / 20)
- fmain.Frame1.Width = iWidth + (iWidth / 10)
+ 'Message(iLeftWidth)
+ 'fmain.tvPlan.Width = iLeftWidth
+
+ 'fmain.tvPlan.Width = iWidth + (iWidth / 20)
+ 'fmain.Frame1.Width = iWidth + (iWidth / 10)




Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Fri Sep 26 15:53:29 2008
@@ -29,9 +29,9 @@

    DIM iRet AS Integer = 0
    WITH FMain
-      .tvPlan["Inst2"].Selected = TRUE
-      .tvPlan["Inst2"].Picture = MdlCore.sNowPic
-      .tvPlan["Inst1"].Picture = MdlCore.sDonePic
+      .tvPlan["Inst1"].Selected = TRUE
+      .tvPlan["Inst1"].Picture = MdlCore.sNowPic
+      .tvPlan["Inst0"].Picture = MdlCore.sDonePic
    END WITH
    ME.CALCULATE_TOTAL_PACKAGES()
      'RETURN

Modified: branches/iVL/MdlPartFrmt.module
==============================================================================
--- branches/iVL/MdlPartFrmt.module	(original)
+++ branches/iVL/MdlPartFrmt.module	Fri Sep 26 15:53:29 2008
@@ -56,7 +56,7 @@

        FMain.tvPlan["Inst1"].Selected = TRUE
        FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-      FMain.tvPlan["Inst2"].Picture = MdlCore.sToDopic
+      FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic


      'Umount the volume first


