[Vectorlinux-devel] [vinstall-ng commit] r101 - branches/iVL

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

Author: M0...@gm...
Date: Wed Aug  6 15:01:46 2008
New Revision: 101

Modified:
    branches/iVL/.project
    branches/iVL/FrmInstallSys.class
    branches/iVL/FrmInstallSys.form
    branches/iVL/FrmLiloOsList.form
    branches/iVL/MdlSetup.module

Log:
- Implemented scrolling credits text


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Aug  6 15:01:46 2008
@@ -1,6 +1,6 @@
  # Gambas Project File 2.0
  Title=VectorLinux Installer
-Startup=FrmInstallSys
+Startup=FrmLilo
  Version=0.0.30
  Library=gb.gtk
  Library=gb.form

Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class	(original)
+++ branches/iVL/FrmInstallSys.class	Wed Aug  6 15:01:46 2008
@@ -34,6 +34,7 @@

  PUBLIC SUB Form_Open()

+
        ' prepare the system
        'ME.HIDE_PROGRES_CONTROLS()

@@ -44,7 +45,10 @@

  'ME.BEGIN_PROCESS()
  MdlSetup.RUN_CREDITS("/mnt/loop/CREDIT", ME.tlCredits)
+
  ME.tmCredits.Enabled = TRUE
+
+
  END

  PUBLIC SUB Form_Show()
@@ -67,6 +71,9 @@
        .pbInstallProg.Move(.tlCurrStepLbl.left +  
(.tlCurrStepLbl.Width), .tlCurrStepLbl.top, .FrmProg.Width -  
(.tlCurrStepLbl.Width + (.tlcurrsteplbl.left * 2)))
        .tlCurrPkg2.Move(.tlCurrPkg.Left, .tlCurrPkg.top +  
(.tlCurrPkg.Height * 2.5), .FrmProg.Width - (.tlCurrPkg.Left * 2))
        .pbInstallProg2.Move(.tlCurrPkg2.Left, .tlCurrPkg2.top +  
(.tlCurrPkg2.Height + 2), .tlCurrPkg2.Width, 27)
+      .frmCredits.Move(.FrmProg.left, .FrmProg.top + .FrmProg.Height +  
16, .FrmProg.Width)
+      .sclCredits.Move(8, 24, .frmCredits.Width - (.sclCredits.left * 2))
+      .tlCredits.Move(8, 4)

        '.pbInstallProg.Move(.tlCurrStepLbl.Left + (.tlCurrStepLbl.Width +  
2), .FrmProg.Width - (.tlCurrStepLbl.Width + (.tlCurrStepLbl.left * 2))) '
        '.pbInstallProg.Move(.tlCurrPkg.Left, .tlCurrPkg.top +  
(.tlCurrPkg.Height + 2), .tlCurrPkg.Width)
@@ -92,12 +99,21 @@

  PUBLIC SUB tmCredits_Timer()

+  ' ' DIM i AS Integer = ME.FrmProg.left + 20
+  ' '
+  ' ' IF ME.tlCredits.x < (i) - (ME.tlCredits.Width) THEN ME.tlCredits.x =  
(frmCredits.Width - 12)
+  ' '   tlCredits.x = frmCredits.left + 4 + (tlCredits.x - 10)
+  ' '
+
+
+
    DIM X AS Integer
    X = ME.sclCredits.ScrollX

    INC ME.sclCredits.ScrollX
        IF X = ME.sclCredits.Scrollx THEN
          ME.sclCredits.scrollx = 0
+        ME.tmCredits.Enabled = FALSE
        END IF


@@ -106,5 +122,17 @@
     ' IF ME.sclCredits.ScrollX < - ME.tlCredits.Width + ME.tlCredits.x THEN
     '   ME.sclCredits.Scrollx = ME.sclCredits.Width
     ' ENDIF
+
+END
+
+PUBLIC SUB sclCredits_MouseDown()
+
+
+
+END
+
+PUBLIC SUB tlCredits_MouseDown()
+
+

  END

Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form	(original)
+++ branches/iVL/FrmInstallSys.form	Wed Aug  6 15:01:46 2008
@@ -11,7 +11,7 @@
      MoveScaled(1,10,76,34)
      Text = ("")
      { tlCurrPkg TextLabel
-      MoveScaled(2,1,73,3.1667)
+      MoveScaled(2,1,73,3.125)
        Text = ("Installing ...")
      }
      { pbInstallProg ProgressBar
@@ -19,10 +19,10 @@
        Label = False
      }
      { pbInstallProg2 ProgressBar
-      MoveScaled(1,19,44,3.1667)
+      MoveScaled(1,19,44,3.125)
      }
      { tlCurrPkg2 TextLabel
-      MoveScaled(1,15,45,3.1667)
+      MoveScaled(1,15,45,3.125)
        Text = ("Total progress")
      }
      { tlCurrStepLbl TextLabel
@@ -31,14 +31,16 @@
      }
    }
    { frmCredits Frame
-    MoveScaled(2,47,81,13)
+    MoveScaled(2,47,81,8)
      Text = ("VectorLinux ... Brought to you by ")
      { sclCredits ScrollView
-      MoveScaled(2,3,77,7)
+      MoveScaled(1,1,58,5)
+      Border = False
        ScrollBar = Scroll.None
        { tlCredits TextLabel
-        MoveScaled(1,1,53,4)
+        MoveScaled(0,0,53,4)
          Text = ("")
+        Alignment = Align.Normal
        }
      }
    }

Modified: branches/iVL/FrmLiloOsList.form
==============================================================================
--- branches/iVL/FrmLiloOsList.form	(original)
+++ branches/iVL/FrmLiloOsList.form	Wed Aug  6 15:01:46 2008
@@ -9,8 +9,11 @@
    }
    { VPanel1 VPanel
      MoveScaled(1,13,71,43)
-    { scrlOsList ScrollView
-      MoveScaled(0,0,71,40)
+    { scrlOsList ListContainer
+      MoveScaled(2,0,58,15)
+    }
+    { scrlOsListold ScrollView
+      MoveScaled(3,18,71,19)
        Expand = True
      }
    }

Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Wed Aug  6 15:01:46 2008
@@ -205,20 +205,29 @@



+
+
  PUBLIC SUB RUN_CREDITS(sCreditFile AS String, tlOutput AS TextLabel)

    DIM sFile AS String[] = Split(File.Load(sCreditFile), "\n")
    DIM i AS Integer

    FOR i = 0 TO sFile.count - 1
-    tlOutput.Text = tlOutput.Text & Space(3) & Trim(sFile[i])
+      IF Left(Trim(sFile[i]), Len("M0E-lnx")) = "M0E-lnx" THEN
+              sFile[i] = "M0E-lnx  [ vpackager, vasmCC, GUI installer ]"
+      ELSE IF Left(Trim(sFile[i]), Len("Uelsk8s")) = "Uelsk8s" THEN
+          sFile[i] = "Uelks8s [ vlthemeswitch, ISO Master, Gui Installer ]"
+      ELSE
+        sFile[i] = sFile[i]
+      END IF
+    tlOutput.Text = tlOutput.Text & Space(12) & " *** " & sFile[i]
+'    tlOutput.Text = sFile[i]
+    'WAIT 20
    NEXT
    tlOutput.Width = MdlObjSizer.get_object_width(tlOutput.Text) + 24
    'tlOutput.Border = Border.Plain

-
-
-
+
  END