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

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

Author: M0E.lnx
Date: Tue Nov 11 10:19:27 2008
New Revision: 282

Added:
    branches/iVL/MdlNav.module
Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/FMain.class

Log:
Began splitting the navigation algorithm


Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Tue Nov 11 10:19:27 2008
@@ -86,19 +86,19 @@
  msgid "Your screen may flicker or go blank for a few seconds during this  
process."
  msgstr ""

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

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

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

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


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Nov 11 10:19:27 2008
@@ -186,7 +186,7 @@
    DIM sDev AS String
    DIM sLang AS String

-  tvPlan.Refresh()
+  'tvPlan.Refresh()

    IF LAST.TEXT = ("Restart") THEN
    'EXEC "shutdown", "-r", " now"
@@ -239,7 +239,7 @@
            IF .rbEditPartitions.Value = TRUE THEN
              .tlChoiceExp.text = .tlChoiceExp.text & gb.NewLine &  
gb.NewLine & "<b><br><br>" & ("Please wait while setup attampts to run the  
partitioning utility") & "</b>"
            ELSE IF .rbUseExisting.Value = TRUE THEN
-            .tlChoiceExp.Text = .tlChoiceExp.Text & gb.NewLine &  
gb.NewLine & "<b><br><br><hr>" & ("Please wait while setup analyses your  
current partition setup.") & " <br>" & ("This may take a while ...")  
& "</b>"
+            .tlChoiceExp.Text = .tlChoiceExp.Text & gb.NewLine &  
gb.NewLine & "<b><br><br>" & ("Please wait while setup analyses your  
current partition setup.") & " <br>" & ("This may take a while ...")  
& "</b>"

            END IF

@@ -439,7 +439,7 @@
    END IF
  END IF
  tvPlan.Refresh()
-
+ClsGlobal.sBackNav.Add(FrmCurr)
  END


@@ -473,45 +473,46 @@

  PUBLIC SUB btback_Click()

-  DIM iKey AS Integer
-  DIM frm AS Form
-
-  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
+   DIM iKey AS Integer
+   DIM frm AS Form
+'
+'   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
+'   ' ' '
+'   ' ' '
+'
+'
+' END SELECT
+'   frm.Reparent(ME.pnlwinhost)
+'    FrmCurr.Close
+'    frm.Show


-
+    iKey = ClsGlobal.sBackNav.Find(FrmCurr)
+      IF iKey <> -1 THEN
+        frm = ClsGlobal.sBackNav[iKey - 1]
+        ClsGlobal.sBackNav.Delete(iKey)
+          WITH FMain
+            .tvPlan.MoveBack
+          END WITH
+      FrmCurr.Hide
+      frm.Show
+      END IF

  END


Added: branches/iVL/MdlNav.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlNav.module	Tue Nov 11 10:19:27 2008
@@ -0,0 +1,29 @@
+' Gambas module file
+'    This file is part of vinstall-ng
+
+'    vinstall-ng is free software: you can redistribute it and/or modify
+'    it under the terms of the GNU General Public License as published by
+'    the Free Software Foundation, either version 2 of the License, or
+'    (at your option) any later version.
+
+'    vinstall-ng  is distributed in the hope that it will be useful,
+'    but WITHOUT ANY WARRANTY; without even the implied warranty of
+'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'    GNU General Public License for more details.
+
+'    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 FUNCTION Forward(sTrFCurrent AS String) AS Form
+
+  DIM fRet AS Form
+    SELECT CASE sTrFCurrent
+      CASE "FrmSelISO"
+        fRet = FrmPartScheme
+    END SELECT
+
+    RETURN fRet
+
+
+
+END