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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: M0...@gm...
Date: Wed Dec 10 06:39:47 2008
New Revision: 383

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/.lang/FrmPartScheme.pot
    branches/iVL/.lang/FrmSelISO.pot
    branches/iVL/FMain.class
    branches/iVL/FrmImportAccts.class
    branches/iVL/FrmLiloSetup.class
    branches/iVL/FrmPartScheme.class
    branches/iVL/FrmSelISO.class
    branches/iVL/MdlImportAccts.module
    branches/iVL/MdlNetConf.module
    branches/iVL/MdlSetup.module

Log:
- Restored network detection to B2 detection while hiding wireless networks
- Fixed issue with DGM face icon
- Refined user HOME detection.
- Refined navigation.
- Added prompt when user unchecks all lilo entries
- Re-enabled next button after unsuccessful hostname and domain name entries
- Re-enabled next button after back is clicked


Modified: branches/iVL/.lang/FMain.pot
==============================================================================

--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Wed Dec 10 06:39:47 2008
@@ -14,99 +14,111 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:187
+#: FMain.class:188
  msgid "Restart"
  msgstr ""

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

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

-#: FMain.class:352
+#: FMain.class:353
  msgid "This may take a while ..."
  msgstr ""

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

-#: FMain.class:434
+#: FMain.class:441
+msgid "You have not selected any operating systems for your boot menu."
+msgstr ""
+
+#: FMain.class:441
+msgid "If you wish to bypass the bootloader setup, uncheck the"
+msgstr ""
+
+#: FMain.class:441
+msgid "checkbox."
+msgstr ""
+
+#: FMain.class:450
  msgid "Please select a default operating system to boot before proceeding"
  msgstr ""

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

-#: FMain.class:444
+#: FMain.class:460
  msgid "Skipping boot loader setup"
  msgstr ""

-#: FMain.class:470
+#: FMain.class:486
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:486
+#: FMain.class:502
  msgid "Please enter the root password. For your security purposes, do not  
leave this blank"
  msgstr ""

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

-#: FMain.class:504
+#: FMain.class:521
  msgid "Setup has detected existing directories in the partition you  
selected for /home."
  msgstr ""

-#: FMain.class:504
+#: FMain.class:521
  msgid "Would you like to import these user accounts into your new  
Operating System"
  msgstr ""

-#: FMain.class:504
+#: FMain.class:521
  msgid "Yes"
  msgstr ""

-#: FMain.class:504
+#: FMain.class:521
  msgid "No"
  msgstr ""

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

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

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

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

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

-#: FMain.class:794
+#: FMain.class:808
  msgid "Back"
  msgstr ""

-#: FMain.class:805
+#: FMain.class:819
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:816
+#: FMain.class:830
  msgid "Next"
  msgstr ""

-#: FMain.class:830
+#: FMain.class:844
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot	(original)
+++ branches/iVL/.lang/FrmPartScheme.pot	Wed Dec 10 06:39:47 2008
@@ -34,19 +34,19 @@
  msgid "This option is the safest choice if you have other existing  
installations that you wish to keep."
  msgstr ""

-#: FrmPartScheme.class:112
+#: FrmPartScheme.class:113
  msgid "Disk Partitioning Options"
  msgstr ""

-#: FrmPartScheme.class:117
+#: FrmPartScheme.class:118
  msgid "Use existing disk partitions"
  msgstr ""

-#: FrmPartScheme.class:122
+#: FrmPartScheme.class:123
  msgid "Modify my disk partitions to make room for new installation"
  msgstr ""

-#: FrmPartScheme.class:127
+#: FrmPartScheme.class:128
  msgid "TextLabel1"
  msgstr ""


Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot	(original)
+++ branches/iVL/.lang/FrmSelISO.pot	Wed Dec 10 06:39:47 2008
@@ -42,19 +42,19 @@
  msgid "Minimum Disk Space Requirements"
  msgstr ""

-#: FrmSelISO.class:254
+#: FrmSelISO.class:255
  msgid "No installable images found."
  msgstr ""

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

-#: FrmSelISO.class:265
+#: FrmSelISO.class:266
  msgid "TextLabel1"
  msgstr ""

-#: FrmSelISO.class:270
+#: FrmSelISO.class:271
  msgid "Search Again"
  msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Wed Dec 10 06:39:47 2008
@@ -177,6 +177,7 @@
    DIM sISONAME AS String
    DIM sDev AS String
    DIM sLang AS String
+  DIM i AS Integer
    DIM cbox AS ComboBox

    'tvPlan.Refresh()
@@ -428,6 +429,21 @@
        frmNext = FrmLiloSetup

      CASE "FrmLiloSetup"
