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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: M0...@gm...
Date: Mon Oct 20 12:24:22 2008
New Revision: 237

Added:
    branches/iVL/images/arrow_old.png   (contents, props changed)
    branches/iVL/images/check_old.png   (contents, props changed)
    branches/iVL/images/circle_old.png   (contents, props changed)
Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/FMain.class
    branches/iVL/FrmCredits.class
    branches/iVL/FrmUserAdd.class
    branches/iVL/MdlUsrAdd.module
    branches/iVL/images/arrow.png
    branches/iVL/images/check.png
    branches/iVL/images/circle.png

Log:
- Modified credits scroller to make the VL logo appear from underneath the  
crollview
- Modified overview graphics (oMasta)
- Added question to ask whether to proceed without creating user accounts  
or not
- Optimized UserAdd window for 800x600 resolution



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

--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Mon Oct 20 12:24:22 2008
@@ -42,47 +42,59 @@
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:314
-msgid "has been installed on your computer. Additional system  
configuration"
+#: FMain.class:305
+msgid "You have not created any user accounts for this system yet. It is  
recommended that you"
  msgstr ""

-#: FMain.class:314
-msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
+#: FMain.class:305
+msgid "create at least one."
  msgstr ""

-#: FMain.class:314
-msgid "Would you like to reboot your computer now?"
+#: FMain.class:305
+msgid "Would you like to continue anyway?"
  msgstr ""

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

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

-#: FMain.class:319
+#: FMain.class:324
+msgid "has been installed on your computer. Additional system  
configuration"
+msgstr ""
+
+#: FMain.class:324
+msgid "will take place after you reboot your system.Part of this process  
must be done in text mode."
+msgstr ""
+
+#: FMain.class:324
+msgid "Would you like to reboot your computer now?"
+msgstr ""
+
+#: FMain.class:329
  msgid "The VectorLinux installer will now exit. Enjoy your new operating  
system"
  msgstr ""

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

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

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

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

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


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Mon Oct 20 12:24:22 2008
@@ -299,6 +299,16 @@


      CASE "FrmUserAdd"
+
+        IF MdlUsrAdd.iUsrAccts = 0 THEN
+            SELECT CASE Message.Question(("You have not created any user  
accounts for this system yet. It is recommended that you") & "<br>" &
+            ("create at least one.") & "<br><br>" & ("Would you like to  
continue anyway?"), ("Yes"), ("No"))
+
+              CASE 2
+                RETURN
+            END SELECT
+      END IF
+

        frmNext = FrmNetConf


Modified: branches/iVL/FrmCredits.class
==============================================================================
--- branches/iVL/FrmCredits.class	(original)
+++ branches/iVL/FrmCredits.class	Mon Oct 20 12:24:22 2008
@@ -41,7 +41,8 @@
      WITH ME
        '.PictureBox1.Move(.ClientWidth / 2 - (.PictureBox1.Width / 2), 4)
        .ScrollView1.Move(.ClientWidth / 2 - (.ScrollView1.Width / 2), 8)
-      .PictureBox1.Move(.ScrollView1.Width / 2 - (.PictureBox1.Width / 2),  
12)
+      .PictureBox1.Move(.ScrollView1.Width / 2 - (.PictureBox1.Width /  
2), .ScrollView1.Height + .PictureBox1.Height)
+      .TextLabel1.Move(.ScrollView1.Width / 2 - (.TextLabel1.Width /  
2), .PictureBox1.Top + .PictureBox1.Height * 2)
        '.TextLabel1.Move(
        '.ScrollView1.Move(.ClientWidth / 2 - (.ScrollView1.Width /  
2), .PictureBox1.top + .PictureBox1.Height + 8)
        .ScrollView1.Height = .ClientH - .ScrollView1.top - 12

Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class	(original)
+++ branches/iVL/FrmUserAdd.class	Mon Oct 20 12:24:22 2008
@@ -24,8 +24,9 @@


  PUBLIC SUB Form_Open()
-  Fmain.frmcurr = ME

+  Fmain.frmcurr = ME
+  MdlUsrAdd.iUsrAccts = 0
    WITH FMain
      .FrmCurr = ME
      .tvPlan["Conf2"].Picture = MdlCore.sDonePic
@@ -67,6 +68,10 @@
    DIM sGroups AS  
String '= '"plugdev,disk,cdrom,floppy,lp,scanner,audio,video,games"
    DIM cb AS CheckBox

+
+    ' increment the number of user accounts created
+    INC MdlUsrAdd.iUsrAccts
+
  'Message("Ateempting to create user now")

    IF ME.tbUsername.Text = "" THEN
@@ -160,15 +165,7 @@
    SHELL "umount /mnt/target/tmp" WAIT
    SHELL "umount /mnt/target/sys" WAIT

-    ' ' ' SELECT CASE Message.Question(ClsGlobal.DISTRO & Space(1) & ("has  
been installed on your computer.") & "<br>" &
-    ' ' ' ("Would you like to reboot your computer now?"), ("Yes"), ("No"))
-    ' ' '   CASE 1
-    ' ' '     SHELL "shutdown -r now"
-    ' ' '   CASE ELSE
-    ' ' '   RETURN
-    ' ' '   'STOP EVENT
-    ' ' ' END SELECT
-
+


  END
@@ -224,19 +221,28 @@
      .pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
      .btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)

