vectorlinux-devel

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

Author: M0...@gm...
Date: Thu Nov 20 06:25:21 2008
New Revision: 306

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/MdlSetup.pot
    branches/iVL/.project
    branches/iVL/FrmUserAdd.class
    branches/iVL/FrmUserAdd.form
    branches/iVL/installer.gambas

Log:
Added listing of created user accounts

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Thu Nov 20 06:25:21 2008
@@ -86,23 +86,23 @@
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:454
+#: FMain.class:455
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:772
+#: FMain.class:773
  msgid "Back"
  msgstr ""

-#: FMain.class:784
+#: FMain.class:785
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:796
+#: FMain.class:797
  msgid "Next"
  msgstr ""

-#: FMain.class:810
+#: FMain.class:811
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot	(original)
+++ branches/iVL/.lang/MdlSetup.pot	Thu Nov 20 06:25:21 2008
@@ -14,27 +14,27 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: MdlSetup.module:198
+#: MdlSetup.module:199
  msgid "Calculating package count ... Please wait"
  msgstr ""

-#: MdlSetup.module:254
+#: MdlSetup.module:255
  msgid "Total bulks to be installed = "
  msgstr ""

-#: MdlSetup.module:257
+#: MdlSetup.module:258
  msgid "Total pkgs to be installed = "
  msgstr ""

-#: MdlSetup.module:300
+#: MdlSetup.module:301
  msgid "BROUGHT TO YOU BY"
  msgstr ""

-#: MdlSetup.module:316
+#: MdlSetup.module:317
  msgid "Activating swap space"
  msgstr ""

-#: MdlSetup.module:318
+#: MdlSetup.module:319
  msgid "Preparing filesystems"
  msgstr ""


Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Nov 20 06:25:21 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.209
+Version=0.0.210
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug
@@ -17,7 +17,6 @@
  Language=en_US
  ControlPublic=1
  ModulePublic=1
-ExecPath=/root/gui-installer2/installer.gambas
  Maintainer=M0E-lnx
  Vendor=VectorLinux
  Address=M0...@gm...

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Thu Nov 20 06:25:21 2008
@@ -29,9 +29,9 @@
    MdlUsrAdd.iUsrAccts = 0
    WITH FMain
      .FrmCurr = ME
-    .tvPlan["Conf2"].Picture = MdlCore.sDonePic
-    .tvPlan["Conf3"].picture = MdlCore.sNowPic
-    .tvPlan["Conf3"].Selected = TRUE
+    ' .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+    ' .tvPlan["Conf3"].picture = MdlCore.sNowPic
+    ' .tvPlan["Conf3"].Selected = TRUE
    END WITH
      WITH ME
        .tlBanner.Text = "<h3>" & ("Create User Accounts") & "</h3>"
@@ -174,18 +174,63 @@
    'SHELL "umount /mnt/target/tmp" WAIT
    'SHELL "umount /mnt/target/sys" WAIT

-
+ME.LIST_NEW_USER_ACCOUNT()


  END

