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

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

Author: M0E.lnx
Date: Tue Nov 11 08:55:35 2008
New Revision: 281

Modified:
    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/FMain.class

Log:
Attempt to fix the reverse navigation woes

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

--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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.
@@ -18,87 +18,87 @@
  msgid "Restart"
  msgstr ""

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

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

-#: FMain.class:241
+#: FMain.class:242
  msgid "This may take a while ..."
  msgstr ""

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

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

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

-#: FMain.class:322
+#: FMain.class:325
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:336
+#: FMain.class:339
  msgid "Passwords do not match. Please enter the same password twice"
  msgstr ""

-#: FMain.class:351
+#: FMain.class:354
  msgid "You have not created any user accounts for this system yet. There  
is not enough information"
  msgstr ""

-#: FMain.class:351
+#: FMain.class:354
  msgid "to create an account here. It is recommended that you create at  
least one."
  msgstr ""

-#: FMain.class:351
+#: FMain.class:354
  msgid "Would you like to continue anyway?"
  msgstr ""

-#: FMain.class:351
+#: FMain.class:354
  msgid "Yes"
  msgstr ""

-#: FMain.class:351
+#: FMain.class:354
  msgid "No"
  msgstr ""

-#: FMain.class:369
+#: FMain.class:372
  msgid "Please specify a hostname for this computer"
  msgstr ""

-#: FMain.class:373
+#: FMain.class:376
  msgid "Please specify the domain this computer belongs to"
  msgstr ""

-#: FMain.class:386
+#: FMain.class:389
  msgid "VectorLinux will now try to detect and configure your graphics  
hardware."
  msgstr ""

-#: FMain.class:386
+#: FMain.class:389
  msgid "Your screen may flicker or go blank for a few seconds during this  
process."
  msgstr ""

-#: FMain.class:609
+#: FMain.class:639
  msgid "Back"
  msgstr ""

-#: FMain.class:621
+#: FMain.class:651
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:633
+#: FMain.class:663
  msgid "Next"
  msgstr ""

-#: FMain.class:647
+#: FMain.class:677
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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.

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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	Tue Nov 11 08:55:35 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/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Nov 11 08:55:35 2008
@@ -214,6 +214,7 @@

    ELSE

+  IF ERROR THEN Message(Error.Where & "<br>" & Error.Text)

    SELECT CASE FrmCurr.Name ' very nice navigation algoritm

@@ -283,11 +284,13 @@
              END IF


-    CASE "FrmPkgsel2", "FrmUsrPkgSel"
+    CASE "FrmPkgsel2" ', "FrmUsrPkgSel"
        ' summarize the build
  ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '          
MdlSummarize.SUMMARIZE_INSTALL
          frmNext = FrmSummary
          'frmNext = install
+  CASE "FrmUsrPkgSel"
+    frmNext = FrmSummary
      CASE "FrmWinDrives"
        'Move on to selecting packages
          frmNext = FrmPkgSel
@@ -472,16 +475,43 @@

    DIM iKey AS Integer
    DIM frm AS Form
-    iKey = ClsGlobal.sBackNav.Find(FrmCurr)
-      IF iKey <> -1 THEN
-        frm = ClsGlobal.sBackNav[iKey - 1]
-          WITH FMain
-            .tvPlan.MoveBack
-          END WITH
-      FrmCurr.Hide
-      frm.Show
+
+  SELECT CASE FrmCurr.Name
+    CASE "FrmSummary"
+      'IF FrmPkgSel.rbCustom.Value = TRUE THEN
+      IF ClsPkgSel.bCustom = TRUE THEN
+        frm = FrmUsrPkgSel
+       'ELSE IF FrmPkgSel.rbFull.Value = TRUE THEN
+       ELSE
+        frm = FrmPkgSel
        END IF
-
+    'FrmCurr.Close
+  CASE "FrmUsrPkgSel"
+  'FrmCurr.Hide
+    frm = FrmPkgSel
+
+
+
+  ' ' ' CASE ELSE
+  ' ' '
+  ' ' '
+  ' ' '   iKey = ClsGlobal.sBackNav.Find(FrmCurr)
+  ' ' '     IF iKey <> -1 THEN
+  ' ' '       frm = ClsGlobal.sBackNav[iKey - 1]
+  ' ' '         WITH FMain
+  ' ' '           .tvPlan.MoveBack
+  ' ' '         END WITH
+  ' ' '     FrmCurr.Hide
+  ' ' '     frm.Show
+  ' ' '     END IF
+
+END SELECT
+  frm.Reparent(ME.pnlwinhost)
+   FrmCurr.Close
+   frm.Show
+
+
+

  END