+      FOR EACH cbox IN MdlLilo.arrLinuxIncCheckboxes
+        IF cbox.Value = TRUE THEN INC i
+      NEXT
+      FOR EACH cbox IN MdlLilo.arrWinBootChecks
+        IF cbox.Value = TRUE THEN INC i
+      NEXT
+
+      IF i = 0 THEN
+        Message.error(("You have not selected any operating systems for  
your boot menu.") & "<br>" &
+        ("If you wish to bypass the bootloader setup, uncheck the") &  
Space(1) & "\"" & FrmLiloSetup.cbYNLilo.Text & "\"" & Space(1) &  
("checkbox."))
+        STOP EVENT
+        RETURN
+      END IF
+
+
        MdlCore.WARN_STATUS("")
        IF FrmLiloSetup.cbYNLilo.Value = FALSE THEN
            IF FrmLiloSetup.cbBootDefault.Text = "" THEN
@@ -499,7 +515,8 @@
                frmNext = FrmUserAdd
              ELSE

-            IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt  
&/ "home")) > 0 THEN
+            'IF Len(MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt  
&/ "home")) > 0 THEN
+            IF MdlSetup.SCAN_HOME_DIRS(ClsGlobal.sTargetMnt &/ "home") = 1  
THEN ' home dirs were found
                  SELECT CASE Message.Question(("Setup has detected existing  
directories in the partition you selected for /home.") & "<br>" &
                  ("Would you like to import these user accounts into your  
new Operating System"), ("Yes"), ("No"))
                    CASE 1
@@ -538,10 +555,13 @@
      CASE "FrmNetConf"
          IF Trim(FrmNetConf.txtHostName.Text) = "" THEN
            Balloon.Error(("Please specify a hostname for this computer"),  
FrmNetConf.txtHostName)
+          fmain.btnext.Enabled = TRUE
            RETURN
          END IF
          IF Trim(FrmNetConf.tbDomain.Text) = "" THEN
            Balloon.Error(("Please specify the domain this computer belongs  
to"), FrmNetConf.tbDomain)
+          fmain.btnext.Enabled = TRUE
+
            RETURN
          END IF

@@ -574,9 +594,6 @@

    END SELECT

-'         IF frmNext = "" THEN frmNext = FrmSelISO
-'IF frmNext = "" OR IsNull(FrmNetConf) OR NOT frmNext THEN frmNext =  
FrmSelISO
-'IF FrmCurr.text = "FrmLangSel" THEN STOP EVENT

    frmNext.Reparent(ME.pnlWinHost)
    frmNext.ResizeScaled(pnlwinhost.Width, pnlwinhost.Height)
@@ -644,7 +661,7 @@
        frm.Show
        ClsGlobal.sBackNav.Add(frm)
        END IF
-
+      fmain.btnext.Enabled = TRUE




Modified: branches/iVL/FrmImportAccts.class
==============================================================================
--- branches/iVL/FrmImportAccts.class	(original)
+++ branches/iVL/FrmImportAccts.class	Wed Dec 10 06:39:47 2008
@@ -161,11 +161,11 @@
    IF ERROR THEN Message.Error(Error.Where & gb.NewLine & Error.Text)
    ' Add the face icon
    IF Len(ME.tbPicPath.Text) > 0 THEN
-          IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname  
&/ ".face.icon") THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname  
&/ ".face.icon"
+          IF Exist(clsglobal.sTargetMnt &/ "home" &/ sname &/ ".face")  
THEN KILL clsglobal.sTargetMnt &/ "home" &/ sname &/ ".face"
            SHELL "cd " & sPicdir & " && ln -s " &  
Replace(ME.tbPicPath.Text, ClsGlobal.sTargetMnt, "") & Space(1) & sname  
& ".face.icon" WAIT  'link for KDM
                ' Tweak for the GDM face icon to work
         '   TRY COPY Trim(tbPicPath.Text) TO clsglobal.sTargetMnt &/ "home"  
&/ sname &/ ".face"
-       EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt &/ "home" &/  
sname &/ ".face "] WAIT
+       EXEC ["cp", Trim(tbPicPath.Text), clsglobal.sTargetMnt &/ "home" &/  
sname &/ ".face"] WAIT  ' icon for GDM login
         EXEC ["chmod", "664", clsglobal.sTargetMnt &/ "home" &/ sname  
&/ ".face"] WAIT
            'SHELL "chmod 644 " & ClsGlobal.sTargetMnt &/ "home/" & sname  
&/ ".face" WAIT
            SHELL "chroot " & ClsGlobal.sTargetMnt & " chown " & sname &  
Space(1) &/ "home" &/ sname &/ ".face" WAIT
@@ -260,5 +260,11 @@
  PUBLIC SUB Form_Show()

    ME.Form_Open()
+
+END
+
+PUBLIC SUB Form_Hide()
+
+  ME.Close()

  END

Modified: branches/iVL/FrmLiloSetup.class
==============================================================================
--- branches/iVL/FrmLiloSetup.class	(original)
+++ branches/iVL/FrmLiloSetup.class	Wed Dec 10 06:39:47 2008
@@ -134,6 +134,9 @@

  PUBLIC SUB Form_Show()

-  ME.Form_Open()
+    FMain.tvPlan["Conf0"].Selected = TRUE
+   FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
+   FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
+  'ME.Form_Open()

  END

Modified: branches/iVL/FrmPartScheme.class
==============================================================================
--- branches/iVL/FrmPartScheme.class	(original)
+++ branches/iVL/FrmPartScheme.class	Wed Dec 10 06:39:47 2008
@@ -81,6 +81,7 @@

  PUBLIC SUB Form_Hide()

+'ME.Close
  'FMain.tvPlan["Prep1"].Picture = MdlCore.sDonePic

  END

Modified: branches/iVL/FrmSelISO.class
==============================================================================
--- branches/iVL/FrmSelISO.class	(original)
+++ branches/iVL/FrmSelISO.class	Wed Dec 10 06:39:47 2008
@@ -219,7 +219,8 @@

  PUBLIC SUB Form_Hide()

-  FMain.frmLast = ME
+  'FMain.frmLast = ME
+  'ME.Close
    'FMain.tvPlan["Prep0"].Picture = MdlCore.sDonePic



Modified: branches/iVL/MdlImportAccts.module
==============================================================================
--- branches/iVL/MdlImportAccts.module	(original)
+++ branches/iVL/MdlImportAccts.module	Wed Dec 10 06:39:47 2008
@@ -20,10 +20,12 @@
    DIM sDir AS String
      FOR EACH sdir IN Dir(ClsGlobal.sTargetMnt &/ "home", "*", gb.Directory)
        IF sdir <> "ftp" THEN
+      IF sdir <> "lost+found" THEN
          IF FrmImportAccts.cbAccntList.Find(sdir) = -1 THEN
            FrmImportAccts.cbAccntList.Add(sdir)
          END IF
        END IF
+    END IF
      NEXT

  END

Modified: branches/iVL/MdlNetConf.module
==============================================================================
--- branches/iVL/MdlNetConf.module	(original)
+++ branches/iVL/MdlNetConf.module	Wed Dec 10 06:39:47 2008
@@ -73,8 +73,9 @@
      objIntTypes = NEW Object[]


-    'SHELL "export res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo  
\"$res\" | tr -s \' \'" TO seths
-    SHELL "ifconfig -a | grep ^[a-z]|grep -v ^lo | tr -s \' \'\"\"" TO  
seths
+    SHELL "res=$(ifconfig -a | grep ^[a-z] | grep -v ^lo); echo \"$res\" |  
tr -s \' \'\"\" " TO seths
+
+    'SHELL "ifconfig -a | grep ^[a-z]|grep -v ^lo | tr -s \' \'\"\"" TO  
seths
        'File.Save(Temp("eths"), Trim(seths))
        'Message(File.Load(Temp("eths")))


Modified: branches/iVL/MdlSetup.module
==============================================================================
--- branches/iVL/MdlSetup.module	(original)
+++ branches/iVL/MdlSetup.module	Wed Dec 10 06:39:47 2008
@@ -339,21 +339,27 @@

  END

-PUBLIC FUNCTION SCAN_HOME_DIRS(sHomePartition AS String) AS String
+PUBLIC FUNCTION SCAN_HOME_DIRS(sHomePartition AS String) AS Integer

    DIM sDump AS String

    IF NOT ClsPartSel.sHome THEN RETURN ""
    IF ClsPartSel.sRoot = ClsPartSel.sHome THEN RETURN ""

-    SHELL "ls " & sHomePartition & " | grep -v ftp | grep -v lost+found |  
grep -v .*" TO sDump
+    SHELL "ls " & sHomePartition & " | grep / | grep -v ftp | grep -v  
lost+found" TO sDump

      sDump = Trim(sDump)
-    IF NOT ClsPartSel.sHome OR IF Len(sDump) = 0 THEN
+
+    IF Len(sDump) > 0 THEN
+      RETURN 1
+    ELSE
      FrmUserAdd.btImportAcct.Enabled = FALSE
      FrmUserAdd.btImportAcct.ForeColor = Color.Gray
+      RETURN 0
+
      END IF
-    RETURN sDump
+
+    'RETURN sDump


  END