+  PUBLIC SUB LIST_NEW_USER_ACCOUNT()
+  'needs to verify with /etc/passwd to check for user account
+  DIM sFile AS String[] = Split(DConv(File.Load(clsglobal.sTargetMnt  
&/ "etc" &/ "passwd")))
+  DIM arrline AS String[]
+  DIM i, ii, iUID AS Integer
+  DIM sLine, sSec, sUsrLogin, sUsrRlName, sUsrHome AS String
+  DIM vuid AS Variant
+  DIM tl AS TextLabel
+  DIM tly AS Integer
+
+  FrmUserAdd.LstUsers.Clear
+  tly = 4
+  FOR i = 0 TO sFile.count - 1
+    sLine = sFile[i]
+      ' now split each line
+        arrline = Split(sLine, ":")
+          FOR ii = 0 TO arrline.count - 1
+            sSec = Trim(arrline[ii])
+              vuid = arrline[2]
+              iUID = CInt(vuid)
+              sUsrLogin = arrline[0]
+              sUsrRlName = arrline[4]
+              sUsrHome = arrline[5]
+          NEXT
+        IF iUID >= 1000 THEN
+          tl = NEW TextLabel(LstUsers) AS "UserList"
+              WITH tl
+                  .Height = 21
+                  .Width = LstUsers.Width
+                  .Text = sUsrLogin
+                  .ToolTip = sUsrRlName & "\n" & "<b>" & "USER ID: "  
& "</b > " & iUid &
+                          "<b>" & "HOME DIRECTORY: " & "</b>" & sUsrHome
+                  .Move(0, tly)
+              END WITH
+              tly = tly + tl.Height + 2
+          END IF
+  NEXT
+
+
+
+
+END
+
+
+

  PUBLIC SUB Form_Resize()

    DIM iboxleft AS Integer
    DIM iboxwidth AS Integer = 250
    DIM cb AS CheckBox
-  DIM icbspace AS Integer
+  DIM icbspace, iListBottom, iListTop, iListLeft AS Integer
    DIM icby AS Integer
    DIM tl AS TextLabel
    DIM tb AS TextBox
@@ -210,6 +255,9 @@
      IF tb.tag = "line4" THEN itlbottom = tl.top + tl.Height + 8
    NEXT

+    iListTop = tbUsername.Top
+    iListLeft = tbUsername.Left + tbUsername.Width + 8
+    iListBottom = tbPasswd2.top + tbPasswd2.Height

    WITH ME

@@ -227,8 +275,10 @@
      .Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8,  
MdlObjSizer.get_object_width(.Button1.Text) + 36)
      .btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,  
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
      '.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +  
2), .tbUsername.top)
-    .pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
+    '.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
      .btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
+    .pbUsrPic.Move(.btgrpHelp.Left, .btgrpHelp.Top + .btgrpHelp.Height + 2)
+    .LstUsers.Move(iListLeft, iListTop, 200, iListBottom - iListTop)

          icby = 16
          icbspace = 4
@@ -388,14 +438,15 @@
  END

  PUBLIC SUB Form_Show()
-
-    Fmain.frmcurr = ME
-
-  WITH FMain
-    .FrmCurr = ME
-    .tvPlan["Conf2"].Picture = MdlCore.sDonePic
-    .tvPlan["Conf3"].picture = MdlCore.sNowPic
-    .tvPlan["Conf3"].Selected = TRUE
-  END WITH
+  '
+  ME.Form_Open()
+  '   Fmain.frmcurr = ME
+  '
+  ' WITH FMain
+  '   .FrmCurr = ME
+  '   .tvPlan["Conf2"].Picture = MdlCore.sDonePic
+  '   .tvPlan["Conf3"].picture = MdlCore.sNowPic
+  '   .tvPlan["Conf3"].Selected = TRUE
+  ' END WITH

  END

Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form	(original)
+++ branches/iVL/FrmUserAdd.form	Thu Nov 20 06:25:21 2008
@@ -52,6 +52,10 @@
        Text = ("Help")
        Picture = Picture["icon:/16/help"]
      }
+    { pbUsrPic PictureBox
+      MoveScaled(58,6,8,8)
+      Stretch = True
+    }
    }
    { Button1 Button
      MoveScaled(1,63,14,3)
@@ -89,14 +93,15 @@
    { hrSep Separator
      MoveScaled(22,7,12,1)
    }
-  { pbUsrPic PictureBox
-    MoveScaled(35,19,8,8)
-    Stretch = True
-  }
    { tlRealName TextLabel
      MoveScaled(2,21,12,3)
      Tag = "line2"
      Text = ("Real Name")
      Alignment = Align.Normal
+  }
+  { LstUsers ListContainer
+    MoveScaled(36,18,21,12)
+    Background = Color.Background
+    ToolTip = ("List of created user accounts")
    }
  }

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