vectorlinux-devel Mailing List for vectorlinux (Page 34)

Brought to you by: joe1962, johnb316, johnvan54, uelsk8s, vec7

vectorlinux-devel — Vector Linux developer's list

You can subscribe to this list here.

2006	Jan	Feb	Mar (40)	Apr (76)	May (31)	Jun (39)	Jul (44)	Aug (87)	Sep (32)	Oct (23)	Nov (36)	Dec (10)
2007	Jan (3)	Feb	Mar	Apr	May	Jun	Jul (2)	Aug (49)	Sep (14)	Oct	Nov	Dec (1)
2008	Jan	Feb	Mar	Apr	May	Jun	Jul (63)	Aug (95)	Sep (39)	Oct (61)	Nov (75)	Dec (118)
2009	Jan (25)	Feb (37)	Mar (20)	Apr (15)	May (14)	Jun (48)	Jul (82)	Aug (160)	Sep (94)	Oct (55)	Nov (59)	Dec (4)
2010	Jan (5)	Feb (17)	Mar (6)	Apr	May	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec
2011	Jan (2)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar (1)	Apr (2)	May	Jun	Jul	Aug	Sep (2)	Oct	Nov (1)	Dec
2013	Jan	Feb	Mar	Apr (1)	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 64 > >> (Page 34 of 64)

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

From: <cod...@go...> - 2008-11-09 18:12:46

Author: uelsk8s
Date: Sun Nov  9 10:12:12 2008
New Revision: 272

Modified:
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmNetConf.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlNetConf.module
    branches/iVL/installer.gambas

Log:
added face browser icon for gdm

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Sun Nov  9 10:12:12 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.141
+Version=0.0.142
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,6 +17,7 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
+ExecPath=/root/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Sun Nov  9 10:12:12 2008
@@ -354,6 +354,7 @@

        SHELL "cp /mnt/target/etc/modules.conf >/etc/modules.conf" WAIT
        SHELL "ifconfig eth0 up" WAIT
+      SHELL "chmod 700 /mnt/target/home/*"
        frmNext = FrmNetConf



Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Sun Nov  9 10:12:12 2008
@@ -21,11 +21,11 @@
    DIM sHost AS String

      'SHELL "chroot " & ClsGlobal.sTargetMnt & " hostname" TO sRes
-    EXEC ["chroot " & ClsGlobal.sTargetMnt, "hostname"] TO sRes
+    'EXEC ["chroot " & ClsGlobal.sTargetMnt, "hostname"] TO sRes

-    IF sRes = "" THEN
+    'IF sRes = "" THEN
          sRes = "Vector.Linux.net"
-      END IF
+     ' END IF


      sRes = Trim(sRes)
@@ -141,3 +141,4 @@
  END IF

  END
+

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Sun Nov  9 10:12:12 2008
@@ -113,8 +113,10 @@
              'SHELL "cd " & sPicdir & " && ln -s root1.png  
root.face.icon"          ' This needs to go somewhere else

              'SHELL "cd " & sPicdir & " ; ln -s default3.png " &  
ME.tbUsername.Text & ".face.icon"
-
+            'this next line is for kdm
              SHELL "cd " & sPicdir & "; ln -s " & Replace(tbPicPath.Text,  
ClsGlobal.sTargetMnt, "") & Space(1) & tbUsername.Text & ".face.icon" WAIT
+            'this next line is for gdm
+            SHELL "cd /mnt/target/home/" & tbUsername.Text & "; cp " &  
Replace(tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & ".face" WAIT

            ENDIF


Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Sun Nov  9 10:12:12 2008
@@ -583,8 +583,8 @@
      IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts") THEN MOVE  
ClsGlobal.sTargetMnt &/ "etc" &/ "hosts" TO ClsGlobal.sTargetMnt &/ "etc"  
&/ "hosts.bak"
      IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts") THEN KILL  
ClsGlobal.sTargetMnt &/ "etc" &/ "hosts"

-      Message.Info(sFileIn)
-      RETURN
+      'Message.Info(sFileIn)
+      'RETURN
        TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts",  
SConv(sFileIn))
            CATCH
            Message.Error(Error.where & gb.NewLine & Error.text)

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

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

From: <cod...@go...> - 2008-11-07 22:01:20

Author: M0E.lnx
Date: Fri Nov  7 14:00:48 2008
New Revision: 271

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/MdlCore.pot
    branches/iVL/DevLog
    branches/iVL/FrmInstallSys.class
    branches/iVL/FrmInstallSys.form
    branches/iVL/MdlInstallCustom.module

Log:
- Updated binary
   Ready for testing

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Fri Nov  7 14:00:48 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.

Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot	(original)
+++ branches/iVL/.lang/MdlCore.pot	Fri Nov  7 14:00:48 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/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Fri Nov  7 14:00:48 2008
@@ -1 +1,2 @@
-- Implemented new package listing for custom installation
+- Updated binary
+  Ready for testing
\ No newline at end of file

Modified: branches/iVL/FrmInstallSys.class
==============================================================================
--- branches/iVL/FrmInstallSys.class	(original)
+++ branches/iVL/FrmInstallSys.class	Fri Nov  7 14:00:48 2008
@@ -141,7 +141,7 @@
        '.tlCurrPkg.Move(4, 24, .FrmProg.Width - (.tlCurrPkg.Left * 2))
        .tlCurrStepLbl.Move(4, .tlCurrPkg.top + .tlCurrPkg.Height + 4,  
MdlObjSizer.get_object_width(.tlCurrStepLbl.text))
        '.pbInstallProg.Move(.tlCurrStepLbl.Left + .tlCurrStepLbl.Width +  
8, .tlCurrStepLbl.top, .FrmProg.w - (.pbInstallProg.x +  
(.tlCurrStepLbl.left * 2)))
-      .pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width + 4,  
tlCurrStepLbl.top, .ClientWidth - (.pbInstallProg.Left -  
4), .tlCurrStepLbl.Height) '.hrsep.Width - (pbInstallProg.Left))
+      .pbInstallProg.Move(.tlCurrStepLbl.left + .tlCurrStepLbl.Width + 4,  
tlCurrStepLbl.top + (tlCurrStepLbl.Height / 4), .ClientWidth -  
(.pbInstallProg.Left - 4), .tlCurrStepLbl.Height / 2) '.hrsep.Width -  
(pbInstallProg.Left))
        .tlCurrPkg2.Move(4, .pbInstallProg.top + .pbInstallProg.Height + 24,  
MdlObjSizer.get_object_width(.tlCurrPkg2.text))
        '.pbInstallProg2.Move(8, .tlCurrPkg2.top + .tlCurrPkg2.Height +  
2, .FrmProg.Width - (.pbInstallProg2.x * 2))
        .pbInstallProg2.Move(4, tlCurrPkg2.top + .tlCurrPkg2.Height +  
2, .hrsep.Width)

Modified: branches/iVL/FrmInstallSys.form
==============================================================================
--- branches/iVL/FrmInstallSys.form	(original)
+++ branches/iVL/FrmInstallSys.form	Fri Nov  7 14:00:48 2008
@@ -28,6 +28,7 @@
    { tlCurrStepLbl TextLabel
      MoveScaled(3,26,11,3)
      Text = ("Current Step ")
+    Alignment = Align.Normal
    }
    { embCredits Panel
      MoveScaled(12,40,52,32)

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Fri Nov  7 14:00:48 2008
@@ -282,25 +282,31 @@
                'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg & "  
-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump"]
                'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/  
sPkg, "-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
                'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
-              hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo  
\'FAILED\' 2> /tmp/installdump" 'WAIT
+              'hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo  
\'FAILED\' 2> /tmp/installdump" 'WAIT
+              hproc = EXEC ["installpkg", "-R", ClsGlobal.sTargetMnt,  
sBasePath &/ sLoc &/ sPkg] ' WAIT
+                  'if hpro
                      WAIT 1
                      IF hproc.State = Process.Running THEN
                        REPEAT
                          WAIT
                      UNTIL hproc.State = Process.Stopped
                    END IF
-          sDump = File.Load("/tmp/installdump")
+                  IF hproc.Value > 0 THEN
+                    Message.Error(sPkg & Space(1) & ("Failed to install.  
Installation will stop"))
+                    RETURN 1
+                  END IF
+'          sDump = File.Load("/tmp/installdump")

            'INC i


-            IF InStr(sDump, "FAILED") > 0 THEN
-                  Message.Error("Error installing user-selected package" &  
Space(1) & sPkg)
-                  RETURN 1
-                ' ELSE
-                '   RETURN 0
-                END IF
-
+            ' ' IF InStr(sDump, "FAILED") > 0 THEN
+            ' '       Message.Error("Error installing user-selected  
package" & Space(1) & sPkg)
+            ' '       RETURN 1
+            ' '     ' ELSE
+            ' '     '   RETURN 0
+            ' '     END IF
+            ' '
      END IF
      INC ii
    UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count - 1
@@ -688,6 +694,8 @@
          MdlSetup.SHOW_PROGRESS_CONTROLS()
    FrmInstallSys.tlCurrPkg.Text = "Installing " & File.Name(sBulkPath)
    hproc = SHELL "lzmadec <" & sBulkPath & " | tar -xp -C " &  
ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump" 'FOR READ
+      'hproc = EXEC ["lzmadec", "<", sBulkPath, "|", "tar", "-xp", "-C",  
clsglobal.sTargetMnt] 'WAIT
+      'hproc = EXEC ["lzmadec", "<" & sBulkPath & " | tar -xp -C " &  
ClsGlobal.sTargetMnt]
    WAIT 1
    IF hproc.State = Process.Running THEN
      WAIT 1
@@ -699,18 +707,23 @@
        IF vSize <> "" THEN
          'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),  
CFloat(vSize))
          MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize)
-        'FrmInstallSys.pbInstallProg2.Value =  
FrmInstallSys.pbInstallProg2.Value + (fPbInc /  
FrmInstallSys.pbInstallProg.Value) '(FrmInstallSys.pbInstallProg.Value /  
fPbInc)
+
+        FrmInstallSys.pbInstallProg2.Value =  
(FrmInstallSys.pbInstallProg2.Value + (fPbInc - (fPbInc *  
FrmInstallSys.pbInstallProg.Value)) / 100)
        END IF
      UNTIL
        hproc.State = Process.Stopped
-        sDump = File.Load("/tmp/installdump")
-      IF InStr(sDump, "FAILED") > 0 THEN
-        RETURN 1
-      ELSE
+        IF hproc.value > 0 THEN
+            Message.Error(File.BaseName(sBulkPath) & Space(1) & ("failed  
to install. Installation will stop now"))
+              RETURN 1
+      END IF
+      ' ' '   sDump = File.Load("/tmp/installdump")
+      ' ' ' IF InStr(sDump, "FAILED") > 0 THEN
+      ' ' '   RETURN 1
+      ' ' ' ELSE
          FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
        RETURN 0
      END IF
-  END IF
+'  END IF
  END

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

From: <cod...@go...> - 2008-11-07 15:21:46

Author: M0E.lnx
Date: Fri Nov  7 07:12:36 2008
New Revision: 270

Modified:
    branches/iVL/.lang/#project.pot
    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/.project
    branches/iVL/FMain.class
    branches/iVL/FrmLilo.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlCore.module
    branches/iVL/MdlLiloOsList.module
    branches/iVL/installer.gambas

Log:
- Added -C argument support to jump straight to the configure stage

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/.project
+# /home/vluser/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsGlobal.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsPartSel.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsWinDrives.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
  # Generated by Gambas compiler

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

-#: FMain.class:177
+#: FMain.class:185
  msgid "Restart"
  msgstr ""

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

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

-#: FMain.class:214
+#: FMain.class:235
  msgid "This may take a while ..."
  msgstr ""

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

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

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

-#: FMain.class:295
+#: FMain.class:316
  msgid "Skipping lilo setup"
  msgstr ""

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

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

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

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

-#: FMain.class:324
+#: FMain.class:345
  msgid "Yes"
  msgstr ""

-#: FMain.class:324
+#: FMain.class:345
  msgid "No"
  msgstr ""

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

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

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

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

-#: FMain.class:509
+#: FMain.class:531
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:529
+#: FMain.class:551
  msgid "Next"
  msgstr ""

-#: FMain.class:535
+#: FMain.class:557
  msgid "Back"
  msgstr ""

-#: FMain.class:541
+#: FMain.class:563
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:557
+#: FMain.class:579
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmDiskPart.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartScheme.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartSel.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPkgSel.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSelISO.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSummary.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmWinDrives.class
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
  # Generated by Gambas compiler

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

-#: MdlCore.module:182
+#: MdlCore.module:204
  msgid "Scanning system for installable media. Please wait ..."
  msgstr ""

-#: MdlCore.module:198
+#: MdlCore.module:220
  msgid "No Installable Media Found"
  msgstr ""

-#: MdlCore.module:200
+#: MdlCore.module:222
  msgid "Setup was unable to find any installable media on your system.  
Please insert your VectorLinux "
  msgstr ""

-#: MdlCore.module:200
+#: MdlCore.module:222
  msgid "installation CD and click "
  msgstr ""

-#: MdlCore.module:200
+#: MdlCore.module:222
  msgid "to try again"
  msgstr ""

-#: MdlCore.module:361
+#: MdlCore.module:383
  msgid "Build Date: "
  msgstr ""

-#: MdlCore.module:361
+#: MdlCore.module:383
  msgid "MINIMUM REQUIREMENTS"
  msgstr ""

-#: MdlCore.module:366
+#: MdlCore.module:388
  msgid "Setup is unable to find SETUP.CONF in your install media. This  
could be symptoms of a bad burn or a bad ISO"
  msgstr ""

-#: MdlCore.module:439
+#: MdlCore.module:461
  msgid "Cannot find SETUP.CONF"
  msgstr ""

-#: MdlCore.module:447
+#: MdlCore.module:469
  msgid "Preparation"
  msgstr ""

-#: MdlCore.module:448
+#: MdlCore.module:470
  msgid "Language Selection"
  msgstr ""

-#: MdlCore.module:449
+#: MdlCore.module:471
  msgid "Find installation media"
  msgstr ""

-#: MdlCore.module:450
+#: MdlCore.module:472
  msgid "Disk Partitioning"
  msgstr ""

-#: MdlCore.module:451
+#: MdlCore.module:473
  msgid "Software Selection"
  msgstr ""

-#: MdlCore.module:453
+#: MdlCore.module:475
  msgid "Installation"
  msgstr ""

-#: MdlCore.module:454
+#: MdlCore.module:476
  msgid "Installation Summary"
  msgstr ""

-#: MdlCore.module:456
+#: MdlCore.module:478
  msgid "Install Operating System"
  msgstr ""

-#: MdlCore.module:457
+#: MdlCore.module:479
  msgid "System Configuration"
  msgstr ""

-#: MdlCore.module:458
+#: MdlCore.module:480
  msgid "Boot Menu Options"
  msgstr ""

-#: MdlCore.module:459
+#: MdlCore.module:481
  msgid "Regional Settings"
  msgstr ""

-#: MdlCore.module:460
+#: MdlCore.module:482
  msgid "System Administrator"
  msgstr ""

-#: MdlCore.module:461
+#: MdlCore.module:483
  msgid "User Accounts"
  msgstr ""

-#: MdlCore.module:462
+#: MdlCore.module:484
  msgid "Network Configuration"
  msgstr ""

-#: MdlCore.module:463
+#: MdlCore.module:485
  msgid "Final Hardware Configuration"
  msgstr ""


Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot	(original)
+++ branches/iVL/.lang/MdlDiskPart.pot	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlDiskPart.module
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlObjSizer.module
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPartSel.module
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPkgSel.module
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSetup.module
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSummarize.module
+# /home/vluser/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	Fri Nov  7 07:12:36 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Nov  7 07:12:36 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.127
+Version=0.0.141
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Nov  7 07:12:36 2008
@@ -46,6 +46,14 @@
  'ClsGlobal.sSourceMnt = "/mnt" &/ "source" 'FOR TESTING ONLY
  '/ THE FOLLOWING LINES HAVE BEEN COMMENTED FOR TESTING ONLY
  'IF frmInit = "" OR IsNull(frmInit) THEN frmInit = FrmSelISO
+
+IF Application.Args[1] = "-C" THEN
+frmInit = FrmPartSel
+FMain.btnext.Enabled = TRUE
+FMain.btnext.ForeColor = Color.Black
+END IF
+
+
  IF NOT frmInit THEN frmInit = FrmLangSel
  frmInit.Reparent(ME.pnlwinhost)
  frmInit.width = pnlwinhost.Width
@@ -85,7 +93,7 @@
   UNTIL FMain.tvPlan.MoveBelow()
   'Message(iWidth)
  FMain.btnext.Enabled = FALSE ' disable the button until a language is  
selected
-
+IF ERROR THEN Message(Error.Text & "<br>" & Error.Where)
  END

  PUBLIC SUB AUTOSIZE_LEFT_PANE()
@@ -186,6 +194,19 @@

    END IF

+  IF Application.Args[1] = "-C" THEN
+    ' navigation for configuration
+              SELECT CASE FrmCurr.Name
+                CASE "FrmPartSel"
+                    frmNext = FrmLilo
+              END SELECT
+
+              'FrmCurr.Hide
+              frmNext.Reparent(FrmCurr.Parent)
+              frmNext.Show
+
+
+  ELSE


    SELECT CASE FrmCurr.Name ' very nice navigation algoritm
@@ -403,6 +424,7 @@
        MdlSetup.BEGIN_INSTALLATION()
      END IF

+  END IF
  END IF
  tvPlan.Refresh()


Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Fri Nov  7 07:12:36 2008
@@ -36,6 +36,7 @@
  ME.tlList.Adjust
  ME.TabStrip1.Index = MdlLiloOsList.iVltag
  MdlLiloOsList.bVlCliOption = TRUE
+
  ' ' '
  '


Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Fri Nov  7 07:12:36 2008
@@ -126,6 +126,14 @@

        WITH FrmLilo.LiloTarget
            'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
+          'IF Application.Args[1] <> "" THEN
+
+                ' DETECT THE FILESYSTEM OF THE PARTITION BEING MOUNTED AS  
ROOT HERE
+
+
+
+           ' ELSE
+
                FOR EACH cb IN MdlPartSel.oMountPoints
                  IF cb.text = "/" THEN
                    ClsPartSel.sRoot = cb.Tag ' make sure this is set... we  
will need it later
@@ -136,6 +144,9 @@
                      NEXT
                  END IF
            NEXT
+
+
+      'END IF

            '.Add("Sector")
  '          END IF

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Fri Nov  7 07:12:36 2008
@@ -151,12 +151,34 @@
  PUBLIC SUB main()

  ' ' '
+IF Application.Args[1] = "-C" THEN
+  ' try to configure
+  'EXEC ["mount", Application.Args[1], "/mnt/target"] WAIT
+ME.display_config_stage
+  ELSE


    FMain.Show
+  END IF


  END
+
+PUBLIC SUB display_config_stage()
+
+  FrmPartSel.Reparent(fmain.pnlwinhost)
+  fmain.frmInit = FrmPartSel
+  fmain.Show
+  fmain.btnext.Enabled = TRUE
+  fmain.btnext.ForeColor = Color.Black
+  'ME.PREPARE_INSTALL_LAYOUT
+  'FrmLilo.Show
+  IF ERROR THEN Message(Error.where & "\n" & Error.Text)
+END
+
+
+
+

  PUBLIC SUB TRANSLATE_HOST_WINDOW()


Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Fri Nov  7 07:12:36 2008
@@ -370,6 +370,8 @@
            ' Add an option to boot the recently installed OS to CLI mode
            'ClsPartSel.sRoot = "/dev/sdb" ' for testing only
              'IF sLiloDesc LIKE "Vector" THEN
+            'IF Application.Args[1] = "" THEN
+
                FOR EACH cb IN MdlPartSel.oMountPoints
                  IF cb.text = "/" AND cb.tag = arrLinux[i] THEN
                'IF arrLinux[i] = ClsPartSel.sRoot THEN
@@ -387,6 +389,15 @@
                    ME.iVlTag = FrmLilo.TabStrip1.Index - 1
                END IF
              NEXT
+
+        'ELSE
+                ' DETECT THE FILESYSTEM ON THE ROOT PARTITION HERE
+
+
+        'END IF
+
+
+
              'END IF
          END WITH ' end jacking with the tabstrip itself
       END IF

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

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

From: <cod...@go...> - 2008-11-06 21:13:10

Author: M0E.lnx
Date: Thu Nov  6 13:11:20 2008
New Revision: 269

Modified:
    branches/iVL/.lang/#project.pot
    branches/iVL/.lang/ClsGlobal.pot
    branches/iVL/.lang/ClsPartSel.pot
    branches/iVL/.lang/ClsWinDrives.pot
    branches/iVL/.lang/FrmDiskPart.pot
    branches/iVL/.lang/FrmPartScheme.pot
    branches/iVL/.lang/FrmPartSel.pot
    branches/iVL/.lang/FrmSelISO.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/.project
    branches/iVL/FrmPkgSel.class
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlInstallSys.module
    branches/iVL/installer.gambas

Log:
Fully implemented new bulk selection window

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Nov  6 13:11:20 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/remote/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Thu Nov  6 13:11:20 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/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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	Thu Nov  6 13:11:20 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/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Nov  6 13:11:20 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.126
+Version=0.0.127
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,7 +17,6 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class	(original)
+++ branches/iVL/FrmPkgSel.class	Thu Nov  6 13:11:20 2008
@@ -26,9 +26,9 @@
        .rbFull_Click()
    END WITH
    FMain.FrmCurr = ME
-  ' ' FMain.tvPlan["Prep3"].Selected = TRUE
-  ' ' FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
-  ' ' FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic
+  FMain.tvPlan["Prep3"].Selected = TRUE
+  FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+  FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic
    FMain.btback.Enabled = TRUE
  FMain.btback.ForeColor = Color.Black


Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Nov  6 13:11:20 2008
@@ -18,6 +18,8 @@


  ' needs to read arrays from clsPkgsel and install all required packages
+PUBLIC fPbInc AS Float
+
  PRIVATE hproc AS Process
  PRIVATE sDump AS String
  PRIVATE sErr AS String
@@ -504,8 +506,9 @@
          IF iret <> 0 THEN
            RETURN 1
          END IF
-      INC ii
+
        END IF
+      INC ii
      UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count


@@ -601,6 +604,9 @@
    'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
    iPkgCnt = i
    PRINT ("Total packages to be installed = ") & i
+  fPbInc = 1 / iPkgCnt
+  PRINT "The total progrssbar will work in increments of " & fPbInc & " on  
every bulk installed"
+
  END


@@ -693,6 +699,7 @@
        IF vSize <> "" THEN
          'MdlInstallSys.UPDATE_STEP_PROGRESS(CFloat(vTargetSize),  
CFloat(vSize))
          MdlInstallSys.UPDATE_STEP_PROGRESS(vTargetSize, vSize)
+        'FrmInstallSys.pbInstallProg2.Value =  
FrmInstallSys.pbInstallProg2.Value + (fPbInc /  
FrmInstallSys.pbInstallProg.Value) '(FrmInstallSys.pbInstallProg.Value /  
fPbInc)
        END IF
      UNTIL
        hproc.State = Process.Stopped

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Thu Nov  6 13:11:20 2008
@@ -664,6 +664,7 @@
    IF iVal > FrmInstallSys.pbInstallProg.Value THEN
      FrmInstallSys.pbInstallProg.Value = iVal
    END IF
+
    'PRINT CStr(iCurrSize) & "/" & CStr(sTargetSize + sPakSize) & " = " &  
iVal & "%"
  END


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

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

From: <cod...@go...> - 2008-11-06 19:22:17

Author: M0E.lnx
Date: Thu Nov  6 11:21:36 2008
New Revision: 268

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmPkgSel.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/FMain.class
    branches/iVL/FrmSummary.class

Log:
Fixed bug in installation summary caused by the new Bulk selection window

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov  6 11:21:36 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.

Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot	(original)
+++ branches/iVL/.lang/FrmPkgSel.pot	Thu Nov  6 11:21:36 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.
@@ -16,6 +16,18 @@

  #: FrmPkgSel.class:25
  msgid "Choose your installation mode"
+msgstr ""
+
+#: FrmPkgSel.class:40
+msgid "Package"
+msgstr ""
+
+#: FrmPkgSel.class:41
+msgid "Description"
+msgstr ""
+
+#: FrmPkgSel.class:42
+msgid "Size"
  msgstr ""

  #: FrmPkgSel.class:70

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Nov  6 11:21:36 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.
@@ -62,19 +62,19 @@
  msgid "BULK PACKAGES"
  msgstr ""

-#: FrmSummary.class:190
+#: FrmSummary.class:200
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:259
+#: FrmSummary.class:269
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:269
+#: FrmSummary.class:279
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:279
+#: FrmSummary.class:289
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Nov  6 11:21:36 2008
@@ -246,7 +246,7 @@
            IF ClsPkgSel.bCustom = TRUE THEN
                'get the list of selected bulks only

-              MdlPkgSel.GET_USER_BULK_SELECTION()
+              'MdlPkgSel.GET_USER_BULK_SELECTION()
                'frmNext = FrmPkgsel2
                frmNext = FrmUsrPkgSel
              ELSE

Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Thu Nov  6 11:21:36 2008
@@ -174,15 +174,25 @@
            GridView2.MoveTo(1, 0)
                irow = 1
              ' add bulk packages
-            FOR EACH cb IN MdlPkgSel.Bulks
-              IF cb.Value = TRUE THEN
-                INC ME.GridView2.Rows.Count
-                  GridView2[irow, 0].text = File.BaseName(cb.Tag)
-
-                  INC irow
-              END IF
-
-            NEXT
+                REPEAT
+                  IF FrmPkgSel.scrlInstallOpts[i, 0].Picture =  
FrmPkgSel.pyes THEN
+                    INC GridView2.Rows.Count
+                    GridView2[irow, 0].text = FrmPkgSel.scrlInstallOpts[i,  
1].Text
+                    INC irow
+                  ENDIF
+                  INC i
+                UNTIL i = FrmPkgSel.scrlInstallOpts.Rows.Count
+
+
+            ' ' ' FOR EACH cb IN MdlPkgSel.Bulks
+            ' ' '   IF cb.Value = TRUE THEN
+            ' ' '     INC ME.GridView2.Rows.Count
+            ' ' '       GridView2[irow, 0].text = File.BaseName(cb.Tag)
+            ' ' '
+            ' ' '       INC irow
+            ' ' '   END IF
+            ' ' '
+            ' ' ' NEXT
          INC GridView2.Rows.Count
          'irow = irow + 1 ' move the selection to the next line
            GridView2[irow, 0].BackColor = Color.SelectedBackground

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

From: <cod...@go...> - 2008-11-06 19:09:14

Author: M0E.lnx
Date: Thu Nov  6 11:08:02 2008
New Revision: 267

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmPkgSel.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/FrmPkgSel.class
    branches/iVL/FrmPkgSel.form
    branches/iVL/MdlInstallCustom.module

Log:
- Implemented Bulk package selection to match that of Individual packages.  
Using a gridview instead of
   Checkboxes created @ runtime.



Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov  6 11:08:02 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/vluser/devel/installer/FMain.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	Thu Nov  6 11:08:02 2008
@@ -14,27 +14,27 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FrmPkgSel.class:22
+#: FrmPkgSel.class:25
  msgid "Choose your installation mode"
  msgstr ""

-#: FrmPkgSel.class:51
-msgid "Installs everything in your VectorLinux media to your system"
+#: FrmPkgSel.class:70
+msgid "Installs all optional components in your VectorLinux media to your  
system"
  msgstr ""

-#: FrmPkgSel.class:60
+#: FrmPkgSel.class:80
  msgid "Choose your optional components to install."
  msgstr ""

-#: FrmPkgSel.class:101
+#: FrmPkgSel.class:195
  msgid "TextLabel1"
  msgstr ""

-#: FrmPkgSel.class:107
+#: FrmPkgSel.class:205
  msgid "Full Install"
  msgstr ""

-#: FrmPkgSel.class:112
+#: FrmPkgSel.class:210
  msgid "Custom Install"
  msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Thu Nov  6 11:08:02 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSelISO.class
+# /home/vluser/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	Thu Nov  6 11:08:02 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmPkgSel.class
==============================================================================
--- branches/iVL/FrmPkgSel.class	(original)
+++ branches/iVL/FrmPkgSel.class	Thu Nov  6 11:08:02 2008
@@ -15,6 +15,9 @@
  '    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 pYes AS picture = Picture.load("images/16px-check.png")
+PUBLIC pNo AS Picture = picture.load("images/16px-Nocheck.png")
+

  PUBLIC SUB Form_Open()

@@ -23,12 +26,27 @@
        .rbFull_Click()
    END WITH
    FMain.FrmCurr = ME
