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

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

Author: M0...@gm...
Date: Tue Oct 21 14:02:28 2008
New Revision: 238

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/FMain.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlLiloOsList.module
    branches/iVL/MdlUsrAdd.module

Log:
- Added a message bump to stop on root passwords not matching
- Reduced the spaced available for objects in user add window to keep  
checkboxes from overlaping
   the help button



Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Tue Oct 21 14:02:28 2008
@@ -42,59 +42,63 @@
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:305
+#: FMain.class:298
+msgid "Passwords do not match. Please enter the same password twice"
+msgstr ""
+
+#: FMain.class:310
  msgid "You have not created any user accounts for this system yet. It is  
recommended that you"
  msgstr ""

-#: FMain.class:305
+#: FMain.class:310
  msgid "create at least one."
  msgstr ""

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

-#: FMain.class:305
+#: FMain.class:310
  msgid "Yes"
  msgstr ""

-#: FMain.class:305
+#: FMain.class:310
  msgid "No"
  msgstr ""

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

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

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

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

-#: FMain.class:421
+#: FMain.class:426
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:441
+#: FMain.class:446
  msgid "Next"
  msgstr ""

-#: FMain.class:447
+#: FMain.class:452
  msgid "Back"
  msgstr ""

-#: FMain.class:453
+#: FMain.class:458
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:469
+#: FMain.class:474
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Oct 21 14:02:28 2008
@@ -294,6 +294,11 @@
         frmNext = FrmRootPass

      CASE "FrmRootPass"
+      IF FrmRootPass.tbPasswd1.Text <> FrmRootPass.tbPasswd2.Text THEN
+          Balloon.Error(("Passwords do not match. Please enter the same  
password twice"), FrmRootPass.tbPasswd2)
+          FrmRootPass.tbPasswd2.SelectAll
+                RETURN
+      END IF
        FrmRootPass.Button1_Click()
         frmNext = FrmUserAdd


Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Tue Oct 21 14:02:28 2008
@@ -225,7 +225,7 @@
          icbspace = 4

          FOR EACH cb IN MdlUsrAdd.objGrps
-          IF icbspace >= .fGroupSel.Width * 0.75 THEN
+          IF icbspace >= .fGroupSel.Width * 0.70 THEN
              icbspace = 4
              icby = icby + cb.Height + 4
            END IF
@@ -324,6 +324,11 @@
      .tbRealname.Clear
      .tbPicPath.Clear
      .tbUsername.Clear
+    .bUsePic.Value = FALSE
+    .tbPicPath.Text = ""
+    .tbPicPath.Visible = FALSE
+    .pbUsrPic.Picture.Clear
+    .pbUsrPic.Visible = FALSE
    END WITH
      FOR EACH cb IN MdlUsrAdd.objGrps
        cb.Delete

Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module	(original)
+++ branches/iVL/MdlLiloOsList.module	Tue Oct 21 14:02:28 2008
@@ -65,7 +65,7 @@
                      ' now populate it with the necessary stuff
                        tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinBanner"
                          WITH tl
-                          .text = "<b>" & ("Windows installation found  
in ") & sWinPart & "</b>"
+                          .text = "<b>" & ("Windows installation found  
in") & Space(1) & sWinPart & "</b>"
                            .Move(4, 16, MdlObjSizer.get_object_width(.text)  
+ 24, 27)
                            .Alignment = Align.Normal
                            .BackColor = Color.Background
@@ -120,7 +120,8 @@
            SHELL "mkdir /mnt" &/ sWinAddr WAIT
            PRINT "mounting " & sWinAddr
            SHELL "mount " & "/dev" &/ sWinAddr & Space(1) & "/mnt" &/  
sWinAddr WAIT
-            IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"  
&/ "winver.exe") = TRUE THEN
+            'IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"  
&/ "winver.exe") = TRUE THEN
+            IF IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
                ' this is indeed a windows installation

                    WITH FrmLilo.TabStrip1
@@ -131,7 +132,7 @@
                        tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinPartLbl"
                          WITH tl
                            .Move(4, 24)
-                          .text = "<b>" & ("Windows installation found  
in ") & sWinPart & "</b>"
+                          .text = "<b>" & ("Windows installation found  
in") & Space(1) & sWinPart & "</b>"
                            .Height = 27
                            .Width = MdlObjSizer.get_object_width(.text)
                            .BackColor = Color.Background

Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module	(original)
+++ branches/iVL/MdlUsrAdd.module	Tue Oct 21 14:02:28 2008
@@ -109,7 +109,7 @@
        cb.Move(x, y)
        x = x + 116
        htotal = x
-        IF htotal >= FrmUserAdd.fGroupSel.Width * 0.75 THEN
+        IF htotal >= FrmUserAdd.fGroupSel.Width * 0.70 THEN
            htotal = 4
            x = 4
            y = y + cb.Height + 4