Menu
▾
▴
[Vectorlinux-devel] [vinstall-ng commit] r326 - in branches/iVL: . .lang
|
From: <cod...@go...> - 2008-11-26 16:12:19
|
Author: M0E.lnx
Date: Wed Nov 26 08:10:32 2008
New Revision: 326
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/.project
branches/iVL/DevLog
branches/iVL/FrmUserAdd.class
branches/iVL/FrmUserAdd.form
branches/iVL/MdlConfLilo.module
branches/iVL/MdlDiskPart.module
branches/iVL/MdlLilo.module
branches/iVL/installer.gambas
Log:
DevLog
Modified: branches/iVL/.lang/#project.pot
==============================================================================
--- branches/iVL/.lang/#project.pot (original)
+++ branches/iVL/.lang/#project.pot Wed Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/.project
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsGlobal.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsPartSel.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/ClsWinDrives.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FMain.class
+# /home/vluser/devel/installer/FMain.class
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.lang/FrmDiskPart.pot
==============================================================================
--- branches/iVL/.lang/FrmDiskPart.pot (original)
+++ branches/iVL/.lang/FrmDiskPart.pot Wed Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmDiskPart.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartScheme.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPartSel.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmPkgSel.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSelISO.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmSummary.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/FrmWinDrives.class
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlCore.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlDiskPart.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlObjSizer.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPartSel.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlPkgSel.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSetup.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlSummarize.module
+# /home/vluser/devel/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 Nov 26 08:10:32 2008
@@ -1,4 +1,4 @@
-# /root/gui-installer/MdlWinDrives.module
+# /home/vluser/devel/installer/MdlWinDrives.module
# Generated by Gambas compiler
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
Modified: branches/iVL/.project
==============================================================================
--- branches/iVL/.project (original)
+++ branches/iVL/.project Wed Nov 26 08:10:32 2008
@@ -2,7 +2,7 @@
# Compiled with Gambas 2.9.0
Title=VectorLinux Installer
Startup=MdlCore
-Version=0.1.8
+Version=0.1.9
Library=gb.gtk
Library=gb.form
Library=gb.debug
@@ -17,7 +17,6 @@
Language=en_US
ControlPublic=1
ModulePublic=1
-ExecPath=/root/gui-installer/installer.gambas
Maintainer=M0E-lnx
Vendor=VectorLinux
Add...@gm...
Modified: branches/iVL/DevLog
==============================================================================
--- branches/iVL/DevLog (original)
+++ branches/iVL/DevLog Wed Nov 26 08:10:32 2008
@@ -1,5 +1,5 @@
-- 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
+- Fixed typo in gparted module
+- Fixed issue with user icon now showing up after first user account.
+- Added auto-modifying of -cli lilo entry if the chosen label is too long.
Added warning to user interface to warn accordingly
+- Relabeled "Sector" to "Bootsector of" in LIlo setup
+- Fine tuned lilo target options in the search for a floppy drive
Modified: branches/iVL/FrmUserAdd.class
==============================================================================
--- branches/iVL/FrmUserAdd.class (original)
+++ branches/iVL/FrmUserAdd.class Wed Nov 26 08:10:32 2008
@@ -23,6 +23,23 @@
PUBLIC otb AS Object[]
+PUBLIC SUB CHECK_FOR_EXISTING_USER_ACCOUNTS()
+
+ DIM sDump AS String
+
+ 'EXEC ["ls", clsglobal.sTargetMnt &/ "home", "|", "grep", "-v", "ftp"]
TO sDump
+ SHELL "ls " & clsglobal.sTargetMnt &/ "home | grep -v ftp" TO sDump
+ sDump = Trim(sDump)
+
+ IF Len(sDump) > 0 THEN FrmUserAdd.btImportAcct.Enabled = TRUE
+
+
+
+END
+
+
+
+
PUBLIC SUB Form_Open()
Fmain.frmcurr = ME
@@ -189,7 +206,8 @@
'SHELL "umount /mnt/target/sys" WAIT
'ME.LIST_NEW_USER_ACCOUNT()
- ME.LstUsers.Visible = TRUE
+ ME.LstUsers.Visible = TRUE
+ ME.pbUsrPic.Visible = TRUE
END
@@ -288,6 +306,7 @@
.fGroupSel.Move(4, .tbPicPath.top + .tbPicPath.Height + 4, .ClientW -
(.fGroupSel.Left * 2), .ClientH - (.fGroupSel.top + (.Button1.Height)))
.Button1.Move(4, .fGroupSel.top + .fGroupSel.Height + 8,
MdlObjSizer.get_object_width(.Button1.Text) + 36)
.btClrFrm.Move(.Button1.Left + .Button1.Width + 4, .Button1.top,
MdlObjSizer.get_object_width(.btClrFrm.text) + 36)
+ .btImportAcct.Move(.btClrFrm.Left + .btClrFrm.W + 4, .btClrFrm.top,
MdlObjSizer.get_object_width(.btImportAcct) + 36)
'.pbUsrPic.Move(.tbUsername.Left + (.tbUsername.Width +
2), .tbUsername.top)
'.pbUsrPic.Move(.btBrowse.Left + .btBrowse.Width, tbUsername.top)
.btgrpHelp.Move(.fGroupSel.Width - (.btgrpHelp.Width + 4), 12)
@@ -307,47 +326,6 @@
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
- '
-
-
-
-
-
- ' FOR EACH tl IN otl
- ' IF tl.width > iboxleft THEN
- ' iboxleft = tl.Left + tl.Width + 8
- ' END IF
- ' NEXT
-
-
- 'FOR EACH tb IN otb
-
- ' ' ' FOR EACH cb IN MdlUsrAdd.objGrps
- ' ' '
- ' ' ' 'icbspace = icbspace + cb.Width + 4
- ' ' ' IF icbspace >= .fGroupSel.Width * 0.75 THEN
- ' ' ' icby = icby + cb.Height * 2
- ' ' ' icbspace = 4
- ' ' ' END IF
- ' ' ' cb.Move(icbspace, icby)
- ' ' ' icbspace = icbspace + cb.Width + 4
- ' ' '
- ' ' ' NEXT
-
-
-
-
-
END WITH
Modified: branches/iVL/FrmUserAdd.form
==============================================================================
--- branches/iVL/FrmUserAdd.form (original)
+++ branches/iVL/FrmUserAdd.form Wed Nov 26 08:10:32 2008
@@ -100,11 +100,16 @@
Alignment = Align.Normal
}
{ frmUserList Frame
- MoveScaled(35,16,18.8889,17)
+ MoveScaled(35,16,18.8571,17)
Text = ("User Accounts")
{ LstUsers ScrollView
MoveScaled(1,2,17,13)
Border = False
}
+ }
+ { btImportAcct Button
+ MoveScaled(30,63,24,1)
+ Text = ("Import Existing User Accounts")
+ Picture = Picture["icon:/small/redo"]
}
}
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Wed Nov 26 08:10:32 2008
@@ -121,24 +121,20 @@
sList = Trim(sList)
sListarr = Split(sList, "\n").Sort(gb.Ascent)
FOR i = 0 TO sListarr.count - 1
- sTarget = "MBR of " & Trim(sListarr[i])
+ sTarget = (("MBR of ")) & Trim(sListarr[i])
'FrmLilo.LiloTarget.Add(sTarget)
FrmLiloSetup.cbLIloTarget.Add(sTarget)
NEXT
'WITH FrmLilo.LiloTarget
WITH FrmLiloSetup.cbLIloTarget
- IF LCase(ClsPartSel.fRoot) <> "xfs" THEN
-
- .Add("Sector")
- END IF
-
+ IF LCase(ClsPartSel.fRoot) <> "xfs" THEN .Add(("Bootsector of ")
& ClsPartSel.sRoot)
+ '.Add(("Bootsector of ")) & ClsPartSel.sRoot
+ 'END IF
-
- SHELL "lsdev | grep floppy" TO sDump
- IF sDump <> "" THEN
- .Add("Floppy")
- END IF
+ SHELL "lsdev | grep -i floppy" TO sDump
+ IF sDump <> "" THEN .Add(("Floppy"))
+ 'END IF
END WITH
Modified: branches/iVL/MdlDiskPart.module
==============================================================================
--- branches/iVL/MdlDiskPart.module (original)
+++ branches/iVL/MdlDiskPart.module Wed Nov 26 08:10:32 2008
@@ -77,7 +77,7 @@
REPEAT
aHandle = Desktop.Find(Trim(sTypes[i]) & " - GParted")
INC i
- UNTIL aHandle.coun > 0 OR i = sTypes.Count - 1
+ UNTIL aHandle.count > 0 OR i = sTypes.Count - 1
END IF
IF aHandle.count = 0 THEN
Modified: branches/iVL/MdlLilo.module
==============================================================================
--- branches/iVL/MdlLilo.module (original)
+++ branches/iVL/MdlLilo.module Wed Nov 26 08:10:32 2008
@@ -92,11 +92,11 @@
DIM iTimeOut AS Integer
sTarget = Trim(FrmLiloSetup.cbLIloTarget.Text)
- IF InStr(sTarget, "MBR of") THEN
+ IF InStr(sTarget, ("MBR of")) THEN
sTarget = Right(sTarget, Len(sTarget) - InStr(sTarget, "/") + 1)
- ELSE IF sTarget = "Sector" THEN
+ ELSE IF sTarget = ("Bootsector of ") & ClsPartSel.sRoot THEN
sTarget = ClsPartSel.sRoot
- ELSE IF sTarget = "Floppy" THEN
+ ELSE IF sTarget = ("Floppy") THEN
sTarget = "/dev/df0"
END IF
@@ -177,6 +177,12 @@
FOR EACH chbox IN ME.arrLinuxTextBoots
IF chbox.Value = TRUE THEN
IF chbox.tag = cb.Tag THEN
+ ' validate length of -tui entry
+ IF Len(sLabel) + Len("-tui") > 15 THEN
+ Message.warning(("Your option to boot") &
Space(1) & sLabel & Space(1) & ("is too long. it has been adjusted to
\"Vector-cli\". You can run vasmCC after the first boot to modify your boot
options"))
+ sLabel = "Vector"
+
+ END IF
sClisection = "image = " & sBootPath &/ sKernel & "\n"
&
"root = " & Right(cb.Tag, Len(cb.Tag) - InStr(cb.Tag, "/") + 1)
& "\n" &
"label = " & sLabel & "-tui" & "\n" &
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