-  FMain.tvPlan["Prep3"].Selected = TRUE
-  FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
-  FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic
+  ' ' FMain.tvPlan["Prep3"].Selected = TRUE
+  ' ' FMain.tvPlan["Prep2"].Picture = MdlCore.sDonePic
+  ' ' FMain.tvPlan["Prep3"].Picture = MdlCore.sNowPic
    FMain.btback.Enabled = TRUE
  FMain.btback.ForeColor = Color.Black

+'ME.scrlInstallOpts.Columns.count = 4
+WITH ME.scrlInstallOpts
+.Columns.count = 4
+.Rows.count = 1
+.Header = TRUE
+.Columns[1].text = ("Package")
+.Columns[2].Text = ("Description")
+.Columns[3].Text = ("Size")
+.Columns[0].Width = 32
+.Columns[1].Width = 120
+.Columns[2].Width = 350
+END WITH
+
+ME.FILL_IN_BULK_LIST()
+
  END

  PUBLIC SUB Form_Resize()
@@ -36,10 +54,11 @@
    WITH ME
      '.tlBanner.Width = .ClientWidth - 8
      .tlBanner.Move(4, 4, .ClientWidth - (.tlBanner.Left * 2), 27)
-    .hrSep.Move(4, .tlBanner.top + .tlBanner.Height -  
(.hrSep.H), .tlBanner.Width)
+    .hrSep.Move(4, .tlBanner.top + .tlBanner.Height, .tlBanner.Width)
      .rbFull.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height + 12,  
MdlObjSizer.get_object_width(.rbfull.text) + 36)
      .rbCustom.Move(.tlBanner.Left, .rbFull.top + .rbFull.Height + 4,  
MdlObjSizer.get_object_width(.rbcustom.text) + 36)
-    .tlActionDesc.Width = .tlBanner.Width - 4
+    .tlActionDesc.Move(4, .rbCustom.top + .rbCustom.Height +  
12, .tlBanner.Width - 4)
+    '.tlActionDesc.Width = .tlBanner.Width - 4
      .scrlInstallOpts.Move(.tlActionDesc.Left, .tlActionDesc.top  
+ .tlActionDesc.Height + 8, .tlActionDesc.Width - 12, .ClientHeight -  
(.tlActionDesc.top + (.tlActionDesc.height * 2.75)))

    END WITH
@@ -48,9 +67,10 @@

  PUBLIC SUB rbFull_Click()

