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

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

Author: M0...@gm...
Date: Thu Nov 20 11:42:47 2008
New Revision: 308

Modified:
    branches/iVL/.project
    branches/iVL/DevLog
    branches/iVL/FrmLilo.class
    branches/iVL/FrmLiloSetup.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/FrmUserAdd.form
    branches/iVL/installer.gambas

Log:
- Fixed list of user accounts created
- Fixed LILO errors
- Added default append line values
- Updated binary
- Installer is ready for testing.

Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project	(original)
+++ branches/iVL/.project	Thu Nov 20 11:42:47 2008
@@ -2,7 +2,7 @@
  # Compiled with Gambas 2.9.0
  Title=VectorLinux Installer
  Startup=MdlCore
-Version=0.0.213
+Version=0.0.218
  Library=gb.gtk
  Library=gb.form
  Library=gb.debug

Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog	(original)
+++ branches/iVL/DevLog	Thu Nov 20 11:42:47 2008
@@ -1,3 +1,5 @@
-- Resized (smaller) textboxes for hostname and domain name on Netconf  
window (for better looks @ lower resolutions
+- Fixed list of user accounts created
+- Fixed LILO errors
+- Added default append line values
  - Updated binary
-
+- Installer is ready for testing.
\ No newline at end of file

Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class	(original)
+++ branches/iVL/FrmLilo.class	Thu Nov 20 11:42:47 2008
@@ -50,6 +50,9 @@
  MdlLiloOsList.list_boot_options()
  ME.tsOsSetup.Index = 0
  ME.cbDefBoot.Text = "Linux"
+
+'ME.cbDefBoot.Selection
+
  FMain.btnext.Enabled = TRUE
  END


Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class	(original)
+++ branches/iVL/FrmLiloSetup.class	Thu Nov 20 11:42:47 2008
@@ -18,24 +18,12 @@

  PUBLIC SUB Form_Open()

-
-
- '
- '          ME.tlBanner.Text = "<h3>" & tlBanner.text & "</h3>"
- '  'ClsPartSel.sRoot = "/dev/sdb1" '
- ' FMain.FrmCurr = ME
     FMain.tvPlan["Conf0"].Selected = TRUE
     FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
     FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
-   ' ' '
-   ' FMain.tvPlan["Inst0"].Picture = MdlCore.sDonePic
-' FMain.tvPlan["Inst1"].Picture = MdlCore.sNowPic
-' FMain.tvPlan["Inst1"].Selected = TRUE
-  'ME.tlBanner.Text = "<h3>" & tlBanner.Text & "</h3
+
  ME.tlBanner.Text = "<b>" & ME.tlBanner.Text & "</b>"
- ' ' ' FMain.tvPlan[" Conf0 "].Selected = TRUE"
-   ' ' ' FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
-   ' ' ' FMain.tvPlan["Inst1"].Picture = MdlCore.sDoneP>"
+""
  MdlConfLilo.DISPLAY_LILO_TARGET_OPTIONS()
  ME.list_video_modes()
  FMain.FrmCurr = ME
@@ -46,12 +34,16 @@
    MdlLilo.LIST_DEFAULT_BOOT_OPTIONS() ' initial list
    FMain.btnext.Enabled = TRUE
    ME.cbVideoRes.text = "Bootsplash High"
+'    ME.cbBootDefault_Click
+ME.cbVideoRes_Click()
    ME.cbBootDefault.Text = "VectorLinux"
+
  END

  PUBLIC SUB CLEANUP_TABSTRIP()
  DIM i AS Integer

+
      ' will remove blank tabstrip
        FOR i = 0 TO ME.tsLIloTabs.Count
          tsLIloTabs.Index = i
@@ -61,7 +53,7 @@
            END IF

        NEXT
-
+  ' fix append lines

  END

@@ -123,7 +115,12 @@
          FOR EACH tb IN MdlLilo.arrLinuxAppendtxtBoxes
            IF InStr(tb.Text, "splash=") = FALSE THEN
              IF tb.Tag <> "" THEN
-              tb.Text = tb.Text & " splash=silent"
+              IF tb.Text = "" THEN
+                  tb.Text = "splash=silent"
+                ELSE
+                       tb.Text = tb.Text & " splash=silent"
+              END IF
+
              ELSE
                tb.Text = "splash=silent"
              END IF

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Thu Nov 20 11:42:47 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>"
@@ -68,7 +68,7 @@
    DIM sPicdir AS String = ClsGlobal.sTargetMnt  
&/ "usr/share/apps/kdm/pics/users/"
    DIM sGroups AS  
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
    DIM cb AS CheckBox
-  DIM tl AS TextBox
+  DIM tl AS TextLabel
    'DIM tly AS Integer


@@ -159,13 +159,13 @@
            ENDIF
            'Message(("User account for") & Space(1) & ME.tbUsername.Text &  
Space(1) & ("was created."))
                  ' easy way to create the account here
-                  tl = NEW TextLabel
+                  tl = NEW TextLabel(ME.LstUsers)
                      WITH tl
                        .Text = ME.tbUsername.Text
                        .Height = 21
                        .Width = MdlObjSizer.get_object_width(.Text)
                        .ToolTip = ME.tbRealname.Text
-                      .Move(2, tly)
+                      .Move(4, tly)
                      END WITH
                      tly = tly + tl.Height + 2
           btClrFrm_Click() ' clear the form
@@ -187,7 +187,7 @@
    'SHELL "umount /mnt/target/sys" WAIT

  'ME.LIST_NEW_USER_ACCOUNT()
-
+  ME.LstUsers.Visible = TRUE

  END


Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form	(original)
+++ branches/iVL/FrmUserAdd.form	Thu Nov 20 11:42:47 2008
@@ -101,6 +101,7 @@
    }
    { LstUsers ListContainer
      MoveScaled(36,18,21,12)
+    Visible = False
      Background = Color.Background
      ToolTip = ("List of created user accounts")
    }

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