Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r240 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-10-22 18:12:07
|
Author: M0...@gm...
Date: Wed Oct 22 11:09:53 2008
New Revision: 240
Modified:
branches/iVL/.lang/#project.pot
branches/iVL/.lang/ClsGlobal.pot
branches/iVL/.lang/ClsPartSel.pot
branches/iVL/.lang/ClsWinDrives.pot
branches/iVL/.lang/FMain.pot
branches/iVL/.lang/FrmDiskPart.pot
branches/iVL/.lang/FrmPartScheme.pot
branches/iVL/.lang/FrmPartSel.pot
branches/iVL/.lang/FrmPkgSel.pot
branches/iVL/.lang/FrmSelISO.pot
branches/iVL/.lang/FrmSummary.pot
branches/iVL/.lang/FrmWinDrives.pot
branches/iVL/.lang/MdlCore.pot
branches/iVL/.lang/MdlDiskPart.pot
branches/iVL/.lang/MdlObjSizer.pot
branches/iVL/.lang/MdlPartSel.pot
branches/iVL/.lang/MdlPkgSel.pot
branches/iVL/.lang/MdlSetup.pot
branches/iVL/.lang/MdlSummarize.pot
branches/iVL/.lang/MdlWinDrives.pot
branches/iVL/FMain.class
branches/iVL/FrmLilo.class
branches/iVL/FrmRootPass.class
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/FrmZoneSet.class
branches/iVL/MdlLiloOsList.module
branches/iVL/MdlUsrAdd.module
Log:
- Added functionality to create the user account (if enough information is
provided) from the next button on FMain
- Enabled reverse navigation for configuration state.
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/.project
+# /home/remote/projects/installer/.project
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsGlobal.pot
==============================================================================
--- branches/iVL/.lang/ClsGlobal.pot (original)
+++ branches/iVL/.lang/ClsGlobal.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsGlobal.class
+# /home/remote/projects/installer/ClsGlobal.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsPartSel.pot
==============================================================================
--- branches/iVL/.lang/ClsPartSel.pot (original)
+++ branches/iVL/.lang/ClsPartSel.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsPartSel.class
+# /home/remote/projects/installer/ClsPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/ClsWinDrives.pot
==============================================================================
--- branches/iVL/.lang/ClsWinDrives.pot (original)
+++ branches/iVL/.lang/ClsWinDrives.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/ClsWinDrives.class
+# /home/remote/projects/installer/ClsWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot (original)
+++ branches/iVL/.lang/FMain.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FMain.class
+# /home/remote/projects/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
@@ -46,59 +46,59 @@
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"
+#: FMain.class:313
+msgid "You have not created any user accounts for this system yet. There
is not enough information"
msgstr ""
-#: FMain.class:310
-msgid "create at least one."
+#: FMain.class:313
+msgid "to create an account here. It is recommended that you create at
least one."
msgstr ""
-#: FMain.class:310
+#: FMain.class:313
msgid "Would you like to continue anyway?"
msgstr ""
-#: FMain.class:310
+#: FMain.class:313
msgid "Yes"
msgstr ""
-#: FMain.class:310
+#: FMain.class:313
msgid "No"
msgstr ""
-#: FMain.class:329
+#: FMain.class:335
msgid "has been installed on your computer. Additional system
configuration"
msgstr ""
-#: FMain.class:329
+#: FMain.class:335
msgid "will take place after you reboot your system.Part of this process
must be done in text mode."
msgstr ""
-#: FMain.class:329
+#: FMain.class:335
msgid "Would you like to reboot your computer now?"
msgstr ""
-#: FMain.class:334
+#: FMain.class:340
msgid "The VectorLinux installer will now exit. Enjoy your new operating
system"
msgstr ""
-#: FMain.class:426
+#: FMain.class:435
msgid "Process Overview"
msgstr ""
-#: FMain.class:446
+#: FMain.class:455
msgid "Next"
msgstr ""
-#: FMain.class:452
+#: FMain.class:461
msgid "Back"
msgstr ""
-#: FMain.class:458
+#: FMain.class:467
msgid "Exit Installation"
msgstr ""
-#: FMain.class:474
+#: FMain.class:483
msgid "Button1"
msgstr ""
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmDiskPart.class
+# /home/remote/projects/installer/FrmDiskPart.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartScheme.pot
==============================================================================
--- branches/iVL/.lang/FrmPartScheme.pot (original)
+++ branches/iVL/.lang/FrmPartScheme.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartScheme.class
+# /home/remote/projects/installer/FrmPartScheme.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPartSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPartSel.pot (original)
+++ branches/iVL/.lang/FrmPartSel.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPartSel.class
+# /home/remote/projects/installer/FrmPartSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmPkgSel.pot
==============================================================================
--- branches/iVL/.lang/FrmPkgSel.pot (original)
+++ branches/iVL/.lang/FrmPkgSel.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmPkgSel.class
+# /home/remote/projects/installer/FrmPkgSel.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSelISO.pot
==============================================================================
--- branches/iVL/.lang/FrmSelISO.pot (original)
+++ branches/iVL/.lang/FrmSelISO.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSelISO.class
+# /home/remote/projects/installer/FrmSelISO.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmSummary.pot
==============================================================================
--- branches/iVL/.lang/FrmSummary.pot (original)
+++ branches/iVL/.lang/FrmSummary.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmSummary.class
+# /home/remote/projects/installer/FrmSummary.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmWinDrives.pot
==============================================================================
--- branches/iVL/.lang/FrmWinDrives.pot (original)
+++ branches/iVL/.lang/FrmWinDrives.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/FrmWinDrives.class
+# /home/remote/projects/installer/FrmWinDrives.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlCore.pot
==============================================================================
--- branches/iVL/.lang/MdlCore.pot (original)
+++ branches/iVL/.lang/MdlCore.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlCore.module
+# /home/remote/projects/installer/MdlCore.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlDiskPart.pot
==============================================================================
--- branches/iVL/.lang/MdlDiskPart.pot (original)
+++ branches/iVL/.lang/MdlDiskPart.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlDiskPart.module
+# /home/remote/projects/installer/MdlDiskPart.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlObjSizer.pot
==============================================================================
--- branches/iVL/.lang/MdlObjSizer.pot (original)
+++ branches/iVL/.lang/MdlObjSizer.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlObjSizer.module
+# /home/remote/projects/installer/MdlObjSizer.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPartSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPartSel.pot (original)
+++ branches/iVL/.lang/MdlPartSel.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPartSel.module
+# /home/remote/projects/installer/MdlPartSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlPkgSel.pot
==============================================================================
--- branches/iVL/.lang/MdlPkgSel.pot (original)
+++ branches/iVL/.lang/MdlPkgSel.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlPkgSel.module
+# /home/remote/projects/installer/MdlPkgSel.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSetup.pot
==============================================================================
--- branches/iVL/.lang/MdlSetup.pot (original)
+++ branches/iVL/.lang/MdlSetup.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSetup.module
+# /home/remote/projects/installer/MdlSetup.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlSummarize.pot
==============================================================================
--- branches/iVL/.lang/MdlSummarize.pot (original)
+++ branches/iVL/.lang/MdlSummarize.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlSummarize.module
+# /home/remote/projects/installer/MdlSummarize.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/MdlWinDrives.pot
==============================================================================
--- branches/iVL/.lang/MdlWinDrives.pot (original)
+++ branches/iVL/.lang/MdlWinDrives.pot Wed Oct 22 11:09:53 2008
@@ -1,4 +1,4 @@
-# /home/moe/projects/installer/MdlWinDrives.module
+# /home/remote/projects/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Wed Oct 22 11:09:53 2008
@@ -36,7 +36,7 @@
-'ME.Maximized = TRUE
+ME.Maximized = TRUE
frmInit = MdlCore.frmInit
'MdlCore.LOCK_GUI
'frmInit = FrmLangSel
@@ -306,12 +306,18 @@
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"))
-
+ 'IF FrmUserAdd.tbUsername.text = "" THEN
+ IF MdlUsrAdd.CREATE_USER_ON_A_SNAP() = FALSE THEN
+ SELECT CASE Message.Question(("You have not created any user
accounts for this system yet. There is not enough information") & "<br>" &
+ ("to create an account here. It is recommended that you create
at least one.") & "<br>" &
+ "<br>" & ("Would you like to continue anyway?"), ("Yes"),
("No"))
+
CASE 2
RETURN
END SELECT
+ ELSE IF MdlUsrAdd.CREATE_USER_ON_A_SNAP() = TRUE THEN
+ FrmUserAdd.Button1_Click()
+ END IF
END IF
@@ -377,6 +383,9 @@
iKey = ClsGlobal.sBackNav.Find(FrmCurr)
IF iKey <> -1 THEN
frm = ClsGlobal.sBackNav[iKey - 1]
+ WITH FMain
+ .tvPlan.MoveBack
+ END WITH
FrmCurr.Hide
frm.Show
END IF
Modified: branches/iVL/FrmLilo.class
==============================================================================
--- branches/iVL/FrmLilo.class (original)
+++ branches/iVL/FrmLilo.class Wed Oct 22 11:09:53 2008
@@ -165,3 +165,13 @@
'MdlConfLilo.WRITE_LILO_DOT_CONF()
END
+
+PUBLIC SUB Form_Show()
+
+ FMain.FrmCurr = ME
+ FMain.tvPlan["Conf0"].Selected = TRUE
+ FMain.tvPlan["Conf0"].Picture = MdlCore.sNowPic
+ FMain.tvPlan["Inst1"].Picture = MdlCore.sDonePic
+ ME.sVidMode = "Standard"
+
+END
Modified: branches/iVL/FrmRootPass.class
==============================================================================
--- branches/iVL/FrmRootPass.class (original)
+++ branches/iVL/FrmRootPass.class Wed Oct 22 11:09:53 2008
@@ -81,3 +81,14 @@
END WITH
END
+
+PUBLIC SUB Form_Show()
+FMain.FrmCurr = ME
+
+ WITH FMain
+ .tvPlan["Conf1"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf2"].picture = MdlCore.sNowPic
+ .tvPlan["Conf2"].Selected = TRUE
+ END WITH
+
+END
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Oct 22 11:09:53 2008
@@ -20,7 +20,7 @@
PUBLIC iUID AS Integer = 1000
PRIVATE otl AS Object[]
-PRIVATE otb AS Object[]
+PUBLIC otb AS Object[]
PUBLIC SUB Form_Open()
@@ -75,13 +75,18 @@
'Message("Ateempting to create user now")
IF ME.tbUsername.Text = "" THEN
- Message(("Enter the login name that this user will use to login to
this system."))
+ Balloon.Error(("Enter the login name that this user will user to login
to this system."), ME.tbUsername)
+ 'Message(("Enter the login name that this user will use to login to
this system."))
+ RETURN
+ STOP EVENT
ELSE
'SHELL "echo " & ME.tbUsername.Text & "| grep -e \'[A-Z]\'" TO sCAPS
IF ME.tbUsername.text LIKE "*[A-Z]*" THEN
'IF ME.tbUsername.textNOT LIKE "*[a-z0-9_-]*" THEN
- Message.Error(("Login name field contains illegal characters. Please
use only lowercase letters and numbers"))
+ Balloon.Error(("Login name field contains illegal characters. Please
use only lowercase letters and numbers"), ME.tbUsername)
+ 'Message.Error(("Login name field contains illegal characters. Please
use only lowercase letters and numbers"))
RETURN
+ STOP EVENT
'ELSE IF ME.tbUsernameNOT LIKE "*[a-z0-9_-]*" THEN
@@ -94,11 +99,11 @@
Message(("Username contains illegal characters"))
RETURN
ELSE IF sLogE <> "" THEN
- Message(("Username already exists"))
+ Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("already exists"))
RETURN
ELSE
IF ME.tbPasswd1.Text = "" THEN
- Message(("Enter a Password."))
+ Message(("Enter a password for") & Space(1) & ME.tbUsername.text)
RETURN
ELSE
IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN
@@ -126,12 +131,12 @@
' need to do some binding for this to work
- PRINT "Mounting system locations with bind options"
+ 'PRINT "Mounting system locations with bind options"
SHELL "mount -o bind /sys /mnt/target/sys" WAIT
SHELL "mount -o bind /tmp /mnt/target/tmp" WAIT
SHELL "mount -o bind /proc /mnt/target/proc" WAIT
SHELL "mount -o bind /dev /mnt/target/dev" WAIT
- PRINT "Deleting old user group"
+ 'PRINT "Deleting old user group"
SHELL "chroot /mnt/target /usr/sbin/groupdel " &
ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT
'SHELL "chroot /mnt/target /usr/sbin/groupadd -g " & iUID &
Space(1) & ME.tbUsername.Text WAIT
@@ -149,13 +154,16 @@
'Message("chroot /mnt/target /sbin/passwdx " &
ME.tbUsername.Text & Space(1) & ME.tbPasswd1.Text)
SHELL "chroot /mnt/target /sbin/passwdx " & ME.tbUsername.Text &
Space(1) & ME.tbPasswd1.Text WAIT
- Message("user " & ME.tbUsername.Text & " was created.")
+ Message(("User account for") & Space(1) & ME.tbUsername.Text &
Space(1) & ("was created."))
btClrFrm_Click() ' clear the form
INC iUID
ELSE
- Message("Passwords do not match")
+ Message(("Passwords do not match"))
+ Balloon.Info(("Enter the same password twice"), ME.tbPasswd1)
ME.tbPasswd1.Clear
ME.tbPasswd2.Clear
+ RETURN
+ STOP EVENT
ENDIF
ENDIF
ENDIF
@@ -295,11 +303,7 @@
END
-PUBLIC SUB Form_Menu()
-
- MdlUsrAdd.DISPLAY_USER_GROUP_OPTIONS()
-END
PUBLIC SUB btBrowse_Click()
'ClsGlobal.sTargetMnt = "/"
@@ -329,6 +333,8 @@
.tbPicPath.Visible = FALSE
'.pbUsrPic.c
.pbUsrPic.Visible = FALSE
+ .Button1.Enabled = FALSE
+ .Button1.ForeColor = Color.Gray
END WITH
FOR EACH cb IN MdlUsrAdd.objGrps
cb.Delete
@@ -368,5 +374,26 @@
("permission to do certain things by adding them to certain groups.")
& "<br><br>" &
("Select which groups you want this user to be a part of here")
Message(sMsg, ("OK"))
+
+END
+
+PUBLIC SUB tbUsername_LostFocus()
+
+ WITH ME
+ .Button1.Enabled = TRUE
+ .Button1.ForeColor = Color.Black
+ END WITH
+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
END
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Wed Oct 22 11:09:53 2008
@@ -55,6 +55,7 @@
}
{ Button1 Button
MoveScaled(1,63,14,3)
+ Enabled = False
Text = ("Create User")
Picture = Picture["icon:/16/add"]
}
Modified: branches/iVL/FrmZoneSet.class
==============================================================================
--- branches/iVL/FrmZoneSet.class (original)
+++ branches/iVL/FrmZoneSet.class Wed Oct 22 11:09:53 2008
@@ -24,7 +24,7 @@
.tvPlan["Conf1"].picture = MdlCore.sNowPic
.tvPlan["Conf1"].Selected = TRUE
END WITH
-
+ MdlCore.unlock_gui() ' unlock the back button
FMain.btnext.Enabled = FALSE
MdlZoneSet.TIME_ZONES()
'ME.lbTmZone.Index = 9
@@ -127,5 +127,18 @@
' RETURN
' LOOP
+
+END
+
+PUBLIC SUB Form_Show()
+
+ Fmain.frmcurr = ME
+ ME.tlbanner.Text = "<h3>" & ("Timezone configuration") & "</h3>"
+ WITH FMain
+ .tvPlan["Conf0"].Picture = MdlCore.sDonePic
+ .tvPlan["Conf1"].picture = MdlCore.sNowPic
+ .tvPlan["Conf1"].Selected = TRUE
+ END WITH
+
END
Modified: branches/iVL/MdlLiloOsList.module
==============================================================================
--- branches/iVL/MdlLiloOsList.module (original)
+++ branches/iVL/MdlLiloOsList.module Wed Oct 22 11:09:53 2008
@@ -50,60 +50,61 @@
arrWinInstalls = NEW Object[]
arrWinLabels = NEW Object[]
- SHELL "fdisk -l | grep -E \'^/dev/.* \\* .*(FAT16)\' | cut -f 1 -d \'
\'" TO sFatList
- sFatList = Trim(sFatList)
- IF sFatList <> "" THEN
- arrFat = Split(sFatList, "\n")
- iTotalEntries = iTotalEntries + (arrFat.count - 1)
- FOR i = 0 TO arrFat.Count - 1
- sWinPart = Trim(arrFat[i])
- sWinAddr = Right(sWinPart, Len(sWinPart) -
RInStr(sWinPart, "/"))
- WITH FrmLilo.TabStrip1
- .count = .count + 1
- .text = "Windows-" & sWinAddr
- .Tag = sWinPart
- ' now populate it with the necessary stuff
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinBanner"
- WITH tl
- .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
- END WITH
-
- tl = NEW TextLabel(FrmLilo.TabStrip1) AS "WinName"
- WITH tl
- .text = ("Name ")
- .Move(tl.left, tl.top + tl.height + 8,
MdlObjSizer.get_object_width(.text) + 8, 27)
- .Alignment = Align.Normal
- .BackColor = Color.Background
- END WITH
-
- tb = NEW TextBox(FrmLilo.TabStrip1) AS "WinNameBox"
- WITH tb
- .text = FrmLilo.TabStrip1.Current.Text
- .MaxLength = 15
- .Height = 27
- .Width = MdlObjSizer.get_object_width(.text) * 2
- .Move(tl.left + tl.Width + 8, tl.top)
- .BackColor = Color.Background
- END WITH
-
-
- cb = NEW CheckBox(FrmLilo.TabStrip1) AS "WinInclude"
- WITH cb
- .text = ("Include this Operating System in the
boot menu")
- .Move(tl.left, tl.top + tl.height,
MdlObjSizer.get_object_width(.text) + 36, 27)
- .Value = TRUE
- .BackColor = Color.Background
- .tag = sWinPart
- END WITH
- arrWinInstalls.Add(cb) ' add to the array to find
out wether to include or not in the boot menu
-
- END WITH ' end jacking with the tabstrip
- NEXT
- END IF
- SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT32|HPFS|NTFS|Win)\' | cut -f
1 -d \' \'" TO sNTFSLst
+ ' ' ' ' ' ' ' ' ' ' ' SHELL "fdisk -l | grep -E \'^/dev/.*
\\* .*(FAT16)\' | cut -f 1 -d \' \'" TO sFatList
+ ' ' ' ' ' ' ' ' ' ' ' sFatList = Trim(sFatList)
+ ' ' ' ' ' ' ' ' ' ' ' IF sFatList <> "" THEN
+ ' ' ' ' ' ' ' ' ' ' ' arrFat = Split(sFatList, "\n")
+ ' ' ' ' ' ' ' ' ' ' ' iTotalEntries = iTotalEntries +
(arrFat.count - 1)
+ ' ' ' ' ' ' ' ' ' ' ' FOR i = 0 TO arrFat.Count - 1
+ ' ' ' ' ' ' ' ' ' ' ' sWinPart = Trim(arrFat[i])
+ ' ' ' ' ' ' ' ' ' ' ' sWinAddr = Right(sWinPart,
Len(sWinPart) - RInStr(sWinPart, "/"))
+ ' ' ' ' ' ' ' ' ' ' ' WITH FrmLilo.TabStrip1
+ ' ' ' ' ' ' ' ' ' ' ' .count = .count + 1
+ ' ' ' ' ' ' ' ' ' ' ' .text = "Windows-" & sWinAddr
+ ' ' ' ' ' ' ' ' ' ' ' .Tag = sWinPart
+ ' ' ' ' ' ' ' ' ' ' ' ' now populate it with the
necessary stuff
+ ' ' ' ' ' ' ' ' ' ' ' tl = NEW
TextLabel(FrmLilo.TabStrip1) AS "WinBanner"
+ ' ' ' ' ' ' ' ' ' ' ' WITH tl
+ ' ' ' ' ' ' ' ' ' ' ' .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
+ ' ' ' ' ' ' ' ' ' ' ' END WITH
+ ' ' ' ' ' ' ' ' ' ' '
+ ' ' ' ' ' ' ' ' ' ' ' tl = NEW
TextLabel(FrmLilo.TabStrip1) AS "WinName"
+ ' ' ' ' ' ' ' ' ' ' ' WITH tl
+ ' ' ' ' ' ' ' ' ' ' ' .text = ("Name ")
+ ' ' ' ' ' ' ' ' ' ' ' .Move(tl.left, tl.top +
tl.height + 8, MdlObjSizer.get_object_width(.text) + 8, 27)
+ ' ' ' ' ' ' ' ' ' ' ' .Alignment = Align.Normal
+ ' ' ' ' ' ' ' ' ' ' ' .BackColor =
Color.Background
+ ' ' ' ' ' ' ' ' ' ' ' END WITH
+ ' ' ' ' ' ' ' ' ' ' '
+ ' ' ' ' ' ' ' ' ' ' ' tb = NEW
TextBox(FrmLilo.TabStrip1) AS "WinNameBox"
+ ' ' ' ' ' ' ' ' ' ' ' WITH tb
+ ' ' ' ' ' ' ' ' ' ' ' .text =
FrmLilo.TabStrip1.Current.Text
+ ' ' ' ' ' ' ' ' ' ' ' .MaxLength = 15
+ ' ' ' ' ' ' ' ' ' ' ' .Height = 27
+ ' ' ' ' ' ' ' ' ' ' ' .Width =
MdlObjSizer.get_object_width(.text) * 2
+ ' ' ' ' ' ' ' ' ' ' ' .Move(tl.left + tl.Width +
8, tl.top)
+ ' ' ' ' ' ' ' ' ' ' ' .BackColor =
Color.Background
+ ' ' ' ' ' ' ' ' ' ' ' END WITH
+ ' ' ' ' ' ' ' ' ' ' '
+ ' ' ' ' ' ' ' ' ' ' '
+ ' ' ' ' ' ' ' ' ' ' ' cb = NEW
CheckBox(FrmLilo.TabStrip1) AS "WinInclude"
+ ' ' ' ' ' ' ' ' ' ' ' WITH cb
+ ' ' ' ' ' ' ' ' ' ' ' .text = ("Include this
Operating System in the boot menu")
+ ' ' ' ' ' ' ' ' ' ' ' .Move(tl.left, tl.top +
tl.height, MdlObjSizer.get_object_width(.text) + 36, 27)
+ ' ' ' ' ' ' ' ' ' ' ' .Value = TRUE
+ ' ' ' ' ' ' ' ' ' ' ' .BackColor =
Color.Background
+ ' ' ' ' ' ' ' ' ' ' ' .tag = sWinPart
+ ' ' ' ' ' ' ' ' ' ' ' END WITH
+ ' ' ' ' ' ' ' ' ' ' ' arrWinInstalls.Add(cb) ' add
to the array to find out wether to include or not in the boot menu
+ ' ' ' ' ' ' ' ' ' ' '
+ ' ' ' ' ' ' ' ' ' ' ' END WITH ' end jacking with the
tabstrip
+ ' ' ' ' ' ' ' ' ' ' ' NEXT
+ ' ' ' ' ' ' ' ' ' ' ' END IF
+ 'SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT32|HPFS|NTFS|Win)\' | cut
-f 1 -d \' \'" TO sNTFSLst
+ SHELL "fdisk -l| grep -E \'^/dev/.* * .*(FAT16|FAT32|HPFS|NTFS|Win)\' |
cut -f 1 -d \' \'" TO sNTFSLst
sNTFSLst = Trim(sNTFSLst)
'Message(sNTFSLst)
IF sNTFSLst <> "" THEN
@@ -120,8 +121,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 IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
+ IF Exist("/mnt" &/ sWinAddr &/ "windows" &/ "system32"
&/ "winver.exe") OR Exist("/mnt" &/ sWinAddr &/ "winnt" &/ "system32"
&/ "winver.exe") THEN
+ 'IF IsDir("/mnt" &/ sWinAddr &/ "windows") = TRUE THEN
' this is indeed a windows installation
WITH FrmLilo.TabStrip1
Modified: branches/iVL/MdlUsrAdd.module
==============================================================================
--- branches/iVL/MdlUsrAdd.module (original)
+++ branches/iVL/MdlUsrAdd.module Wed Oct 22 11:09:53 2008
@@ -121,3 +121,24 @@
END
+PUBLIC FUNCTION CREATE_USER_ON_A_SNAP() AS Boolean
+ DIM bcont AS Boolean
+ DIM tb AS TextBox
+
+ FOR EACH tb IN FrmUserAdd.otb
+ IF tb.Text = "" THEN
+ bcont = FALSE
+ BREAK
+ ELSE
+ bcont = TRUE
+ END IF
+ NEXT
+
+ 'IF NOT bcont THEN bcont = TRUE
+ RETURN bcont
+
+ 'Message.Error("Please
+
+END
+
+
|