-  tlActionDesc.Text = ("Installs everything in your VectorLinux media to  
your system")
+  tlActionDesc.Text = ("Installs all optional components in your  
VectorLinux media to your system")
    tlActionDesc.Adjust
-  scrlInstallOpts.Visible = FALSE
+  'scrlInstallOpts.Visible = FALSE
+  scrlInstallOpts.Enabled = FALSE
    ClsPkgSel.bCustom = FALSE

  END
@@ -59,12 +79,63 @@

    tlActionDesc.Text = ("Choose your optional components to install.")
    tlActionDesc.Adjust
-  scrlInstallOpts.Visible = TRUE
-  MdlPkgSel.LIST_BULK_SELECTION
+  'scrlInstallOpts.Visible = TRUE
+  scrlInstallOpts.Enabled = TRUE
+  'MdlPkgSel.LIST_BULK_SELECTION
    ClsPkgSel.bCustom = TRUE

  END

+PUBLIC SUB FILL_IN_BULK_LIST()
+
+  DIM i, ii AS Integer
+  DIM sBulk AS String
+  DIM sDesc AS String
+  DIM sLine, sSize AS String
+  DIM arrLine AS String[]
+  DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "veclinux"  
&/ "optional" '"/mnt/cdrom/veclinux/optional" ' temporary path ... needs to  
change to global variable
+  DIM sFile AS String[] = Split(File.Load(ClsGlobal.sSourceMnt  
&/ "veclinux" &/ "SETUP.CONF"), gb.NewLine)
+  DIM fsiZe AS Float
+
+  FOR i = 0 TO sFile.count - 1
+      sLine = sFile[i]
+        IF Left(sLine, Len("BULK")) = "BULK" AND InStr(sLine, "optional")  
THEN
+
+                 arrLine = Split(sLine, ":")
+              sBulk = Right(arrLine[0], Len(arrLine[0]) -  
InStr(arrLine[0], "/"))
+              sBulk = File.BaseName(sBulk)
+              sSize = arrLine[1]
+              fsiZe = Round((arrLine[1] / 1024), -2)
+              'Message(fsiZe)
+              sDesc = arrLine[2]
+              sDesc = Replace(sDesc, "\'", "")
+
+              scrlInstallOpts[ii, 0].Picture = pYes
+              scrlInstallOpts[ii, 1].Text = sBulk
+              scrlInstallOpts[ii, 2].Text = sDesc
+              scrlInstallOpts[ii, 3].Text = fsiZe & " MB"
+
+              INC ii
+              INC scrlInstallOpts.Rows.Count
+          'Message.Info(sBulk)
+          END IF
+NEXT
+
+
+
+
+
+
+
+END
+
+
+
+
+
+
+
+
  PUBLIC SUB Form_Hide()

  '   IF ClsPkgSel.bCustom = FALSE THEN
@@ -76,5 +147,28 @@
  PUBLIC SUB Form_Show()

    Form_Open()
+
+END
+
+PUBLIC SUB Form_Menu()
+
+  ME.FILL_IN_BULK_LIST
+
+END
+
+PUBLIC SUB scrlInstallOpts_Click()
+
+  IF LAST.column = 0 THEN
+  IF scrlInstallOpts[LAST.row, LAST.column].Picture = pyes THEN
+    scrlInstallOpts[LAST.row, LAST.column].Picture = pNo
+  ELSE IF scrlInstallOpts[LAST.row, LAST.column].Picture = pNo THEN
+    scrlInstallOpts[LAST.row, LAST.column].Picture = pyes
+  END IF
+'GridView1[LAST.row, LAST.column].Refresh()
+END IF
+
+'Message(GridView1[LAST.row, 4].Text)
+scrlInstallOpts.Refresh()
+

  END

Modified: branches/iVL/FrmPkgSel.form
==============================================================================
--- branches/iVL/FrmPkgSel.form	(original)
+++ branches/iVL/FrmPkgSel.form	Thu Nov  6 11:08:02 2008
@@ -8,22 +8,23 @@
      Text = ("TextLabel1")
      Alignment = Align.Normal
    }
+  { hrSep Separator
+    MoveScaled(34,6,20,1)
+  }
    { rbFull RadioButton
-    MoveScaled(1,9,40,3.2857)
+    MoveScaled(1,10,40,3.1429)
      Text = ("Full Install")
    }
    { rbCustom RadioButton
-    MoveScaled(1,13,55,3.2857)
+    MoveScaled(1,14,55,3.1429)
      Text = ("Custom Install")
    }
    { tlActionDesc TextLabel
-    MoveScaled(1,17,63,6)
+    MoveScaled(1,19,63,4)
      Text = ("")
    }
-  { scrlInstallOpts ScrollView
-    MoveScaled(1,24,52,28)
-  }
-  { hrSep Separator
-    MoveScaled(34,7,20,1)
+  { scrlInstallOpts GridView
+    MoveScaled(1,27,56,23)
+    Expand = True
    }
  }

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Nov  6 11:08:02 2008
@@ -497,18 +497,33 @@
    DIM i, ii AS Integer
    DIM iRet AS Integer

-  FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
-    sPkg = ClsPkgSel.arrBulks[i]
-    'install the packages now
-    PRINT " + Install " & sPkgPath &/ sPkg
-    'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
-        iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
-    IF iRet <> 0 THEN
-      RETURN 1
-    END IF
-    PRINT " ! " & sPkgPath &/ sPkg & " is installed"
-  NEXT
-END
+  REPEAT
+    IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes THEN
+      sPkg = FrmPkgSel.scrlInstallOpts[ii, 1].text & ".tlz"
+      iret = ME.INSTALL_THIS_BULK(sPkgPath &/ "optional" &/ sPkg)
+        IF iret <> 0 THEN
+          RETURN 1
+        END IF
+      INC ii
+      END IF
+    UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+
+
+
+' ' ' '
+' ' ' '
+' ' ' '   FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
+' ' ' '     sPkg = ClsPkgSel.arrBulks[i]
+' ' ' '     'install the packages now
+' ' ' '     PRINT " + Install " & sPkgPath &/ sPkg
+' ' ' '     'iRet = ME.INSTALL_THIS_PACKAGE(sPkgPath &/ sPkg)
+' ' ' '         iret = ME.INSTALL_THIS_BULK(sPkgPath &/ sPkg)
+' ' ' '     IF iRet <> 0 THEN
+' ' ' '       RETURN 1
+' ' ' '     END IF
+' ' ' '     PRINT " ! " & sPkgPath &/ sPkg & " is installed"
+' ' ' '   NEXT
+ END


  PUBLIC SUB CALCULATE_TOTAL_PACKAGES()
@@ -551,14 +566,22 @@
      i = i + 1
    END IF
    'Count user-selected stuff in
-      'we will need to cycle through the arrays for th is for accuracy...
-        irs = 0
-        FOR EACH cb IN MdlPkgSel.Bulks
-          IF cb.value = TRUE THEN INC irs
+
+        REPEAT
+          IF FrmPkgSel.scrlInstallOpts[ii, 0].Picture = FrmPkgSel.pyes  
THEN INC irs
+          INC ii
+          UNTIL ii = FrmPkgSel.scrlInstallOpts.Rows.Count
+          i = i + irs

-
-        NEXT
-        i = i + irs
+
+      ' ' ' ' 'we will need to cycle through the arrays for th is for  
accuracy...
+      ' ' ' '   irs = 0
+      ' ' ' '   FOR EACH cb IN MdlPkgSel.Bulks
+      ' ' ' '     IF cb.value = TRUE THEN INC irs
+      ' ' ' '
+      ' ' ' '
+      ' ' ' '   NEXT
+      ' ' ' '   i = i + irs
        ' now do the optional packages
        irs = 0 ' reset the count

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

From: <cod...@go...> - 2008-11-06 17:18:00

Author: M0E.lnx
Date: Thu Nov  6 09:16:12 2008
New Revision: 266

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/DevLog
    branches/iVL/FrmSelISO.class
    branches/iVL/MdlInstallCustom.module

Log:
- Implemented new package listing for custom installation


Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov  6 09:16:12 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.

Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Thu Nov  6 09:16:12 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.
@@ -31,7 +31,7 @@
  msgstr ""

  #: FrmSelISO.class:82
-msgid "Installable media found."
+msgid "Select installation media from the list below"
  msgstr ""

  #: FrmSelISO.class:113

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Nov  6 09:16:12 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/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Thu Nov  6 09:16:12 2008
@@ -1,2 +1 @@
-- Fixed EXEC line that triggers when installer is done
-- Fixed duplicate "During this process" in message.wrarning before setting  
up X
+- Implemented new package listing for custom installation

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Thu Nov  6 09:16:12 2008
@@ -79,7 +79,7 @@
      FMain.btnext.ForeColor = Color.Gray
      FMain.btback.ForeColor = Color.Gray
      ELSE
-      tlBanner.text = "<b>" & ("Installable media found.") & "</b>"
+      tlBanner.text = "<b>" & ("Select installation media from the list  
below") & "</b>"
        WITH FMain
          .btback.Enabled = FALSE
            .btback.ForeColor = Color.Gray

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Nov  6 09:16:12 2008
@@ -248,7 +248,7 @@
  PUBLIC FUNCTION INSTALL_USER_PACKAGES() AS Integer

    DIM ii, i, iStepTotal AS Integer
-  DIM sBasePath AS String = ClsGlobal.sTargetMnt &/ "packages"
+  DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
    DIM sLoc, spkg, sDump AS String

    ' get the step total by running though the list and comparing pictures
@@ -269,9 +269,18 @@
        sPkg = FrmUsrPkgSel.GridView1[ii, 5].Text
        INC i
          ' install this package
-        EXEC ["echo", " ", " > /tmp/installdump"] WAIT
+        EXEC ["echo \" \" > /tmp/installdump"] WAIT
            FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &  
FrmUsrPkgSel.GridView1[ii, 1].Text
-              hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "  
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
+                FrmInstallSys.pbInstallProg.Value = i / iStepTotal
+          INC iPkgNum
+          FrmInstallSys.pbInstallProg2.Value =  
MdlSetup.UPDATE_OVERALL_PROGRESS(iPkgCnt, iPkgNum)
+
+              'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "  
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
+              'hproc = EXEC ["installpkg -R " & ClsGlobal.sTargetMnt &  
Space(1) & sBasePath &/ sLoc &/ sPkg & " || echo \'FAILED\' 2>  
/tmp/installdump"]
+              'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg & "  
-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2> /tmp/installdump"]
+              'hproc = EXEC ["installpkg", sBasePath &/ sLoc &/  
sPkg, "-R " & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
+              'hproc = EXEC ["installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & " || echo \'FAILED\' 2>  
/tmp/installdump"] WAIT
+              hproc = SHELL "installpkg " & sBasePath &/ sLoc &/ sPkg &  
Space(1) & "-R" & Space(1) & ClsGlobal.sTargetMnt & Space(1) & "|| echo  
\'FAILED\' 2> /tmp/installdump" 'WAIT
                      WAIT 1
                      IF hproc.State = Process.Running THEN
                        REPEAT
@@ -280,8 +289,9 @@
                    END IF
            sDump = File.Load("/tmp/installdump")

-          INC i
-          FrmInstallSys.pbInstallProg.Value = i / iStepTotal
+          'INC i
+
+
              IF InStr(sDump, "FAILED") > 0 THEN
                    Message.Error("Error installing user-selected package" &  
Space(1) & sPkg)
                    RETURN 1
@@ -503,7 +513,7 @@

  PUBLIC SUB CALCULATE_TOTAL_PACKAGES()

-  DIM i AS Integer
+  DIM i, ii AS Integer
    DIM irs AS Integer
    DIM sOutput AS String
    DIM sOutArr AS String[]
@@ -563,7 +573,7 @@
          ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
          ' ' ' ' ' ' '   IF cb.Value = TRUE THEN INC irs
          ' ' ' ' ' ' '
-        NEXT
+'        NEXT
        i = i + irs ' the count to the total
    'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count
    iPkgCnt = i
@@ -636,10 +646,12 @@
      sDesc = Replace(sDesc, "\'", "")
    vSize = Trim(CStr(vSize))
    sDump = ""
-  SHELL "echo \"\" > /tmp/installdump" WAIT
+  'SHELL "echo \" \" > /tmp/installdump" WAIT
+  EXEC ["echo \" \" > /tmp/installdump"] WAIT
    sErr = ""
    IF vSize <> "" THEN
      SHELL "gsize=$(df| grep " & ClsGlobal.sTargetMnt & " ) && echo $gsize  
| cut -f3 -d \' \'" TO vTargetSize
+'    EXEC ["gzise=$(df | grep " & ClsGlobal.sTargetMnt & ") && echo $gzise  
| cut -f3 -d \' \'"] TO vTargetSize
    END IF
    FrmInstallSys.pbInstallProg.Value = 0
    INC iPkgNum

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

From: <cod...@go...> - 2008-11-06 14:20:18

Author: M0E.lnx
Date: Thu Nov  6 06:19:44 2008
New Revision: 265

Modified:
    branches/iVL/.lang/FrmSummary.pot
    branches/iVL/FrmSummary.class
    branches/iVL/MdlInstallCustom.module

Log:
Fixed bug with new package selection listings

Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Thu Nov  6 06:19:44 2008
@@ -66,15 +66,15 @@
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:257
+#: FrmSummary.class:259
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:267
+#: FrmSummary.class:269
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:277
+#: FrmSummary.class:279
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Thu Nov  6 06:19:44 2008
@@ -192,16 +192,17 @@

          'OLD CODE BASED ON THE CHECKBOX OBJECTS
          i = 0
-        irow = 0
+        'irow = 0
          'INC GridView2.Rows.Count
                  REPEAT
                    IF FrmUsrPkgSel.GridView1[i, 0].Picture =  
FrmUsrPkgSel.pYes THEN
                    INC GridView2.Rows.Count
                      GridView2[irow, 0].Text = FrmUsrPkgSel.GridView1[i,  
1].Text
+                    INC irow
                    END IF
                    INC i
-                  INC irow
-                UNTIL i = FrmUsrPkgSel.GridView1.Rows.count - 1
+
+                UNTIL i = FrmUsrPkgSel.GridView1.Rows.Count

              ' ' '
              ' ' '

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Thu Nov  6 06:19:44 2008
@@ -484,7 +484,7 @@

    DIM SPkg AS String
    DIM sPkgPath AS String = ClsGlobal.sSourceMnt &/ "veclinux"
-  DIM i AS Integer
+  DIM i, ii AS Integer
    DIM iRet AS Integer

    FOR i = 0 TO ClsPkgSel.arrBulks.Count - 1
@@ -551,9 +551,18 @@
          i = i + irs
        ' now do the optional packages
        irs = 0 ' reset the count
-        FOR EACH cb IN MdlPkgSel.Pkgs
-          IF cb.Value = TRUE THEN INC irs
-
+
+        REPEAT
+          IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+            INC irs
+          END IF
+          INC ii
+          UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count
+
+
+        ' ' ' ' ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+        ' ' ' ' ' ' '   IF cb.Value = TRUE THEN INC irs
+        ' ' ' ' ' ' '
          NEXT
        i = i + irs ' the count to the total
    'i = i + ClsPkgSel.arrBulks.Count + ClsPkgSel.arrPkgs.Count

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

From: <cod...@go...> - 2008-11-05 23:40:25

Author: uelsk8s
Date: Wed Nov  5 15:39:28 2008
New Revision: 264

Modified:
    branches/iVL/.project
    branches/iVL/FMain.class
    branches/iVL/FrmLangSel.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/installer.gambas

Log:
added the users group to the useradd command

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Wed Nov  5 15:39:28 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.123
+Version=0.0.126
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,6 +17,7 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
+ExecPath=/root/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Nov  5 15:39:28 2008
@@ -366,7 +366,7 @@


            ME.END_INSTALLER()
-          frmNext = FrmAlsaConf
+          'frmNext = FrmAlsaConf
  '      frmNext = FrmLilo ' this is already done

    CASE "FrmAlsaConf"

Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class	(original)
+++ branches/iVL/FrmLangSel.class	Wed Nov  5 15:39:28 2008
@@ -34,31 +34,31 @@
  PUBLIC SUB LIST_LANG_CHOICES()


-  ' ' ' ' ' WITH ME.lblangsel
-  ' ' ' ' '   .Add("es_ES", "Spanish")
-  ' ' ' ' '   .Add("en_US", "US English")
-  ' ' ' ' ' END WITH
+  WITH ME.lblangsel
+    .Add("es_ES", "Spanish")
+    .Add("en_US", "US English")
+  END WITH


-    DIM sLangCode, sLangName AS String
-    DIM i AS Integer
-
-    i = 0
-    FOR EACH sLangCode IN Dir(".lang", "*.mo")
-      'Message(sLangCode)
-      SELECT CASE File.BaseName(".lang" &/ sLangCode)
-        CASE "en_US"
-          sLangName = "US English"
-        CASE "es"
-          sLangName = "Spanish"
-      END SELECT
-
-    ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
-
-
-NEXT
-
-
+'     DIM sLangCode, sLangName AS String
+'     DIM i AS Integer
+'
+'     i = 0
+'     FOR EACH sLangCode IN Dir(".lang", "*.mo")
+'       'Message(sLangCode)
+'       SELECT CASE File.BaseName(".lang" &/ sLangCode)
+'         CASE "en_US"
+'           sLangName = "US English"
+'         CASE "es"
+'           sLangName = "Spanish"
+'       END SELECT
+'
+'     ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
+'
+'
+' NEXT
+'
+'
  END



Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Wed Nov  5 15:39:28 2008
@@ -148,7 +148,7 @@
            'SHELL "chroot /mnt/target  /usr/sbin/useradd -m -s /bin/bash  
-u " & iUID & " -g " & ME.tbUsername.Text & " -G " & sGroups & Space(1) &  
ME.tbUsername.Text WAIT
            PRINT "Creating new user account"
            SHELL "chroot /mnt/target /usr/sbin/useradd -m -c " & "\'" &  
ME.tbRealname.text & "\'" & " -g " & ME.tbUsername.text &
-          " -p " & ME.tbPasswd1.text & " -u " & iUID & " -G " & "\'" &  
sGroups & "\' -s /bin/bash " & ME.tbUsername.Text WAIT
+          " -p " & ME.tbPasswd1.text & " -u " & iUID & " -G " & "\'users,"  
& sGroups & "\' -s /bin/bash " & ME.tbUsername.Text WAIT
          '  sDocmd = "useradd -m -c " & "\'" & sname & "\'" & " -g " &  
slogin & " -p " & ME.txtpass1.Text &
         '" -G " & "\'" & sgrparse & "\' " & slogin


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

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

From: <cod...@go...> - 2008-11-05 22:32:58

Author: M0E.lnx
Date: Wed Nov  5 14:31:19 2008
New Revision: 263

Added:
    branches/iVL/FrmUsrPkgSel.class
    branches/iVL/FrmUsrPkgSel.form
    branches/iVL/MdlPkgSelNew.module
    branches/iVL/images/16px-Nocheck.png   (contents, props changed)
    branches/iVL/images/16px-check.png   (contents, props changed)
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/DevLog
    branches/iVL/FMain.class
    branches/iVL/FrmNetConf.class
    branches/iVL/FrmNetConf.form
    branches/iVL/FrmSummary.class
    branches/iVL/MdlInstallCustom.module
    branches/iVL/MdlNetConf.module

Log:
- Fixed bug with hostname/domain name
- Began implementing new package selection window
   This will eliminate the lag and memmory useage
   required to display full package descriptions on
   the software selection phase



Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsGlobal.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsPartSel.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/ClsWinDrives.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FMain.class
+# /home/vluser/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -18,83 +18,91 @@
  msgid "Restart"
  msgstr ""

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

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

-#: FMain.class:213
+#: FMain.class:214
  msgid "This may take a while ..."
  msgstr ""

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

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

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

-#: FMain.class:291
+#: FMain.class:295
  msgid "Skipping lilo setup"
  msgstr ""

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

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

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

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

-#: FMain.class:320
+#: FMain.class:324
  msgid "Yes"
  msgstr ""

-#: FMain.class:320
+#: FMain.class:324
  msgid "No"
  msgstr ""

-#: FMain.class:343
+#: FMain.class:341
+msgid "Please specify a hostname for this computer"
+msgstr ""
+
+#: FMain.class:345
+msgid "Please specify the domain this computer belongs to"
+msgstr ""
+
+#: FMain.class:358
  msgid "VectorLinux will now try to detect and configure your graphics  
hardware."
  msgstr ""

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

-#: FMain.class:494
+#: FMain.class:509
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:514
+#: FMain.class:529
  msgid "Next"
  msgstr ""

-#: FMain.class:520
+#: FMain.class:535
  msgid "Back"
  msgstr ""

-#: FMain.class:526
+#: FMain.class:541
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:542
+#: FMain.class:557
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmDiskPart.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartScheme.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPartSel.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmPkgSel.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSelISO.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmSummary.class
+# /home/vluser/devel/installer/FrmSummary.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -66,15 +66,15 @@
  msgid "USER-SELECTED PACKAGES"
  msgstr ""

-#: FrmSummary.class:243
+#: FrmSummary.class:257
  msgid "Installation Type"
  msgstr ""

-#: FrmSummary.class:253
+#: FrmSummary.class:267
  msgid "Partition Selection Scheme"
  msgstr ""

-#: FrmSummary.class:263
+#: FrmSummary.class:277
  msgid "Software Selection"
  msgstr ""


Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot	(original)
+++ branches/iVL/.lang/FrmWinDrives.pot	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/FrmWinDrives.class
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlCore.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlDiskPart.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlObjSizer.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPartSel.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlPkgSel.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSetup.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlSummarize.module
+# /home/vluser/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	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,4 @@
-# /home/rbistolfi/vinstall-ng/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Wed Nov  5 14:31:19 2008
@@ -1,4 +1,2 @@
-- Restored code to automatically list the translations provided by looking  
in .lang
-- Modified the way the installer ends. Added final message window instead  
of a message.warning
-- Added warning right before quietly configuring X letting the user know  
that the screen may flicker.
-- Updated binary
+- Fixed EXEC line that triggers when installer is done
+- Fixed duplicate "During this process" in message.wrarning before setting  
up X

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Nov  5 14:31:19 2008
@@ -175,7 +175,8 @@
    tvPlan.Refresh()

    IF LAST.TEXT = ("Restart") THEN
-  EXEC "shutdown -r now"
+  'EXEC "shutdown", "-r", " now"
+  EXEC ["shutdown", "-r", "now"]
    ELSE

    IF FrmLangSel.Visible = TRUE THEN
@@ -246,13 +247,16 @@
                'get the list of selected bulks only

                MdlPkgSel.GET_USER_BULK_SELECTION()
-              frmNext = FrmPkgsel2
+              'frmNext = FrmPkgsel2
+              frmNext = FrmUsrPkgSel
              ELSE
                ' Going for simple install. Now we are ready to summarize
  ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '                
MdlSummarize.SUMMARIZE_INSTALL
                frmNext = FrmSummary
              END IF
-    CASE "FrmPkgsel2"
+
+
+    CASE "FrmPkgsel2", "FrmUsrPkgSel"
        ' summarize the build
  ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' '          
MdlSummarize.SUMMARIZE_INSTALL
          frmNext = FrmSummary
@@ -333,14 +337,25 @@


      CASE "FrmNetConf"
-      MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text)
+        IF Trim(FrmNetConf.txtHostName.Text) = "" THEN
+          Balloon.Error(("Please specify a hostname for this computer"),  
FrmNetConf.txtHostName)
+          RETURN
+        END IF
+        IF Trim(FrmNetConf.tbDomain.Text) = "" THEN
+          Balloon.Error(("Please specify the domain this computer belongs  
to"), FrmNetConf.tbDomain)
+          RETURN
+        END IF
+
+
+
+      MdlNetConf.SET_HOSTNAME(FrmNetConf.txtHostName.text,  
FrmNetConf.tbDomain.Text)
        MdlNetConf.SET_DNS_ADDRESSES()
        MdlNetConf.WRITE_INET()


        ' CONFIGURE X QUIETLY HERE
            Message.Warning(("VectorLinux will now try to detect and  
configure your graphics hardware.") & "<br>" &
-          ("Your screen may flicker or go blank during this process for a  
few seconds during this process."))
+          ("Your screen may flicker or go blank for a few seconds during  
this process."))

          MdlXconf.QUIET_XORG_CONFIGURATION()


Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Wed Nov  5 14:31:19 2008
@@ -17,15 +17,27 @@

  PUBLIC FUNCTION GET_CURRENT_HOST_NAME() AS String
    DIM sRes AS String
+  DIM sDomain AS String
+  DIM sHost AS String

-    SHELL "chroot " & ClsGlobal.sTargetMnt & " hostname" TO sRes
-
-    sRes = Trim(sRes)
-      IF sRes = "" THEN
+    'SHELL "chroot " & ClsGlobal.sTargetMnt & " hostname" TO sRes
+    EXEC ["chroot " & ClsGlobal.sTargetMnt, "hostname"] TO sRes
+
+    IF sRes = "" THEN
          sRes = "Vector.Linux.net"
        END IF

-    RETURN Trim(sRes)
+
+    sRes = Trim(sRes)
+    IF InStr(sRes, ".") THEN
+      sHost = Left(sRes, InStr(sRes, ".") - 1)
+      sDomain = Right(sRes, Len(sRes) - InStr(sRes, "."))
+          ' set the default domain name
+          FrmNetConf.tbDomain.Text = sDomain
+      END IF
+
+
+    RETURN Trim(sHost)

  END

@@ -33,13 +45,13 @@
  PUBLIC SUB Form_Open()
    DIM cb AS ComboBox
      FMain.FrmCurr = ME
+    ME.tlHostNameLbl.Alignment = Align.Normal

-
-    WITH FMain
-    .tvPlan["Conf3"].Picture = MdlCore.sDonePic
-    .tvPlan["Conf4"].Picture = MdlCore.sNowPic
-    .tvPlan["Conf4"].Selected = TRUE
-  END WITH
+  ' '   WITH FMain
+  ' '   .tvPlan["Conf3"].Picture = MdlCore.sDonePic
+  ' '   .tvPlan["Conf4"].Picture = MdlCore.sNowPic
+  ' '   .tvPlan["Conf4"].Selected = TRUE
+  ' ' END WITH

      ME.txtHostName.text = ME.GET_CURRENT_HOST_NAME()

@@ -64,6 +76,7 @@

    'MdlNetConf.WRITE_INET() ' only enabled for testing. THis will get  
triggered on the "next" button's click event
    'MdlNetConf.SET_DNS_ADDRESSES
+  'MdlNetConf.UPDATE_HOSTS_FILE(Trim(txtHostName.Text),  
Trim(tbDomain.Text))

  END

@@ -75,6 +88,8 @@
        .hrSep.Move(4, .tlBanner.top + .tlBanner.Height - 4, .tlBanner.Width)
        .tlHostNameLbl.Move(.tlBanner.Left, .tlBanner.top + .tlBanner.Height  
+ 8, MdlObjSizer.get_object_width(.tlHostNameLbl.text), 21)
        .txtHostName.Move(.tlHostNameLbl.left + .tlHostNameLbl.Width +  
4, .tlHostNameLbl.top)
+      .tlDomainName.Move(.txtHostName.Left + .txtHostName.Width +  
24, .txtHostName.top, MdlObjSizer.get_object_width(.tlDomainName.Text))
+      .tbDomain.Move(.tlDomainName.left + .tlDomainName.Width +  
4, .tlDomainName.top, .txtHostName.Width)
        .cbUseManDNS.Move(.tlHostNameLbl.Left, .tlHostNameLbl.top  
+ .tlHostNameLbl.Height + 10,  
MdlObjSizer.get_object_width(.cbUseManDNS.text) + 24)
        .tlPrimaryDNS.Move(.cbUseManDNS.left, .cbUseManDNS.top  
+ .cbUseManDNS.Height + 4, MdlObjSizer.get_object_width(.tlPrimaryDNS.text))
          itxtboxleft = .tlPrimaryDNS.Left + .tlPrimaryDNS.Width + 24
@@ -95,5 +110,34 @@

      ME.txtPrimaryDNS.Enabled = cbUseManDNS.Value
      ME.txtSecDNS.Enabled = cbUseManDNS.Value
+
+END
+
+PUBLIC SUB txtHostName_KeyRelease()
+IF Key.Text THEN
+  IF Key.text LIKE "*[a-z]*" OR Key.text LIKE "*[A-Z]*" OR Key.text = "-"  
OR Key.Text = "." OR Key.Text LIKE "*[0-9]*" THEN
+    'Message("good")
+  ELSE
+    IF Key.text <> "-" OR Key.Text <> "." THEN
+    txtHostName.Text = Left(txtHostName.Text, Len(txtHostName.Text) - 1)
+    END IF
+    'Message("Bad")
+  END IF
+END IF
+
+END
+
+PUBLIC SUB tbDomain_KeyRelease()
+
+ IF Key.Text THEN
+  IF Key.text LIKE "*[a-z]*" OR Key.text LIKE "*[A-Z]*" OR Key.text = "-"  
OR Key.Text = "." OR Key.Text LIKE "*[0-9]*" THEN
+    'Message("good")
+  ELSE
+    IF Key.text <> "-" OR Key.Text <> "." THEN
+    txtHostName.Text = Left(txtHostName.Text, Len(txtHostName.Text) - 1)
+    END IF
+    'Message("Bad")
+  END IF
+END IF

  END

Modified: branches/iVL/FrmNetConf.form
==============================================================================
--- branches/iVL/FrmNetConf.form	(original)
+++ branches/iVL/FrmNetConf.form	Wed Nov  5 14:31:19 2008
@@ -3,14 +3,20 @@
  { Form Form
    MoveScaled(0,0,114,74)
    Text = ("")
-  { tlHostNameLbl TextLabel
-    MoveScaled(1,8,16,3)
-    Text = ("Computer Name")
+  { tlDomainName TextLabel
+    MoveScaled(47,8,9,3)
+    Text = ("Domain")
      Alignment = Align.Normal
    }
    { txtHostName TextBox
      MoveScaled(18,8,28,3)
      Text = ("")
+    MaxLength = 24
+  }
+  { tbDomain TextBox
+    MoveScaled(58,8,29,3)
+    Text = ("")
+    MaxLength = 24
    }
    { frmNetDevices Frame
      MoveScaled(1,20,85,49)
@@ -33,7 +39,7 @@
    }
    { txtPrimaryDNS TextBox txtManDNSBoxes
      Name = "txtPrimaryDNS"
-    MoveScaled(24,16,18.3333,3)
+    MoveScaled(24,16,18.2857,3)
      Enabled = False
      Text = ("192.168.1.254")
    }
@@ -44,7 +50,7 @@
    }
    { txtSecDNS TextBox txtManDNSBoxes
      Name = "txtSecDNS"
-    MoveScaled(68,15,18.3333,3)
+    MoveScaled(68,15,18.2857,3)
      Enabled = False
      Text = ("")
    }
@@ -55,5 +61,10 @@
    }
    { hrSep Separator
      MoveScaled(13,6,33,1)
+  }
+  { tlHostNameLbl TextLabel
+    MoveScaled(2,8,15,3)
+    Text = ("Computer Name")
+    Alignment = Align.Normal
    }
  }

Modified: branches/iVL/FrmSummary.class
==============================================================================
--- branches/iVL/FrmSummary.class	(original)
+++ branches/iVL/FrmSummary.class	Wed Nov  5 14:31:19 2008
@@ -154,7 +154,7 @@

  PUBLIC SUB prepare_packages_summary()

-    DIM irow AS Integer = 0
+    DIM irow, i AS Integer = 0
      DIM sPkg, sSize AS String
      DIM cb AS CheckBox
      DIM sDesc AS String
@@ -190,15 +190,30 @@
            GridView2[irow, 0].text = ("USER-SELECTED PACKAGES")
          INC irow

-            FOR EACH cb IN MdlPkgSel.Pkgs
-              IF cb.Value = TRUE THEN
-                INC GridView2.Rows.Count
-                  GridView2[irow, 0].text = File.BaseName(cb.tag)
-                  'shell "
+        'OLD CODE BASED ON THE CHECKBOX OBJECTS
+        i = 0
+        irow = 0
+        'INC GridView2.Rows.Count
+                REPEAT
+                  IF FrmUsrPkgSel.GridView1[i, 0].Picture =  
FrmUsrPkgSel.pYes THEN
+                  INC GridView2.Rows.Count
+                    GridView2[irow, 0].Text = FrmUsrPkgSel.GridView1[i,  
1].Text
+                  END IF
+                  INC i
                    INC irow
-              END IF
-
-            NEXT
+                UNTIL i = FrmUsrPkgSel.GridView1.Rows.count - 1
+
+            ' ' '
+            ' ' '
+            ' ' ' FOR EACH cb IN MdlPkgSel.Pkgs
+            ' ' '   IF cb.Value = TRUE THEN
+            ' ' '     INC GridView2.Rows.Count
+            ' ' '       GridView2[irow, 0].text = File.BaseName(cb.tag)
+            ' ' '       'shell "
+            ' ' '       INC irow
+            ' ' '   END IF
+            ' ' '
+            ' ' ' NEXT
  END



Added: branches/iVL/FrmUsrPkgSel.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmUsrPkgSel.class	Wed Nov  5 14:31:19 2008
@@ -0,0 +1,108 @@
+' Gambas class file
+
+
+PUBLIC pYes AS Picture = Picture.Load("images/16px-check.png")
+PUBLIC pNo AS Picture = Picture.Load("images/16px-Nocheck.png")
+
+
+PUBLIC SUB Form_Open()
+
+FMain.FrmCurr = ME
+
+    WITH ME.GridView1
+    .Columns.count = 6
+    '.Rows.count = 2
+    .Columns[0].Width = 24
+    .Columns[1].Text = ("Package Name")
+    .Columns[2].text = ("Description")
+    .Columns[2].Width = 420
+    .Columns[3].text = ("Size")
+    .Columns[3].Width = 120
+    .Columns[4].Width = 0
+    .Columns[5].Width = 0
+
+    END WITH
+ME.LIST_PACKAGES
+END
+
+PUBLIC SUB LIST_PACKAGES()
+
+    'DIM sFile AS String = File.Load("/tmp/PACKAGES.TXT")
+    DIM sFile AS String = File.Load(ClsGlobal.sSourceMnt &/ "packages"  
&/ "PACKAGES.TXT")
+    DIM sPACKAGES AS String[]
+    DIM i, ii AS Integer
+    DIM sLine, sPkg, sDesc, sSize, sLoc AS String
+
+    sPACKAGES = Split(sFile, "\n")
+      FOR i = 0 TO sPACKAGES.count - 1
+
+          sLine = Trim(sPACKAGES[i])
+              IF Left(sLine, Len("PACKAGE NAME:")) = "PACKAGE NAME:" THEN
+                    INC GridView1.Rows.Count
+
+                sPkg = Trim(Right(sLine, Len(sLine) - InStr(sLine, ":")))
+                sSize = sPACKAGES[i + 3]
+                sLoc = sPACKAGES[i + 1]
+                sSize = Right(sSize, Len(sSize) - InStr(sSize, ":"))
+                sSize = Replace(sSize, "*[A-Z]", "")
+                sLoc = Right(sLoc, Len(sLoc) - InStr(sLoc, "/"))
+
+                    ' Add to the list
+                'ME.GridView1[ii, 1].text = sPkg
+                ME.GridView1[ii, 0].Picture = pYes
+                EXEC ["pkgname", sPkg] TO ME.GridView1[ii, 1].Text
+                ME.GridView1[ii, 3].Text = sSize
+                ME.GridView1[ii, 4].Text = sLoc
+                ME.GridView1[ii, 5].Text = sPkg
+              ELSE IF Left(sLine, Len("PACKAGE DESCRIPTION:")) = "PACKAGE  
DESCRIPTION:" THEN
+                  sDesc = sPACKAGES[i + 1]
+                  sDesc = Right(sDesc, Len(sDesc) - InStr(sDesc, ":"))
+                  sDesc = Trim(sDesc)
+                        IF InStr(sDesc, "(") THEN
+                          sDesc = Right(sDesc, Len(sDesc) -  
InStr(sDesc, "("))
+                          sDesc = Replace(sDesc, ")", "")
+                        END IF
+
+                    ' Add description
+                    ME.GridView1[ii, 2].text = sDesc
+
+
+
+                    INC ii
+                    'INC GridView1.Rows.Count
+              END IF
+
+
+      NEXT
+
+
+
+
+
+
+END
+
+
+PUBLIC SUB GridView1_Click()
+
+'Message(GridView1.Current.text)
+IF LAST.column = 0 THEN
+  IF GridView1[LAST.row, LAST.column].Picture = pyes THEN
+    GridView1[LAST.row, LAST.column].Picture = pNo
+  ELSE IF GridView1[LAST.row, LAST.column].Picture = pNo THEN
+    GridView1[LAST.row, LAST.column].Picture = pyes
+  END IF
+'GridView1[LAST.row, LAST.column].Refresh()
+END IF
+
+'Message(GridView1[LAST.row, 4].Text)
+GridView1.Refresh()
+
+
+END
+
+PUBLIC SUB Form_Menu()
+
+  MdlPkgSelNew.GET_LIST_OF_SELECTED_PACKAGES()
+
+END

Added: branches/iVL/FrmUsrPkgSel.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmUsrPkgSel.form	Wed Nov  5 14:31:19 2008
@@ -0,0 +1,31 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,72,47)
+  Text = ("")
+  Arrangement = Arrange.Vertical
+  { Panel1 Panel
+    MoveScaled(1,1,68,4)
+    Arrangement = Arrange.Horizontal
+    AutoResize = True
+    { tlBanner TextLabel
+      MoveScaled(1,0,20,3)
+      Expand = True
+      AutoResize = True
+      Text = ("Software Selection")
+      Alignment = Align.Normal
+      Border = Border.Plain
+    }
+  }
+  { Panel2 Panel
+    MoveScaled(1,6,70,28)
+    Expand = True
+    Arrangement = Arrange.Vertical
+    { GridView1 GridView
+      MoveScaled(0,1,64,25)
+      Expand = True
+      Mode = Select.Single
+      Header = GridView.Horizontal
+    }
+  }
+}

Modified: branches/iVL/MdlInstallCustom.module
==============================================================================
--- branches/iVL/MdlInstallCustom.module	(original)
+++ branches/iVL/MdlInstallCustom.module	Wed Nov  5 14:31:19 2008
@@ -53,7 +53,8 @@
      RETURN
    END IF

-  iret = ME.INSTALL_USER_SELECTED_PACKAGES()
+  'iret = ME.INSTALL_USER_SELECTED_PACKAGES()
+  iret = ME.INSTALL_USER_PACKAGES() ' new code based on the gridview
      'Message("Installing user-selected packages")
    PRINT "INSTALLING OPTIONAL SOFTWARE SELECTED BY USER"
    IF iRet <> 0 THEN
@@ -243,7 +244,62 @@
  ' ' '   NEXT
  ' ' ' END

+
+PUBLIC FUNCTION INSTALL_USER_PACKAGES() AS Integer
+
+  DIM ii, i, iStepTotal AS Integer
+  DIM sBasePath AS String = ClsGlobal.sTargetMnt &/ "packages"
+  DIM sLoc, spkg, sDump AS String
+
+  ' get the step total by running though the list and comparing pictures
+  ii = 0
+    REPEAT
+    IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+    INC iStepTotal
+    END IF
+      INC ii
+    UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count - 1
+
+  ii = 0
+
+
+  REPEAT
+    IF FrmUsrPkgSel.GridView1[ii, 0].Picture = FrmUsrPkgSel.pYes THEN
+      sLoc = FrmUsrPkgSel.GridView1[ii, 4].Text
+      sPkg = FrmUsrPkgSel.GridView1[ii, 5].Text
+      INC i
+        ' install this package
+        EXEC ["echo", " ", " > /tmp/installdump"] WAIT
+          FrmInstallSys.tlCurrPkg.Text = ("Installing") & Space(1) &  
FrmUsrPkgSel.GridView1[ii, 1].Text
+              hproc = EXEC ["installpkg", sBasePath &/ sLoc &/ sPkg, "  
-R ", ClsGlobal.sTargetMnt, " || echo \'FAILED\' 2> /tmp/installdump"]
+                    WAIT 1
+                    IF hproc.State = Process.Running THEN
+                      REPEAT
+                        WAIT
+                    UNTIL hproc.State = Process.Stopped
+                  END IF
+          sDump = File.Load("/tmp/installdump")
+
+          INC i
+          FrmInstallSys.pbInstallProg.Value = i / iStepTotal
+            IF InStr(sDump, "FAILED") > 0 THEN
+                  Message.Error("Error installing user-selected package" &  
Space(1) & sPkg)
+                  RETURN 1
+                ' ELSE
+                '   RETURN 0
+                END IF
+
+    END IF
+    INC ii
+  UNTIL ii = FrmUsrPkgSel.GridView1.Rows.Count - 1
+
+
+
+
+END
+
  PUBLIC FUNCTION INSTALL_USER_SELECTED_PACKAGES() AS Integer
+
    DIM cb AS CheckBox
    DIM sBasePath AS String = ClsGlobal.sSourceMnt &/ "packages"
    DIM iStepTotal AS Integer = 0
@@ -257,9 +313,7 @@
          INC iStepTotal
        END IF
      NEXT
-
-
-
+
      FOR EACH cb IN MdlPkgSel.Pkgs
        IF cb.Value = TRUE THEN
          ' we will only measure #/##

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Wed Nov  5 14:31:19 2008
@@ -530,31 +530,35 @@
        File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "rc.d" &/ "rc.inet" & ii,  
sScript)
          IF cb.Value = TRUE THEN
            '''SHELL "chmod +x /tmp/rc.inet" & ii WAIT  ''' This is the  
wrong path
-          SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "etc" &/ "rc.d"  
&/ "rc.inet" & ii WAIT
-      END IF
+            SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "etc" &/ "rc.d"  
&/ "rc.inet" & ii WAIT
+        END IF
        INC ii
      NEXT
      'INC ii
    'ME.SET_HOSTNAME("Test")
  END

-PUBLIC SUB SET_HOSTNAME(sHostName AS String)
+PUBLIC SUB SET_HOSTNAME(sHostName AS String, sDomain AS String)

    DIM sRes AS String
      SHELL "skill -n X" TO sRes
        sRes = Trim(sRes)
-    IF Len(sRes) > 0 THEN
-      SHELL "echo " & sHostName & " > " & ClsGlobal.sTargetMnt &/ "etc"  
&/ "HOSTNAME" WAIT
-    ELSE ' X is not running
-      SHELL "hostname $HOSTNAME; echo " & sHostName & " > " &  
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT ' This sets the hostname  
to the current CLI session and saves it for future boots
-    END IF
-    ME.UPDATE_HOSTS_FILE(sHostName)
+
+      EXEC ["echo ", sHostName & "." & sDomain, " >", ClsGlobal.sTargetMnt  
&/ "etc" &/ "HOSTNAME"] WAIT
+
+    ' ' '
+    ' ' ' IF Len(sRes) > 0 THEN
+    ' ' '   SHELL "echo " & sHostName & " > " & ClsGlobal.sTargetMnt  
&/ "etc" &/ "HOSTNAME" WAIT
+    ' ' ' ELSE ' X is not running
+    ' ' '   SHELL "hostname $HOSTNAME; echo " & sHostName & " > " &  
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT ' This sets the hostname  
to the current CLI session and saves it for future boots
+    ' ' ' END IF
+    ME.UPDATE_HOSTS_FILE(sHostName, sDomain)



  END

-PUBLIC SUB UPDATE_HOSTS_FILE(sHostName AS String)
+PUBLIC SUB UPDATE_HOSTS_FILE(sHostName AS String, sDomain AS String)

      DIM sFileIn, sFileOut AS String

@@ -564,7 +568,7 @@
      "# This file describes a numeber of host-to-address mappings for the  
TCP/IP subsystem. \n" &
      "# It is mostly used  at boot time, when no name servers are running.  
On small systems, this \n" &
      "# file can be used instead of a \"named\" name server. Just add the  
names, addresses and any \n" &
-    "# aliases to this file ...\n #\n#\n#n" &
+    "# aliases to this file ...\n #\n#\n#\n" &
      "# By the way, Arnt Gulbrandsen <agr...@nv...> says that  
127.0.0.1 should NEVER \n" &
      "# be named with the name of the machine. It causes problem sor some  
programs, irc and \n" &
      "# reputedly talk. :^) \n#\n#\n" &
@@ -573,12 +577,14 @@
      "#\n#\n" &
      "# This next entry is technically wrong, but good enough to get TCP/IP  
applications to quit complaining \n" &
      "# that they can\'t clarify the hostname on a loopback-only system  
\n#\n#\n# \n" &
-    "127.0.0.1" & Space(5) & sHostName & Space(5) & sHostName & "\n#\n#" &
+    "127.0.0.1" & Space(5) & sHostName & "." & sDomain & Space(5) &  
sHostName & "\n#\n#" &
      "# End of hosts."

      IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts") THEN MOVE  
ClsGlobal.sTargetMnt &/ "etc" &/ "hosts" TO ClsGlobal.sTargetMnt &/ "etc"  
&/ "hosts.bak"
      IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts") THEN KILL  
ClsGlobal.sTargetMnt &/ "etc" &/ "hosts"

+      Message.Info(sFileIn)
+      RETURN
        TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts",  
SConv(sFileIn))
            CATCH
            Message.Error(Error.where & gb.NewLine & Error.text)

Added: branches/iVL/MdlPkgSelNew.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlPkgSelNew.module	Wed Nov  5 14:31:19 2008
@@ -0,0 +1,18 @@
+' Gambas module file
+
+PUBLIC SUB GET_LIST_OF_SELECTED_PACKAGES()
+  DIM i AS Integer
+  DIM sList AS String
+
+    'FrmUsrPkgSel.GridView1[0, 0].
+      REPEAT
+        IF FrmUsrPkgSel.GridView1[i, 0].Picture = FrmUsrPkgSel.pYes THEN
+          sList = sList & FrmUsrPkgSel.GridView1[i, 1].Text
+        END IF
+        INC i
+        UNTIL i = FrmUsrPkgSel.GridView1.Rows.Count
+
+        Message(sList)
+
+
+END

Added: branches/iVL/images/16px-Nocheck.png
==============================================================================
Binary file. No diff available.

Added: branches/iVL/images/16px-check.png
==============================================================================
Binary file. No diff available.

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

From: <cod...@go...> - 2008-11-04 22:35:10

Author: rbistolfi
Date: Tue Nov  4 14:34:32 2008
New Revision: 262

Modified:
    branches/iVL/.lang/en_US.po
    branches/iVL/.lang/es.mo
    branches/iVL/.lang/es.po
    branches/iVL/FrmDone.class

Log:
es.po update


Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po	(original)
+++ branches/iVL/.lang/en_US.po	Tue Nov  4 14:34:32 2008
@@ -156,7 +156,7 @@
  msgid "to restart your computer at a later time"
  msgstr ""

-#: FrmDone.class:67
+#: FrmDone.class:73
  #, fuzzy
  msgid "Installation is finished"
  msgstr "Installation"

Modified: branches/iVL/.lang/es.mo
==============================================================================
Binary files. No diff available.

Modified: branches/iVL/.lang/es.po
==============================================================================
--- branches/iVL/.lang/es.po	(original)
+++ branches/iVL/.lang/es.po	Tue Nov  4 14:34:32 2008
@@ -86,7 +86,7 @@
  msgid "Add option to boot this Operating system into Text mode"
  msgstr "Añadir una opción para arrancar este sistema operativo en modo  
texto"

-#: FrmDone.class:35
+#: FrmDone.class:38
  msgid "After reboot you can use vasm or vasmCC to fine tune your  
installation."
  msgstr "Luego de reiniciar, puedes utilizar Vasm o VasmCC para ultimar los  
detalles de la instalación "

@@ -196,7 +196,7 @@

  #: FrmXconf.class:322
  msgid "Color Depth"
-msgstr ""
+msgstr "Profundidad de color"

  #: FrmZoneSet.class:174
  msgid "ComboBox1"
@@ -318,7 +318,7 @@
  msgid "Error while installing system configuration. "
  msgstr "Error al instalar la configuración del sistema. "

-#: FrmDone.class:29
+#: FrmDone.class:32
  msgid "Exit"
  msgstr "Salir"

@@ -442,7 +442,7 @@
  msgid "Installation Type"
  msgstr "Tipo de instalación"

-#: FrmDone.class:58
+#: FrmDone.class:73
  msgid "Installation is finished"
  msgstr "La instalación ha finalizado "

@@ -668,7 +668,7 @@

  #: FrmAlsaConf.class:36
  msgid "Please use the setup program below to setup the sound system."
-msgstr ""
+msgstr "Pro favo utiliza el siguiente software para configurar el sistema  
de sonido. "

  #: FMain.class:213
  msgid "Please wait while setup analyses your current partition setup."
@@ -696,7 +696,7 @@

  #: FrmXconf.class:27
  msgid "Probe hardware to setup your Graphical Environment using your  
preffered settings"
-msgstr ""
+msgstr "Testear tu hardware para configurar tu Entorno Gráfico con tus  
configuraciones predefinidas "

  #: FMain.class:494
  msgid "Process Overview"
@@ -722,9 +722,9 @@
  msgid "Regional Settings"
  msgstr "Opciones de regionalización"

-#: FMain.class:177 FrmDone.class:25
+#: FMain.class:177 FrmDone.class:28
  msgid "Restart"
-msgstr ""
+msgstr "Reiniciar"

  #: MdlUsrAdd.module:65
  msgid "Restricted administrator (backup)"
@@ -740,7 +740,7 @@

  #: FrmXconf.class:328
  msgid "Screen Resolution"
-msgstr ""
+msgstr "Resolución de la pantalla "

  #: FrmSelISO.class:267
  msgid "Search Again"
@@ -912,7 +912,7 @@

  #: FrmAlsaConf.class:36
  msgid "This portion of the setup process allows you to sutup your  
soundcard for your new operating system."
-msgstr ""
+msgstr "Esta parte de la instlación te permite configurar tu tarjeta de  
sonido para tunuevo sistema operativo. "

  #: MdlUsrAdd.module:44
  msgid "This user can access CD/DVD devices"
@@ -992,7 +992,7 @@

  #: FrmSelISO.class:76
  msgid "Unable to locate any installable media."
-msgstr ""
+msgstr "No se ha podido encontrar un medio de instalación. "

  #: MdlNetConf.module:109
  msgid "Unplugged"
@@ -1008,7 +1008,7 @@

  #: FrmXconf.class:29
  msgid "Use the console framebuffer driver"
-msgstr ""
+msgstr "Utilizar el controlador Framebuffer para la consola "

  #: FrmPartScheme.class:61
  msgid "Use this option if you already prepared your partitions using the  
VectorLinux installer"
@@ -1032,7 +1032,7 @@

  #: FrmUserAdd.class:102
  msgid "User account for"
-msgstr ""
+msgstr "Cuenta de usuario para "

  #: FrmUserAdd.class:99
  msgid "Username contains illegal characters"
@@ -1138,7 +1138,7 @@
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr "Debes seleccionar una partición para \"/\" (raíz). Allí sera  
instalado el sistema operativo"

-#: FrmDone.class:35
+#: FrmDone.class:38
  msgid "Your computer needs to be restarted so that you can use your new  
operating system. Click"
  msgstr ""

@@ -1182,7 +1182,7 @@
  msgid "for this is"
  msgstr "para esto es"

-#: FrmDone.class:35
+#: FrmDone.class:38
  msgid "has been installed to your system. Your new system has been  
configured with the default factory settings."
  msgstr ""

@@ -1230,11 +1230,11 @@
  msgid "to create an account here. It is recommended that you create at  
least one."
  msgstr ""

-#: FrmDone.class:35
+#: FrmDone.class:38
  msgid "to restart your computer at a later time"
  msgstr ""

-#: FrmDone.class:35
+#: FrmDone.class:38
  msgid "to restart your computer now or click"
  msgstr ""


Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class	(original)
+++ branches/iVL/FrmDone.class	Tue Nov  4 14:34:32 2008
@@ -45,3 +45,9 @@


  END
+
+PUBLIC SUB PnlMsg_MouseDown()
+
+
+
+END

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

From: <cod...@go...> - 2008-11-04 22:14:08

Author: rbistolfi
Date: Tue Nov  4 14:12:30 2008
New Revision: 261

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/.lang/en_US.po
    branches/iVL/.lang/es.mo
    branches/iVL/.lang/es.po
    branches/iVL/FrmDone.class

Log:
make the picture change in the left panel and advance the selection


Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Tue Nov  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsGlobal.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsPartSel.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/ClsWinDrives.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FMain.class
+# /home/rbistolfi/vinstall-ng/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Tue Nov  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmDiskPart.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartScheme.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPartSel.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmPkgSel.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSelISO.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmSummary.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/FrmWinDrives.class
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlCore.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlDiskPart.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlObjSizer.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPartSel.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlPkgSel.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSetup.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlSummarize.module
+# /home/rbistolfi/vinstall-ng/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  4 14:12:30 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/MdlWinDrives.module
+# /home/rbistolfi/vinstall-ng/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/en_US.po
==============================================================================
--- branches/iVL/.lang/en_US.po	(original)
+++ branches/iVL/.lang/en_US.po	Tue Nov  4 14:12:30 2008
@@ -18,19 +18,23 @@
  msgid "GUI installer for Vector linux"
  msgstr "GUI installer for Vector linux"

-#: FMain.class:205
+#: FMain.class:177 FrmDone.class:28
+msgid "Restart"
+msgstr ""
+
+#: FMain.class:211
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr "Please wait while setup attempts to run the partitioning utility"

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

-#: FMain.class:207
+#: FMain.class:213
  msgid "This may take a while ..."
  msgstr "This may take a while ..."

-#: FMain.class:221
+#: FMain.class:227
  msgid ""
  "You must select a \"/\" partition. This is the target where the system  
will "
  "install to"
@@ -38,90 +42,137 @@
  "You must select a \"/\" partition. This is the target where the system  
will "
  "install to"

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

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

-#: FMain.class:284
+#: FMain.class:291
  msgid "Skipping lilo setup"
  msgstr "Skipping lilo setup per user request"

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

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

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

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

-#: FMain.class:313
+#: FMain.class:320
  msgid "Yes"
  msgstr ""

-#: FMain.class:313
+#: FMain.class:320
  #, fuzzy
  msgid "No"
  msgstr "None"

-#: FMain.class:335
-#, fuzzy
-msgid "has been installed on your computer. Additional system  
configuration"
-msgstr "Packages have been installed to your system. Please click"
-
-#: FMain.class:335
+#: FMain.class:343
  msgid ""
-"will take place after you reboot your system.Part of this process must  
be "
-"done in text mode."
-msgstr ""
-
-#: FMain.class:335
-msgid "Would you like to reboot your computer now?"
+"VectorLinux will now try to detect and configure your graphics hardware."
  msgstr ""

-#: FMain.class:340
+#: FMain.class:343
  msgid ""
-"The VectorLinux installer will now exit. Enjoy your new operating system"
+"Your screen may flicker or go blank during this process for a few  
seconds "
+"during this process."
  msgstr ""

-#: FMain.class:437
+#: FMain.class:494
  msgid "Process Overview"
  msgstr "Process Overview"

-#: FMain.class:457
+#: FMain.class:514
  msgid "Next"
  msgstr "Next"

-#: FMain.class:463
+#: FMain.class:520
  msgid "Back"
  msgstr "Back"

-#: FMain.class:469
+#: FMain.class:526
  msgid "Exit Installation"
  msgstr "Exit Installation"

-#: FMain.class:485
+#: FMain.class:542
  msgid "Button1"
  msgstr "-"

+#: FrmAlsaConf.class:36
+msgid ""
+"This portion of the setup process allows you to sutup your soundcard for "
+"your new operating system."
+msgstr ""
+
+#: FrmAlsaConf.class:36
+msgid "Please use the setup program below to setup the sound system."
+msgstr ""
+
  #: FrmDiskPart.class:115
  msgid "Disk Partitioning:"
  msgstr "Disk Partitioning:"

+#: FrmDone.class:32
+msgid "Exit"
+msgstr ""
+
+#: FrmDone.class:38
+#, fuzzy
+msgid ""
+"has been installed to your system. Your new system has been configured  
with "
+"the default factory settings."
+msgstr "Packages have been installed to your system. Please click"
+
+#: FrmDone.class:38
+msgid "After reboot you can use vasm or vasmCC to fine tune your  
installation."
+msgstr ""
+
+#: FrmDone.class:38
+msgid ""
+"Your computer needs to be restarted so that you can use your new  
operating "
+"system. Click"
+msgstr ""
+
+#: FrmDone.class:38
+msgid "to restart your computer now or click"
+msgstr ""
+
+#: FrmDone.class:38
+msgid "to restart your computer at a later time"
+msgstr ""
+
+#: FrmDone.class:67
+#, fuzzy
+msgid "Installation is finished"
+msgstr "Installation"
+
+#: FrmHalSwitch.class:20
+msgid "Would you like to use Vl-Hot or HAL to manage your removable  
devices?"
+msgstr ""
+
+#: FrmHalSwitch.class:25
+msgid "HAL"
+msgstr ""
+
+#: FrmHalSwitch.class:30
+msgid "VL-Hot"
+msgstr ""
+
  #: FrmHostPrep.class:130
  msgid "Vectorlinux is preparing your system for installation. Please wait."
  msgstr "Vectorlinux is preparing your system for installation. Please  
wait."
@@ -131,7 +182,7 @@
  msgstr "Current Status"

  #: FrmHostPrep.class:139 FrmLilo.class:223 FrmPartScheme.class:127
-#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:247
+#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:262
  #: FrmSummaryOld.class:87
  msgid "TextLabel1"
  msgstr "-"
@@ -161,7 +212,7 @@
  msgid "Total Progress"
  msgstr "Total progress"

-#: FrmLangSel.class:116
+#: FrmLangSel.class:123
  msgid "Select your language"
  msgstr "Select your language"

@@ -520,37 +571,47 @@
  msgid "Set Password"
  msgstr "Set Password"

-#: FrmSelISO.class:29 MdlCore.module:198
+#: FrmSelISO.class:30 MdlCore.module:198
  msgid "No Installable Media Found"
  msgstr "No Installable Media Found"

-#: FrmSelISO.class:73
+#: FrmSelISO.class:74
  msgid "Click"
  msgstr "Click"

-#: FrmSelISO.class:73
+#: FrmSelISO.class:74
  msgid "to begin installating"
  msgstr "to begin installating"

-#: FrmSelISO.class:98
+#: FrmSelISO.class:76
+#, fuzzy
+msgid "Unable to locate any installable media."
+msgstr "Unable to install kernels. "
+
+#: FrmSelISO.class:82
+#, fuzzy
+msgid "Installable media found."
+msgstr "No Installable Media Found"
+
+#: FrmSelISO.class:113
  msgid "Unable to identify distro."
  msgstr "Unable to identify distro."

-#: FrmSelISO.class:133
+#: FrmSelISO.class:148
  msgid "Minimum Disk Space Requirements"
  msgstr "Minimum Disk Space Requirements"

-#: FrmSelISO.class:236
+#: FrmSelISO.class:251
  msgid "No installable images found."
  msgstr "No installable images found."

-#: FrmSelISO.class:242
+#: FrmSelISO.class:257
  msgid ""
  "Select which VectorLinux version you wish to install from the list below"
  msgstr ""
  "Select which VectorLinux version you wish to install from the list below"

-#: FrmSelISO.class:252
+#: FrmSelISO.class:267
  msgid "Search Again"
  msgstr "Search Again"

@@ -588,7 +649,7 @@
  msgid "Not Used"
  msgstr "Not Used"

-#: FrmSummary.class:90 MdlNetConf.module:218
+#: FrmSummary.class:90 MdlNetConf.module:220
  msgid "None"
  msgstr "None"

@@ -743,6 +804,97 @@
  msgid "Select the windows partitions you would like to mount during boot"
  msgstr "Select the windows partitions you would like to mount during boot"

+#: FrmXconf.class:25
+msgid "Uses the default (failsafe) configuration."
+msgstr ""
+
+#: FrmXconf.class:27
+msgid ""
+"Probe hardware to setup your Graphical Environment using your preffered "
+"settings"
+msgstr ""
+
+#: FrmXconf.class:29
+msgid "Use the console framebuffer driver"
+msgstr ""
+
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
+msgstr ""
+
+#: FrmXconf.class:311
+msgid "Video Driver"
+msgstr ""
+
+#: FrmXconf.class:322
+msgid "Color Depth"
+msgstr ""
+
+#: FrmXconf.class:328
+#, fuzzy
+msgid "Screen Resolution"
+msgstr "Video Resolution"
+
+#: FrmXconf.class:335
+msgid "24 bit True Color"
+msgstr ""
+
+#: FrmXconf.class:335
+msgid "16 bit Pseudo Color"
+msgstr ""
+
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
+msgstr ""
+
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
+msgstr ""
+
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
+msgstr ""
+
+#: FrmXconf.class:340
+msgid "Vesa"
+msgstr ""
+
+#: FrmXconf.class:342
+msgid "Fbdev"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "1920x1280"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "1600x1200"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "1440x900"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "1280x1024"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "1280x800"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "1024x768"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "800x600"
+msgstr ""
+
+#: FrmXconf.class:348
+msgid "640x480"
+msgstr ""
+
  #: FrmZoneSet.class:21
  msgid "Timezone configuration"
  msgstr "Timezone configuration"
@@ -777,11 +929,11 @@
  "the Coordinated Universal Time (UTC/GMT). Otherwise,\n"
  "Choose localtime since most PCs are setup this way."

-#: MdlConfLilo.module:95
+#: MdlConfLilo.module:96
  msgid "Lilo returned an error. Please see below"
  msgstr "Lilo returned an error. Please see below"

-#: MdlConfLilo.module:97
+#: MdlConfLilo.module:99
  msgid "Boot loader has been setup successfully"
  msgstr "Boot loader has been setup successfully"

@@ -865,6 +1017,11 @@
  msgid "User Accounts"
  msgstr "User Accounts"

+#: MdlCore.module:463
+#, fuzzy
+msgid "Final Hardware Configuration"
+msgstr "Hardware Configuration"
+
  #: MdlDiskPart.module:46
  msgid ""
  "VectorLinux is unable to determine the type of hard disks on your system."
@@ -1041,107 +1198,107 @@
  msgid "Label"
  msgstr "Label"

-#: MdlLiloOsList.module:276
+#: MdlLiloOsList.module:277
  msgid "Operating system installed in "
  msgstr "Operating system installed in"

-#: MdlLiloOsList.module:288
+#: MdlLiloOsList.module:289
  msgid "Include this operating system in the boot menu"
  msgstr "Include this operating system in the boot menu"

-#: MdlLiloOsList.module:299
+#: MdlLiloOsList.module:300
  msgid "Name"
  msgstr "Name"

-#: MdlLiloOsList.module:320
+#: MdlLiloOsList.module:321
  msgid "Initial Ram Disk"
  msgstr "Initial Ram Disk"

-#: MdlLiloOsList.module:345
+#: MdlLiloOsList.module:346
  msgid "Kernel boot options"
  msgstr "Kernel boot options"

-#: MdlLiloOsList.module:376
+#: MdlLiloOsList.module:379
  msgid "Add option to boot this Operating system into Text mode"
  msgstr "Add option to boot this Operating system into Text mode"

-#: MdlNetConf.module:93
+#: MdlNetConf.module:95
  msgid "Wired"
  msgstr "Wired"

-#: MdlNetConf.module:96
+#: MdlNetConf.module:98
  msgid "Wireless"
  msgstr "Wireless"

-#: MdlNetConf.module:105
+#: MdlNetConf.module:107
  msgid "Plugged-in"
  msgstr "Plugged-in"

-#: MdlNetConf.module:107
+#: MdlNetConf.module:109
  msgid "Unplugged"
  msgstr "Unplugged"

-#: MdlNetConf.module:126
+#: MdlNetConf.module:128
  msgid "Hardware Address"
  msgstr "Hardware Address"

-#: MdlNetConf.module:147
+#: MdlNetConf.module:149
  msgid "Interface Type"
  msgstr "Interface Type"

-#: MdlNetConf.module:166
+#: MdlNetConf.module:168
  msgid "Automatically activate this interface at start-up"
  msgstr "Automatically activate this interface at start-up"

-#: MdlNetConf.module:179
+#: MdlNetConf.module:181
  msgid "Setup Mode"
  msgstr "Setup Mode"

-#: MdlNetConf.module:205
+#: MdlNetConf.module:207
  msgid "Encryption type"
  msgstr "Encryption type"

-#: MdlNetConf.module:231
+#: MdlNetConf.module:233
  msgid "Encryption key"
  msgstr "Encryption Key"

-#: MdlNetConf.module:250
+#: MdlNetConf.module:252
  msgid "Access Point"
  msgstr "ESSID"

-#: MdlNetConf.module:274
+#: MdlNetConf.module:276
  msgid "STATUS:"
  msgstr "STATUS:"

-#: MdlNetConf.module:290
+#: MdlNetConf.module:292
  msgid "Dynamic Host Control Protocol"
  msgstr "Dynamic Host Control Protocol"

-#: MdlNetConf.module:290
+#: MdlNetConf.module:292
  msgid "Automatic settings via DHCP."
  msgstr "Automatic settings via DHCP."

-#: MdlNetConf.module:290
+#: MdlNetConf.module:292
  msgid "This will work if you use a cable or DSL modem on a home network."
  msgstr "This will work if you use a cable or DSL modem on a home network."

-#: MdlNetConf.module:290
+#: MdlNetConf.module:292
  msgid "If in doubt, choose this option"
  msgstr "If in doubt, choose this option"

-#: MdlNetConf.module:330
+#: MdlNetConf.module:332
  msgid "Static IP Address Settings"
  msgstr ""

-#: MdlNetConf.module:352
+#: MdlNetConf.module:354
  msgid "IP Address"
  msgstr "IP Address"

-#: MdlNetConf.module:375
+#: MdlNetConf.module:377
  msgid "Subnet Mask"
  msgstr "Subnet Mask"

-#: MdlNetConf.module:397
+#: MdlNetConf.module:399
  msgid "Gateway Address"
  msgstr "Gateway Address"

@@ -1276,9 +1433,6 @@

  #~ msgid "Include this Operating System in the boot menu"
  #~ msgstr "Include this Operating System in the boot menu"
-
-#~ msgid "Hardware Configuration"
-#~ msgstr "Hardware Configuration"

  #~ msgid "Create initial user accounts"
  #~ msgstr "Create initial user accounts"

Modified: branches/iVL/.lang/es.mo
==============================================================================
Binary files. No diff available.

Modified: branches/iVL/.lang/es.po
==============================================================================
--- branches/iVL/.lang/es.po	(original)
+++ branches/iVL/.lang/es.po	Tue Nov  4 14:12:30 2008
@@ -10,1280 +10,1243 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: .project:1
-msgid "VectorLinux Installer"
-msgstr "Instalador de VectorLinux"
-
-#: .project:2
-msgid "GUI installer for Vector linux"
-msgstr "Instaladaor Gráfico de VectorLinux"
+#: FrmXconf.class:335
+msgid "1 bit Mono B/W"
+msgstr "1 bit Mono "

-#: FMain.class:205
-msgid "Please wait while setup attampts to run the partitioning utility"
+#: FrmXconf.class:348
+msgid "1024x768"
  msgstr ""
-"Por favor espere, el instalador intentará ejecutar la herramienta de "
-"particionado"

-#: FMain.class:207
-msgid "Please wait while setup analyses your current partition setup."
-msgstr "Por favor espere mientras el instalador analiza su particonado  
actual."
-
-#: FMain.class:207
-msgid "This may take a while ..."
-msgstr "Esto puede tardar unos minutos ..."
-
-#: FMain.class:221
-msgid ""
-"You must select a \"/\" partition. This is the target where the system  
will "
-"install to"
+#: FrmXconf.class:348
+msgid "1280x1024"
  msgstr ""
-"Debes seleccionar una partición para \"/\" (raíz). Allí sera instalado  
el "
-"sistema operativo"
-
-#: FMain.class:271
-msgid "Please select a default operating system to boot before proceeding"
-msgstr "Por favor selectione el sistema operativo que se iniciara por  
defecto"
-
-#: FMain.class:272
-msgid "Select an entry from this list"
-msgstr "Seleccione una de esta opciones"

-#: FMain.class:284
-msgid "Skipping lilo setup"
-msgstr "Salteando configuración de LILO"
-
-#: FMain.class:298
-#, fuzzy
-msgid "Passwords do not match. Please enter the same password twice"
+#: FrmXconf.class:348
+msgid "1280x800"
  msgstr ""
-"Las contraseñas no coinciden. Por favor ingrese la misma contraseña dos "
-"veces para estar seguros de que es la que Usted verdaderamente desea."

-#: FMain.class:313
-msgid ""
-"You have not created any user accounts for this system yet. There is not "
-"enough information"
+#: FrmXconf.class:348
+msgid "1440x900"
  msgstr ""

-#: FMain.class:313
-msgid ""
-"to create an account here. It is recommended that you create at least  
one."
+#: FrmXconf.class:335
+msgid "16 bit Pseudo Color"
  msgstr ""

-#: FMain.class:313
-#, fuzzy
-msgid "Would you like to continue anyway?"
-msgstr "Deseas reiniciar ahora?"
-
-#: FMain.class:313
-msgid "Yes"
-msgstr "Sí"
-
-#: FMain.class:313
-msgid "No"
-msgstr "No"
-
-#: FMain.class:335
-msgid "has been installed on your computer. Additional system  
configuration"
-msgstr "se ha instalado en este ordenador. Configuracion adicional del  
systema"
-
-#: FMain.class:335
-msgid ""
-"will take place after you reboot your system.Part of this process must  
be "
-"done in text mode."
-msgstr ""
-"occurira en el arranque inicial. Parte de este proceso debe hacerce en  
modo "
-"texto."
-
-#: FMain.class:335
-msgid "Would you like to reboot your computer now?"
-msgstr "Deseas reiniciar ahora?"
-
-#: FMain.class:340
-msgid ""
-"The VectorLinux installer will now exit. Enjoy your new operating system"
+#: FrmXconf.class:348
+msgid "1600x1200"
  msgstr ""
-"El instalador de Vector Linux ha terminado sus funciones. Que disfrute  
su "
-"nuevo sistema operativo."

-#: FMain.class:437
-msgid "Process Overview"
-msgstr "Resumen del proceso"
-
-#: FMain.class:457
-msgid "Next"
-msgstr "Siguiente"
-
-#: FMain.class:463
-msgid "Back"
-msgstr "Regresar"
-
-#: FMain.class:469
-msgid "Exit Installation"
-msgstr "Cancelar Instalación"
-
-#: FMain.class:485
-msgid "Button1"
+#: FrmNetConf.class:161
+msgid "192.168.1.254"
  msgstr "-"

-#: FrmDiskPart.class:115
-msgid "Disk Partitioning:"
-msgstr "Particionado de disco:"
+#: FrmXconf.class:348
+msgid "1920x1280"
+msgstr ""

-#: FrmHostPrep.class:130
-msgid "Vectorlinux is preparing your system for installation. Please wait."
+#: FrmXconf.class:335
+msgid "24 bit True Color"
  msgstr ""
-"Por favor espere mientras VectorLinux prepara su sistema para instalacion"

-#: FrmHostPrep.class:135
-msgid "Current Status"
-msgstr "Estado Actual"
+#: FrmXconf.class:335
+msgid "4 bit 16 Color"
+msgstr ""

-#: FrmHostPrep.class:139 FrmLilo.class:223 FrmPartScheme.class:127
-#: FrmPkgSel.class:101 FrmPkgsel2.class:86 FrmSelISO.class:247
-#: FrmSummaryOld.class:87
-msgid "TextLabel1"
-msgstr "-"
+#: FrmXconf.class:348
+msgid "640x480"
+msgstr ""

-#: FrmInstallSys.class:57 FrmInstallSysN.class:72
-msgid "Current Step"
-msgstr "Este paso"
+#: FrmXconf.class:335
+msgid "8 bit 256 Color"
+msgstr ""

-#: FrmInstallSys.class:181
-msgid "Vectorlinux is currently being installed to your system... Please  
wait"
-msgstr "Por favor espere mientras VectorLinux se instala en su sistema"
+#: FrmXconf.class:348
+msgid "800x600"
+msgstr ""

-#: FrmInstallSys.class:194
-msgid "Total progress"
-msgstr "Progreso Total"
+#: FrmPartSel.class:149
+msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
+msgstr "Acerca del particionado en Linux"

-#: FrmInstallSys.class:204
-msgid "Installing ..."
-msgstr "Instalando..."
+#: FrmRootPass.class:28
+msgid "About the root account"
+msgstr "Acerca de la cuenta del usuario root"

-#: FrmInstallSys.class:209
-msgid "Current Step "
-msgstr "Este paso"
+#: MdlNetConf.module:252
+msgid "Access Point"
+msgstr "Punto de Accesso (Access Point)"

-#: FrmInstallSysN.class:82
-msgid "Total Progress"
-msgstr "Progreso Total"
+#: MdlSetup.module:243
+msgid "Activating swap space"
+msgstr "Activando la partición Swap"

-#: FrmLangSel.class:116
-msgid "Select your language"
-msgstr "Selecciona tu idioma"
+#: MdlLiloOsList.module:379
+msgid "Add option to boot this Operating system into Text mode"
+msgstr "Añadir una opción para arrancar este sistema operativo en modo  
texto"

-#: FrmLicense.class:99
-msgid "LICENSE AGREEMENT"
-msgstr "Aceptación de licencia"
+#: FrmDone.class:35
+msgid "After reboot you can use vasm or vasmCC to fine tune your  
installation."
+msgstr "Luego de reiniciar, puedes utilizar Vasm o VasmCC para ultimar los  
detalles de la instalación "

-#: FrmLicense.class:104
-msgid "TextArea1"
-msgstr "-"
+#: MdlUsrAdd.module:74
+msgid "Allow user to mount / un-mount Pendrive (USB Sticks)"
+msgstr "Permitir al usuario montar o desmontar Pendrives (USB Sticks)"

-#: FrmLicense.class:110
-msgid "Yes, I Agree to the License Agreement"
-msgstr "De acuerdo"
+#: MdlUsrAdd.module:77
+msgid "Allow user to mount / un-mount Removable HD Storage Devices"
+msgstr "Permitir al usuario montar o desmontar Dispositivos de  
Almacenamiento Externos (HD Storage)"

-#: FrmLicense.class:115
-msgid "No, I Do Not Agree"
-msgstr "No estoy de acuerdo"
+#: MdlNetConf.module:292
+msgid "Automatic settings via DHCP."
+msgstr "Configuración automática utilizando DHCP"

-#: FrmLilo.class:35
-msgid ""
-"The following Operating Systems have been detected on this computer.  
Choose "
-"your desired option"
-msgstr ""
-"los siguientes Sistemas Operativos han sido detectados en su ordenador. "
-"Selecciona la opción deseada"
+#: MdlNetConf.module:168
+msgid "Automatically activate this interface at start-up"
+msgstr "Activar esta interfaz automáticamente al arrancar"

-#: FrmLilo.class:35
-msgid ""
-"for each one of them by clicking on each tab. To proceed with the  
default "
-"pre-set values, simply click"
-msgstr ""
-"para cada uno de ellos seleccionando cada pestaña. Para continuar con  
los "
-"valores seleccionados por defecto simplemente haz click en "
+#: MdlSetup.module:227
+msgid "BROUGHT TO YOU BY"
+msgstr "Créditos "

-#: FrmLilo.class:132
-msgid "Standard"
-msgstr "Estandar"
+#: FrmSummary.class:173
+msgid "BULK PACKAGES"
+msgstr "PAQUETES POR CATEGORIA"

-#: FrmLilo.class:206
-msgid "Configure and install lilo (Linux Boot Loader)"
-msgstr "Confuguración de LILO"
+#: MdlSummarize.module:58
+msgid "BULK PACKAGES:"
+msgstr "Paquetes por categoría"

-#: FrmLilo.class:211
-msgid "Don't Install Lilo"
-msgstr "No quiero instalar LILO"
+#: FMain.class:520
+msgid "Back"
+msgstr "Regresar"

-#: FrmLilo.class:217 FrmNetConf.class:141
-msgid "Tab 0"
-msgstr "-"
+#: FrmLilo.class:271
+msgid "Boot Default"
+msgstr "Arranque por defecto"

-#: FrmLilo.class:235
-msgid "Target"
-msgstr "-"
+#: MdlCore.module:458
+msgid "Boot Menu Options"
+msgstr "Opciones de arranque"

-#: FrmLilo.class:241
-msgid "Video Resolution"
-msgstr "Resolucion de pantalla"
+#: MdlConfLilo.module:99
+msgid "Boot loader has been setup successfully"
+msgstr "El cargador de arranque ha sido configurado con éxito"

  #: FrmLilo.class:249
-msgid "Bootsplash Med"
-msgstr "Resolución del arranque gráfico (bootsplash) media"
+msgid "Bootsplash Extra high"
+msgstr "Resolución del arranque gráfico (bootsplash) súper alta"

  #: FrmLilo.class:249
  msgid "Bootsplash High"
  msgstr "Resolución del arranque gráfico (bootsplash) alta"

  #: FrmLilo.class:249
-msgid "Bootsplash Extra high"
-msgstr "Resolución del arranque gráfico (bootsplash) súper alta"
-
-#: FrmLilo.class:254
-msgid "Prompt Timeout"
-msgstr "Esperar"
+msgid "Bootsplash Med"
+msgstr "Resolución del arranque gráfico (bootsplash) media"

-#: FrmLilo.class:265
-msgid "Seconds"
-msgstr "Segundos"
+#: MdlCore.module:361
+msgid "Build Date: "
+msgstr "Compilado el: "

-#: FrmLilo.class:271
-msgid "Boot Default"
-msgstr "Arranque por defecto"
+#: FMain.class:542
+msgid "Button1"
+msgstr "-"

-#: FrmNetConf.class:58
-msgid "Network Interfaces"
-msgstr "Dispositivos de red"
+#: MdlInstallCustom.module:459
+msgid "Calculating package count ... Please wait"
+msgstr "Calculando el número de paquetes ... Por favor espere"

-#: FrmNetConf.class:125
-msgid "Computer Name"
-msgstr "Nombre Local"
+#: MdlCore.module:439
+msgid "Cannot find SETUP.CONF"
+msgstr "No se pudo encontrar SETUP.CONF"

-#: FrmNetConf.class:148
-msgid "Manual DNS Server Specification"
-msgstr "Configuración Manual de servidores de nombres (DNS)"
+#: FrmPartSel.class:183
+msgid "Check this box if you have a Windows installation on your system or  
any other windows partition (FAT, FAT32, NTFS) that you want auto-mounted  
as soon as your computer starts"
+msgstr "Selecciona esta casilla si hay una instalación Windows en tu  
sistema o otra partición Windows (FAT, FAT32, NTFS) que quieras montar  
automáticamente al arrancar el ordenador"

-#: FrmNetConf.class:153
-msgid "Primary DNS Server"
-msgstr "Servidor de nombres primario (DNS)"
+#: FrmUserAdd.class:433
+msgid "Choose a unique name for each user. Enter the password for twice  
for accuracy. You can make as many users as you want, and when you are  
finished click next to continue."
+msgstr "Elige un nombre único para cada usuario. Es necesario ingresar las  
contraseñas dos veces. Puedes crear todas las cuentas de usuarios que  
desees"

-#: FrmNetConf.class:161
-msgid "192.168.1.254"
-msgstr "-"
+#: FrmZoneSet.class:181
+msgid "Choose how\nyour hardware clock is set up.\nChoose UTC if you know  
that the clock is set up to\nthe Coordinated Universal Time (UTC/GMT).  
Otherwise,\nChoose localtime since most PCs are setup this way."
+msgstr "Elige como funciona el reloj de esta máquina. Si tienes dudas  
elige UTC/GMT"

-#: FrmNetConf.class:166
-msgid "Secondary DNS Server"
-msgstr "Servidor de nombres (DNS) secundario"
+#: FrmZoneSet.class:169
+msgid "Choose the correct timezone for the area in which you live."
+msgstr "Selecciona la zona horaria del área donde vives"

-#: FrmNetConf.class:179 MdlCore.module:462
-msgid "Network Configuration"
-msgstr "Configuración de red"
+#: FrmPkgSel.class:22
+msgid "Choose your installation mode"
+msgstr "Selecciona el modo de instalación"

-#: FrmPartScheme.class:61
-msgid ""
-"Select this option if you already have a linux installation that you wish  
to "
-"overwrite or if a linux partition scheme exists in your hard disk."
-msgstr ""
-"Selecciona esta opción si ya dispones de una instalación de Linux que "
-"quieras sobreescribir o si las particines Linux ya existen en tu disco  
duro."
+#: FrmPkgSel.class:60
+msgid "Choose your optional components to install."
+msgstr "Selecciona los componentes opcionales a instalar."

-#: FrmPartScheme.class:61
-msgid "This option will overwrite any existing data in the selected  
partitions"
-msgstr "Esta opción sobreescribirá los datos de las particiones  
seleccionadas"
+#: FrmUserAdd.class:500
+msgid "Clear Form"
+msgstr "Limpiar Formulario"

-#: FrmPartScheme.class:61
-msgid ""
-"Use this option if you already prepared your partitions using the "
-"VectorLinux installer"
-msgstr ""
-"Usa esta opción si ya haz preparado tus particiones utilizando el  
instalador "
-"de VectorLinux"
+#: FrmSelISO.class:74
+msgid "Click"
+msgstr "Haz click en"

-#: FrmPartScheme.class:70
-msgid ""
-"Select this option is you wish to create, more or resize partitions in  
order "
-"to make room for your new VectorLinux installation."
+#: FrmXconf.class:322
+msgid "Color Depth"
  msgstr ""
-"Selecciona esta opción si deseas crear o redimensionar particiones para "
-"conseguir espacio para tu nueva instalación de VectorLinux."

-#: FrmPartScheme.class:70
-msgid ""
-"This option is the safest choice if you have other existing  
installations "
-"that you wish to keep."
-msgstr "Esta opción es la más segura si quieres conservar otras  
instalaciones."
+#: FrmZoneSet.class:174
+msgid "ComboBox1"
+msgstr "-"

-#: FrmPartScheme.class:112
-msgid "Disk Partitioning Options"
-msgstr "Opciones de particionado de disco"
+#: FrmNetConf.class:125
+msgid "Computer Name"
+msgstr "Nombre Local"

-#: FrmPartScheme.class:117
-msgid "Use existing disk partitions"
-msgstr "Utilizar las particiones existentes en mi disco duro"
+#: FrmLilo.class:206
+msgid "Configure and install lilo (Linux Boot Loader)"
+msgstr "Confuguración de LILO"

-#: FrmPartScheme.class:122
-msgid "Modify my disk partitions to make room for new installation"
-msgstr "Modificaré mi disco duro para hacer lugar para la nueva  
instalación"
+#: FrmUserAdd.class:494
+msgid "Create User"
+msgstr "Agregar Usuario"

-#: FrmPartSel.class:149
-msgid "ABOUT SYSTEM PARTITIONING IN LINUX"
-msgstr "Acerca del particionado en Linux"
+#: FrmUserAdd.class:37
+msgid "Create User Accounts"
+msgstr "Limiar cuentas de usuario"

-#: FrmPartSel.class:149
-msgid ""
-"Linux is a modular operating system. This means that is has the ability  
to "
-"store system and"
-msgstr ""
-"Linux es un sistema operativo modular. Esto significa que tiene la  
capacidad "
-"de alojar el sistema y"
+#: FrmHostPrep.class:135
+msgid "Current Status"
+msgstr "Estado Actual"

-#: FrmPartSel.class:149
-msgid ""
-"user data separately for added data security. You may install the system  
to "
-"a single partition"
-msgstr ""
-"datos del usuario separadamente para incrementar la seguridad de sus  
datos. "
-"Puedes instalar el sistema en una única partición"
+#: FrmInstallSys.class:57 FrmInstallSysN.class:72
+msgid "Current Step"
+msgstr "Este paso"

-#: FrmPartSel.class:149
-msgid ""
-"by simply selecting a \"/\" value on this screen. The rest is optional.  
The "
-"following is a"
-msgstr ""
-"simplemente seleccionando un valor para \"/\" en esta pantalla. El resto  
es "
-"opcional. Lo siguiente es un"
+#: FrmInstallSys.class:209
+msgid "Current Step "
+msgstr "Este paso"

-#: FrmPartSel.class:149
-msgid "suggested setup for a typical Linux installation"
-msgstr "configuración recomendada para una instalación típica de Linux"
+#: FrmSummary.class:16 MdlSummarize.module:56
+msgid "Custom"
+msgstr "Personalisado"

-#: FrmPartSel.class:149
-msgid ""
-"Used to store system data. This particular install requires a minimum of"
-msgstr ""
-"Utilizada para almacenar los datos del sistema. Esta instalación en "
-"particular requiere un mínimo de"
+#: FrmPkgSel.class:112
+msgid "Custom Install"
+msgstr "Instalación Personalizada"

-#: FrmPartSel.class:149
-msgid "for this"
-msgstr "para esto"
+#: FrmPartSel.class:184
+msgid "Detect and Setup Windows partitions for auto-mounting at boot"
+msgstr "Detectar volúmenes con sistemas Windows"

-#: FrmPartSel.class:149
-msgid ""
-"but you should considear a higher value to make sure you have room to "
-"install additional software"
-msgstr ""
-"pero deberías considerar un valor más alto para asegurarte espacio para "
-"software adicional que desees instlar luego"
+#: MdlCore.module:450
+msgid "Disk Partitioning"
+msgstr "Particionado de disco"

-#: FrmPartSel.class:149
-msgid "in case you wish to."
-msgstr "en caso que lo desees."
+#: FrmPartScheme.class:112
+msgid "Disk Partitioning Options"
+msgstr "Opciones de particionado de disco"

-#: FrmPartSel.class:149
-msgid ""
-"Used to store user documents, pictures, videos. Give yourself as much  
room "
-"as you want"
-msgstr ""
-"Utilizada para almacenar los ficheros del usuario, documentos, imágenes, "
-"videos, etc. Puedes asignar tanto espacio como desees"
+#: FrmDiskPart.class:115
+msgid "Disk Partitioning:"
+msgstr "Particionado de disco:"

-#: FrmPartSel.class:149
-msgid "Typically, you want to use the largest partition for this."
-msgstr "Normalmente querrías utilizar tu partición más grande para esto."
+#: MdlInstallSys.module:167 MdlPartFrmt.module:33 MdlPartSel.module:141
+msgid "Do not format"
+msgstr "No Formatear"

-#: FrmPartSel.class:149
-msgid ""
-"Using a swap partition is suggested if your total RAM is less than 1GB. "
-"Suggested ammount"
-msgstr ""
-"Utilizar una partición Swap es recomendado si tu cantidad de memoria RAM  
es "
-"inferior a 1GB. El monto sugerido "
+#: FrmSummary.class:112 MdlInstallSys.module:190 MdlWinDrives.module:123
+msgid "Do not mount"
+msgstr "No montar"

-#: FrmPartSel.class:149
-msgid "for this is"
-msgstr "para esto es"
+#: FrmLilo.class:211
+msgid "Don't Install Lilo"
+msgstr "No quiero instalar LILO"

-#: FrmPartSel.class:149
-msgid "but can also be calculated as 2 times your ammount of RAM"
-msgstr ""
-"pero también puede ser calculada duplicando el tamaño de tu memoria RAM"
+#: MdlNetConf.module:292
+msgid "Dynamic Host Control Protocol"
+msgstr "Dynamic Host Control Protocol (DHCP)"

-#: FrmPartSel.class:174
-msgid "Please select the partitions you wish to use and how to use them"
+#: MdlUsrAdd.module:71
+msgid "Elite user"
+msgstr "Usuario Privilegiado"
+
+#: MdlNetConf.module:233
+msgid "Encryption key"
+msgstr "Clave encriptada"
+
+#: MdlNetConf.module:207
+msgid "Encryption type"
+msgstr "Tipo de encriptación"
+
+#: FrmRootPass.class:137 FrmUserAdd.class:514
+msgid "Enter Password"
+msgstr "Ingresa contraseña"
+
+#: FrmRootPass.class:34
+msgid "Enter a Password for root."
+msgstr "Ingresa una contraseña para root."
+
+#: FrmUserAdd.class:106
+msgid "Enter a password for"
+msgstr "Ingresa una contraseña para "
+
+#: FrmUserAdd.class:78
+msgid "Enter the login name that this user will user to login to this  
system."
+msgstr "Ingresa el nombre de usuario que será utilizado para registrarse  
en el sistema."
+
+#: FrmUserAdd.class:162
+msgid "Enter the same password twice"
+msgstr "Ingreasa la misma contraseña dos veces "
+
+#: MdlInstallSys.module:509
+msgid "Error occurred while installing"
+msgstr "Ha ocurrido un error durante la instalación"
+
+#: MdlInstallCustom.module:539
+msgid "Error while installing "
+msgstr "Error al instalar "
+
+#: MdlInstallCustom.module:72
+msgid "Error while installing required system software. "
+msgstr "Error al instalar el software base. "
+
+#: MdlInstallCustom.module:81
+msgid "Error while installing system configuration. "
+msgstr "Error al instalar la configuración del sistema. "
+
+#: FrmDone.class:29
+msgid "Exit"
+msgstr "Salir"
+
+#: FMain.class:526
+msgid "Exit Installation"
+msgstr "Cancelar Instalación"
+
+#: MdlPartSel.module:92
+msgid "FILESYSTEM"
+msgstr "Sistema de archivos"
+
+#: MdlInstallSys.module:786
+msgid "Failed to install"
+msgstr "La instalación ha fallado"
+
+#: FrmXconf.class:342
+msgid "Fbdev"
  msgstr ""
-"For favor, seleccione las secciones del disco que desea usar, y también  
como "
-"usarlas"

-#: FrmPartSel.class:183
-msgid ""
-"Check this box if you have a Windows installation on your system or any "
-"other windows partition (FAT, FAT32, NTFS) that you want auto-mounted as "
-"soon as your computer starts"
-msgstr ""
-"Selecciona esta casilla si hay una instalación Windows en tu sistema o  
otra "
-"partición Windows (FAT, FAT32, NTFS) que quieras montar automáticamente  
al "
-"arrancar el ordenador"
+#: FrmSummary.class:41
+msgid "Filesystem"
+msgstr "Sistema de Archivos"

-#: FrmPartSel.class:184
-msgid "Detect and Setup Windows partitions for auto-mounting at boot"
-msgstr "Detectar volúmenes con sistemas Windows"
+#: MdlCore.module:463
+msgid "Final Hardware Configuration"
+msgstr "Configuración final del hardware "

-#: FrmPartSel.class:189 FrmUserAdd.class:486
-msgid "Help"
-msgstr "Ayuda"
+#: MdlCore.module:449
+msgid "Find installation media"
+msgstr "Buscar medio de instalación"

-#: FrmPkgSel.class:22
-msgid "Choose your installation mode"
-msgstr "Selecciona el modo de instalación"
+#: MdlInstallSys.module:630
+msgid "Finished intalling Bulks"
+msgstr "Instalación de paquetes finalizada"

-#: FrmPkgSel.class:51
-msgid "Installs everything in your VectorLinux media to your system"
-msgstr "Instalar todo lo que incluye el medio de instalación en tu disco  
duro"
+#: FrmRootPass.class:13
+msgid "For added security, use a password that is easy for you to  
remember, but hard for others to guess"
+msgstr "Por motivos de seguridad, deberías utilizar una clave fácil de  
recordar, pero difícil de adivinar"

-#: FrmPkgSel.class:60
-msgid "Choose your optional components to install."
-msgstr "Selecciona los componentes opcionales a instalar."
+#: FrmSummary.class:20 MdlSummarize.module:69
+msgid "Full"
+msgstr "Completa"

  #: FrmPkgSel.class:107
  msgid "Full Install"
  msgstr "Instalacion Completa"

-#: FrmPkgSel.class:112
-msgid "Custom Install"
-msgstr "Instalación Personalizada"
+#: .project:2
+msgid "GUI installer for Vector linux"
+msgstr "Instaladaor Gráfico de VectorLinux"

-#: FrmPkgsel2.class:21
-msgid "Select your indivirual packages to install."
-msgstr "Selecciona paquetes individuales para su instalación."
+#: MdlNetConf.module:399
+msgid "Gateway Address"
+msgstr "Dirección de Puerta de Enlace"

-#: FrmPkgsel2.class:21
-msgid "To install them all, just click next"
-msgstr "Para instalarlos todos, simplemente presiona Sigiente"
+#: MdlDiskPart.module:53
+msgid "Gparted was not found on this system. Please install gparted and  
try again"
+msgstr "No se encontró Gparted en el sistema.  Por favor, instala Gparted  
y prueba de nuevo"

-#: FrmRootPass.class:6
-msgid "System Administrator Password"
-msgstr "Contraseña del administrador del sistema"
+#: FrmXconf.class:301
+msgid "Graphical Interface Settings"
+msgstr "Configuración de la interfaz gráfica de usuario "

-#: FrmRootPass.class:13
-msgid "Most other every-day taks do not require administrative  
priviledges."
-msgstr "Las tareas diarias no requieren privilegios de administrador"
+#: FrmUserAdd.class:375
+msgid "Groups are a way of administering permissions for your users. You  
grant the user"
+msgstr "Los Grupos son un método para administrar los permisos de los  
usuarios. Le garantizas a cada usuario"

-#: FrmRootPass.class:13
-msgid ""
-"For added security, use a password that is easy for you to remember, but "
-"hard for others to guess"
+#: FrmHalSwitch.class:25
+msgid "HAL"
  msgstr ""
-"Por motivos de seguridad, deberías utilizar una clave fácil de recordar, "
-"pero difícil de adivinar"

-#: FrmRootPass.class:28
-msgid "About the root account"
-msgstr "Acerca de la cuenta del usuario root"
+#: MdlNetConf.module:128
+msgid "Hardware Address"
+msgstr "Dirección MAC"

-#: FrmRootPass.class:34
-msgid "Enter a Password for root."
-msgstr "Ingresa una contraseña para root."
+#: FrmPartSel.class:189 FrmUserAdd.class:486
+msgid "Help"
+msgstr "Ayuda"

-#: FrmRootPass.class:48
-msgid ""
-"Passwords do not match. Please enter the same password twice for  
accuracy."
-msgstr ""
-"Las contraseñas no coinciden. Por favor ingrese la misma contraseña dos "
-"veces para estar seguros de que es la que Usted verdaderamente desea."
+#: MdlSummarize.module:56
+msgid "INSTALL TYPE:"
+msgstr "Tipo de instalación:"

-#: FrmRootPass.class:118 MdlCore.module:460
-msgid "System Administrator"
-msgstr "Administrador del sistema"
+#: MdlNetConf.module:354
+msgid "IP Address"
+msgstr "Dirección IP"

-#: FrmRootPass.class:131
-msgid ""
-"The linux root account is pre-assigned to be used as the system "
-"administrator's account. This account is used to perform system-wide  
changes "
-"such as software upgrades, managing user accounts etc. \n"
-"\n"
-"Most other operations do not require administrative priviledges.\n"
-"The root password must be entered twice for ensured accuracy. When  
choosing "
-"a root password, think of something easy for you to remember, but hard  
for "
-"others to guess."
-msgstr ""
-"La cuenta root en los sistemas Linux está diseñada como la cuenta del "
-"administrador del sistema. Es utilizada para realizar tareas de "
-"mantenimiento del sistema globales, tales como actualizaciones de  
software, "
-"gestionar los permisos o crear nuevos usuarios, etc. \n"
-"\n"
-"La mayoría de las otras operaciones no requieren privilegios de "
-"administrador.\n"
-"La contraseña para el usuario root deberá ser ingresada dos veces para "
-"asegurar que es la contraseña deseada. Al elegir la contraseña de "
-"administrador, piensa en algo fácil de recordar, pero al mismo tiempo "
-"difícil de adivinar para los otros. "
+#: MdlNetConf.module:292
+msgid "If in doubt, choose this option"
+msgstr "Si dudas, elige esta opción"

-#: FrmRootPass.class:137 FrmUserAdd.class:514
-msgid "Enter Password"
-msgstr "Ingresa contraseña"
+#: MdlLiloOsList.module:146
+msgid "Include this installation in the boot menu"
+msgstr "Incluir esta instalación en el menú de arranque"

-#: FrmRootPass.class:142
-msgid "Re-Enter Password"
-msgstr "Vuelva a ingresar la contraseña"
+#: MdlLiloOsList.module:289
+msgid "Include this operating system in the boot menu"
+msgstr "Incluir este sistema operativo en el menú de arranque"

-#: FrmRootPass.class:159
-msgid "Set Password"
-msgstr "Define tu contraseña"
+#: MdlLiloOsList.module:321
+msgid "Initial Ram Disk"
+msgstr "Disco Ram inicial"

-#: FrmSelISO.class:29 MdlCore.module:198
-msgid "No Installable Media Found"
-msgstr "No se encontró ningún medio instalable"
+#: MdlCore.module:456
+msgid "Install Operating System"
+msgstr "Instalación del sistema operativo"

-#: FrmSelISO.class:73
-msgid "Click"
-msgstr "Haz click en"
+#: FrmSelISO.class:82
+msgid "Installable media found."
+msgstr "Medio de instalación encontrado."

-#: FrmSelISO.class:73
-msgid "to begin installating"
-msgstr "para comenzar la instalación"
+#: MdlCore.module:453
+msgid "Installation"
+msgstr "Instalación "

-#: FrmSelISO.class:98
-msgid "Unable to identify distro."
-msgstr "No se pudo detectar la distribución."
+#: FrmSummary.class:14 MdlCore.module:454
+msgid "Installation Summary"
+msgstr "Resumen del proceso"
+
+#: FrmSummary.class:243
+msgid "Installation Type"
+msgstr "Tipo de instalación"
+
+#: FrmDone.class:58
+msgid "Installation is finished"
+msgstr "La instalación ha finalizado "
+
+#: MdlInstallSys.module:736
+msgid "Installation phase complete. Ready for configuration"
+msgstr "Fase de instalación completada.  Vamos a por la configuración"
+
+#: MdlInstallSys.module:471
+msgid "Installing"
+msgstr "Instalando"
+
+#: FrmInstallSys.class:204
+msgid "Installing ..."
+msgstr "Instalando..."
+
+#: MdlInstallSys.module:826
+msgid "Installing Final configuration files..."
+msgstr "Instalando los últimos ficheros de configuración ..."
+
+#: MdlInstallSys.module:775
+msgid "Installing Required Package ..."
+msgstr "Instalando paquetes requeridos ..."
+
+#: MdlInstallSys.module:739
+msgid "Installing default system configuration and required software."
+msgstr "Instalando el software necesario y las configuraciones por  
defecto."
+
+#: MdlInstallCustom.module:269
+msgid "Installing user-selected package"
+msgstr "Instalando paquetes selecionados por el usuario"
+
+#: FrmPkgSel.class:51
+msgid "Installs everything in your VectorLinux media to your system"
+msgstr "Instalar todo lo que incluye el medio de instalación en tu disco  
duro"
+
+#: MdlNetConf.module:149
+msgid "Interface Type"
+msgstr "Tipo de interfaz"
+
+#: MdlDiskPart.module:46
+msgid "It is still possible to install VectorLinux on your system, but you  
need to pre-partition your disks first"
+msgstr "Es posible instalar VectorLinux entu sistema, pero derías  
particionar el disco primero"
+
+#: MdlLiloOsList.module:346
+msgid "Kernel boot options"
+msgstr "Opciones de arranque de kernel"
+
+#: FrmLicense.class:99
+msgid "LICENSE AGREEMENT"
+msgstr "Aceptación de licencia"
+
+#: MdlLiloOsList.module:155
+msgid "Label"
+msgstr "Etiqueta"
+
+#: MdlCore.module:448
+msgid "Language Selection"
+msgstr "Seleccion de idioma"
+
+#: MdlConfLilo.module:96
+msgid "Lilo returned an error. Please see below"
+msgstr "Lilo ha devuelto un error.  Por favor, lee más abajo"
+
+#: FrmPartSel.class:149
+msgid "Linux is a modular operating system. This means that is has the  
ability to store system and"
+msgstr "Linux es un sistema operativo modular. Esto significa que tiene la  
capacidad de alojar el sistema y"
+
+#: MdlDiskPart.module:57
+msgid "Loading gparted ... Please wait"
+msgstr "Cargando Gparted ... Por favor espere"
+
+#: FrmZoneSet.class:176
+msgid "LocalTime"
+msgstr "Hora Local"
+
+#: FrmUserAdd.class:507
+msgid "Login Name"
+msgstr "Nombre de usuario"
+
+#: FrmUserAdd.class:86
+msgid "Login name field contains illegal characters. Please use only  
lowercase letters and numbers"
+msgstr "Tu nombre de usuario contiene caracteres ilegales. Por favor  
utiliza solo letras minúsculas y números"
+
+#: MdlCore.module:361
+msgid "MINIMUM REQUIREMENTS"
+msgstr "Requerimientos mínimos del sistema"
+
+#: MdlPartSel.module:82
+msgid "MOUNT POINT"
+msgstr "Punto de montaje"

-#: FrmSelISO.class:133
+#: MdlWinDrives.module:84
+msgid "MOUNT TO"
+msgstr "Montar en"
+
+#: FrmNetConf.class:148
+msgid "Manual DNS Server Specification"
+msgstr "Configuración Manual de servidores de nombres (DNS)"
+
+#: FrmSelISO.class:148
  msgid "Minimum Disk Space Requirements"
  msgstr "Requerimientos mínimos de espacio en disco"

-#: FrmSelISO.class:236
-msgid "No installable images found."
-msgstr "No se encontró ninguna imagen que se pueda instalar"
+#: FrmPartScheme.class:122
+msgid "Modify my disk partitions to make room for new installation"
+msgstr "Modificaré mi disco duro para hacer lugar para la nueva  
instalación"

-#: FrmSelISO.class:242
-msgid ""
-"Select which VectorLinux version you wish to install from the list below"
-msgstr "Selectiona la imagen que deseas instalar de la lista"
+#: FrmRootPass.class:13
+msgid "Most other every-day taks do not require administrative  
priviledges."
+msgstr "Las tareas diarias no requieren privilegios de administrador"

-#: FrmSelISO.class:252
-msgid "Search Again"
-msgstr "Buscar nuevamente"
+#: FrmSummary.class:43
+msgid "Mount Point"
+msgstr "Punto de montaje"

-#: FrmSummary.class:14 MdlCore.module:454
-msgid "Installation Summary"
-msgstr "Resumen del proceso"
+#: MdlLiloOsList.module:300
+msgid "Name"
+msgstr "Nombre"

-#: FrmSummary.class:16 MdlSummarize.module:56
-msgid "Custom"
-msgstr "Personalisado"
+#: FrmNetConf.class:179 MdlCore.module:462
+msgid "Network Configuration"
+msgstr "Configuración de red"

-#: FrmSummary.class:20 MdlSummarize.module:69
-msgid "Full"
-msgstr "Completa"
+#: FrmNetConf.class:58
+msgid "Network Interfaces"
+msgstr "Dispositivos de red"

-#: FrmSummary.class:37
-msgid "Partition"
-msgstr "Partición"
+#: FMain.class:514
+msgid "Next"
+msgstr "Siguiente"

-#: FrmSummary.class:39
-msgid "Size"
-msgstr "Tamano"
+#: FMain.class:320
+msgid "No"
+msgstr "No"

-#: FrmSummary.class:41
-msgid "Filesystem"
-msgstr "Sistema de Archivos"
+#: FrmSelISO.class:30 MdlCore.module:198
+msgid "No Installable Media Found"
+msgstr "No se encontró ningún medio instalable"
+
+#: MdlWinDrives.module:186
+msgid "No Windows partitions detected"
+msgstr "Particiones Windows no detectadas en tu sistema"
+
+#: FrmSelISO.class:251
+msgid "No installable images found."
+msgstr "No se encontró ninguna imagen que se pueda instalar"

-#: FrmSummary.class:43
-msgid "Mount Point"
-msgstr "Punto de montaje"
+#: FrmLicense.class:115
+msgid "No, I Do Not Agree"
+msgstr "No estoy de acuerdo"
+
+#: FrmSummary.class:90 MdlNetConf.module:220
+msgid "None"
+msgstr "Ninguno"

  #: FrmSummary.class:49 MdlInstallSys.module:142 MdlPartSel.module:143
  msgid "Not Used"
  msgstr "Sin usar"

-#: FrmSummary.class:90 MdlNetConf.module:218
-msgid "None"
-msgstr "Ninguno"
+#: FrmUserAdd.class:376
+msgid "OK"
+msgstr "OK"

-#: FrmSummary.class:112 MdlInstallSys.module:190 MdlWinDrives.module:123
-msgid "Do not mount"
-msgstr "No montar"
+#: MdlSummarize.module:62
+msgid "OPTIONAL PACKAGES:"
+msgstr "Paquetes opcionales"
+
+#: MdlSummarize.module:49
+msgid "OPTIONAL WINDOWS PARTITIONS TO BE MOUNTED AT BOOT TIME."
+msgstr "Particiones Windows que se montarán al inicio del sistema."
+
+#: MdlLiloOsList.module:277
+msgid "Operating system installed in "
+msgstr "Sistema operativo montado en"
+
+#: MdlPartSel.module:71 MdlWinDrives.module:74
+msgid "PARTITION"
+msgstr "Partición"
+
+#: MdlSummarize.module:28
+msgid "PARTITIONING LAYOUT"
+msgstr "Diseño del particionado"

  #: FrmSummary.class:164
  msgid "Package Name"
  msgstr "Nombre del paquete"

-#: FrmSummary.class:173
-msgid "BULK PACKAGES"
-msgstr "PAQUETES POR CATEGORIA"
-
-#: FrmSummary.class:190
-msgid "USER-SELECTED PACKAGES"
-msgstr "PAQUETES INDIVIDUALES"
+#: MdlInstallSys.module:362
+msgid "Packages have been installed in your system. Please click"
+msgstr "Los paquetes han sido instalados en tu sistema. Por favor haga  
click"

-#: FrmSummary.class:243
-msgid "Installation Type"
-msgstr "Tipo de instalación"
+#: FrmSummary.class:37
+msgid "Partition"
+msgstr "Partición"

  #: FrmSummary.class:253
  msgid "Partition Selection Scheme"
  msgstr "Selección del esquema de particionado"

-#: FrmSummary.class:263 MdlCore.module:451
-msgid "Software Selection"
-msgstr "Selección de software"
+#: FrmUserAdd.class:161
+msgid "Passwords do not match"
+msgstr "Las contraseñas no coinciden "

-#: FrmUserAdd.class:37
-msgid "Create User Accounts"
-msgstr "Limiar cuentas de usuario"
+#: FMain.class:305
+msgid "Passwords do not match. Please enter the same password twice"
+msgstr "Las contraseñas no coinciden. Por favor ingrese la misma  
contraseña "

-#: FrmUserAdd.class:78
-#, fuzzy
-msgid "Enter the login name that this user will user to login to this  
system."
-msgstr ""
-"Ingresa el nombre de usuario que será utilizado para registrarse en el "
-"sistema."
+#: FrmRootPass.class:48
+msgid "Passwords do not match. Please enter the same password twice for  
accuracy."
+msgstr "Las contraseñas no coinciden. Por favor ingrese la misma  
contraseña dos veces para estar seguros de que es la que Usted  
verdaderamente desea."

-#: FrmUserAdd.class:86
-msgid ""
-"Login name field contains illegal characters. Please use only lowercase "
-"letters and numbers"
-msgstr ""
-"Tu nombre de usuario contiene caracteres ilegales. Por favor utiliza  
solo "
-"letras minúsculas y números"
+#: FMain.class:279
+msgid "Please select a default operating system to boot before proceeding"
+msgstr "Por favor selectione el sistema operativo que se iniciara por  
defecto"

-#: FrmUserAdd.class:99
-msgid "Username contains illegal characters"
-msgstr "El nombre de usuario contiene caracteres ilegales"
+#: MdlPartSel.module:289
+msgid "Please select only one "
+msgstr "Por favor, seleccione solo una"

-#: FrmUserAdd.class:102
-#, fuzzy
-msgid "User account for"
-msgstr "Usuarios"
+#: FrmPartSel.class:174
+msgid "Please select the partitions you wish to use and how to use them"
+msgstr "For favor, seleccione las secciones del disco que desea usar, y  
también como usarlas"

-#: FrmUserAdd.class:102
-#, fuzzy
-msgid "already exists"
-msgstr "El nombre de usuario ya existe"
+#: FrmAlsaConf.class:36
+msgid "Please use the setup program below to setup the sound system."
+msgstr ""

-#: FrmUserAdd.class:106
-#, fuzzy
-msgid "Enter a password for"
-msgstr "Ingresa una contraseña para root."
+#: FMain.class:213
+msgid "Please wait while setup analyses your current partition setup."
+msgstr "Por favor espere mi...
 
[truncated message content]

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

From: <cod...@go...> - 2008-11-04 21:14:49

Author: M0E.lnx
Date: Tue Nov  4 13:13:31 2008
New Revision: 260

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.project
    branches/iVL/DevLog
    branches/iVL/FMain.class
    branches/iVL/FMain.form
    branches/iVL/FrmDone.class
    branches/iVL/FrmLangSel.class
    branches/iVL/installer.gambas

Log:
- Restored code to automatically list the translations provided by looking  
in .lang
- Modified the way the installer ends. Added final message window instead  
of a message.warning
- Added warning right before quietly configuring X letting the user know  
that the screen may flicker.
- Updated binary


Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Tue Nov  4 13:13:31 2008
@@ -14,91 +14,87 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:205
+#: FMain.class:177
+msgid "Restart"
+msgstr ""
+
+#: FMain.class:211
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr ""

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

-#: FMain.class:207
+#: FMain.class:213
  msgid "This may take a while ..."
  msgstr ""

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

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

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

-#: FMain.class:285
+#: FMain.class:291
  msgid "Skipping lilo setup"
  msgstr ""

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

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

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

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

-#: FMain.class:314
+#: FMain.class:320
  msgid "Yes"
  msgstr ""

-#: FMain.class:314
+#: FMain.class:320
  msgid "No"
  msgstr ""

-#: FMain.class:389
-msgid "has been installed on your computer. Additional system  
configuration"
-msgstr ""
-
-#: FMain.class:389
-msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
-msgstr ""
-
-#: FMain.class:389
-msgid "Would you like to reboot your computer now?"
+#: FMain.class:343
+msgid "VectorLinux will now try to detect and configure your graphics  
hardware."
  msgstr ""

-#: FMain.class:394
-msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
+#: FMain.class:343
+msgid "Your screen may flicker or go blank during this process for a few  
seconds during this process."
  msgstr ""

-#: FMain.class:474
+#: FMain.class:494
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:495
+#: FMain.class:514
  msgid "Next"
  msgstr ""

-#: FMain.class:501
+#: FMain.class:520
  msgid "Back"
  msgstr ""

-#: FMain.class:507
+#: FMain.class:526
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:523
+#: FMain.class:542
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Tue Nov  4 13:13:31 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.122
+Version=0.0.123
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Tue Nov  4 13:13:31 2008
@@ -1,14 +1,4 @@
-- Re-worked the language selection
-  * Changed the listview for a columnview
-    \- This will eliminate the need to create an array
-        with a long list of languages. Instead, the installer will
-	look in it's .lang dir and list all the .mo files, then it
-	will populate the columnview using only the languages found.
-
-
-
--I added the non-gui config code to run in the BG when lilo window starts.
- this is how it is done in old installer.
- we still need vhalswitch, ALSA-config(this should be done in xterm IMO),  
vxconf, hwinit??, and runlevel??.
- we can skip last 2 IMO
- I added code to mount all needed binds to liloconfig and stoppped  
mount/umount in root, and useradd.
\ No newline at end of file
+- Restored code to automatically list the translations provided by looking  
in .lang
+- Modified the way the installer ends. Added final message window instead  
of a message.warning
+- Added warning right before quietly configuring X letting the user know  
that the screen may flicker.
+- Updated binary

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Nov  4 13:13:31 2008
@@ -172,6 +172,12 @@
    DIM sDev AS String
    DIM sLang AS String

+  tvPlan.Refresh()
+
+  IF LAST.TEXT = ("Restart") THEN
+  EXEC "shutdown -r now"
+  ELSE
+
    IF FrmLangSel.Visible = TRUE THEN
    ME.Button1_Click()
    WAIT
@@ -333,12 +339,17 @@


        ' CONFIGURE X QUIETLY HERE
+          Message.Warning(("VectorLinux will now try to detect and  
configure your graphics hardware.") & "<br>" &
+          ("Your screen may flicker or go blank during this process for a  
few seconds during this process."))
+
          MdlXconf.QUIET_XORG_CONFIGURATION()

        frmNext = FrmDone

        CASE "FrmDone"
            'offer to reboot here
+
+
            ME.END_INSTALLER()
            frmNext = FrmAlsaConf
  '      frmNext = FrmLilo ' this is already done
@@ -376,25 +387,34 @@
        WAIT 1
        MdlSetup.BEGIN_INSTALLATION()
      END IF
-

+END IF
+tvPlan.Refresh()

  END


  PUBLIC SUB END_INSTALLER()
-
-    SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has been  
installed on your computer. Additional system configuration") & "<br>" &
-            ("will take place after you reboot your system.Part of this  
process must be done in text mode.") & "<br><br>" &
-            ("Would you like to reboot your computer now?"), ("Yes"),  
("No"))
-      CASE 1
-        SHELL "shutdown -r now"
-      CASE ELSE
-      RETURN
-        Message.Info(("The VectorLinux installer will now exit. Enjoy your  
new operating system"))
-        QUIT ' dirty quit event
-      'STOP EVENT
-    END SELECT
+
+    ' Check for /tmp/status in the target installation
+      IF Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = FALSE THEN
+        REPEAT
+          WAIT
+        UNTIL Exist(ClsGlobal.sTargetMnt &/ "tmp" &/ "status") = TRUE
+      END IF
+
+    ' ' ' ' '
+    ' ' ' ' ' SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) &  
("has been installed on your computer. Additional system configuration")  
& "<br>" &
+    ' ' ' ' '         ("will take place after you reboot your system.Part  
of this process must be done in text mode.") & "<br><br>" &
+    ' ' ' ' '         ("Would you like to reboot your computer now?"),  
("Yes"), ("No"))
+    ' ' ' ' '   CASE 1
+    ' ' ' ' '     SHELL "shutdown -r now"
+    ' ' ' ' '   CASE ELSE
+    ' ' ' ' '   RETURN
+    ' ' ' ' '     Message.Info(("The VectorLinux installer will now exit.  
Enjoy your new operating system"))
+    ' ' ' ' '     QUIT ' dirty quit event
+    ' ' ' ' '   'STOP EVENT
+    ' ' ' ' ' END SELECT


  END

Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form	(original)
+++ branches/iVL/FMain.form	Tue Nov  4 13:13:31 2008
@@ -9,7 +9,6 @@
      { tvPlan TreeView
        MoveScaled(1,2,22,56)
        Expand = True
-      Mode = Select.None
        Border = False
      }
    }

Modified: branches/iVL/FrmDone.class
==============================================================================
--- branches/iVL/FrmDone.class	(original)
+++ branches/iVL/FrmDone.class	Tue Nov  4 13:13:31 2008
@@ -22,9 +22,17 @@
    FMain.FrmCurr = ME

    tlbanner.text = "<b>" & tlbanner.text & "</b>"
+  FMain.btnext.Text = ("Restart")
+  FMain.btnext.Width = MdlObjSizer.get_object_width(FMain.btnext.Text) + 36
+  FMain.btback.Enabled = FALSE
+  FMain.btback.ForeColor = Color.Gray
+  FMain.btQuit.Text = ("Exit")
+  FMain.btQuit.Width = MdlObjSizer.get_object_width(FMain.btQuit.Text) + 36
    WITH ME.tlMsg
      .Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your  
system. Your new system has been configured with the default factory  
settings.") & "<br><br>" &
-    ("After reboot you can use vasm or vasmCC to fine tune your  
installation.")
+    ("After reboot you can use vasm or vasmCC to fine tune your  
installation.") & "<br><br>" &
+    ("Your computer needs to be restarted so that you can use your new  
operating system. Click") & Space(1) & FMain.btnext.text & Space(1)&
+    ("to restart your computer now or click") & Space(1) &  
FMain.btQuit.Text & Space(1) & ("to restart your computer at a later time")
    END WITH

  END

Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class	(original)
+++ branches/iVL/FrmLangSel.class	Tue Nov  4 13:13:31 2008
@@ -34,31 +34,31 @@
  PUBLIC SUB LIST_LANG_CHOICES()


-  WITH ME.lblangsel
-    .Add("es_ES", "Spanish")
-    .Add("en_US", "US English")
-  END WITH
+  ' ' ' ' ' WITH ME.lblangsel
+  ' ' ' ' '   .Add("es_ES", "Spanish")
+  ' ' ' ' '   .Add("en_US", "US English")
+  ' ' ' ' ' END WITH


-' '     DIM sLangCode, sLangName AS String
-' '     DIM i AS Integer
-' '
-' '     i = 0
-' '     FOR EACH sLangCode IN RDir(".lang", "*.mo")
-' '       'Message(sLangCode)
-' '       SELECT CASE File.BaseName(".lang" &/ sLangCode)
-' '         CASE "en_US"
-' '           sLangName = "US English"
-' '         CASE "es"
-' '           sLangName = "Spanish"
-' '       END SELECT
-' '
-' '     ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
-' '
-' '
-' ' NEXT
-' '
-' '
+    DIM sLangCode, sLangName AS String
+    DIM i AS Integer
+
+    i = 0
+    FOR EACH sLangCode IN Dir(".lang", "*.mo")
+      'Message(sLangCode)
+      SELECT CASE File.BaseName(".lang" &/ sLangCode)
+        CASE "en_US"
+          sLangName = "US English"
+        CASE "es"
+          sLangName = "Spanish"
+      END SELECT
+
+    ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
+
+
+NEXT
+
+
  END



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

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

From: <cod...@go...> - 2008-11-04 20:23:12

Author: uelsk8s
Date: Tue Nov  4 12:22:22 2008
New Revision: 259

Modified:
    branches/iVL/MdlConfLilo.module

Log:
added echo to /tmp/status to ensure finish of BG config script

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Tue Nov  4 12:22:22 2008
@@ -329,22 +329,24 @@
  "for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &  
gb.NewLine &
  "update-mime-database /usr/share/mime/" & gb.NewLine &
  "cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &  
gb.NewLine &
-"/sbin/valsaconf-quiet" & gb.NewLine
+"/sbin/valsaconf-quiet" & gb.NewLine &
+"echo done >/tmp/status" & gb.NewLine
+
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
  'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng" WAIT
-
  SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
  SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &"
-SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-SHELL "touch " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2"
-sOut = "#!/bin/bash \n" &
-"/sbin/config-stage1 gui-installer" & gb.NewLine
-File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut)
-'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
-SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
-'SHELL "chroot /mnt/target " WAIT
+
+' SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+' SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+' SHELL "touch " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+' sOut = "#!/bin/bash \n" &
+' "/sbin/config-stage1 gui-installer" & gb.NewLine
+' File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",  
sOut)
+' 'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+' SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+' 'SHELL "chroot /mnt/target " WAIT

  END

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

From: <cod...@go...> - 2008-11-04 18:42:29

Author: M0E.lnx
Date: Tue Nov  4 10:40:55 2008
New Revision: 258

Added:
    branches/iVL/FrmDone.class
    branches/iVL/FrmDone.form
Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/FMain.class
    branches/iVL/FMain.form
    branches/iVL/FrmXconf.class
    branches/iVL/FrmXconf.form
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlLiloOsList.module
    branches/iVL/MdlNetConf.module
    branches/iVL/MdlXconf.module

Log:
Implented quiet X configuration instead of full blown x configurator

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Tue Nov  4 10:40:55 2008
@@ -66,39 +66,39 @@
  msgid "No"
  msgstr ""

-#: FMain.class:382
+#: FMain.class:389
  msgid "has been installed on your computer. Additional system  
configuration"
  msgstr ""

-#: FMain.class:382
+#: FMain.class:389
  msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
  msgstr ""

-#: FMain.class:382
+#: FMain.class:389
  msgid "Would you like to reboot your computer now?"
  msgstr ""

-#: FMain.class:387
+#: FMain.class:394
  msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
  msgstr ""

-#: FMain.class:454
+#: FMain.class:474
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:474
+#: FMain.class:495
  msgid "Next"
  msgstr ""

-#: FMain.class:480
+#: FMain.class:501
  msgid "Back"
  msgstr ""

-#: FMain.class:486
+#: FMain.class:507
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:502
+#: FMain.class:523
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Nov  4 10:40:55 2008
@@ -331,6 +331,13 @@
        MdlNetConf.SET_DNS_ADDRESSES()
        MdlNetConf.WRITE_INET()

+
+      ' CONFIGURE X QUIETLY HERE
+        MdlXconf.QUIET_XORG_CONFIGURATION()
+
+      frmNext = FrmDone
+
+      CASE "FrmDone"
            'offer to reboot here
            ME.END_INSTALLER()
            frmNext = FrmAlsaConf
@@ -426,5 +433,18 @@
    MdlCore.frmInit = FrmSelISO
    MdlCore.main

+
+END
+
+PUBLIC SUB tvPlan_MouseDown()
+
+  tvPlan.MoveLast()
+  RETURN
+
+END
+
+PUBLIC SUB tvPlan_Click()
+
+STOP EVENT

  END

Modified: branches/iVL/FMain.form
==============================================================================
--- branches/iVL/FMain.form	(original)
+++ branches/iVL/FMain.form	Tue Nov  4 10:40:55 2008
@@ -9,6 +9,7 @@
      { tvPlan TreeView
        MoveScaled(1,2,22,56)
        Expand = True
+      Mode = Select.None
        Border = False
      }
    }

Added: branches/iVL/FrmDone.class
==============================================================================
--- (empty file)
+++ branches/iVL/FrmDone.class	Tue Nov  4 10:40:55 2008
@@ -0,0 +1,30 @@
+' Gambas class 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 SUB Form_Open()
+
+  FMain.FrmCurr = ME
+
+  tlbanner.text = "<b>" & tlbanner.text & "</b>"
+  WITH ME.tlMsg
+    .Text = ClsGlobal.DISTRO & Space(1) & ("has been installed to your  
system. Your new system has been configured with the default factory  
settings.") & "<br><br>" &
+    ("After reboot you can use vasm or vasmCC to fine tune your  
installation.")
+  END WITH
+
+END

Added: branches/iVL/FrmDone.form
==============================================================================
--- (empty file)
+++ branches/iVL/FrmDone.form	Tue Nov  4 10:40:55 2008
@@ -0,0 +1,25 @@
+# Gambas Form File 2.0
+
+{ Form Form
+  MoveScaled(0,0,79,52)
+  Text = ("")
+  Arrangement = Arrange.Vertical
+  { tlBanner TextLabel
+    MoveScaled(0,0,25,3)
+    Text = ("Installation is finished")
+  }
+  { Separator1 Separator
+    MoveScaled(0,3,31,1)
+  }
+  { PnlMsg Panel
+    MoveScaled(1,5,74,24)
+    Expand = True
+    Arrangement = Arrange.Horizontal
+    { tlMsg TextLabel
+      MoveScaled(1,2,67,16)
+      Expand = True
+      AutoResize = True
+      Text = ("")
+    }
+  }
+}

Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class	(original)
+++ branches/iVL/FrmXconf.class	Tue Nov  4 10:40:55 2008
@@ -86,134 +86,134 @@

  END

-PUBLIC SUB LIST_KBD_LAYOUTS()
-
-  DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
-  DIM i, ii AS Integer
-  DIM sArr AS String[] '= Split(sFile, "\n")
-  DIM sHack AS String
-
-      ' ugly hack to get a good list begins here
-      sHack = "#!/bin/bash \n" &
-  "echo /dev/null > /tmp/kbd.file \n" &
-      "while read code desc1 desc2 junk \n" &
-      "do \n" &
-      "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file \n"  
&
-      "done < /etc/X11/xkb/rules/xorg.lst"
-
-      File.Save("/tmp/kbd_strip.sh", sHack)
-      SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
-      SHELL "sh /tmp/kbd_strip.sh" WAIT
-
-      ' END OF UGLY HACK HERE
-
-      sFile = File.Load("/tmp/kbd.file")
-      sarr = Split(sFile, "\n")
-
-
-      ii = 1
-      FOR i = 0 TO sArr.count - 1
-      'PRINT sArr[i]
-        'IF Left(sArr[i], Len("!  Layout")) = "!  Layout" THEN
-  IF Left(sArr[i]) = "!" AND InStr(sArr[i], "layout") THEN
-      'REPEAT
-          IF Trim(sarr[i + ii]) <> "" THEN
-          REPEAT
-            'PRINT sarr[i + ii]
-            ME.cvKbLayout.Add(Left(sarr[i + ii], InStr(sarr[i +  
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +  
ii], " ")))
-            INC ii
-          'END IF
-          UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "variant")  
= TRUE
-          END IF
-END IF
-        NEXT
-
-
-
-END
-
-PUBLIC SUB LIST_KBD_VARIANTS()
-
-   DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
-  DIM i, ii AS Integer
-  DIM sArr AS String[] '= Split(sFile, "\n")
-
-
-
-      sFile = File.Load("/tmp/kbd.file")
-      sarr = Split(sFile, "\n")
-
-
-      ii = 1
-      FOR i = 0 TO sArr.count - 1
-      'PRINT sArr[i]
-        'IF Left(sArr[i], Len("!  Layout")) = "!  Layout" THEN
-  IF Left(sArr[i]) = "!" AND InStr(sArr[i], "variant") THEN
-      'REPEAT
-          IF Trim(sarr[i + ii]) <> "" THEN
-          REPEAT
-            'PRINT sarr[i + ii]
-            ME.cvKbdVar.Add(Left(sarr[i + ii], InStr(sarr[i + ii], ":")),  
Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i + ii], ":")))
-            INC ii
-          'END IF
-          UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "option") =  
TRUE
-          END IF
-END IF
-        NEXT
-
-END
-
-
-
-PUBLIC SUB LIST_KBD_MODELS()
-
-  DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
-  DIM i, ii AS Integer
-  DIM sArr AS String[] '= Split(sFile, "\n")
-  'DIM sHack AS String
-
-  '     ' ugly hack to get a good list begins here
-  '     sHack = "#!/bin/bash \n" &
-  ' "echo /dev/null > /tmp/kbd.file \n" &
-  '     "while read code desc1 desc2 junk \n" &
-  '     "do \n" &
-  '     "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file  
\n" &
-  '     "done < /etc/X11/xkb/rules/xorg.lst"
-  '
-  '     File.Save("/tmp/kbd_strip.sh", sHack)
-  '     SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
-  '     SHELL "sh /tmp/kbd_strip.sh" WAIT
-
-      ' END OF UGLY HACK HERE
-
-      sFile = File.Load("/tmp/kbd.file")
-      sarr = Split(sFile, "\n")
-
-
-      ii = 1
-      FOR i = 0 TO sArr.count - 1
-      'PRINT sArr[i]
-        'IF Left(sArr[i], Len("!  Layout")) = "!  Layout" THEN
-  IF Left(sArr[i]) = "!" AND InStr(sArr[i], "model") THEN
-      'REPEAT
-          IF Trim(sarr[i + ii]) <> "" THEN
-          REPEAT
-            'PRINT sarr[i + ii]
-            ME.cvKeybdModel.add(Left(sarr[i + ii], InStr(sarr[i +  
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +  
ii], " ")))
-            INC ii
-          'END IF
-          UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "layout") =  
TRUE
-          END IF
-END IF
-        NEXT
-
-
-
-END
-
-
-
-
+' ' ' ' ' ' ' PUBLIC SUB LIST_KBD_LAYOUTS()
+' ' ' ' ' ' '
+' ' ' ' ' ' '   DIM sFile AS String '=  
File.Load("/etc/X11/xkb/rules/xorg.lst")
+' ' ' ' ' ' '   DIM i, ii AS Integer
+' ' ' ' ' ' '   DIM sArr AS String[] '= Split(sFile, "\n")
+' ' ' ' ' ' '   DIM sHack AS String
+' ' ' ' ' ' '
+' ' ' ' ' ' '       ' ugly hack to get a good list begins here
+' ' ' ' ' ' '       sHack = "#!/bin/bash \n" &
+' ' ' ' ' ' '   "echo /dev/null > /tmp/kbd.file \n" &
+' ' ' ' ' ' '       "while read code desc1 desc2 junk \n" &
+' ' ' ' ' ' '       "do \n" &
+' ' ' ' ' ' '       "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >>  
/tmp/kbd.file \n" &
+' ' ' ' ' ' '       "done < /etc/X11/xkb/rules/xorg.lst"
+' ' ' ' ' ' '
+' ' ' ' ' ' '       File.Save("/tmp/kbd_strip.sh", sHack)
+' ' ' ' ' ' '       SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' '       SHELL "sh /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' '
+' ' ' ' ' ' '       ' END OF UGLY HACK HERE
+' ' ' ' ' ' '
+' ' ' ' ' ' '       sFile = File.Load("/tmp/kbd.file")
+' ' ' ' ' ' '       sarr = Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '       ii = 1
+' ' ' ' ' ' '       FOR i = 0 TO sArr.count - 1
+' ' ' ' ' ' '       'PRINT sArr[i]
+' ' ' ' ' ' '         'IF Left(sArr[i], Len("!  Layout")) = "!  Layout"  
THEN
+' ' ' ' ' ' '   IF Left(sArr[i]) = "!" AND InStr(sArr[i], "layout") THEN
+' ' ' ' ' ' '       'REPEAT
+' ' ' ' ' ' '           IF Trim(sarr[i + ii]) <> "" THEN
+' ' ' ' ' ' '           REPEAT
+' ' ' ' ' ' '             'PRINT sarr[i + ii]
+' ' ' ' ' ' '             ME.cvKbLayout.Add(Left(sarr[i + ii],  
InStr(sarr[i + ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) -  
InStr(sarr[i + ii], " ")))
+' ' ' ' ' ' '             INC ii
+' ' ' ' ' ' '           'END IF
+' ' ' ' ' ' '           UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i +  
ii], "variant") = TRUE
+' ' ' ' ' ' '           END IF
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' '         NEXT
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' END
+' ' ' ' ' ' '
+' ' ' ' ' ' ' PUBLIC SUB LIST_KBD_VARIANTS()
+' ' ' ' ' ' '
+' ' ' ' ' ' '    DIM sFile AS String '=  
File.Load("/etc/X11/xkb/rules/xorg.lst")
+' ' ' ' ' ' '   DIM i, ii AS Integer
+' ' ' ' ' ' '   DIM sArr AS String[] '= Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '       sFile = File.Load("/tmp/kbd.file")
+' ' ' ' ' ' '       sarr = Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '       ii = 1
+' ' ' ' ' ' '       FOR i = 0 TO sArr.count - 1
+' ' ' ' ' ' '       'PRINT sArr[i]
+' ' ' ' ' ' '         'IF Left(sArr[i], Len("!  Layout")) = "!  Layout"  
THEN
+' ' ' ' ' ' '   IF Left(sArr[i]) = "!" AND InStr(sArr[i], "variant") THEN
+' ' ' ' ' ' '       'REPEAT
+' ' ' ' ' ' '           IF Trim(sarr[i + ii]) <> "" THEN
+' ' ' ' ' ' '           REPEAT
+' ' ' ' ' ' '             'PRINT sarr[i + ii]
+' ' ' ' ' ' '             ME.cvKbdVar.Add(Left(sarr[i + ii], InStr(sarr[i  
+ ii], ":")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +  
ii], ":")))
+' ' ' ' ' ' '             INC ii
+' ' ' ' ' ' '           'END IF
+' ' ' ' ' ' '           UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i +  
ii], "option") = TRUE
+' ' ' ' ' ' '           END IF
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' '         NEXT
+' ' ' ' ' ' '
+' ' ' ' ' ' ' END
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' PUBLIC SUB LIST_KBD_MODELS()
+' ' ' ' ' ' '
+' ' ' ' ' ' '   DIM sFile AS String '=  
File.Load("/etc/X11/xkb/rules/xorg.lst")
+' ' ' ' ' ' '   DIM i, ii AS Integer
+' ' ' ' ' ' '   DIM sArr AS String[] '= Split(sFile, "\n")
+' ' ' ' ' ' '   'DIM sHack AS String
+' ' ' ' ' ' '
+' ' ' ' ' ' '   '     ' ugly hack to get a good list begins here
+' ' ' ' ' ' '   '     sHack = "#!/bin/bash \n" &
+' ' ' ' ' ' '   ' "echo /dev/null > /tmp/kbd.file \n" &
+' ' ' ' ' ' '   '     "while read code desc1 desc2 junk \n" &
+' ' ' ' ' ' '   '     "do \n" &
+' ' ' ' ' ' '   '     "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >>  
/tmp/kbd.file \n" &
+' ' ' ' ' ' '   '     "done < /etc/X11/xkb/rules/xorg.lst"
+' ' ' ' ' ' '   '
+' ' ' ' ' ' '   '     File.Save("/tmp/kbd_strip.sh", sHack)
+' ' ' ' ' ' '   '     SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' '   '     SHELL "sh /tmp/kbd_strip.sh" WAIT
+' ' ' ' ' ' '
+' ' ' ' ' ' '       ' END OF UGLY HACK HERE
+' ' ' ' ' ' '
+' ' ' ' ' ' '       sFile = File.Load("/tmp/kbd.file")
+' ' ' ' ' ' '       sarr = Split(sFile, "\n")
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '       ii = 1
+' ' ' ' ' ' '       FOR i = 0 TO sArr.count - 1
+' ' ' ' ' ' '       'PRINT sArr[i]
+' ' ' ' ' ' '         'IF Left(sArr[i], Len("!  Layout")) = "!  Layout"  
THEN
+' ' ' ' ' ' '   IF Left(sArr[i]) = "!" AND InStr(sArr[i], "model") THEN
+' ' ' ' ' ' '       'REPEAT
+' ' ' ' ' ' '           IF Trim(sarr[i + ii]) <> "" THEN
+' ' ' ' ' ' '           REPEAT
+' ' ' ' ' ' '             'PRINT sarr[i + ii]
+' ' ' ' ' ' '             ME.cvKeybdModel.add(Left(sarr[i + ii],  
InStr(sarr[i + ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) -  
InStr(sarr[i + ii], " ")))
+' ' ' ' ' ' '             INC ii
+' ' ' ' ' ' '           'END IF
+' ' ' ' ' ' '           UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i +  
ii], "layout") = TRUE
+' ' ' ' ' ' '           END IF
+' ' ' ' ' ' ' END IF
+' ' ' ' ' ' '         NEXT
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' ' END
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '
+' ' ' ' ' ' '

  PUBLIC SUB Form_Resize()

