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

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

Author: M0E.lnx
Date: Tue Dec  2 13:16:31 2008
New Revision: 340

Modified:
    branches/iVL/.project
    branches/iVL/FrmImportAccts.class
    branches/iVL/FrmZoneSet.class
    branches/iVL/MdlResetSettings.module
    branches/iVL/installer.gambas

Log:
Fixed bad object reference in accounts importing

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

Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class	(original)
+++ branches/iVL/FrmImportAccts.class	Tue Dec  2 13:16:31 2008
@@ -127,7 +127,7 @@

    SHELL "chroot /mnt/target  /usr/sbin/groupdel " &  
Trim(ME.cbAccntList.Text) WAIT
    SHELL "chroot /mnt/target /usr/sbin/groupadd " & "-g" & Space(1) &  
FrmUserAdd.iUID & Space(1) & Trim(ME.cbAccntList.Text) WAIT
-  SHELL "chroot /mnt/target /usr/sbin/useradd  -g " & ME.tbUsername.text  
& " -p " & ME.tbPasswd1.text & " -u " & FrmUserAdd.iUID & " -G "  
& "\'users," & sGroups & "\' -s /bin/bash " & 'ME.tbUsername.Text WAIT
+  SHELL "chroot /mnt/target /usr/sbin/useradd  -g " &  
Trim(ME.cbAccntList.Text) & " -p " & ME.tbPasswd1.text & " -u " &  
FrmUserAdd.iUID & " -G " & "\'users," & sGroups & "\' -s /bin/bash "  
& 'ME.tbUsername.Text WAIT
    Trim(ME.cbAccntList.Text) & " -d /home/" & Trim(ME.cbAccntList.Text) WAIT
    SHELL "chroot /mnt/target /sbin/passwdx " & Trim(ME.cbAccntList.Text) &  
Space(1) & ME.tbPass1.Text WAIT

@@ -206,7 +206,7 @@
    .tbPass2.Move(.tlPasswd2.Left, .tbPass1.top, 175)
    .tlPicPath.Move(4, .tbPass1.top + .tbPass1.Height + 8,  
MdlObjSizer.get_object_width(.tlPicPath.Text))
    .btBrowsePic.Move(.ClientWidth - .btBrowsePic.Width - 8, .tlPicPath.top  
+ .tlPicPath.Height + 8, MdlObjSizer.get_object_width(.btBrowsePic.Text) +  
36)
-  .tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)  
- (.tbPicPath.Left * 2) - 8)
+  .tbPicPath.Move(4, .btBrowsePic.top, (.ClientWidth - .btBrowsePic.Width)  
- (.tbPicPath.Left * 2) - 24)
    .pbLogin.Move(.tbPass2.Left + .tbPass2.Width + 8, .tlPasswd2.top + 4,  
48, 48)
    .scrGrpHost.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientWidth  
- (.scrGrpHost.Left * 2), .ClientHeight - (.scrGrpHost.Top +  
(.btBrowsePic.Height * 4)))
    .btResetSettings.Move(4, .scrGrpHost.top + .scrGrpHost.Height + 8,  
MdlObjSizer.get_object_width(.btResetSettings.Text) + 36)

Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class	(original)
+++ branches/iVL/FrmZoneSet.class	Tue Dec  2 13:16:31 2008
@@ -29,6 +29,7 @@
    MdlZoneSet.TIME_ZONES()
    'ME.lbTmZone.Index = 9
    FMain.btnext.Enabled = TRUE
+  MdlCore.warn_status_off()
  END



Modified: branches/iVL/MdlResetSettings.module
==============================================================================
--- branches/iVL/MdlResetSettings.module	(original)
+++ branches/iVL/MdlResetSettings.module	Tue Dec  2 13:16:31 2008
@@ -64,7 +64,11 @@
             'INC i
          INC FrmResetSettings.gvSettings.Rows.Count
          FrmResetSettings.gvSettings[i, 1].Text = sDesc
-        FrmResetSettings.gvSettings[i, 2].Text = sFile
+        FrmResetSettings.gvSettings[i, 2].Text = sFile
+            IF InStr(FrmImportAccts.sSettingsList, sFile) THEN
+                FrmResetSettings.gvSettings[i, 0].Picture = FrmPkgSel.pYes
+            END IF
+
     INC i
     END IF
        END IF

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