-        icby = 4
-        icbspace = 24
+        icby = 16
+        icbspace = 4

          FOR EACH cb IN MdlUsrAdd.objGrps
-          'icbspace = icbspace + cb.Height + 4
-          IF icbspace >= .fGroupSel.Height * 0.75 THEN
-            icby = icby + 128
-            icbspace = 24
+          IF icbspace >= .fGroupSel.Width * 0.75 THEN
+            icbspace = 4
+            icby = icby + cb.Height + 4
            END IF
-          cb.Move(icby, icbspace)
-          icbspace = icbspace + cb.Height + 4
-    NEXT
-
+          cb.Move(icbspace, icby)
+          icbspace = icbspace + 116
+    NEXT
+    '
+    ' '     FOR EACH cb IN MdlUsrAdd.objGrps
+    ' '       'icbspace = icbspace + cb.Height + 4
+    ' '       IF icbspace >= .fGroupSel.Height * 0.60 THEN
+    ' '         icby = icby + 128
+    ' '         icbspace = 24
+    ' '       END IF
+    ' '       cb.Move(icby, icbspace)
+    ' '       icbspace = icbspace + cb.Height + 4
+    ' ' NEXT
+    '




Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module	(original)
+++ branches/iVL/MdlUsrAdd.module	Mon Oct 20 12:24:22 2008
@@ -14,6 +14,9 @@

  '    You should have received a copy of the GNU General Public License
  '    along with vinstall-ng.  If not, see <http://www.gnu.org/licenses/>.
+
+PUBLIC iUsrAccts AS Integer
+
  PUBLIC objGrps AS Object[]

  PUBLIC SUB DISPLAY_USER_GROUP_OPTIONS()
@@ -75,11 +78,11 @@
        bdefval = TRUE
  END SELECT
    'x = 4
-      IF htotal > FrmUserAdd.width THEN
-        x = 4
-        y = y + 24
-        htotal = x
-      END IF
+      ' ' ' IF htotal > FrmUserAdd.fGroupSel.Width * 0.75 THEN
+      ' ' '   x = 4
+      ' ' '   y = y + 25
+      ' ' '   htotal = x
+      ' ' ' END IF
    'y = 12
  cb = NEW CheckBox(FrmUserAdd.fGroupSel)
    WITH cb
@@ -87,10 +90,10 @@
    .Value = bdefval
    .Height = 21
    .Width = MdlObjSizer.get_object_width(.text) + 24
-  .Move(x, y)
+  '.Move(x, y)
    .ToolTip = sComment
    'y = y + cb.Height
-  x = x + 100
+  x = x + 128
    htotal = htotal + x
    END WITH
    objGrps.Add(cb)
@@ -98,12 +101,23 @@
  NEXT


-
-END
+  ' now move the objects to their places
+  x = 4
+  htotal = 4
+  y = 16
+    FOR EACH cb IN objGrps
+      cb.Move(x, y)
+      x = x + 116
+      htotal = x
+        IF htotal >= FrmUserAdd.fGroupSel.Width * 0.75 THEN
+          htotal = 4
+          x = 4
+          y = y + cb.Height + 4
+        END IF
+    NEXT
+
+

-PUBLIC FUNCTION CREATE_NEW_ACCOUNT()
-
-

  END


Modified: branches/iVL/images/arrow.png
==============================================================================
Binary files. No diff available.

Added: branches/iVL/images/arrow_old.png
==============================================================================
Binary file. No diff available.

Modified: branches/iVL/images/check.png
==============================================================================
Binary files. No diff available.

Added: branches/iVL/images/check_old.png
==============================================================================
Binary file. No diff available.

Modified: branches/iVL/images/circle.png
==============================================================================
Binary files. No diff available.

Added: branches/iVL/images/circle_old.png
==============================================================================
Binary file. No diff available.