@@ -234,9 +234,9 @@

  PUBLIC SUB Form_Menu()

-  ME.LIST_KBD_LAYOUTS
-  ME.LIST_KBD_MODELS
-  ME.LIST_KBD_VARIANTS
+'  ME.LIST_KBD_LAYOUTS
+'  ME.LIST_KBD_MODELS
+'  ME.LIST_KBD_VARIANTS

  END

@@ -261,5 +261,11 @@
  PUBLIC SUB cvKbLayout_Click()

    Message(LAST.current.key)
+
+END
+
+PUBLIC SUB Form_MouseDown()
+
+

  END

Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form	(original)
+++ branches/iVL/FrmXconf.form	Tue Nov  4 10:40:55 2008
@@ -13,81 +13,42 @@
      }
    }
    { Panel1 Panel
-    MoveScaled(0,6,98,10)
-    Arrangement = Arrange.Horizontal
+    MoveScaled(0,7,98,31)
      AutoResize = True
-    { Frame1 Frame
-      MoveScaled(2,0,85,9)
-      Expand = True
+    { tlSetupMethod TextLabel
+      MoveScaled(0,0,13,3.4286)
+      Text = ("Video Driver")
+      Alignment = Align.Normal
+    }
+    { tlChoiceExp TextLabel
+      MoveScaled(0,4,35,3)
        Text = ("")
-      { tlChoiceExp TextLabel
-        MoveScaled(1,5,35,3)
-        Text = ("")
-      }
-      { cbSetupMethod ComboBox
-        MoveScaled(14,1,22,3)
-        Text = ("Vesa")
-        ReadOnly = True
-        List = [("Vesa"), ("Fbdev")]
-      }
-      { tlSetupMethod TextLabel
-        MoveScaled(1,1,13,3)
-        Text = ("Video Driver")
-        Alignment = Align.Normal
-      }
-      { tlColorDepth TextLabel
-        MoveScaled(42,1,11,3)
-        Text = ("Color Depth")
-        Alignment = Align.Normal
-      }
-      { cbColorDepth ComboBox
-        MoveScaled(52,1,24,3)
-        Text = ("")
-        List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit  
256 Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
-      }
-      { tlScreenRes TextLabel
-        MoveScaled(42,4,18,3)
-        Text = ("Screen Resolution")
-        Alignment = Align.Normal
-      }
-      { cbScreenRes ComboBox
-        MoveScaled(60,4,16,3)
-        Text = ("")
-        List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),  
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
-      }
-    }
-  }
-  { pblKbdSets Panel
-    MoveScaled(1,17,96,27)
-    Expand = True
-    Arrangement = Arrange.Horizontal
-    AutoResize = True
-    { frmkbdlay Frame
-      MoveScaled(0,0,30,25)
-      Expand = True
-      Text = ("Keyboard Layout")
-      { cvKbLayout ColumnView
-        MoveScaled(1,3,28,20)
-        Expand = True
-      }
-    }
-    { frmKbdMod Frame
-      MoveScaled(33,0,32,24)
-      Expand = True
-      Text = ("Keyboard Model")
-      { cvKeybdModel ColumnView
-        MoveScaled(1,3,29,21)
-        Expand = True
-      }
-    }
-    { frmkeyVar Frame
-      MoveScaled(67,1,27,23)
-      Expand = True
-      Text = ("Keyboard Variant")
-      { cvKbdVar ColumnView
-        MoveScaled(8,3,11,21)
-        Expand = True
-      }
+    }
+    { tlColorDepth TextLabel
+      MoveScaled(0,9,11,3)
+      Text = ("Color Depth")
+      Alignment = Align.Normal
+    }
+    { tlScreenRes TextLabel
+      MoveScaled(0,12,18,3)
+      Text = ("Screen Resolution")
+      Alignment = Align.Normal
+    }
+    { cbColorDepth ComboBox
+      MoveScaled(10,9,24,3)
+      Text = ("")
+      List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit 256  
Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
+    }
+    { cbSetupMethod ComboBox
+      MoveScaled(13,0,22,3.4286)
+      Text = ("Vesa")
+      ReadOnly = True
+      List = [("Vesa"), ("Fbdev")]
+    }
+    { cbScreenRes ComboBox
+      MoveScaled(18,12,16,3)
+      Text = ("")
+      List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),  
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
      }
    }
  }

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Tue Nov  4 10:40:55 2008
@@ -128,6 +128,7 @@
            'IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
                FOR EACH cb IN MdlPartSel.oMountPoints
                  IF cb.text = "/" THEN
+                  ClsPartSel.sRoot = cb.Tag ' make sure this is set... we  
will need it later
                      FOR EACH cb1 IN MdlPartSel.oFsTypes
                        IF cb1.tag = cb.tag THEN
                        IF cb1.text <> "xfs" THEN .Add("Sector")
@@ -262,18 +263,18 @@
                      "read-only" & " \n \n"
    ENDIF

-          FOR EACH cbox IN MdlPartSel.oMountPoints
-            IF cbox.text = "/" AND bInc.tag = cbox.tag THEN
-                    IF MdlLiloOsList.bVlCliOption = TRUE THEN
-        'IF bInc.tag = ClsPartSel.sRoot AND MdlLiloOsList.bVlCliOption =  
TRUE THEN
-          sCliSection = Replace(sSection, "append = \"" & sEntryApnd  
& "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
-          sCliSection = Replace(sCliSection, "label = " &  
sEntryLbl, "label = " & sEntryLbl & "-tui")
-          sCliSection = sCliSection & gb.NewLine
+          'FOR EACH cbox IN MdlPartSel.oMountPoints
+          '  IF cbox.text = "/" AND cbox.tag = ClsPartSel.sRoot THEN
+           '         IF MdlLiloOsList.bVlCliOption = TRUE THEN
+        IF bInc.tag = ClsPartSel.sRoot AND MdlLiloOsList.bVlCliOption =  
TRUE THEN
+                        sCliSection = Replace(sSection, "append = \"" &  
sEntryApnd & "\"", "append = \"2 " & sEntryApnd & "\"") 'splash=silent\"")
+                        sCliSection = Replace(sCliSection, "label = " &  
sEntryLbl, "label = " & sEntryLbl & "-tui")
+                        sCliSection = sCliSection & gb.NewLine
          ELSE
-          sCliSection = ""
+                      sCliSection = ""
          END IF
-        END IF
-  NEXT
+        'END IF
+  'NEXT
      ELSE
        sSection = ""


Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Tue Nov  4 10:40:55 2008
@@ -484,10 +484,6 @@
  END


-
-
-
-
  PUBLIC SUB OsList_click()



Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Tue Nov  4 10:40:55 2008
@@ -568,11 +568,11 @@
      "# By the way, Arnt Gulbrandsen <agr...@nv...> says that  
127.0.0.1 should NEVER \n" &
      "# be named with the name of the machine. It causes problem sor some  
programs, irc and \n" &
      "# reputedly talk. :^) \n#\n#\n" &
-    "# For loopbacking." &
+    "# For loopbacking. \n" &
      "127.0.0.1" & Space(5) & "localhost" & "\n" &
      "#\n#\n" &
      "# This next entry is technically wrong, but good enough to get TCP/IP  
applications to quit complaining \n" &
-    "# that they can\'t clarify the hostname on a loopback-only system  
\n#\n#\n#" &
+    "# that they can\'t clarify the hostname on a loopback-only system  
\n#\n#\n# \n" &
      "127.0.0.1" & Space(5) & sHostName & Space(5) & sHostName & "\n#\n#" &
      "# End of hosts."


Modified: branches/iVL/MdlXconf.module
==============================================================================
--- branches/iVL/MdlXconf.module	(original)
+++ branches/iVL/MdlXconf.module	Tue Nov  4 10:40:55 2008
@@ -15,9 +15,10 @@
  '    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 SUB LIST_KBD_LAYOUT()
+PUBLIC SUB QUIET_XORG_CONFIGURATION()

-  ' Read /etc/X11/xkb/rules/xorg.lst
+  SHELL "chroot " & ClsGlobal.sTargetMnt & " X -configure :2" WAIT
+      IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf") THEN  
MOVE ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf" TO  
ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf.dist"
+  COPY ClsGlobal.sTargetMnt &/ "root" &/ "xorg.conf.new" TO  
ClsGlobal.sTargetMnt &/ "etc" &/ "X11" &/ "xorg.conf"

  END

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

From: <cod...@go...> - 2008-11-03 19:49:40

Author: M0E.lnx
Date: Mon Nov  3 08:32:53 2008
New Revision: 256

Modified:
    branches/iVL/FrmNetConf.class
    branches/iVL/MdlNetConf.module

Log:
Fixed problem with /etc/hosts not being created or appended in the target  
system.This led to problem when starting XFCE4 complaining about not  
finding the hostname.

Modified: branches/iVL/FrmNetConf.class
==============================================================================
--- branches/iVL/FrmNetConf.class	(original)
+++ branches/iVL/FrmNetConf.class	Mon Nov  3 08:32:53 2008
@@ -18,7 +18,7 @@
  PUBLIC FUNCTION GET_CURRENT_HOST_NAME() AS String
    DIM sRes AS String

-    SHELL "hostname" TO sRes
+    SHELL "chroot " & ClsGlobal.sTargetMnt & " hostname" TO sRes

      sRes = Trim(sRes)
        IF sRes = "" THEN

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Mon Nov  3 08:32:53 2008
@@ -548,9 +548,45 @@
      ELSE ' X is not running
        SHELL "hostname $HOSTNAME; echo " & sHostName & " > " &  
ClsGlobal.sTargetMnt &/ "etc" &/ "HOSTNAME" WAIT ' This sets the hostname  
to the current CLI session and saves it for future boots
      END IF
+    ME.UPDATE_HOSTS_FILE(sHostName)

+
+
+END
+
+PUBLIC SUB UPDATE_HOSTS_FILE(sHostName AS String)

+    DIM sFileIn, sFileOut AS String
+
+    sFileIn = "# \n" &
+    "# hosts \n" &
+    "#\n #\n" &
+    "# This file describes a numeber of host-to-address mappings for the  
TCP/IP subsystem. \n" &
+    "# It is mostly used  at boot time, when no name servers are running.  
On small systems, this \n" &
+    "# file can be used instead of a \"named\" name server. Just add the  
names, addresses and any \n" &
+    "# aliases to this file ...\n #\n#\n#n" &
+    "# By the way, Arnt Gulbrandsen <agr...@nv...> says that  
127.0.0.1 should NEVER \n" &
+    "# be named with the name of the machine. It causes problem sor some  
programs, irc and \n" &
+    "# reputedly talk. :^) \n#\n#\n" &
+    "# For loopbacking." &
+    "127.0.0.1" & Space(5) & "localhost" & "\n" &
+    "#\n#\n" &
+    "# This next entry is technically wrong, but good enough to get TCP/IP  
applications to quit complaining \n" &
+    "# that they can\'t clarify the hostname on a loopback-only system  
\n#\n#\n#" &
+    "127.0.0.1" & Space(5) & sHostName & Space(5) & sHostName & "\n#\n#" &
+    "# End of hosts."
+
+    IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts") THEN MOVE  
ClsGlobal.sTargetMnt &/ "etc" &/ "hosts" TO ClsGlobal.sTargetMnt &/ "etc"  
&/ "hosts.bak"
+    IF Exist(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts") THEN KILL  
ClsGlobal.sTargetMnt &/ "etc" &/ "hosts"
+
+      TRY File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "hosts",  
SConv(sFileIn))
+          CATCH
+          Message.Error(Error.where & gb.NewLine & Error.text)
+
  END
+
+
+

  PUBLIC SUB SET_DNS_ADDRESSES()

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

From: <cod...@go...> - 2008-11-03 19:30:46

Author: M0E.lnx
Date: Mon Nov  3 11:29:59 2008
New Revision: 257

Modified:
    branches/iVL/.project
    branches/iVL/FrmXconf.class
    branches/iVL/FrmXconf.form
    branches/iVL/installer.gambas

Log:
Added keyboard model and variant listings to xorg.conf window. Updated  
binary

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Mon Nov  3 11:29:59 2008
@@ -1,8 +1,8 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
-Startup=FrmXconf
-Version=0.0.120
+Startup=MdlCore
+Version=0.0.122
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,7 +17,6 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
-ExecPath=/home/uel/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class	(original)
+++ branches/iVL/FrmXconf.class	Mon Nov  3 11:29:59 2008
@@ -132,6 +132,84 @@

  END

+PUBLIC SUB LIST_KBD_VARIANTS()
+
+   DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
+  DIM i, ii AS Integer
+  DIM sArr AS String[] '= Split(sFile, "\n")
+
+
+
+      sFile = File.Load("/tmp/kbd.file")
+      sarr = Split(sFile, "\n")
+
+
+      ii = 1
+      FOR i = 0 TO sArr.count - 1
+      'PRINT sArr[i]
+        'IF Left(sArr[i], Len("!  Layout")) = "!  Layout" THEN
+  IF Left(sArr[i]) = "!" AND InStr(sArr[i], "variant") THEN
+      'REPEAT
+          IF Trim(sarr[i + ii]) <> "" THEN
+          REPEAT
+            'PRINT sarr[i + ii]
+            ME.cvKbdVar.Add(Left(sarr[i + ii], InStr(sarr[i + ii], ":")),  
Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i + ii], ":")))
+            INC ii
+          'END IF
+          UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "option") =  
TRUE
+          END IF
+END IF
+        NEXT
+
+END
+
+
+
+PUBLIC SUB LIST_KBD_MODELS()
+
+  DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
+  DIM i, ii AS Integer
+  DIM sArr AS String[] '= Split(sFile, "\n")
+  'DIM sHack AS String
+
+  '     ' ugly hack to get a good list begins here
+  '     sHack = "#!/bin/bash \n" &
+  ' "echo /dev/null > /tmp/kbd.file \n" &
+  '     "while read code desc1 desc2 junk \n" &
+  '     "do \n" &
+  '     "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file  
\n" &
+  '     "done < /etc/X11/xkb/rules/xorg.lst"
+  '
+  '     File.Save("/tmp/kbd_strip.sh", sHack)
+  '     SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+  '     SHELL "sh /tmp/kbd_strip.sh" WAIT
+
+      ' END OF UGLY HACK HERE
+
+      sFile = File.Load("/tmp/kbd.file")
+      sarr = Split(sFile, "\n")
+
+
+      ii = 1
+      FOR i = 0 TO sArr.count - 1
+      'PRINT sArr[i]
+        'IF Left(sArr[i], Len("!  Layout")) = "!  Layout" THEN
+  IF Left(sArr[i]) = "!" AND InStr(sArr[i], "model") THEN
+      'REPEAT
+          IF Trim(sarr[i + ii]) <> "" THEN
+          REPEAT
+            'PRINT sarr[i + ii]
+            ME.cvKeybdModel.add(Left(sarr[i + ii], InStr(sarr[i +  
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +  
ii], " ")))
+            INC ii
+          'END IF
+          UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "layout") =  
TRUE
+          END IF
+END IF
+        NEXT
+
+
+
+END



@@ -141,6 +219,7 @@

      WITH ME
      .TlBanner.Move(4, 24, .hbBanner.Width - (.TlBanner.Left * 2))
+    '.cvKbLayout.Move(4, 18, .frmkbdlay.Width - (.frmkbdlay.Left * 4))

      END WITH

@@ -156,11 +235,31 @@
  PUBLIC SUB Form_Menu()

    ME.LIST_KBD_LAYOUTS
+  ME.LIST_KBD_MODELS
+  ME.LIST_KBD_VARIANTS

  END

  PUBLIC SUB Frame1_Menu()

    'ME.LIST_KBD_LAYOUTS
+
+END
+
+PUBLIC SUB cvKbdVar_Click()
+
+  Message(LAST.current.key)
+
+END
+
+PUBLIC SUB cvKeybdModel_Click()
+
+  Message(LAST.current.key)
+
+END
+
+PUBLIC SUB cvKbLayout_Click()
+
+  Message(LAST.current.key)

  END

Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form	(original)
+++ branches/iVL/FrmXconf.form	Mon Nov  3 11:29:59 2008
@@ -1,7 +1,7 @@
  # Gambas Form File 2.0

  { Form Form
-  MoveScaled(0,0,89,59)
+  MoveScaled(0,0,103,59)
    Text = ("")
    Arrangement = Arrange.Vertical
    { hbBanner Panel
@@ -13,15 +13,15 @@
      }
    }
    { Panel1 Panel
-    MoveScaled(0,6,69,10)
+    MoveScaled(0,6,98,10)
      Arrangement = Arrange.Horizontal
      AutoResize = True
      { Frame1 Frame
-      MoveScaled(0,0,69,9)
+      MoveScaled(2,0,85,9)
        Expand = True
        Text = ("")
        { tlChoiceExp TextLabel
-        MoveScaled(1,5,58,3)
+        MoveScaled(1,5,35,3)
          Text = ("")
        }
        { cbSetupMethod ComboBox
@@ -35,38 +35,59 @@
          Text = ("Video Driver")
          Alignment = Align.Normal
        }
-    }
-  }
-  { Panel2 Panel
-    MoveScaled(1,17,83,5)
-    AutoResize = True
-    { tlColorDepth TextLabel
-      MoveScaled(0,0,11,3)
-      Text = ("Color Depth")
-      Alignment = Align.Normal
-    }
-    { tlScreenRes TextLabel
-      MoveScaled(38,0,18,3)
-      Text = ("Screen Resolution")
-      Alignment = Align.Normal
-    }
-    { cbColorDepth ComboBox
-      MoveScaled(10,0,24,3)
-      Text = ("")
-      List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit 256  
Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
-    }
-    { cbScreenRes ComboBox
-      MoveScaled(56,0,15,3)
-      Text = ("")
-      List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),  
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
+      { tlColorDepth TextLabel
+        MoveScaled(42,1,11,3)
+        Text = ("Color Depth")
+        Alignment = Align.Normal
+      }
+      { cbColorDepth ComboBox
+        MoveScaled(52,1,24,3)
+        Text = ("")
+        List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit  
256 Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
+      }
+      { tlScreenRes TextLabel
+        MoveScaled(42,4,18,3)
+        Text = ("Screen Resolution")
+        Alignment = Align.Normal
+      }
+      { cbScreenRes ComboBox
+        MoveScaled(60,4,16,3)
+        Text = ("")
+        List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),  
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
+      }
      }
    }
    { pblKbdSets Panel
-    MoveScaled(2,23,78,29)
+    MoveScaled(1,17,96,27)
      Expand = True
      Arrangement = Arrange.Horizontal
-    { cvKbLayout ColumnView
-      MoveScaled(0,0,29,28)
+    AutoResize = True
+    { frmkbdlay Frame
+      MoveScaled(0,0,30,25)
+      Expand = True
+      Text = ("Keyboard Layout")
+      { cvKbLayout ColumnView
+        MoveScaled(1,3,28,20)
+        Expand = True
+      }
+    }
+    { frmKbdMod Frame
+      MoveScaled(33,0,32,24)
+      Expand = True
+      Text = ("Keyboard Model")
+      { cvKeybdModel ColumnView
+        MoveScaled(1,3,29,21)
+        Expand = True
+      }
+    }
+    { frmkeyVar Frame
+      MoveScaled(67,1,27,23)
+      Expand = True
+      Text = ("Keyboard Variant")
+      { cvKbdVar ColumnView
+        MoveScaled(8,3,11,21)
+        Expand = True
+      }
      }
    }
  }

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

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

From: <cod...@go...> - 2008-10-31 20:59:21

Author: M0E.lnx
Date: Fri Oct 31 13:57:39 2008
New Revision: 255

Modified:
    branches/iVL/.lang/#project.pot
    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/.project
    branches/iVL/FrmXconf.class
    branches/iVL/FrmXconf.form

Log:
Added keyboard layout listing to FrmXconf form

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/.project
+# /home/vluser/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsGlobal.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsPartSel.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/ClsWinDrives.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmDiskPart.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartScheme.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPartSel.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmPkgSel.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSelISO.class
+# /home/vluser/devel/installer/FrmSelISO.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -30,27 +30,31 @@
  msgid "Unable to locate any installable media."
  msgstr ""

-#: FrmSelISO.class:112
+#: FrmSelISO.class:82
+msgid "Installable media found."
+msgstr ""
+
+#: FrmSelISO.class:113
  msgid "Unable to identify distro."
  msgstr ""

-#: FrmSelISO.class:147
+#: FrmSelISO.class:148
  msgid "Minimum Disk Space Requirements"
  msgstr ""

-#: FrmSelISO.class:250
+#: FrmSelISO.class:251
  msgid "No installable images found."
  msgstr ""

-#: FrmSelISO.class:256
+#: FrmSelISO.class:257
  msgid "Select which VectorLinux version you wish to install from the list  
below"
  msgstr ""

-#: FrmSelISO.class:261
+#: FrmSelISO.class:262
  msgid "TextLabel1"
  msgstr ""

-#: FrmSelISO.class:266
+#: FrmSelISO.class:267
  msgid "Search Again"
  msgstr ""


Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmSummary.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/FrmWinDrives.class
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlCore.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlDiskPart.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlObjSizer.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPartSel.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlPkgSel.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSetup.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlSummarize.module
+# /home/vluser/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	Fri Oct 31 13:57:39 2008
@@ -1,4 +1,4 @@
-# /home/uel/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Oct 31 13:57:39 2008
@@ -1,7 +1,7 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
-Startup=MdlCore
+Startup=FrmXconf
  Version=0.0.120
  Library=gb.gtk
  Library=gb.form

Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class	(original)
+++ branches/iVL/FrmXconf.class	Fri Oct 31 13:57:39 2008
@@ -86,6 +86,57 @@

  END

+PUBLIC SUB LIST_KBD_LAYOUTS()
+
+  DIM sFile AS String '= File.Load("/etc/X11/xkb/rules/xorg.lst")
+  DIM i, ii AS Integer
+  DIM sArr AS String[] '= Split(sFile, "\n")
+  DIM sHack AS String
+
+      ' ugly hack to get a good list begins here
+      sHack = "#!/bin/bash \n" &
+  "echo /dev/null > /tmp/kbd.file \n" &
+      "while read code desc1 desc2 junk \n" &
+      "do \n" &
+      "echo \"$code\" \"$desc1\" \"$desc2\" \"$junk\" >> /tmp/kbd.file \n"  
&
+      "done < /etc/X11/xkb/rules/xorg.lst"
+
+      File.Save("/tmp/kbd_strip.sh", sHack)
+      SHELL "chmod +x /tmp/kbd_strip.sh" WAIT
+      SHELL "sh /tmp/kbd_strip.sh" WAIT
+
+      ' END OF UGLY HACK HERE
+
+      sFile = File.Load("/tmp/kbd.file")
+      sarr = Split(sFile, "\n")
+
+
+      ii = 1
+      FOR i = 0 TO sArr.count - 1
+      'PRINT sArr[i]
+        'IF Left(sArr[i], Len("!  Layout")) = "!  Layout" THEN
+  IF Left(sArr[i]) = "!" AND InStr(sArr[i], "layout") THEN
+      'REPEAT
+          IF Trim(sarr[i + ii]) <> "" THEN
+          REPEAT
+            'PRINT sarr[i + ii]
+            ME.cvKbLayout.Add(Left(sarr[i + ii], InStr(sarr[i +  
ii], " ")), Right(sarr[i + ii], Len(sarr[i + ii]) - InStr(sarr[i +  
ii], " ")))
+            INC ii
+          'END IF
+          UNTIL Trim(sarr[i + ii]) = "" OR InStr(sarr[i + ii], "variant")  
= TRUE
+          END IF
+END IF
+        NEXT
+
+
+
+END
+
+
+
+
+
+
  PUBLIC SUB Form_Resize()

      WITH ME
@@ -99,5 +150,17 @@

  'Message(Trim(Left(cbcolordepth.text, 2)))

+
+END
+
+PUBLIC SUB Form_Menu()
+
+  ME.LIST_KBD_LAYOUTS
+
+END
+
+PUBLIC SUB Frame1_Menu()
+
+  'ME.LIST_KBD_LAYOUTS

  END

Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form	(original)
+++ branches/iVL/FrmXconf.form	Fri Oct 31 13:57:39 2008
@@ -38,28 +38,35 @@
      }
    }
    { Panel2 Panel
-    MoveScaled(1,17,83,34)
-    Arrangement = Arrange.Row
+    MoveScaled(1,17,83,5)
      AutoResize = True
      { tlColorDepth TextLabel
        MoveScaled(0,0,11,3)
        Text = ("Color Depth")
        Alignment = Align.Normal
      }
+    { tlScreenRes TextLabel
+      MoveScaled(38,0,18,3)
+      Text = ("Screen Resolution")
+      Alignment = Align.Normal
+    }
      { cbColorDepth ComboBox
        MoveScaled(10,0,24,3)
        Text = ("")
        List = [("24 bit True Color"), ("16 bit Pseudo Color"), ("8 bit 256  
Color"), ("4 bit 16 Color"), ("1 bit Mono B/W")]
      }
-    { tlScreenRes TextLabel
-      MoveScaled(0,4,18,3)
-      Text = ("Screen Resolution")
-      Alignment = Align.Normal
-    }
      { cbScreenRes ComboBox
-      MoveScaled(18,4,15,3)
+      MoveScaled(56,0,15,3)
        Text = ("")
        List = [("1920x1280"), ("1600x1200"), ("1440x900"), ("1280x1024"),  
("1280x800"), ("1024x768"), ("800x600"), ("640x480")]
+    }
+  }
+  { pblKbdSets Panel
+    MoveScaled(2,23,78,29)
+    Expand = True
+    Arrangement = Arrange.Horizontal
+    { cvKbLayout ColumnView
+      MoveScaled(0,0,29,28)
      }
    }
  }

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

From: <cod...@go...> - 2008-10-31 18:02:30

Author: M0E.lnx
Date: Fri Oct 31 11:01:57 2008
New Revision: 254

Modified:
    branches/iVL/FrmSelISO.class

Log:
Fixed error in media detection

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Fri Oct 31 11:01:57 2008
@@ -69,7 +69,7 @@
    ClsGlobal.sBackNav.Add(ME)
    END IF

-  IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) <> -1 THEN
+  IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) = -1 THEN
      tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'"  
& Space(1) & ("to begin installating") & Space(1)&
      Left(FrmSelISO.lstInstallableImg.text,  
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
    ELSE IF lstInstallableImg.Find(("No Installable Media Found")) <> -1 THEN
@@ -79,6 +79,7 @@
      FMain.btnext.ForeColor = Color.Gray
      FMain.btback.ForeColor = Color.Gray
      ELSE
+      tlBanner.text = "<b>" & ("Installable media found.") & "</b>"
        WITH FMain
          .btback.Enabled = FALSE
            .btback.ForeColor = Color.Gray

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

From: <cod...@go...> - 2008-10-31 15:07:33

Author: uelsk8s
Date: Fri Oct 31 08:06:16 2008
New Revision: 253

Modified:
    branches/iVL/.lang/#project.pot
    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/.project
    branches/iVL/FMain.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/MdlNetConf.module
    branches/iVL/installer.gambas

Log:
bring up network in host

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/.project
+# /home/uel/gui-installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsGlobal.class
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsPartSel.class
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/ClsWinDrives.class
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FMain.class
+# /home/uel/gui-installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -30,75 +30,75 @@
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

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

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

-#: FMain.class:284
+#: FMain.class:285
  msgid "Skipping lilo setup"
  msgstr ""

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

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

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

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

-#: FMain.class:313
+#: FMain.class:314
  msgid "Yes"
  msgstr ""

-#: FMain.class:313
+#: FMain.class:314
  msgid "No"
  msgstr ""

-#: FMain.class:380
+#: FMain.class:382
  msgid "has been installed on your computer. Additional system  
configuration"
  msgstr ""

-#: FMain.class:380
+#: FMain.class:382
  msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
  msgstr ""

-#: FMain.class:380
+#: FMain.class:382
  msgid "Would you like to reboot your computer now?"
  msgstr ""

-#: FMain.class:385
+#: FMain.class:387
  msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
  msgstr ""

-#: FMain.class:452
+#: FMain.class:454
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:472
+#: FMain.class:474
  msgid "Next"
  msgstr ""

-#: FMain.class:478
+#: FMain.class:480
  msgid "Back"
  msgstr ""

-#: FMain.class:484
+#: FMain.class:486
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:500
+#: FMain.class:502
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmDiskPart.class
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartScheme.class
+# /home/uel/gui-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 Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPartSel.class
+# /home/uel/gui-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 Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmPkgSel.class
+# /home/uel/gui-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 Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSelISO.class
+# /home/uel/gui-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 Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmSummary.class
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/FrmWinDrives.class
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlCore.module
+# /home/uel/gui-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 Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlDiskPart.module
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlObjSizer.module
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPartSel.module
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlPkgSel.module
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSetup.module
+# /home/uel/gui-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	Fri Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlSummarize.module
+# /home/uel/gui-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 Oct 31 08:06:16 2008
@@ -1,4 +1,4 @@
-# /home/remote/devel/installer/MdlWinDrives.module
+# /home/uel/gui-installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Oct 31 08:06:16 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.118
+Version=0.0.120
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,6 +17,7 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
+ExecPath=/home/uel/gui-installer/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Add...@gm...

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Fri Oct 31 08:06:16 2008
@@ -261,10 +261,11 @@
      'POST INSTALL CONFIGURATION
      CASE "FrmInstallSys"
        MdlInstallSys.WRITE_NEW_DISTRO_ID()
+      MdlConfLilo.PERFORM_BINDING()
        frmNext = FrmLilo

      CASE "FrmLilo"
-      MdlConfLilo.PERFORM_BINDING()
+
        'make sure lilo has not been bypassed
          IF FrmLilo.YNLiloBox.Value = FALSE THEN
              ' do some simple checks to make sure nothing is left blank  
before proceeding
@@ -283,7 +284,7 @@
            ' lilo installation / setup has been skipped
            FrmLilo.tlBanner.Text = "<b>" & ("Skipping lilo setup") & "</b>"
          END IF
-
+       SHELL "mount -o bind /mnt/target/lib /lib && depmod -aq &&  
/etc/rc.d/rc.udev restart"
        'frmNext = FrmLiloOsList
         frmNext = FrmZoneSet

@@ -320,7 +321,8 @@
              END IF
        END IF

-
+      SHELL "cp /mnt/target/etc/modules.conf >/etc/modules.conf" WAIT
+      SHELL "ifconfig eth0 up" WAIT
        frmNext = FrmNetConf



Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Fri Oct 31 08:06:16 2008
@@ -316,18 +316,19 @@
  SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
  SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
  sOut = "#!/bin/bash \n" &
+"DISPLAY=" & gb.NewLine &
  "chmod +x /etc/rc.d/rc.udev" & gb.NewLine &
  "/etc/rc.d/rc.udev restart" & gb.NewLine &
  "/etc/rc.d/rc.modules" & gb.NewLine &
  "/sbin/vlsetup" & gb.NewLine &
+"/sbin/vhwconf" & gb.NewLine &
  "sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
  "rm -r /root/.mc 2>/dev/null" & gb.NewLine &
  "for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh  
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
  "for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &  
gb.NewLine &
  "update-mime-database /usr/share/mime/" & gb.NewLine &
  "cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &  
gb.NewLine &
-"/sbin/vhwconf" & gb.NewLine &
-"/sbin/valsaconf-quiet"
+"/sbin/valsaconf-quiet" & gb.NewLine
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
  'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng" WAIT
@@ -338,7 +339,7 @@
  SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
  SHELL "touch " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2"
  sOut = "#!/bin/bash \n" &
-"/sbin/config-stage1 gui-installer"
+"/sbin/config-stage1 gui-installer" & gb.NewLine
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut)
  'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Fri Oct 31 08:06:16 2008
@@ -35,6 +35,8 @@
  PRIVATE pWiredPic AS Picture = picture["images/ethernet.png"]
  PRIVATE pWirelessPic AS picture = picture["images/wireless.png"]

+
+
  PUBLIC SUB LIST_NETWORK_INTERFACES()

    ' This SUB will detect network interfaces and offer setup options for  
each one of them

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

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

From: <cod...@go...> - 2008-10-31 14:53:26

Author: M0E.lnx
Date: Fri Oct 31 07:52:04 2008
New Revision: 252

Modified:
    branches/iVL/.lang/#project.pot
    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/.project
    branches/iVL/FrmSelISO.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
Fixed bug in FrmSelISO that locked up the image selection windows even when  
some images were found

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Fri Oct 31 07:52:04 2008
@@ -1,4 +1,4 @@
-# /home/vluser/devel/installer/.project
+# /home/remote/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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.
@@ -30,11 +30,11 @@
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

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

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

@@ -66,39 +66,39 @@
  msgid "No"
  msgstr ""

-#: FMain.class:379
+#: FMain.class:380
  msgid "has been installed on your computer. Additional system  
configuration"
  msgstr ""

-#: FMain.class:379
+#: FMain.class:380
  msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
  msgstr ""

-#: FMain.class:379
+#: FMain.class:380
  msgid "Would you like to reboot your computer now?"
  msgstr ""

-#: FMain.class:384
+#: FMain.class:385
  msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
  msgstr ""

-#: FMain.class:451
+#: FMain.class:452
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:471
+#: FMain.class:472
  msgid "Next"
  msgstr ""

-#: FMain.class:477
+#: FMain.class:478
  msgid "Back"
  msgstr ""

-#: FMain.class:483
+#: FMain.class:484
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:499
+#: FMain.class:500
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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.
@@ -14,43 +14,43 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FrmSelISO.class:29
+#: FrmSelISO.class:30
  msgid "No Installable Media Found"
  msgstr ""

-#: FrmSelISO.class:73
+#: FrmSelISO.class:74
  msgid "Click"
  msgstr ""

-#: FrmSelISO.class:73
+#: FrmSelISO.class:74
  msgid "to begin installating"
  msgstr ""

-#: FrmSelISO.class:75
+#: FrmSelISO.class:76
  msgid "Unable to locate any installable media."
  msgstr ""

-#: FrmSelISO.class:104
+#: FrmSelISO.class:112
  msgid "Unable to identify distro."
  msgstr ""

-#: FrmSelISO.class:139
+#: FrmSelISO.class:147
  msgid "Minimum Disk Space Requirements"
  msgstr ""

-#: FrmSelISO.class:242
+#: FrmSelISO.class:250
  msgid "No installable images found."
  msgstr ""

-#: FrmSelISO.class:248
+#: FrmSelISO.class:256
  msgid "Select which VectorLinux version you wish to install from the list  
below"
  msgstr ""

-#: FrmSelISO.class:253
+#: FrmSelISO.class:261
  msgid "TextLabel1"
  msgstr ""

-#: FrmSelISO.class:258
+#: FrmSelISO.class:266
  msgid "Search Again"
  msgstr ""


Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot	(original)
+++ branches/iVL/.lang/FrmSummary.pot	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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	Fri Oct 31 07:52:04 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/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Fri Oct 31 07:52:04 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.116
+Version=0.0.118
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Fri Oct 31 07:52:04 2008
@@ -26,7 +26,8 @@


    IF lstInstallableImg.Count > 0 THEN
-  IF lstInstallableImg.Text <> ("No Installable Media Found") THEN
+  'IF lstInstallableImg.Text <> ("No Installable Media Found") THEN
+  IF lstInstallableImg.Find(("No Installable Media Found")) = -1
      IF InStr(Trim(lstInstallableImg.Text), ".iso") OR  
InStr(Trim(lstInstallableImg.Text), ".ISO") = TRUE THEN
      sLocation = Left(lstInstallableImg.Text,  
InStr(lstInstallableImg.Text, " ") - 1)

@@ -68,15 +69,22 @@
    ClsGlobal.sBackNav.Add(ME)
    END IF

-  IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) = -1 THEN
+  IF lstInstallableImg.count = 1 AND lstInstallableImg.Find(("No  
Installable Media Found")) <> -1 THEN
      tlBanner.Text = ("Click") & Space(1) & "\'" & FMain.btnext.text & "\'"  
& Space(1) & ("to begin installating") & Space(1)&
      Left(FrmSelISO.lstInstallableImg.text,  
InStr(FrmSelISO.lstInstallableImg.text, "/") - 4)
-  ELSE
+  ELSE IF lstInstallableImg.Find(("No Installable Media Found")) <> -1 THEN
      tlBanner.Text = "<b>" & ("Unable to locate any installable media.")  
& "</b>"
      FMain.btnext.Enabled = FALSE
      FMain.btback.Enabled = FALSE
      FMain.btnext.ForeColor = Color.Gray
      FMain.btback.ForeColor = Color.Gray
+    ELSE
+      WITH FMain
+        .btback.Enabled = FALSE
+          .btback.ForeColor = Color.Gray
+          .btnext.Enabled = TRUE
+          .btnext.ForeColor = Color.Black
+      END WITH
    END IF
     FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic
    FMain.tvPlan["Prep1"].Picture = MdlCore.sNowPic

Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Fri Oct 31 07:52:04 2008
@@ -316,21 +316,21 @@
  SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
  SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
  sOut = "#!/bin/bash \n" &
-"chmod +x /etc/rc.d/rc.udev" &
-"/etc/rc.d/rc.udev restart" &
-"/etc/rc.d/rc.modules" &
-"/sbin/vlsetup" &
-"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" &
-"rm -r /root/.mc 2>/dev/null" &
-"for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh  
];then sh convert.sh & 2>/dev/null;fi;done" &
-"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &
-"update-mime-database /usr/share/mime/" &
-"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &
-"/sbin/vhwconf" &
+"chmod +x /etc/rc.d/rc.udev" & gb.NewLine &
+"/etc/rc.d/rc.udev restart" & gb.NewLine &
+"/etc/rc.d/rc.modules" & gb.NewLine &
+"/sbin/vlsetup" & gb.NewLine &
+"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & gb.NewLine &
+"rm -r /root/.mc 2>/dev/null" & gb.NewLine &
+"for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh  
];then sh convert.sh & 2>/dev/null;fi;done" & gb.NewLine &
+"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &  
gb.NewLine &
+"update-mime-database /usr/share/mime/" & gb.NewLine &
+"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &  
gb.NewLine &
+"/sbin/vhwconf" & gb.NewLine &
  "/sbin/valsaconf-quiet"
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
-SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
-SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
+'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
+SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng" WAIT

  SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
  SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &"
@@ -340,7 +340,7 @@
  sOut = "#!/bin/bash \n" &
  "/sbin/config-stage1 gui-installer"
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut)
-SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
  'SHELL "chroot /mnt/target " WAIT


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

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

From: <cod...@go...> - 2008-10-31 00:00:09

Author: uelsk8s
Date: Thu Oct 30 16:59:32 2008
New Revision: 251

Modified:
    branches/iVL/FMain.class
    branches/iVL/MdlConfLilo.module
    branches/iVL/installer.gambas

Log:
run alsa config quietly - getting ready for ISO test

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Oct 30 16:59:32 2008
@@ -264,6 +264,7 @@
        frmNext = FrmLilo

      CASE "FrmLilo"
+      MdlConfLilo.PERFORM_BINDING()
        'make sure lilo has not been bypassed
          IF FrmLilo.YNLiloBox.Value = FALSE THEN
              ' do some simple checks to make sure nothing is left blank  
before proceeding
@@ -274,7 +275,6 @@
                      RETURN
                  END IF
          ' Now that lilo has been setup, write it to the config
-        MdlConfLilo.PERFORM_BINDING()
          MdlConfLilo.GENERATE_LILO_DOT_CONF()
          MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
          MdlConfLilo.WRITE_LILO_DOT_CONF()
@@ -330,6 +330,7 @@
        MdlNetConf.WRITE_INET()

            'offer to reboot here
+          ME.END_INSTALLER()
            frmNext = FrmAlsaConf
  '      frmNext = FrmLilo ' this is already done


Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module	(original)
+++ branches/iVL/MdlConfLilo.module	Thu Oct 30 16:59:32 2008
@@ -311,15 +311,6 @@
  SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT
  SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT
  SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT
-
-'SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-'SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
-  'SHELL "touch " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
-'sOut = "#!/bin/bash \n" &
-'"/sbin/config-stage1 gui-installer"
-'File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2",  
sOut)
-'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
-'SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"

  'We will run the commands neccisary to setup the newly installed system  
here
  SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT
@@ -335,13 +326,22 @@
  "for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" &
  "update-mime-database /usr/share/mime/" &
  "cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm  
libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" &
-"/sbin/vhwconf"
+"/sbin/vhwconf" &
+"/sbin/valsaconf-quiet"
  File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut)
  SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"
  SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/config-vinstall-ng"

  SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT
  SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &"
+SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT
+SHELL "touch " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2"
+sOut = "#!/bin/bash \n" &
+"/sbin/config-stage1 gui-installer"
+File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut)
+SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
+SHELL "chmod +x " & ClsGlobal.sTargetMnt  
&/ "var/log/setup/init/config-stage2"
  'SHELL "chroot /mnt/target " WAIT

  END

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

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

From: <cod...@go...> - 2008-10-30 18:58:46

Author: M0E.lnx
Date: Thu Oct 30 11:57:50 2008
New Revision: 249

Modified:
    branches/iVL/.project
    branches/iVL/FrmLangSel.class
    branches/iVL/FrmXconf.class
    branches/iVL/FrmXconf.form
    branches/iVL/installer.gambas

Log:
Changing the Language selection method

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Oct 30 11:57:50 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.112
+Version=0.0.116
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class	(original)
+++ branches/iVL/FrmLangSel.class	Thu Oct 30 11:57:50 2008
@@ -33,25 +33,31 @@

  PUBLIC SUB LIST_LANG_CHOICES()

-    DIM sLangCode, sLangName AS String
-    DIM i AS Integer
-
-    i = 0
-    FOR EACH sLangCode IN RDir(".lang", "*.mo")
-      'Message(sLangCode)
-      SELECT CASE File.BaseName(".lang" &/ sLangCode)
-        CASE "en_US"
-          sLangName = "US English"
-        CASE "es"
-          sLangName = "Spanish"
-      END SELECT
-
-    ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
-
-
-NEXT
-

+  WITH ME.lblangsel
+    .Add("es_ES", "Spanish")
+  END WITH
+
+
+' '     DIM sLangCode, sLangName AS String
+' '     DIM i AS Integer
+' '
+' '     i = 0
+' '     FOR EACH sLangCode IN RDir(".lang", "*.mo")
+' '       'Message(sLangCode)
+' '       SELECT CASE File.BaseName(".lang" &/ sLangCode)
+' '         CASE "en_US"
+' '           sLangName = "US English"
+' '         CASE "es"
+' '           sLangName = "Spanish"
+' '       END SELECT
+' '
+' '     ME.lblangsel.Add(File.BaseName(sLangCode), sLangName)
+' '
+' '
+' ' NEXT
+' '
+' '
  END



Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class	(original)
+++ branches/iVL/FrmXconf.class	Thu Oct 30 11:57:50 2008
@@ -76,12 +76,13 @@
      END IF
    NEXT

-
-  FrmXconf.cbSetupMethod.Add(sOut)
-  FrmXconf.cbSetupMethod.text = sOut
+        IF sOut <> "EndSectio" THEN
+          FrmXconf.cbSetupMethod.Add(sOut)
+          FrmXconf.cbSetupMethod.text = sOut
+        END IF

    'Message(sOut)
-
+  FrmXconf.cbSetupMethod_Click()

  END


Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form	(original)
+++ branches/iVL/FrmXconf.form	Thu Oct 30 11:57:50 2008
@@ -25,8 +25,8 @@
          Text = ("")
        }
        { cbSetupMethod ComboBox
-        MoveScaled(14,1,22,4)
-        Text = ("")
+        MoveScaled(14,1,22,3)
+        Text = ("Vesa")
          ReadOnly = True
          List = [("Vesa"), ("Fbdev")]
        }

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

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

From: <cod...@go...> - 2008-10-30 14:53:31

Author: M0E.lnx
Date: Thu Oct 30 07:51:45 2008
New Revision: 248

Added:
    branches/iVL/MdlAlsaConf.module
Modified:
    branches/iVL/.lang/#project.pot
    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/.project
    branches/iVL/FMain.class
    branches/iVL/FrmAlsaConf.class
    branches/iVL/FrmAlsaConf.form
    branches/iVL/MdlCore.module

Log:
Alsaconf module ready for testing

Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot	(original)
+++ branches/iVL/.lang/#project.pot	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/.project
+# /home/vluser/devel/installer/.project
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/ClsGlobal.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/ClsPartSel.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/ClsWinDrives.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -66,39 +66,39 @@
  msgid "No"
  msgstr ""

-#: FMain.class:335
+#: FMain.class:379
  msgid "has been installed on your computer. Additional system  
configuration"
  msgstr ""

-#: FMain.class:335
+#: FMain.class:379
  msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
  msgstr ""

-#: FMain.class:335
+#: FMain.class:379
  msgid "Would you like to reboot your computer now?"
  msgstr ""

-#: FMain.class:340
+#: FMain.class:384
  msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
  msgstr ""

-#: FMain.class:435
+#: FMain.class:451
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:455
+#: FMain.class:471
  msgid "Next"
  msgstr ""

-#: FMain.class:461
+#: FMain.class:477
  msgid "Back"
  msgstr ""

-#: FMain.class:467
+#: FMain.class:483
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:483
+#: FMain.class:499
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmDiskPart.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmPartScheme.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmPartSel.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmPkgSel.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmSelISO.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmSummary.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/FrmWinDrives.class
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlCore.module
+# /home/vluser/devel/installer/MdlCore.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -104,5 +104,9 @@

  #: MdlCore.module:462
  msgid "Network Configuration"
+msgstr ""
+
+#: MdlCore.module:463
+msgid "Final Hardware Configuration"
  msgstr ""


Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot	(original)
+++ branches/iVL/.lang/MdlDiskPart.pot	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlDiskPart.module
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlObjSizer.module
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlPartSel.module
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlPkgSel.module
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlSetup.module
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlSummarize.module
+# /home/vluser/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	Thu Oct 30 07:51:45 2008
@@ -1,4 +1,4 @@
-# /home/vluser/projects/installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Oct 30 07:51:45 2008
@@ -1,7 +1,7 @@
  # Gambas Project File 2.0
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
-Startup=FrmXconf
+Startup=MdlCore
  Version=0.0.112
  Library=gb.gtk
  Library=gb.form

Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Thu Oct 30 07:51:45 2008
@@ -330,19 +330,14 @@
        MdlNetConf.WRITE_INET()

            'offer to reboot here
-            SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) &  
("has been installed on your computer. Additional system configuration")  
& "<br>" &
-            ("will take place after you reboot your system.Part of this  
process must be done in text mode.") & "<br><br>" &
-            ("Would you like to reboot your computer now?"), ("Yes"),  
("No"))
-      CASE 1
-        SHELL "shutdown -r now"
-      CASE ELSE
-      'RETURN
-        Message.Info(("The VectorLinux installer will now exit. Enjoy your  
new operating system"))
-        QUIT ' dirty quit event
-      'STOP EVENT
-    END SELECT
+          frmNext = FrmAlsaConf
  '      frmNext = FrmLilo ' this is already done
-
+
+  CASE "FrmAlsaConf"
+
+  frmNext = FrmXconf
+
+
    END SELECT

  '         IF frmNext = "" THEN frmNext = FrmSelISO
@@ -375,6 +370,27 @@


  END
+
+
+PUBLIC SUB END_INSTALLER()
+
+    SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has been  
installed on your computer. Additional system configuration") & "<br>" &
+            ("will take place after you reboot your system.Part of this  
process must be done in text mode.") & "<br><br>" &
+            ("Would you like to reboot your computer now?"), ("Yes"),  
("No"))
+      CASE 1
+        SHELL "shutdown -r now"
+      CASE ELSE
+      RETURN
+        Message.Info(("The VectorLinux installer will now exit. Enjoy your  
new operating system"))
+        QUIT ' dirty quit event
+      'STOP EVENT
+    END SELECT
+
+
+END
+
+
+

  PUBLIC SUB btback_Click()


Modified: branches/iVL/FrmAlsaConf.class
==============================================================================
--- branches/iVL/FrmAlsaConf.class	(original)
+++ branches/iVL/FrmAlsaConf.class	Thu Oct 30 07:51:45 2008
@@ -22,15 +22,18 @@
  PUBLIC SUB Form_Open()

    FMain.FrmCurr = ME
+
+FMain.tvPlan.Current.picture = MdlCore.sDonePic
+FMain.tvPlan.MoveNext()
+FMain.tvPlan.Current.Picture = MdlCore.sNowPic

-
-  MdlDiskPart.EMBED_ALSA()
+'  MdlDiskPart.EMBED_ALSA()
+  MdlAlsaConf.EMBED_ALSACONFIG()

    WITH ME
-    .tlBanner.Text = "<b>ALSA Config:</b><br>" &
-    "Advanced Linux Sound Architecture:" &
-    "This portion of the setup process allows you to sutup your soundcard  
for your new operating system." &
-    "Please use the setup program below to setup the sound system."
+    .tlBanner.Text = "<b>" & "Advanced Linux Sound Architecture:"  
& "</b><br>" &
+    ("This portion of the setup process allows you to sutup your soundcard  
for your new operating system.") & "<br>" &
+    ("Please use the setup program below to setup the sound system.")
      .tlBanner.Adjust

    END WITH
@@ -60,29 +63,20 @@

  END

+
+PUBLIC SUB Form_Menu()
+
+'MdlAlsaConf.EMBED_ALSACONFIG()
+
+END
+
  PUBLIC SUB EmbALSA_Close()

-  DIM bReboot AS Boolean
-
-    FrmDiskPart.tlBanner.Text = "<h3><br>Analyzing system partitioning  
scheme... Please wait<br>This will take a few seconds...</h3>"
-    FrmDiskPart.tlBanner.Refresh
-    FrmDiskPart.tlBanner.Adjust
-    'Message("Exiting GParted")
-    WAIT 1
-
-
-
-       ME.Hide
-
-        FrmPartSel.Show
-
-
-
-  FMain.btnext.Enabled = TRUE
-  FMain.btnext.ForeColor = Color.Black
-  FMain.btback.Enabled = TRUE
-  FMain.btback.ForeColor = Color.Black
-  FMain.btQuit.Enabled = TRUE
-  FMain.btQuit.ForeColor = Color.Black
-  'END IF
+  WITH FMain
+    .btnext.Enabled = TRUE
+    .btnext.ForeColor = Color.Black
+    .btback.Enabled = TRUE
+    .btback.ForeColor = Color.Black
+  END WITH
+
  END

Modified: branches/iVL/FrmAlsaConf.form
==============================================================================
--- branches/iVL/FrmAlsaConf.form	(original)
+++ branches/iVL/FrmAlsaConf.form	Thu Oct 30 07:51:45 2008
@@ -4,15 +4,23 @@
    MoveScaled(0,0,84,55)
    Text = ("")
    Arrangement = Arrange.Vertical
-  { tlBanner TextLabel
-    MoveScaled(1,2,81,9)
-    Text = ("Alsa Config:")
+  { pnlBanner Panel
+    MoveScaled(1,1,75,9)
+    Arrangement = Arrange.Vertical
+    { tlBanner TextLabel
+      MoveScaled(1,0,36,6)
+      Text = ("")
+    }
+    { Separator1 Separator
+      MoveScaled(1,7,13,1)
+    }
    }
-  { VPanel1 VPanel
-    MoveScaled(1,12,74,48)
+  { pnlAlsa Panel
+    MoveScaled(1,9,78,33)
      Expand = True
+    Arrangement = Arrange.Horizontal
      { EmbALSA Embedder
-      MoveScaled(6,7,76,32)
+      MoveScaled(0,0,76,32)
        Expand = True
      }
    }

Added: branches/iVL/MdlAlsaConf.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlAlsaConf.module	Thu Oct 30 07:51:45 2008
@@ -0,0 +1,129 @@
+' 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 SUB EMBED_ALSACONFIG()
+
+  DIM aHandle AS NEW Pointer[]
+  DIM iHandle AS Integer
+  DIM i AS Integer = 0
+  DIM sDump AS String
+
+  SHELL "chroot /mnt/target /usr/bin/xterm -e alsaconf"
+
+  aHandle = Desktop.Find("alsaconf")
+    IF aHandle.Count = 0 THEN
+      REPEAT
+        WAIT 1
+        aHandle = Desktop.Find("*alsaconf")
+        INC i
+      UNTIL aHandle.Count > 0 OR i = 3
+    END IF
+    iHandle = aHandle[0]
+
+    TRY FrmAlsaConf.EmbALSA.Embed(iHandle)
+      CATCH
+      Message(Error.where & "\n" & Error.Text)
+       ' Message(("Error trying to launch sound configuration utility"))
+    'END IF
+
+
+
+
+
+  ' ' ' DIM sWins AS String = "gpartedbin,Gpartedbin" '" GParted, / dev /  
sda - GParted, / dev / hda - GParted ""
+  ' ' ' DIM sWons AS String[] = Split(sWins, ",")
+  ' ' ' DIM sType AS String
+  ' ' ' DIM sTypes AS String[]
+  'DIM sTypeArr AS String[]
+  'Desktop.Find("", "GParted")
+
+  ' The window can be found on the Desktop WM_CLASS property which can be  
seen via the xprop application
+  ' We may need to implement this method here instead of the win window  
title method.
+
+  ' For now, try to determine what type of drive thsi is..
+  ' The following line will get the first listed drive (/dev/sda or  
/dev/hda) and use that
+  ' as a starting point to search for a running instance of gparted
+  ' ' ' ' SHELL "probedisk | grep -v \'cdrom\' | cut -f 1 -d \'|\'" TO  
sType
+  ' ' ' '   stype = Trim(sType)
+  ' ' ' '     'Message(sType)
+  ' ' ' '  IF stype = "" THEN
+  ' ' ' '     Message.Error(("VectorLinux is unable to determine the type  
of hard disks on your system.") & " <br>" &
+  ' ' ' '     ("It is still possible to install VectorLinux on your  
system, but you need to pre-partition your disks first"))
+  ' ' ' '  ELSE IF InStr(sType, "\n") > 0 THEN
+  ' ' ' '   ' more than one type of disk was found... by default, gparted  
will load using /dev/hda first
+  ' ' ' '     sType = "/dev/hda"
+  ' ' ' '   END IF
+  ' ' ' '
+  ' ' ' '   IF Exist("/usr/sbin/gparted") = FALSE THEN
+  ' ' ' '     Message.Error(("Gparted was not found on this system. Please  
install gparted and try again"))
+  ' ' ' '     RETURN
+  ' ' ' '   END IF
+  ' ' ' '
+  ' ' ' ' FrmDiskPart.tlBanner.Text = "<h3>" & ("Loading gparted ...  
Please wait") & "</h3>"
+  ' ' ' ' SHELL "/usr/sbin/gparted"
+  ' ' ' ' WAIT 1
+  ' ' ' '
+  ' ' ' ' sTypes = Split(sType, "\n")
+  ' ' ' '
+  ' ' ' '     aHandle = Desktop.Find("", "*parted*", "")
+  ' ' ' '    i = 0
+  ' ' ' '    IF aHandle.Count = 0 THEN 'lets give it a chance to start
+  ' ' ' '      REPEAT
+  ' ' ' '        WAIT 1
+  ' ' ' '        aHandle = Desktop.Find("", "*parted*", "")
+  ' ' ' '        INC i
+  ' ' ' '      UNTIL
+  ' ' ' '      aHandle.Count > 0 OR i > 5
+  ' ' ' '    END IF
+  ' ' ' '
+  ' ' ' '    IF aHandle.count = 0 ' still struggling here
+  ' ' ' '     'FOR i = 0 TO sTypes.Count - 1
+  ' ' ' '       i = 0
+  ' ' ' '       REPEAT
+  ' ' ' '       aHandle = Desktop.Find(Trim(sTypes[i]) & " - GParted")
+  ' ' ' '       INC i
+  ' ' ' '       UNTIL aHandle.coun > 0 OR i = sTypes.Count - 1
+  ' ' ' '    END IF
+  ' ' ' '
+  ' ' ' ' IF aHandle.count = 0 THEN
+  ' ' ' '   aHandle = Desktop.Find("GParted") ' one last attempt
+  ' ' ' ' END IF
+  ' ' ' '
+  ' ' ' '
+  ' ' ' '       IF aHandle.Count = 0 THEN
+  ' ' ' '         Message(("Setup is unable to successfully run gparted on  
this system. This may be a sign of ") & "\n" &
+  ' ' ' '         ("a bad install media. Setup cannot continue."))
+  ' ' ' '       RETURN
+  ' ' ' '       'END IF
+  ' ' ' '
+  ' ' ' '   ELSE IF aHandle.Count >= 2 THEN
+  ' ' ' '     Message(("Several windows found. I will take the first  
one!"))
+  ' ' ' '   ENDIF
+  ' ' ' '   'ELSE
+  ' ' ' '   iHandle = aHandle[0]
+  ' ' ' '
+  ' ' ' ' 'ENDIF
+  ' ' ' '
+  ' ' ' ' 'TRY embEmbedder.Embed(iHandle)
+  ' ' ' '
+  ' ' ' ' TRY FrmDiskPart.EmbGPARTED.Embed(iHandle)
+  ' ' ' '
+  ' ' ' ' CATCH
+  ' ' ' ' Message.Error(Error.Text & gb.NewLine & Error.Where)
+  ' ' ' '
+END
+

Modified: branches/iVL/MdlCore.module
==============================================================================
--- branches/iVL/MdlCore.module	(original)
+++ branches/iVL/MdlCore.module	Thu Oct 30 07:51:45 2008
@@ -460,7 +460,7 @@
    .Add("Conf2", ("System Administrator"), sToDopic, "Conf")
    .Add("Conf3", ("User Accounts"), sToDopic, "Conf")
    .Add("Conf4", ("Network Configuration"), sToDopic, "Conf")
-  '.Add("Conf5", ("Hardware Configuration"), sToDoPic, "Conf")
+  .Add("Conf5", ("Final Hardware Configuration"), sToDoPic, "Conf")
  END WITH
  iLeftWidth = 0
  iWidth = 0

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

From: <cod...@go...> - 2008-10-29 21:57:15

Author: M0E.lnx
Date: Wed Oct 29 14:28:57 2008
New Revision: 247

Added:
    branches/iVL/MdlXconf.module
Removed:
    branches/iVL/MdlConfXorg.module
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/FrmXconf.class
    branches/iVL/FrmXconf.form

Log:
more work in the xorg.conf module

Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot	(original)
+++ branches/iVL/.lang/ClsGlobal.pot	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/ClsGlobal.class
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/ClsPartSel.class
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/ClsWinDrives.class
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FMain.class
+# /home/vluser/projects/installer/FMain.class
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot	(original)
+++ branches/iVL/.lang/FrmDiskPart.pot	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmDiskPart.class
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmPartScheme.class
+# /home/vluser/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmPartSel.class
+# /home/vluser/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmPkgSel.class
+# /home/vluser/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmSelISO.class
+# /home/vluser/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmSummary.class
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/FrmWinDrives.class
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlCore.module
+# /home/vluser/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlDiskPart.module
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlObjSizer.module
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlPartSel.module
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlPkgSel.module
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlSetup.module
+# /home/vluser/projects/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlSummarize.module
+# /home/vluser/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	Wed Oct 29 14:28:57 2008
@@ -1,4 +1,4 @@
-# /home/remote/projects/installer/MdlWinDrives.module
+# /home/vluser/projects/installer/MdlWinDrives.module
  # Generated by Gambas compiler

  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

Modified: branches/iVL/FrmXconf.class
==============================================================================
--- branches/iVL/FrmXconf.class	(original)
+++ branches/iVL/FrmXconf.class	Wed Oct 29 14:28:57 2008
@@ -54,19 +54,20 @@
        'imark = i
          'ii = 1
          REPEAT
-          IF InStr(sFileIn[i + ii], "Driver") = FALSE THEN
+          'IF InStr(sFileIn[i + ii], "Driver") = FALSE THEN
+          IF Left(sFileIn[i + ii], Len("Driver")) <> "Driver" THEN
              INC ii
            END IF
-          UNTIL InStr(sFileIn[i + ii], "Driver") OR InStr(sFileIn[i +  
ii], "EndSection") '= TRUE
+          UNTIL Left(sFileIn[i + ii], Len("Driver")) = "Driver" OR  
InStr(sFileIn[i + ii], "EndSection") '= TRUE
            sOut = Trim(Mid(sFileIn[i + ii], InStr(sFileIn[i + ii], "\"") +  
1, Len(sFileIn[i + ii]) - InStr(sFileIn[i + ii], "\"") - 1))
-          Message(sOut)
+          'Message(sOut)
              ' look for the indentifier string
              ii = 0
              REPEAT
-              IF InStr(sFileIn[i + ii], "Identifier") = FALSE THEN
+              IF Left(Trim(sFileIn[i + ii]), Len("Identifier"))  
<> "Identifier" THEN
                  INC ii
                END IF
-            UNTIL InStr(sFileIn[i + ii], "Identifier") OR InStr(sFileIn[i  
+ ii], "EndSection")
+            UNTIL Left(Trim(sFileIn[i + ii]), Len("Identifier"))  
= "Identifier" OR InStr(sFileIn[i + ii], "EndSection")
              clsXconf.sVidID = Trim(Mid(sFileIn[i + ii], InStr(sFileIn[i +  
ii], "\"") + 1, Len(sFileIn[i + ii]) - InStr(sFileIn[i + ii], "\"") - 1))
              'Message(sID)
            'Message("Found Driver: " & sFileIn[i + ii])

Modified: branches/iVL/FrmXconf.form
==============================================================================
--- branches/iVL/FrmXconf.form	(original)
+++ branches/iVL/FrmXconf.form	Wed Oct 29 14:28:57 2008
@@ -25,7 +25,7 @@
          Text = ("")
        }
        { cbSetupMethod ComboBox
-        MoveScaled(14,1,22,3)
+        MoveScaled(14,1,22,4)
          Text = ("")
          ReadOnly = True
          List = [("Vesa"), ("Fbdev")]
@@ -42,11 +42,11 @@
      Arrangement = Arrange.Horizontal
      AutoResize = True
      { Frame2 Frame
-      MoveScaled(0,0,35,25)
+      MoveScaled(0,0,39,25)
        Expand = True
        Text = ("Keyboard Layout")
        { cvKbdLayout ColumnView
-        MoveScaled(1,2,32,21)
+        MoveScaled(1,2,36,21)
          Expand = True
        }
      }

Added: branches/iVL/MdlXconf.module
==============================================================================
--- (empty file)
+++ branches/iVL/MdlXconf.module	Wed Oct 29 14:28:57 2008
@@ -0,0 +1,23 @@
+' 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 SUB LIST_KBD_LAYOUT()
+
+  ' Read /etc/X11/xkb/rules/xorg.lst
+
+END

14 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 64 > >> (Page 34 of 64)